diff --git a/TODO.md b/TODO.md
index e1c71fb85b..3641bf985f 100644
--- a/TODO.md
+++ b/TODO.md
@@ -84,10 +84,7 @@ Name | Buildsystem | Category | User | RFH
 [gridstudio](https://github.com/ricklamers/gridstudio) | go | visualization | Alessandro-Barbieri | yes
 [osmosis](https://wiki.openstreetmap.org/wiki/Osmosis) | gradle | geography | Alessandro-Barbieri | yes
 [Opensearch](https://github.com/opensearch-project/OpenSearch) | gradle |  | Alessandro-Barbieri | yes
-[ijavascript](https://github.com/n-riesco/ijavascript) | npm | jupyter | Alessandro-Barbieri | yes
 [cocalc](https://github.com/sagemathinc/cocalc) | npm | math | Alessandro-Barbieri | yes
-[pelias](https://github.com/pelias/pelias) | npm | geography | Alessandro-Barbieri | yes
-[hsd](https://github.com/handshake-org/hsd) | npm | dns | Alessandro-Barbieri | yes
 [Gitfs](https://github.com/presslabs/gitfs) | setuptools | filesystem | Alessandro-Barbieri | no
 [usbkill](https://github.com/hephaest0s/usbkill) | setuptools | util | Alessandro-Barbieri | no
 [mapillary_tools](https://github.com/mapillary/mapillary_tools) | setuptools | geography | Alessandro-Barbieri | no
diff --git a/app-backup/grub-btrfs/Manifest b/app-backup/grub-btrfs/Manifest
new file mode 100644
index 0000000000..767ea459da
--- /dev/null
+++ b/app-backup/grub-btrfs/Manifest
@@ -0,0 +1 @@
+DIST grub-btrfs-4.10.1.tar.gz 24581 BLAKE2B 10cba8c3e22ff44c347e331fc8e6f108a947e912db042aca5b61307f01058cef82d44033ce2e1fc36d926e178d2bdd397beac30a7adf89b811ebdba1fb12b112 SHA512 e9d395ad56e3095ca27a92f2ceedb699249ea14b29a351e3db13cf27aa8999a9de2bfdca565a5ed359744f88c0dc6f8919b32c8283c763f5facc7b01e98a08c5
diff --git a/app-backup/grub-btrfs/grub-btrfs-4.10.1.ebuild b/app-backup/grub-btrfs/grub-btrfs-4.10.1.ebuild
new file mode 100644
index 0000000000..146919a6b3
--- /dev/null
+++ b/app-backup/grub-btrfs/grub-btrfs-4.10.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Improves Grub by adding btrfs snapshots to the Grub menu."
+HOMEPAGE="https://github.com/Antynea/grub-btrfs"
+SRC_URI="https://github.com/Antynea/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	sys-fs/btrfs-progs
+	sys-boot/grub
+"
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+src_prepare() {
+	default
+}
+src_compile(){
+	true
+}
+
+pkg_postinst() {
+	elog "run 'grub-mkconfig -o /boot/grub/grub.cfg' to update your Grub menu."
+}
diff --git a/app-backup/grub-btrfs/metadata.xml b/app-backup/grub-btrfs/metadata.xml
new file mode 100644
index 0000000000..bccd8dadbf
--- /dev/null
+++ b/app-backup/grub-btrfs/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>pascal.jaeger@leimstift.de</email>
+		<name>Pascal Jäger</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">Antynea/grub-btrfs</remote-id>
+	</upstream>
+	<longdescription lang="en">
+		Improves Grub by adding "btrfs snapshots" to the Grub menu.
+
+		You can boot your system on a "snapshot" from the Grub menu.
+		Supports manual snapshots, snapper, timeshift ...
+	</longdescription>
+</pkgmetadata>
diff --git a/app-backup/timeshift-autosnap/Manifest b/app-backup/timeshift-autosnap/Manifest
new file mode 100644
index 0000000000..632a41ef2b
--- /dev/null
+++ b/app-backup/timeshift-autosnap/Manifest
@@ -0,0 +1 @@
+DIST timeshift-autosnap-0.9.tar.gz 2876 BLAKE2B 03063b1cedd18eee56681b9af10954f7c26a0dfdd08eb51ba0dc56c5b86eed1dac3024cd5b790ed2f00f30a9c09988d2c2785dad4041e931e3af2301f7159491 SHA512 15dbe97ef26954c33aa0a9dccb62a93da81b98d7194423111536d5ef7c832b8432c75b58b9edbbfaa669a333692bd71624a221928ca8e186cdf833d7ebd63c9c
diff --git a/app-backup/timeshift-autosnap/files/timeshift-autosnap-remove-arch-specific.patch b/app-backup/timeshift-autosnap/files/timeshift-autosnap-remove-arch-specific.patch
new file mode 100644
index 0000000000..a778006bf2
--- /dev/null
+++ b/app-backup/timeshift-autosnap/files/timeshift-autosnap-remove-arch-specific.patch
@@ -0,0 +1,10 @@
+--- a/timeshift-autosnap
++++ b/timeshift-autosnap
+@@ -53,7 +53,7 @@ if $(get_property "deleteSnapshots" "boolean" "true") ; then
+     fi
+ fi;
+ 
+-if $(get_property "updateGrub" "boolean" "true") && [ "$(pacman -Qs ^grub-btrfs$)" ]; then
++if $(get_property "updateGrub" "boolean" "true") ; then
+     grub-mkconfig -o /boot/grub/grub.cfg
+ fi;
diff --git a/app-backup/timeshift-autosnap/metadata.xml b/app-backup/timeshift-autosnap/metadata.xml
new file mode 100644
index 0000000000..bccd8dadbf
--- /dev/null
+++ b/app-backup/timeshift-autosnap/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>pascal.jaeger@leimstift.de</email>
+		<name>Pascal Jäger</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">Antynea/grub-btrfs</remote-id>
+	</upstream>
+	<longdescription lang="en">
+		Improves Grub by adding "btrfs snapshots" to the Grub menu.
+
+		You can boot your system on a "snapshot" from the Grub menu.
+		Supports manual snapshots, snapper, timeshift ...
+	</longdescription>
+</pkgmetadata>
diff --git a/app-backup/timeshift-autosnap/timeshift-autosnap-0.9.ebuild b/app-backup/timeshift-autosnap/timeshift-autosnap-0.9.ebuild
new file mode 100644
index 0000000000..a2c30bdb76
--- /dev/null
+++ b/app-backup/timeshift-autosnap/timeshift-autosnap-0.9.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Automatically creates a timeshift-snapshot when executed"
+HOMEPAGE="https://gitlab.com/gobonja/timeshift-autosnap"
+SRC_URI="https://gitlab.com/gobonja/timeshift-autosnap/-/archive/${PV}/{$P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+        app-backup/timeshift
+        >=sys-apps/portage-2.1
+"
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+PATCHES=( "${FILESDIR}/${PN}-remove-arch-specific.patch" )
+
+src_unpack() {
+        default
+	mv ${WORKDIR}/timeshift-autosnap-${PV}* ${WORKDIR}/timeshift-autosnap-${PV}
+}
+
+src_compile(){
+	true
+}
+
+src_install(){
+	dobin timeshift-autosnap
+	insinto /etc
+	doins timeshift-autosnap.conf
+}
+
+pkg_postinst() {
+	elog "to run timeshift-autosnap everytime you emerge a package run: 
+'touch /etc/portage/bashrc' 
+'grep -q  '#!/bin/' /etc/portage/bashrc || awk -i inplace 'BEGINFILE{print "#!/bin/sh"}{print}' /etc/portage/bashrc 
+'grep -q 'timeshift-autosnap' /etc/portage/bashrc || echo 'function pre_pkg_setup() { /usr/bin/timeshift-autosnap ; }' >> /etc/portage/bashrc'"
+}
diff --git a/app-editors/imhex/Manifest b/app-editors/imhex/Manifest
index d9a07528d3..d07eb6afc6 100644
--- a/app-editors/imhex/Manifest
+++ b/app-editors/imhex/Manifest
@@ -1,2 +1,3 @@
 DIST imhex-1.10.0.tar.gz 8509953 BLAKE2B e258693f44d5524a86c88e29152bfe9777a149236f146a16b88bc7a49d3450f1b46138649a830c7164175afaea3c0d5e76c998e3e65020627b3c978c504431bb SHA512 03d84e30d5ee064ef2c3faf5cb40965f2c94b41e4d8b3e2e3e800f079d0710f0660b4c751dc0c4516b9b19bbf57df44a102ae61fa41d56606ce1f37c9aa8313c
+DIST imhex-1.10.1.tar.gz 8523483 BLAKE2B 7d73a06cfe83fdd9fa8723f1c64a752212f8e2f0dbf902f2d1da1349e53e580684263b168569f092d32c129eddba40131d8f8bd3148d6d59340dcd67bcdc8b6e SHA512 0542ce5db530989367dfc98932bd09e3020c955e2bd666122644612e1c41e2bc3d6a6374c60e7afbb4bae86c75930dfbc7a48f37a8cd8a0d85a550231f470b91
 DIST imhex-1.8.1.tar.gz 1758664 BLAKE2B 62c58358810bd4f1192495001d01fc6c6fe8f28a35adc1478c8b2d0dab0fd929c0f46018c9afd51c1094cbae0c04002f4887fb2fb9377b6c645abaee006b9a03 SHA512 c6ec73a282c9eb90b58d164c29abbef3dceba09aa706a8295cecdcb429d5efa4015fac0dd0a3111eae3efe667f5b16f063624bf188a00a400fc06b008e3b51f8
diff --git a/app-editors/imhex/imhex-1.10.1.ebuild b/app-editors/imhex/imhex-1.10.1.ebuild
new file mode 100644
index 0000000000..511463ff0b
--- /dev/null
+++ b/app-editors/imhex/imhex-1.10.1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_BUILD_TYPE="Release"
+CMAKE_MAKEFILE_GENERATOR="emake"
+LLVM_MAX_SLOT=12
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake desktop llvm python-single-r1 xdg-utils
+
+DESCRIPTION="A hex editor for reverse engineers, programmers, and eyesight"
+HOMEPAGE="https://github.com/WerWolv/ImHex"
+SRC_URI="https://github.com/WerWolv/ImHex/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/ImHex-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	${PYTHON_DEPS}
+	app-forensics/yara
+	>=dev-cpp/nlohmann_json-3.10.2
+	dev-cpp/xdgpp
+	dev-libs/capstone
+	>=dev-libs/libfmt-8.0.0
+	dev-libs/nativefiledialog-extended
+	dev-libs/openssl
+	dev-libs/tre
+	media-libs/freetype
+	media-libs/glfw
+	media-libs/glm
+	net-libs/mbedtls
+	net-misc/curl
+	sys-apps/file
+	sys-devel/llvm:${LLVM_MAX_SLOT}
+	virtual/libiconv
+	virtual/libintl
+"
+RDEPEND="${DEPEND}"
+BDEPEND="app-admin/chrpath"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.8.1-system-xdgpp.patch"
+	"${FILESDIR}/${PN}-1.8.1-system-nativefiledialog.patch"
+	"${FILESDIR}/${P}-fix-yara-linking.patch"
+	"${FILESDIR}/${P}-no-lnlohmann_json.patch"
+	"${FILESDIR}/${P}-link-mbedtls.patch"
+)
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_prepare() {
+	rm -r external/{curl,fmt,llvm,nativefiledialog,nlohmann_json,xdgpp,yara} || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	python-single-r1_pkg_setup
+	local mycmakeargs=(
+		-DPROJECT_VERSION="${PV}"
+		-DPYTHON_VERSION_MAJOR_MINOR="\"${EPYTHON/python/}\""
+		-DUSE_SYSTEM_CURL=ON
+		-DUSE_SYSTEM_FMT=ON
+		-DUSE_SYSTEM_LLVM=ON
+		-DUSE_SYSTEM_NLOHMANN_JSON=ON
+		-DUSE_SYSTEM_YARA=ON
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	# can't use cmake_src_install, doing it manual
+	dobin "${BUILD_DIR}/${PN}"
+	insinto "/usr/$(get_libdir)"
+	doins "${BUILD_DIR}/plugins/builtin/builtin.hexplug"
+	dolib.so "${BUILD_DIR}/plugins/lib${PN}/lib${PN}.so"
+	insinto "/usr/share/${PN}"
+	doins "${S}/res/icon.ico"
+	doins -r "${S}/res/resources"
+
+	chrpath -d "${ED}/usr/bin/imhex"
+	chrpath -d "${ED}/usr/$(get_libdir)/builtin.hexplug"
+
+	mypythondir="${D}/$(python_get_sitedir)/imhex"
+	mkdir -p "${mypythondir}" || die
+	mv "${S}"/python_libs/lib/* "${mypythondir}" || die
+	python_optimize "${mypythondir}"
+
+	# create desktop icon
+	make_desktop_entry "imhex" "ImHex" "/usr/share/${PN}/icon.ico" "X-Editor"
+
+	# install docs
+	einstalldocs
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/app-emulation/spice-html5/metadata.xml b/app-emulation/spice-html5/metadata.xml
index 7a38bb9009..d2b2c8ce9f 100644
--- a/app-emulation/spice-html5/metadata.xml
+++ b/app-emulation/spice-html5/metadata.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<description>co-maintainers welcome</description>
+		<email>lssndrbarbieri@gmail.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-misc/apidb/Manifest b/app-misc/apidb/Manifest
index 0b58b71c78..f665692c07 100644
--- a/app-misc/apidb/Manifest
+++ b/app-misc/apidb/Manifest
@@ -1,4 +1,5 @@
 DIST 5.11.0-beta.tar.gz 193852 BLAKE2B 522e691afdf97dde0d34982938d1443156057d30b46a2f705881dd76f5ff739dcc2c2b01a4aef8f0edf59d51259bc6a88760a9cee31fbbada622e6da7ad37718 SHA512 42955f30f79c8eb22a18b95aae480ca43ba2de95f0cd5db2a69851b1e3098927a9ef28c8a7ef4ae136d424821c5a6f8ca9f91893161baeca75236683df95d6be
 DIST 5.13.1-beta.tar.gz 190519 BLAKE2B 0fb809e50d28163559e9d633e4b5f58f3111fadf3992071515e61b97709f2925c11e498978739115d20907fe5eb5d9755929d3fa582d9300b69bccefc493d199 SHA512 11d5999faf1475e82b1143c383e13b0b6fc27de78fb81adc73cc2febf5dbb28e45a770c850275642aa338ceddac6ef83fd41f0b739e615855d05a39dc0f901b6
 DIST 5.13.4-beta.tar.gz 190587 BLAKE2B f7f71d3841a6d4ccdc5f30f0d4352342f317090a226757562ff4183562c33ed8e5aba0bf373dc58a10345b8b33a84d91db26058f748897c641aa3ea4fe2e236c SHA512 81287cc16dcc65189df90999ca4b7ad133cd735f21b2568fcff1f479165d8b7464186d3a3f9429dda3dd8213eadec60f9898dbccb0295801788e344a88c17af9
+DIST 5.13.6-beta.tar.gz 190636 BLAKE2B 9ee3fc2964442982b510d9d18584aa9a96343b1dbe2c6e902f54c1a2dc040aa7479f6a1076a108b20975869279f8873e80938918cd1bfbc13602e423f1d637ac SHA512 872bdbdfbc7e85153b56049f90bf83868b8542924a66abf399c422e6c321616a89420622623acaf78c8ab68cd90fa2b4a7a3bb29a225c9ff81edb6b4af751239
 DIST 5.8.0-beta.tar.gz 183120 BLAKE2B 82d6a2e40aab046b14c6256acca458765bc744144f57d8aeae5201f8e89d97c70d5dbc42fe89880ded8ea9ee9ff96e2f2a91f3da8e7b13fb52cd4ba75caedaf6 SHA512 07d9cb217922239ad79ec6632d28f87d986e69ec3fd5c5440dbae96514a10a66f043efa84031c6541c3b1dc8b6786b5265c9cdd98f8b4102c3e937934bad649a
diff --git a/app-misc/apidb/apidb-5.13.6_beta.ebuild b/app-misc/apidb/apidb-5.13.6_beta.ebuild
new file mode 100644
index 0000000000..0f7dc87bf0
--- /dev/null
+++ b/app-misc/apidb/apidb-5.13.6_beta.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+CMAKE_BINARY=cmake
+CMAKE_MAKEFILE_GENERATOR=emake
+
+inherit cmake
+
+MYPV="${PV/_beta/-beta}"
+MYPN="${PN}"
+MYP="${MYPN}-${MYPV}"
+
+DESCRIPTION="API Generator for Database access"
+HOMEPAGE="https://github.com/azaeldevel/apidb"
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/azaeldevel/apidb.git"
+else
+	inherit autotools
+	SRC_URI="https://github.com/azaeldevel/${PN}/archive/${MYPV}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+IUSE="+mariadb postgresql commands gtk +corelibs"
+
+RDEPEND="
+	dev-libs/libxml2
+	dev-libs/boost
+	dev-libs/octetos-coreutils
+	dev-libs/octetos-db-abstract
+	gtk? ( x11-libs/gtk+:3 )
+	dev-libs/libtar
+	mariadb? ( dev-libs/octetos-db-maria )
+	postgresql? ( dev-libs/octetos-db-postgresql )
+	gnome-base/librsvg
+"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex
+"
+
+S="${WORKDIR}/${PN}-${MYPV}"
+
+src_prepare() {
+	sed -i 's/lib/${LIBDIR}/' src/CMakeLists.txt || die
+	sed -i 's/lib/${LIBDIR}/' src/mysql-reader-c++/CMakeLists.txt  || die
+	sed -i 's/lib/${LIBDIR}/' src/mariadb-reader-c++/CMakeLists.txt  || die
+	sed -i 's/lib/${LIBDIR}/' src/postgresql-reader-c++/CMakeLists.txt  || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	APIDBBUILD="CORE"
+	APIDBINSTALL=""
+	if use corelibs ;then
+		APIDBINSTALL="CORE"
+	fi
+	if use mariadb ;then
+		APIDBBUILD="$APIDBBUILD;MARIADB"
+		APIDBINSTALL="$APIDBINSTALL;DRIVERS"
+	fi
+	if use postgresql ;then
+		APIDBBUILD="$APIDBBUILD;POSTGRESQL"
+		APIDBINSTALL="$APIDBINSTALL;DRIVERS"
+	fi
+	if use commands ;then
+		APIDBINSTALL="$APIDBINSTALL;COMMANDS"
+	fi
+	if use gtk ;then
+		APIDBINSTALL="$APIDBINSTALL;GTK3"
+	fi
+	local mycmakeargs=(-DAPIDB_VERSION_STAGE=alpha -DPLATFORM=LINUX_GENTOO -DAPIDBBUILD=$APIDBBUILD -DAPIDBINSTALL=$APIDBINSTALL)
+	cmake_src_configure
+}
diff --git a/app-misc/diff-so-fancy/Manifest b/app-misc/diff-so-fancy/Manifest
index fecb9985ae..c3f02462fc 100644
--- a/app-misc/diff-so-fancy/Manifest
+++ b/app-misc/diff-so-fancy/Manifest
@@ -1 +1,2 @@
 DIST diff-so-fancy-1.4.2.tar.gz 51750 BLAKE2B 77d43c813cd6bd5c33b26c8687f6a664bc5557a1df65a300fd15d914723ffefe60c62facbf09f5e4bd4a0d063ea22ff99e9d049e5ce215f1deee7e7c3ed92cec SHA512 cedef279417708d4cbbc6d37fe8b4ba4e71b2bc759a86abab068242db3ff71336c7672251fd6d558bd38e2e5a3084caf19fb5a3c2e76d22dbbd07cf56ec29110
+DIST diff-so-fancy-1.4.3.tar.gz 51800 BLAKE2B e36a30e79d50f9dd0c151ab42e4192563ab0dc9aa30d0aa12e2cf85c29ef8acf9761cc7c19e0067ecf62f5243b667a7d438ab19aaa7150fd93613e11ecbfabf8 SHA512 9c85c0ffcb7235ad985377206e93e56bdac3926f029d8ab8a899a4391339f344049e9bfe4b77df0f2bda29720ab454378218ea3752b97f40b5ac7ba72a5fa047
diff --git a/app-misc/diff-so-fancy/diff-so-fancy-1.4.3.ebuild b/app-misc/diff-so-fancy/diff-so-fancy-1.4.3.ebuild
new file mode 100644
index 0000000000..6ccc8520e2
--- /dev/null
+++ b/app-misc/diff-so-fancy/diff-so-fancy-1.4.3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Good-lookin' diffs. Actually... nah... The best-lookin' diffs."
+HOMEPAGE="https://github.com/so-fancy/diff-so-fancy"
+SRC_URI="https://github.com/so-fancy/diff-so-fancy/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="
+	${RDEPEND}
+	dev-lang/perl
+"
+BDEPEND="test? ( dev-util/bats )"
+
+PATCHES=( "${FILESDIR}/fix-path.patch" )
+DOCS=( README.md history.md pro-tips.md )
+RESTRICT="!test? ( test )"
+
+src_install() {
+	dobin "${PN}"
+
+	insinto "/usr/share/${PN}"
+	doins lib/*
+
+	einstalldocs
+}
+
+src_test() {
+	bats test || die
+}
diff --git a/app-misc/hollywood/Manifest b/app-misc/hollywood/Manifest
index 5d0e5d602e..1c9b997199 100644
--- a/app-misc/hollywood/Manifest
+++ b/app-misc/hollywood/Manifest
@@ -1 +1 @@
-DIST hollywood-0_pre20200822.tar.gz 16721081 BLAKE2B 9e55bb6734c9f26ada954af69c3da5d83da161ea2c2f2c7483c3a8dcfb42a2a842696d2a8faf736a93a77789c5b181e556dc86da4db3ccacb03906c150131105 SHA512 1b18f7895315f8cfc71642adccc171a45ef15a9f355a4b4cb5d5b094e5d850dd7c2898f495d332279e5b87bbf6104540f101f4c94ce00fc75d30db7b6089ab57
+DIST hollywood-1.22.tar.gz 16721081 BLAKE2B 9e55bb6734c9f26ada954af69c3da5d83da161ea2c2f2c7483c3a8dcfb42a2a842696d2a8faf736a93a77789c5b181e556dc86da4db3ccacb03906c150131105 SHA512 1b18f7895315f8cfc71642adccc171a45ef15a9f355a4b4cb5d5b094e5d850dd7c2898f495d332279e5b87bbf6104540f101f4c94ce00fc75d30db7b6089ab57
diff --git a/app-misc/hollywood/hollywood-0_pre20200822.ebuild b/app-misc/hollywood/hollywood-1.22.ebuild
similarity index 99%
rename from app-misc/hollywood/hollywood-0_pre20200822.ebuild
rename to app-misc/hollywood/hollywood-1.22.ebuild
index 635e3a9d3a..ca4167ff6d 100644
--- a/app-misc/hollywood/hollywood-0_pre20200822.ebuild
+++ b/app-misc/hollywood/hollywood-1.22.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
 
 inherit optfeature
 
@@ -14,6 +14,7 @@ HOMEPAGE="
 "
 SRC_URI="https://github.com/dustinkirkland/hollywood/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/${PN}-${COMMIT}"
+
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
diff --git a/app-text/OCRmyPDF/Manifest b/app-text/OCRmyPDF/Manifest
index 1c431256e9..ad570a2cb5 100644
--- a/app-text/OCRmyPDF/Manifest
+++ b/app-text/OCRmyPDF/Manifest
@@ -1 +1,2 @@
 DIST OCRmyPDF-12.0.2.tar.gz 7895055 BLAKE2B 4fab449f9edf8788c74773da0e73adca9dc686afcbc69d9d6263049044b202744244eab4f4d6e5596461c55d399320a5e7604c6a8080c0d6a05ea6df15314eac SHA512 8bc749353d88dd1e0b2fbd313ba45fa5bf79b70c0366bde21dbe457ce269d02bea64e797e73b823fe9c02b2bd18f181f6cea414306ab1470e244e4201f86781a
+DIST OCRmyPDF-12.6.0.tar.gz 7897200 BLAKE2B e183280e11414a7b2bedd339e971f1c74697d9847771e24592207e5bfe82af184544576c067856cdee9d8409bdca856e8aeb48c8e5b4e32154b69111fba2d775 SHA512 0792fccec7ecdfc93a02c4e29d0c88076c191aed3a2848c4db5d6b18ad4837a24e325dfc961aaa7c68407de7dd471e45e7b6389d6cf8f9465fe3892038696e97
diff --git a/app-text/OCRmyPDF/OCRmyPDF-12.6.0.ebuild b/app-text/OCRmyPDF/OCRmyPDF-12.6.0.ebuild
new file mode 100644
index 0000000000..35a9ead068
--- /dev/null
+++ b/app-text/OCRmyPDF/OCRmyPDF-12.6.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7..8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="OCRmyPDF adds an OCR text layer to scanned PDF files"
+HOMEPAGE="https://github.com/jbarlow83/OCRmyPDF"
+SRC_URI="https://github.com/jbarlow83/OCRmyPDF/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# This uses *a lot* of RAM, I have 32gb and these tests tried to use it all
+RESTRICT="test"
+IUSE="jbig2enc"
+
+RDEPEND="
+	app-text/ghostscript-gpl
+	app-text/tesseract
+	app-text/unpaper
+	dev-python/cffi[${PYTHON_USEDEP}]
+	dev-python/coloredlogs[${PYTHON_USEDEP}]
+	>=dev-python/pdfminer-six-20191110[${PYTHON_USEDEP}]
+	<=dev-python/pdfminer-six-20201018[${PYTHON_USEDEP}]
+	dev-python/pikepdf[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pluggy[${PYTHON_USEDEP}]
+	dev-python/reportlab[${PYTHON_USEDEP}]
+	dev-python/tqdm[${PYTHON_USEDEP}]
+	media-gfx/img2pdf[${PYTHON_USEDEP}]
+	media-gfx/pngquant
+	media-libs/leptonica
+	virtual/python-cffi[${PYTHON_USEDEP}]
+	jbig2enc? ( media-libs/jbig2enc )
+"
+DEPEND="
+	test? (
+		dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		~dev-python/python-xmp-toolkit-2.0.1[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs --no-autodoc
+
+src_install() {
+	distutils-r1_src_install
+	newbashcomp misc/completion/ocrmypdf.bash "${PN,,}"
+	insinto /usr/share/fish/vendor_completions.d
+	doins misc/completion/ocrmypdf.fish
+}
diff --git a/app-text/mdbook/Manifest b/app-text/mdbook/Manifest
index 0a18befe4b..8151cab14e 100644
--- a/app-text/mdbook/Manifest
+++ b/app-text/mdbook/Manifest
@@ -1,7 +1,10 @@
 DIST aho-corasick-0.7.18.crate 112923 BLAKE2B 4f6947d1aacf89ccfab0592cdc55fa61ef09cea38231d3f758765dbce328a810c0b588be4ba96e81d64955379ee005722d22a7aec39caea6e72342245d7ca34f SHA512 7a23b16231a90d23ee60ad4c81bc225410599a4560d33d3a203138fc540c39cf1000100fed3aed40dcc371c3635656a3792545dca5dd1aefbde00d8774eebd00
 DIST ammonia-3.1.1.crate 35514 BLAKE2B 4cc4f9c50488264932347e3d8f710731e4ef43bd4e6b27fa5307b196f1142e0725c9f76595e430d2c8ed0880868d9e4fac226f3026e71c15de67c46b1e00cc3e SHA512 fae5b33ac0f6bc72acb51cf6ea87df55f308b798830342f92a24ed35a51a0eb7081a7fd14df0fedb30f4f516bd30de00d6059c246ab200a483fb8b4a68a4fac5
+DIST ammonia-3.1.2.crate 39704 BLAKE2B 78c4df1a201b1899331a1e9c4861bb792b0a0da4573881608591dd661373063d7c9b91255f22e998ac19b6e5f78ba1318fab066bf18c2d2792059c991ec127ea SHA512 eec32f6367740d78bfe17c3c83adbc34d6143b01b64e19a0821726155206883229884464893048b235164c21e0c122a5b3e530ccd8d80ad78ab19243bcdcae97
 DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
 DIST anyhow-1.0.40.crate 34534 BLAKE2B 79a3731153f8e3ace906b9a360521147fd055f7401a99ea2373501ade7e49ecdb280dd59b6a3b9b2f88e90857302e71f772c767e62cb702e32c8343fd4b0f741 SHA512 5efc7347a7fa72abce9a8b3b76649abb00d73c16c5125aa4b6faaa7040eb5138d7d9470b66c186825c9651272f5c359578503d0866ce7242ea7ca9dc05087165
+DIST anyhow-1.0.43.crate 34968 BLAKE2B a846dbc5275906e9f8ec4d5019a0fbff56e16eb970f8f528f2a7e5e2078e39a235d879870ffb92d6af45dc01b730825beb0a346fd6a2de1ddbf076366cd8eada SHA512 d35eb86b3c1676a88fcd9fa8a956f0fb3d3a657caa777e27eb8d5f6a86fec352273c463782dd803a87514c72fe679855d7a379c63bb385df593a5e14c069b7a3
+DIST assert_cmd-1.0.7.crate 26777 BLAKE2B a27a6c59969b6202ceebc72b50331e056f02e05befe710f3f1fe77622a61ed4ed11e258cc2df43f52a7f57c18e4bc9b33c72946d012a4fd6f5417c1a5fedddff SHA512 9e0e67bdf14df8235cdd11d9c453bb2f0723188a39961d8aab26fd98f2c64629d085c8d3eb50ee88371ecdc2ea306bfe5dda1ca4872082b40f13a4cea99e05d1
 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
 DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
 DIST base64-0.12.3.crate 57545 BLAKE2B 5ff7e888f6b750ddfe302438d52766f5d6281b8c8ce73827a9ad1d64641704414649e6c1e02bce6abbb2858b9f859fce54a0e0e793549a474c4b49a724c8663f SHA512 ec6ad7cbd4980a12189690e9e24ec1db3c3def9e93672a415808904f68db2b5d8c5740e44207b2c629db5dd5d6ba6bd9dd342dd82367da6198e0313d86e54f02
@@ -9,9 +12,11 @@ DIST base64-0.13.0.crate 62070 BLAKE2B b957f65cdb1e28baeca0cefc92fa98be797409b7d
 DIST bit-set-0.5.2.crate 14093 BLAKE2B 06d41a217438d9a00f8e57e592d12364b671d082f21a4d174673bc820dde28ef5ce02e782002d03c9311f71b0130eeeca7cfacbc4c1b27475069479163643ef3 SHA512 9709f35c7e69b84eed61f73da99ffe0693d1d0fa5fb94d13759cfbbb9dd4b0bb27628c3200e4b29ef29cdb0aede5fd3d7ddf663012b2c5946975bc169efbac34
 DIST bit-vec-0.6.3.crate 19927 BLAKE2B f5bd3bb9c87fdf3b206739b74df20cab50a1a45af3a58b2642a5a061c26207884be58ef8369a3cd06dfd3615bff0ce15915fdd4b6b6f03facc4a0f86c0b7e910 SHA512 b4b4a82c80d0ff13527ae4fff449ac9c1c7bc519c013af6ea3428348e0e5b9306b725c0a13a42d7d9dcf0f895a9eee0c63695a2503eb7fd2200083c9ea3a9aa8
 DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
+DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
 DIST block-buffer-0.7.3.crate 7179 BLAKE2B 549e8532358f9a77fdfbd5ef7a06d60f20f034fcf69072757811cb4a95f5cee5589bebd40fe87af36127254ec42ef3240cc7542828085f590fb774faab8f0e21 SHA512 74c8b89777a006bd72511b32df94f8bd78e2b53c30d85d39ea3c52acf199c357140fb6181f7f7ab5e30dd80d37181582cad740c95b89328a7a4b0f84f77ad6bf
 DIST block-buffer-0.9.0.crate 7108 BLAKE2B 42e99ec46c6e43d5f85e8d6d0a8fcef7175c97828758c93e55505c0e18e2646ae77bf264076041bf682532e28268a4978dd9c822c0475347ee3d29c5df2601fb SHA512 2d0f8908f59d4b1cccd1fbca0c1fa3cc4b224f09549669b28a16af5acfd4369b66851e9be8d65e1df71be998fbc42fc130ad32b71e035d6055724e8fa31fbf98
 DIST block-padding-0.1.5.crate 7342 BLAKE2B 876421fa89251d011a455163baa49e0931e0692ed928fad71357fc93b87493eeab4cfcf8fc4aa94638a90a8dce8ec1ad95e9ba91da9557008e5fc19c1f618ab4 SHA512 acf5369cdae38b6b1a5c1561a9df18b8a39c8fd434fa50c49a8f73d2654a835269b7b22876354c903514c49c77aa860c68cd84d3c1efcb36bdfa8b01af300a9a
+DIST bstr-0.2.17.crate 330350 BLAKE2B 90c3a48d78b73d7e36a3da9fda0beae6e91ce534d17198ea8ceee0b613d03297f9dd8bca30e1ec5da01d1da359a1da72b2c2771b77c82bebab5006cafd665192 SHA512 883eac8210d14f89517b4dd5e25d02c97cf31602ec74498b5e186112ba0f154d47de8d1c41a8f4e5503f3b53c064e2c976b60bbfd63fc28b186bc006e00f20c2
 DIST byte-tools-0.3.1.crate 5526 BLAKE2B e87163b1f2abde9c6ad5002c37b21308a98a879dc7af14059839be7b5a019d2487ef03867f3f5cd436b7081cb78a930abce79b5cce23eb95cc60e05067e1b1df SHA512 18e0f248a1e9780706e3a184d63558f03f30002646abc6d46ef49db9d5f6768af3d24d210b688aa4ad33d41248429e4df46bc3926f27851f90c92d260e5c4baa
 DIST byteorder-1.4.3.crate 22512 BLAKE2B d39c546ba7346df315297fc53da4bfc77ecb1f38567ddb788549ee31cae2719a8bc0b7d1f1705abb3cff033aa57af004987d90748f5a31765273b3223a011c0d SHA512 8c8000eb8ecf40351c9ce36a3a8acd7a02f81786d1b11aab85adfeffa0f2267ed74df29b2ca5d1d38128484d1d3cad2b673aa0d0441dcd0620dfd3934bb888fa
 DIST bytes-0.5.6.crate 46291 BLAKE2B 6d33ab47d04f2e469db2add31db118f95cad53002be7969738923d62a4fe3605ccbe9fbcae6d8741310c543625e80d9adac7d9e9fed01b71cb3943ddd015d920 SHA512 a1caa1f58754f4d2e54b8df8d0ca0083ee5282f5e4d3bb5b1735022933dd2e66fb3f39c7a82216bf7a7e29591695c2e10c8b7144c83ac598e34193f2425a32cc
@@ -21,16 +26,22 @@ DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b
 DIST chrono-0.4.19.crate 155663 BLAKE2B c92c273fb6475bbb2546dfb75eaa23321bc8f9a5fa8a7c652f527649b96ff8718fa932f52b500b02a4acae7837df5bdb14f69cb821d4962be2790dbd1d023a54 SHA512 a119349bfc2243a249f1d18b1ae548a04b30fecb75913a56f26d1ff8c0eb53097a2674d9141e2094018191cbbc1620843fbddaf52999824e077c1157f0907980
 DIST clap-2.33.3.crate 201925 BLAKE2B bec9c866481c5b3fddeb314f68af9bce38fc421e42816182de3209e8ea3447b72cf033e6251eea27fe974eff8085b7d98cdd2911b5cc0ec6b4bf4c750deb8a25 SHA512 3eb0fd648e2e3f9e5ff69a5e6cf0d867304fe18523accd036f28a86de368e4774088a6936c108ccc045092c539fe7f7494ea96420ebf6b4bec16880cea84bedf
 DIST cpufeatures-0.1.1.crate 9863 BLAKE2B ce6ae66f4f855403cdffd92a0ffc3b831e9a53e61471e92ea34dd2feb02d6a9eeee547f0001fefdbe7486df724d36a565fb7c1118f1178a4a041fcfcc4973114 SHA512 6b4e0ef00673cf5af54cb1bb576e51447882d162ccfb3d62d0a6560c4759f36611db2aa52e8bd66f85c5cfdbb7e85ad75ecb52ff166bfb10741823a517da51f7
+DIST cpufeatures-0.1.5.crate 10419 BLAKE2B 77e0eb2c8b1b638b9812ebb3a1ac5c48b9c2f7690fa9ef7a9c14a49a880958c2a39afc00e981115078bec98725e4f76eb338465935017958caf5922f3f124933 SHA512 700c31a677867df05c69ab098575c66d4d9f2de077431f938c1e0036492e00e876e6c563b705e22cc82c937fa01049b42d577c9b4c84ede4fee774ac30362478
 DIST ctor-0.1.20.crate 9328 BLAKE2B bc2f4ce53f6b7d6a2fb441317a3f91b8852c541261f95f0b7d12adb35ec1c943810242ce71e514445479c5d225b735cd50fa4dfb514e6b121be753555ab3c30c SHA512 877f4663f8079a368d198a3351e98551c6d8123dd5e53b812529b77b09f1c08296e6df817d7429e4c70a73a6203fd98bce5ec2ce7b09baabe4f348bd54a9c0dd
 DIST difference-2.0.0.crate 147616 BLAKE2B d720202ba8d73fb9b3cc6a982208e4fbe22eda4b3e296f4238a7b2d8ed0339827ca5a3d93a983396901614a9eabe36a0baf55ecc5f55075ebf7fa1e4c0699eb2 SHA512 cc9956757770ecf237d8f46abef25ce219193c877be6cf83163e87c494956cca3202951ac01bba0728e7202fcde2261009c1b4599f389cf979858f25936a5482
+DIST difflib-0.4.0.crate 7638 BLAKE2B 57c703de0d467c997bcbedc4d6577569b3d72c612d3ccd929025a98f4bf8f72f2a0d43f3cd3bc616676c2569aed176b3c1362cfa868a4bb1197e05fe4dbce32f SHA512 fcb57859424fea6958a4407061c421599fbca111357b1fe72faa65d8fb0b74425c993a24484e8414f475fa146cd8368c4f82e1ceb4e8dd9f95741149345b37a9
 DIST digest-0.8.1.crate 9449 BLAKE2B a610eb0144fdd49dbd846a86e88781b69ccb6a4f918b09fb4562ee9e3d535d12a1e499e36e5eb894d1d81f7a06ca00296b3aa35063f434fdcf22ff202890650c SHA512 186c3ddc01fefff6a134ea0be633a9fe8067b8db34f31e9991069e7a9b82ed595a1105283a87e3021af2337ad332faf1b85a6bb513a4482df7d24e3e7a5ba055
 DIST digest-0.9.0.crate 13247 BLAKE2B c5f2fa8a5bc12021d99ea63f08fa8c8b5b3353d90cf9d58ba84252b3f81b88b52f28c15c24c61fcee44f7d547a0bad11def7fa8f4616d070db163e48f89ab64b SHA512 8637a322c429f51ecb0fa4c3b58fabef01368c1a093492fad65f48eeeec2366fd1b7876e6e47723e089ec5ce11f881bfe4dcebdc605811252b797db027746a45
+DIST doc-comment-0.3.3.crate 4123 BLAKE2B a82d1c1a7a90af6e111b5e684a1298d7eac5fd8e4bf7d5baf6c7403d26b609958716d57e51122fe7ad7626fe00a2d824dcfef3cc2fd7679fdb7b5099603de1cd SHA512 e98ff9646a3612bd41bb6f278e7b6e9a0c58747f8b82524da814cf51b7f06c76ad4d65b502ac5740e818744abb295f78f15f8262d0b50ced1523f6d1a26939ba
 DIST dtoa-0.4.8.crate 16175 BLAKE2B 5fff15e66c2edeb9eb9da89c66389b3a9bbb891d75afc3bb7da4dcbe9cad9e50af318cc8cc01cc7e56730763e8ea8ceb33b9447d1a7fa52a8d0f0d2060a97522 SHA512 fe1701ba2c40988b92f5f4ef78a8c81718b140ff8ca2d04023b09a89440e6ddb53ef36d1ebd9dd3e948428b361ed6611bd24ec1a31b5010c220c555e1f0bf6b8
 DIST either-1.6.1.crate 13641 BLAKE2B e5f40c40a5edb6dcb07a10bf79183cbe42438f1f70f3932dce72f6f6e91f75f24d17d82bc447507def4dad4345ffc9dd9162dde778afb253bdb1218e91887949 SHA512 4bfe56920e30cbc8eb4f90162db618f7dca653b42db35ab6a7045d3fd9a24ceb1778b1f79613850bdb1a87ad3794fa0d73015e46c48d513f368d8c3776fc9ddf
 DIST elasticlunr-rs-2.3.11.crate 93003 BLAKE2B 1630d8a01e2f1717df9f8350068ca0268cdf66354346ac33dc24cf053ebefce6c71229db4c09e8dbfbfd6aa949200305581d0ce071066facc28a19242cd07682 SHA512 5179f247621e63cff039ff9f68de68659eb5a9e53d3815edea102973e0cce8e936183d843aeadb72fc069c2959d7fdfe7f5acfc6aad53858208dce68a715eabc
+DIST elasticlunr-rs-2.3.13.crate 93039 BLAKE2B e414342dd7a0b69022d57a853ef523cb5d480f7c2f284ad955b2e217f44432e7271c8642fd3a1500f63122e0c399337cc82fa7b0e241669ea3d8a194b923567a SHA512 5a4bf14fea7bbe55d33f2cf69cd989b93169b57ef317badc48815381eaf2534e2a02ca0a0ca7ccc16f9df3cfbcca729ddb879050ae2788a68904895b540a34ad
 DIST env_logger-0.7.1.crate 32281 BLAKE2B 6f1894c64f301ca4b687270c911dbe230f674662aa0561b97c4d2537886e404664b5773d4e223e2018047c222a951232c3cb52ec5bddbfb6665e34c3e7ea52f5 SHA512 604060d2ee83ab337a2d20d6784d1b7541534d2fd9e1662fc5c709fa681672a9db5e34d00face864b56ae321962e644ebe29fbb6d68a0d556419cf5d71c6149f
 DIST fake-simd-0.1.2.crate 5398 BLAKE2B 40437b18ca7b77258577f518232dcf67e2bf09b64234dc3f02b9eba0c5c1fede8f8d1dc7cbc112ce80e4f0bf317387d1b8046d41a4f83a7c54981fd2b71fc8e2 SHA512 d57242c54ea3283185eaecbf8d96a4c9decbada3ae3aceb516a79710be9bf038a6e06a29b9ba4ebcd41b8f42943a3024a983ea23e36b17edc445a8c4980f2893
 DIST filetime-0.2.14.crate 14358 BLAKE2B 7d50e71b5a556bc24a6bcf737ec07f185c6d6a2ba2717d91aaba71ec15d1981c47dd6010e5a4278f8996e05bd49d04f3481f0b9e3156a8ad1da1cf39a84796d6 SHA512 f2e6e41b8b705c510e1f1932451ab8a0acc6a4f84a7a21880c7e69639a6aace7c5ed4f694ebf47d04ae6ff227f8d6c6733f2c4bcb953088531dd91b37262e45b
+DIST filetime-0.2.15.crate 14511 BLAKE2B 6659bfbe4c15c639deae9734ead88b31c118e7335dccead7deef103a795521e42de2903a7fa08cf802049e9df9cecee8d619c3db3d507a7f8f9f5bd706584090 SHA512 34d320a9aa71059d0303c62936aa94b30a873ba4b0b3b78851fe636d132422a662f79596d79edc33e778e07b0a1259693b59d7035ea390aefa4849f1af459f64
+DIST float-cmp-0.9.0.crate 10102 BLAKE2B 46bce5f7e838a947bbbdd22b085435e795b67fd23479780f65bf1586a70e7a35f04f9af086be98bff24e2583eeac7c9688727a2ddbd1ce978526dc01abf67dfd SHA512 f8dad12ecf8a278769054fd78794999dae8dedbcfde5e77bdf6cea12fdeaadeeb2f1f3ca62df9aadc1bc3f61457236c4854d6d6923ad6d03ae7f23af600572e8
 DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
 DIST form_urlencoded-1.0.1.crate 8773 BLAKE2B e2d2224dbd85d053343aea29ef1bd540fb8be12fd600289e9c048e3b74bfb009d0770f8296556309ef756086f22feec4713dfed1006e1101075c8897be5471cc SHA512 3ab371c223561a27ffbd35cf648ef4a9145d47bba9d71900a7c54cfc2f089175e9361f6352331a9a7fa018923b15e7a3553c8f9ff9fae80e1626e641a5faff68
 DIST fsevent-0.4.0.crate 7292 BLAKE2B e55fa22bca32165c17ab1cf623311de85d1c1cd78f89fcc016babfa3557658352c17e1fd9a2fa64c753b0073a96361461662c4583f780cd7195ffcaa254da0ce SHA512 98d5e6998e3ae0cf3e0f383aa1e8f7fadd9b75154753168da4f6b87cc9a37b8830e7bed4b2169993ddf49646c9d47aa022d6af8a8a66370e7fc533932e70855f
@@ -39,34 +50,50 @@ DIST fuchsia-zircon-0.3.3.crate 22565 BLAKE2B a4dac3457036efab8f79fe5d5b4545e409
 DIST fuchsia-zircon-sys-0.3.3.crate 7191 BLAKE2B 530bb5d475ac828843af248c6bbd24ca3b5dd8118c8884ccc6d7261818cff1c79038077114ffa04bc73a078177527824c4d9d20a9b022e4057afee3330258cff SHA512 978b7e8795a5877a68409ed3a1d7b4246263f8e7e7ce9ba8a022643be98f58f329cc1c234717df80a509db849da4394f39e90a8e2a6f56f8fa8dd3c07e7d4386
 DIST futf-0.1.4.crate 11341 BLAKE2B 804cdb89803ecba0371ba045d3af3f4c4cf219e31f0cfff3ab96720ef39cbde14418ae8031601c211b279682781b1d3e6d2ce31c2d212d21afda7fc1da64d8cd SHA512 4cd5ecbb8c180c9b390a6884edf65bfc3aff53ffe7b930cf2b432ff9c46a8c5a06001f3f412f99c41a60def52207e709ffa07a4b432ada488e77067fb5e1b3bf
 DIST futures-0.3.14.crate 45557 BLAKE2B f58e82dcdd7a238427a394aa05d98104fac3bf498f73475f2ec6c5af021672f41dab71819551b2ae4b2a472764e96ad020bbc2e9217a887bc41b08da247d0859 SHA512 a5a93ec0bfc62409299816022e93850bf110ff8038b2d09bc0ed533fd7057e002b32b0aa141852d961e218190d1e1a0dc7d483d75882203966a0b89469932e2c
+DIST futures-0.3.16.crate 46410 BLAKE2B 30fab6c72c09c030ebfa8d4deaf35cf5d5efc2b14a8cc7c3eea83109e1588f6042daab3ddf2e660daa643d26cd227229e2f3d780e24b7686dde1ca04e24c7d08 SHA512 57a58ede8599cc61fcbe555c84df312aa890ea993ba956759ec8effb71982fad668f024c536dbd20856388d6ceb93841de6c063e5321affcd41e96fddf7a9a0a
 DIST futures-channel-0.3.14.crate 31260 BLAKE2B 86809f71b17c5b285ca7c05b02f5d864afd3eac865472d08b45e71cff54574dddf9f0069f4db2bb9589e4ea32377787695d8b03c7a2906fb4c36478d1be5fe28 SHA512 0f88863d9d2cdb58426cdf1898c050ccf08f6086963308518725e3b778eea87ed632c776e450c0e890c872d6e67ad9680554d4d1c7433200986877e593eae642
+DIST futures-channel-0.3.16.crate 31765 BLAKE2B eaef9d4daa760dde5811355230659ee5ec1e8ad784fd935667664cb3db65bed30c4e342bbb4ec4687ed2ab299c7e733d30c017055b18e307296dc8e7797cbc5c SHA512 84baf9a5b74693448ba3cdc402957d0882da6ad0becd3588fb61107d0ed9912a6ddfe599ecc4751713c81f4c962cfa283f0b3bf6472ca17383ab7c5ea5821e65
 DIST futures-core-0.3.14.crate 13831 BLAKE2B 0380b7ce85ad227715db962af37b7427de60ea5a033637fda5d9a389a9e92dd21346182490bedb02b438c3521a19e25aa1ad1c45f5035cd90f0ce662dec30bae SHA512 7cc7c7073a7a5bfe4295073e63a7dff82f32f43df3a0fcf6e7c0905a1272a50a19a8bceb32755590e456c8cd1b296574a2c48d02b8fd3622aaad305ac4520d75
+DIST futures-core-0.3.16.crate 14486 BLAKE2B eb6afd63cea682e3b3252e956a213d9a6a7135ee3631eb10482af03e3bd717e1c69b49c6956aa3390cb4c9961a50b33cf7e7a356e6a511d98de9893d93f2f9c3 SHA512 cc3aa3794a0fc6005c88134943552dd426dcdbe0d117a2ab3269fc6b5b7ae637e0441c28f5b25bc544585c8830ceebde252241a0502fe832f64476c4b4774bb4
 DIST futures-io-0.3.14.crate 9056 BLAKE2B eec9cfdfafeb2794959cb3a94f5c8b463ef31a55d68e6a762e82125a90cc61233e9e9219e355c5bd7354e7c133669811e40fc5e8902ab9651d0b88e1845eed10 SHA512 7533e75d82864709299a29df3a2770aa9b14cdff91c6a2b6a3f98e577866afbc20f329ae71e748320553fc1cb7754027c6e11ac7bf28913e9fe8b26dab59c01f
+DIST futures-io-0.3.16.crate 9050 BLAKE2B 60bcaca9e006adbc0d97af5cd9a5a7c3b50a94f017a130c21d7132f7f121e1e74f5ab538362afaffe44d4ad1bdb67f89dc8c7fa28ea69ee30dde84019ebe4c70 SHA512 cb9edb5224741f249f1936b3444e6bfd4ea4eee1d3964971d242ae1f80bb191067b1e3f0b36045e3234ea7f35738037c863fec204b952a40f84c5f46026c9ac9
 DIST futures-macro-0.3.14.crate 9681 BLAKE2B 35f8870fd86d33c0713535de85545726b7b22fa019f363d4b688a24367de1c87899b10207e8df73f2dbb4249b4d274095901f2632cc558621ae793977a369e7b SHA512 07e50e955f4b666d2457ebfd15503f359b7b9605d4736e6be939a02b30754be4f8761201780d8cb7929429a293d013f7a853ac1d9be4b7ea2060dccabebde489
+DIST futures-macro-0.3.16.crate 10779 BLAKE2B 94d23ff28c5211f27faf1e9f3444b00a226dd1b43594edc8016dbe425b07ba59d335c1fb93ddce63d1ca1ca2c9ccdf3a56dfd6d8088391d62fadc71fd2cbea97 SHA512 ca36a9499937d0afcfaa9fe9f3e29fbed1ae8fb83e7e6cd267c67fdc3c723098788aa25a941ba8571fb9a5f9e40431a1024c647cd719ca57b847659b926cc515
 DIST futures-sink-0.3.14.crate 7658 BLAKE2B 7d560ff741ae650497137f4b23720bb32f7f7ee57346e124a0fb69f742f4cb622728be35ac917870dca52e8ed44c808d522f0a9e42235c10f400cb7e5676b6f0 SHA512 839f1a4fd62e4552673f2e35c4abee5d84ce99acd4f27cf4845662fe951a255ea5617de2b2c2c8882fea416407ac6b3b826b23a46e4f4dbbab4e98cf8587b425
+DIST futures-sink-0.3.16.crate 7663 BLAKE2B 355c7372524be71fbd6405f5bbd173765eb191008c725deb790f183eedae194a8b5c09c512a8e4641a903c409c2a903fc6a2095372ee52dc15f9e10527abeb98 SHA512 32d42751026ea88aa169c0e8f69b80aaa4ad582d852492f7056da35859ec3299d4ff57f508a5fa2da18c5931e97c924d88ec72341cdb342ff79f50f7dba1f87a
 DIST futures-task-0.3.14.crate 11115 BLAKE2B 6d68f897fb4ad7f80ee4bfa851da15516da20177c1ccdb610121bccadc6c587ef9869c01d266275bbba4742fb400be23be00db68565a5091660b5d987c76e3a9 SHA512 32e55a5651e23733e2b60872de25d307d201fb9990c1418edc955ba2c93a083a52584a16ab951c28560069ba4da588f5b070b670c7244fab0074e28459a49da3
+DIST futures-task-0.3.16.crate 11712 BLAKE2B 88c095b45590e6b4d645413fdfb82b3be178fbfb44c6e36c31a6e78f97cf4a7f53d896ae57b0e34da4195678a49c68a684b3af2f3182435352884a7562d30426 SHA512 7c95d177e9cca05ca8982886957010c4defa9c5dcd3b425738b68f750515277e27fd331148168e866d55da4b2389aeb8f0a7af0174553914c55095654666b6ec
 DIST futures-util-0.3.14.crate 140139 BLAKE2B 8d22ad08d86e8ae11f4bc9ee53a458c126b9bb75f43960f66a5004a8bd4e6dce351e2123cf80972c2ff67803ce40147e8c955e84f27c31f56fd89bfb79831355 SHA512 b1ba5bf402be6fefefe2fdd54df7eb802fcf11470ab6cde987ea01c9ea0fa7da61a5a4cff79e3a7f58db3f1c8b98df39345eeae8d9455e337878f8f6f395f341
+DIST futures-util-0.3.16.crate 144642 BLAKE2B 0ce9ebcd85868d6e64622ab498962d8450f7fdb3d15357b77d94409640f6d09803f4ddf6423a118a87231799f0dd495f59ec431e4bd3e823f0decb035f5b43f4 SHA512 21815551e0e22d9fdfbb7ad36daeb3b01bd01c58e85091d0fe08a677141338f68f8754012c9e7b78e031e3baa345927fd05851f20de29fe6155e532bebb19b26
 DIST generic-array-0.12.4.crate 18212 BLAKE2B 6e7d77c884ea5a2a8a2d34d7d714730709bdf52f0ebbdb232a1ec8403de4b4f431eafedfc3c2d7ea1f8a28a84660fd34b71b09117dee4bb86052912143142734 SHA512 f92002b549aa9db2a80f65c50357c1f0f490a63e104fae7a271e0b16d6c43ec9146cb7f371f00eb1575a1bfc713ded3beb51f9e96ede93f2ce66ebf78ec85cb8
 DIST generic-array-0.14.4.crate 28916 BLAKE2B 41adcb738bb316d17967e029a829dcf7377427977309b010c2f2e365f16306b44991eb5f65698782497f614b129b14cad11bfeba2ae19b45efd117114492517e SHA512 34ac71fee2cd50ff786d39b4abacd9e090a8598baf4dc36ba5fecfb7171cd8e4f58e5360cbb0baf02a87eea26b7dca85b35555b82bbefe06635d2fd38f7b8b40
 DIST getopts-0.2.21.crate 18457 BLAKE2B 10651e947e49acc768d99ae56ca5a7f37c1f61bbd1674e2ca58e3ae563fd64f3563d53ccdd0ae7a878710a39e13a99ac8c274974157db2c691f8c222de14992d SHA512 5515ae6ccb0f03efb783683f46cfd1755342c4e83bb673ff8914c7f9dea0dae333f8d9703865e992659a359067df0e8b0e2253de0d4b0c7707cbe7d73401bb1f
 DIST getrandom-0.1.16.crate 25077 BLAKE2B 0cbe96c27e78100c181a064e5fe524efa9a7a267fe60f8336d2ae0125883acd5d575ff17d1d56607255d9b2c30cb9d962026fdea1a5c3c29a5e0760d27c3136a SHA512 c5450c522c07c7a38b326f9a9062bac7d089630219d577ea4b55abad4e0c31d17b7cde385fc43912dfa100b42334e7a52422c55fda8b738caae428c6f9addb53
 DIST getrandom-0.2.2.crate 26010 BLAKE2B f2df79db0fff4a4e57bb5c748932dd7a8d24f7072f9a81fa92159ea79de29a70e7b834af6ffc5178e898af456188f16476043e9be4dd25c6e7edde06d93cbb8a SHA512 f498fe00c9887748a0be88fbd698a6087ccb79874cfeb35a18f90994603be29cb2aacfbc65fb8ba967190ccbc41ff9ff56bfff1de40811e1bc99a08b0568f59b
+DIST getrandom-0.2.3.crate 26261 BLAKE2B 3e52a87b9355f850e07e5080c20e1ab3acfa927bae28c63bb8bfd6a773ad77be96d3ba770c344631cc0f2d9a95aac920790173168b102e25f50480ee96663569 SHA512 e6da64ed529cb0fc000b613f75187ed6b20f716e721d8a02ac2ae39c507fb9f6189ebb66b522d28584eff1e7e9efc274cad6bfe43f464f58053701e1d51c603d
 DIST gitignore-1.0.7.crate 12148 BLAKE2B 730b52920af24a58199c8350e59154b5e71796bc44c54fbff918316dc731712bdc6045730bf9e4060f17a1e589166d17fbeb6715c51bf459b83345ab1383bdf7 SHA512 17b421257ed83cc3fd0a855b5573bd24fdeec13549280bd24b194657f579ce4494d9068aa17f09b1734467aa381289ef465142d349cc5005c7ae44eca917e0a8
 DIST glob-0.3.0.crate 18724 BLAKE2B 1f1dd380e7d668a0c2cff9134279ebda958b4bccdd4a65ff01f9665b45ec4cce8ffbd47eb46e52cf516c5fd5803561e6bcb60cdee21ddfbb8601a95d45500620 SHA512 87098ffdbc518442995c422120cef71f83069c8f88a1970ecec5105b0f284ddd92bcee929f5c230d5b90ae1ead7e1214c3eea26f4a8b26715a00c1ab8b09bc46
 DIST h2-0.2.7.crate 156989 BLAKE2B 2f75a2f82391c994299e01fae5958dc7e21b78e38b8ade83a0c90698f54d232e6f0068bed88b98314e702bff773e8753c600ecf6b638b5bc1c7e692ef636d289 SHA512 6157bcd335d303246478f45b8740dca687f693dbbb462a0ea9560af12d1fe12a9c680c57c1e7ea0b0842137ee66cde827f273e0faa619db3b6180c5587bd0fc9
 DIST h2-0.3.3.crate 158845 BLAKE2B 4c9d0f9ebc34a3aeafd7492876b90f43e49adee4f99d031de53245e87f8fb0b2cdbf1aa98db5beb27bb8e852218241f8fd2f8a50631e68839c2fbd98a9aebf97 SHA512 7f7ac1d513b6c6068700b41c19cdf74a57ddb6090b5457ed247df93f0a4bb877fc44f9081c962692adb4731c82e0802a0d2151d69c59cc5af754102e83613a42
+DIST h2-0.3.4.crate 159228 BLAKE2B 50ca89c8caaf9952d1059175cf28a5050d334bc95b952e9cf5404556ea153e302881682699505c068bd4905c352fa61df0ae464f09605c8db7d86388a7f93144 SHA512 070def34be02d7c3eb3324c8a1d86fe51afb0dc6506825a972cf1df3311f184a46f20701a76e78b3a105de56a09dc5b3c098b743ae7f9f0d3b2f927d83bd536c
 DIST handlebars-3.5.5.crate 77308 BLAKE2B ad3fe42425ea8b668402bd20be4647659df7d23cd14f1d1a2973b4286b9fe9add88b0c2de5fff31e091f555f52f5402126a4b3d727a1dbbc2bd3b65eb84f5a10 SHA512 51d4802ae707cb53bfe34f2aa8fba614eb44c127bd9a3fd85d997e248f5b2c7f1e7e1a394ec0ac2458c76501bd56e15ddfd6e31abdf0122d247e2c56bbc21f2a
 DIST handlebars-4.0.0.crate 86593 BLAKE2B 723173f316575bf16d7a708b0fa564b812f426038ded83aa9d95cfd39fb702a002cf01036c7b09ba1353e3ae277b43d56e0092c1f4fc78b839fcc46f357170cc SHA512 761db58248ecb7ee797e4f8c216e35584406bc9fc7036e034f9a0050d20d2e6781eea0535c35ee77ba2c94703aac6ce5f618a0f8e3928bc58c816555c6d3cca1
+DIST handlebars-4.1.2.crate 89046 BLAKE2B 0b3442309632a3826ddfdbe0b6c51a15d4018883cff7f18e3c79e613fe26c7a8dddf80f378f331e71ef32304c77f69b234f5da00ea621bed76780e0a49ca82f6 SHA512 02f93829d5e6844115aa464aa41986fcaa376b7b0ca539fb5dabdc48b979143a7706011a505f2da3ba1866f02ed3d86df272e47675d054952e9d28410ab2d7c2
+DIST hashbrown-0.11.2.crate 85713 BLAKE2B 402f9f1bdcb92631206f9b72923ee35e28db8623e87469c0f1496664bc7185077013ab3c8aea68268241e5b2504f10cddc613a350abd4291050deda6c112e559 SHA512 c21ca68fd49bbb741901f59fed04cc124b8da99e2a4dfc26e2e5e1140637872b344612a01691bd30cc771575c571be15f756c84dde225441699cd2322af2ad6c
 DIST hashbrown-0.9.1.crate 77734 BLAKE2B d59002253112cf92173c3c1b305fd03fb7318ef187d7e033433baf6a354db046d1f3fe0387b3cf500fbcc0f83d2b2076527ba7cda2695f7627eca0bc3e3487c1 SHA512 dfa4742111f6fe757b7fa97f04c7b4a78ce9708c87e8e09ecf3c28f2566e48af9885fda380ed918cec37b5c696110fbdd30273aba6e7d2221c9e65f72af064fd
 DIST headers-0.3.4.crate 67384 BLAKE2B 4e5b2767fe120911b15f72605f4be957cb0ad7d2d87bb521f9c960fd0fbf56f7d761a69516c708dc1c5c7c0f4d44f2086e43537d689a15f484bc17b04eac17e2 SHA512 b19f4058f2a69dc9bd3b20294962beb9e02d7fa82630740a7eff19720ebab2e8332f11b129d9932eec34a03070d6b807f72979060a4ef582860996a13b88dcc0
 DIST headers-core-0.2.0.crate 2380 BLAKE2B b9edc2634ef43c53372038a67713785656bf5c030ae285bce287b7b130abc04bf56e66fcc2c67e3eda162d64b008c9a45a1f7be990d248da3ec1c18b361f33bc SHA512 1d502e6a3b2ad70a0d1e410c55864ddbf4118ea073ff7697e6b763cd18748d91f074b36451c015e3bbadad4400d099f4a2e350c609f44daee4ad40398633a8fd
 DIST heck-0.3.2.crate 54718 BLAKE2B 6514f604361932e0a8e1a86786d3ec7218d95f8b3b3bcfc9e21c5fddc58ebe28bc0781e2ad24de4dd4296da85e97c742d8473370c99a593e7e5fc7df00fc9b4c SHA512 cbc72c3473ab14fe445491b1d9586d50de9a462af344638b871f7309fa805069a1405bcb1e0859b561f48583fc71045f38d03b92332d35131c67e140ccd241ad
+DIST heck-0.3.3.crate 10260 BLAKE2B dc756738081d855583f239908f671e9b5dde72ebfb577f6387b1a169817a03332464cf67071708a4c4f06b1ecb222118e8c719073ccdec1c0f938e5ef378b13f SHA512 b3498e033f44e03206421e565efec5b21d13107b60d35e4476331c44e6effd75c81f7678f2452c822eefd581209a2ffefd2034779cca2d8b4fac4583bbbf777f
 DIST hermit-abi-0.1.18.crate 9936 BLAKE2B a5a1d1c9bdf83fdca8edc392f8fa7d9b9b248ac8d716e009300220befa5d8d80601643e768037be89bbbe6e21adbe6349c94c595cee3837c4b92b5f98ba838ad SHA512 54f060c6c1c80d41f40cec7102345147efb535aff9fa5cc0ed4ccd7f010bfdb6daaf40626fd5069af60ceb42058452803b59d4bbcfbed4c5546c79b57ae0f914
+DIST hermit-abi-0.1.19.crate 9979 BLAKE2B 801e8052b85341cca388ada9db4b06bb1bd7b64474185b2ad06c0256b9e597639bd3dd4ba0053ea010f922e53969a4ab47b90d451fd9b94c8f2324055d151ea1 SHA512 1c877fcd562b15d2de9c151fd6c5f3ea4bf48abcb799e6139a180ffad5d64b632f0000d5707bbd92ff23a0e5f349157b9e0f5be8b50f03680b0fa47315dbb78a
 DIST html5ever-0.25.1.crate 73165 BLAKE2B 70bee0c77337b2fee3fedda6fc475969b5e9a20342bf6890819fa9a69be8cac66e0dfc0a608f5cd6ba789a780f403ee736dbde1af52cb800a599b0113801dc99 SHA512 2b946224a0c5859436a57a507a89601adeffc12092376fe47429c5c5a61bd1d00b3271f0be7dea82ba1dce93a1cb820f72df8ba4c90fd13bd1ec408cff6ca660
 DIST http-0.2.4.crate 105489 BLAKE2B 07acee6b91b6a316f3277ad324df6da1d2ac804a409983384d2fc027ab63ed05390278b21867c0096730c91a00b8f8971ab6a66d17b9764f119d245592a1cfb6 SHA512 0b5c609c12ae4020801a184dd6c751919bfd4db985844c55b53368afbe2b9f641cf9aa523ae49a0b25a251cd8f19ed634fa28990d4582cf7a27f10c4304eb465
 DIST http-body-0.3.1.crate 5394 BLAKE2B 9dd7a35cd22d22060762e17f028e9353fd66fcdc81c0fcb2f0361dc7ac86bab18b89ba774f28e2e2b451aebd01a31b01029587a3d119c5a30ff176c203482367 SHA512 0c81b2d8512be3f07d5b08534d2a27424fd6abdf175e9bad9a657b9d95a48e2916c8713bea8de3154520c7ebd097324de246a1d2ca6595f2355e1c93fd9fe6ee
 DIST http-body-0.4.2.crate 7603 BLAKE2B cb3739c4207e678dace73889a621d56ce85cb87c32df8174112bd3812e1d804454694679a38c268d13bfe49de4f364ffca3c279317beeb26e89949c86b335b58 SHA512 69bd0a9324626953d2114ef4dddb69da8bb9f90236529e6d40cde0ed92c210f6b6849fe4558fcae50a578dff74e70c57fe8853bac4980101404fffc0b0cfb6fe
+DIST http-body-0.4.3.crate 7660 BLAKE2B ef56f26e844f1f234a5fd96f29aed91897617ce126e6f143ee29fda2183858b3439570ee980469fd092ae8d7fab00ce7d4300e0f2506a9348876df766d80ed50 SHA512 2d72e11cbb072dde536c5187f22d88dd9aca0768e7b0191003e463900d50ba73e01ec6dd8c98d348c0fc5651ec022b859daedb5194c71fd787af4f2dfb97650c
 DIST httparse-1.4.0.crate 25546 BLAKE2B 5ea52423fd2734f423643c37be2464d192644eddca5a072567cf3c439acf7f686be002d5d3c4969bace7c5a6a8f811270e3dfbce704433df255d41477abc0594 SHA512 378dfe2fa2600eb186cef45cbf3db1051750ac863a6c31edb421a59671b876fdc1668cba270b1625f5d4c4cc892a50c6bc00d86ab0375585d2d7f25c22baabc4
+DIST httparse-1.5.1.crate 26758 BLAKE2B c2f17a601b54032c1898b88feb836ec380465b5305e240d9466760aea85bc709ed873d1677714acba0d493d27fa5f5288931cb7d62f240e50e2d6b84d4e72046 SHA512 70eec6bec5927e272d7cbd09472a14b0f33d153498d5e1894c0853bfd35981c0d249a799c3f4acc01b8499c29519a49d81efb755bdbce124e55f73eb75cf8592
 DIST httpdate-0.3.2.crate 10768 BLAKE2B b435d0a530fcab46496a921a565c3ad8654cb39ea038bc942c8fefab8dee2576e9b157f203b376e80a10690650c1c899eaa29e5af75888c8998b07d5d049fa97 SHA512 5cb56c85aac5acc0e9e2c72fe0913d2faaaaeab10a15c0479407ab779494bd81f8e3fc9675f5990186a34689e841427e83723a87a91a5204ff57188e89be98ea
 DIST httpdate-1.0.1.crate 10293 BLAKE2B f25b69244fd82beeb0c9c8f4691d1d057df6f835883f6cde069a4eb28bdbd7808b5f02c8a48b88ca4f60e14c2e0dcc84f4cadd733edea2f8f3d061bb485fff1a SHA512 1a63f11759e331e5938697d181c7f021e953e3616741116437253eaf6da862b6cdb08a0fef5808042d8367de9fac31b63ebcc917cfb81b0244b4d238f95538ab
 DIST humantime-1.3.0.crate 17020 BLAKE2B 37efaacedac293197ff7acc8b0446a73243a2d90ed8dbdcecd9cb0af6e901f135e1d92aa1a642460f531a6811a5f08075f8aabaa9941e96eddef301e205fdbe1 SHA512 2589bfdac96108951882b7ee497528b9084ddd344a67914810ea9961a1e319167d5cab959c66cbb26e398e75ca50d488a251694fff35f3c2f69a88b6f22844da
@@ -74,15 +101,19 @@ DIST hyper-0.13.10.crate 141981 BLAKE2B 8cc13ed7579957040f19a81aa2540d4b9d453737
 DIST hyper-0.14.11.crate 169467 BLAKE2B d4640bf1619711c15c155777a84cad1c5d9220d6d029ec808d953f46ec409b14664e8a5ffb489250874790ee512c4a30d1c298d974d9da83c40a88690c6dfeeb SHA512 c04875f2e3c1732ed29c4f73de24fc197486d157325fa8304aa29e6948984a01d91ae7e9455f56337d3cff2c270694cdec0dad950f1b4bc3f8b3c7964fc079af
 DIST idna-0.2.3.crate 271023 BLAKE2B 157ece18825fd3f8055581ccbd14191a6923da4c806ce51b3d6376682878db000a1b873f744c8e9e1966e4c1f8393643bcb603deae299ed0bd87847b0bd2c591 SHA512 1278bd561ce329e1dc7a6f24a10f83d9a068af5d15a088414f3921c6728b0d54f4d60d6f4d0d5a786596ad226263e1e50c3842f192d5758aa4665ba4ed5c269f
 DIST indexmap-1.6.2.crate 50225 BLAKE2B 38f40c5aae0c5dc5da515e610007983b2d581994293f2eac747a3fd78c9cefb9faff64555e0c6dda146e9d1332d59f23c353c6758e63f99b6c4676123723ec67 SHA512 1509b6aa6b3b84fa15b98026052f6d5f0f1aedd065b02b24e31b799f8db68d5770e9a8302ef10e1ad16817256dbc03c55593928a48eddb252d25de7e0b7e6406
+DIST indexmap-1.7.0.crate 50363 BLAKE2B b45318ae2a6e1f008494db77a3159eea3fed4f77eb04ae65599be9392d6ef78d4677b65d04fefab8f917f6808fee821a33bcf53a50b88785fae5ef6848e3a08a SHA512 9b882b4a7068a686acaee0a08bd4f3b35b58d36e786358cf14a3436eb61339649e64f1757331cc7833a2fa364c76eb6b75cf0c732afaeb202113de1e66b72ab9
 DIST inotify-0.7.1.crate 24637 BLAKE2B 7089e15c76ab1585850cc17d1c7d5094f6c229d2009dd90648df78d08a5b82567ccfbc116547e4d78df5b4821f4d3fdd7b46b22e0d1b8cd1569cf22c4877b4da SHA512 e98e041efbfaa932f0eb2e21f1831776280ec3873ecba8815dc3af716a37ec19c863a909d9f10a49347e964eae0aba33290a892dc0f0e178f6ccc0a4fdcf2c6f
 DIST inotify-sys-0.1.5.crate 6965 BLAKE2B d70124656ce3e6f5ea3f430e8e7100d0691003161234b40542ca86c407ecaac1785f3eca98e9fd2914dababbc3f47a0855c99c9f19245d1f2cd5312739c802af SHA512 dae749f32c533b0c9f99963d97a77dcbfcacf173ec8fd7a02f275804f9925e867b4dfdf6be52c3c3c3de136d64e6e7d6b30a3bf804a01608cf974b0cc2e346da
 DIST input_buffer-0.3.1.crate 7812 BLAKE2B 4e607c9ef5220d82d11988f06877a14b264e032d01cfa996b4122fcbafd8270c39f841ff823e5f4b5d3133f957742fdfda1da27633e24d00caa67221f2ef961e SHA512 6d62e304e5747f496bd39a0689aa246b9bfb5832f2418af92c72f010f531817f6c8835415952aa9969b45ee468a880e66a9abaa9f6cd304b65fd09850b4af10d
 DIST input_buffer-0.4.0.crate 7771 BLAKE2B e23b89b67f70decf77b91d3a370d07f430d7119ba5fbfeabaa8f669ada225ea9c37a40e80457f112b3519369b7dae0f886bdb0e03314421486167c3d071343fb SHA512 85ac0716580a3d2121d35d9d2f721b282f3424ff78947c31ac203f4ea85cbcd9fd86efd3f41341551da15beb51171a5a8f8aa09ea081715236f23b5c5234cf2b
 DIST iovec-0.1.4.crate 8720 BLAKE2B aa1b4cd98ebe47901c0959cf1d8eb2586a803d0453e2a8bdd5c63442b32886dbcb37650aa218c748fd45c9fe3a7fdf20569eae5b19716487b139caae1526da4c SHA512 e23fcaac239807daea20ddcf2cdd4fb858ba1aa970ce6248f70f0fba5bff7ebdb27247c0997ac0ff2791178f86ff9657e473d8f64b86c644763e5b3474edd158
+DIST itertools-0.10.1.crate 116219 BLAKE2B 7d354daf7b069515ec7fe77ff2f4f07ecf870735d7ca166fd6b10ba89431cc27bf264c648efd2052206e8edd8f596485b913071453f37e5de47da44e935db79f SHA512 8626eee66aa598e16f5322a6fc55b17c622656f58635c990f5cbd8faeb4739690b0abb3efac4a9a3073752e9f2a51a0ba29401edb12e0f6bf9bddd8d1b394dbc
 DIST itoa-0.4.7.crate 12099 BLAKE2B 0e4ffbaad504565056f74c3ef560a87eff321a0da6d7a2c8fa35813c207713c22d77080c3b830fefbb21370dd29cfbc6a2807044485b38ac1e0c9c1de3ccebc5 SHA512 c61eb50aa00591af28698b45c528c36bd92088f7cd2f453cf686a1824f4656292638bebc468cf67f903473a5045f22777af623cc0515ef3bf25146b89a7c454f
+DIST itoa-0.4.8.crate 11926 BLAKE2B e5a648b490908d0ffa3a0832342ad11264eb4357939bb39aad014aed3938bb60e82703b7e31929a458525061e9bc40539d33753bdbd722a03b6804e57dd1f70c SHA512 6911d269ff3ed7350e4f0dcfc6e9e0d70e25833e1e7cfcc57d5b8aff1f47b8be4f2e9baf1b92e5517cff63492be489b6d29b48dd9bb642e428acaa431216b68e
 DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
 DIST lazycell-1.3.0.crate 12502 BLAKE2B dca2d3f46823a52dcf87b7d6103fc4f1f83bc5247ce361946ac2d9df239fb43ce4b418104503698dff0242480cd014996e77da4ae0a88f3cedbce4eb9d3c9ef8 SHA512 f9d627afc28b61e9687a3f72260eb013401fd64057647641ff2e763770d7380ab1d2d8cbb4a3c8818d53d504c618a3b46aaf701f72f4d7b25d226042824c2f8d
+DIST libc-0.2.100.crate 528168 BLAKE2B 6dc25b31bf98fe1d131dec95aa63d6a3def163ffc09cce41e85ae2432e8ebcaa02fdde5ec05a94fbd324fd87eae9042d76961c4fa2050f6fb7c2e443840468ad SHA512 a0382df08ec54c87db442e80899d28c7efafa2b137bc88bfec6a9f209d1d980e6f9f17caab03d5a89f24709bfe716dd4eeee1a4700ac76584b7b9596f65a2313
 DIST libc-0.2.94.crate 511713 BLAKE2B 6ad3fe9aa5ea5fb06a7b2beeb68fa245e5ed7d19aa7e4b21c9e2ab73da11a9249913e604f0f87fbcc82676cceee16f14403cd2f27ae462730e1682c539666283 SHA512 316717d2e46b57c200d67d0ebb4fb162cb1f0b688895b9eb6075924cda3be8ba7fae85319692682178b6fc5cb2764e8b3a9d3e7ce234fd8a21a0a9c453ca174c
 DIST log-0.4.14.crate 34582 BLAKE2B ddfba35947ae1f5905cd9ecb9eb862a78af6f00ee8b8fe6258b369b140928fe677a02b1b3ca5bdec36ff2b16abd85a9f49688fd5f3d1ba2b2905e7f96b8a84c1 SHA512 796100167663d85a7bc4244cd305e9b3f0a1b1520764b63464698eb136318d0928c40c16f5d19d9f602a5bf769851275bbd48d66b088b0c37be7a6fb62def7cc
 DIST mac-0.1.1.crate 4838 BLAKE2B c87e9f9283f179acd28c189d02d9d3de0ec99f9cfbefa590daa2880c275894951c5b0b935b652ab6c8c0172ac59e87f52fd49b787b230e6730365dc076d17578 SHA512 dbc6def04c482911ace311f34be79992fa04042c7ce36b71459b5af5c1c43e9fa66b6b40f63f8c3647daba287bf1c1be9b1a8031ead1d855f99a988898c96f1a
@@ -90,11 +121,14 @@ DIST maplit-1.0.2.crate 8871 BLAKE2B 3cf975d35de2d2fbd50227a6d2c5e72227e99197b62
 DIST markup5ever-0.10.1.crate 34668 BLAKE2B a13f39ba93a26a558a8f03ebbbaa98bf2c7caa4fd393be3e307acd5b59a6d91fa8fbf4deff234266cd55772d5047145cc80c5a215ff8eb5b2fddb88468ae4fb2 SHA512 447b0f44ea8b786688127aba1b6eed826dc0127658d293c22db74864381b5e7bc0584243dcc0ee19929d3e757521167c13a108155ed5c8e78375cb0fd3c6f7b7
 DIST markup5ever_rcdom-0.1.0.crate 25165 BLAKE2B 4123ee804991e9be31e6a4dbcb7dcce12bb776d22e4409ad388678a92965834acb9b1b2fa51e6472ee2c0db156e4a75e5b6db5f6b6d4220159ab93b056d0418c SHA512 7c21836fcdd45bfdef7305327255291c92d75d3329798d31abab26297de8c381e41b4419fb7ac631310835d590b63751a63bdd87e2697ea3dfdd6599033433c7
 DIST matches-0.1.8.crate 2216 BLAKE2B f18176110921b1cf6e58d52d12f1d1a3455ce2dc04421fbf1b392f66cdd81a88e924571fa27e307a06301d83b04f3b8a0ca3ae40d2da6f2decb8aac4e2801fbb SHA512 98b58f6a2694b03a7dd1be69ebf7e3ad14483fc8e4cb6e6c26a4937e4e660e843efb4dd04a7312dd9659ca02acd3775678f73b8faac44a76ffafaf873c22f590
+DIST matches-0.1.9.crate 2246 BLAKE2B de155202636c6a03ed68cdb21e8ef96e19b45be040a82943d2d7e5192c0ab5c253ab6d65f0b30b2689e21da79cba684af5be6e63c48266681aceba356f6eea41 SHA512 6a2809687d30ff04ea97bf9d1610d746e097699a4c3625ffd1b7b1e4a9673ece9d559058c9f760b99d6ab509024f7b338e7cfa6fe767499c983efa98bfb98305
 DIST mdbook-0.4.10.tar.gz 1483113 BLAKE2B 0295b4dd5e0ebc1f7347d9345e1cb001c7a12925855fa0a708e2fb40e285bacd7118014ebfd72905f450aa950d2b3e98573b94b53a03057d349d9b171e81ba47 SHA512 309b51b4765e8c5ff354d3da1e77f552662f97ca312e60ceba4aa10da3b2d51d0ee750811e65a5044dacb2fd3720c9f65ff6968fd242e16c16644247f40e2ee5
 DIST mdbook-0.4.11.tar.gz 1490029 BLAKE2B 0bf0207ea6ebc7516634e429f599111dd437111bc0a227e04cc4243ad413cbe1af7c64eac6466b634088f0b751d8c43e99f4dbb7217e853663c9a5692f9b30fe SHA512 cb145e8645594ac8bab59f4abe2d3fecd9437908e7c1ef9354ba82a8f20199ed55d962944038e6d4ec8003f4374e7ead5148aeaf3b42aab1dfe60e8e57956fc8
 DIST mdbook-0.4.12.tar.gz 1485183 BLAKE2B 8952b440014c6418696f9cce752f369e69b4d9401cf0de832496a3dcb8a13d2e5a2189a45e0764734dc7e0853fb98073c9251830b75d60924e4a122de9e1fd90 SHA512 e2e76fe303ca3abd76ac97aac7692178ae51744b2adb567d2cf3cb5009bfd807922e0e054b296746e57fabdae98835ebbfd838f6191fbfced138f9d73dc99de0
+DIST mdbook-0.4.13.tar.gz 1489803 BLAKE2B 524ed91405ee9968b396400898653a80316e71f474f510d803b417046c6c329b32fd94764807ecd6df9b39d7b8a5b0046ef030190a9498bcca7a5d491a0091ab SHA512 64ee7c17ff8de496230db70d7bc9110d28caf51cc335192a0c4d03ca8a09492928ef46c9df04d16836c6b3cd85da3bf60d806c47da12d86bc8f154421e9c53c0
 DIST mdbook-0.4.9.tar.gz 1482002 BLAKE2B 0597c8771fe3e27aab68ac60aec561ec1782347c409d11ced27b315b33c4a87526af36934f9be8dfb32667c745f95e3323a080b0770089171241c1f38b488bcf SHA512 b8df26893054f05b28e81353fe71bc3e0355db70a2b7f894a9c8a4c5b2f608e8eae5e0b3de285e1ddf2c34d53a8902fd4513a72f0f2b1c35d1f0a054ed231782
 DIST memchr-2.4.0.crate 63392 BLAKE2B a3f30546c3b58ff4eba534bd7046446e96ad793718edfd3379bd125c47eb270728c4aed4aed1c6afa27032f74078b2b2ddddd5cc6044e117e2b956bb13f902a6 SHA512 b142e308a5aef8e45910411789031e194349ee540c4ced0e2384d864dc1913299fb63a161ceb5228256e97d0949661b7f83a169ef9d4b78afbd9004cb7b8a2fb
+DIST memchr-2.4.1.crate 64977 BLAKE2B 31479718c118093b684bed946eae0706d77d9d275bd49f5aeff4de490f479abd60c7dc462150eafffc6d6fc1da0853123b78be038826b775d2a41a4c39d93ab5 SHA512 d8912e3902a2126f86159bdc998532a2890b882cbb7d59b5a470fffcad4c32281e045f2fff48a235aa4189f1928866bf3d33b699d50866ad6b6c272bba7adb11
 DIST mime-0.3.16.crate 15206 BLAKE2B 9a599ca82fd0dd6d3d2dea68a47b8441b1024d016ee1fb23cc6431b39ead20c9b3fe1ff3397af79c2c1b2cd277c440d4fff69f6b28c550ddbe15f680923c834b SHA512 cb1d691610cb82720e553247336fc5eab63407ad37febf2eb50aaa4e329cca70959ecd8bb8c7af5753acec2c8e86fc9a0f8ad9ad2de93fe9295ce84033d6054c
 DIST mime_guess-2.0.3.crate 27437 BLAKE2B 6f9176749241dc9b8c08eea3285ac1aeb40ab079f8184d93c436c00b205ab754d9c2b5c481774837bd1c4522b33338fb7ecabe88ee2da471478cdc1391d9281c SHA512 b08013ce235e66eaf49a88ab4c5cf4d1f1b95846c1bbdc1a73efea9052058860c7dbe2b028fe1b33c713621862fe9af2ed097558cbf5e08903ee406a44af162d
 DIST mio-0.6.23.crate 103554 BLAKE2B 1286ea6deb7579964a5c15926509d438c5454d4f56e936753c76927826fbc5444dbe33b7465a15d0ae6c122bcc98899959391a5418bff31c176d51d7b2f33077 SHA512 ea95d15072fe36524a85b50108415a809d7ea3744deee45e4b6a1b763a11c88cda6dbabe4f8d01945a5edeb52296a74fcf457c85be3032c1311a35025860d05c
@@ -104,7 +138,9 @@ DIST miow-0.2.2.crate 22044 BLAKE2B bec3bbd899a080e5c97a8c1dd9dead16a57aa44cf2bc
 DIST miow-0.3.7.crate 24563 BLAKE2B 24375754245e4ac50620a8b6da6b21958914a6af6422a470487841c2524587d596673cc3718a85979ee911f104d71b59b38fbe9db28c1c7e4b702b9373215cb7 SHA512 451073e8913148889493de0373bc0450c8b23e136e151b48b9976292e4e03b7c3f3279ecf49dda5196badfe662a661a998cfa456d2ec340a495d54a4d2382699
 DIST net2-0.2.37.crate 21311 BLAKE2B 21cef5df92d5d51c8e23c57ad2225e3311c13083fb86830bcb313965eb5ad0170519bed9a47cefb2305d3614ce55e11896a06437cf9ca50c79b7843ea633e99f SHA512 9ae70c655468c3e35ce05988626e0398a3cdf7b7343c08aaecf1267bb958329e608b814cc7be252fe085de3cf6913a1c72aad206c677459469ba4886c20206ec
 DIST new_debug_unreachable-1.0.4.crate 2561 BLAKE2B 5c9831b04e2a44b2dd27816df0a331a8108991a84ebdfefe4e42f325ec3519ee50e89a99d490020a65a3d75acc371316c2253d2c6382453a0b15f4c3d5b96520 SHA512 6f964bb322aa8f2ff92078381dd720527600c6449e237b703278cbcf47b39a2581fddfc2f34ebb7cf31229e33d58de48bb5050e083fec6dad9aefddc1d771c85
+DIST normalize-line-endings-0.3.0.crate 5737 BLAKE2B 935b2d20ccd37ca7469641a37aa0ae9b6872715d6ee88d568d0ee16fb76416cb1a0c585cff861825de8cef11d864b1dc1b350911c28d64e071d8fb444bbdf740 SHA512 f8e2a6e333b0e8972febe8b9cf058c8d899c384fd177e0b6ef1c5f94e0fa18192963970cb1a2ba80e3135a8cca66cdae6796e4d84ac6b325bb369575bdfc6eea
 DIST notify-4.0.16.crate 53902 BLAKE2B 4155fc7986f6a5d617f5dc3e5a41c4b03ffb9df1aa1a4d948ea1cbe42f23d5348710bff55f6a70bffc171985568a6d4fe697bbf92226947153e9e959786c64bf SHA512 7c8ceda432db562d2d261ebf1b18a8ac323bb05d1a7df1caafdc5a0c409edd3a04d84da1761fea8ceb41e4717600c3572ac9257458af0a19b17004ec0496376f
+DIST notify-4.0.17.crate 54419 BLAKE2B 826315718f1135bf49daac9d0eaa87f2c49bd34f83fb8e3b7970ca954b7942d20466d2c90a1c90c899f9c5683066fa341e38b0cd83a1942ccf387652a712aabe SHA512 78fffa1da9fafef40ac92190dfaa71e22b8999bb8bd9425e4d8e9054d234ca0fbaf7726c023987756a3900b00aa9e713b093ba7643374f2ffb20416ce19bd193
 DIST ntapi-0.3.6.crate 127221 BLAKE2B 5e530c90eab66c73fa1864084eb462490bb0cce58ecd9e22659d4933ae94871c722dd2e9b351f9ab620a0e45779cc2030cc65bc6badcf9ccc6263d0850c11447 SHA512 c07f2ae51e4fbbe55de9f617d333e4042a93de69e9bfcdd44acc1b342edd88cc2a360fe6710d9568594e2c0990776004400d0741e61d1a2a1cec4a645c4cb035
 DIST num-integer-0.1.44.crate 22216 BLAKE2B e1c08427e006cde6f2084adadb6086e87e6d6f8bb8dfa757a8228aa671e862a366e4bd8ca5e0500008c18bab128aead9bd5b1e53568a4f40afadcaf3882ee98f SHA512 d07e27ede02a1d007373935fd91e57a26e0e84ae14bbe24be66763baae6850788bd64ad2598d2bde4f4fad6c8a4675c40bfe0927164b16b9b69de5e9a83d9771
 DIST num-traits-0.2.14.crate 45476 BLAKE2B ae310d9d5640acc3e45e1e5d1d2f519539795922c0058ee940c94c94b6654b39358b7c18dd23a276f2c1b16a30dd4de4cbc8575bcda6a5c11e70665d670e6439 SHA512 c3028eca9f7b718de0db3a36cf3e462bdba43562d52c9b809ed4cc0aa6af403aea542d6d4da743cd1dd541397815a3c5a84cef4d6e40122994e4be6a62319b2e
@@ -112,6 +148,7 @@ DIST num_cpus-1.13.0.crate 14704 BLAKE2B e7a26e597ad5e45309393a9500b031ba64a7783
 DIST opaque-debug-0.2.3.crate 5643 BLAKE2B fc0cf1ca373f2eef8a37f6d7eb02acc7cbe4d71f7844e01453c036c7595121272c207023f43ae5287b343756ca0a8bddc53c5e0186e95c75c019268a5f716087 SHA512 7aa44aedd3fa5a6ed3d60239c23dce4cb7b27693e110140e6b332579bf1c1b773244f12271ced975e53caf68f3f381a7edaada573efb982d2e13d638a3a6dd40
 DIST opaque-debug-0.3.0.crate 5767 BLAKE2B fb5d32c876a271b41582563f5d6978d75bc1cba2cc34167f491bc198e6eded45b9dea65effa3aa972ede20978808b37ad1aadb6837f926fa3378ffd382076d41 SHA512 9909b06668a4f97b4d0e916de3e1d0a922a5a0b911a7ce190de786f62ceaccd382cbd0dbe01ab0f15e5472c10848482da2307a6d897928b6b7d5365bc0321cae
 DIST open-1.7.0.crate 6101 BLAKE2B a0ab3b5c9c48999962dcd7af73231f3b2887fdc4244ac066998660029216f10c71cf32e7f08e788bb6cf4f945569acdc4ebb2ce2094d82377b7a4f38304a03da SHA512 755d199424644347dc60527865141616a64d86c2629b35960e30a8130f6f1e6c389c1f6cbb13b9c2f8746f9bfbf599ed708a54aeef95a107ab73631e8006921b
+DIST opener-0.5.0.crate 12350 BLAKE2B 5992f6d564ae14b609aff2d0415c4d7414a8cafebdccb9ac0b66056cd2968f346d63855d8251b153414115c6c8d8cc91134ab53d6b714df78f2c3c858b22cf8a SHA512 4a9be4d280cc5039d080bfaa318b47a80dfa930f3e60068ca10346aeac421abc8575d7eef3649061847e24ad3a6262fb58ab183f6f2704f429e9674f392c30a7
 DIST output_vt100-0.1.2.crate 4062 BLAKE2B eed08c0a1800560d4f623f451d818e3c7f0dcd72fa99f4e5e6dd4934e50a9649011ec955e06728fd017d58bb9f36cecbeb9b4aa8c13c040225c24019f774e63a SHA512 b8eb00a541bebef2e0bb44975c4547fadfd4ab88a14aa8e31945f3c73531a550cf5729f1f3d18fae5cf36286b82d1a54fb08b28720f1592ab6cfe0814c8d3036
 DIST percent-encoding-2.1.0.crate 9748 BLAKE2B f3ff35ac683724b15e40c85e0fb8ececb07b61beeea82b7020f02d27df05a8a3535f157b3cd688533e414d6541de7de8640ef4756706d8061af0fec94ba04ab3 SHA512 98af4dfa7c6a3cf0d5aa929c436f9eb1ba1b576a944513f1284e6df2ad06be7cab9eba145d888d50af88f8c970bacc702b323041bec6d4fa1dc34095186c628a
 DIST pest-2.1.3.crate 77986 BLAKE2B 210638cdc2cc5e389d2248fbc06b8163dd5ddd77974a04d32f674e7f959acb3c5efc7f26100b6ceb7c346ee06a39db0e11ad5b793a1bc09dba679e6a5a4aa2f1 SHA512 08a36d4571cc0e912ae87e1f2116424b3d4139b653dd9a446fec8ff39cd9a691e8305c86cf75d227b5349197ada4ce79912ac25f0726b98a0642981ac4673c83
@@ -124,32 +161,45 @@ DIST phf_generator-0.8.0.crate 7604 BLAKE2B 936c9ad95d2d5b6b4bc97dac9bcf99813462
 DIST phf_shared-0.8.0.crate 2860 BLAKE2B db48d88ad6e7aa6bdb2f6750ab66063a55d005b4f5e92ededb59da1f1fa9b1296d30f87d32d036f08e3a74111ea4d8287e8eb6c86d0edd76b3ceb38f223696db SHA512 6ad7ac732b7cc42e7e179329fbfee7074d26652d73eb4f2b97224491d978ad9b14c66e5a539c96b84c70124ac44cfc009bf963a42c438d028bd9737b99f463f3
 DIST pin-project-0.4.28.crate 47895 BLAKE2B 9833ebaed73495bbc730334186f54880cd804a9a25027a98b1089cb23831b3a197cdea3cfee47fe26ff30536c258506cfb5add0cce99813be6d2133d48c290c3 SHA512 e82a511bce7795d32c691ec61ed1746f8b7ca5913d2b46e6959ceb4071a633b2754ed6bec52b8f7e8320026614ba9a276186ace120e899fbaa5c19704a670492
 DIST pin-project-1.0.7.crate 54847 BLAKE2B d902d2bd9008ffb0f254adbf0fff3c55614abec67db5a5814707f00ce50690e47890c2ab89ac488e12661c59db7692502eb7003cffafb4a57a66959a01f139b4 SHA512 e3903b508abb9a1412d8fe31f04d01c2bf634c770b1d6f697da1ec4eaee023ed95d5488e1fb4f3aca62afe145b52730c40781eb6d52deb55d5f9820503a92f86
+DIST pin-project-1.0.8.crate 54991 BLAKE2B 27ee86530b313e3514950e5f072367875fff4961e0f3ff635acaa3be08e0cf1b60aa96ff782651e25d1aee9abb4351262fad02ce5f90972a5188ca1b8ba30fe8 SHA512 7a838ad361025b22cfd6ef0ae600b100e673b537d499ce8cde9728520eaec11a68edc8c65e3a1532ffe8cc1efad1d7aac7d8e9f82372cc5a18a3deaeea189dbe
 DIST pin-project-internal-0.4.28.crate 29989 BLAKE2B 8d651639b8a4766723d8d9c528e0d54115db833c1eb9f20d08d11114cac87bca58acf32e3003698e2b53491aa1090f2294030ea7409373536677794b64969be5 SHA512 35a41e7ed1acf30f8cf4681b214bd7a5931fa5805402b60239d899cb5135cd872aa95d942beb3e33c9884cc139f4119e7aef3dc676b8da7252653e71fe9ce8aa
 DIST pin-project-internal-1.0.7.crate 27884 BLAKE2B 52ef94e6c2fb44ee36d7d5bcda09fe65dc69386f6df6e4573674c6e796ce506ba672c1421603ca7501a7b3747f7277cd8f4e9c121e4068d5e857232de08cb1be SHA512 14d96d6cc73c7b86151f206383d24e1c7d79d70f586ff59f1bc47fccf271bef4a0561eecf86f7b03cd14520040f80ec00c266df79b2eeb04506582d80cd2ef97
+DIST pin-project-internal-1.0.8.crate 27941 BLAKE2B 74992114d7d582282a92334d2b88f6c50083dcefc1bd62f5cfc588d5255ecbbdd8a2764a4d877051af0258ff9ae37d503e021d27f2a35ca497bfc11a12317ae4 SHA512 9bd11fbb60e3cb99d81eee590b4672d2c2616825e5aa99e01c6b310e5c6651b9e7f6097db0975542746ddf4c455f090f450ec7a588dad4031bb5d09dd91d11cd
 DIST pin-project-lite-0.1.12.crate 16854 BLAKE2B 48ecd648fd7a7694a48144e9e3f05a3e2878e52a5e5ecf2c6cc2cdc556957282bbaa3bb04f6418cbcfb254cceab5a0bca92173cf293db5cfc9c9589ec1597543 SHA512 4285eb45548b1827b54890162c68698e50d3747eba7b4c1c75a8104124846bc745a40d9acce18115bd06993d7d8f11232168e5e6f4159d3d273ff800706e5bc4
 DIST pin-project-lite-0.2.6.crate 25494 BLAKE2B 851a8388c3837d8516d98b561a3ae95b584e7b0e56cb04a300b45e5a97b4c81bde991a9625f42a596244f3f8638c26d6ddf46cdc7697aa24c823e991d0c107db SHA512 21b298896a10c2b21e481f5769a9ce557ec376819681599699f0881769d2dd378bd0bfdf7c43cc16eb521c48c67207e63373622fff84ff26da88703a57461461
+DIST pin-project-lite-0.2.7.crate 27212 BLAKE2B 71997c66fe24bbded0030acf9d460c8ecdd07f7a047007413ad5daee06ade30ce487e7f921d610f9e0bc7aa036391f6c595493d9b7d95c17e9195f5a2b23441a SHA512 c948201981269f6f54da069470c56c5b9c4c6f52e349dc7970ad828d412facfbb66a09745c0565b4320fbfd1aa7983f3664604f7ade37a30cf25ce253afe8749
 DIST pin-utils-0.1.0.crate 7580 BLAKE2B 457e1287202f16d1873b24bf4f1de1828300128c4ba3131758e64f9784d36d47365f22d85493c3a85d854f0d8dbb4c6cef3a0f5b064014dc03943e58b7ba9178 SHA512 828422b8440cc82ac6b0743e0112fa7540d437aed457564999092b1462cd7672cd6b1f0201b67075431aeedd3d9c5127468a3dd028744109944f7f023c82fd70
 DIST ppv-lite86-0.2.10.crate 20915 BLAKE2B 83a075381c24b2b89f5266929f5672ce051c3781c1a199252738dadbf471618c8b87452ce84e1cd87a9eac11b44107002894f544091210cc7e77bf52c045288e SHA512 c9941052e504b9b310024064026e4b1d540dd877705ef450a833d9ff6dee70ba874cdad68c46381a71d5b54482cd80b3dbb8e0c225758fd339069031a55195f1
 DIST precomputed-hash-0.1.1.crate 1640 BLAKE2B 64a37ef3edd317f771e833bb394f7c19bc9b8c844156c831d2b550692c7e2e36bce44ecf18dd9f2d0f0511346eaf0d2a0ebe792fc288ca0e94a93933f2051846 SHA512 a118a98286a47e2f0cf35d2678d0325c18b9b7d5bdf40ceadc16483b282307fd1498434d5bdfa25477a4f420d97c34d786e42e9fa70431b788b4b8fde9718e05
+DIST predicates-2.0.1.crate 27077 BLAKE2B eca1527c1734b3bbd674dd5fadbe040187b95f66480b6cbf322f225db0b47e49d5a510bb97e861fb28a6ddaf56a1f10ae8c3136a22953c86a491086d63c08848 SHA512 81d5faa0224c430d467d22edc20a02dc214852d937f948ca1d51eac61788f4340a279a93ecb8a9bea495f2a45e2c86a42b8b495c431f50e752c2ee0c422b946f
+DIST predicates-core-1.0.2.crate 8185 BLAKE2B f2525cf9d1444c0b6cfd981fb9f8555e4e797fe2a28edcbd75e719121d55eca593249d32a708e920c83549a2240dd04f154b19e59faf740ada773c3e59d52483 SHA512 bfeee297e7bb81c1cc63908ab47f10e21e53b9f690d9aaf08855bc1824e0c87cf05c92e5a8dbc57eace7490c0ce58bbe2e178ac33ad0553ad2772593d89f8aab
+DIST predicates-tree-1.0.2.crate 6341 BLAKE2B 6a701096226f37076d5fb0e62e37609b86f08ec32ff76191ff2717341979f946642d173fd9911929ab89562572817d377889c3a78af4cebad5e362c1675c6813 SHA512 d11b2b7d44ba5a00ed189d4455216f0c991c0f272776166a528136e26436e3f0cbbbdd001bf9a2b9aceaaf221fb9218fb497116e7957bf6bd9761616428c7ed2
 DIST pretty_assertions-0.6.1.crate 61551 BLAKE2B 1e92be2282e42720c9e1d1d26f9e67515cf8aa528479e14bae9c79193652c435e9513e85b7958016c105ed581fcbae19ceaa742fac6b07374a2e6f7b57a689b2 SHA512 10010c6e6b02098def38a8e6cbfe34fd052fe5773628d57a8141c7933f868906870158b4d4b1948b752d2c5f7b2981806d5f835e125aa2447d408415ba764f71
 DIST proc-macro-hack-0.5.19.crate 15556 BLAKE2B 98c22fc3e5f5fa8b6f44d15de42b6ffcc82ba3f98a07ffa48bcbc5d3abcfca6af136c5d0d8c7f1ca34261ed8f8c9c17a394231f97a4c342c81aa7f8b9e74b203 SHA512 9e4cbec41056438287f5b23086264c86e2f0cdc193064006556736377b2954229de13a585149b9995002c9aee3334ee2a80ae4afdcc96cabe7ed2bf718476952
 DIST proc-macro-nested-0.1.7.crate 6495 BLAKE2B c27ad92b57837ab1ce220958846253ed29de12ee1ed849948e5202913371d877bb648e6880ac3e6619b8d48342e1fe105df56a0abda1b13bd62262bea4c85fff SHA512 dc5d898c6d5588d279aa0852193105bbb3824798a05875e2181c66da8c3849fcb32189d9b213cad09054242aa4ae9cb602f9c2d1b5e7302963bac244bbaa27c2
 DIST proc-macro2-1.0.26.crate 38233 BLAKE2B e44a5d98fbf75130c0eeb8fad6d025ce66fe41cc5ef882f418bd8c9e5d228d712020e309dad68e2f862e5f9216a1103fd6e69953e17c213166467b335f604802 SHA512 e6d39cc0d5ec644e3fb424347bde0a82a8ce8549745a1a827bf4dc21f6248471935b5499c3b6d1b7a129f0ddc560754254c528ac39fb1fce2ec3bd9520afc3e2
+DIST proc-macro2-1.0.28.crate 38732 BLAKE2B f2d4765789d03d5d26c9de7e1283ce6e4086ca640d95a36649f8fdfe96533ad768b2a8ba56726e0462ba4fcd8f332fc455307987e0b7c79a5e96f2e75a641162 SHA512 2a4e34ab2bb692c3661db40ebc6d22f3dbcbc30c2f4d88e1a7f022f8522e943ffe2a1c9b92411c7e04941dc0156cb365e0de953fa45d8710e39b660ee9028741
 DIST pulldown-cmark-0.7.2.crate 102716 BLAKE2B eed82045f85940b21628f142c11f8fe1bb2bb93a059222dd50c5c4cea7f526dd7c84e357a92217e7ef181379da478e35111a95c48ea06ef072283f695462eba7 SHA512 2bd539845cbcc952543c45d3e323377c961c1ca67b7a2161782eaf829a759beb3e360d2cc550044e176a25e77e94cba2248dad4377dfbbaecebc1a413db464af
 DIST quick-error-1.2.3.crate 15066 BLAKE2B 1c61525d383f3588c1c5017f016f60b484bbf2035e7f63c553bd9a49b638ab0c6106ac3676a41072b24da4e13dde78706e0f99fd1ec9ee329d5be81d45a85866 SHA512 f8aaf9024d20ccd42b706c756eed8320aee339f8776392b47a41cc82ca06b03df1a5b1f00854cea96689c5af261b4d8c5d2b1a242d10f2755e7e33dc41be35b9
 DIST quick-error-2.0.1.crate 14265 BLAKE2B 3815c89e960923bfe0abc962c38714b953fa1d5af991f3de22d1d084a8cd1ba1761fc961ba97e06ead3992ed1b61f525d04bcce459599e5546315932281c1dfd SHA512 e028deb598466ae91663e5d090606be4f117662d0fa6e0c0b0043c7261f26787057e84e644cae72a45b1a0a7b1fb03fc9712faa3abee94b97ce2c8d25c365c32
 DIST quote-1.0.9.crate 25042 BLAKE2B 26ef31e89fd2f0cc21ff65f8072f30c7977ac634d2536cf9845a0894d6659f62a96cd0a6ee48f7706036c2c1b898ef8c9167bd62714ad0c9cba4fb02f30922af SHA512 dd6cdaea183b85400531ef01e56657edbec0d8f7c27898c1e591b72dff755fa5875b33ca320bd65be0e9aecfc6a61ec119a4bd1291e9f2057fca642ab5b198c8
 DIST rand-0.7.3.crate 112246 BLAKE2B ecc7c1bd70ac874c03bd8b7faa3016bb2d5ee5c19603280a12a45a81598f706e445971ee081e6ca410ab6f0f5f7a06d9315848cd556a2d8522a82024f6ff91e4 SHA512 f9b68ef9446f1ca2c8092c50990f15c1b4cb5529eeeac4df8d69755e0b7253c663c587775e7cb0a7298c31edb444975dda34926759306541f6d43d0d3cf57b7e
 DIST rand-0.8.3.crate 84493 BLAKE2B 5db817304b94424cdc77b60c9a3aa451abfbe315d97e311776ff9cf968585ca98f24994df3fa708e3896d36ba66d5f8dc795a652d2c568edc6be355baa7b4d69 SHA512 fd61348a8c3187881473c8764238d2388da3419e82174f2877cda51a7cd136106b2c7f0dea6b914f120b929c1db323529fa161465156661ffd19eef9b2737e4d
+DIST rand-0.8.4.crate 87406 BLAKE2B c09358416d2425a8243b623346fe71bf6f03fddab1a23fc752f4303ba7c241b3606629e4edf0ea720785bda0bca534acd675c2de079b78eac3df24a1ad6ba654 SHA512 77ae0e988e31e12f7d3f2c40814f930eecbc94c4aced827c337be78eeeabf39fde2dc5c4fda059afdc01285ff4afe30393c32694377de004feff16207606558e
 DIST rand_chacha-0.2.2.crate 13267 BLAKE2B 7908867ceac98243ade22e1b38f1903fe0249324484d91c948a5058a1e099e5213f325c5ba3400898c8319158ed69f4ed064164f235470856a8191bd990d5a10 SHA512 1e2117442e4ffdd834dcbf0ea1829e73202c0ff9041d5969d81a59330242145f2753f2a56de2fdbff65f26cf0d227c7d08b2094ab2f946b764aef88106a6ac84
 DIST rand_chacha-0.3.0.crate 13920 BLAKE2B 9e329831b46c4d6cf2bc6755024588df907f87145adf35e156bc1c2b7068b583b652f90ba35094a1bba26e0449d32d2877fa52cea012ab50429ee526264caf7c SHA512 631f32a5b0bb42ca87ee8381795402f8c5a80202700b786655537f981c0e210e41eaa42ad4247a25bce1260c29caa8ba3b03f92e520ac331403fd8e76fbbfe93
+DIST rand_chacha-0.3.1.crate 15251 BLAKE2B 645771b2c3e274f085e0837a20306b1d59f6e9032fba8eb38a6d1b30180d15e2f89ffa2a162bf6358da41e030098242d81e71dab4321980d0a4f6ddfc2974ce3 SHA512 8198c580b1b9b0429758ffa49cd8138fa3ce724f0dcf73c767ea7e55611d6a2e4c7cad9950896510def500ce4062b594386c947ac3d89425b4e5c9b04d0b8075
 DIST rand_core-0.5.1.crate 21116 BLAKE2B e74791f941a79971f2741172d489d546373c9abcb0dfbffcb7b97b858ec800b2e0c97df4ac636f3aa1b8dd6c14685edf317336d577f31b5c6cb7d89a157e547a SHA512 4f7500b35e165e6c817fdd67a50745d5497d24e554bb554705097e37258751e8755c4d6b8a69fcb5e1977708ba78620bc35d640e4e018fcd4e88d9dbdbebdcbf
 DIST rand_core-0.6.2.crate 21708 BLAKE2B 745aab7160c4d9b52e7d0ab0fab257bcead4dfca1242d820d760bade713822b7b8e283852a2e337a6d33b40ddbd95f86c36bfc4c418ef0ded86f59ae4a4df56a SHA512 f1f21dd6306d6f4b5666d1ef4994d0d68f10a7a94fe628a5aa8ba28ae0376cb34b7c091f82e2db8f2555eec4f35088f6c4df42ed84de7467d5780e284b397115
+DIST rand_core-0.6.3.crate 21938 BLAKE2B 7c73e2da6d423c68dbbca31f6528bdb3f42fa39b30d0951ca7058e05ce16ef09ef5e047697b33ec17720314f934512c0907aeb892df93d63abd8b63eda2b50a7 SHA512 0fc31f96ca8ebba8c179367de01458e909265e1d627ec0c5620be7c8e83d2f9570471d6ec2cb2bc4bc531505b02fc31f1165708cc1357906791c87123b06ee87
 DIST rand_hc-0.2.0.crate 11670 BLAKE2B 55fd048f2524cecd4f0e17927a81111e3070a8cc6a5b0234a46445400ad5527194edf8c91fb5ad6538f4958d53044ab02424f61a38adb2931e2cb7568c458ee8 SHA512 bca185612bed5cee4da76fb68fe854105da276f5bf2da464e596d586b925df798cc692ed881e276ab77c36b4b0551930966c93656be122ad05899d87853533b0
 DIST rand_hc-0.3.0.crate 11780 BLAKE2B 7600829591c3631aed73598d4837b0e3be55aa0594e0562ab7914013b19c4f88648e0103765ddf32643e771e0961ff2f726b9c8b323798d36ef9b994c1d03ffc SHA512 c78372332aa0bed3352d58e07be3e97f01e69410051be2d3cba569b05037df7379e896a84638b4e9f4e477b9851e4bdef0accba2c53d118bf4667a3e1bbe95bf
+DIST rand_hc-0.3.1.crate 11891 BLAKE2B b3aa810638390eea4245ebb711de88ccdc2a64350a5c6e14064fea7685d49746b4b77215dbb8374fa7a6cbc2cfd79fb553513d6e551acf64586d8303f7d4f3a0 SHA512 582bb44b81c27e698eb57c6f06444b8a7c9d3f7ee73f4e14be8004c4bfd3bbfd9795c69f7294b5e87107e86b90fa3e91ad080964474af81c92705d356e43fbb5
 DIST rand_pcg-0.2.1.crate 11291 BLAKE2B f8837f3f3dcd7ecfc90f88bb6464b9f79f7c1975ecc68289fd10a5c97323de9c1106de9847fc798f50d96044e46cca9d41f1635130be40bc789492bfaf999de9 SHA512 612c0d1cdc591f80733bf8097e251f02ef7a7e71cafb74e37b63ac68043558045c0c96196200ad07ce7aa9f2d373640c20e598ae5774935c8b52350ec20958ba
+DIST redox_syscall-0.2.10.crate 23582 BLAKE2B 7253dd96415e7b70df488c208d86c250c670b1245ac6573a59085faabbde9e33fabfacd233e7d737e365493db14008c180274b41ea0a4af5f6f98eec666a873f SHA512 ef012eb4bffe32119e50ecdbef4cc31f6e84a344e94f026484fe4e2c904f94053a8b6249fb6bd8ada31b3ecfbf0096085283bb68aeb62b1b01b57f35794aee92
 DIST redox_syscall-0.2.8.crate 23697 BLAKE2B 5a084a48e06ab0dc69f64b05058b78d994040da6c42f04c8b615b1977fa3e813cd5a531ab33402402914362301670709679aaaa321e8904424c38d35c284b7ec SHA512 250556a7683254c9daf22887b39abb010eb9d4fe08b944e52bc6595ef6d8acfed76e5f43931fe20c84bdb3743772fb62a0be154ecfb6e66c2facb4c73546eacf
 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 remove_dir_all-0.5.3.crate 9184 BLAKE2B ab7ef94e0230ddc9b363f038254a180881bbc20eb04a254f97e6f71ed491c99ba1c88f5e85632d450243882a4a0df63f3b8b183bc1fbca9caf30ec23d577b1d7 SHA512 50417d6d8a33912193a1ed37eb72b47431b12ae65d2780cdb7080c3d141e63819da13751c3fb737685cea322f70b36d413389c3dc01aa12b4dce615aefed0e2c
 DIST ryu-1.0.5.crate 49570 BLAKE2B 3bfba4a5f290a429de7ac3b86823b2a973f40eb6f48c15329173d95964d31ada36f2618be4b36774a03f97f2ce61364900c6a3ad5465a294e2df311a1f4104ed SHA512 d1708ffa3112a684edf2956b6730ead040401d38f1457cde074eaaa59c249007dc8b925629e7f6df89f7ea757e9d0826649d685cc8ede0a04d50296048bf476c
@@ -159,31 +209,43 @@ DIST select-0.5.0.crate 60423 BLAKE2B 96520bd4ce08fdc86836aa7132b925786687959267
 DIST semver-0.11.0.crate 20826 BLAKE2B 9006a801dab95e7a28605f623984b467221c3207b64af251bce3fb4fa74f731c4a3b9f95081bac59f754fab215782856edd98dd763b66563010498b97e8f35d9 SHA512 bdbd8eba37071ec1d24d372cc34ac4d82b6d914e7396ed51276e80d4d299864507a9d837ef381f6c4868981b7ca35514050ab8d7a621d43697a9c4b4bd5d8573
 DIST semver-parser-0.10.2.crate 23176 BLAKE2B a946a635d207f14a59f3b5db3d0a6dd8ea283bfade3fc15f07bd9f19087bc12203591a17d697692ca12abf3618481d53f4e7492b80e7233a519bfefa49b95da0 SHA512 154a6905eb5fb854450a0bd00381f93ededd6f1a992103a53464429195102eb266c7e8681e89cf952223a51427fa17c0a36e3b7c2eb6d375b309e5fd3d721f1a
 DIST serde-1.0.125.crate 75144 BLAKE2B 0823f4cec3704ce5232c266fcb69323dbcd93d2d15712abcc8cc61a2d123d662ae8153a32b3723324ea55a40f2b9101ed654cced45c500fcf399b9d7ccc113b8 SHA512 ed2819d678e7405e2d8a0cc1b43540abf2ad8871eeda4985af5e37016a42b938d7429c4e865cec2ae5364cc7fbe1052a5a46ea51b42c3ed5b9c7c1acb596ac3b
+DIST serde-1.0.129.crate 75300 BLAKE2B a6f1a7df810f3232da585bcff86a7905785f82b2c434a87e2ae7e5cc0dfa8aee2dde47b301fdea17ee885fed54698c607a1334a9faef1a83840b9b111668ba6c SHA512 7c520bd5d9d5ba05c4b696413ab843ba36b22b0a4d8bdb2883eecadd2f69153fa90f57689f861ee5c9ac36536698b7694837cff45c615ec4892fc6b035c25482
 DIST serde_derive-1.0.125.crate 54155 BLAKE2B c99e9e806831dccb3ccca20675e11f603a7348c433a641a46cf9a448a7a8b7ee242d0d6110780089b08e88b8f33aef5b75e8b1d25e2e6d242a44e9093b2badfa SHA512 dd4e247c9581b437157f37e355bc3335a3927417920acce72e73d6fe05a80e19fb3160c72abede7842e7d54749c33a94335fe9f3468c2f561267b863df368a6f
+DIST serde_derive-1.0.129.crate 54697 BLAKE2B a5921822dbc1761ccf5e5951f60f27e4d2d263491cdddc870acd8cb069bf3194be9099911edc161bc1b037bb4c0551bf8918214d13b52cbb94ab98675dd5b672 SHA512 f4a418a5431a4d9b47f5555e485a81485bc7fa050fe137f8145ac02615cb21ea6d06ffa88e8f2c404341885e51f45750c273382adec1eea20bff9ea7a18b85f7
 DIST serde_json-1.0.64.crate 115138 BLAKE2B c61a404db9800cfb4e2ac29d4e287a7c8f388b62407d5e25e07514e2840fdf9c127476db35cb556b56143755c64c26be1c6b1facc7529067b06946ac8f54a573 SHA512 55a45dd4c60fd93d2d9331f6a8eac39fdfece9ddc1aae45ea27e3dfa81352f08c71bf03906ba99d0feb5df8d847b68547ecaa8eb5a2c76011ebbe8d4cd5bfc2d
+DIST serde_json-1.0.66.crate 115121 BLAKE2B c46c65339ff79138649df206f2ec759945c31ac11bac4807a8d1e76095c1937211b0b4ebf88c69d2d22cbd90ba25643a74cafeb291e815ddeb5c5ca208eec9e6 SHA512 8cbb64a24781a94e9448dd39f9429830fff6fe61be3772c1ca825f7d489ac3c06b189c42730129e281d8f43f7128b3b9cd2308727e625763588bbaf61b54d1d1
 DIST serde_urlencoded-0.6.1.crate 12540 BLAKE2B a8d697cbe24c0b1dab0c0a42a8e2277e197821427647147eb9ce1217dc41635004f6374f1a54b00e5a7b6ee54ffcb4a2c855f8ac3177645e7a8cc1bd9fe0415b SHA512 e48b87717549d1b99f5759aa12b5c76507b26a6176a69f0a3c7297145b50b539344b43a827345096783256ac8053bf700505091c6d9d0e430bf01a990803d444
 DIST serde_urlencoded-0.7.0.crate 12489 BLAKE2B ef64d92d79b80521ffe90f18534d0a0f20834e692c708e3126d3486b1585aa228e3140be81984256f0adc71c764d5c2bb66b755b9475eebefcff67c952d42372 SHA512 2e49d1113a863a45235e4c5df3de1221398091c33b9eb5a806ea496902090f82d6dcf4f478f897ea54eea44f553fc20aeb2c1c124b81806b0704dd33d5650a13
 DIST sha-1-0.8.2.crate 12338 BLAKE2B 90702eff48c15b49195b547d797976837b0fc9028f76da626e094b80d5d630bedee637053dc57274c27d68b8b6f3c443f1aef37c06b7aad895630bd9d73039b2 SHA512 65ddb7bd8f0157d134e70f7c6d6abf7aea198cb97da17b418a265642c5930b8cbd9c8e0b97b557102787cc842cddc93213d669345c2aaac6a1e7146765b2d5cd
 DIST sha-1-0.9.5.crate 13780 BLAKE2B d21bf44b67fdf7cb3a68cf1b9a7648c4cce4d036bb43175acda9163dca9702f17b8f4de4efdb9e30ae50a7f51a666984354e31b51bbfdb3b23c2b4bc4287ce07 SHA512 91de1c379c12ab3c15416eb48b82229856db866fdcfad75c055a1b0bb3ba521a8611c240bf44566a97d77b2519aa9740887c80f051f47a8a8486c29ff9f41f21
+DIST sha-1-0.9.7.crate 13999 BLAKE2B 4fe76727ecb3edc5a177e2ab10269f03d39dad76c073f34d647ca33ef0c4b3c5d458db6145f41c7224ae1fbc81e0e33696c5af5103908b76dbf697517415f63a SHA512 d592f7ffa58dbc5aba3a5d6ac96aa27be01e0d54ae63ffb339bb17689f0023819044713b7cf386396fe71555a3da603a4419b36b6594629bd7e43f70d92a67f5
 DIST shlex-1.0.0.crate 4555 BLAKE2B c39f219b68e7a85fc0a0bb2df38d3b232a80815f5e541a03173d308c0274f55c61e54887c95c22d51b2e62339365bf5deac5b0d0ab3bb5d40fb70b8f75f1755b SHA512 aea9827adb630b9ed71423fb216113ee20dba31e5f1e7d078445e8bd77e7e9bfe64ea2e73f3be0fcaa472023b724793f86c06ff8efb9e4cc133f805bcf11c560
 DIST siphasher-0.3.5.crate 9455 BLAKE2B 73a09ba949dc4ea670a01e4cfc4f34d8f6ab53facd656beadda396fee087b36afd895e2acba5fecb796fb629b0f56bca84f971970c2f771ed84f74f667f9708d SHA512 4887f7b7b4c0df55c185249a16041052e16ad1f7c80d69ca69dba76af7b25095f2ace3d5b2a33346797f74b63c476a67055929c2856a6b4dff60e8fe2147f8ae
+DIST siphasher-0.3.6.crate 9708 BLAKE2B 652b226927c1a2020a1d407bf53582d10d9e2cf1e0a71ff07c6b30edb31d3def77b9e9e1f9bd3c5cc6206b2158cbd5753d6c05ea0010a2ada3a26ebf64c425d6 SHA512 2b2295b4807ae418ae03ad5b1d1a9adb8c29706179e1e77a483b0d1786736385e0681384e8f5879d21c1b009958659f2efa8c553a2a93618e66dd0660aa1e169
 DIST slab-0.4.3.crate 15681 BLAKE2B d7e3eb0374de081d1870d2b46c9137e5ec75950a8fec217e3b120e455fe847e9245884990fbff4d01d512ea297c2012cb1a64f9b169264168081f5f7d6b20b39 SHA512 8649f32f26c1354b3281534fa0e062a145b62813c46f9ff5989ae688154221b00ed1b8c044c67a4b78c00a2e3478a8eb9c1c96fb424c24cd6cefd4df875fbb15
+DIST slab-0.4.4.crate 15725 BLAKE2B 54f3d5e4e76aee03d52f25e2927c03c10d89fb7ff62d83ba6f56003daf8a98e63ec220f564107f3282e96bdf3bd525b68e71511ba367db2550d3aed18b4bc59d SHA512 a8232c85d9693c2a417201768a5b2ecd82e3a721fee39ec80e44c769c66f8cb3ddf00a157f376ebe4c168082550ec48e63af23de2da4f30ed343b4e3bd13c3d1
 DIST socket2-0.3.19.crate 33782 BLAKE2B 1ab3c61a439c1594e19c4a14958d0a85b54666532d16eaa9a1e40e586b7707b1c7b5a751fb373f16bcc26510abc25e0321808e721c0b33b7b04416b9f6cbc5bb SHA512 113d902ca0b966bc0bcad71e3b7d715c79cd075d9dd7fc4140a042bac91b3ce692fb0f1fd0216fa3f6286920b4a92e1a4c342d7ae8d1d98ded36e7480ddafec9
 DIST socket2-0.4.0.crate 37949 BLAKE2B 10cad25fc39a2141913c82eb1d33c14cc7cf54ef7323c0031558aac89b1045f7433a81a8bba83f21523a3ed0ec793189d6333ed19ad06cfc1b70c28d730aa9a6 SHA512 7731bf377bc2f6f06b95d563452bdf1405aafebabc9211f4bd3a13847cc154ae9cff0951130e630fad9f7a53eadd30dfb92b918ae239d7cdec57c327f2cc464d
+DIST socket2-0.4.1.crate 41364 BLAKE2B 6b1ab3dc342a30467a9579a2dea338e3f5e2a73745f68cd65ee4f34cec390ad67794d2e32d21b01675ed6ce2136c8faa07ea7b8e262a5848cc9b1320e1e53a2b SHA512 71eb3e8d15cf4e88f801d740230710b5b52ff1434526c0e61e950168979ee715dd8acec217d1a5d6f50fa49536558ef94115902f936302d81737eb163db4b8c4
 DIST string_cache-0.8.1.crate 14423 BLAKE2B af0c9b9f52a246d5537ac2831be6aea462ce253b086baf6fb1773f760d566ba70917b686c2c732f60cff4c30068c5800b7c26f73763e9ef825b2fa619f6a7c00 SHA512 476aa99da2d83de7eabe68b3dc2d064cb549e2caa2b708459f883cc0a8f27bed1b1607abb1481959cc26046cfd4c44886bb87bbef5aba95a195a9d850311915b
 DIST string_cache_codegen-0.5.1.crate 8243 BLAKE2B 3ce7bd89edfdd58260fb58e7b954eec503dab2562d13274f401a0af5f7e5152a660298e9884f578e361557225c67c80c0342e5c71d47aad7ec43a47ea91c617c SHA512 c3aeb752cbdbcb78cee6156b726264d182e77b3d6ac89066c366d87d8bdffc32d83e6e59a40471f07d7c827717db25fa6fb489dbd3a650f2fc252a7c85f4ecae
 DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
 DIST strum-0.18.0.crate 4207 BLAKE2B c34eb922b3d6e9aebcc92b5f6031a1e02c92bb0828ba2a69f197da80c11da78cc91a7b275cb976ece55398a3ec08470eed5ce3d18d8b5851ae306d47cb5d23ca SHA512 ed81f891fdf8a2bcf563b1b103d9cd02a2ffbdbb8c33c1be5c09920c4d1ab5409d0917bebdd4a13573a44be626dfdfe3d0892c54c7340a2f8fff7a56c4f4dac7
+DIST strum-0.21.0.crate 5296 BLAKE2B 6910f08a5dcbbe6008b777a2948a8f01ca18d30be76ff6a89dcfcb28b05353a860fc1b59412933b9c54b9ad424a1366e0b81773e38b04e9a5f9a038b2d1bf082 SHA512 687a99aa93616e16510213b66f53be35561d19cd19f9776084e9d6d33f8576f5eec7a806a0e48997da2b41e6f563a05424c1d5cb5ab2b4a2310cfe1d3b10a5a6
 DIST strum_macros-0.18.0.crate 10229 BLAKE2B cdfb1d626f8b338ec7002056e70d539e41af7ae060fb85d787d66218f6b7f58c260f99f02e0c3ba9512de371d35456ffab29a7633d0d6f716c1879adadf08b3b SHA512 df13553e2b89b2c87be3948f4881434a5eb851d0318fafab9eeb9764ea56ae8ebd50639d10fa508f674442a859d4cbd4d344c7d1253fc7f8eed3443891f4defd
+DIST strum_macros-0.21.1.crate 16280 BLAKE2B 48e4eb3f5e5431684a4688feb55cbf024a810b39df37fa869b4d417bf16c245c3eb901fe2c544da206f1dd4a3c2e62653b4080a9dc02eb446c6795225b34d857 SHA512 85ea12f8e03f04c427b99e027065279bd559ea1c51532c6f35cc842218e350e27349258f0fe25f5efc9fca047387da3ec5d670f94a50d574b15f4b5f1c99ddea
 DIST syn-1.0.72.crate 232500 BLAKE2B 8f71f7fb66426f78eec3439688b0468fbef582c8ca912781f19607acd9e8371f2230b305a96f613c16f7299e66fdb2395dc037e1093d3897864bd2bf50ab3d7e SHA512 f01e2ef74fc3f84a753c1c379c24e3c63f3c575d72ab865f8e7d51f4dee4293ac8197b4e123ebaa942e9199bf0a0d8194e57a5aa6314bee6951d3d458dfc3da9
+DIST syn-1.0.75.crate 233068 BLAKE2B 8d4b5ddf1a18c59989f7664f0893265dbb6c833235afa430bf1fd224f3f542ff7385c5068a0da8841c9771ba9e93ce8974c6ae8dd0033235447d6a44488652bf SHA512 9ecda1f0cb91b4472309ad00f10eae80fdfce3c60990ec5f6510cb2ae8adb6f49e8b1d092426c5d1f0a7e9d669929330ac26a78fed227046dd1eb09a81d2e53f
 DIST tempfile-3.2.0.crate 25892 BLAKE2B ea6870c642c5712c7c96072a5d3dc04d75c19cf1413081e3bf53c1ae6c75e05ab537446071cadb5460b34f7fb7715a03005a1335a64139458db938c3415f7c0d SHA512 56d1c5af7cb6863f9eac990354126979534aae7bf298bc8b1c918c7317ce2ba31f53089aaa1ecf8baa4a39d4111d74f4450be82b509b3c2aa0428880029e663a
 DIST tendril-0.4.2.crate 37138 BLAKE2B 444fd1ac19fa456075534123f73774f95f36b296afbb4b1e82a6c306971928c851dd663ab6baf09cd20f65b06e7ad46a726690df19bf00c3dddd164420b815ae SHA512 84cce485442a2e1ee6f8806a20dff038b1ff446d22ecfc9865c9ec8bcd209afe0748c7dd31f89c45cd5fd98e34abc1faf3c7a21b6d4bd5863e53d295bb700b3f
 DIST termcolor-1.1.2.crate 17287 BLAKE2B 5ff748064c9fb6663befce2fd299edf6a6deb06ea72d21a62d6e77642934cca0933e10340fa84f636631cc08c76ba83ef2284b2212759129d54248e5fccb4c49 SHA512 f37b034345382cd621b1344a3fb301ca3d4d9db8b5858ac1ea82372c983229fce3c0ea8213d6b7e91291b6034affe11e2c3e593dbd95256294ce5c584b33e14c
 DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
 DIST time-0.1.43.crate 28653 BLAKE2B 95fe69647e8d52784be1fd3457578896aa38279d00f51f1070eadab111d39450583c63854c73d4384f2e4349b0250f1c9bff9901529b776c596846c057c93335 SHA512 c3e0c68cab1ed2f33f41955f83e632c51924e4d3c1d22dd0c4ae98499e03f3cafde8b0c2d9e69b67a78d6e4055e464ee00d1ed6af5eb9fa75052405b43e24a25
 DIST tinyvec-1.2.0.crate 41625 BLAKE2B d7ffe63aa2f076ecf57a2c8af3269abc7c811b7e19c3bb6ce4830f9d12a9942620a43786f4f578000d01883a9cc33105619e4357b29d64babb9d6313ad99bbd1 SHA512 eae5ef44a90995a3e7186e52c1d90447f677b9b6db2f4e120e5c32f2077f324f000a16474e347eae702b7fa2a487f3e5ff06baa2082f3904ecf404c27ceae74e
+DIST tinyvec-1.3.1.crate 42386 BLAKE2B 9fa7dc7c4967bc3ba3f7e5fbef54a7b6fca46f6520aed2482d355b1f6434ac702e073df19034908f214e5c0ffaaa3bdb41c7d394d9f828dbeaa177158ee99ad2 SHA512 ad07998e9bacccf8ce2bcb01fea8008c6514ad73c15c6426453cfdbb432dac7d588d05551b179c83ca062ea02f0853e97e2b9712da0b8dc20ddab4c0efd5afd2
 DIST tinyvec_macros-0.1.0.crate 1817 BLAKE2B a3d1966bf57c11afcd026269135a6189f149f905bb70b47537c0a7bcaef0bfc6c89bdcbdb0f6cb8e5255632855134631c683fc90606a254ec8ba818fd5ef0794 SHA512 d6afc83a3c70cde916a6ff599e2772588e4bbfa7a5b1c7e5c8aa0f4a8a5c9426182497a644e4a88194ece986d38fa64b6c8eda9eb1630441c8e65a8741a45873
 DIST tokio-0.2.25.crate 413390 BLAKE2B 3fc36579030bac46a733bbb061088eee56e9a172241f74d744de972065507db14202a0533a5d231bbba495404c16b5d6bec0d11ebb11e258ff0273b47b2f7d90 SHA512 19b8d46a81230be0a06d6354c2775b20fe0c108b4c504f5fe798952bf84f8ecfd9fd149ba899ee67a1158e1b0ea9eab49f6249a655eb0ab1cf418c0097b30705
+DIST tokio-1.10.0.crate 509770 BLAKE2B a4cd395932a450432e2cebd8a55115e0236f8f255c44915ee68c3e286e97528ade8fa939764817cd4c7fbc9641772da80bf02ed2ea50c8e843db34b8749d8f32 SHA512 fb848dd97062c9c1e004f8e42444b43990463a815560fff2412a73cca82b4857259b52ce88b8c4542dc3a798cc85df855541e75a02f366f41c258aecf9da9bc6
 DIST tokio-1.9.0.crate 499709 BLAKE2B 8c6421cfb8ab00610c7b7cddc23e172e719aaa8a0a2696fc33aa4c81e7a8140e9310140aded8f9266f6ad7343aa8a9f8bc3f24f7e1c656ba82b85d9efe3b3863 SHA512 41c22b0774bcc86535f43d440585395268c8b8f6e7191541e437126182d6d7bb889de8baa6aed105902f8d4a20127016c770c2b001192e19fac055c748fe416e
 DIST tokio-macros-0.2.6.crate 6460 BLAKE2B 239493963b5fb28eb9ea7dd568576db4d38c7e6b8ead4d072862891ca5aa096a8ae61481f3cc256d1bba2a2ae9a62660a8a0ac3a1b0408cf33f4b204a252d095 SHA512 1e3f7f42dcece16d8785e500816768ecdef944b0297bea9ca215c15aadf1dc89030061cd4ac01fc9d3c32ee83c6471dccbf7e99ff8f2385853e831e08954a51f
 DIST tokio-macros-1.3.0.crate 7876 BLAKE2B 8541e18365182f65034f1ef7096c77186744edf5a171a2806f60c291d8475fa3722430f37936a28fb9e1d525a31e7fdfaff460d1d967e5b4ee875541f4e7581b SHA512 1ec1bc27236b76a9652595d2874d587e724207c1bbce777beeb41edcef5282cb740af28a99aee187127ec9cf824aa34a0a3983098bb355c73d7b4afd18eef1f9
@@ -193,10 +255,13 @@ DIST tokio-tungstenite-0.13.0.crate 30189 BLAKE2B 58069c327de8ed663425bd6b9655ff
 DIST tokio-util-0.3.1.crate 27233 BLAKE2B 96e43dd3f6f6209a6436e6ef3a40739f44507312b02a83f0316c7500dd6a59b5a71af005a98818d9b1db0e33aed4a9330e4cf955855925c8a428132762985db2 SHA512 301a5d9a8a9537653e17d3360dc27d41c95aa28bcda3e0815923dca0ac735071b01b9fc8c1d53e826e0cd1e6e5f98cc233f1e9dea906ba06c6b5192608ae7ae8
 DIST tokio-util-0.6.7.crate 73201 BLAKE2B 4bed0bdc343b9fce03c12c0ab442cd7eaf3681232090547a0269bef5f362e1d96d2a10cf78708c6775234e23e8e2e00697333dc861df56136a29583d7a2401d2 SHA512 f6d81191a1caffd2cf78175bf0de3432bec684c739378072cf23daa1280b54d1781cf43d663a49b0cb34662043c1747073c97291414cf0407581325cb091b263
 DIST toml-0.5.8.crate 54219 BLAKE2B b4f9f563e5ba4574d4f2dcbe244378a2e1e984bd9fbbbfa5a06bdd5f8b8d677394f0db9cb8696f6936c80a52caa86b1b3ebaf3885c53855af23f03d318785f19 SHA512 26b7901ee4b7cbb4cf8ea57d365a99ed05e0a76e73452e47d4bcb3b4eeb7bbd393c13eea9ea33dc13622942efcda39acdba9425b74b40c920c9f19673a1f2082
+DIST topological-sort-0.1.0.crate 8728 BLAKE2B 4ac5cd3c9da1f2825d8ab5d40b7657a8723bb498338bad8887bb69fcbeacb7d8a5ea980696db92db8769f77d2fb8dacebae2e40d8e23a9abdd7604d686b4f78d SHA512 abba534c349e0583212c3c88779c244faa4ec41c2446c134cc43e94a851878c4c08d9a6316a8723052fc5de628f7b0acfd74aab09be363b568d54ff0de1e0590
 DIST tower-service-0.3.1.crate 6299 BLAKE2B f56562faebe3a933f39f8e2093af65378bd307c59f9695408510ea9ca2230c68228c6726a0a2c7c42943002837dd9d86ce0a1d4b7849ba5c61df28df7632d909 SHA512 d23f9db2d6632f561970b55eaeaac22a20c8b9af18931cd564db193688eb2a2973127b440e175cfd7358f3d0ead53f7a759e34b7b86c293751079af9c2181ba7
 DIST tracing-0.1.26.crate 68583 BLAKE2B dbdeb4081dddb777d52afd1afb043e018e72f99ce6c4fbb16cb14e618da9c794ee594252cdd7a6d4a7c149a8ea86d63f6e4f1d75ad3bd76590d70af107616eac SHA512 19ddccaebb2d3b2230a6ceda5f72af29200ae760e8d411c2073e7338a6ca2231c8b2b14180eabec78dd521ab7b48996966b0419725adf8c67a03d1775ec834be
 DIST tracing-core-0.1.18.crate 48381 BLAKE2B f175efd5481bbc9e881a36dad6c29eeb4b39400dd117e178d9e7a0e765cfdd3f36abe7e3fc2a537c79c5af544c764a0273a382cae907f5e79b6c140ffd2b9a91 SHA512 a5fddcc04651d05e61c2422d028a399cca260672f7a8e5c072126d9d4e21ef7a38911fca09e32c6da287a0f1cb6d1297d30e0f6fbb951fc190d2a67281a115b7
+DIST tracing-core-0.1.19.crate 50079 BLAKE2B 4eb551d147eb17d96f9248dc780ebb305c622173d98fb429fc17ee6544e30f499883973c1d7c80d322a509c69df632fd47ec6be5ed0e7fd2e04e3751d7d40252 SHA512 27db417a15eeb736b695374650994029c41a7ac50b6b7ab0a76a02aca0473be14a2d4aa0a27029071d6b864760f32977a9fb3e47144dc5f3b79fdd1a42c7bd4f
 DIST tracing-futures-0.2.5.crate 11637 BLAKE2B 2b23233705674cadf5dc8092d3990f375e780de2b9bdfcbfdd5f4bc9bd0f15a14c6bc8e36963bcd332e729b33b90ecd10b2250495e0657eaeb302e666313534e SHA512 8a437a029e18dcac3a3be7a3355a63e75432ff892316c9f2929c7557e3895b1bb5efb59a7588372bd9efc386b5cab54c2b382be99ef8fa643e66ae5656e506bb
+DIST treeline-0.1.0.crate 3855 BLAKE2B 3347bee24c686a6b6890f85b60429d36b14f2738e6a5e5adcd493d099b097a8087f7c61f4c155fd8b3af3982a97da31740353b4d036ae451ed8944a9b0feaf75 SHA512 37a7c7e95855fdf0fafe5b529eed6c6cfc641da799bc6738a5649a9a0c3db2ef3e63d692862a987bc19263f33b6df2e8ae71b49fe30160d6d470cbb804511824
 DIST try-lock-0.2.3.crate 4158 BLAKE2B d8bb2fd8ba10285871ac3dee069474d4225e312c0a13b6bc238604c5207fe33437541abfdb507a6b400fc3359b78d39a7e9a5bebca426692b5dab4622b09c192 SHA512 ebae7ba9227e6fc20499b48ab85169943765342d4790bb4a31ac33a2be0af9401e2854c8e00b9d3b7e225d16875c90700b1c3fa99af07833d3b7a91b7a414fc3
 DIST tungstenite-0.11.1.crate 53895 BLAKE2B 6a08674ed6c1b161dbebcf32a43345bd3f167e57599eb070aca57cfeab09339505afbbfe5d10214bfb68c0775ce4b44e4337767fac60e1fd938b1f165db99d06 SHA512 b63a4c0d50a4d4ed11e21741f8c7f0eb958bd1cc930c09b104d3823d8a0f81a310b08c58968cad44730229f32c7d043accb1acd6e905c1227ef07c2990b78aed
 DIST tungstenite-0.12.0.crate 54287 BLAKE2B 211a39484af5a12262fc95eeacb0f68a1076956aa3e2df0f06d6a2839ceb4e096ef3919df60a2bf4ebd74eeff85a21a9242330cd1e892bff04fd3588b04da810 SHA512 d6d93b143a4e1ab6a610954f9621518f1b50e0b8d1ca019d106027bc1a9f4698bf455f3948afed1cf7c626b04f426075d9b0393922f16b8ace50aa1ccfea0474
@@ -204,8 +269,11 @@ DIST typenum-1.13.0.crate 40238 BLAKE2B 5e5f9c8c60a4406c5a9a487033ddf7e8fd835bc2
 DIST ucd-trie-0.1.3.crate 44615 BLAKE2B 491f604d63446dbccf5176333edd159ac56261a9aa76efecf57e9a11ae017a6cba975658a4ffdd310561704fb0831686fb7770b1142b4ac495f01e26de51b099 SHA512 54d43b3824669aa20b725c7747f4fb65bd24e620670c968c1bb0094a0503773acda921b50a0b200c1ea0f84e1e059883c1704bfa5a856d2e2ccda116fb8c3e2b
 DIST unicase-2.6.0.crate 23478 BLAKE2B 6e580108ac81b1cbee70e5bd331f43b12f266dae4f4f758bb8f5f073bd1af61943ee0de34cc27769525b19da8c24f8dea4941d0f5454594ab0cc8b78071ff053 SHA512 7e76a5f344e32c56cf87223585d87a56c79627b52bba0b29eb6de82de874b2964accededa8e9b5741f57944b6750fba5c61e679a50d4fd5a5646f431e2f4f188
 DIST unicode-bidi-0.3.5.crate 33423 BLAKE2B 26434df7646ca6fc3b655ac2482c2be70700bd84fdd31d016f49b5276b23308d1f9258d40ff97a4090e3dd603d3a19f8fe45c13c5dcde6b00816dcee1695c7d3 SHA512 4541d84db17eef16da6ea59f1ff7103549ff338d6ffabef21e75fbfcfdb1a3fd0f8e8fe18abab7b6117e997cefeaa5e87fb01fed8fedbcd0657fc913743de8ad
+DIST unicode-bidi-0.3.6.crate 33737 BLAKE2B 90cb2d05bcafd32a237b747e290f3dba186d069845e50ffdcd7e62a2ddd73f4e8fc27ad972d86453ff375fab50fd5ec47ac323413e351fb7d4b80f1536519d7f SHA512 a1013539b0da1609d9c37cc1d8359efa93bd88b4ae176d25398e6c44d93b615835a54b184641f00313b14cf46542b1e92278b0dc1bd00dfca0566467b21857e7
 DIST unicode-normalization-0.1.17.crate 100345 BLAKE2B 2579748ab87f6d74ab8e845d88c1990e4ef32e46e38f9a1841e3381d257d973f2f8a9da359c8e3f11790a888acf81f548ed3b749a67bb3e95acf3b744dd063f3 SHA512 727b4844a4eb103375dff7d88d620e1fb581cbdf2523f07a5c1673ff333d772d48ffae7658bfe4816a5bb42de5f68a96e15be9341c540a0f746c2990eeccb3d6
+DIST unicode-normalization-0.1.19.crate 107353 BLAKE2B 4c69d50efcae131eb4b91d385a64b49412a11ba913b3c0364cd04ad107d59e31adbda74d34ed13a065d9a7825d79fb740e82a4dc66b7813a9837af4352ac9e16 SHA512 7459e9d2867308cac80a98d8dd0b0cce797e2830ea5ff55b878f7a37a6f5e1f0bc14340e1a29955298d660ba2be57754a1478d74851b1b90576dd5bc4231729f
 DIST unicode-segmentation-1.7.1.crate 93066 BLAKE2B 80058a79c64972dfff897b08a24e9f18ae0fa312a50f86fc321961eeab83c5546bdbc30534315870d891e648bde1d7d77f459ec9744455bdebb94bf6e326f2ef SHA512 183ca68d456a8d53e6f255129e8fd07b87d8da23b8f18187231d6fa70dac80e4069eb6c501d45155d9f0050b6bd713964e55f0e4b25a40546c4d245a17fc8dc6
+DIST unicode-segmentation-1.8.0.crate 94011 BLAKE2B 33440cedd5b51bd6075c9c75541bb8dcc16037b1c937ca72962f6c46be71a30850ab8e8a144d8b7548e5a91c78d551e7bbab5f26a713f1df0311d15f11299af9 SHA512 f0779ec42907b665df53f38ea370e661f10e7c72a75917f4cbd055868428c0eac1c7fc194d4bbf048e00f0f3d3e2b3602ae88d7820ad0c73e94a5228b61f6495
 DIST unicode-width-0.1.8.crate 16732 BLAKE2B 5aa7b87eef1322e4151a3fcf981ade311b8fa030527d7561815950e58d3f15156163dfe34da6a708c37dccc3f7652bf7fc2cd899fe8bb0118b67c4113ff3a2d2 SHA512 0abba6da6981a2451e01d93bbd47652c46eb6fb07cc0214f33259fb29945bfd5ee2b302e883ddca8f68e921635f222701b7310e7da2a5e225f854980d1e474b0
 DIST unicode-xid-0.2.2.crate 14955 BLAKE2B 6c6da49ac08dbd8b3248272224d6bff96b9cd1f36029b1937a58a0b929c3a48326053305ed49e73edd70f572f5abbc4817cedc899c69e3457805ad056669f6af SHA512 92ffd0dd34e3ca235ecf110b38c447d3ec1faa23d76c112457f28d432f92fa6b5f428bc5e1bfd278f361f55426dd96e19ecb0d3eff6cf250892f069c52bd89a8
 DIST url-2.2.2.crate 68555 BLAKE2B f8e59f784b6c2e16bacfba36ad68670a6af17c16ea3b0866b5aa98e5bf4686cf1b1aac9b1f0a0ea3b89a01e044a2ca37830416f42d147158ea8e88f23fd28ac2 SHA512 f9b6ad99d69ff303283b3fd9e98945fbd6cb411a3d141badcbb3a0566723a451375e6dd5d5357e3eb7a1b5b1ee5756a2347c43817db2de6fe35b9004b090e077
@@ -213,6 +281,7 @@ DIST urlencoding-1.1.1.crate 3711 BLAKE2B d325fb842acc932f66e93e167f7bda071bdfba
 DIST utf-8-0.7.6.crate 10422 BLAKE2B 296690040895ba9da9e69d527aea415f4bd6bd3c010e67a08f9cffd2f4cd92a99f9ddde77512f9ef5a0db069ac9ac3cd6fd91aa18f0bcadf870ed212fdd76f2b SHA512 6bf0787cc297a1ac4e47389464d05ef6850602f549621687e776618bec96c1f7bacbb1ac8faaa63e5d28d975b850db8d6c784eb66e2466128f0521b91c14015b
 DIST vec_map-0.8.2.crate 14466 BLAKE2B 8f109fbff19604b82ea2aa61c952e2ce9b5597ccc8e1ef4e847648e2de08dece8c4debe92889edeccb8d393645fd0b62436b49d236ded7ad181c4a51239a9539 SHA512 4f1ef59bc2c437e79f1f84fe021bce5aa8ccd581f500f3d5776913d5f17d45b03ccee64f5bd03d47656318cfc9344a1f4311079d471fa409a8e4e94c143973f9
 DIST version_check-0.9.3.crate 12547 BLAKE2B 85761c300a8d755e0b376191ef0604728ae641261fdb10682a3134a828eadc4a33216426d286bcdbd8d0c5fcfe6ca8ba20ed078c4f53066b959739a0e73daec0 SHA512 4b3b428214a0322af536a18e6f050438398766af6589389f20a804121a6721962ba411e2dcfded60aaa74313128fb0e831bea31378e2695c29b29bdc24d7cbfd
+DIST wait-timeout-0.2.0.crate 12441 BLAKE2B a99d3f57bc6e784ac06167f98b2dc2841f730dfab4fb9772b15e67707f756d6ba7daeb3e992d32291bed3daa85eaa8a8ddde64db5e1acf1cc4031fc9bdc82212 SHA512 db3b7aa2acfd44e64451042b8ba98eecab77a82aa5c58ed08dadb119ab36dee4e26d62baad7978ed56d5ad03019c96be5021455362290f56043981137bac8066
 DIST walkdir-2.3.2.crate 23516 BLAKE2B 473f2b51aafd6ac17e5c3da8d545d179b31486b3a65ab39fbd8bd7fbb2ebcc24bebf01781200a26a68f0b1cb464f5763a919aead3b03eba5a7e1be6efec5500b SHA512 6c44071354faf37720ec4117ded34c8d530489542ee107ac26a7a56ef4a882b9003e22e84f1d61f6078643521343e35aa1f7b57c838779e78e5937a667bf82da
 DIST want-0.3.0.crate 6550 BLAKE2B d97ac51dd5e49bec27cd196711110679013bb7aca520235db3f38c7d4399a2a17b9cf599cd0811137df957f2341e75442d48483dc7aed6910f0eed7a78ddad37 SHA512 7e7af8ddcc6faed3e3d18384a000339617187b74b0adf111a02bc15fdb152c88007844d6fe6f35a47a13f3384a19ee4723b884623de7d45c6619d76aa6699404
 DIST warp-0.2.5.crate 110850 BLAKE2B 130083bcab21932d50a8d45eae0cef547060de673ae715499e662ab5e3c7ca33cc0abfd701cae397cc1d9d2e15d78eb9857b487ef9fdb974f3ac981924901b27 SHA512 7f3d7a2c014b34405abf89dd04b4d38434b2f95db809cb30acbacf3cec4341051857ca870d92a42489b9489e56b8030e59192954ebd98ab36adea58b8af3b406
diff --git a/app-text/mdbook/mdbook-0.4.13.ebuild b/app-text/mdbook/mdbook-0.4.13.ebuild
new file mode 100644
index 0000000000..8ebef8fb3c
--- /dev/null
+++ b/app-text/mdbook/mdbook-0.4.13.ebuild
@@ -0,0 +1,252 @@
+# Copyright 2017-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Auto-Generated by cargo-ebuild 0.3.1
+
+EAPI=7
+
+CRATES="
+aho-corasick-0.7.18
+ammonia-3.1.2
+ansi_term-0.11.0
+anyhow-1.0.43
+assert_cmd-1.0.7
+atty-0.2.14
+autocfg-1.0.1
+base64-0.13.0
+bit-set-0.5.2
+bit-vec-0.6.3
+bitflags-1.3.2
+block-buffer-0.7.3
+block-buffer-0.9.0
+block-padding-0.1.5
+bstr-0.2.17
+byte-tools-0.3.1
+byteorder-1.4.3
+bytes-1.0.1
+cfg-if-0.1.10
+cfg-if-1.0.0
+chrono-0.4.19
+clap-2.33.3
+cpufeatures-0.1.5
+ctor-0.1.20
+difference-2.0.0
+difflib-0.4.0
+digest-0.8.1
+digest-0.9.0
+doc-comment-0.3.3
+either-1.6.1
+elasticlunr-rs-2.3.13
+env_logger-0.7.1
+fake-simd-0.1.2
+filetime-0.2.15
+float-cmp-0.9.0
+fnv-1.0.7
+form_urlencoded-1.0.1
+fsevent-0.4.0
+fsevent-sys-2.0.1
+fuchsia-zircon-0.3.3
+fuchsia-zircon-sys-0.3.3
+futf-0.1.4
+futures-0.3.16
+futures-channel-0.3.16
+futures-core-0.3.16
+futures-io-0.3.16
+futures-macro-0.3.16
+futures-sink-0.3.16
+futures-task-0.3.16
+futures-util-0.3.16
+generic-array-0.12.4
+generic-array-0.14.4
+getopts-0.2.21
+getrandom-0.1.16
+getrandom-0.2.3
+gitignore-1.0.7
+glob-0.3.0
+h2-0.3.4
+handlebars-4.1.2
+hashbrown-0.11.2
+headers-0.3.4
+headers-core-0.2.0
+heck-0.3.3
+hermit-abi-0.1.19
+html5ever-0.25.1
+http-0.2.4
+http-body-0.4.3
+httparse-1.5.1
+httpdate-1.0.1
+humantime-1.3.0
+hyper-0.14.11
+idna-0.2.3
+indexmap-1.7.0
+inotify-0.7.1
+inotify-sys-0.1.5
+input_buffer-0.4.0
+iovec-0.1.4
+itertools-0.10.1
+itoa-0.4.8
+kernel32-sys-0.2.2
+lazy_static-1.4.0
+lazycell-1.3.0
+libc-0.2.100
+log-0.4.14
+mac-0.1.1
+maplit-1.0.2
+markup5ever-0.10.1
+markup5ever_rcdom-0.1.0
+matches-0.1.9
+memchr-2.4.1
+mime-0.3.16
+mime_guess-2.0.3
+mio-0.6.23
+mio-0.7.13
+mio-extras-2.0.6
+miow-0.2.2
+miow-0.3.7
+net2-0.2.37
+new_debug_unreachable-1.0.4
+normalize-line-endings-0.3.0
+notify-4.0.17
+ntapi-0.3.6
+num-integer-0.1.44
+num-traits-0.2.14
+num_cpus-1.13.0
+opaque-debug-0.2.3
+opaque-debug-0.3.0
+opener-0.5.0
+output_vt100-0.1.2
+percent-encoding-2.1.0
+pest-2.1.3
+pest_derive-2.1.0
+pest_generator-2.1.3
+pest_meta-2.1.3
+phf-0.8.0
+phf_codegen-0.8.0
+phf_generator-0.8.0
+phf_shared-0.8.0
+pin-project-1.0.8
+pin-project-internal-1.0.8
+pin-project-lite-0.2.7
+pin-utils-0.1.0
+ppv-lite86-0.2.10
+precomputed-hash-0.1.1
+predicates-2.0.1
+predicates-core-1.0.2
+predicates-tree-1.0.2
+pretty_assertions-0.6.1
+proc-macro-hack-0.5.19
+proc-macro-nested-0.1.7
+proc-macro2-1.0.28
+pulldown-cmark-0.7.2
+quick-error-1.2.3
+quick-error-2.0.1
+quote-1.0.9
+rand-0.7.3
+rand-0.8.4
+rand_chacha-0.2.2
+rand_chacha-0.3.1
+rand_core-0.5.1
+rand_core-0.6.3
+rand_hc-0.2.0
+rand_hc-0.3.1
+rand_pcg-0.2.1
+redox_syscall-0.2.10
+regex-1.5.4
+regex-automata-0.1.10
+regex-syntax-0.6.25
+remove_dir_all-0.5.3
+ryu-1.0.5
+same-file-1.0.6
+scoped-tls-1.0.0
+select-0.5.0
+semver-0.11.0
+semver-parser-0.10.2
+serde-1.0.129
+serde_derive-1.0.129
+serde_json-1.0.66
+serde_urlencoded-0.7.0
+sha-1-0.8.2
+sha-1-0.9.7
+shlex-1.0.0
+siphasher-0.3.6
+slab-0.4.4
+socket2-0.4.1
+string_cache-0.8.1
+string_cache_codegen-0.5.1
+strsim-0.8.0
+strum-0.21.0
+strum_macros-0.21.1
+syn-1.0.75
+tempfile-3.2.0
+tendril-0.4.2
+termcolor-1.1.2
+textwrap-0.11.0
+time-0.1.43
+tinyvec-1.3.1
+tinyvec_macros-0.1.0
+tokio-1.10.0
+tokio-macros-1.3.0
+tokio-stream-0.1.7
+tokio-tungstenite-0.13.0
+tokio-util-0.6.7
+toml-0.5.8
+topological-sort-0.1.0
+tower-service-0.3.1
+tracing-0.1.26
+tracing-core-0.1.19
+treeline-0.1.0
+try-lock-0.2.3
+tungstenite-0.12.0
+typenum-1.13.0
+ucd-trie-0.1.3
+unicase-2.6.0
+unicode-bidi-0.3.6
+unicode-normalization-0.1.19
+unicode-segmentation-1.8.0
+unicode-width-0.1.8
+unicode-xid-0.2.2
+url-2.2.2
+utf-8-0.7.6
+vec_map-0.8.2
+version_check-0.9.3
+wait-timeout-0.2.0
+walkdir-2.3.2
+want-0.3.0
+warp-0.3.1
+wasi-0.10.2+wasi-snapshot-preview1
+wasi-0.9.0+wasi-snapshot-preview1
+winapi-0.2.8
+winapi-0.3.9
+winapi-build-0.1.1
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-util-0.1.5
+winapi-x86_64-pc-windows-gnu-0.4.0
+ws2_32-sys-0.2.1
+xml5ever-0.16.1
+"
+
+inherit cargo
+
+DESCRIPTION="Creates a book from markdown files"
+HOMEPAGE="https://github.com/rust-lang/mdBook"
+SRC_URI="https://github.com/rust-lang/mdBook/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" $(cargo_crate_uris ${CRATES})"
+# Prevent portage from trying to fetch bunch of *.crate from mirror despite they are not mirrored.
+RESTRICT="mirror"
+LICENSE="Apache-2.0 BSD CC0-1.0 ISC MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+QA_FLAGS_IGNORED="usr/bin/mdbook"
+
+src_prepare() {
+	eapply_user
+
+	mv ../mdBook-${PV}/{.,}* .
+}
+
+src_install() {
+	cargo_src_install
+
+	dodoc CHANGELOG.md README.md
+}
diff --git a/dev-R/RcppEnsmallen/Manifest b/dev-R/RcppEnsmallen/Manifest
index 592d85448d..a0c565f82c 100644
--- a/dev-R/RcppEnsmallen/Manifest
+++ b/dev-R/RcppEnsmallen/Manifest
@@ -1 +1 @@
-DIST RcppEnsmallen_0.2.15.0.1.tar.gz 223966 BLAKE2B fd7ed0b56d2f136f836b8987bb7b599aa1acdffce3c77e381939d7ec575cb5dabb181d5ddd7c229f3905b3d43c69705cd55fffcae5ea057742435ac13baa5080 SHA512 ab3ad2711154342030f66d89a3472181ac311b769b55018742cbee7e233327eabb85d4dccb9a5361f680d1ca0fe5ffa613211f908d85981eea19efd0ecb39f70
+DIST RcppEnsmallen_0.2.17.0.1.tar.gz 243399 BLAKE2B c143d6f2d3631e1226ee35894fc56ea113a756418efbd1e2deb70d9b1ddbf63e79b6cbe8c86f2dab81bbfd62af2ae464651fedd893dee0c6961c8759f589c421 SHA512 6b6c10ad188b13cca2498c5fc2cec74a18eab34f30411cbc48e09c327253889aa85a80717372aadc2f5c2245f7a7332c474cae237730bab5dbf4b4895f0f7607
diff --git a/dev-R/RcppEnsmallen/RcppEnsmallen-0.2.15.0.1.ebuild b/dev-R/RcppEnsmallen/RcppEnsmallen-0.2.17.0.1.ebuild
similarity index 91%
rename from dev-R/RcppEnsmallen/RcppEnsmallen-0.2.15.0.1.ebuild
rename to dev-R/RcppEnsmallen/RcppEnsmallen-0.2.17.0.1.ebuild
index 8fc9736853..4a00cf0af3 100644
--- a/dev-R/RcppEnsmallen/RcppEnsmallen-0.2.15.0.1.ebuild
+++ b/dev-R/RcppEnsmallen/RcppEnsmallen-0.2.17.0.1.ebuild
@@ -8,7 +8,7 @@ MYPV="$(ver_cut 2-4 ${PV})"
 inherit R-packages
 
 DESCRIPTION='Header-Only C++ Mathematical Optimization library for armadillo'
-SRC_URI="mirror://cran/src/contrib/Archive/RcppEnsmallen/RcppEnsmallen_${PV}.tar.gz"
+#SRC_URI="mirror://cran/src/contrib/RcppEnsmallen/RcppEnsmallen_${PV}.tar.gz"
 KEYWORDS="~amd64"
 LICENSE='GPL-2+'
 
diff --git a/dev-R/lattice/Manifest b/dev-R/lattice/Manifest
index 28eb711ac7..4aa2697d7e 100644
--- a/dev-R/lattice/Manifest
+++ b/dev-R/lattice/Manifest
@@ -1 +1,2 @@
-DIST lattice_0.20-44.tar.gz 399257 BLAKE2B 98ce0b74478dc5bf2e9e1f8282a1793d38a3cabdce3e48e8bc7f9a18b438bc91e32a61195e845308892a8c290ac7326b1d842a8760903f413d8407d6901c264a SHA512 425cbe4e0efa3a53b1b5609cecd6065d4b1c6cb0eb00f4595d1446a642efb8b95da769f66081b7f106b43170dcded146151d7597a74daef4c9ec79302792f5f2
+DIST lattice-0.20.44.tar.gz 399257 BLAKE2B 98ce0b74478dc5bf2e9e1f8282a1793d38a3cabdce3e48e8bc7f9a18b438bc91e32a61195e845308892a8c290ac7326b1d842a8760903f413d8407d6901c264a SHA512 425cbe4e0efa3a53b1b5609cecd6065d4b1c6cb0eb00f4595d1446a642efb8b95da769f66081b7f106b43170dcded146151d7597a74daef4c9ec79302792f5f2
+DIST lattice-0.20.45.tar.gz 399470 BLAKE2B b228bfb8e5d8e01a0e6977bcc1f63f61d097d01bd429bf4050de00ac4e1b3230153bb418bd778c4e352201246041bd141c4d5860b7a66bd3703e7ab97feb8a05 SHA512 b27975007c86e05653ddf1b9f0188e1fdbf4497965279928b71bc7b39df5a42c05e3fcee2dbd4284dbc6f3af4e32730c259b1abb29c6632ac90571ba15e65391
diff --git a/dev-R/lattice/lattice-0.20.44.ebuild b/dev-R/lattice/lattice-0.20.44.ebuild
index 14a13fb34e..c88a0c20e7 100644
--- a/dev-R/lattice/lattice-0.20.44.ebuild
+++ b/dev-R/lattice/lattice-0.20.44.ebuild
@@ -3,11 +3,12 @@
 
 EAPI=7
 
-inherit R-packages
+inherit R-packages optfeature
 
 DESCRIPTION='Trellis Graphics for R'
+HOMEPAGE="http://lattice.r-forge.r-project.org/index.php"
 KEYWORDS="~amd64"
-SRC_URI="http://cran.r-project.org/src/contrib/lattice_0.20-44.tar.gz"
+SRC_URI="mirror://cran/src/contrib/Archive/"{$PN}"/"${PN}"_"$(ver_rs 2 '-')".tar.gz -> "${P}".tar.gz"
 LICENSE='GPL-2+'
 
 DEPEND="
@@ -15,3 +16,7 @@ DEPEND="
 	dev-lang/R[minimal]
 "
 RDEPEND="${DEPEND}"
+
+pkg_postinst() {
+	optfeature "immer in the MASS package for data from the same experiment (expressed as total yield for 3 blocks) for a subset of varieties" dev-R/MASS
+}
diff --git a/dev-R/lattice/lattice-0.20.45.ebuild b/dev-R/lattice/lattice-0.20.45.ebuild
new file mode 100644
index 0000000000..559080528e
--- /dev/null
+++ b/dev-R/lattice/lattice-0.20.45.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit R-packages optfeature
+
+DESCRIPTION='Trellis Graphics for R'
+HOMEPAGE="http://lattice.r-forge.r-project.org/index.php"
+KEYWORDS="~amd64"
+SRC_URI="mirror://cran/src/contrib/"${PN}"_"$(ver_rs 2 '-')".tar.gz -> "${P}".tar.gz"
+LICENSE='GPL-2+'
+
+DEPEND="
+	>=dev-lang/R-3.0.0
+	dev-lang/R[minimal]
+"
+RDEPEND="${DEPEND}"
+
+pkg_postinst() {
+	optfeature "immer in the MASS package for data from the same experiment (expressed as total yield for 3 blocks) for a subset of varieties" dev-R/MASS
+}
diff --git a/dev-R/waldo/Manifest b/dev-R/waldo/Manifest
index 46c624cf8b..37efec9e72 100644
--- a/dev-R/waldo/Manifest
+++ b/dev-R/waldo/Manifest
@@ -1 +1 @@
-DIST waldo_0.2.5.tar.gz 26295 BLAKE2B 98a63480956f18d800a07d82e5ad7c8276138295e7a6a2781485efee20698456d3da80394627b41490918cc8baf41491bfa1f950ab134534035b56599ca2dd7f SHA512 b94540663ece80b62fb423b4016ad7e5a82dd6a6905a1f7a237d0c795fc0823dbb3eeb03db32885ead1d9d6d5e03ac1b90427e7f38556730207d3bf745159131
+DIST waldo_0.3.1.tar.gz 33728 BLAKE2B b2219446582a2479b32316159bff0bb1309f7cb7bca71fd97e126e8c3ddc77873e33e20ef7600d123ad56362a016d724e44ae631afc19d2ad2dcbe3300331f77 SHA512 3655f92013f87c7a34c36bdeaba225c7f0dd7b31703b018191ab3b665f93c46ec1a4f37c8b904aa80c344ee9e10fb905ef75bda935a309e0bc14a44fa2ab418f
diff --git a/dev-R/waldo/waldo-0.2.5.ebuild b/dev-R/waldo/waldo-0.3.1.ebuild
similarity index 73%
rename from dev-R/waldo/waldo-0.2.5.ebuild
rename to dev-R/waldo/waldo-0.3.1.ebuild
index 489f8c7f46..dff58087d3 100644
--- a/dev-R/waldo/waldo-0.2.5.ebuild
+++ b/dev-R/waldo/waldo-0.3.1.ebuild
@@ -10,12 +10,20 @@ KEYWORDS="~amd64"
 LICENSE='MIT'
 
 DEPEND="
-	>=dev-R/rlang-0.4.10
-	dev-R/tibble
-	dev-R/fansi
-	dev-R/diffobj
 	dev-R/cli
+	>=dev-R/diffobj-0.3.4
+	dev-R/fansi
 	dev-R/glue
 	dev-R/rematch2
+	>=dev-R/rlang-0.4.10
+	dev-R/tibble
 "
 RDEPEND="${DEPEND}"
+
+SUGGESTED_PACKAGES="
+	dev-R/covr
+	>=dev-R/testthat-3.0.0
+	dev-R/R6
+	dev-R/withr
+	dev-R/xml2
+"
diff --git a/dev-R/xfun/Manifest b/dev-R/xfun/Manifest
index 8dc9bf9a44..34f90e92fe 100644
--- a/dev-R/xfun/Manifest
+++ b/dev-R/xfun/Manifest
@@ -1 +1 @@
-DIST xfun_0.24.tar.gz 112441 BLAKE2B 74bddcec27db321e2f9f059aab35b55115d4e64dc92cd5dcb4b8f9fdcefb912b5cd10dc8f340e9d211a6ece750a14ddfad0a3c92e088ab9be03e1d18659c1e7b SHA512 c6b1cf001af4922d3ffe847a4ff7259b025f31c81c8dc94bf29003fd6a3617157a939ac53c5222257054093f60d718a243d805664e3cb2bfa96c8c932356ccc1
+DIST xfun_0.26.tar.gz 113158 BLAKE2B 977937f749f2d22562d686fb357d18c7e9dff15623db1e22f4c9d4b3c8e41480f6aed83df7b88f9f358810e43cafc97904cad069a961da206a91f68cf8f9fb85 SHA512 28e8bb6587c1c80044e55947e0e6efbe58d90f042cec940f0aa26f1eaed5cb9cde0014cdeff002cc10ccefb3388f4585b27de57cc61a577b8f7f45b7e27aa95e
diff --git a/dev-R/xfun/xfun-0.24.ebuild b/dev-R/xfun/xfun-0.24.ebuild
deleted file mode 100644
index 9e297eed68..0000000000
--- a/dev-R/xfun/xfun-0.24.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit R-packages
-
-DESCRIPTION='Supporting Functions for Package maintained by Yihui Xie'
-KEYWORDS="~amd64"
-LICENSE='MIT'
diff --git a/dev-R/xfun/xfun-0.26.ebuild b/dev-R/xfun/xfun-0.26.ebuild
new file mode 100644
index 0000000000..7a04da32b9
--- /dev/null
+++ b/dev-R/xfun/xfun-0.26.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit R-packages
+
+DESCRIPTION='Supporting Functions for Package maintained by Yihui Xie'
+KEYWORDS="~amd64"
+LICENSE='MIT'
+
+SUGGESTED_PACKAGES="
+	dev-R/testit
+	dev-R/parallel
+	dev-R/codetools
+	dev-R/rstudioapi
+	>=dev-R/tinytex-0.30
+	dev-R/mime
+	dev-R/markdown
+	dev-R/knitr
+	dev-R/htmltools
+	dev-R/remotes
+	dev-R/pak
+	dev-R/rhub
+	dev-R/renv
+	dev-R/curl
+	dev-R/jsonlite
+	dev-R/rmarkdown
+"
diff --git a/dev-cpp/coeurl/Manifest b/dev-cpp/coeurl/Manifest
new file mode 100644
index 0000000000..7ac73aba63
--- /dev/null
+++ b/dev-cpp/coeurl/Manifest
@@ -0,0 +1 @@
+DIST coeurl-0.0.1_pre20210813.tar.bz2 19129 BLAKE2B f6b4b57cebd0251ddc778ad9d0fe02a852604b84894662c1dda644687dea8603aac6bd2f2a6108ae72ca8c08b07204992a8874313975ff9c03f3c49f5ddc7993 SHA512 9f50778a0f3de966bb60bb524413e783277175ae4fa38dd8a356159dd7ed65338ceab309a510bbf040b076d03f8bfeb77fd10426e2291cadff4b27afe8d0ed2e
diff --git a/dev-cpp/coeurl/coeurl-0.0.1_pre20210813.ebuild b/dev-cpp/coeurl/coeurl-0.0.1_pre20210813.ebuild
new file mode 100644
index 0000000000..ac8e678a29
--- /dev/null
+++ b/dev-cpp/coeurl/coeurl-0.0.1_pre20210813.ebuild
@@ -0,0 +1,24 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson
+
+MY_COMMIT="22f58922da16c3b94d293d98a07cb7caa7a019e8"
+DESCRIPTION="A simple async wrapper around CURL for C++"
+HOMEPAGE="https://nheko.im/nheko-reborn/coeurl"
+SRC_URI="https://nheko.im/nheko-reborn/coeurl/-/archive/${MY_COMMIT}/${PN}-${MY_COMMIT}.tar.bz2 -> ${P}.tar.bz2"
+S="${WORKDIR}/${PN}-${MY_COMMIT}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="test" # Tests turned off because they need a local webserver.
+
+RDEPEND="
+	net-misc/curl
+	dev-libs/libevent
+	dev-libs/spdlog
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-dotnet/dotnet-aspnet-bin/metadata.xml b/dev-cpp/coeurl/metadata.xml
similarity index 70%
rename from dev-dotnet/dotnet-aspnet-bin/metadata.xml
rename to dev-cpp/coeurl/metadata.xml
index e29f0a4a02..5533c93d75 100644
--- a/dev-dotnet/dotnet-aspnet-bin/metadata.xml
+++ b/dev-cpp/coeurl/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>telans@posteo.de</email>
-		<name>James Beddek</name>
+		<email>gentoo@tastytea.de</email>
+		<name>Ronny (tastytea) Gutbrod</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/dev-cpp/fbthrift/Manifest b/dev-cpp/fbthrift/Manifest
index dcd8c044f5..01b0015b59 100644
--- a/dev-cpp/fbthrift/Manifest
+++ b/dev-cpp/fbthrift/Manifest
@@ -1 +1,2 @@
 DIST fbthrift-2021.08.02.00.tar.gz 5833339 BLAKE2B 647f582396a88ae616162e011bc77c15d4e08d0b511f12684d4b731a2108c370971d7ec52f8ac0c84ff9e94b228e69f4fca29b1ca0747e39bbcf5d58cd491b2a SHA512 a416f9a09a62293fc756d631355787fd0faed639d77986a654610c3fc49344e1f0184d2333c79bd49ac9a450be6d2542317beb512e72d99179206db0cc5e7467
+DIST fbthrift-2021.10.04.00.tar.gz 5974931 BLAKE2B f268dae6368c8619d877d41bf4eaa018110e002da6b5a57a573d3345da62d5dfc13310e84792ad59d3c9e11e70e67eced7b441bfad67fe23afe1a779e485030c SHA512 5b1c7f2e787d198bcf8664e38714e860fbeda75aa1c2cd35e6dde10493451d58241693c81fbf7680725747e9ccb958728dc1ed27d161c466ee18e00ca2d25b2f
diff --git a/dev-cpp/fbthrift/fbthrift-2021.10.04.00.ebuild b/dev-cpp/fbthrift/fbthrift-2021.10.04.00.ebuild
new file mode 100644
index 0000000000..3320d823e2
--- /dev/null
+++ b/dev-cpp/fbthrift/fbthrift-2021.10.04.00.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
+
+DESCRIPTION="Facebook's branch of Apache Thrift, including a new C++ server"
+HOMEPAGE="https://github.com/facebook/fbthrift"
+SRC_URI="https://github.com/facebook/fbthrift/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	app-arch/zstd
+	~dev-cpp/fizz-${PV}:=
+	~dev-cpp/folly-${PV}:=
+	dev-cpp/gflags
+	dev-cpp/glog
+	~dev-cpp/wangle-${PV}:=
+	dev-libs/libfmt
+	dev-libs/openssl:0=
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DLIB_INSTALL_DIR=$(get_libdir)
+	)
+	cmake_src_configure
+}
diff --git a/dev-cpp/fizz/Manifest b/dev-cpp/fizz/Manifest
index 8400375e1a..caf1d015bc 100644
--- a/dev-cpp/fizz/Manifest
+++ b/dev-cpp/fizz/Manifest
@@ -1 +1,2 @@
 DIST fizz-2021.08.02.00.tar.gz 540357 BLAKE2B 6edb14ea4b981a7b9fe076570e583c8b875929e63135d4848b1c1a2aa109e1258fd541376bc9346dc229f2dba0e2c346cebb5b486c8a33bcc54f6746ff3de5f0 SHA512 59c734127d9a1dfb7975929f20ae27a11ee3f2a35fb73ef1ba311b347457339a524194459023e2fb038cc7bf688e13beb6391227bec1ecdb12397344e45f051f
+DIST fizz-2021.10.04.00.tar.gz 543594 BLAKE2B d024f3a7d7ea4fd03f6525e225e6f33dbe931a7c8ff5b01fb572b22f09286d606897c091f63ebecd1b1558667b21bae635b1b555b1ca82b610d152160eb0f11e SHA512 be99b9abd8b832af22411ab894ee82285a637c79176955cd0cf242aed77de1883f98eaaeeef7391a75b42f7c3a4e8c2b26a11a242554688adde84a02f87261c9
diff --git a/dev-cpp/fizz/fizz-2021.10.04.00.ebuild b/dev-cpp/fizz/fizz-2021.10.04.00.ebuild
new file mode 100644
index 0000000000..a1908fcff7
--- /dev/null
+++ b/dev-cpp/fizz/fizz-2021.10.04.00.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="C++14 implementation of the TLS-1.3 standard"
+HOMEPAGE="https://github.com/facebookincubator/fizz"
+
+SRC_URI="https://github.com/facebookincubator/fizz/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+CMAKE_USE_DIR="${S}/fizz"
+
+RDEPEND="
+	~dev-cpp/folly-${PV}:=
+	dev-cpp/gflags
+	dev-cpp/glog
+	dev-libs/double-conversion
+	dev-libs/libevent
+	dev-libs/libfmt
+	dev-libs/libsodium
+	dev-libs/openssl:0=
+"
+#TODO: discover if gtest is linked
+DEPEND="
+	${RDEPEND}
+	dev-cpp/gtest
+"
+
+src_prepare() {
+	cmake_src_prepare
+	sed -i '/Sodium/d' fizz/cmake/fizz-config.cmake.in || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLIB_INSTALL_DIR=$(get_libdir)
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-cpp/folly/Manifest b/dev-cpp/folly/Manifest
index 3b6d47a6ab..c6f7a6ee94 100644
--- a/dev-cpp/folly/Manifest
+++ b/dev-cpp/folly/Manifest
@@ -1 +1,2 @@
 DIST folly-2021.08.02.00.tar.gz 3469070 BLAKE2B f670746690c3531e573fb01293361808f943de7324bfd4862a10ea9764a41197094e522668e580946244279fa096f7173958cccc57b4f610c7c08ccbf3ec702d SHA512 dbe005f31eeb60e85ef949432de09d7c49a52b19f195c06ef265189a13ad98cbd4b902b59f303c140b7aedc5ff8a604cc9bda9d1d374290561124a729c07149d
+DIST folly-2021.10.04.00.tar.gz 3495417 BLAKE2B ed8745c605ad66ee5bd2474737c7e0a7d08243bf809a1880cc010077a3ec8bd6155d7dc853fd165a956b5635fbdd1691de004320e78a1be194aaedae8554b77d SHA512 685cb716d1131a456a927d769eaf7174ec4528cdafd124c38a424c630a820a90998258c79cb793d91c8a4d587367524e597cb4dcc5d4f377815bfdd7ad29cbf2
diff --git a/dev-cpp/folly/folly-2021.10.04.00.ebuild b/dev-cpp/folly/folly-2021.10.04.00.ebuild
new file mode 100644
index 0000000000..e95ea64e9d
--- /dev/null
+++ b/dev-cpp/folly/folly-2021.10.04.00.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="An open-source C++ library developed and used at Facebook"
+HOMEPAGE="https://github.com/facebook/folly"
+SRC_URI="https://github.com/facebook/folly/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+DEPEND="
+	app-arch/lz4
+	<app-arch/snappy-1.1.9
+	app-arch/zstd
+	dev-cpp/gflags
+	dev-cpp/glog[gflags]
+	dev-libs/boost[context,threads(+)]
+	dev-libs/double-conversion
+	dev-libs/libevent
+	dev-libs/libfmt
+	sys-libs/binutils-libs
+	sys-libs/zlib
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	cmake_src_prepare
+	sed \
+		-e "s/lib CACHE/$(get_libdir) CACHE/" \
+		-e "s/lib\/cmake\/folly CACHE/$(get_libdir)\/cmake\/folly CACHE/" \
+		-i CMakeLists.txt || die
+}
diff --git a/dev-cpp/vexcl/files/vexcl-1.4.2-include-map.patch b/dev-cpp/vexcl/files/vexcl-1.4.2-include-map.patch
new file mode 100644
index 0000000000..e3fd08a16b
--- /dev/null
+++ b/dev-cpp/vexcl/files/vexcl-1.4.2-include-map.patch
@@ -0,0 +1,26 @@
+From 555a838850c96ab838a299255157fbe4fd4df2ee Mon Sep 17 00:00:00 2001
+From: Denis Demidov <dennis.demidov@gmail.com>
+Date: Mon, 4 Oct 2021 10:46:03 +0300
+Subject: [PATCH] Missing <map> include in backend/{opencl/compute}/filter.hpp
+
+Fixes #290
+--- a/vexcl/backend/compute/filter.hpp
++++ b/vexcl/backend/compute/filter.hpp
+@@ -35,6 +35,7 @@ THE SOFTWARE.
+ #include <fstream>
+ #include <string>
+ #include <vector>
++#include <map>
+ #include <functional>
+ #include <cstdlib>
+ 
+--- a/vexcl/backend/opencl/filter.hpp
++++ b/vexcl/backend/opencl/filter.hpp
+@@ -35,6 +35,7 @@ THE SOFTWARE.
+ #include <fstream>
+ #include <string>
+ #include <vector>
++#include <map>
+ #include <functional>
+ #include <cstdlib>
+ 
diff --git a/dev-cpp/vexcl/vexcl-1.4.2-r1.ebuild b/dev-cpp/vexcl/vexcl-1.4.2-r2.ebuild
similarity index 92%
rename from dev-cpp/vexcl/vexcl-1.4.2-r1.ebuild
rename to dev-cpp/vexcl/vexcl-1.4.2-r2.ebuild
index e246c3a57b..2e98677360 100644
--- a/dev-cpp/vexcl/vexcl-1.4.2-r1.ebuild
+++ b/dev-cpp/vexcl/vexcl-1.4.2-r2.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
 
 DOCS_BUILDER="sphinx"
 DOCS_DEPEND="
@@ -9,7 +9,7 @@ DOCS_DEPEND="
 	dev-python/sphinx-bootstrap-theme
 "
 DOCS_DIR="docs"
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake python-any-r1 docs
 
@@ -35,7 +35,10 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}/add-sphinx-ext-autodoc-to-conf-py.patch" )
+PATCHES=(
+	"${FILESDIR}/add-sphinx-ext-autodoc-to-conf-py.patch"
+	"${FILESDIR}/${P}-include-map.patch"
+)
 REQUIRED_USE="
 	^^ ( ${IUSE_BACKEND//+/} )
 "
diff --git a/dev-cpp/wangle/Manifest b/dev-cpp/wangle/Manifest
index cfd6db2d3e..cc325b4bfa 100644
--- a/dev-cpp/wangle/Manifest
+++ b/dev-cpp/wangle/Manifest
@@ -1 +1,2 @@
 DIST wangle-2021.08.02.00.tar.gz 336849 BLAKE2B 0d9e6c9843da125961c8434b50644a4a18ec966f867f8304118eb5b41809f825ced7d740fa9ab85e0dc275541ca2e50d07c3fd3ad43fa98c32853c1d11bd344c SHA512 6be173d0804fa0d67f411f1160a7fc627a4eeeadf5222b26f0498af33a659e90f5539b14eeca17cd32008c902900e78497ae5bb6ce70575e7e1ebecca14d2c81
+DIST wangle-2021.10.04.00.tar.gz 337770 BLAKE2B fae836a3eb40b10ad5a4af31837731681f7c748ac3450da9c6125d49cc48856004380868d985859ab54ef6032ec0827ab73b688a9c0732be9bdbcbc5340bc85d SHA512 1ea0bf0bbae7999e5c2d9216b846f59b81b0e3219487bc34576cce9470dc7b5a2af623d8565a27ef2c8d63ffc2c1f8e5f226f9f9ad078b911e98986da908c69f
diff --git a/dev-cpp/wangle/wangle-2021.10.04.00.ebuild b/dev-cpp/wangle/wangle-2021.10.04.00.ebuild
new file mode 100644
index 0000000000..2440a2f5c1
--- /dev/null
+++ b/dev-cpp/wangle/wangle-2021.10.04.00.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Framework providing common client/server abstractions"
+HOMEPAGE="https://github.com/facebook/wangle"
+
+SRC_URI="https://github.com/facebook/wangle/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+CMAKE_USE_DIR="${S}/wangle"
+
+DEPEND="
+	~dev-cpp/fizz-${PV}:=
+	~dev-cpp/folly-${PV}:=
+	dev-cpp/gflags
+	dev-cpp/glog
+	dev-libs/double-conversion
+	dev-libs/libevent
+	dev-libs/libfmt
+	dev-libs/openssl:0=
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DLIB_INSTALL_DIR=$(get_libdir)
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-cpp/xdgpp/Manifest b/dev-cpp/xdgpp/Manifest
index b883dfdb9a..83e5c069ef 100644
--- a/dev-cpp/xdgpp/Manifest
+++ b/dev-cpp/xdgpp/Manifest
@@ -1,9 +1,9 @@
-DIST xdgpp-01.patch 18645 BLAKE2B 37f28e5c10c53995d03aa0c0d67c8551760ead077cc60051ce45bce100cce9466fdaf954c8aed8b762fbed8b1cc6d693257aefe71e1e3cc578adb5e6af1cce91 SHA512 76ef4a01d034ea07c804fc0af0d3068b7d25b4c121a5e1fc4061792c69296d1c2765a0bbc4c2f9b994740bcba4f084b0b6e3c2cdbdcec4d87a9d05776ec8943d
-DIST xdgpp-02.patch 1686 BLAKE2B c7e1627e1aa7c419973b1c7a029932d2ba3b4dd2899dd776cbe2ab6f3b0c7488592c1e90e8012c6b79adf2fbfeb9b655ffab6e92f3c294ee3e35c4041c6cd272 SHA512 49ed9458307e177390c4af53d5bce0901f9ef3310f6d00a7def418de27e560a836b6065624abaf805475e89016939d72fc776c59301b39e5c279d410581ee538
-DIST xdgpp-03.patch 2242 BLAKE2B 62ea3037e99070450ea127452cbebfdddce2821e6479cf47cf62c58a7c9a8844fe3d4e29c48c4f82b0121925e44e5a5c7b5ee0ec1ffb0612de2ab640f67937d0 SHA512 d0fcce9c37ddbdcf035b4f1a353a41c2a9742156341e7350b5af9b5078860a05ed67db70f90af44352bc51936bb15eaa89bbfde20164de089766a9be3a1ff10b
-DIST xdgpp-04.patch 941 BLAKE2B 77154c1d6c3639e6bdd7914acefc4b8c3080fdf5a1926546de44db352e01b49109ccc45148ce1a02108e8b7f6280acffb71c3e56125556324503c60da9d2324c SHA512 eae051f9ccc3682a37e57f41a608bb3b292f9e757aa8b1533a11a9599b89a3c97f68d50f2c45d41f7cb3259cb1ed6286871ddded67080fd188d15721a09b1b1b
-DIST xdgpp-05.patch 1468 BLAKE2B 2f105c5a061b5457303e450e97fa0c6bb9b4bce105c13374feef01dd412bae6857121433380a92fb5f9d01cb37f9868d87f3b8763058d24d40fd6e672e678cc8 SHA512 5fbefbe80da2903dd994f9d306240026802532f0c6f667b7cd624928ecb6ee7fddd97694184aff7129f4a809467390f2d6aec689cf20d82366c8404444b0095c
-DIST xdgpp-06.patch 1554 BLAKE2B fbe5a9971230086c8db6ef8c8b6b06c52edcb37019f10c0c7639cedc0caa945c33a5c1d8c82b31284b2b9960d46b1380e5f71ca74a95c624cf1053a0b2cee97c SHA512 1040133d4ce1214f1e6006487481eae1906220348ec12b524af0f43d88030a487d26b22822225120f4bc032634d5ea7feba6d0cc1d18449afb91a1bea9717a0e
-DIST xdgpp-07.patch 783 BLAKE2B a929f12664a3e0c843a267572ce09da668fdeb564333f6570662e430b8a595688a432c3147a97b965f1441bffc3a6ed1e98de331435b38e03b6466533abfd8c4 SHA512 8857a95fc47e6819c16f8596f1136795d1eefce71b0f59124d79dcbfb8181134acc9fc53bff66efbaf92fc51ada46604e9777d4e519ad126b0c4a3f4a33b9f8f
-DIST xdgpp-08.patch 776 BLAKE2B 88acef3e9548fd28d641ddbc1d4675946cf91a54164df172e1b81495ef0ccda0e782827d2a777ffb9b4e0329138078c40675b1d363c2a061570ecdd91fd12f06 SHA512 f9b58d41e4c796d985d1515f1b836d4b64c0c154635c5281d004a376220e8ba7550aa8f9bb72fa56af81292cde6a72d5a36d0fdf59b69b34a68f927bc6d27d52
-DIST xdgpp-09.patch 1283 BLAKE2B 4c0ae66928f1e3ff54d9e10028d8bbc406ae193ff884e54ec4170ba4874de42f596a27e3de03257bd181d8bee8604feeb0994afacf1e6039797ed9d60ef1aee4 SHA512 4136f81242b9078620549ac70128b348225815f141e6fb5ca8e76e54ec25f0ebc9cfec655ac92f397d8934d8189aa6ebf20220f41db1c87ee6dcf69d6944d913
+DIST xdgpp-01.patch 18645 BLAKE2B f91bbfb9117fa22a38003cf78d1e249ffcbb908433b7648c0444120495ed98929c99294805c79eab737c879d5a0e2d48ff09ea7ffee607ade36c23e810a07c6d SHA512 ee25622cd55c9f06b6e41b83d9853f96b88f82508c70fa57c35c010d8ff4f070a62b958c296bef68e5cdef0b887a3ef998556e2c1b0281fd9dc2b20999e4099e
+DIST xdgpp-02.patch 1686 BLAKE2B 0dd3f836056009f51ca4fde5f17d74ebb9f90d4d564e9af6d7cd8e561251f31021c0414f01f253e2355dc0079929b4626daa8189294b4a48144d4127e3549a02 SHA512 9341eb4994a4705eebcce1793d5a5a2ed4e5031a7ee535b30f9ccfab153f04c13bf50f7f318f2bcda027a9aebab799888310e5192e1925de83bc8606003495d0
+DIST xdgpp-03.patch 2242 BLAKE2B af4ccd6c023fe17b8cf69514915e5f29581528dee3a971b9c49796fc16a67da8c0bb1a042a65970a4e0e98341bf7bada6236325df78f324d520bc3c3c9ee2731 SHA512 6dc7dd203957f6c9bf33dc387af293edb01c29639d21eee2757da9c0f3da1f60113cd4eb088f2c96bf7f2d528b6ad1056abe495b2bfd27f516c9050b0034f648
+DIST xdgpp-04.patch 941 BLAKE2B 276192f42ae1dc85a09a6b894b93fc2add1c6438b8696f8adb5fd2a55e2ce60daf97310e577d60fb779ab60863bcc41b0f18ce8e4ac13e61dd65db684287fc50 SHA512 1f55e78237945226743b862899fbce20ff88261e3d51eabd049c093f6780b5b14a159d2193caade7a8c5f048f3c9f082566146c1812b499280717c5c6afd9f46
+DIST xdgpp-05.patch 1468 BLAKE2B f2f350c0c602f00d1703fb7910f1d9c8d460aecdbfbdc50119ab66ba001888388b41a0f8097c09dd4fa6f8b903cbd52534d0c9f1ef0813f6679533bb734c4649 SHA512 79a0b7fb8c9ad289ef5a7d6b358c84f3f99cfb42f75a3fd8582a17dc6230a14238e52378fa5861963d5a1a5d6b1fbf740b3011c560d96d6b141ea57f38ee016b
+DIST xdgpp-06.patch 1554 BLAKE2B 317ba86d06c3bd6c423f6a3d15e0ee9e0c58a50f9bdf00c38282db381e299a4ee6f3fb32fa7f393cf6480c6bb3427c230997c31f1ae07cad22cea27d5e1ceb54 SHA512 e5c85c67bd82cd5f2243869bbdc5315e98e93c1797823733f279136e1ee78acd326ea4046199d7cc3916d074a042c74135f0cf7d9a7031a99dd40cc2a6159b6e
+DIST xdgpp-07.patch 783 BLAKE2B 1754e87fa6abb54f4a501ab5961e8a4fcfdadcedaf943a08adee85860ffdbd35f3c96f484bad3d5a99d7c9fbc32f5225e4506072d86663ae04710ecc6c6bb89b SHA512 1eafdd63fd4dce0e86819c6a794530699fd357aeef2084b258bda673457b17d42356d183a73fce45474a5363664c1b9d360e86735754f8a43f85adaaa8d07673
+DIST xdgpp-08.patch 776 BLAKE2B ca3ad59674c3b37d803881701114bb1960ab39b5e28faba50d5dfaced0c9669c30f16039d4389a059ca8985e4af88ab860da0ace758959fb74b463562b43dfdf SHA512 686a1b7da86356270fdb8f3d6f3455cea7410174124768a037770a050d4d2750fea9ca20317102a905ef1db2f09fb4fccb1c1d00e0dd8edab02b43899183b620
+DIST xdgpp-09.patch 1283 BLAKE2B 0a55ee1e9de425ffc09b7612f83df7c5242cc1997e9a0a8dd7607b423a6a22ace94e89bcdb3f9a6734d9737d7b8f004525f581e496a4451f2514d5a758f385c1 SHA512 ddf667ce44d29c683c22e6c808e90398dbd9b83ed0544d9032536eb2f4d1054d61c1b3af2234280292505dba526bfe6c069601564927c223184770e55aa1951d
diff --git a/dev-db/pg_repack/Manifest b/dev-db/pg_repack/Manifest
index 467c88b23e..86d75afc32 100644
--- a/dev-db/pg_repack/Manifest
+++ b/dev-db/pg_repack/Manifest
@@ -1 +1 @@
-DIST pg_repack-1.4.6.tar.gz 94760 BLAKE2B e85d4cf3c31c9a96db818d2be8137c3d3ca3b3bfb3d2cf28cd0a77742c2487e9c9627b3ca5724963d6af1dd0e95dc8c8be7e00ff98d1f58d0ac1fef30393bc60 SHA512 c36081847d09fbcec8a98ce97ae0f93a8fa686b81fa3915b616481cef88da0db398e7985b98a6e6d1b80cba7b08f6501de0e53edeb876eeb317417fe6ba7571d
+DIST pg_repack-1.4.7.tar.gz 95343 BLAKE2B 70c822901646c3f425257ac56052470537083792d96f5bc8fd87a65e8f70f1afd66366edae0f723e258af140a82ae154502f7d21799a72cb2fc10453abbb16ac SHA512 bdcc61fa8ee8d8868d33aa308311e2f7029f8cb8f6d6627e36303ba36e8e7cef31cbb5a665029d63072fb5ea0983e9310b29055d98fceb0c18c5838bdc8bc50c
diff --git a/dev-db/pg_repack/pg_repack-1.4.6.ebuild b/dev-db/pg_repack/pg_repack-1.4.7.ebuild
similarity index 87%
rename from dev-db/pg_repack/pg_repack-1.4.6.ebuild
rename to dev-db/pg_repack/pg_repack-1.4.7.ebuild
index 39c58c0add..e733761b24 100644
--- a/dev-db/pg_repack/pg_repack-1.4.6.ebuild
+++ b/dev-db/pg_repack/pg_repack-1.4.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-POSTGRES_COMPAT=( 9.6 10 11 12 13 )
+POSTGRES_COMPAT=( 9.6 10 11 12 13 14 )
 POSTGRES_USEDEP="server"
 
 inherit postgres-multi
diff --git a/dev-dotnet/dotnet-aspnet-bin/Manifest b/dev-dotnet/dotnet-aspnet-bin/Manifest
deleted file mode 100644
index eb99b0306f..0000000000
--- a/dev-dotnet/dotnet-aspnet-bin/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST aspnetcore-runtime-5.0.5-linux-arm.tar.gz 37301082 BLAKE2B 22b4a2f131c9da3e315a6519e34eaf7a2835fb20e343352b40c47de8c51bbca921c82efdc99dfce3b5c000f1772fc277e4c97c4ed58a9f0bf16c925e133f561d SHA512 962f02bd27a96fc577bd4a6e3763e50daace29479880a96386d863a5905ff4b081c9f12086b540b48a2df378919a1ae368032cc76a322f5bb602fb7bf48ad773
-DIST aspnetcore-runtime-5.0.5-linux-arm64.tar.gz 36772038 BLAKE2B 0a3230fd250406112e91f91f80a878e2cbc213706fc90487c19302aed381af5f05aee2ef552047b5cf4e9256d0518c63e8c1ee90c39f8e233a6cadb5a7fb4ac8 SHA512 f2421b16295f53b2796c604eb89e4cea0f238f376e4e3d4f348d8aebed6543fd605e76c871de049cb5328ec1fcea9a35d65b57c1c2c4d09a2614fd5bb2428980
-DIST aspnetcore-runtime-5.0.5-linux-x64.tar.gz 39270599 BLAKE2B 1a764c56420d64e03930624ddaf0414753a67a2f40f7905d836c015482d68215470e780c2f283df05e8315c237e8965777a5f0fbf45aaa83bde27f45c34b4611 SHA512 149b378b2377b60980a9bc0fa2f345293439f0da18bc75e8bffadc2faba8c3c175325fdd4edc9faaf898c4836f76a1685d55a0efdb679a5034b9e761450a88a4
diff --git a/dev-dotnet/dotnet-aspnet-bin/dotnet-aspnet-bin-5.0.5.ebuild b/dev-dotnet/dotnet-aspnet-bin/dotnet-aspnet-bin-5.0.5.ebuild
deleted file mode 100644
index 45711edf86..0000000000
--- a/dev-dotnet/dotnet-aspnet-bin/dotnet-aspnet-bin-5.0.5.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION=".NET ASP.NET Runtime Store"
-HOMEPAGE="https://dotnet.microsoft.com/"
-SRC_URI="
-	amd64? ( https://dotnetcli.azureedge.net/dotnet/aspnetcore/Runtime/${PV}/aspnetcore-runtime-${PV}-linux-x64.tar.gz )
-	arm? ( https://dotnetcli.azureedge.net/dotnet/aspnetcore/Runtime/${PV}/aspnetcore-runtime-${PV}-linux-arm.tar.gz )
-	arm64? ( https://dotnetcli.azureedge.net/dotnet/aspnetcore/Runtime/${PV}/aspnetcore-runtime-${PV}-linux-arm64.tar.gz )
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
-
-# The SDK includes dotnet-aspnet-bin so prevent installing the SDK at the same time
-RDEPEND="
-	app-crypt/mit-krb5
-	~dev-dotnet/dotnet-runtime-bin-${PV}
-	!dev-dotnet/dotnet-sdk-bin
-	!dev-dotnet/dotnet-sdk-bin-common
-	dev-libs/icu
-	dev-util/lldb
-	dev-util/lttng-ust
-	net-misc/curl
-	sys-apps/lsb-release
-	sys-devel/llvm
-	sys-libs/zlib
-	|| (
-		dev-libs/openssl
-		dev-libs/openssl-compat
-	)
-	|| (
-		sys-libs/libunwind
-		sys-libs/llvm-libunwind
-	)
-"
-
-QA_PREBUILT="*"
-
-S="${WORKDIR}"
-
-src_install() {
-	insinto /opt/dotnet/shared/
-	doins -r "${S}/shared/Microsoft.AspNetCore.App"
-}
diff --git a/dev-dotnet/dotnet-runtime-bin/Manifest b/dev-dotnet/dotnet-runtime-bin/Manifest
deleted file mode 100644
index 92e6c2069b..0000000000
--- a/dev-dotnet/dotnet-runtime-bin/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST dotnet-runtime-5.0.5-linux-arm.tar.gz 28939822 BLAKE2B 7b0d311789624e94943c5fbfa3df76992b43dd12fb838f9af427e12c2b0f91027e1263265a59ecf43652cf711f36c1ac6518bf8d6b5aa0d93fabde81a81fffb2 SHA512 b7032a935a808370b1eedad7d3e7204c4d05518d21be5aa0b990bf935b48cc89ed70d2fcb282a5ae191034722bc09dfcbc12e2ad674b37c8bd23db8811cde3cb
-DIST dotnet-runtime-5.0.5-linux-arm64.tar.gz 28659540 BLAKE2B 1633092a1344a8e293e2382bcbec0ca55c9fceb6214ec6d14f3b4beca301d7941a43fc80cf1eee63aad87579d6721a6497c20ab0da0b2532295af0bede902e3c SHA512 d3ea167e1877f6a30ed3e2243bfde572340db295cdc2fe91a6035bfaaab4b15a42023bbef79db3cdbc8cf32a24efd91d53975701c8068cbcc0a51965a70efdee
-DIST dotnet-runtime-5.0.5-linux-x64.tar.gz 30858909 BLAKE2B 7d4b777045e58793cc57b25e7b111b2f8affde574dd7f7ccd9b76b827b2c23139f9a0a4150ec83ba47a7d1419df35addecc53bb992fe9edb3ba7812c56ef28f2 SHA512 ce9d3778c9a331b35cf18d7b64f9eec8fc37d9088f1a2208488577f611b2ab0f8b3a82b7f559b331d584ac86e1f09153ee2e255e617239fe9a9382373f873237
diff --git a/dev-dotnet/dotnet-runtime-bin/dotnet-runtime-bin-5.0.5.ebuild b/dev-dotnet/dotnet-runtime-bin/dotnet-runtime-bin-5.0.5.ebuild
deleted file mode 100644
index 3bcb443735..0000000000
--- a/dev-dotnet/dotnet-runtime-bin/dotnet-runtime-bin-5.0.5.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION=".NET Runtime"
-HOMEPAGE="https://dotnet.microsoft.com/"
-SRC_URI="
-	amd64? ( https://dotnetcli.azureedge.net/dotnet/Runtime/${PV}/dotnet-runtime-${PV}-linux-x64.tar.gz )
-	arm? ( https://dotnetcli.azureedge.net/dotnet/Runtime/${PV}/dotnet-runtime-${PV}-linux-arm.tar.gz )
-	arm64? ( https://dotnetcli.azureedge.net/dotnet/Runtime/${PV}/dotnet-runtime-${PV}-linux-arm64.tar.gz )
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
-
-# The SDK includes dotnet-runtime-bin so prevent installing the SDK at the same time
-RDEPEND="
-	app-crypt/mit-krb5
-	!dev-dotnet/dotnet-sdk-bin
-	!dev-dotnet/dotnet-sdk-bin-common
-	dev-libs/icu
-	dev-util/lldb
-	dev-util/lttng-ust
-	net-misc/curl
-	sys-apps/lsb-release
-	sys-devel/llvm
-	sys-libs/zlib
-	|| (
-		dev-libs/openssl
-		dev-libs/openssl-compat
-	)
-	|| (
-		sys-libs/libunwind
-		sys-libs/llvm-libunwind
-	)
-"
-
-QA_PREBUILT="*"
-
-S="${WORKDIR}"
-
-src_install() {
-	insinto /opt/dotnet
-	doins -r "${S}/."
-	dosym ../../opt/dotnet/dotnet /usr/bin/dotnet
-	fperms +x /usr/bin/dotnet
-	doenvd "${FILESDIR}/80dotnet"
-}
diff --git a/dev-dotnet/dotnet-runtime-bin/files/80dotnet b/dev-dotnet/dotnet-runtime-bin/files/80dotnet
deleted file mode 100644
index 4cf0206ea9..0000000000
--- a/dev-dotnet/dotnet-runtime-bin/files/80dotnet
+++ /dev/null
@@ -1,2 +0,0 @@
-DOTNET_CLI_TELEMETRY_OPTOUT=1
-DOTNET_ROOT=/opt/dotnet
diff --git a/dev-dotnet/dotnet-sdk-bin-common/Manifest b/dev-dotnet/dotnet-sdk-bin-common/Manifest
deleted file mode 100644
index 0b7ac621e2..0000000000
--- a/dev-dotnet/dotnet-sdk-bin-common/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST dotnet-sdk-5.0.301-linux-arm.tar.gz 138735656 BLAKE2B c23732749f67bd2ca63cadba9bcb3f5abd4e10d00fed441825e6a59f9d3a3e663101502e5557dd94e737443cc9bbab0d5dbe8f7ebdbde54586596ec5c520a64f SHA512 89663ffb22299ad626d3f1d5129e493fb8784e6ed854b128a364407a060eec2979cd7d3c9e4f3df8e47ccb72b98ff8b18e8d53c7fb65b3455faa7344f67417a2
-DIST dotnet-sdk-5.0.301-linux-arm64.tar.gz 136933875 BLAKE2B 6c48c8a2d47ba5bed47e6176d10e273ec996686cb5a4d5b3239098ff23d44526091f7eae1ce762a2eb2f6f31420cafda84471b936082469eadc8c62aa0dcd8bf SHA512 56e233b8f35abe80984bc8a60028f4f8dbc8543313a0711045ef13c693e11e706ee4809574518f57910ec2c93bed896da32760c8143a298556dc25478caca90f
-DIST dotnet-sdk-5.0.301-linux-x64.tar.gz 142255332 BLAKE2B 172888e2eb78d2f768cff6a7e99d6473b469b7cbde74a4eab63e601d85bad118be374f330a413a9b6b3e6773340bdaef8ead4ed54a194189a50cac6b61fac556 SHA512 81cd7a3550a262d5c907030677429fa9a1cb515071274931ab760bd8bb2a14f40c9384c8757e1c1aa681b1de22035f16bf20b41ed208becd054cc9bb1f620322
diff --git a/dev-dotnet/dotnet-sdk-bin-common/dotnet-sdk-bin-common-5.0.301.ebuild b/dev-dotnet/dotnet-sdk-bin-common/dotnet-sdk-bin-common-5.0.301.ebuild
deleted file mode 100644
index 11ad560475..0000000000
--- a/dev-dotnet/dotnet-sdk-bin-common/dotnet-sdk-bin-common-5.0.301.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Common files shared between multiple slots of .NET"
-HOMEPAGE="https://dotnet.microsoft.com/"
-SRC_URI="
-	amd64? ( https://dotnetcli.azureedge.net/dotnet/Sdk/${PV}/dotnet-sdk-${PV}-linux-x64.tar.gz )
-	arm? ( https://dotnetcli.azureedge.net/dotnet/Sdk/${PV}/dotnet-sdk-${PV}-linux-arm.tar.gz )
-	arm64? ( https://dotnetcli.azureedge.net/dotnet/Sdk/${PV}/dotnet-sdk-${PV}-linux-arm64.tar.gz )
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
-
-# The SDK includes dotnet-runtime-bin and dotnet-aspnet-bin,
-#  so prevent installing them at the same time
-RDEPEND="
-	!dev-dotnet/dotnet-aspnet-bin
-	!dev-dotnet/dotnet-runtime-bin
-	~dev-dotnet/dotnet-sdk-bin-${PV}
-"
-
-QA_PREBUILT="*"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	# For current .NET versions, all the directories contain versioned files,
-	# but the top-level files (the dotnet binary for example) are shared between versions,
-	# and those are backward-compatible.
-	# The exception from this above rule is packs/NETStandard.Library.Ref which is shared between >=3.0 versions.
-	# These common files are installed by the non-slotted dev-dotnet/dotnet-sdk-bin-common
-	# package, while the directories are installed by dev-dotnet/dotnet-sdk-bin which uses
-	# slots depending on major .NET version.
-	# This makes it possible to install multiple major versions at the same time.
-	default
-
-	# Skip the versioned files (which are located inside sub-directories)
-	find . -maxdepth 1 -type d ! -name . ! -name packs -exec rm -rf {} \; || die
-	find ./packs -maxdepth 1 -type d ! -name packs ! -name NETStandard.Library.Ref -exec rm -rf {} \; || die
-}
-
-src_install() {
-	insinto /opt/dotnet
-	doins -r "${S}/."
-	dosym ../../opt/dotnet/dotnet /usr/bin/dotnet
-	fperms +x /usr/bin/dotnet
-	doenvd "${FILESDIR}/80dotnet"
-}
diff --git a/dev-dotnet/dotnet-sdk-bin-common/files/80dotnet b/dev-dotnet/dotnet-sdk-bin-common/files/80dotnet
deleted file mode 100644
index 4cf0206ea9..0000000000
--- a/dev-dotnet/dotnet-sdk-bin-common/files/80dotnet
+++ /dev/null
@@ -1,2 +0,0 @@
-DOTNET_CLI_TELEMETRY_OPTOUT=1
-DOTNET_ROOT=/opt/dotnet
diff --git a/dev-dotnet/dotnet-sdk-bin-common/metadata.xml b/dev-dotnet/dotnet-sdk-bin-common/metadata.xml
deleted file mode 100644
index e29f0a4a02..0000000000
--- a/dev-dotnet/dotnet-sdk-bin-common/metadata.xml
+++ /dev/null
@@ -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>telans@posteo.de</email>
-		<name>James Beddek</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-js/core-js/Manifest b/dev-js/core-js/Manifest
deleted file mode 100644
index 4809740e48..0000000000
--- a/dev-js/core-js/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST core-js-3.17.3.tgz 186125 BLAKE2B 120110a35ce153df3a8844a0e475f11c7239d6c19043370d5addc67de6c5eb74f0b369bee6835ecc05638c7ba5932f3398bc9505395842a5f8760150eb8089e9 SHA512 972bda8ecfb077c3758577f3a1bd4b74e0821c55386c631baaa98b9f54384250a90ea58fa467fea749e3f8b36bbc30c6df78f48595f0da7b2fbd5a47cacc7237
diff --git a/dev-js/core-js/core-js-3.17.3.ebuild b/dev-js/core-js/core-js-3.17.3.ebuild
deleted file mode 100644
index 3807b011cc..0000000000
--- a/dev-js/core-js/core-js-3.17.3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit node
-
-DESCRIPTION="Standard library"
-HOMEPAGE="
-	https://github.com/zloirock/core-js
-	https://www.npmjs.com/package/core-js
-"
-
-LICENSE="MIT"
-KEYWORDS="~amd64"
diff --git a/dev-js/core-js/metadata.xml b/dev-js/core-js/metadata.xml
deleted file mode 100644
index 57e7985405..0000000000
--- a/dev-js/core-js/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<bugs-to>https://github.com/zloirock/core-js/issues</bugs-to>
-		<remote-id type="github">zloirock/core-js</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-js/ijavascript/Manifest b/dev-js/ijavascript/Manifest
deleted file mode 100644
index a0f3a0a4dc..0000000000
--- a/dev-js/ijavascript/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ijavascript-5.2.0.tgz 460798 BLAKE2B f16736b9574fa31e9dbcafce9c82e14e11865d98370079fe120c7101f87cec6ed1b5eaa2abbc3598ec42b94bcfcd106e9457e1a382495cfe9ac1fac203f97223 SHA512 30857747d776a3dbae71398d1f9214e5bbd771ebe58ec3abb07ed2bf7ae67ffba85e397f8976fc871e199f2981a5db78f1fed4da6d222a6a56950cf18ed86d8f
diff --git a/dev-js/ijavascript/ijavascript-5.2.0.ebuild b/dev-js/ijavascript/ijavascript-5.2.0.ebuild
deleted file mode 100644
index 6a224530cb..0000000000
--- a/dev-js/ijavascript/ijavascript-5.2.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit node
-
-DESCRIPTION="IJavascript is a Javascript kernel for the Jupyter notebook"
-HOMEPAGE="
-	https://n-riesco.github.io/ijavascript
-	https://www.npmjs.com/package/ijavascript
-"
-
-LICENSE="BSD"
-KEYWORDS="~amd64"
-RDEPEND="
-	${NODEJS_RDEPEND}
-	dev-js/jp-kernel
-"
diff --git a/dev-js/jmp/Manifest b/dev-js/jmp/Manifest
deleted file mode 100644
index 9178bda6cf..0000000000
--- a/dev-js/jmp/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST jmp-2.0.0.tgz 10391 BLAKE2B 4b4ac9f1dcd2170b8ea6f4ce476ebe785546fb0be2dc4bf4a8745ce1c9dcbd4fdd91004ea571ff37e42a411952a2e18e8acd9bed339778c6bf987a94d0bd85d8 SHA512 5404df5951c4ad0240d9732d9908c94071f243f8718c7326b32f9e826c1193f47315c850078c63ad1d625f8f7a559afe1f285caf8cef2fe22491294860ac7a63
diff --git a/dev-js/jmp/files/uuid.patch b/dev-js/jmp/files/uuid.patch
deleted file mode 100644
index 3fff4420f2..0000000000
--- a/dev-js/jmp/files/uuid.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ur a/index.js b/index.js
---- a/index.js	1985-10-26 09:15:00.000000000 +0100
-+++ b/index.js	2021-02-15 16:02:25.296238209 +0100
-@@ -33,7 +33,7 @@
-  */
- 
- var crypto = require("crypto");
--var uuid = require("uuid/v4");
-+const { v4: uuidv4 } = require('uuid');
- var zmq = require("zeromq");
- 
- var DEBUG = global.DEBUG || false;
-diff -ur a/test/index.js b/test/index.js
---- a/test/index.js	1985-10-26 09:15:00.000000000 +0100
-+++ b/test/index.js	2021-02-15 16:02:01.816099481 +0100
-@@ -37,7 +37,7 @@
- var assert = require("assert");
- var crypto = require("crypto");
- 
--var uuid = require("uuid/v4");
-+const { v4: uuidv4 } = require('uuid');
- 
- var jmp = require("..");
- var zmq = jmp.zmq;
diff --git a/dev-js/jmp/jmp-2.0.0.ebuild b/dev-js/jmp/jmp-2.0.0.ebuild
deleted file mode 100644
index 0f07f1a7ba..0000000000
--- a/dev-js/jmp/jmp-2.0.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit node
-
-DESCRIPTION="create, parse and reply to messages of the Jupyter Messaging Protocol"
-HOMEPAGE="
-	https://github.com/n-riesco/jmp
-	https://www.npmjs.com/package/jmp
-"
-
-LICENSE="BSD"
-KEYWORDS="~amd64"
-PATCHES=( "${FILESDIR}/uuid.patch" )
-RDEPEND="
-	${NODEJS_RDEPEND}
-	dev-js/uuid
-	dev-js/zeromq
-"
diff --git a/dev-js/jp-kernel/Manifest b/dev-js/jp-kernel/Manifest
deleted file mode 100644
index 585626e06f..0000000000
--- a/dev-js/jp-kernel/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST jp-kernel-2.0.0.tgz 10274 BLAKE2B 62363b0d0b55bb43d77db7512ecca2e62707e30772a32a1f1bc45f1fa20de0c8fb28a09fdaf1c76f5654e5a6938a47ce676d43b3b1681c14da0a03b8df72b344 SHA512 029cf702aa49853a05968ef49b09e56d5caa84945a83384d28aa7ce1931e4ea7bf032f68227a3cba79bb7857a976547c9bcc33ffd257250c548caff72aefdca6
diff --git a/dev-js/jp-kernel/jp-kernel-2.0.0.ebuild b/dev-js/jp-kernel/jp-kernel-2.0.0.ebuild
deleted file mode 100644
index cd2ab9f2ea..0000000000
--- a/dev-js/jp-kernel/jp-kernel-2.0.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit node
-
-DESCRIPTION="Generic Node.js kernel for the Jupyter notebook"
-HOMEPAGE="
-	https://n-riesco.github.io/jp-kernel
-	https://www.npmjs.com/package/jp-kernel
-"
-
-LICENSE="BSD"
-KEYWORDS="~amd64"
-RDEPEND="
-	${NODEJS_RDEPEND}
-	dev-js/jmp
-	dev-js/nel
-	dev-js/uuid
-"
diff --git a/dev-js/nel/Manifest b/dev-js/nel/Manifest
deleted file mode 100644
index 2caa323d36..0000000000
--- a/dev-js/nel/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST nel-1.2.0.tgz 64173 BLAKE2B 99d3a9961159f62bbcf875344eeaf8c6474a7ddc9dfa63dd81150fe55b85ab9ed4eb004c0a7075a3d50b06bd586f9e5a9a8440d8f5c9dce6b85846dee85e0793 SHA512 cadf7a85d6289ab642e59bd81cc0ac445e4a21a67c02e7b919f7f8b07fba1a63c33097edd3def1e491b50e270b9df812604e7a08b3faced6447dbfb74adf7563
diff --git a/dev-js/nel/nel-1.2.0.ebuild b/dev-js/nel/nel-1.2.0.ebuild
deleted file mode 100644
index d2f55bf648..0000000000
--- a/dev-js/nel/nel-1.2.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit node
-
-DESCRIPTION="Node.js Evaluation Loop (NEL): module to run a Node.js REPL session"
-HOMEPAGE="
-	https://github.com/n-riesco/nel
-	https://www.npmjs.com/package/nel
-"
-
-LICENSE="BSD"
-KEYWORDS="~amd64"
diff --git a/dev-js/node-addon-api/Manifest b/dev-js/node-addon-api/Manifest
deleted file mode 100644
index f62c84a979..0000000000
--- a/dev-js/node-addon-api/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST node-addon-api-3.1.0.tgz 122233 BLAKE2B 5c9fcd35f0d1a60397c2c805db8fe67458a073d973eebec50db769644ecd5bbf978a88a21670f70219f22c4f0f1939bfcd77563030bfbea9e098f9a1c4cb29cf SHA512 7e59ab0cd074e8b225e65cb0533ed894d1991ffe69d0ced6dbc93c87377d2ec86d761d70b210f663e53887d2c3e8a39b3b2d5ff9f115760a6b3eb1329a3339bb
diff --git a/dev-js/node-addon-api/metadata.xml b/dev-js/node-addon-api/metadata.xml
deleted file mode 100644
index 53acdcd545..0000000000
--- a/dev-js/node-addon-api/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>lssndrbarbieri@gmail.com</email>
-    <name>Alessandro Barbieri</name>
-  </maintainer>
-  <upstream>
-    <bugs-to>https://github.com/nodejs/node-addon-api/issues</bugs-to>
-    <remote-id type="github">nodejs/node-addon-api</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-js/node-addon-api/node-addon-api-3.1.0.ebuild b/dev-js/node-addon-api/node-addon-api-3.1.0.ebuild
deleted file mode 100644
index 39d6f26796..0000000000
--- a/dev-js/node-addon-api/node-addon-api-3.1.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit node
-
-DESCRIPTION="Node.js API (N-API)"
-HOMEPAGE="
-	https://github.com/nodejs/node-addon-api
-	https://www.npmjs.com/package/node-addon-api
-"
-
-LICENSE="MIT"
-KEYWORDS="~amd64"
-
-src_install() {
-	dodoc -r doc/.
-	rm -rf doc || die
-	node_src_install
-}
diff --git a/dev-js/node-gyp-build/Manifest b/dev-js/node-gyp-build/Manifest
deleted file mode 100644
index 857d4b3d31..0000000000
--- a/dev-js/node-gyp-build/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST node-gyp-build-4.2.3.tgz 4822 BLAKE2B 87abbab8d7d3ba2e8c6f5fb0f730159f9335c743dfeea92f3a3370e0a8e24fa9dee1672833b7e661091a82791046d5b5ec5e83c26cf1b9c44586118991db707f SHA512 30de99a7399f34244cfb7b79ecf4c91e01f2c3f8783969d9ea647c3f98ffb99b6a42be3a451b8313f3fe8379f4611fc08985de5a2c596736a2a7bee074809f46
diff --git a/dev-js/node-gyp-build/node-gyp-build-4.2.3.ebuild b/dev-js/node-gyp-build/node-gyp-build-4.2.3.ebuild
deleted file mode 100644
index b8dd65151a..0000000000
--- a/dev-js/node-gyp-build/node-gyp-build-4.2.3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit node
-
-DESCRIPTION="Build tool and bindings loader for node-gyp that supports prebuilds"
-HOMEPAGE="
-	https://github.com/prebuild/node-gyp-build
-	https://www.npmjs.com/package/node-gyp-build
-"
-
-LICENSE="MIT"
-KEYWORDS="~amd64"
diff --git a/dev-js/uuid/Manifest b/dev-js/uuid/Manifest
deleted file mode 100644
index 18679ae38b..0000000000
--- a/dev-js/uuid/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST uuid-8.3.2.tgz 27977 BLAKE2B f2c9b5bebfa75744a3100ab468f7e56d059564804701eebf72f8b9e7eadc9d0b36d3cc4ceab6f90d54f5657b0b99039389c05c59145a6c9f793e4aaf09cc4362 SHA512 f8d62cd9078c5b2f865853849bdc679fa1c20e9d25ed0043ee697cccb52627ef77439345d0da1c12b9f09139175453625f7fdfa42e9a7d2f0385bfe0cfb47b7a
diff --git a/dev-js/uuid/uuid-8.3.2.ebuild b/dev-js/uuid/uuid-8.3.2.ebuild
deleted file mode 100644
index ffe7fb60c9..0000000000
--- a/dev-js/uuid/uuid-8.3.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit node
-
-DESCRIPTION="RFC4122 (v1, v4, and v5) UUIDs"
-HOMEPAGE="
-	https://github.com/uuidjs/uuid
-	https://www.npmjs.com/package/uuid
-"
-
-LICENSE="MIT"
-KEYWORDS="~amd64"
-
-src_install() {
-	node_src_install
-	# errno binary conflicts with dev-libs/ossp-uuid
-	mv "${ED}/usr/bin/uuid" "${ED}/usr/bin/node-uuid" || die
-}
diff --git a/dev-js/zeromq/Manifest b/dev-js/zeromq/Manifest
deleted file mode 100644
index 579861b74e..0000000000
--- a/dev-js/zeromq/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST zeromq-6.0.0-beta.6.tgz 5123933 BLAKE2B 0fcfdef37ceda7f6ae7c41da6e758f3bebb3b30153fd6109d8a8fdfdd719d191c4df8acc38cad773596aa280e768cb004c4d104a67c50e12994869314f5af67b SHA512 c0b7fa33ba411e28e5f81465b542f65680e981b41c3997ad897f14cf27072fc09c605c589d1ae9a06e5f8b7517dfe5266afcf5964e3f7466907b3f2a88382bfd
diff --git a/dev-js/zeromq/zeromq-6.0.0_beta6.ebuild b/dev-js/zeromq/zeromq-6.0.0_beta6.ebuild
deleted file mode 100644
index e362810937..0000000000
--- a/dev-js/zeromq/zeromq-6.0.0_beta6.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit node flag-o-matic
-
-MYPV="${PV/_beta/-beta.}"
-MYP="${PN}-${MYPV}"
-SRC_URI="mirror://npm/${PN}/-/${MYP}.tgz"
-DESCRIPTION="Next-generation ZeroMQ bindings for Node.js"
-HOMEPAGE="
-	https://github.com/zeromq/zeromq.js
-	https://www.npmjs.com/package/zeromq
-"
-
-LICENSE="MIT"
-KEYWORDS="~amd64"
-IUSE="drafts"
-
-CDEPEND="net-libs/zeromq:=[drafts?]"
-DEPEND="
-	${NODEJS_DEPEND}
-	${CDEPEND}
-	dev-js/node-gyp-build
-	dev-js/node-addon-api
-"
-RDEPEND="
-	${NODEJS_RDEPEND}
-	${CDEPEND}
-"
-
-src_configure() {
-	NPM_FLAGS="--zmq-shared --build-from-source"
-	use drafts && NPM_FLAGS+=" --zmq-draft"
-	append-cxxflags " -I/usr/$(get_libdir)/node_modules/node-addon-api"
-	node_src_configure
-}
-
-src_prepare() {
-	rm -rf prebuilds || die
-	rm -rf vendor || die
-	node_src_prepare
-}
-
-src_compile() {
-	node_src_compile
-	rm -rf build/Release/.deps || die
-	rm -rf build/Release/obj.target || die
-}
diff --git a/dev-libs/mtxclient/Manifest b/dev-libs/mtxclient/Manifest
index 1baa03481c..ca390a5cf5 100644
--- a/dev-libs/mtxclient/Manifest
+++ b/dev-libs/mtxclient/Manifest
@@ -1,2 +1,2 @@
-DIST mtxclient-0.4.1.tar.gz 572552 BLAKE2B 4d0facaffb0ce1fadc1011b7d557774bcd9ffcef7349894255b9522bcc4e9228739ad8da5a60b0addf6835cf5de3613bebc19842b6922ab9cf94f88c944d0091 SHA512 246c84bc8bc7dd6fd688c79601d16e931b5aaf5fe967d6ea226f1961df2b74ad70d4e790b7400051e007506f58ecd6594ccead31bd3c6308aa2c6727b122c203
 DIST mtxclient-0.5.1.tar.gz 582367 BLAKE2B d30a5e0e16d6783d8d1175e5f4144d845fe62897dcc7952cb1598470befa1da47a2b06cd70a60f511a1c2e7656eca2cf5a87734cbc61b79d2a05df295fd256e0 SHA512 f0a5e823bd7f3cccdf5f919c04c36a1a5ab4d2627a6f8f3fac78e4b300eda3b9e1f5060fb31e6e47267bbafc3a03f6c2a2d16c2323e63ce4889f551860e7703f
+DIST mtxclient-0.5.2_pre20210916.tar.gz 588702 BLAKE2B 643e37c13348d0fff65b38e16581918d1b9555d6d6cc19ce4965eaa5e34620a6d0f60af7bb075ffded4b585f38b889565c3cfd42f02c2749e4a8c8f013b6c125 SHA512 778257173c08930a05d3bef91afe34d4cf963f57e75159f99a2468513df80669215002ecf5f10c3639a8fef944aeb814cb447e4984c5e1c8ffd87d53b8938030
diff --git a/dev-libs/mtxclient/mtxclient-0.4.1.ebuild b/dev-libs/mtxclient/mtxclient-0.5.2_pre20210916.ebuild
similarity index 78%
rename from dev-libs/mtxclient/mtxclient-0.4.1.ebuild
rename to dev-libs/mtxclient/mtxclient-0.5.2_pre20210916.ebuild
index 1834d66962..20e905ea7e 100644
--- a/dev-libs/mtxclient/mtxclient-0.4.1.ebuild
+++ b/dev-libs/mtxclient/mtxclient-0.5.2_pre20210916.ebuild
@@ -1,13 +1,15 @@
 # Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake
 
+MY_COMMIT="b452a984b0fc522c21bb8df7d320bf13960974d0"
 DESCRIPTION="Client API library for Matrix, built on top of Boost.Asio"
 HOMEPAGE="https://github.com/Nheko-Reborn/mtxclient"
-SRC_URI="https://github.com/Nheko-Reborn/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/Nheko-Reborn/${PN}/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_COMMIT}"
 
 LICENSE="MIT"
 SLOT="0"
@@ -18,13 +20,14 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-libs/boost-1.70.0
-	<dev-libs/olm-3.2.5
+	dev-libs/olm
 	>=dev-libs/openssl-1.1.0
 	dev-cpp/nlohmann_json
+	dev-libs/spdlog
+	dev-cpp/coeurl
 "
 DEPEND="
 	${RDEPEND}
-	dev-libs/spdlog
 	test? ( dev-cpp/gtest )
 "
 
diff --git a/dev-libs/randomx/Manifest b/dev-libs/randomx/Manifest
index 5821b398ef..a14ac82984 100644
--- a/dev-libs/randomx/Manifest
+++ b/dev-libs/randomx/Manifest
@@ -1 +1,2 @@
 DIST randomx-1.1.8.tar.gz 163477 BLAKE2B 482f38a7e9f7b03ec5bd40ff923a1a1e575ed0c30431dcbecfe1072cdb10ccc93b61cf9d2177f4549e284125e17386e0314cb39734b22dc150193bd5d28bb813 SHA512 f41f13ba7b979a969e9d60e6c44cf289802e7459d6d817a64377428c3e833ea2f71a8a1e6559682ecc0ec2a33f958bb5b727d7faa28cb6ff69a524d713969bce
+DIST randomx-1.1.9.tar.gz 163669 BLAKE2B 41a665061c438c335825abfdf8fbde7f0c8a910fcca22e47babd015120b675378ad04afdc602f2b8e41cc6030ea6caa6298a27bce634034e95b5657d4ea06492 SHA512 89e0541bc849db270672acd7210a6c7109e4ca07765e6e656229ff8867792bfae933ee85b0aa4545dc3cf0c6515140ab782c8e231af17a82610718a80458c420
diff --git a/dev-libs/randomx/randomx-1.1.9.ebuild b/dev-libs/randomx/randomx-1.1.9.ebuild
new file mode 100644
index 0000000000..1431d23747
--- /dev/null
+++ b/dev-libs/randomx/randomx-1.1.9.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic
+
+DESCRIPTION="Proof of work algorithm based on random code execution"
+HOMEPAGE="https://github.com/tevador/RandomX"
+SRC_URI="https://github.com/tevador/RandomX/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+S="${WORKDIR}"/RandomX-${PV}
+
+src_configure() {
+	append-ldflags -Wl,-z,noexecstack
+	cmake_src_configure
+}
diff --git a/dev-python/aodhclient/Manifest b/dev-python/aodhclient/Manifest
index 5e9751ea8e..9345d068a1 100644
--- a/dev-python/aodhclient/Manifest
+++ b/dev-python/aodhclient/Manifest
@@ -1 +1 @@
-DIST aodhclient-2.1.1.tar.gz 46687 BLAKE2B 5f229e36f1b840b346fb4c85ca52185d6c3714c9f75e269ab7cfc8dc010c3afb08d387d06d419fb81cb3b8b1056afe970bc6e8c91dbe5e62c048e7c1f1fac36d SHA512 acb8f2571caa248a35625335f5c04794ff24c16bc775cad8f78621dfe159645d6ed39da62722fc990cea1c5f86b4bd08f40d1c5c82d08b632f913367fc723386
+DIST aodhclient-2.3.0.tar.gz 49992 BLAKE2B b256294020ca9439485c6ad19909e2993d86491a33294f37ef0282d2b658a0b0e2e4a22e2c4fde1c274f50d36b0302dad4a057ba3b7711989d973fc0f70c786f SHA512 2e121d8ee45256f3fa676902603a840a0d0ac7474dec1a4df4409389436bc315c0b9ee7c16ea269e9fdfb7b8737901c30575b4e4eb039d92441c99cd404cd54c
diff --git a/dev-python/aodhclient/aodhclient-2.1.1.ebuild b/dev-python/aodhclient/aodhclient-2.1.1.ebuild
deleted file mode 100644
index 15ab1b6353..0000000000
--- a/dev-python/aodhclient/aodhclient-2.1.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Aodh API"
-HOMEPAGE="https://github.com/openstack/python-aodhclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
-RDEPEND="
-	>=dev-python/pbr-1.8[${PYTHON_USEDEP}]
-	>=dev-python/cliff-1.14.0[${PYTHON_USEDEP}]
-	!~dev-python/cliff-1.16.0[${PYTHON_USEDEP}]
-	>=dev-python/osc-lib-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
-	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-2.10.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/aodhclient/aodhclient-2.3.0.ebuild b/dev-python/aodhclient/aodhclient-2.3.0.ebuild
new file mode 100644
index 0000000000..5fa8447e26
--- /dev/null
+++ b/dev-python/aodhclient/aodhclient-2.3.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack Aodh API"
+HOMEPAGE="
+	https://github.com/openstack/python-aodhclient
+	https://opendev.org/openstack/python-aodhclient
+	https://pypi.org/project/aodhclient
+	https://launchpad.net/python-aodhclient
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/pbr-1.4[${PYTHON_USEDEP}]
+	>=dev-python/cliff-1.14.0[${PYTHON_USEDEP}]
+	>=dev-python/osc-lib-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-1.0.0[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		>=dev-python/hacking-3.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/reno-1.6.2[${PYTHON_USEDEP}]
+		>=dev-python/tempest-10[${PYTHON_USEDEP}]
+		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/pifpaf-0.23[${PYTHON_USEDEP}]
+		dev-python/gnocchi[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/aodhclient/metadata.xml b/dev-python/aodhclient/metadata.xml
index 32907fdb2b..f478b5bb4b 100644
--- a/dev-python/aodhclient/metadata.xml
+++ b/dev-python/aodhclient/metadata.xml
@@ -8,7 +8,7 @@
 	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
-		<remote-id type="pypi">python-aodhclient</remote-id>
+		<remote-id type="pypi">aodhclient</remote-id>
 		<remote-id type="github">openstack/python-aodhclient</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/autoflake/autoflake-1.4.ebuild b/dev-python/autoflake/autoflake-1.4-r1.ebuild
similarity index 83%
rename from dev-python/autoflake/autoflake-1.4.ebuild
rename to dev-python/autoflake/autoflake-1.4-r1.ebuild
index d2b5ae13f1..370d5864ad 100644
--- a/dev-python/autoflake/autoflake-1.4.ebuild
+++ b/dev-python/autoflake/autoflake-1.4-r1.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7,8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
 inherit distutils-r1
 
@@ -19,11 +18,12 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
-RESTRICT="!test? ( test )"
 
 DEPEND=">=dev-python/pyflakes-1.1.0[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}"
 
+RESTRICT="!test? ( test )"
+
 python_test() {
 	"${EPYTHON}" test_autoflake.py || die
 }
diff --git a/dev-python/basictracer/Manifest b/dev-python/basictracer/Manifest
new file mode 100644
index 0000000000..6cba7aa4b8
--- /dev/null
+++ b/dev-python/basictracer/Manifest
@@ -0,0 +1 @@
+DIST basictracer-3.2.0.tar.gz 21262 BLAKE2B 999949a14657807ba4186a95af31e24afe4e27a45c181c9e98380a2735483989f481ae40591798b5722847f2d2954ada60f7628865c30cedff1b85fc9ea65626 SHA512 9876de9df861a1de6d00f0aacf75da70460242ff616d35b39c8dc78812af97276cb0934d903ffba70724bd5c906a2b93f556905df8315238db18c543eb275ee9
diff --git a/dev-python/basictracer/basictracer-3.2.0.ebuild b/dev-python/basictracer/basictracer-3.2.0.ebuild
new file mode 100644
index 0000000000..61554abeb9
--- /dev/null
+++ b/dev-python/basictracer/basictracer-3.2.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python implementation of the BasicTracer reference implementation"
+HOMEPAGE="https://github.com/opentracing/basictracer-python"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/protobuf-python-3.0.1[${PYTHON_USEDEP}]
+	>=dev-python/opentracing-2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/basictracer/metadata.xml b/dev-python/basictracer/metadata.xml
new file mode 100644
index 0000000000..25273c9f49
--- /dev/null
+++ b/dev-python/basictracer/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>lssndrbarbieri@gmail.com</email>
+    <name>Alessandro Barbieri</name>
+  </maintainer>
+  <upstream>
+    <bugs-to>https://github.com/opentracing/basictracer-python/issues</bugs-to>
+    <remote-id type="pypi">basictracer</remote-id>
+    <remote-id type="github">opentracing/basictracer-python</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/castellan/Manifest b/dev-python/castellan/Manifest
index 2bf4ddb573..3cab06c554 100644
--- a/dev-python/castellan/Manifest
+++ b/dev-python/castellan/Manifest
@@ -1 +1 @@
-DIST castellan-3.6.0.tar.gz 70924 BLAKE2B bbd9bf5b411332d5454b4c0d69b63c16b751f8e23c01e723a95acbc722f57fb5f1286c20855b9a9a0e36607737e417f9c5b02a1f7ea4e394c210fa812feb6323 SHA512 d2eb7d7e9ecf29f43d16f0d95dbc18165bde7c9087670fde817fc476a58d57cd3765e9706e4108da99159065748b78dc1f25b9a6ae024359ed98ea5a10dfe3c4
+DIST castellan-3.9.1.tar.gz 77838 BLAKE2B e8945bc2e0f9fd5407f764d16dd564e00c4c30d5986eea99552bc22121461d14582225888d088c4881967066e2286462f0591506d753acc5177f61f3ad2f9544 SHA512 6cf489307c8bc74922297d51305f37668c1118c3f22607bed455cb37a515709cd161203f024fe289c0a99225957365e0cb39eca0945d135b0a6e03872241d009
diff --git a/dev-python/castellan/castellan-3.6.0.ebuild b/dev-python/castellan/castellan-3.6.0.ebuild
deleted file mode 100644
index 382236424d..0000000000
--- a/dev-python/castellan/castellan-3.6.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Generic Key Manager interface for OpenStack"
-HOMEPAGE="https://pypi.org/project/castellan/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-CDEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.7[${PYTHON_USEDEP}]
-	>=dev-python/python-barbicanclient-4.5.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-6.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.20.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/castellan/castellan-3.9.1.ebuild b/dev-python/castellan/castellan-3.9.1.ebuild
new file mode 100644
index 0000000000..c567d5e3ec
--- /dev/null
+++ b/dev-python/castellan/castellan-3.9.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_8 )
+
+inherit distutils-r1
+
+DESCRIPTION="Generic Key Manager interface for OpenStack"
+HOMEPAGE="
+	https://pypi.org/project/castellan
+	https://opendev.org/openstack/castellan
+	https://pypi.org/project/castellan
+	https://launchpad.net/castellan
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.7[${PYTHON_USEDEP}]
+	>=dev-python/python-barbicanclient-4.5.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-6.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		>=dev-python/hacking-3.0.1[${PYTHON_USEDEP}]
+		>=dev-python/python-barbicanclient-4.5.2[${PYTHON_USEDEP}]
+		>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/bandit-1.6.0[${PYTHON_USEDEP}]
+		>=dev-python/pifpaf-0.10.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/celery/celery-5.1.1.ebuild b/dev-python/celery/celery-5.1.1.ebuild
index 0845fbe96d..9614de20d6 100644
--- a/dev-python/celery/celery-5.1.1.ebuild
+++ b/dev-python/celery/celery-5.1.1.ebuild
@@ -11,7 +11,7 @@ inherit bash-completion-r1 distutils-r1 optfeature
 
 DESCRIPTION="Asynchronous task queue/job queue based on distributed message passing"
 HOMEPAGE="
-	http://celeryproject.org
+	https://docs.celeryproject.org/en/stable/index.html
 	https://pypi.org/project/celery
 	https://github.com/celery/celery
 "
diff --git a/dev-python/cotyledon/Manifest b/dev-python/cotyledon/Manifest
new file mode 100644
index 0000000000..089a280887
--- /dev/null
+++ b/dev-python/cotyledon/Manifest
@@ -0,0 +1 @@
+DIST cotyledon-1.7.3.tar.gz 23354 BLAKE2B 9437ff26fb5b65420e2c45eb1d689e30350cef72bc92f3403d98ca9e6e92b93588764fa00a96ee26ea356283b87910dc2af05f989acb5e043572ab7bcbb651fb SHA512 28415bfa128c9f1760ece2707a4a3b67441f26e14125f322e8f23c4efaa65ea7e5a522378629a0d675ef1533ff21b4c252b36adf9ea38a70011d53af6e8ee06d
diff --git a/dev-python/cotyledon/cotyledon-1.7.3.ebuild b/dev-python/cotyledon/cotyledon-1.7.3.ebuild
new file mode 100644
index 0000000000..b177fa74f5
--- /dev/null
+++ b/dev-python/cotyledon/cotyledon-1.7.3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Cotyledon provides a framework for defining long-running services"
+HOMEPAGE="
+	https://github.com/sileht/cotyledon
+	https://pypi.org/project/cotyledon
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/setproctitle[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-js/ijavascript/metadata.xml b/dev-python/cotyledon/metadata.xml
similarity index 62%
rename from dev-js/ijavascript/metadata.xml
rename to dev-python/cotyledon/metadata.xml
index a337fc2375..4a436b3cd5 100644
--- a/dev-js/ijavascript/metadata.xml
+++ b/dev-python/cotyledon/metadata.xml
@@ -6,7 +6,8 @@
     <name>Alessandro Barbieri</name>
   </maintainer>
   <upstream>
-    <bugs-to>https://github.com/n-riesco/ijavascript/issues</bugs-to>
-    <remote-id type="github">n-riesco/ijavascript</remote-id>
+    <bugs-to>https://github.com/sileht/cotyledon/issues</bugs-to>
+    <remote-id type="pypi">cotyledon</remote-id>
+    <remote-id type="github">sileht/cotyledon</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/cursive/cursive-0.2.2-r1.ebuild b/dev-python/cursive/cursive-0.2.2-r1.ebuild
deleted file mode 100644
index 737826a409..0000000000
--- a/dev-python/cursive/cursive-0.2.2-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Cursive implements OpenStack-specific validation of digital signatures."
-HOMEPAGE="https://github.com/openstack/cursive"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
-RDEPEND="
-	>=dev-python/pbr-1.8[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-1.14.0[${PYTHON_USEDEP}]
-	>=dev-python/castellan-0.4.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/cursive/cursive-0.2.2-r2.ebuild b/dev-python/cursive/cursive-0.2.2-r2.ebuild
new file mode 100644
index 0000000000..d76a041fe4
--- /dev/null
+++ b/dev-python/cursive/cursive-0.2.2-r2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_8 )
+
+inherit distutils-r1
+
+DESCRIPTION="Cursive implements OpenStack-specific validation of digital signatures"
+HOMEPAGE="
+	https://github.com/openstack/cursive
+	https://opendev.org/x/cursive
+	https://launchpad.net/cursive
+	https://pypi.org/project/cursive
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/pbr-1.6[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-1.14.0[${PYTHON_USEDEP}]
+	>=dev-python/castellan-0.4.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		>=dev-python/hacking-0.11.0[${PYTHON_USEDEP}]
+		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/dotmap/Manifest b/dev-python/dotmap/Manifest
index 25ed3fd2c7..db0a8c230c 100644
--- a/dev-python/dotmap/Manifest
+++ b/dev-python/dotmap/Manifest
@@ -1 +1,2 @@
+DIST dotmap-1.3.24.tar.gz 11981 BLAKE2B c7afcae398c4532e670afee9a6ea9a38dcc43fa485f3e856b2ff40da76a09b74c979acd0dc7f73a0f51198af379bd9ad5d832d1379617407ea9af38b0ff421ab SHA512 4b580b0f57a38de998865b376127ea407bb707502a4449ccc02cb59854c49b2f9c0c07a242e962f0146ff1c5c6bb1faafbd570939f25bb3b20b79946cb898270
 DIST dotmap-1.3.8.tar.gz 9973 BLAKE2B cbf90f7c32b6e64217c9d6ccb13a3d89cf4d5a15704abda76c0ee9914b30882c1bf6993a4b74b7dbb269604f1149102f24da27de4136b7adfefd277861826d2e SHA512 c164b8c6d61d9d0bc66c665df8fe8d376dabc0f994824bd44cade504839a053b9a95973be1d8611f961faeac109d8dfeca93e27b28a12b35c557d22e669772a7
diff --git a/dev-python/dotmap/dotmap-1.3.24.ebuild b/dev-python/dotmap/dotmap-1.3.24.ebuild
new file mode 100644
index 0000000000..e934702e42
--- /dev/null
+++ b/dev-python/dotmap/dotmap-1.3.24.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+#don't bump to python 3.10 until https://github.com/drgrib/dotmap/issues/76 is resolved
+PYTHON_COMPAT=( python3_{8..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Dot access dictionary with dynamic hierarchy creation and ordered iteration"
+HOMEPAGE="
+	https://github.com/drgrib/dotmap
+	https://pypi.org/project/dotmap
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64"
+SLOT="0"
+
+distutils_enable_tests unittest
diff --git a/dev-python/doubles/Manifest b/dev-python/doubles/Manifest
new file mode 100644
index 0000000000..676021958c
--- /dev/null
+++ b/dev-python/doubles/Manifest
@@ -0,0 +1 @@
+DIST doubles-1.5.3.tar.gz 16835 BLAKE2B bc57c3da3e55377073ead71f45a07fb1ccc0b41ff86b6ed6ec00d5d134245b304483d2a024c1a650e4561f4ca14ef5ebb71627f9cbbb2daa561315b67035f007 SHA512 4e5b19a762db6fea379d2338420bdb25b8db79253b22d8107815126d5a234f15c36368b10da367ac91d6ff35c55b3892fcdb46e4ed93b3891237e10984c1859c
diff --git a/dev-python/doubles/doubles-1.5.3.ebuild b/dev-python/doubles/doubles-1.5.3.ebuild
new file mode 100644
index 0000000000..33d8322bd8
--- /dev/null
+++ b/dev-python/doubles/doubles-1.5.3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Test doubles for Python"
+HOMEPAGE="https://github.com/uber/doubles"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-js/jp-kernel/metadata.xml b/dev-python/doubles/metadata.xml
similarity index 64%
rename from dev-js/jp-kernel/metadata.xml
rename to dev-python/doubles/metadata.xml
index 07b57a2e03..fd81770d21 100644
--- a/dev-js/jp-kernel/metadata.xml
+++ b/dev-python/doubles/metadata.xml
@@ -6,7 +6,8 @@
     <name>Alessandro Barbieri</name>
   </maintainer>
   <upstream>
-    <bugs-to>https://github.com/n-riesco/jp-kernel/issues</bugs-to>
-    <remote-id type="github">n-riesco/jp-kernel</remote-id>
+    <bugs-to>https://github.com/uber/doubles/issues</bugs-to>
+    <remote-id type="pypi">doubles</remote-id>
+    <remote-id type="github">uber/doubles</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/fastavro/fastavro-1.4.5.ebuild b/dev-python/fastavro/fastavro-1.4.5.ebuild
index 358c1e73c2..f255bea080 100644
--- a/dev-python/fastavro/fastavro-1.4.5.ebuild
+++ b/dev-python/fastavro/fastavro-1.4.5.ebuild
@@ -3,7 +3,14 @@
 
 EAPI=8
 
-EPYTEST_DESELECT=( tests/test_fastavro.py::test_cython_python )
+EPYTEST_DESELECT=(
+	tests/test_fastavro.py::test_cython_python
+	tests/test_main_cli.py::test_cli_record_output
+	tests/test_main_cli.py::test_cli_stream_input
+	tests/test_main_cli.py::test_cli_arg_metadata
+	tests/test_main_cli.py::test_cli_arg_schema
+	tests/test_main_cli.py::test_cli_arg_codecs
+)
 PYTHON_COMPAT=( python3_8 )
 
 inherit distutils-r1
diff --git a/dev-python/fontParts/Manifest b/dev-python/fontParts/Manifest
index 4cccf85f20..6b407900e7 100644
--- a/dev-python/fontParts/Manifest
+++ b/dev-python/fontParts/Manifest
@@ -1 +1,2 @@
 DIST fontParts-0.9.10.tar.gz 427443 BLAKE2B 21f6aa33e6034ef31f13ef6fc5224d3e5b2af039298191a1498b6d2fab0b58bdaa76971120893ab6e9478d6e1d59b1c6a08ec48ef19d42e8848e71366c86488a SHA512 c08e88d400f6e7f3fc11374830e43c2262dfbd9a48e5205703039274bdd69102c16dc65f23fba7196b28dac3436cd052478e5e8a5435c6d081ce80c2daababea
+DIST fontParts-0.9.11.tar.gz 427573 BLAKE2B 3a59ef7cb8c8e8a282c67c431a040ad2ab53f74cf913b5d0b1789749c242c579cca3f97523287adc63435752d994f883d89a19d78569d2439da1d10f23e431cf SHA512 850d5717457bace997b165d77ef97bc1f2f4662f7a1c164ec18a68d297a9eb6e499bfb0f70044ca7bcc9ddc6575880c893ceea03c3b14fe104eb3ab21537f464
diff --git a/dev-python/fontParts/fontParts-0.9.11.ebuild b/dev-python/fontParts/fontParts-0.9.11.ebuild
new file mode 100644
index 0000000000..35bc9315cf
--- /dev/null
+++ b/dev-python/fontParts/fontParts-0.9.11.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="An API for interacting with the parts of fonts"
+HOMEPAGE="https://github.com/robotools/fontParts"
+SRC_URI="https://github.com/robotools/fontParts/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=dev-python/booleanOperations-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/defcon-0.6.0[${PYTHON_USEDEP}]
+	>=dev-python/fontMath-0.4.8[${PYTHON_USEDEP}]
+	>=dev-python/fonttools-3.32.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-python/fontPens[${PYTHON_USEDEP}] )
+"
+
+RESTRICT="!test? ( test )"
+
+pkg_setup() {
+	export SETUPTOOLS_SCM_PRETEND_VERSION="${PV%_*}"
+}
+
+python_test() {
+	"${EPYTHON}" Lib/fontParts/fontshell/test.py -v || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/gabbi/Manifest b/dev-python/gabbi/Manifest
new file mode 100644
index 0000000000..27b38b3bf2
--- /dev/null
+++ b/dev-python/gabbi/Manifest
@@ -0,0 +1 @@
+DIST gabbi-2.3.0.tar.gz 220806 BLAKE2B 40f5a34d9982123cb61062f666be93c292ca3732b7377edf636afd5a0eb30a9ff74bcb19e395f74fde1fc7de9032d4238bc4714df32a2d677081b962cd11cd39 SHA512 e383b90c8e3e647a2490a654227d241e04b68c6a7cd883f50c8f39ca44954676e4bf4e371f7273246c9c02df52a18d65760fe7b1d8e290fab694bf755573f82b
diff --git a/dev-python/gabbi/gabbi-2.3.0.ebuild b/dev-python/gabbi/gabbi-2.3.0.ebuild
new file mode 100644
index 0000000000..297ddc0884
--- /dev/null
+++ b/dev-python/gabbi/gabbi-2.3.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+PYTHON_COMPAT=( python3_8 )
+
+inherit distutils-r1
+
+DESCRIPTION="Declarative HTTP testing library"
+HOMEPAGE="
+	https://github.com/cdent/gabbi
+	https://pypi.org/project/gabbi
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/pbr[${PYTHON_USEDEP}]
+	dev-python/pytest[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.11.0[${PYTHON_USEDEP}]
+	dev-python/certifi[${PYTHON_USEDEP}]
+	>=dev-python/jsonpath-rw-ext-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/wsgi_intercept-1.8.1[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/stestr[${PYTHON_USEDEP}]
+		dev-python/hacking[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-js/jmp/metadata.xml b/dev-python/gabbi/metadata.xml
similarity index 64%
rename from dev-js/jmp/metadata.xml
rename to dev-python/gabbi/metadata.xml
index 02340b950a..4bedf06abf 100644
--- a/dev-js/jmp/metadata.xml
+++ b/dev-python/gabbi/metadata.xml
@@ -6,7 +6,8 @@
     <name>Alessandro Barbieri</name>
   </maintainer>
   <upstream>
-    <bugs-to>https://github.com/n-riesco/jmp/issues</bugs-to>
-    <remote-id type="github">n-riesco/jmp</remote-id>
+    <bugs-to>https://github.com/cdent/gabbi/issues</bugs-to>
+    <remote-id type="pypi">gabbi</remote-id>
+    <remote-id type="github">cdent/gabbi</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/geopy/Manifest b/dev-python/geopy/Manifest
index 1a545734b2..cdee45832d 100644
--- a/dev-python/geopy/Manifest
+++ b/dev-python/geopy/Manifest
@@ -1 +1,2 @@
 DIST geopy-2.1.0.tar.gz 280382 BLAKE2B 061c4f5fee8ce50690df442f431866630b6538831191b2b357ee387133d098e6aa69136ef4f11b9b627e52a8610a22438463c7e1fc5c2b193543a666ddc955b0 SHA512 6d369412f7c685cda7195589341fbd8f57564fa888fa753de266a356627125f971212afbdd7253e16df90870fbfe3faab63dfb898928d9622c6aa8654ec6fe74
+DIST geopy-2.2.0.tar.gz 289811 BLAKE2B f876a867a19e5178eba1fa6b7389159e820fc6a9c9a6ac4beb807e2b1b121612a526b5f7290d5fd6db3e259cbd03a86695775d4cad39662126d5f5b7194b19bd SHA512 78b6c2e4726dd50ad97e3425a0459b4611eed54c06c16a2b397db9c3fd9878d76f9eba26ce353908315fea469a76b4044401f5ba37aab3752e9649fd35db16cd
diff --git a/dev-python/geopy/geopy-2.2.0.ebuild b/dev-python/geopy/geopy-2.2.0.ebuild
new file mode 100644
index 0000000000..c6a372fa55
--- /dev/null
+++ b/dev-python/geopy/geopy-2.2.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="A Geocoding Toolbox for Python"
+HOMEPAGE="
+	https://geopy.readthedocs.io
+	https://github.com/geopy/geopy
+	https://pypi.org/project/geopy
+"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND=">=sci-geosciences/GeographicLib-1.51-r1[python,${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/async_generator[${PYTHON_USEDEP}]
+		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+	)
+"
+
+RESTRICT="test"
+PROPERTIES="test_network"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	dev-python/sphinx-issues \
+	dev-python/sphinx_rtd_theme
diff --git a/dev-python/glance_store/Manifest b/dev-python/glance_store/Manifest
index af2fbb666d..0e17250822 100644
--- a/dev-python/glance_store/Manifest
+++ b/dev-python/glance_store/Manifest
@@ -1 +1 @@
-DIST glance_store-2.3.0.tar.gz 212933 BLAKE2B 69f54fbb44de0e6e9608e38cf0b43ee6fb7df7758d19b6dee6f15fb00a25ce885610ef9c779d2138c08f5d3a28760121ef66edade0b23619685d5f985433247f SHA512 59499c1fa8b596faba0918219b76e5e7d51f6c7e94d14b99f28b2a9f87b456e638bd42fe33124ae9507043a975db6e5b5762e5979258db35b772f41a08d59be6
+DIST glance_store-2.7.0.tar.gz 229579 BLAKE2B 9623fedf6cf9de51b6793202a8d0134380fa1b9d0f5a595bc2d718f468f48bd078f32c7154ee719db3a49d38bfcea4e7d763caf67cb3e522a034184425477230 SHA512 fc5b06dbd197d99b36e2f744f10dff77d268e1dfe13ebb85b1945f28d3b27607d7023735868e6f4bfcd63735c917a2bc21aa7772ed35a4710f9df557d4cd5a99
diff --git a/dev-python/glance_store/glance_store-2.3.0.ebuild b/dev-python/glance_store/glance_store-2.3.0.ebuild
deleted file mode 100644
index a1b09a0312..0000000000
--- a/dev-python/glance_store/glance_store-2.3.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="A library for glance"
-HOMEPAGE="https://github.com/openstack/glance_store"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="cinder swift vmware"
-
-DEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
-RDEPEND="
-	>=dev-python/pbr-1.8[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-1.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	cinder? (
-		>=dev-python/python-cinderclient-4.1.0[${PYTHON_USEDEP}]
-		>=dev-python/os-brick-2.6.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-privsep-1.23.0[${PYTHON_USEDEP}]
-	)
-	swift? (
-		>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
-		>=dev-python/python-swiftclient-3.2.0[${PYTHON_USEDEP}]
-	)
-	vmware? ( >=dev-python/oslo-vmware-2.17.0[${PYTHON_USEDEP}] )
-"
diff --git a/dev-python/glance_store/glance_store-2.7.0.ebuild b/dev-python/glance_store/glance_store-2.7.0.ebuild
new file mode 100644
index 0000000000..266ec51b87
--- /dev/null
+++ b/dev-python/glance_store/glance_store-2.7.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_8 )
+
+inherit distutils-r1
+
+DESCRIPTION="A library for glance"
+HOMEPAGE="
+	https://github.com/openstack/glance_store
+	https://opendev.org/openstack/glance_store
+	https://pypi.org/project/glance-store
+	https://launchpad.net/glance-store
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="cinder swift vmware"
+
+RDEPEND="
+	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-2.18.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-4.7.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.18.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.11.0[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	cinder? (
+		>=dev-python/python-cinderclient-4.1.0[${PYTHON_USEDEP}]
+		>=dev-python/os-brick-2.6.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-privsep-1.23.0[${PYTHON_USEDEP}]
+	)
+	swift? (
+		>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
+		>=dev-python/python-swiftclient-3.2.0[${PYTHON_USEDEP}]
+	)
+	vmware? ( >=dev-python/oslo-vmware-3.6.0[${PYTHON_USEDEP}] )
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		>=dev-python/hacking-3.0.1[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/retrying-1.3.3[${PYTHON_USEDEP}]
+		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+	)
+"
+# where to put this?
+#		>=dev-python/boto3-1.9.199[${PYTHON_USEDEP}]
+
+distutils_enable_tests pytest
diff --git a/dev-python/glyphsLib/glyphsLib-5.3.2.ebuild b/dev-python/glyphsLib/glyphsLib-5.3.2-r1.ebuild
similarity index 95%
rename from dev-python/glyphsLib/glyphsLib-5.3.2.ebuild
rename to dev-python/glyphsLib/glyphsLib-5.3.2-r1.ebuild
index f01689346f..f52e847f0a 100644
--- a/dev-python/glyphsLib/glyphsLib-5.3.2.ebuild
+++ b/dev-python/glyphsLib/glyphsLib-5.3.2-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{8..9} )
+
 inherit distutils-r1
 
 DESCRIPTION="A library to provide a bridge from Glyphs source files to UFOs"
@@ -19,7 +19,6 @@ RDEPEND="
 	>=dev-python/fonttools-4.14[${PYTHON_USEDEP}]
 	>=dev-python/ufoLib2-0.8[${PYTHON_USEDEP}]
 "
-
 BDEPEND="
 	app-arch/unzip
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/glyphtools/Manifest b/dev-python/glyphtools/Manifest
index 3de22054c7..91aea12cb7 100644
--- a/dev-python/glyphtools/Manifest
+++ b/dev-python/glyphtools/Manifest
@@ -1 +1,2 @@
 DIST glyphtools-0.7.3.tar.gz 14972 BLAKE2B b8252b42bad73fced07cacb160f0a1d61647596ec0af41b979021c3f7642cdbeb0d2e5544c35fa2f0ca37ba835e94b661ad931ea3bdbedbb4a88d2b3d3fa9498 SHA512 de505b7c7916bedcb81e70013928915a3dc3289445f1b2e438e66cb581a2a35b342d484333d1740d8db7150fc61b380bced382748f11866c81b9a06740efbadc
+DIST glyphtools-0.7.4.tar.gz 20023 BLAKE2B a771f626220dc2f26ba643edb21fd64460369b192bf21ccf4e798ee7179a8c7a35d69cd07ca700193cf0be579db757a9487434280168fc2b8c4d5b330ddcb344 SHA512 e04df8ebdfb4738d3f277dc7dce5ab1d8ad3f4e97bd30192779f362ebb65124fb688fb6f586fadf767e24b2efd7af519ffc9c4fc14adaf6d0546a07e8075c759
diff --git a/dev-python/glyphtools/glyphtools-0.7.4.ebuild b/dev-python/glyphtools/glyphtools-0.7.4.ebuild
new file mode 100644
index 0000000000..d6c4bae084
--- /dev/null
+++ b/dev-python/glyphtools/glyphtools-0.7.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Routines for extracting information from fontTools glyphs"
+HOMEPAGE="https://github.com/simoncozens/glyphtools"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64"
+SLOT="0"
+
+RDEPEND="
+	dev-python/babelfont[${PYTHON_USEDEP}]
+	dev-python/beziers[${PYTHON_USEDEP}]
+	dev-python/glyphsLib[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	dev-python/sphinxcontrib-napoleon \
+	dev-python/sphinxcontrib-restbuilder
diff --git a/dev-python/gnocchi/Manifest b/dev-python/gnocchi/Manifest
new file mode 100644
index 0000000000..50da4b62e5
--- /dev/null
+++ b/dev-python/gnocchi/Manifest
@@ -0,0 +1 @@
+DIST gnocchi-4.4.1.tar.gz 981822 BLAKE2B d47907e4cd76450f2264a681f5d6184929e7a0fc294d84d1d709aff57c4f8b667db3a3de7acb5d14dfc69c3d421dde31d0251de3242e992c1a8d4c204dd742b2 SHA512 24884f8f010ae38041d6a5d723e0dc02b195b356a1fa3a516a9a7e0c5425ad493c52a66420029041f26939c96009b3b0103e66eb070603697e3184dee2b42b96
diff --git a/dev-python/gnocchi/gnocchi-4.4.1.ebuild b/dev-python/gnocchi/gnocchi-4.4.1.ebuild
new file mode 100644
index 0000000000..3afc474f47
--- /dev/null
+++ b/dev-python/gnocchi/gnocchi-4.4.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+PYTHON_COMPAT=( python3_8 )
+
+inherit distutils-r1
+
+DESCRIPTION="OpenTracing API for Python"
+HOMEPAGE="
+	https://gnocchi.osci.io
+	https://github.com/gnocchixyz/gnocchi
+	https://pypi.org/project/gnocchi
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/numpy-1.9.0[${PYTHON_USEDEP}]
+	dev-python/iso8601[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-3.22.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-3.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-3.22.0[${PYTHON_USEDEP}]
+	dev-python/pytimeparse[${PYTHON_USEDEP}]
+	>=dev-python/pecan-0.9[${PYTHON_USEDEP}]
+	dev-python/jsonpatch[${PYTHON_USEDEP}]
+	>=dev-python/cotyledon-1.5.0[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/stevedore[${PYTHON_USEDEP}]
+	dev-python/ujson[${PYTHON_USEDEP}]
+	>=dev-python/voluptuous-0.8.10[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+	>=dev-python/tenacity-4.6.0[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.4.1[${PYTHON_USEDEP}]
+	dev-python/paste[${PYTHON_USEDEP}]
+	dev-python/pastedeploy[${PYTHON_USEDEP}]
+	dev-python/daiquiri[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/lz4-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/tooz-1.38[${PYTHON_USEDEP}]
+	dev-python/cachetools[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		>=dev-python/pifpaf-1.0.1[${PYTHON_USEDEP}]
+		>=dev-python/gabbi-1.37.0[${PYTHON_USEDEP}]
+		dev-python/fixtures[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/subunit[${PYTHON_USEDEP}]
+		dev-python/os-testr[${PYTHON_USEDEP}]
+		dev-python/testrepository[${PYTHON_USEDEP}]
+		dev-python/testscenarios[${PYTHON_USEDEP}]
+		>=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-0.9.38[${PYTHON_USEDEP}]
+		>=dev-python/webtest-2.0.16[${PYTHON_USEDEP}]
+		>=dev-python/keystonemiddleware-4.0.0[${PYTHON_USEDEP}]
+		>=dev-python/wsgi_intercept-1.4.1[${PYTHON_USEDEP}]
+		dev-python/pyxattr[${PYTHON_USEDEP}]
+		dev-python/python-swiftclient[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/gnocchi/metadata.xml b/dev-python/gnocchi/metadata.xml
new file mode 100644
index 0000000000..34adf3ab78
--- /dev/null
+++ b/dev-python/gnocchi/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>lssndrbarbieri@gmail.com</email>
+    <name>Alessandro Barbieri</name>
+  </maintainer>
+  <upstream>
+    <bugs-to>https://github.com/gnocchixyz/gnocchi/issues</bugs-to>
+    <remote-id type="pypi">gnocchi</remote-id>
+    <remote-id type="github">gnocchixyz/gnocchi</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/hijri-converter/Manifest b/dev-python/hijri-converter/Manifest
index 2c650f513d..ecba7a4057 100644
--- a/dev-python/hijri-converter/Manifest
+++ b/dev-python/hijri-converter/Manifest
@@ -1,2 +1,2 @@
-DIST hijri-converter-2.1.1.tar.gz 36506 BLAKE2B a019d9c67e411ed8f1a8dfbb48ae56bd28f3240cfa2a959a47b79a4436dce241b5cf40b78731cecf21ce2fb555cc081ae77596bdab20aded1439dc016a43ed00 SHA512 ab20fbe8146dea503c3726ea7566f364e2442003c6a5c934d5efe0915d2dadae5fb78a8e741ac5eb06de81106e7d112e97e6da86f97754d648c2bcdb73d5a0b0
 DIST hijri-converter-2.1.3.tar.gz 36865 BLAKE2B 4076d2eda430327162716fe80f4093132e139d1cb01129d15c66aa908dcb212877bf478cd60af102969a5058d08dc15773a83d3dbad1ed5431188e9a8549e170 SHA512 d7307f4c11f04f266ca478d58c6248debc720204cc7b58da033cf8340e4cdfb07a6908f139d50260908224bbed1ab50885c3f82b348e1d35ce38c138d2bbf970
+DIST hijri-converter-2.2.2.tar.gz 38540 BLAKE2B 214bf04b0b6f8a2ef1ea1dc99f73a6c3e99cb8d351ed2588e6f7920e5a8e3a36fca03594bf9f3cb9d8fbdbdae232f6f8e4fd8e71db3094adc5d5aa34b601d103 SHA512 086a0f349cde650ad98558d5543ad463bded316a41d8827d9ee1d69aa49e0e396711befb469de697a1d3fc565901f7a6735b61856b2fc70f446960dfef15a330
diff --git a/dev-python/hijri-converter/hijri-converter-2.1.1.ebuild b/dev-python/hijri-converter/hijri-converter-2.2.2.ebuild
similarity index 84%
rename from dev-python/hijri-converter/hijri-converter-2.1.1.ebuild
rename to dev-python/hijri-converter/hijri-converter-2.2.2.ebuild
index 2db8463838..312d4863ba 100644
--- a/dev-python/hijri-converter/hijri-converter-2.1.1.ebuild
+++ b/dev-python/hijri-converter/hijri-converter-2.2.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/hstspreload/Manifest b/dev-python/hstspreload/Manifest
index 6046f81451..97fbc93628 100644
--- a/dev-python/hstspreload/Manifest
+++ b/dev-python/hstspreload/Manifest
@@ -1 +1,2 @@
+DIST hstspreload-2021.10.1.tar.gz 1247430 BLAKE2B fa6bb9fb5be874094afa5a5475846a3bfd7dd4d53dd9819be25f8cd91db3606624d3c5c0813fdc142fc56d33e98d98d49023f26384fd15dbbc5dac7f7b58d353 SHA512 6ca5cbdbe3799066598da7fc1703438b108fe2786d3e422a6d84dc74bf5f8f4854b77ff4443309dbc2294840b00973b5f064db0b0adbb9b7b55425707cead81e
 DIST hstspreload-2021.7.5.tar.gz 1212079 BLAKE2B eba71d75a7cd384922ec4fbc7a153d432b80b6c9bff9e799c6f2a72c86603d34bc77e19f45e6dd80140fa53c11f3c5b7688614011bea22a8edfd260d23cd9020 SHA512 a294a078c96a95427307921565c7568ff6b20b51e4b8fba7e170e0d9d91b590ac73c32b9b5167c5086cc00ff6887ed69c669fdec3d240f9b96e6e215ca8daf00
diff --git a/dev-python/hstspreload/hstspreload-2021.10.1.ebuild b/dev-python/hstspreload/hstspreload-2021.10.1.ebuild
new file mode 100644
index 0000000000..99c1b0a235
--- /dev/null
+++ b/dev-python/hstspreload/hstspreload-2021.10.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Chromium HSTS Preload list as a Python package"
+HOMEPAGE="
+	https://hstspreload.org
+	https://github.com/sethmlarson/hstspreload
+	https://pypi.org/project/hstspreload
+"
+SRC_URI="https://github.com/sethmlarson/hstspreload/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+RESTRICT="test"
+PROPERTIES="test_network"
+
+distutils_enable_tests pytest
diff --git a/dev-python/jaeger-client/Manifest b/dev-python/jaeger-client/Manifest
new file mode 100644
index 0000000000..7ea76f97a2
--- /dev/null
+++ b/dev-python/jaeger-client/Manifest
@@ -0,0 +1 @@
+DIST jaeger-client-4.8.0.tar.gz 87365 BLAKE2B 11e688cd4b23c42d9fe34c9975534f59788c17e3c1057e24e8acc51b8907bbb50d0cbbdbd1754a9b7108c40f2c9c436edf31d2cdeb585c5f31f1a425e26ad071 SHA512 1b88700ebb2a81d213b425904edb431e676d6f52c5b300b780d0a4f59f5d300bf13f09d233a5ca0dee2bce54de743ec9632be99ef1820eddc563897c47eb3129
diff --git a/dev-python/jaeger-client/jaeger-client-4.8.0.ebuild b/dev-python/jaeger-client/jaeger-client-4.8.0.ebuild
new file mode 100644
index 0000000000..23dcebd1ac
--- /dev/null
+++ b/dev-python/jaeger-client/jaeger-client-4.8.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_8 )
+
+inherit distutils-r1
+
+DESCRIPTION="Jaeger Bindings for Python OpenTracing API"
+HOMEPAGE="
+	https://github.com/jaegertracing/jaeger-client-python
+	https://pypi.org/project/jaeger-client
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/threadloop-1[${PYTHON_USEDEP}]
+	dev-python/thrift[${PYTHON_USEDEP}]
+	>=www-servers/tornado-4.3[${PYTHON_USEDEP}]
+	>=dev-python/opentracing-2.1[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pycurl[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/pytest-tornado[${PYTHON_USEDEP}]
+		dev-python/pytest-benchmark[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+		>=dev-python/tchannel-2.1.0[${PYTHON_USEDEP}]
+		>=dev-python/opentracing_instrumentation-3[${PYTHON_USEDEP}]
+		>=dev-python/prometheus_client-0.11.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/jaeger-client/metadata.xml b/dev-python/jaeger-client/metadata.xml
new file mode 100644
index 0000000000..f460b9964c
--- /dev/null
+++ b/dev-python/jaeger-client/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>lssndrbarbieri@gmail.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">jaeger-client</remote-id>
+		<remote-id type="github">jaegertracing/jaeger-client-python</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/jsonpath-rw-ext/Manifest b/dev-python/jsonpath-rw-ext/Manifest
new file mode 100644
index 0000000000..e8a03f93b9
--- /dev/null
+++ b/dev-python/jsonpath-rw-ext/Manifest
@@ -0,0 +1 @@
+DIST jsonpath-rw-ext-1.2.2.tar.gz 20581 BLAKE2B eec62ee71fd234d5f7b8d2e091bdbf8b4bb2ec2780730b8ef77a466111b2fb3cbfc89b84c9e7905b53315150a28d4d84e7f251970d3a9b9002a5dbadf08b45b0 SHA512 28ca708023a942665c946d3e0ec618488f7d30d832e4ad0748d6c7019849f2ad19e3629c4452ab461b9c14d71f3360a4590357637f95ea44f8bc3b4544d5e0af
diff --git a/dev-python/jsonpath-rw-ext/jsonpath-rw-ext-1.2.2.ebuild b/dev-python/jsonpath-rw-ext/jsonpath-rw-ext-1.2.2.ebuild
new file mode 100644
index 0000000000..9462af10c6
--- /dev/null
+++ b/dev-python/jsonpath-rw-ext/jsonpath-rw-ext-1.2.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+PYTHON_COMPAT=( python3_8 )
+
+inherit distutils-r1
+
+DESCRIPTION="Extensions for JSONPath RW"
+HOMEPAGE="
+	https://pypi.org/project/jsonpath-rw-ext
+	https://github.com/sileht/python-jsonpath-rw-ext
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/pbr-1.8[${PYTHON_USEDEP}]
+	>=dev-python/jsonpath-rw-1.2.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		>=dev-python/hacking-0.12.0[${PYTHON_USEDEP}]
+		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/jsonpath-rw-ext/metadata.xml b/dev-python/jsonpath-rw-ext/metadata.xml
new file mode 100644
index 0000000000..aaf8e8137b
--- /dev/null
+++ b/dev-python/jsonpath-rw-ext/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>lssndrbarbieri@gmail.com</email>
+    <name>Alessandro Barbieri</name>
+  </maintainer>
+  <upstream>
+    <bugs-to>https://github.com/sileht/python-jsonpath-rw-ext/issues</bugs-to>
+    <remote-id type="pypi">jsonpath-rw-ext</remote-id>
+    <remote-id type="github">sileht/python-jsonpath-rw-ext</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/jsonpath-rw/Manifest b/dev-python/jsonpath-rw/Manifest
new file mode 100644
index 0000000000..161efdd861
--- /dev/null
+++ b/dev-python/jsonpath-rw/Manifest
@@ -0,0 +1 @@
+DIST jsonpath-rw-1.4.0.tar.gz 13814 BLAKE2B 96c17df53db15ea06b8d33231a5349e00d85eb92c9c1da784ee8b1773f1a12791f8dc2a6dc7ec67fde0c8c3cfec0a8fc08e77ff08eeebe4ef699d6d4bdda9276 SHA512 5fcbd832975a32d375fd400ebfb84f083c0e7d8780cc63df730a75cca0224bf32d72cb793fcac63fc3afa9697199d7a569af29961da95494253996cc6e5f63b7
diff --git a/dev-python/jsonpath-rw/jsonpath-rw-1.4.0.ebuild b/dev-python/jsonpath-rw/jsonpath-rw-1.4.0.ebuild
new file mode 100644
index 0000000000..af6371fde1
--- /dev/null
+++ b/dev-python/jsonpath-rw/jsonpath-rw-1.4.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A robust and significantly extended implementation of JSONPath for Python"
+HOMEPAGE="
+	https://github.com/kennknowles/python-jsonpath-rw
+	https://pypi.org/project/jsonpath-rw
+"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/decorator[${PYTHON_USEDEP}]
+	 dev-python/ply[${PYTHON_USEDEP}]
+	 dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${REDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	nosetests --verbose || die
+	py.test -v -v || die
+}
diff --git a/dev-python/jsonpath-rw/metadata.xml b/dev-python/jsonpath-rw/metadata.xml
new file mode 100644
index 0000000000..14dc6d8c23
--- /dev/null
+++ b/dev-python/jsonpath-rw/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <description>comaintainers welcome</description>
+    <email>lssndrbarbieri@gmail.com</email>
+    <name>Alessandro Barbieri</name>
+  </maintainer>
+  <upstream>
+    <bugs-to>https://github.com/kennknowles/python-jsonpath-rw/issues</bugs-to>
+    <remote-id type="pypi">jsonpath-rw</remote-id>
+    <remote-id type="github">kennknowles/python-jsonpath-rw</remote-id>
+    <maintainer status="unknown">
+      <email>kenn.knowles@gmail.com</email>
+      <name>Kenneth Knowles</name>
+    </maintainer>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/k5test/Manifest b/dev-python/k5test/Manifest
index c16461c1c4..e500c5ab01 100644
--- a/dev-python/k5test/Manifest
+++ b/dev-python/k5test/Manifest
@@ -1 +1,2 @@
+DIST k5test-0.10.0.tar.gz 11865 BLAKE2B 106d34d8737b35b70b01303ea0fa7fc4cf244fb43090e841f99ea83842484363bb67d88f5bfe2f6d6716b0b6303b7e9b5c0c893ce320f192cce2d92807b791fc SHA512 80faee7b4bb6b2c9d899e29fb7857d0dc2b761d6c4b46d802168ac5d52287c333729becc6220d78ec7b1d61fda8f8333b14efa53571b4d2d5198c59e2c953c2a
 DIST k5test-0.9.2.tar.gz 8216 BLAKE2B 7a4864c6c37725f87b0c4b6263093ac01a190bfd769a288c4f47c5590b42fa452af56150e89fa867b7a5b1ea56204f54b769b31b49113c5921a5209336ac9a36 SHA512 0feb0335da75c6201f43760834c723b82428838791f9adddd75a7259e55d9d74e752ce11fdfad9a2964abf9ca2cfe03e4914127af5f3d421fe78966cbeab647e
diff --git a/dev-python/k5test/k5test-0.10.0.ebuild b/dev-python/k5test/k5test-0.10.0.ebuild
new file mode 100644
index 0000000000..fe8f27ebc8
--- /dev/null
+++ b/dev-python/k5test/k5test-0.10.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A library for setting up self-contained Kerberos 5 environments"
+HOMEPAGE="https://github.com/pythongssapi/k5test"
+SRC_URI="https://github.com/pythongssapi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ISC MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-python/six[${PYTHON_USEDEP}]"
+RDEPEND="
+	${DEPEND}
+	virtual/krb5
+"
diff --git a/dev-python/manhole/manhole-1.8.0-r1.ebuild b/dev-python/manhole/manhole-1.8.0-r1.ebuild
new file mode 100644
index 0000000000..a49107d059
--- /dev/null
+++ b/dev-python/manhole/manhole-1.8.0-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+EPYTEST_DESELECT=(
+	"tests/test_manhole.py::test_non_daemon_connection"
+	"tests/test_manhole.py::test_daemon_connection"
+	"tests/test_manhole.py::test_uwsgi"
+	"tests/test_manhole.py::test_fork_exec"
+	"tests/test_manhole.py::test_connection_handler_exec[str]"
+	"tests/test_manhole.py::test_connection_handler_exec[func]"
+	"tests/test_manhole.py::test_environ_variable_activation"
+	"tests/test_manhole.py::test_stderr_doesnt_deadlock"
+	"tests/test_manhole_cli.py"
+)
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Debugging manhole for python application"
+HOMEPAGE="
+	https://github.com/ionelmc/python-manhole
+	https://pypi.org/project/manhole
+"
+SRC_URI="https://github.com/ionelmc/python-${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/python-${PN}-${PV}"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+DEPEND="
+	test? (
+		dev-python/gevent[${PYTHON_USEDEP}]
+		dev-python/process-tests[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/eventlet[${PYTHON_USEDEP}]' python3.8 python3.9)
+	)
+"
+
+DOCS=( AUTHORS.rst CHANGELOG.rst README.rst )
+
+distutils_enable_tests --install pytest
+distutils_enable_sphinx docs dev-python/sphinx-py3doc-enhanced-theme
diff --git a/dev-python/manhole/manhole-1.8.0.ebuild b/dev-python/manhole/manhole-1.8.0.ebuild
deleted file mode 100644
index eae6b4e6c4..0000000000
--- a/dev-python/manhole/manhole-1.8.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="Debugging manhole for python application"
-HOMEPAGE="
-	https://github.com/ionelmc/python-manhole
-	https://pypi.org/project/manhole
-"
-SRC_URI="https://github.com/ionelmc/python-${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/python-${PN}-${PV}"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-BDEPEND="test? (
-	dev-python/gevent[${PYTHON_USEDEP}]
-	dev-python/process-tests[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep \
-		'dev-python/eventlet[${PYTHON_USEDEP}]' python3.8 python3.9)
-)"
-
-DOCS=( AUTHORS.rst CHANGELOG.rst README.rst )
-
-distutils_enable_tests --install pytest
-distutils_enable_sphinx docs dev-python/sphinx-py3doc-enhanced-theme
-
-python_test() {
-	epytest_args=(
-		--deselect tests/test_manhole.py::test_non_daemon_connection
-		--deselect tests/test_manhole.py::test_daemon_connection
-		--deselect tests/test_manhole.py::test_uwsgi
-		--deselect tests/test_manhole.py::test_fork_exec
-		--deselect tests/test_manhole.py::test_connection_handler_exec[str]
-		--deselect tests/test_manhole.py::test_connection_handler_exec[func]
-		--deselect tests/test_manhole.py::test_environ_variable_activation
-		--deselect tests/test_manhole.py::test_stderr_doesnt_deadlock
-		--deselect tests/test_manhole_cli.py
-	)
-
-	epytest "${epytest_args[@]}"
-}
diff --git a/dev-python/neutron-lib/Manifest b/dev-python/neutron-lib/Manifest
index d2c1146f97..2bcd534580 100644
--- a/dev-python/neutron-lib/Manifest
+++ b/dev-python/neutron-lib/Manifest
@@ -1 +1 @@
-DIST neutron-lib-2.6.1.tar.gz 453572 BLAKE2B 6b79394a91cb7e6efcf66c0c8bab3b722de9a5408182472fa9dfe26b4a6c630889fc9aae0f7f0bab4917eaa830cdb230788d9a3520b4b8a526dbdbb361e0379b SHA512 d2da2b0d73cb5accda8219ced9fb68344a2c75d98a0d33cf5d52e703a8ea0afb3c6bb0a85445e453b512918f1c3fe7b97fa1a587a648e6731205b421c05319b0
+DIST neutron-lib-2.15.0.tar.gz 505877 BLAKE2B 022584803e83d880edd16ba1109e9fd3519a12215a608d6e3823a6102d4656f4c7de0a8f819cb98c9c166c36e7088c71f5bca61cf198bb55aa3f34b2d1f90f02 SHA512 8d8ddf708f43c183f6a3a91c296ee6eaf9c70e562da4e16522b85a6484ffc44183d07ab82de389b0a4e7e5305386fdd9e707e853815ef79951028b6ae7c1930e
diff --git a/dev-python/neutron-lib/neutron-lib-2.15.0.ebuild b/dev-python/neutron-lib/neutron-lib-2.15.0.ebuild
new file mode 100644
index 0000000000..fadc1f334a
--- /dev/null
+++ b/dev-python/neutron-lib/neutron-lib-2.15.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_8 )
+
+inherit distutils-r1
+
+DESCRIPTION="Neutron shared routines and utilities."
+HOMEPAGE="
+	https://github.com/openstack/neutron-lib
+	https://opendev.org/openstack/neutron-lib
+	https://pypi.org/project/neutron-lib
+
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/sqlalchemy-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/pecan-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.14.0[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/os-ken-0.3.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-8.0.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.22.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-4.44.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.20.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-4.3.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-7.0.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-3.6.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-2.25.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-4.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-versionedobjects-1.31.2[${PYTHON_USEDEP}]
+	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/setproctitle-1.1.10[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
+	>=dev-python/os-traits-0.9.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/hacking-3.0.1[${PYTHON_USEDEP}]
+		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/reno-3.1.0[${PYTHON_USEDEP}]
+		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/neutron-lib/neutron-lib-2.6.1.ebuild b/dev-python/neutron-lib/neutron-lib-2.6.1.ebuild
deleted file mode 100644
index 2450e010fc..0000000000
--- a/dev-python/neutron-lib/neutron-lib-2.6.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_8 )
-
-inherit distutils-r1
-
-DESCRIPTION="Neutron shared routines and utilities."
-HOMEPAGE="https://github.com/openstack/neutron-lib"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pecan-1.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pecan-1.0.2[${PYTHON_USEDEP}]
-	!~dev-python/pecan-1.0.3[${PYTHON_USEDEP}]
-	!~dev-python/pecan-1.0.4[${PYTHON_USEDEP}]
-	!~dev-python/pecan-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/os-ken-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.44.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-7.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-1.30.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-2.18.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-versionedobjects-1.31.2[${PYTHON_USEDEP}]
-	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/setproctitle-1.1.10[${PYTHON_USEDEP}]
-	>=dev-python/os-traits-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]"
diff --git a/dev-python/opentracing/Manifest b/dev-python/opentracing/Manifest
new file mode 100644
index 0000000000..6a60cba886
--- /dev/null
+++ b/dev-python/opentracing/Manifest
@@ -0,0 +1 @@
+DIST opentracing-2.4.0.tar.gz 46228 BLAKE2B 465026265a60935be1ed4b23c5b8692b89b90d1c973d496f0c1e87b633e1cc98fe42b83fbacac5921197b5779560e8e4bd515aaaebf09ff4707997a8ad4b8f9e SHA512 fd8fa47c8c05d8ee8c19df8ec14756e05ba9d27f20b3026ccf71f925288ccd2594ec53ff1a26503e19e94d77a8ff0024c37af4efab38a0bee53cb1fed30e9a53
diff --git a/dev-python/opentracing/metadata.xml b/dev-python/opentracing/metadata.xml
new file mode 100644
index 0000000000..acfd64bde8
--- /dev/null
+++ b/dev-python/opentracing/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>lssndrbarbieri@gmail.com</email>
+    <name>Alessandro Barbieri</name>
+  </maintainer>
+  <upstream>
+    <bugs-to>https://github.com/opentracing/opentracing-python/issues</bugs-to>
+    <remote-id type="pypi">opentracing</remote-id>
+    <remote-id type="github">opentracing/opentracing-python</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/opentracing/opentracing-2.4.0.ebuild b/dev-python/opentracing/opentracing-2.4.0.ebuild
new file mode 100644
index 0000000000..408a4c9178
--- /dev/null
+++ b/dev-python/opentracing/opentracing-2.4.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="OpenTracing API for Python"
+HOMEPAGE="
+	http://opentracing.io
+	https://github.com/opentracing/opentracing-python
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64"
+
+RDEPEND=""
+DEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/doubles[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		dev-python/gevent[${PYTHON_USEDEP}]
+		www-servers/tornado[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/opentracing_instrumentation/Manifest b/dev-python/opentracing_instrumentation/Manifest
new file mode 100644
index 0000000000..63d875c0c1
--- /dev/null
+++ b/dev-python/opentracing_instrumentation/Manifest
@@ -0,0 +1 @@
+DIST opentracing_instrumentation-3.3.1.tar.gz 26278 BLAKE2B 7f5bcaf3f3e72b3f393d0332b335b7857de7daa33d4eb96a3b00a9d7042046d6c7f9df80f43fd6f8944bbb490e664a4475b7caf793ceb7cf778b2229d2a6295f SHA512 dbee49e4d465660120701b1019dae8480ffaf822647e848c433603ee2b18346f14533101acef74adc1f087710ff5c6887b2ac9935bd83d9e6d7c49d3fa572bed
diff --git a/dev-python/opentracing_instrumentation/metadata.xml b/dev-python/opentracing_instrumentation/metadata.xml
new file mode 100644
index 0000000000..04846e95e8
--- /dev/null
+++ b/dev-python/opentracing_instrumentation/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>lssndrbarbieri@gmail.com</email>
+    <name>Alessandro Barbieri</name>
+  </maintainer>
+  <upstream>
+    <bugs-to>https://github.com/uber-common/opentracing-python-instrumentation/issues</bugs-to>
+    <remote-id type="pypi">opentracing-instrumentation</remote-id>
+    <remote-id type="github">uber-common/opentracing-python-instrumentation</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/opentracing_instrumentation/opentracing_instrumentation-3.3.1.ebuild b/dev-python/opentracing_instrumentation/opentracing_instrumentation-3.3.1.ebuild
new file mode 100644
index 0000000000..fd2cea5736
--- /dev/null
+++ b/dev-python/opentracing_instrumentation/opentracing_instrumentation-3.3.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+PYTHON_COMPAT=( python3_8 )
+
+inherit distutils-r1
+
+DESCRIPTION="A collection of Python instrumentation tools for the OpenTracing API"
+HOMEPAGE="
+	https://github.com/uber-common/opentracing-python-instrumentation
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/future[${PYTHON_USEDEP}]
+	dev-python/wrapt[${PYTHON_USEDEP}]
+	>=www-servers/tornado-4.1[${PYTHON_USEDEP}]
+	>=dev-python/opentracing-2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/boto3[${PYTHON_USEDEP}]
+		dev-python/botocore[${PYTHON_USEDEP}]
+		dev-python/celery[${PYTHON_USEDEP}]
+		dev-python/doubles[${PYTHON_USEDEP}]
+		dev-python/moto[${PYTHON_USEDEP}]
+		dev-python/psycopg:2[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.3.7[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+		dev-python/pytest-tornado[${PYTHON_USEDEP}]
+		>=dev-python/basictracer-3[${PYTHON_USEDEP}]
+		dev-python/redis-py[${PYTHON_USEDEP}]
+		dev-python/testfixtures[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/orjson/orjson-3.5.3.ebuild b/dev-python/orjson/orjson-3.5.3.ebuild
index 64d9ca1ccc..3dc01d0d5a 100644
--- a/dev-python/orjson/orjson-3.5.3.ebuild
+++ b/dev-python/orjson/orjson-3.5.3.ebuild
@@ -90,11 +90,11 @@ pkg_setup() {
 
 src_compile() {
 	maturin build --no-sdist --manylinux off --interpreter ${EPYTHON} $(usex debug "" --release) || die
-	unzip "target/wheels/${P}-*.whl" || die
+	unzip target/wheels/${P}-*.whl || die
 }
 
 src_install() {
-	python_domodule "${PN}"*.so
+	python_domodule orjson/orjson*.so
 	dodoc README.md
 }
 
diff --git a/dev-python/os-brick/Manifest b/dev-python/os-brick/Manifest
index 3c84b83f80..9c1bb63c79 100644
--- a/dev-python/os-brick/Manifest
+++ b/dev-python/os-brick/Manifest
@@ -1 +1 @@
-DIST os-brick-4.0.1.tar.gz 192821 BLAKE2B da1037e33288a3a20c6858b8620c5905c9a1d218ab858659bce844445d6b33a9b9c629df21eab68419e755bddebc43bf20afc197eaaf4a29dcd7365d19b27b0b SHA512 7847cae82e1ef726eb1189d93f13325d57abdb52286887d6b55e256d9a9f62b0afe71580c5ff30008f5827ba76cac8e423ee5da0d2d01f5794fa3556a6c2cc64
+DIST os-brick-5.0.1.tar.gz 216084 BLAKE2B d37d57ff9fd652e1711bf428b2e772501fa70397100c7f97f434a08785a2e1a2dcccbe7c260d3e98eed5406a33c83f97f49a6ace188d546882780ebca507d389 SHA512 b324c6bef9095833d8ae3a22c6bf695b325b7835d68f91e4aaff00121ae8615a62091a631145fe750743b9d9818f2cec0b810a50e85203cfc3125b07248616b9
diff --git a/dev-python/os-brick/os-brick-4.0.1-r1.ebuild b/dev-python/os-brick/os-brick-4.0.1-r1.ebuild
deleted file mode 100644
index c2cf96c11a..0000000000
--- a/dev-python/os-brick/os-brick-4.0.1-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_8 )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenStack Cinder brick library for managing local volume attaches"
-HOMEPAGE="https://github.com/openstack/cinder"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND=">=dev-python/pbr-5.4.1[${PYTHON_USEDEP}]"
-RDEPEND="
-	>=dev-python/pbr-5.4.1[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.15.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.23.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.44.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.24.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-privsep-1.32.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-2.23.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.34.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/tenacity-6.0.0[${PYTHON_USEDEP}]
-	>=dev-python/os-win-3.0.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -i -e 's/\tetc/\t\/etc/g' setup.cfg || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/os-brick/os-brick-5.0.1.ebuild b/dev-python/os-brick/os-brick-5.0.1.ebuild
new file mode 100644
index 0000000000..d61d10a503
--- /dev/null
+++ b/dev-python/os-brick/os-brick-5.0.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_8 )
+
+inherit distutils-r1
+
+DESCRIPTION="OpenStack Cinder brick library for managing local volume attaches"
+HOMEPAGE="
+	https://opendev.org/openstack/os-brick
+	https://launchpad.net/os-brick
+	https://pypi.org/project/os-brick
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/pbr-5.5.1[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.30.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-4.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-3.1.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-4.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-5.0.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-privsep-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-4.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-4.8.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.25.1[${PYTHON_USEDEP}]
+	>=dev-python/tenacity-6.3.1[${PYTHON_USEDEP}]
+	>=dev-python/os-win-5.4.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		>=dev-python/hacking-4.0.0[${PYTHON_USEDEP}]
+		>=dev-python/ddt-1.4.1[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-4.4.1[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.5.0[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.4.0[${PYTHON_USEDEP}]
+		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-vmware-3.8.0[${PYTHON_USEDEP}]
+		>=dev-python/castellan-3.7.0[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/bandit-1.6.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -i -e 's/\tetc/\t\/etc/g' setup.cfg || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/os-ken/Manifest b/dev-python/os-ken/Manifest
index fb5019261f..c5e5fb14fb 100644
--- a/dev-python/os-ken/Manifest
+++ b/dev-python/os-ken/Manifest
@@ -1 +1 @@
-DIST os-ken-1.2.0.tar.gz 1442682 BLAKE2B 37582acac257cc840039ef4f75a938bce357d53f680b460e0f92a116b0c3eb0a3d38f631998760083f60a4ddf45741489f2b40d6f336ca60f257f8307d3c82f9 SHA512 a88c5165822b70ca4f9c172788acdd08ad8de4f0a07bbc53d3bc37c9c97481d55f1272c74a3438a86fa0d5ebce945f04a12d7a065c580319a0d94049476408ff
+DIST os-ken-2.1.0.tar.gz 1367132 BLAKE2B b00842998f0fdf8056290217d45d0ee54e966c43deef9491ac77574c7a45d50e8609c946159ee4f4c06e22dab3857c93b04898d8d267502702eba88908dcc95d SHA512 9e8e1ad506bcf44b28af64a7771773097ba338abf5dc19c3bf8299227bbcbb5b745aec38e585f5be6ae9f5426a0c32499f56bafdd2615846939bbdd2eac6c527
diff --git a/dev-python/os-ken/os-ken-1.2.0.ebuild b/dev-python/os-ken/os-ken-1.2.0.ebuild
deleted file mode 100644
index 3f34479882..0000000000
--- a/dev-python/os-ken/os-ken-1.2.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="OpenStack Cinder brick library for managing local volume attaches"
-HOMEPAGE="https://github.com/openstack/os-ken"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/os-ken-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]"
-RDEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.18.2[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.18.3[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.23.0[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
-	>=dev-python/ovs-2.6.0[${PYTHON_USEDEP}]
-	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/tinyrpc-0.6[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.2[${PYTHON_USEDEP}]"
diff --git a/dev-python/os-ken/os-ken-2.1.0.ebuild b/dev-python/os-ken/os-ken-2.1.0.ebuild
new file mode 100644
index 0000000000..420db16a66
--- /dev/null
+++ b/dev-python/os-ken/os-ken-2.1.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_8 )
+
+inherit distutils-r1
+
+DESCRIPTION="OpenStack Cinder brick library for managing local volume attaches"
+HOMEPAGE="
+	https://github.com/openstack/os-ken
+	https://opendev.org/openstack/os-ken
+	https://pypi.org/project/os-ken
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/os-ken-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/eventlet-0.22.0[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.5.0[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
+	>=dev-python/ovs-2.8.0[${PYTHON_USEDEP}]
+	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.8.2[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/hacking-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/stestr-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests nose
diff --git a/dev-python/os-testr/Manifest b/dev-python/os-testr/Manifest
new file mode 100644
index 0000000000..b8d05ba2e6
--- /dev/null
+++ b/dev-python/os-testr/Manifest
@@ -0,0 +1 @@
+DIST os-testr-2.0.1.tar.gz 50884 BLAKE2B f709b33b168fade7faf8e13d0dbf3309cb9aa8e543133138cf7a3ac1d642670cbf803ea5e3b19a4cb2db9b5237837ea89835133e30fa09565af11b52385366cd SHA512 d4c5b84a18d05c0da8a017c045e7304b8fe6a3afc3295a76fa3ba192873f0e507e2fa6c3da423f7d77a82eb3e141225b1abd6875acd56c5a2a9d77a32476deff
diff --git a/dev-dotnet/dotnet-runtime-bin/metadata.xml b/dev-python/os-testr/metadata.xml
similarity index 55%
rename from dev-dotnet/dotnet-runtime-bin/metadata.xml
rename to dev-python/os-testr/metadata.xml
index e29f0a4a02..e447453816 100644
--- a/dev-dotnet/dotnet-runtime-bin/metadata.xml
+++ b/dev-python/os-testr/metadata.xml
@@ -2,7 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>telans@posteo.de</email>
-		<name>James Beddek</name>
+		<email>lssndrbarbieri@gmail.com</email>
+		<name>Alessandro Barbieri</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">os-testr</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/os-testr/os-testr-2.0.1.ebuild b/dev-python/os-testr/os-testr-2.0.1.ebuild
new file mode 100644
index 0000000000..fda5db79c3
--- /dev/null
+++ b/dev-python/os-testr/os-testr-2.0.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_8 )
+
+inherit distutils-r1
+
+DESCRIPTION="A testr wrapper to provide functionality for OpenStack projects"
+HOMEPAGE="
+	https://opendev.org/openstack/os-testr
+	https://pypi.org/project/os-testr
+	https://launchpad.net/os-testr
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/os-testr-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/stestr-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		>=dev-python/hacking-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
+		>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/os-traits/Manifest b/dev-python/os-traits/Manifest
index 79f2995725..874cdf84f4 100644
--- a/dev-python/os-traits/Manifest
+++ b/dev-python/os-traits/Manifest
@@ -1 +1 @@
-DIST os-traits-2.4.0.tar.gz 25523 BLAKE2B 4b80ea28b748d69f9ddc510a2c4766f06bfe85544c86c6771d323f8a58e3244033d4bf79c0b525be1a46b39402f19f6dd2e83bef5fcec06e52cd0a3c0708f69d SHA512 ac6cfc58f3f77d44fb252be0c00afbd147ec0da0cca395c76b5ba31d3626a7118273713935f793c9ed9a2230062c9a3e9384867795aa83318cfa2c91fb15fa55
+DIST os-traits-2.6.0.tar.gz 29757 BLAKE2B a0839c5869fe843a372376c7146be595dd48223fcded187a3aca98db33dede7e234818ee30e79d7ecd52c3366ee87a1796e0623ed4d04c3a512304a0bddee9de SHA512 57f46678c1859af09f0e13e491760bddd818b7779716d91197f9fa45c6b195bb023a4de5fface68a95a87bf66547b27d74addb66cde043bd571a0eca176ee53b
diff --git a/dev-python/os-traits/os-traits-2.4.0.ebuild b/dev-python/os-traits/os-traits-2.4.0.ebuild
deleted file mode 100644
index 16fa79532d..0000000000
--- a/dev-python/os-traits/os-traits-2.4.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_8 )
-
-inherit distutils-r1
-
-DESCRIPTION="os-traits is a library containing standardized trait strings."
-HOMEPAGE="https://github.com/openstack/os-traits"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-DEPEND=">=dev-python/pbr-5.4.0[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
diff --git a/dev-python/os-traits/os-traits-2.6.0.ebuild b/dev-python/os-traits/os-traits-2.6.0.ebuild
new file mode 100644
index 0000000000..e2efe366ad
--- /dev/null
+++ b/dev-python/os-traits/os-traits-2.6.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_8 )
+
+inherit distutils-r1
+
+DESCRIPTION="os-traits is a library containing standardized trait strings."
+HOMEPAGE="
+	https://github.com/openstack/os-traits
+	https://pypi.org/project/os-traits
+	https://opendev.org/openstack/os-traits
+	https://launchpad.net/os-traits
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]"
+DEPEND="
+	${RDEPEND}
+	test? (
+		>=dev-python/hacking-3.0.1[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/os-win/Manifest b/dev-python/os-win/Manifest
index 2a0114cf58..086dce99cf 100644
--- a/dev-python/os-win/Manifest
+++ b/dev-python/os-win/Manifest
@@ -1 +1 @@
-DIST os-win-5.1.0.tar.gz 221803 BLAKE2B 37fa5271b86f62a43ea1f6da011601260a9cd32745a2369093dc5103e54945c17d16ecfaf8f5d88fd7ec3673ac41e25ff02d3c15ec5423fb9651101213801cab SHA512 bb93af1b412b8e0699f62a772bf9bacc73e2e73751cf0e9b9a37d59869a6c31e39ddbaafc4b97b494d9a38208d765362a6ce7fe071e1c089c127e1554ae73a02
+DIST os-win-5.5.0.tar.gz 225851 BLAKE2B f0427ecfb25b45f4980992a54ae4b2d6518af5df17013dfd338c9331d1492cab36f9061082a41bee5ab829f31008ddaf7a8708fdd89d3df89d9989d30aba5357 SHA512 bc980d973f5089c1328095b6edfaabf2435df3acbca543a768dbbccc8a10ffce4405c54c7711d2c7fa55c40442fa4b116f2e2d40ad4116b1c8bb96ace3450335
diff --git a/dev-python/os-win/os-win-5.1.0.ebuild b/dev-python/os-win/os-win-5.1.0.ebuild
deleted file mode 100644
index 08f2552769..0000000000
--- a/dev-python/os-win/os-win-5.1.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Windows / Hyper-V library for OpenStack projects."
-HOMEPAGE="https://github.com/openstack/os-win"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/os-win/os-win-5.5.0.ebuild b/dev-python/os-win/os-win-5.5.0.ebuild
new file mode 100644
index 0000000000..d24080f5fb
--- /dev/null
+++ b/dev-python/os-win/os-win-5.5.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_8 )
+
+inherit distutils-r1
+
+DESCRIPTION="Windows / Hyper-V library for OpenStack projects."
+HOMEPAGE="
+	https://github.com/openstack/os-win
+	https://opendev.org/openstack/os-win
+	https://launchpad.net/os-win
+	https://pypi.org/project/os-win/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.22.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.29.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-6.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-4.7.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		>=dev-python/hacking-3.0.1[${PYTHON_USEDEP}]
+		>=dev-python/ddt-1.2.1[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.8.0[${PYTHON_USEDEP}]
+		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/os-xenapi/os-xenapi-0.3.4-r1.ebuild b/dev-python/os-xenapi/os-xenapi-0.3.4-r1.ebuild
deleted file mode 100644
index bb3eec871f..0000000000
--- a/dev-python/os-xenapi/os-xenapi-0.3.4-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="XenAPI library for OpenStack projects"
-HOMEPAGE="https://github.com/openstack/os-xenapi"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]"
-RDEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/os-xenapi/os-xenapi-0.3.4-r2.ebuild b/dev-python/os-xenapi/os-xenapi-0.3.4-r2.ebuild
new file mode 100644
index 0000000000..ed2fff781f
--- /dev/null
+++ b/dev-python/os-xenapi/os-xenapi-0.3.4-r2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_8 )
+
+inherit distutils-r1
+
+DESCRIPTION="XenAPI library for OpenStack projects"
+HOMEPAGE="
+	https://github.com/openstack/os-xenapi
+	https://launchpad.net/os-xenapi
+	https://launchpad.net/os-xenapi
+	https://opendev.org/x/os-xenapi
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.18.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/paramiko-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		>=dev-python/hacking-0.11.0[${PYTHON_USEDEP}]
+		>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/os-testr-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/reno-2.5.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/osprofiler/Manifest b/dev-python/osprofiler/Manifest
index 4905b442a8..17f011c1ae 100644
--- a/dev-python/osprofiler/Manifest
+++ b/dev-python/osprofiler/Manifest
@@ -1 +1 @@
-DIST osprofiler-3.4.0.tar.gz 86842 BLAKE2B 78a679424023f7cd20a0c6c5825747e3c108e977b44985e2f106b8e82d9cfb44f84b3662df531c64cf09fd4ce313c8a457b803ca820291d58f4f2bacb51eff81 SHA512 d88c0c68eee693a799f4e52a447dd7a4b79f7eddeb1c82bf41cdf3be6457c1b1116b6caa19530de4df376a1cbc26f4094835c3ef7110016d3d9ba989f8e8e41c
+DIST osprofiler-3.4.2.tar.gz 90651 BLAKE2B ab7fdfd84126b877c3a1767166c6e80953b25e026427a7075bd83dd6272d966882ed3be83c176fce200d61a9bec88ef6d2772189842413bb250ace71e53ba639 SHA512 2127b867e2b731fe81efa3b8ea64d22426bbff04478aefe879203cfce86202fff0116d555dd100562a405edf5820a37e3afd97809968c213991c0d19bde41fbc
diff --git a/dev-python/osprofiler/osprofiler-3.4.0.ebuild b/dev-python/osprofiler/osprofiler-3.4.0.ebuild
deleted file mode 100644
index 8c83110f28..0000000000
--- a/dev-python/osprofiler/osprofiler-3.4.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="OpenStack Profiler Library"
-HOMEPAGE="https://launchpad.net/osprofiler"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
-RDEPEND="
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-2.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.2[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/importlib_metadata-1.7.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/osprofiler/osprofiler-3.4.2.ebuild b/dev-python/osprofiler/osprofiler-3.4.2.ebuild
new file mode 100644
index 0000000000..b73c6f57f9
--- /dev/null
+++ b/dev-python/osprofiler/osprofiler-3.4.2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_8 )
+
+inherit distutils-r1
+
+DESCRIPTION="OpenStack Profiler Library"
+HOMEPAGE="
+	https://launchpad.net/osprofiler
+	https://opendev.org/openstack/osprofiler
+	https://pypi.org/project/osprofiler
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-2.18.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.2[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/hacking-3.1.0[${PYTHON_USEDEP}]
+		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
+		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/bandit-1.6.0[${PYTHON_USEDEP}]
+		>=dev-python/pymongo-3.0.2[${PYTHON_USEDEP}]
+		>=dev-python/elasticsearch-py-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/redis-py-2.10.0[${PYTHON_USEDEP}]
+		>=dev-python/reno-3.1.0[${PYTHON_USEDEP}]
+		>=dev-python/jaeger-client-3.8.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/ovsdbapp/Manifest b/dev-python/ovsdbapp/Manifest
index 6fa9850bbe..d9c0727142 100644
--- a/dev-python/ovsdbapp/Manifest
+++ b/dev-python/ovsdbapp/Manifest
@@ -1 +1 @@
-DIST ovsdbapp-1.5.0.tar.gz 88970 BLAKE2B 8ec73d73b159e7e45aa057d24a58388057e50ea006d8cb15be739a39471d0d6fed1542e0bcceed8e9daae67eb3c0b543a8131955a246832ef4e0480950f4f4d6 SHA512 d98ca56dc63aee22315b4181b9d3084e82d611489da7764cc44c14f805dcd874bd7aa72f6e1cb4f44234a118accb77d7412479b5f2224312c7105f56fdbac991
+DIST ovsdbapp-1.12.0.tar.gz 98607 BLAKE2B 3dc56c85ff962477b3ec725da69c70506ea17c01049be984524cb3bf6b09fd2a0203bbffeee237d80038ee230d7bfb962b61078a0707a567268c1078f66d37c3 SHA512 5d432be0a2de600ab994e76bf4d05c1c0665ab6053f2fe76a6f96b9f7bdfa69c449e58fdc28e921adf403a0083ee051a7d19a35ee6eaff3596334e4249f0f9ee
diff --git a/dev-python/ovsdbapp/ovsdbapp-1.12.0.ebuild b/dev-python/ovsdbapp/ovsdbapp-1.12.0.ebuild
new file mode 100644
index 0000000000..d3c76d9830
--- /dev/null
+++ b/dev-python/ovsdbapp/ovsdbapp-1.12.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_8 )
+
+inherit distutils-r1
+
+DESCRIPTION="A library for creating OVSDB applications"
+HOMEPAGE="
+	https://opendev.org/openstack/ovsdbapp
+	https://pypi.org/project/ovsdbapp
+	https://launchpad.net/ovsdbapp
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
+	>=dev-python/ovs-2.10.0[${PYTHON_USEDEP}]
+	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		>=dev-python/hacking-3.0.1[${PYTHON_USEDEP}]
+		>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/ovsdbapp/ovsdbapp-1.5.0.ebuild b/dev-python/ovsdbapp/ovsdbapp-1.5.0.ebuild
deleted file mode 100644
index 05fd16441e..0000000000
--- a/dev-python/ovsdbapp/ovsdbapp-1.5.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_8 )
-
-inherit distutils-r1
-
-DESCRIPTION="A library for creating OVSDB applications"
-HOMEPAGE="http://bugs.launchpad.net/ovsdbapp"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/ovs-2.8.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/pykeepass/Manifest b/dev-python/pykeepass/Manifest
index cdbff95aa8..0192005ee7 100644
--- a/dev-python/pykeepass/Manifest
+++ b/dev-python/pykeepass/Manifest
@@ -1 +1,2 @@
 DIST pykeepass-4.0.0.tar.gz 88720 BLAKE2B 7dcce1ded4527f32e0a602d9a7b742fabd32ee6c5e6836f0d4d217c3117177f258e974275670c9cea408e05335004996bea6a68ba12fe02ac30b0276ac7cfb54 SHA512 03483c9dc78774b2c5d4088f9995db9a9142bc69a8d4bc1824f4868175d3556434cb155c1f35a3fa0c04fca72f571af518166f59bcbe21431b7fe34a20b57cb2
+DIST pykeepass-4.0.1.tar.gz 99343 BLAKE2B ed3ea6575041ef73adc769365078818af9080851bba8b31ee24ef283480633305147307c4ea7217fba96ca18cd90bcf33b0d66b0a9148121165f67937d8677b0 SHA512 512f25029fcaa7a84459767cd9101d113623722c2aaf466fd3e77cf0043c37d344ccd2c0226fcbc3b3c22e39f8060c172ab1e1c72993c469a4499b21c47f6134
diff --git a/dev-python/pykeepass/pykeepass-4.0.1.ebuild b/dev-python/pykeepass/pykeepass-4.0.1.ebuild
new file mode 100644
index 0000000000..e7963b9c17
--- /dev/null
+++ b/dev-python/pykeepass/pykeepass-4.0.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library to interact with keepass databases (supports KDBX3 and KDBX4) "
+HOMEPAGE="https://github.com/libkeepass/pykeepass"
+SRC_URI="https://github.com/libkeepass/pykeepass/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/argon2-cffi-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/construct-2.10.54[${PYTHON_USEDEP}]
+	>=dev-python/future-0.18.2[${PYTHON_USEDEP}]
+	>=dev-python/lxml-4.3.5[${PYTHON_USEDEP}]
+	>=dev-python/pycryptodome-3.8.2[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.8.1[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/pykeepass-4.0.0-fix-tests-install.patch )
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+	# pycryptodomex to pycryptodome conversion
+	sed -i 's/Cryptodome/Crypto/g' pykeepass/kdbx_parsing/{common,twofish}.py || die
+}
+
+python_test() {
+	"${EPYTHON}" tests/tests.py -v || die
+}
diff --git a/dev-python/pysaml2/Manifest b/dev-python/pysaml2/Manifest
index 0123be1ab9..bd76ef2a74 100644
--- a/dev-python/pysaml2/Manifest
+++ b/dev-python/pysaml2/Manifest
@@ -1 +1 @@
-DIST pysaml2-6.1.0.tar.gz 325101 BLAKE2B 254d1c57e03f13346db89ee18a885d03ce55ed6eec5649d5c764ed6bf97ff20e2a0715e5678409125737acf8fda464c331a17ebe422cc96518bdd3825cf8db05 SHA512 4b3f942a352e6e9ad8df9d3c41269d00dda9f4a71286a4030556d35e5e3946c214fa5c2942f529b1f1ee4dfc30a4d388dffa204f6bdc7614f65b8a3a37ea5ff9
+DIST pysaml2-7.0.1.tar.gz 359067 BLAKE2B 1a420c40ab34e290cf0ccb1b58ffc01081db540eda0281aa67b37722c39fd6abd6a806e3d8c564ff7af777c922359e632be30c344837ad8eb9e035cfa921400c SHA512 a706136628c1b86b2d53ea64e6506cf4b1ce2722e3583ed0dd39125ee9e898d4309224a0d3baa2c6a4f8adeba22e4e18945113da628659476d5f77f297daef60
diff --git a/dev-python/pysaml2/pysaml2-6.1.0.ebuild b/dev-python/pysaml2/pysaml2-7.0.1.ebuild
similarity index 61%
rename from dev-python/pysaml2/pysaml2-6.1.0.ebuild
rename to dev-python/pysaml2/pysaml2-7.0.1.ebuild
index 3be144be98..8ac8c5ab97 100644
--- a/dev-python/pysaml2/pysaml2-6.1.0.ebuild
+++ b/dev-python/pysaml2/pysaml2-7.0.1.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+EAPI=8
+
 DISTUTILS_USE_SETUPTOOLS=bdepend
+PYTHON_COMPAT=( python3_8 )
 
 inherit distutils-r1
 
@@ -13,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64"
 
 RDEPEND="
 	>=dev-python/cryptography-1.4[${PYTHON_USEDEP}]
@@ -23,4 +24,17 @@ RDEPEND="
 	dev-python/pytz[${PYTHON_USEDEP}]
 	>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/importlib_resources[${PYTHON_USEDEP}]
+	>=dev-python/xmlschema-1.2.1[${PYTHON_USEDEP}]
 "
+DEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/toml[${PYTHON_USEDEP}]
+		dev-python/pyasn1[${PYTHON_USEDEP}]
+		dev-python/pymongo[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pystray/Manifest b/dev-python/pystray/Manifest
index 8a341d8eb8..6e38c4d342 100644
--- a/dev-python/pystray/Manifest
+++ b/dev-python/pystray/Manifest
@@ -1 +1,2 @@
 DIST pystray-0.17.3.tar.gz 24877 BLAKE2B 5faf19241436d56d90a021c24753b914b3ec72fe2f511c3d1cf610e091829a8b130ade1ed4fef19ef6972d0b8ec5a3845f6ba443392d50d1b26bf81ef0715e61 SHA512 63b8bcffe80b619b753169d9b61ff7525cab550e5695abac9f01b9b6623555384a592a92b4ac23e251ff162db1a131aa482f8b2ecb2821b56e3cbb232434821a
+DIST pystray-0.17.4.tar.gz 44996 BLAKE2B 2be8d038afb35c0ecc6a0879a41bf898ef8ecf1f5e6d8e9c6d23a157714b866ec7a19d2e5205e95d5c16d0f401e360fb3fa4cdef1f4ed7779436be3e1a4fd37f SHA512 c6af272bef6f5769259d4958a606da3744ceabb5098286bf62fc5d7f2159231f425c77c1578d3b936000b94398d0afbb72a047d33687a30863a01a46bd2fe533
diff --git a/dev-python/pystray/pystray-0.17.4.ebuild b/dev-python/pystray/pystray-0.17.4.ebuild
new file mode 100644
index 0000000000..2d0717c325
--- /dev/null
+++ b/dev-python/pystray/pystray-0.17.4.ebuild
@@ -0,0 +1,23 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="System tray icon creation via python"
+HOMEPAGE="https://github.com/moses-palmer/pystray"
+SRC_URI="https://github.com/moses-palmer/pystray/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+DEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
+RDEPEND="
+	${DEPEND}
+	dev-python/python-xlib[${PYTHON_USEDEP}]
+"
+BDEPEND="dev-python/pillow[${PYTHON_USEDEP}]"
diff --git a/dev-python/pysubs2/Manifest b/dev-python/pysubs2/Manifest
index 31660782e1..696efb3fed 100644
--- a/dev-python/pysubs2/Manifest
+++ b/dev-python/pysubs2/Manifest
@@ -1 +1,2 @@
 DIST pysubs2-1.2.0.tar.gz 844305 BLAKE2B be553a2672cfebe08847e1fc65b41420485846d75ccb4dbb2c9bb8aec1843d2665bd8117a2f718871ea17e79e40ec491f2360eea695c07622fee16fe52a7f7f7 SHA512 37cf74c8c812c1683ef926c8bb749479bc9eaedd780f29a3299295885fd329eae7b2863f293da878ce54b696e8783cfab49cb341b54735a892339c77c551edfb
+DIST pysubs2-1.3.0.tar.gz 846587 BLAKE2B 0afa4c6d4d8ad4a7eda7461b80a6e61123096601ae64132e55f7c4e564f15f202abe0ef2836c067563072a9dba18b9c74380d31c68d8dde5d83f207ca45d99f2 SHA512 696acb26e2c74615674e33e06545c84bd7ee446f47bec3256da7e101dc317d9d2a0f659d3a51ae95fdad3d8014b635b5f4f12375f7f8f0c7fa85835ec09675ca
diff --git a/dev-python/pysubs2/pysubs2-1.3.0.ebuild b/dev-python/pysubs2/pysubs2-1.3.0.ebuild
new file mode 100644
index 0000000000..75eb35d505
--- /dev/null
+++ b/dev-python/pysubs2/pysubs2-1.3.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A library for editing subtitle files"
+HOMEPAGE="https://github.com/tkarabela/pysubs2"
+SRC_URI="https://github.com/tkarabela/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+distutils_enable_tests nose
diff --git a/dev-python/pytest-tornado/Manifest b/dev-python/pytest-tornado/Manifest
new file mode 100644
index 0000000000..18bc4bccb4
--- /dev/null
+++ b/dev-python/pytest-tornado/Manifest
@@ -0,0 +1 @@
+DIST pytest-tornado-0.8.1.tar.gz 9134 BLAKE2B 6ed8b77e4a6145442aefa082ebcd4b9a1232ec6e90d44d696fc615a0cc097a6b9e44127d1c67a74b736981746a7c707b1f3a4d934eeac35aafea05a021a5ce7b SHA512 b3c35868574e1c42ee7a1c8adfc7314ac4cab8daf3c9ad95e0f7a1279f2707946bd4e727525bef9184599c923857f488def4c7c0a07878625165cfde85bd0304
diff --git a/dev-python/pytest-tornado/metadata.xml b/dev-python/pytest-tornado/metadata.xml
new file mode 100644
index 0000000000..dbc6eb519c
--- /dev/null
+++ b/dev-python/pytest-tornado/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>lssndrbarbieri@gmail.com</email>
+    <name>Alessandro Barbieri</name>
+  </maintainer>
+  <upstream>
+    <bugs-to>https://github.com/vidartf/pytest-tornado/issues</bugs-to>
+    <maintainer>
+      <email>vidartf@gmail.com</email>
+      <name>Vidar Tonaas Fauske</name>
+    </maintainer>
+    <remote-id type="pypi">pytest-tornado</remote-id>
+    <remote-id type="github">vidartf/pytest-tornado</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pytest-tornado/pytest-tornado-0.8.1.ebuild b/dev-python/pytest-tornado/pytest-tornado-0.8.1.ebuild
new file mode 100644
index 0000000000..bb0435b152
--- /dev/null
+++ b/dev-python/pytest-tornado/pytest-tornado-0.8.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A py.test plugin providing fixtures and markers to simplify testing of asynchronous tornado applications"
+HOMEPAGE="https://github.com/vidartf/pytest-tornado"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/pytest-3.6[${PYTHON_USEDEP}]
+	>=www-servers/tornado-5[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-python/python-barbicanclient/Manifest b/dev-python/python-barbicanclient/Manifest
index 013e16076f..e0c15ca7d4 100644
--- a/dev-python/python-barbicanclient/Manifest
+++ b/dev-python/python-barbicanclient/Manifest
@@ -1 +1 @@
-DIST python-barbicanclient-5.0.1.tar.gz 118714 BLAKE2B dbdf98a481853c70e8548eac98a24bad66f398eba37e74425bd941b60c69aa80b1b24f77b2a4228a82f7a9f722068d55b954be8aec41f52e0665c70650b7f447 SHA512 5ab164e92b1d2820b5f84b59748e3fdf0733c587e6c4a9a17cb34cb95ab7a3900430790b50ce40b479a9f39e599a0969e3e8d1c5255ed6c595a287019a736663
+DIST python-barbicanclient-5.2.0.tar.gz 119411 BLAKE2B bb402331e122314404945bc162a757942bc057af8c62467f8b03f62b24292eab930f6471a59930a62ad8f67bcc865cd8bb356342d6957c8170f3a33735dadf90 SHA512 de9d063bf5e79347d0457b8fa69ed0d307fb4cd2b7dff23f156eab16521b3048283b9a7fdb1f464efe04cc4fd28e2072fe965a3e097842d1704f36bb83e7e3a2
diff --git a/dev-python/python-barbicanclient/python-barbicanclient-5.0.1.ebuild b/dev-python/python-barbicanclient/python-barbicanclient-5.0.1.ebuild
deleted file mode 100644
index 86097bbcfc..0000000000
--- a/dev-python/python-barbicanclient/python-barbicanclient-5.0.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Client library for Barbican API."
-HOMEPAGE="https://github.com/openstack/barbican"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-DEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]"
-RDEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/cliff-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/python-barbicanclient/python-barbicanclient-5.2.0.ebuild b/dev-python/python-barbicanclient/python-barbicanclient-5.2.0.ebuild
new file mode 100644
index 0000000000..a0535cefaa
--- /dev/null
+++ b/dev-python/python-barbicanclient/python-barbicanclient-5.2.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_8 )
+
+inherit distutils-r1
+
+DESCRIPTION="Client library for Barbican API"
+HOMEPAGE="
+	https://github.com/openstack/python-barbicanclient
+	https://opendev.org/openstack/python-barbicanclient
+	https://pypi.org/project/python-barbicanclient
+	https://launchpad.net/python-barbicanclient
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/cliff-2.8.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-2.18.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+		>=dev-python/python-openstackclient-3.12.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests nose
diff --git a/dev-python/pywebview/Manifest b/dev-python/pywebview/Manifest
index 178771567b..db7f7ea7e6 100644
--- a/dev-python/pywebview/Manifest
+++ b/dev-python/pywebview/Manifest
@@ -1 +1,2 @@
 DIST pywebview-3.4.tar.gz 307993 BLAKE2B a838514ebbca25b8d54cbc2e9dd4a6caad01a05593cc82d6bb371398b2f70642fe1321b57f45f56121ca0cddeaa62eba05eebc0aa94f9cf0b36736bf8fe3f331 SHA512 a30c8c726e1351f3a5cc96c2774246a0a6326e8b6a2e9c25fe6e3bb7d866ff0c7cbd16da0428f6891c8316eafc70fd96c13255515b63d907ef20459a6cabd70a
+DIST pywebview-3.5.tar.gz 336741 BLAKE2B 332a71499d034acb94e2151771399007d441d85485bf596fb510e7513a417ac8dd1f1091db7796a767b535089d024affaea979567d6992f1bbe1154452cfcd80 SHA512 0d4e60a1389a11a9406634ac05446bc11bdea30ed4d81aca311ef01d8e9613d3582cf480c0a79bfe2b5a8c803c56c437abc0bb86ef4ba243bff638fcd6de9490
diff --git a/dev-python/pywebview/pywebview-3.5.ebuild b/dev-python/pywebview/pywebview-3.5.ebuild
new file mode 100644
index 0000000000..6ba1acf3f8
--- /dev/null
+++ b/dev-python/pywebview/pywebview-3.5.ebuild
@@ -0,0 +1,22 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="A lightweight cross-platform wrapper around a webview component"
+HOMEPAGE="https://github.com/r0x0r/pywebview"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/pygobject[${PYTHON_USEDEP}]
+	dev-python/PyQt5[${PYTHON_USEDEP}]
+	dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/rstr/Manifest b/dev-python/rstr/Manifest
index b5b287942e..6ae33ee175 100644
--- a/dev-python/rstr/Manifest
+++ b/dev-python/rstr/Manifest
@@ -1 +1,2 @@
 DIST rstr-2.2.6.tar.gz 11197 BLAKE2B 115b674b6d474716623846838b77d08455b60c452150f149f1577ec18a730751af1bc9b4cf3cd445b676ebac1c9bf2262da18f15583d06b75f0746adc363be1b SHA512 ddd4eb4ca25f2bd991d14af6ae800a911a7077dfb14ad1968bf9e62363505e54b4f98b36eb53b7077435f9703116cc2338490a3e0d6d4d1d6fe9857a4d560976
+DIST rstr-3.0.0.tar.gz 11389 BLAKE2B 8e5283ed2fd478189a1ddb0663069ca4a50b52a928290af171d8e79b6e59659530f45eac282cffe52be150c8d4a75adca35fdc2e5afb5c0025da31ada02fc3c7 SHA512 8b9909057f44ffdbfa5a037f9eaf50e506204d846143b54c23c6c83a8589ea5dc7236fa7f987e20b127ef139bef6f47b22239fd961da1f5c5b45606f511cadd8
diff --git a/dev-python/rstr/rstr-3.0.0.ebuild b/dev-python/rstr/rstr-3.0.0.ebuild
new file mode 100644
index 0000000000..af5142c3c5
--- /dev/null
+++ b/dev-python/rstr/rstr-3.0.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Easily generate random strings of various types"
+HOMEPAGE="https://pypi.org/project/rstr"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${PN}-${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT=0
+KEYWORDS="~amd64"
+
+distutils_enable_tests unittest
+
+python_test() {
+	"${PYTHON}" -m unittest discover -v rstr/tests || die "tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${ED}" -type d -name "tests" -exec rm -rv {} + || die "tests removing failed"
+}
diff --git a/dev-python/scenedetect/Manifest b/dev-python/scenedetect/Manifest
index 54358e3706..c1ddbecbc2 100644
--- a/dev-python/scenedetect/Manifest
+++ b/dev-python/scenedetect/Manifest
@@ -1 +1,2 @@
 DIST scenedetect-0.5.5.tar.gz 233089 BLAKE2B ae6b54c7e601cd107fdcb28a6fa5ca29c0c613b54a677c0ac1ae43d984a2beb5e8d8e978cea2cc66fc2b320ab4ecd14b8c8b652bd4552340a1b1ebee031fde0f SHA512 858528fa8852ca528f0f6312b67cbbab5037e81b8834ebb7337c87fff8e4066f6b1ae7487fe8cf7d78894a2fab4519b44ff8cd1c9f2ec6bd24b4be8f32388267
+DIST scenedetect-0.5.6.tar.gz 240161 BLAKE2B 0f613f65656a5ab973928553070b7438812c1f9894d9df43e164c342d63147eba7342c1e3b38da3a191fa75014e98481f55ce2775d901e3ae172986f7d3a2174 SHA512 ed634acfe6087db659c8d50f353c8cbbf7a730aa0502b10f014cf2df2c60c5d6fdfa2ef38a53df2ffafb32271abd0e068005764c19899bb58cca148ccca04422
diff --git a/dev-python/scenedetect/scenedetect-0.5.6.ebuild b/dev-python/scenedetect/scenedetect-0.5.6.ebuild
new file mode 100644
index 0000000000..7f94f6f538
--- /dev/null
+++ b/dev-python/scenedetect/scenedetect-0.5.6.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Video Scene Cut Detection and Analysis Tool"
+HOMEPAGE="https://github.com/Breakthrough/PySceneDetect"
+SRC_URI="https://github.com/Breakthrough/PySceneDetect/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test" # Requires video file not provided
+
+RDEPEND="
+	dev-python/click[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/tqdm[${PYTHON_USEDEP}]
+	media-libs/opencv[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/PySceneDetect-${PV}
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+	sed -i -e '/setup_requires/d' -e '/extras_require/d' setup.py || die
+	sed -i 's/description-file/description_file/' setup.cfg || die # bug #800581
+}
diff --git a/dev-python/sortedcollections/metadata.xml b/dev-python/sortedcollections/metadata.xml
index ad76e650ce..f436facfe2 100644
--- a/dev-python/sortedcollections/metadata.xml
+++ b/dev-python/sortedcollections/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<upstream>
 		<doc>http://www.grantjenks.com/docs/sortedcollections/</doc>
-		<remote-id type="github">https://github.com/grantjenks/python-sortedcollections</remote-id>
+		<remote-id type="github">grantjenks/python-sortedcollections</remote-id>
 		<remote-id type="pypi">sortedcollections</remote-id>
 	</upstream>
 	<maintainer type="person">
diff --git a/dev-python/sre_yield/metadata.xml b/dev-python/sre_yield/metadata.xml
index 0a9c05c2be..769fe848e3 100644
--- a/dev-python/sre_yield/metadata.xml
+++ b/dev-python/sre_yield/metadata.xml
@@ -6,8 +6,8 @@
       <name>Alessandro Barbieri</name>
     </maintainer>
     <upstream>
-        <bugs-to>https://github.com/simoncozens/sre_yield/issues</bugs-to>
-        <remote-id type="github">simoncozens/sre_yield</remote-id>
+        <bugs-to>https://github.com/google/sre_yield/issues</bugs-to>
+        <remote-id type="github">google/sre_yield</remote-id>
         <remote-id type="pypi">sre_yield</remote-id>
     </upstream>
 </pkgmetadata>
diff --git a/dev-python/strictyaml/Manifest b/dev-python/strictyaml/Manifest
index d1006928d0..3e724f6100 100644
--- a/dev-python/strictyaml/Manifest
+++ b/dev-python/strictyaml/Manifest
@@ -1 +1,2 @@
 DIST strictyaml-1.3.2.tar.gz 115883 BLAKE2B 5e56bd46c7ecf8194ec786282ad569b6b50c2151f4250ab93c62df795d5d028e718a91bef329bf4c7fff4117433cf8fe9e24fc96a2c11db4434ac2eb914d2a45 SHA512 35d1a0fc48518911944ddaff37d71f9c2ad8bdc8f2e7a94693c88f7283da39cac4ff28eccdf01be41295649cd362a1fa93c9022e19e9837c392e7e31800205e9
+DIST strictyaml-1.4.4.tar.gz 201187 BLAKE2B 02d054aa57ba2540d5b9c8b77f22bf2dbe19f7e181cebaf9c8193555837173f5be2197cbc2d545818b5eafbef72b62299dd4a86761132de058998b222b33cd65 SHA512 14778612313f5f8e410bc276f7bb449711e4660f1ad1013ea4484c4d92e1fdcf5aa7694aab61087e5c14c3e701cb0c65478ef8fd6e2e36e933af4de2ea5ad3c1
diff --git a/dev-python/strictyaml/strictyaml-1.4.4.ebuild b/dev-python/strictyaml/strictyaml-1.4.4.ebuild
new file mode 100644
index 0000000000..b662784d10
--- /dev/null
+++ b/dev-python/strictyaml/strictyaml-1.4.4.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A type-safe YAML parser built atop ruamel.yaml"
+HOMEPAGE="https://github.com/crdoconnor/strictyaml"
+SRC_URI="https://github.com/crdoconnor/strictyaml/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="
+	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-python/tchannel/Manifest b/dev-python/tchannel/Manifest
new file mode 100644
index 0000000000..57cae519f4
--- /dev/null
+++ b/dev-python/tchannel/Manifest
@@ -0,0 +1 @@
+DIST tchannel-2.1.0.tar.gz 89466 BLAKE2B cbda9700d0bb547e972ebd295706a82b02e1a6472edeca9f9b494bb10b8604bfd5f8c173bcb51a75a848e36bb0984407aa6a4fd252e6905c47946bfd0e0f38d7 SHA512 cf9bd0f4d4390c58e80dc784ea304114bebfa6ee00f4dd34daaafe63ba00c9c9c4ac14bc2766df5e5087357aefadb1b716b3a8d9f6a940484fe7b650caaaabef
diff --git a/dev-js/nel/metadata.xml b/dev-python/tchannel/metadata.xml
similarity index 63%
rename from dev-js/nel/metadata.xml
rename to dev-python/tchannel/metadata.xml
index 9f680a8c01..629511b0b5 100644
--- a/dev-js/nel/metadata.xml
+++ b/dev-python/tchannel/metadata.xml
@@ -6,7 +6,8 @@
     <name>Alessandro Barbieri</name>
   </maintainer>
   <upstream>
-    <bugs-to>https://github.com/n-riesco/nel/issues</bugs-to>
-    <remote-id type="github">n-riesco/nel</remote-id>
+    <bugs-to>https://github.com/uber/tchannel/issues</bugs-to>
+    <remote-id type="pypi">tchannel</remote-id>
+    <remote-id type="github">uber/tchannel</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/tchannel/tchannel-2.1.0.ebuild b/dev-python/tchannel/tchannel-2.1.0.ebuild
new file mode 100644
index 0000000000..1c5ecb05f5
--- /dev/null
+++ b/dev-python/tchannel/tchannel-2.1.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_8 )
+
+inherit distutils-r1
+
+DESCRIPTION="Network multiplexing and framing protocol for RPC"
+HOMEPAGE="https://github.com/uber/tchannel"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/crcmod-1[${PYTHON_USEDEP}]
+	>=dev-python/opentracing-2[${PYTHON_USEDEP}]
+	>=dev-python/opentracing_instrumentation-3[${PYTHON_USEDEP}]
+	>=dev-python/thriftrw-0.4[${PYTHON_USEDEP}]
+	>=dev-python/threadloop-1[${PYTHON_USEDEP}]
+	>=www-servers/tornado-4.3[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		>=dev-python/hypothesis-1.14[${PYTHON_USEDEP}]
+		dev-python/ipdb[${PYTHON_USEDEP}]
+		>=dev-python/jaeger-client-4[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pygal[${PYTHON_USEDEP}]
+		>=dev-python/pytest-benchmark-3[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/pytest-tornado[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		>=dev-python/wrapt-1.10[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/threadloop/Manifest b/dev-python/threadloop/Manifest
new file mode 100644
index 0000000000..6adfe8f0e5
--- /dev/null
+++ b/dev-python/threadloop/Manifest
@@ -0,0 +1 @@
+DIST threadloop-1.0.2.tar.gz 4905 BLAKE2B a3a569dd1353fc32277bab59649666c8fe79b3aeee3f04926b3b29fe4d12c771c5d59fbf9bae5eb4eeb70baf0d4c80a2a62b8f1fb54a96b7abaa9dca340aea02 SHA512 63dc84e26d697e6489b4fc1bf035749c8e77af039528a9b1d1df87258654db993ef9c33abce7e04403ac5d5a3e56ed102ce4510193eb31f1f681e642cb1a9614
diff --git a/dev-python/threadloop/metadata.xml b/dev-python/threadloop/metadata.xml
new file mode 100644
index 0000000000..a1932917de
--- /dev/null
+++ b/dev-python/threadloop/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>lssndrbarbieri@gmail.com</email>
+    <name>Alessandro Barbieri</name>
+  </maintainer>
+  <upstream>
+    <bugs-to>https://github.com/breerly/threadloop/issues</bugs-to>
+    <maintainer>
+      <email>breerly@gmail.com</email>
+      <name>Grayson Koonce</name>
+    </maintainer>
+    <remote-id type="pypi">threadloop</remote-id>
+    <remote-id type="github">breerly/threadloop</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/threadloop/threadloop-1.0.2.ebuild b/dev-python/threadloop/threadloop-1.0.2.ebuild
new file mode 100644
index 0000000000..4ca0d6c36e
--- /dev/null
+++ b/dev-python/threadloop/threadloop-1.0.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Run Tornado Coroutines from Synchronous Python"
+HOMEPAGE="https://github.com/GoodPete/threadloop"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64"
+
+RDEPEND=""
+DEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/ipdb[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/thriftrw/Manifest b/dev-python/thriftrw/Manifest
new file mode 100644
index 0000000000..941581aef3
--- /dev/null
+++ b/dev-python/thriftrw/Manifest
@@ -0,0 +1 @@
+DIST thriftrw-1.8.1.tar.gz 1444094 BLAKE2B e573a07e8c9bbc227cc77edbf4a5f325168fbc722f1813c986d069c28d2e10e3152d079dd9632290520a98b67e1a167f8120b62fedf05fec968a64db815028cf SHA512 44e9da43f4bbcc5188e2b59352dabbec161d0f764b469ca084ad1f63dae6d64e2f6ac2744afb0adfa1a878e6fe6c9d0b576a6f08110928543353a6dd24d602bc
diff --git a/dev-js/zeromq/metadata.xml b/dev-python/thriftrw/metadata.xml
similarity index 61%
rename from dev-js/zeromq/metadata.xml
rename to dev-python/thriftrw/metadata.xml
index b7f7931b8d..412bbb30e3 100644
--- a/dev-js/zeromq/metadata.xml
+++ b/dev-python/thriftrw/metadata.xml
@@ -6,10 +6,8 @@
     <name>Alessandro Barbieri</name>
   </maintainer>
   <upstream>
-    <bugs-to>https://github.com/zeromq/zeromq.js/issues</bugs-to>
-    <remote-id type="github">zeromq/zeromq</remote-id>
+    <bugs-to>https://github.com/thriftrw/thriftrw-python/issues</bugs-to>
+    <remote-id type="pypi">thriftrw</remote-id>
+    <remote-id type="github">thriftrw/thriftrw-python</remote-id>
   </upstream>
-  <use>
-    <flag name="drafts">Build the draft API</flag>
-  </use>
 </pkgmetadata>
diff --git a/dev-python/thriftrw/thriftrw-1.8.1.ebuild b/dev-python/thriftrw/thriftrw-1.8.1.ebuild
new file mode 100644
index 0000000000..230a5c2003
--- /dev/null
+++ b/dev-python/thriftrw/thriftrw-1.8.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="OpenTracing API for Python"
+HOMEPAGE="https://github.com/thriftrw/thriftrw-python"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/ply[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	>=dev-python/cython-0.17[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/pytest-benchmark-3.0.1[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/types-paramiko/Manifest b/dev-python/types-paramiko/Manifest
new file mode 100644
index 0000000000..1371cc8fd8
--- /dev/null
+++ b/dev-python/types-paramiko/Manifest
@@ -0,0 +1 @@
+DIST types-paramiko-2.7.0.tar.gz 18515 BLAKE2B 6fd7e8af6b28a1d01784e81ad7ed45e12cb7ceb2ddfd42476117662a8323ec76fd65a844900d5b61dd85b9b523639a8441e563f628f81fd18489f282da248126 SHA512 af05471d90505f22bf3aadb0c66af800088c924cae7ab999b4c5d82e4fb8140cc42068b7605f7e49380090ef74848275697f42ced451873dad5f564f64b23984
diff --git a/dev-js/node-gyp-build/metadata.xml b/dev-python/types-paramiko/metadata.xml
similarity index 62%
rename from dev-js/node-gyp-build/metadata.xml
rename to dev-python/types-paramiko/metadata.xml
index c15aad3b56..56b4f73b06 100644
--- a/dev-js/node-gyp-build/metadata.xml
+++ b/dev-python/types-paramiko/metadata.xml
@@ -6,7 +6,8 @@
     <name>Alessandro Barbieri</name>
   </maintainer>
   <upstream>
-    <bugs-to>https://github.com/prebuild/node-gyp-build/issues</bugs-to>
-    <remote-id type="github">prebuild/node-gyp-build</remote-id>
+    <bugs-to>https://github.com/python/typeshed/issues</bugs-to>
+    <remote-id type="pypi">types-paramiko</remote-id>
+    <remote-id type="github">python/typeshed</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/types-paramiko/types-paramiko-2.7.0.ebuild b/dev-python/types-paramiko/types-paramiko-2.7.0.ebuild
new file mode 100644
index 0000000000..a11bf9f8e0
--- /dev/null
+++ b/dev-python/types-paramiko/types-paramiko-2.7.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Typing stubs for paramiko"
+HOMEPAGE="
+	https://pypi.org/project/types-paramiko
+	https://github.com/python/typeshed
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64"
+
+RDEPEND=">=dev-python/cryptography-3.4.4[${PYTHON_USEDEP}]"
diff --git a/dev-python/ufoLib2/Manifest b/dev-python/ufoLib2/Manifest
index 216d3fdbd8..0662f76402 100644
--- a/dev-python/ufoLib2/Manifest
+++ b/dev-python/ufoLib2/Manifest
@@ -1 +1,2 @@
 DIST ufoLib2-0.11.1.zip 118203 BLAKE2B 74e8fca0ed8c7ceda204d518e5be71bed2f753bba454cbdb380b379f9767e5c5a733471b2107ab32040ba729d067ebac94a1cf92ad24f190fa42ddc1f20ea005 SHA512 4e9b2ab04bb93825c698ff62d2676ffa6a92b83230aaf94176226330852431c9e2d3816b89b0fcd052cf71e91a871c9395c6053d60bdd9cf7e54a08cbe5768d5
+DIST ufoLib2-0.11.4.zip 119452 BLAKE2B 841c7737c8d8479cc9bdbdbd0f1690854088abba9028035a9f03ccf091c95808d77fa445e678e2f5576482f820fcf5f20d92b93822e3bd167a1def5cdd8024a5 SHA512 dcd307d24a1c7ef0c932ed6edda2e5aab6a691cf7b0ae1f4c89b7bf57f6cb988fde9889d569ca21f1571f493c6efcf0411b55b8990e7a9fdce3316863de9a8cd
diff --git a/dev-python/ufoLib2/ufoLib2-0.11.4.ebuild b/dev-python/ufoLib2/ufoLib2-0.11.4.ebuild
new file mode 100644
index 0000000000..7fe869115b
--- /dev/null
+++ b/dev-python/ufoLib2/ufoLib2-0.11.4.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DOCS_DEPEND="
+	dev-python/sphinx_rtd_theme
+	dev-python/typing-extensions
+"
+DOCS_DIR="${S}/docs/source"
+DOCS_BUILDER="sphinx"
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit distutils-r1 docs
+
+DESCRIPTION="A UFO font library"
+HOMEPAGE="https://github.com/fonttools/ufoLib2"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/fonttools-4.0.0[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND="app-arch/unzip"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -e '/\<wheel\>/d' -i setup.cfg || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/ufoNormalizer/Manifest b/dev-python/ufoNormalizer/Manifest
index 6d5545ce49..22d2f41120 100644
--- a/dev-python/ufoNormalizer/Manifest
+++ b/dev-python/ufoNormalizer/Manifest
@@ -1 +1,2 @@
 DIST ufonormalizer-0.5.4.zip 38121 BLAKE2B b88763f9904633b99bfcd8226281b2c8e7172a46d8a6ebed1360d8af6b67944030f008176b55dfb9cb85580419997853b5203867587da87f7910608621ff213f SHA512 f9bc37c6d7c366d34e9fa4cbfbcbb6f8a654955fd61afedfbe6376e70e4145d29c6fe30d48c28dca9f18e476002c1cda773172379be2fae4bd30b466ce1899ba
+DIST ufonormalizer-0.6.1.zip 37360 BLAKE2B b2270b9bd40c5c67e2854049f285eac0a7c202bd4a2245837a99259140e3dd352adcd1c74a9cfd40670fd4c7ee801dacddfd092582abb96459fc4a475c65fd43 SHA512 301bef368a7d42333d885437322991d075e5ebb7169e3397e1d2a486ae18d4efba4db625bad1f9452f512e0a452ec8a9fd0b5c716c8571eb45f9d4d2718f37a7
diff --git a/dev-python/ufoNormalizer/ufoNormalizer-0.6.1.ebuild b/dev-python/ufoNormalizer/ufoNormalizer-0.6.1.ebuild
new file mode 100644
index 0000000000..ab56b595ca
--- /dev/null
+++ b/dev-python/ufoNormalizer/ufoNormalizer-0.6.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MYPN="${PN,,}"
+MYP="${MYPN}-${PV}"
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A tool that will normalize the XML and other data inside of a UFO"
+HOMEPAGE="https://github.com/unified-font-object/ufoNormalizer"
+SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.zip"
+S="${WORKDIR}/${MYP}"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="app-arch/unzip"
+
+distutils_enable_tests setup.py
diff --git a/dev-python/uharfbuzz/Manifest b/dev-python/uharfbuzz/Manifest
index 3c49d7b523..23f36f54fb 100644
--- a/dev-python/uharfbuzz/Manifest
+++ b/dev-python/uharfbuzz/Manifest
@@ -1 +1,2 @@
 DIST uharfbuzz-0.16.1.tar.gz 33252 BLAKE2B 63c036b0884303d724cfc64acb0f44b2705c3ddb35e8132c399535ae0db54744ee8f244aac9e68e73b39969328cbee63d094f4e97908f5e5a007d995176c53cb SHA512 d1c08135a4cc470278726aa6c8c6da7ccac04ab6d0c718c7576c81233834d182c7428c1123abc4f05f094fac2fe4dbb1dd8d264e752cadb3030f7045721ae1ee
+DIST uharfbuzz-0.18.0.tar.gz 33469 BLAKE2B ec255a4d6f9a74b12fd2a2b16f4309a223a50a8a6eea62d51d74dcd911b9300282576c66ec92cd28b00b48734a279391b62fe76ae64604f3e69df002f5e9568d SHA512 faf75e885e64ffdd28613c0ceeb30fc3ac4936cb252c8ff7e396c89b86195bf77f0f2135846152b2b8e949f8f806e9ddd75f42f00bb11514cd806062a06e2701
diff --git a/dev-python/uharfbuzz/uharfbuzz-0.16.1.ebuild b/dev-python/uharfbuzz/uharfbuzz-0.16.1.ebuild
index 36fdf0ec8a..611d52451e 100644
--- a/dev-python/uharfbuzz/uharfbuzz-0.16.1.ebuild
+++ b/dev-python/uharfbuzz/uharfbuzz-0.16.1.ebuild
@@ -4,20 +4,22 @@
 EAPI=8
 
 DISTUTILS_USE_SETUPTOOLS="pyproject.toml"
+EPYTEST_DESELECT=( "tests/test_uharfbuzz.py::TestCallbacks::test_message_func" )
 PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
 inherit distutils-r1
 
-SRC_URI="https://github.com/harfbuzz/uharfbuzz/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
 DESCRIPTION="Streamlined Cython bindings for the HarfBuzz shaping engine"
 HOMEPAGE="https://github.com/harfbuzz/uharfbuzz"
+SRC_URI="https://github.com/harfbuzz/uharfbuzz/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64"
 LICENSE="Apache-2.0"
 SLOT="0"
 
 RDEPEND=">=media-libs/harfbuzz-2.8.1[experimental(-)]"
-DEPEND="${RDEPEND}"
-BDEPEND="
+DEPEND="
+	${RDEPEND}
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
 	dev-python/cython[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/uharfbuzz/uharfbuzz-0.18.0.ebuild b/dev-python/uharfbuzz/uharfbuzz-0.18.0.ebuild
new file mode 100644
index 0000000000..5e1529f959
--- /dev/null
+++ b/dev-python/uharfbuzz/uharfbuzz-0.18.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS="pyproject.toml"
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Streamlined Cython bindings for the HarfBuzz shaping engine"
+HOMEPAGE="https://github.com/harfbuzz/uharfbuzz"
+SRC_URI="https://github.com/harfbuzz/uharfbuzz/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+RDEPEND=">=media-libs/harfbuzz-2.8.1[experimental(-)]"
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
+"
+
+PATCHES=( "${FILESDIR}/${PN}-0.16.1-system-harfbuzz.patch" )
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+	export SETUPTOOLS_SCM_PRETEND_VERSION="${PV%_*}"
+	export USE_SYSTEM_HARFBUZZ=1
+}
+
+python_install() {
+	distutils-r1_python_install
+	python_optimize "$(python_get_sitedir)/${PN}"
+}
diff --git a/dev-python/wsgi_intercept/Manifest b/dev-python/wsgi_intercept/Manifest
new file mode 100644
index 0000000000..3c3189d405
--- /dev/null
+++ b/dev-python/wsgi_intercept/Manifest
@@ -0,0 +1 @@
+DIST wsgi_intercept-1.9.2.tar.gz 29083 BLAKE2B 97eda40f40f0ea00ff213f2222310ce6c77ee9c822e89330ed8a277f32851d06bdf1050629e69677cf7fb00d04128403c5a89aec1d03d796fdbb65e8f3e4e9b6 SHA512 a313fe6302c9f168bd050c83ded1d58ef74feb54870197eb85b3527c2cc77eb76b4ca61ff4b554e13cca10ec7106ad9ba35c9a41a00bbd82ef39a26df2af7769
diff --git a/dev-js/uuid/metadata.xml b/dev-python/wsgi_intercept/metadata.xml
similarity index 71%
rename from dev-js/uuid/metadata.xml
rename to dev-python/wsgi_intercept/metadata.xml
index 452ea2897d..5796baec0d 100644
--- a/dev-js/uuid/metadata.xml
+++ b/dev-python/wsgi_intercept/metadata.xml
@@ -6,7 +6,6 @@
     <name>Alessandro Barbieri</name>
   </maintainer>
   <upstream>
-    <bugs-to>https://github.com/uuidjs/uuid/issues</bugs-to>
-    <remote-id type="github">uuidjs/uuid</remote-id>
+    <remote-id type="pypi">wsgi-intercept</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/wsgi_intercept/wsgi_intercept-1.9.2.ebuild b/dev-python/wsgi_intercept/wsgi_intercept-1.9.2.ebuild
new file mode 100644
index 0000000000..8e79848861
--- /dev/null
+++ b/dev-python/wsgi_intercept/wsgi_intercept-1.9.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="wsgi_intercept installs a WSGI application in place of a real URI for testing"
+HOMEPAGE="https://pypi.org/project/wsgi-intercept"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/httplib2[${PYTHON_USEDEP}]
+		>=dev-python/requests-2.0.1[${PYTHON_USEDEP}]
+		>=dev-python/urllib3-1.11.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/yara-python/Manifest b/dev-python/yara-python/Manifest
index 2c1e298dcb..7e45d96591 100644
--- a/dev-python/yara-python/Manifest
+++ b/dev-python/yara-python/Manifest
@@ -1 +1,2 @@
 DIST yara-python-4.1.0.tar.gz 33717 BLAKE2B f3ec4a90e6d00fa9bc6fe649ce0eb373ae2e3f5fb0c9290020abcb111be10608958ae45733e8200b7199cb43b14a52b2e3ebebf794ac1ab33006467014134b62 SHA512 8b9ce780b6639ab2ee5222adec888c7e0fb6be81c7c64a8b33b033de3f261f9707aa208b7a3a86749f6e86a83fe6d73941c816857faf6eb714399d1f50239b51
+DIST yara-python-4.1.2.tar.gz 33720 BLAKE2B 5d658b063785e5b45a5b8de123dfaf5f21b24ddc100f192fb5007949c225643c8a765031b40bdc09db3c341551d80251ab744fc4adf50ee3c39ba2b44388689d SHA512 8cc275d68d0418e5d7e92e76b1e0bef43e18de15956456c06545ea9be5124fa827eb38b3e781122c17425e0b11cde7137debd6b62160a2cc415e056bcb530102
diff --git a/dev-python/yara-python/yara-python-4.1.2.ebuild b/dev-python/yara-python/yara-python-4.1.2.ebuild
new file mode 100644
index 0000000000..32a20b842e
--- /dev/null
+++ b/dev-python/yara-python/yara-python-4.1.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+#with pypy3 undefined symbol: PyDescr_NewGetSet
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python interface for a malware identification and classification tool"
+HOMEPAGE="https://github.com/VirusTotal/yara-python"
+SRC_URI="https://github.com/virustotal/yara-python/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	=app-forensics/yara-$(ver_cut 1-2)*
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-system-libyara.patch" )
+
+distutils_enable_tests setup.py
+
+compile_python() {
+	distutils-r1_python_compile --dynamic-linking
+}
+
+src_compile() {
+	python_foreach_impl compile_python
+}
diff --git a/dev-util/psautohint/psautohint-2.3.0.ebuild b/dev-util/psautohint/psautohint-2.3.0.ebuild
index 325ca98946..ba1cda3074 100644
--- a/dev-util/psautohint/psautohint-2.3.0.ebuild
+++ b/dev-util/psautohint/psautohint-2.3.0.ebuild
@@ -76,5 +76,6 @@ python_test() {
 		--deselect tests/integration/test_mmhint.py::test_vfotf[tests/integration/data/vf_tests/CJKSparseVar.subset.hinted.otf] \
 		--deselect tests/integration/test_mmhint.py::test_vfotf[tests/integration/data/vf_tests/bug816.hinted.otf] \
 		--deselect tests/integration/test_cli.py::test_multi_outpath \
+		--deselect tests/integration/test_cli.py::test_multi_different_formats \
 		|| die
 }
diff --git a/dev-util/rpmlint/Manifest b/dev-util/rpmlint/Manifest
index 2b0e122ca5..9a3ca3099f 100644
--- a/dev-util/rpmlint/Manifest
+++ b/dev-util/rpmlint/Manifest
@@ -1 +1,2 @@
 DIST rpmlint-2.0.0.tar.gz 5670600 BLAKE2B 31ce8c8c630c967204d9fc5768a6689656e941d0498b53274e4a147ebd15eeafeed0fe14a0df258201c105a03216a6b32c0600008605778ea2c8306ec5d76e65 SHA512 f8f65ec90306bf59c0e31a8a3434477c38b8fb08aa2798b805afd57a506b00110797d514431e69dcb8dde5a54afad8606d8e1c973b8584c47cebed1420d6d61c
+DIST rpmlint-2.1.0.tar.gz 5670384 BLAKE2B cb7947956324a0c9e10d2bdc1e5d9d2354c37b748c97c3bbe0426104898e7ddc96bcad84fe7f03952688256c0f20da43b19ab98969056063f647a60851c841a7 SHA512 75df896259b5c340c528357309b2e5e1ce574b7e5e55dff573a1a7808faa3617da799df37e7e65064952a16549225beb16c1e12ba22f2fe4976a69696ed66f46
diff --git a/dev-util/rpmlint/rpmlint-2.1.0.ebuild b/dev-util/rpmlint/rpmlint-2.1.0.ebuild
new file mode 100644
index 0000000000..6c41815f5e
--- /dev/null
+++ b/dev-util/rpmlint/rpmlint-2.1.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Tool for checking common errors in RPM packages"
+HOMEPAGE="https://github.com/rpm-software-management/rpmlint"
+SRC_URI="https://github.com/rpm-software-management/rpmlint/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	app-arch/bzip2
+	app-arch/cpio
+	app-arch/gzip
+	app-arch/xz-utils
+	app-arch/zstd
+	sys-devel/binutils:*
+
+	$(python_gen_cond_dep '
+		app-arch/rpm[python,${PYTHON_SINGLE_USEDEP}]
+		dev-python/pybeam[${PYTHON_USEDEP}]
+		dev-python/pyxdg[${PYTHON_USEDEP}]
+		dev-python/toml[${PYTHON_USEDEP}]
+		dev-python/zstd[${PYTHON_USEDEP}]
+	')
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		app-shells/dash
+		dev-libs/appstream-glib
+		dev-util/desktop-file-utils
+		dev-util/devscripts
+		|| (
+			( app-text/hunspell[l10n_cs,l10n_en] app-text/enchant[hunspell] )
+			( app-text/aspell[l10n_cs,l10n_en] app-text/enchant[aspell] )
+		)
+
+		$(python_gen_cond_dep '
+			dev-python/pyenchant[${PYTHON_USEDEP}]
+			dev-python/pytest-xdist[${PYTHON_USEDEP}]
+			dev-python/python-magic[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+PATCHES=( "${FILESDIR}/no-coverage.patch" )
+
+distutils_enable_tests pytest
diff --git a/dev-util/rust-analyzer/Manifest b/dev-util/rust-analyzer/Manifest
index 6b35716069..49003838a3 100644
--- a/dev-util/rust-analyzer/Manifest
+++ b/dev-util/rust-analyzer/Manifest
@@ -3,6 +3,7 @@ DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e64656907
 DIST always-assert-0.1.2.crate 7067 BLAKE2B 042aada56eff9ca11c97d1b12c538c70c08248260f043c271466d5fcf70f1a11e4cb498096f2d55d6693d4fed6dee7e47781ae5d0fe3fe09b48e986feafa9c7d SHA512 ab23c4776e98c1d38d9583fad1d4909288793498f928e560106b972df01f307247020b5db034d909975a093db5917bb42d11540c32d787336abcaafc1a7613f0
 DIST ansi_term-0.12.1.crate 24838 BLAKE2B f636772c34e2d68cda7b8d3b2b86abda074585a62bd2654812ce92384244655a9197fa66e6939e19a674c0148ca605313d83de262bb18c2339a8a4eb4438a791 SHA512 b840e28b3e7700689a69a39659b1e066560078dd4a58326b91a028915819e7af883399ee53e920db68fd974c58d35bb1ddf8d427af5937d5f696f57c4376b671
 DIST anyhow-1.0.43.crate 34968 BLAKE2B a846dbc5275906e9f8ec4d5019a0fbff56e16eb970f8f528f2a7e5e2078e39a235d879870ffb92d6af45dc01b730825beb0a346fd6a2de1ddbf076366cd8eada SHA512 d35eb86b3c1676a88fcd9fa8a956f0fb3d3a657caa777e27eb8d5f6a86fec352273c463782dd803a87514c72fe679855d7a379c63bb385df593a5e14c069b7a3
+DIST anyhow-1.0.44.crate 35067 BLAKE2B 19dd53abcbf5ade698f3bf5b1522fa8c1c55b777d91fd05f6c43a7a32691d00da756c7af9d991ebfc71b02fa4e8e2e257c78ce3e29f8c3034066ca43eea4c07d SHA512 d8ec44c64cf4b06121421c99157573b59e2078ab1aba7d949aad9ddd5ec4a1b585a07d0ca06807ed2349c6becaed1cba69f10f9affa2da25f749b615a70aa9ff
 DIST anymap-0.12.1.crate 14298 BLAKE2B a4f5f4f18263e0a6d5b67ac8fbb56cf410534a0fc3e670d57a3275d0efe318c98b9b594f0be44dd7ac9fd08cda1d05733489290884af25f76ea981e0ae61ad60 SHA512 88fbca9ff7482ecd338f9cd9a025499ed98b47eaa89ca8dcd1ccfb013b6c9ebe7a8eca5d7c873eb716c320af7ccda01f6d4c26bb333c8ff434416416ee64a774
 DIST arbitrary-1.0.2.crate 25056 BLAKE2B 8a9e8c7ca229cf52dba3b4213dd128c1d793bf7d2dab0168b0ddeed41b4b19ed9847d1bda7b8b165a4d7b318974343f29e52d696d453d9ba7747205a5170814b SHA512 165256d634334ded55ca0c6b2dc90a84c8ec6f7b662c34ec02a907d7ce3d4af8cc0674ee3cc550d1af86d929a8517885fd2d9651e5d24b47c1296ef9b049dbc1
 DIST arrayvec-0.7.1.crate 28812 BLAKE2B d56dd76553748442c302307a5106e3c0b2eed8bea82ebbbb29800d1585ff09ba84df6c3d36c3bd28d5e9c5cd39eaa9bed194b0c3f6ebe810e2f298446b59aa52 SHA512 564376ac5e00113c0b12c02c7eded4b219fbe20e1d78a85798707abbf9da61e3412d327b630839f6a634274a5d7d4ecb068f04921ae4cc9e622b96282adeb2a1
@@ -29,6 +30,7 @@ DIST crossbeam-utils-0.8.5.crate 38414 BLAKE2B 8a10162cbc54f77737602b6f8574b65a0
 DIST dashmap-4.0.2.crate 21066 BLAKE2B 61c8cd1d52188ff071aae0c323b67e2f16b2282791c696a3f9c3d876d21efcccbad62f80bed85fc1b6a8223708c30ff5d5513b7f4a980f29980f2a6a1f8ab787 SHA512 1658183be619b781c5d9e33a2c709805053ab81187145517eb4bd22e12acb42426fef841a91618e889f4e7da792b88437bbf26e3899144222562c54575107d0e
 DIST derive_arbitrary-1.0.2.crate 7439 BLAKE2B a5c89b25ecc075b49f79507e280d715ed20904c4eaddd07e90d76a2b67774441144c830882591e4187ac82ef4dc67458c31f118a1ed0cd54ebf559ddb8afab55 SHA512 1df7bb6fe02a4afdeb19806030ae037f046dfe6325aaf0840650fddb147de1fd7343096f8c7cf189dbaae52c64851b12e94bcf5c782b8dde6df8bad8db602e3d
 DIST dissimilar-1.0.2.crate 27914 BLAKE2B 26919852e8d76333f5f1e182d5c798026a14f89fae666125165dbdba61b5b4b5d4bb8091f1c2ed8fddd6c27dc093b85b55db6bd30212c85ecdacbeee63ac2914 SHA512 45831ec4654a3db6db2c8de6116c1e4d554e1a8a5ef5aa32aa44d404200d07bef346606163d8900f47daa78f800275af0a32dab19cece7cc56a4fb76a4e5b603
+DIST dissimilar-1.0.3.crate 28403 BLAKE2B 79f9f6b2cd754c1fc49959ad3fc081bec521669ce276c48dd5e6e2a29669f00e5398b391067a40f4bc08336408f95305e4b736485f7dbb2b882f1aa269bf761b SHA512 0c05cbee349bfa775ae37ec84642b204838599b4887f3eace9cfb34464cf747f43caeea9c741d342bf5d8b142269c2eb66d848556b6babe19e878a1e2afac529
 DIST dot-0.1.4.crate 17701 BLAKE2B d608505bd8988e98a4b90b0f812c00735eddc04ff83ddb01c88af59b417d33c4218b8d807a106bef4d140432537d3432ea4292d44b33d009d987e567f938de04 SHA512 76a88f83b082706a1b0619338609695f41cd0179c648fadcce05fcc7f6f7c28a175ac3d138a5f9821ea34c044273c1ce645a0cde166bf0cbda1b726756c540cf
 DIST drop_bomb-0.1.5.crate 6859 BLAKE2B d115c842c3642e070cbf91c8155e09a10fd51f772b2f491d7ac16ddb983e9a6334fad23415670caf24fc3dc2f37a894f6b39443453ca394d9227e8783d5519b4 SHA512 b4b33e275506a52a062d4d3c6beff14b4081b56c4491fcc28f4aaee645f6dec103fc0b67994cf7816d36313ad5383478aca28dc4d6cf619486a517f136d7b344
 DIST either-1.6.1.crate 13641 BLAKE2B e5f40c40a5edb6dcb07a10bf79183cbe42438f1f70f3932dce72f6f6e91f75f24d17d82bc447507def4dad4345ffc9dd9162dde778afb253bdb1218e91887949 SHA512 4bfe56920e30cbc8eb4f90162db618f7dca653b42db35ab6a7045d3fd9a24ceb1778b1f79613850bdb1a87ad3794fa0d73015e46c48d513f368d8c3776fc9ddf
@@ -37,6 +39,7 @@ DIST expect-test-1.1.0.crate 10498 BLAKE2B 2f639b5363b3bb8e457651673c83017a6382b
 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.21.crate 75993 BLAKE2B 023e77990db471c209642ab09a46b1505241e8907d0f97c901770cbfa01177fb6f01877c5d2b3c519ab26ac3437dd36fbaa3a87c665f201abe1d0714eb9a4cb8 SHA512 3711f6479135bc5828aebf7ffd9036776abaac03595af2a034a16c6cccf68278e78291fb8110aadfbea3ecfeab848d6da60f02f40b002710555c3a0e2b1c6b73
+DIST flate2-1.0.22.crate 76026 BLAKE2B a6b7630a31a4d3768540662380f6eb1ae162174947ed76ea8781021467547bbf8733642996e391453d3f074f2101d15ce65f5995cd07834351abd8c3b759df5f SHA512 c76fa3b097774f1da884b969285bb3aa7fac489446845c93dec1afe6b94bfa11f708e6718d5e4460022b9398a698378a210c3b25e9e676d2bde9d5be1a63261f
 DIST form_urlencoded-1.0.1.crate 8773 BLAKE2B e2d2224dbd85d053343aea29ef1bd540fb8be12fd600289e9c048e3b74bfb009d0770f8296556309ef756086f22feec4713dfed1006e1101075c8897be5471cc SHA512 3ab371c223561a27ffbd35cf648ef4a9145d47bba9d71900a7c54cfc2f089175e9361f6352331a9a7fa018923b15e7a3553c8f9ff9fae80e1626e641a5faff68
 DIST fs_extra-1.2.0.crate 29918 BLAKE2B 92e5de4cdaa16ed8c2737e988f8f2419e394f56e30ec43d9a29dbadc13ccbbdff7cf2b30788d37f160123df83fa998b966fc9b5f793b6e15f84af4dda7ec4cd1 SHA512 66670d624394874d7f786f8d362438c53f5b18008909ab8e7a74e82518dbc189e37588836f05f19dcd4718f4c1a5296fdf274380d574b1f475e28891ecdd6c91
 DIST fsevent-sys-4.0.0.crate 4276 BLAKE2B 74c40763c12825851761b187e810a8d28a8e9aa92707a6100c7dbbe5251a53fc38b088b098cbe6c1d1c28cd15537a960a07b4ca43547a9215cc9e9119b4d65c3 SHA512 db81ea513345b4f57b25e2f3b746412c62399bc6c0440fdfb9759c2699cbc68ed5f89631efa12ccc0031036e21be616f7a55a0f2acb6d47dbe49ade8c8004cd9
@@ -49,14 +52,17 @@ DIST home-0.5.3.crate 7890 BLAKE2B ed1cfadae63d1fb0a66f38aa5440dd09a98343e3afadc
 DIST idna-0.2.3.crate 271023 BLAKE2B 157ece18825fd3f8055581ccbd14191a6923da4c806ce51b3d6376682878db000a1b873f744c8e9e1966e4c1f8393643bcb603deae299ed0bd87847b0bd2c591 SHA512 1278bd561ce329e1dc7a6f24a10f83d9a068af5d15a088414f3921c6728b0d54f4d60d6f4d0d5a786596ad226263e1e50c3842f192d5758aa4665ba4ed5c269f
 DIST indexmap-1.7.0.crate 50363 BLAKE2B b45318ae2a6e1f008494db77a3159eea3fed4f77eb04ae65599be9392d6ef78d4677b65d04fefab8f917f6808fee821a33bcf53a50b88785fae5ef6848e3a08a SHA512 9b882b4a7068a686acaee0a08bd4f3b35b58d36e786358cf14a3436eb61339649e64f1757331cc7833a2fa364c76eb6b75cf0c732afaeb202113de1e66b72ab9
 DIST inotify-0.9.3.crate 22066 BLAKE2B 6c5e74824946ab2e8d063ca00d5008eebe53ec89b345808545788cef184be0250cca6fdcca623dc13c1a4894c115388321512885cfde5ee6100bc61c0d98d525 SHA512 c8de4cd8104e3ac0fcde84016df4af2c8e35b17d9ff7ac22640196707244386089f47a8ea551129c69067946b5d7174de67d1b8ad2b7d8f8b6bdd98b9580adba
+DIST inotify-0.9.4.crate 22174 BLAKE2B 7b25619d701abcb6a95f7cbdbff507d00e3b0ce24a422babde649fcb8ce0fcc5889a6f2934f4bd5cac15fac538af4a5056dc081ce13d651f411e2846d8d082ad SHA512 4ae9d96b8bfd9611d376005ae8fcf673dec878fae3052f0af1af780c8ebe641c8061b67bd7ea29500216b13fec722ab8dc3cc5cc851ed5275dd468720f81dcf4
 DIST inotify-sys-0.1.5.crate 6965 BLAKE2B d70124656ce3e6f5ea3f430e8e7100d0691003161234b40542ca86c407ecaac1785f3eca98e9fd2914dababbc3f47a0855c99c9f19245d1f2cd5312739c802af SHA512 dae749f32c533b0c9f99963d97a77dcbfcacf173ec8fd7a02f275804f9925e867b4dfdf6be52c3c3c3de136d64e6e7d6b30a3bf804a01608cf974b0cc2e346da
 DIST instant-0.1.10.crate 5218 BLAKE2B 1e4203d235006ca922134c715781a5bda5a932f6740b7e22505db21d3b675758bce10dbb370e96694574c40c43a1d71ea2e6372df7116b30fe8cb0b65a3b95fe SHA512 a6b2c7e0a7b954e961f2d904a4cd6f701617ad70a7ea13230ee157c473c903803dd64596baa0fabd075e995cd3d013e10681c8d712977341ea2b6f97dd48d596
+DIST instant-0.1.11.crate 5408 BLAKE2B ea26c11694002f667b5c42a93feb9acacaf7824a7f618809c56d0916dd8f9b045a544fdb793aa5a64b1cef00a648bbf71e6addaff69829563bf09a7525c62bf2 SHA512 659eefd86f9aae74c96bb3f1359b92052c43a4d589b3a591d76c0d4298adb53a013a0a811b0fb5caf588aa093a51589aa63bcfb7450b8cd6edc0d73a4ed169b3
 DIST itertools-0.10.1.crate 116219 BLAKE2B 7d354daf7b069515ec7fe77ff2f4f07ecf870735d7ca166fd6b10ba89431cc27bf264c648efd2052206e8edd8f596485b913071453f37e5de47da44e935db79f SHA512 8626eee66aa598e16f5322a6fc55b17c622656f58635c990f5cbd8faeb4739690b0abb3efac4a9a3073752e9f2a51a0ba29401edb12e0f6bf9bddd8d1b394dbc
 DIST itoa-0.4.8.crate 11926 BLAKE2B e5a648b490908d0ffa3a0832342ad11264eb4357939bb39aad014aed3938bb60e82703b7e31929a458525061e9bc40539d33753bdbd722a03b6804e57dd1f70c SHA512 6911d269ff3ed7350e4f0dcfc6e9e0d70e25833e1e7cfcc57d5b8aff1f47b8be4f2e9baf1b92e5517cff63492be489b6d29b48dd9bb642e428acaa431216b68e
 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.103.crate 540563 BLAKE2B cc99ae88783e6f3044ecec5154e0de81a7f792b89415cc2736eb4a436edd316277d690971c4aa0eff7935b5a355c8966805c4ee72c5fec8caecf65a29c13caf9 SHA512 79e1c99bfeb30283f85742cf17867000301bbe022c6b2ace415b4a767068dd64b09581bcc802d42150e45849f5adf8ee2720a0c695324d87d3d96a5c554a216d
 DIST libc-0.2.99.crate 524997 BLAKE2B 9b78f524c5c5b51a5927c6e72ba24276cfd751a6f75905c6bdff0c8055912edec2caa23d9e5132d58995736f8d4d34e22aaeff63bd07aaa6eeed6d31da967a5d SHA512 91a4ae007c897e0b5fa91ecd742c45271c5d0d63819806dedb65bbab81bb1e3faf4f7332899c694df9135222de23ec12ef463f9a2508b6adcd2c0ac5cc113c9c
 DIST libloading-0.7.0.crate 26216 BLAKE2B 83827746f57fb5f1819aa0ccce0ffd698a3ed4b85ef0e954741691003c843ca877de81b4a97ad7c53d28f79701a5caf2fee801a68c015d19c20230f2560b5fc3 SHA512 e2089a8ecacd65522b246cebcf531b6b1ce697d4eaf294e0540e1f34bfd714037177ba802406c31e6bcc722b4f391a84709427de1c6fb441cdeb8e41fd4f1e28
 DIST libmimalloc-sys-0.1.22.crate 908612 BLAKE2B cde50b1556fd49412736c6f6e42360cdd002d3aecf1ac32cb85f514ec559a14587436d0d6d6ab86aa32cf9d62ae4377778a3c941c81aad20370a11034e6d1a96 SHA512 6ed4965552898ef0c51c6e3fc6962793c6694bea79459c08bed2af211887cba3d605b3949cec2734c59a2314c305fcf78b871d2e688ba3756441e53bd49697f1
@@ -64,16 +70,19 @@ DIST lock_api-0.4.5.crate 25199 BLAKE2B c91adefaa0dc3efa786957794b67cf219f515990
 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.89.2.crate 49933 BLAKE2B 00c23d427672f539e1187de55717edc2ebd4518e483e460b4ed19370810ec08142273c00bfde0dd97df68cf77b27485af387d05dc47309cab25f0bb6ac739ca1 SHA512 a1ba7c572c5d9aff31e57f63de7ef7224a558c9b798a7c175c8ebece1f75b122c0d8dc7bb3952fdb8f711b659996d9824ab2cd606f7197d710d7f50c3540fb42
+DIST lsp-types-0.90.0.crate 53694 BLAKE2B 9c30f3442a4ca94770675ea67de4c44824c11a0422ff75448e2537813280c50dbab2b6e707571b08462843421b21071588c82bdd91b4b6bc542b997a78a86d16 SHA512 ce9aa756682bdbbedef638090a5a0a6123b991f790c3a4ad889905960467ef02cadde3c4b81956d1b9798ee606d7cb46eba08dc226ae5b07807f37eb841f9242
 DIST matchers-0.0.1.crate 5039 BLAKE2B 29fe248dc3e85b1c7ca5553f5b49dc2a904cbbcc44a2b6a426c0fe9aef56454ad31acddf9f14a447516bd7687107816c3d46b0f9691e96bc7c7b607cd34cae0b SHA512 a5143b4e6f9131582ffe3d77b14ef51a557cf48d794975706a9d51e0d477cbbd2022a2416e940771911cf99076696f9eefa2c866843f0ba7028206f933674c10
 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.3.1.crate 18393 BLAKE2B 2c851b907f2134ed2d164c9f7ab99d9dcc22ec1192236383b33cb87551c41705b4288411dbfa377b3ae2a5e47ac5f6f4ae64e0f4bc152983c219a388a5d13d35 SHA512 1cf08cd046581d882fa78cc1e6efbb2e5814dada9ee866811732dcde776fd8c0cde2f03167010f32bb4984533e787536ef1954a1152a70d7f0278d5adfa96b28
+DIST memmap2-0.5.0.crate 20760 BLAKE2B 5723352d203e97b8b9e6e898e1e93f2838a820ca4773c430264f6b44887daffd007fcc499931bb21f764d4a402cdf7edaf53e855094c5ca08c6b5dde17da2817 SHA512 cbb1a74f3a8a0671e4e5153633fb0284c7badfc9711569b48ac899c70ea9e2de3cf4b89fb3c959e844b6270206cb8db3f69998d7f09a20cc929ec496106290f0
 DIST memoffset-0.6.4.crate 7664 BLAKE2B 098783d0fde7268b16fc5c9f5df005b93daac18092f04d981559b9f0fa310344c6fbbb93d42587ec7107a5c4e8d757508377dadf03471dbd7022f3bdb5b3da4b SHA512 bf8d05b72571ccdef32a93cc4489ab4cb7abd41415d55572d1dfb983053afe3eb2615e968d87a326af90c5702b9959150f985a4186acfd61df9b69a74e99713d
 DIST mimalloc-0.1.26.crate 4977 BLAKE2B 2a13862c07b5df2cd4d8c4a6d55178a63d89850b84b22ced5ab985c86fd252bc2e899fef81a16d6e2adc4ecec70c680c3e4dbf291e393d9ce4c1ef4de6e9f108 SHA512 d385f187e61d88366576b3fa84d173af14a955ab476f1c837ee719e35929c9a91f1e02d13398160abb0c20e53ba90e9d100aeaefb651e0c264e9472021d4a3a2
 DIST miniz_oxide-0.4.4.crate 49938 BLAKE2B 3403416bf9d10b67ef976eb23be64216027c67c56225efd08c87f8269017cb5174ae64f35d18acb66c7a1b831347791cee5af565f3ddfb31ae4210221604b0c4 SHA512 2c6e484a8a53c6b1fb84e2bf9518919e6e5ba84e7716c0bb8e33b53dc0d3432c35f28f19c18368e27c94f6df66b7674f514ef889cf1b19f546bedfb6e6ebaf6f
 DIST mio-0.7.13.crate 87027 BLAKE2B fa1b8287981c3a96c0b6f29de221241d12bbda1c19a95e315f5e026e130e2bff6199774524d5c178718bba47710cc50dc632e942a590f5d5af598e4d59fad269 SHA512 3f9adb95db494dd39041ec1abda0d476b308296024347f28bfaf5883d7896ee052edda026c25a9ccea9a31cbc5431d95c0e13948e90fc8ca7b1a91a19748a45c
 DIST miow-0.3.7.crate 24563 BLAKE2B 24375754245e4ac50620a8b6da6b21958914a6af6422a470487841c2524587d596673cc3718a85979ee911f104d71b59b38fbe9db28c1c7e4b702b9373215cb7 SHA512 451073e8913148889493de0373bc0450c8b23e136e151b48b9976292e4e03b7c3f3279ecf49dda5196badfe662a661a998cfa456d2ec340a495d54a4d2382699
 DIST notify-5.0.0-pre.12.crate 52799 BLAKE2B b1cd1577a22656ae4189fa50661d276fec522f7db6c4cd0caaf8a7f738971dc0593d88b37ab7d06381a3dca2e089c4f6f9592c0f73acd1f666e183b3533996f9 SHA512 642a7230dab73d38c706840f3dbf5cfb614acf336376c3780d4c69809d0adb4eed916407fe85203fcfbf705239aa5cfc88d54af9a19327495db1923912a8eae8
+DIST notify-5.0.0-pre.13.crate 52883 BLAKE2B ba491e82bd105ebad96c772bc7f3634c24948564321224d2b50f2c65585fa0bc5fe9694f1ce62f343b806fd38b791d41acbde6619e8850157f741968eabff2f7 SHA512 93a43da44218e074fbd53b27e59aae1d1f2a659720b763a3b31abe9541710f7fe841ace214ab91b3e9447fa470cdddb4b1ddfcdc40cc156c29636bcc5fae1691
 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.26.2.crate 238067 BLAKE2B d7731f530dbbbfebc506dcd12bcf33e1421785d9711864d6d824360aa249b85985f4db69ad4036bd7f8fa22d5909f973a0f58a03021289a611ed5290d2fa68b6 SHA512 42882e3b1063ad8326bedd3f402831d6206603f8736c5aecc3c16d296007d25360ce9143bb3f859a6d52f1a530809df1f1117d321f0d22f0b43c1831366eec6d
@@ -90,6 +99,7 @@ DIST pin-project-lite-0.2.7.crate 27212 BLAKE2B 71997c66fe24bbded0030acf9d460c8e
 DIST proc-macro2-1.0.29.crate 38772 BLAKE2B 742c2602afc4beddc96b688d105fd93b1dbdb3cfced724aaf542e97120d374d334e90cfbf02ab62741dd052a272dc583b7d2e1992da3d1b8ff260414c65ac89e SHA512 b3b3b7c6988afeb92209c7e0362f45f9c207611a74bb63bc7746b86fb9ab0d74fea9e7a2d9bc8ac943225ea439540726ffc13711dc5bcb056c1821fc99e8dc63
 DIST pulldown-cmark-0.8.0.crate 106330 BLAKE2B bb59298b605993530e2363f3264c3ac1104ec57885c2dd183dcdf3aa9dc613999d24caeb86848ca3542544238aaa4eb49d5a6599d2fdef53af50b5dbead68e22 SHA512 396ade131c0a74cdfb8454e137e41c21f0b81b7cce654ba6ae9ceb132ba0fa0a467a190e6dd69cd7d59a267efbe83f008c9c8a5c9db47665aabc31a4bb9cb967
 DIST pulldown-cmark-to-cmark-6.0.3.crate 8021 BLAKE2B 86d41b16686497564c53469b4634d5eb3d1c28013c59e379b466f597c6ce780af62cff63f647fd3438199e6866e82208b62a6515c194f127205c3b8333c7d251 SHA512 e88d32fb85e6a5145285aac9e41c158f3abc67d42f4d631ca16fbb77a728d1d25c5d83d1592a75b4eb6e46e34bbc012ec92712b5ec2190eb05acafa4fadf2e0d
+DIST pulldown-cmark-to-cmark-6.0.4.crate 8069 BLAKE2B 5d6358fd1b96d4853617487efedf60c68f89279da54706e1aaf1d896e8feca87a9e172bcc1e744676bbbd339f99b31908d4adf7431204d3e417f5d508c3fe8f9 SHA512 4aafeca13aff10e7780e367bf7309a2d8b50565a231dcb57485283f19eca6f5127faf41b69ec1cbaa9ca1f91778cd69e13c09617f3d1d25f19ef5ed8ceca667a
 DIST quote-1.0.9.crate 25042 BLAKE2B 26ef31e89fd2f0cc21ff65f8072f30c7977ac634d2536cf9845a0894d6659f62a96cd0a6ee48f7706036c2c1b898ef8c9167bd62714ad0c9cba4fb02f30922af SHA512 dd6cdaea183b85400531ef01e56657edbec0d8f7c27898c1e591b72dff755fa5875b33ca320bd65be0e9aecfc6a61ec119a4bd1291e9f2057fca642ab5b198c8
 DIST rayon-1.5.1.crate 160424 BLAKE2B 1c31c8e3290f76d02347271cb020e50e8f915b7a064f133a196c12e07ae1551c0e7c31883a31ec419a05198d6c71f0057be1b8ddb21f451db9ba40da511a0e1a SHA512 a68e65aae7040a6f6b0cc33b53b4c22929c15504ed4fdf54f5eb5fcaeab137c220b00c716aed96246b6a762c4f1e8be920356231d6c4a0b3e01132b9ab96ffc9
 DIST rayon-core-1.9.1.crate 64961 BLAKE2B 7201024124324d2cf2d5785b7e79d2195adc7de576b826a9c28603dc44f1b5de46d277b791a741413c85facb4f4a552bfd55989a190f6f5ea3df4bbd32042f66 SHA512 c24c34dc488171ce476df145e8c6953d35fea93412805f6c411ba8b8e9dbbd733610b291203ee91bd265b766b78e14ba15a7b587e8f0ae8bde53f60e0644ef78
@@ -98,8 +108,9 @@ DIST regex-1.5.4.crate 236581 BLAKE2B 6efaf69d1a99dc3a2e04b2d1a96b036f631e9a0ad0
 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.0.crate 37392 BLAKE2B 0431b1a5ef7b3b666fffbde1aec9969dc01dc889a8d251dc3beb6f3cd03213bd5f3e93bd47baa9987a166e5f924c0bb90796c83660c73c215aa31d29020087f0 SHA512 b152697515b461459c9fbb3e5f7400cf9c03df45fad67b51d17ad265819645e17bb154a438f6675f496b25d76cc858bc27639adb505fcd94c9b5db2817aa5e75
-DIST rust-analyzer-20210920.tar.gz 2070659 BLAKE2B 56fe7752601527ca472353729e8442cf9a61952484e80cfc998c0fa729d9227b83158dfd11e78ae6b38d46595f1f4441fd881b3f0f629f4e7b964d570193a73a SHA512 7663432c84156038e22021093918801ef14164f5bb923eb0c81ec2e704bb6cc5bb0a82531e61e5ca323f127f8d0e4e92a3df2b4d31a663f8cf36038927660c42
+DIST rowan-0.14.1.crate 37695 BLAKE2B 761a2ec18af21dc87d2d88e93a2376857378123e91931181455d9a53e50cdd03c861a52dac7f63c78be29f90dbbedb8d4327e34c8e7dedf9ac2135d3b4fc4f21 SHA512 a15232348349fcf52eebb1901a15b073e181f70a92aad9159fbfbf273439e6fffd550de16d0b775b33900cedab5fd9f5c96d175f2b1b0eac02c46c8c8addc2a7
 DIST rust-analyzer-20210927.tar.gz 2079158 BLAKE2B d3c3622b14d616487c92907138adfbc577c8f968ab917db9cb768e1a7aab1d5dedeb43ca266bee19f0a288b816f33e4c3f854cc928323f5b2bbac6519759709d SHA512 5d40ac8f330191badbc67de8b44d0a7eb16b3e087abc9513e2968f4c7ec92ab4a9faded95af95082e6026c2204370bb5f368c90af5285377fa56fe4146f6ba54
+DIST rust-analyzer-20211004.tar.gz 2090143 BLAKE2B fbf7a87aa349b3f1571f7706bbd23b3e3d32ad9bcab073acacad4759f0ef5cbbd8a29beeb8e7d6228891184ab6239aa5fd25dc653b56b9728e26e5bcdb4b1150 SHA512 1c2bc6858acc3e08bd8ba4b7ba7d5c8da8ba10f758240e492ffb3b19745aad5161f738b9d10920b3751ce0ce226ab1b284139ea34b674bcf8cadc4eebe782703
 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
@@ -113,12 +124,15 @@ DIST semver-1.0.4.crate 29375 BLAKE2B 534a89125c4483fc99c44f7b104870be1471d478ba
 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.67.crate 114957 BLAKE2B 7bbd0ba10da257f058e974aa907b7f358218f409f3896285833cf2ab9950b2d9368dcd3682f2479bc208cbea39cb406d79531675aa8a6937206b90223deba289 SHA512 3199020a986a9cdcfed2adc972451df92b9d92d5d5bfe45dd24e5d23fc4a50dd497602dd9b6176c4f2ba9a88aa78942a5fbc7ace76721b85d3635e267e24ca06
+DIST serde_json-1.0.68.crate 114986 BLAKE2B a588a87ac9fe2b3635d7bf72c185801e3866101020a0afb8f714d37939c2dc7b5b32e2177910df7221df197e4e8a92d92187968efdb5e9f1f1616647c10d81d3 SHA512 54a0345029016873883dbdcd2094615f509759f61b04d9a496dfdbc1e27ee5361dfb3d129f209a9ad66984cc1f4c82751adfe1a564198649ecc939e8c3dd1ac5
 DIST serde_repr-0.1.7.crate 10173 BLAKE2B 30bca6a616e55f44def56ab1f85cbb141727a872466f161f562798db005473d520e6a4dba89b631cfe11f1a38cbc1db2fb0ef921f0245e0990a6744f9987e95a SHA512 4e3e87b1c97ee587e88be56d67f287e43252de474a3becdefb4b768eda661db5d78f665d7d93720a40d9f5bd27fd9ab6213d66713ec89bcc2063092b16625a18
 DIST sharded-slab-0.1.3.crate 49921 BLAKE2B d2ac62876bfaa60b73af0c48de2d27dfe80d7ca99898017ecf64a465b7ab2deb0544243469c8b52fbfa66507fc0163d76d7a37dff9dc2230c9e26e7fcc81375d SHA512 560426186c9fdcdd8fa8a6f5ee12260faf93d8939cc994735d2d89ef86fe719e28224acea1b2f1574061765f5f3dab01a29427c1d83fb14d5b8227c5167b94e4
 DIST smallvec-1.6.1.crate 26444 BLAKE2B ca6c50a63acdd93a2131654d99e50545a6e2d08eb3e2bd57d4a8ee073d90c08195ee442745a8d62a68179ce7bb8e229b7ff8c6fcf46372a9844bc9280b7c85cb SHA512 9e6061c8211a4485ab54eb541adf40748e1fc3fdfab0849e38e5fd34fc6cc69ae78bd065b788692385a6b8157b031c2fe373900e13d3e56e94fc08d574edaaad
+DIST smallvec-1.7.0.crate 27459 BLAKE2B a740a4b7448a4c8d1bef59cfb6dc9a52145e40eeb38028c64c880f31800cd3a4cb8be17394742239dfa7fb692c749f9edf70e6df02abd7a1bff288eec38ba24e SHA512 d061e0059cd6bd1636424374848aa1d4edd21f75605844a7855ff5d343dbdb71e6eb14bd70de7947ae7ab58f04ff096a5e77aa9a1ac14cef59f657685c846156
 DIST smol_str-0.1.18.crate 12024 BLAKE2B 93ce77d8451275a779f1e88ad2cfddfad700486e9100f642c607c9b27df45cfb3a44ef3a0d814d0d1783a21eb1f098d0b452cdf2f77f5e0c7057cb1dfaf495f3 SHA512 9477345ef2da694409834500ea86671a02150b81e6881ebd0a7e3d954aebab9d6e94988fa596004b87603e64b946e76e9bbcd20e830ce100f25f96dc7dc64148
 DIST snap-1.0.5.crate 33022 BLAKE2B 0ce3c4379f4ab122e7785c23b42d463c657cee3179d2dfe909797c11a3730d65b6dd660d8626d0fabeb4344356b5cab8e632809845fb7c21e904bdc41594d52e SHA512 d9181f1ffc6605bf7628ab51479956f9769eca85c0942494dfdcf2c7e805173ee3d3bfc17510e72dad6e5c89b80b2a3f9c40b85464eeb79fd6d26de6bee66fab
 DIST syn-1.0.76.crate 233723 BLAKE2B 99b781b6ffa926ca71d0a09ae81dacfc6ee713e15fd057232e527761b73f088c30967eb13d624bdf34a089c5a33fa28ecf6ca069e3dfd7061932643849243967 SHA512 0f32138d219ca74fcff1ee5ee5bb89f965a30b74c10a040bd8361332cb84900322194dd85ad7571c4bce72c1f66368546db5881165939800f2587b15ce07298a
+DIST syn-1.0.77.crate 233424 BLAKE2B 8738d1940d538c48d2ae469af1e48a33364a47a0b4af6edb4bb6de5d1fb1330757a488d6fbd6bf4711cb04761f37f9c2be13a09bded867b4b229e7123dc7805a SHA512 3e5ef87be2f3fefac57e011447c9902c779ed67c88919021e6d24540e1a22f4308acfe8b92bb78cc83069d8fa03429985f9b14c8bd185af8fabc6e78213322e7
 DIST synstructure-0.12.5.crate 18020 BLAKE2B a3ed7e10e13e096df7b624f567de3406b043db4ee7bad6f25d8aa093af4e9f3bbb39e22bb46fb1b5c7c5c31cb65218c79d959eddec8ba32959ee66f422732a1e SHA512 62d5669459a444ff91bcd630ff58fbbbb70cf1a2240c7caf1c4020c1aa8f9010d952172470e41daed75fb3cfe154761ac56675b9ca7a754bc9aa484c3152560b
 DIST termcolor-1.1.2.crate 17287 BLAKE2B 5ff748064c9fb6663befce2fd299edf6a6deb06ea72d21a62d6e77642934cca0933e10340fa84f636631cc08c76ba83ef2284b2212759129d54248e5fccb4c49 SHA512 f37b034345382cd621b1344a3fb301ca3d4d9db8b5858ac1ea82372c983229fce3c0ea8213d6b7e91291b6034affe11e2c3e593dbd95256294ce5c584b33e14c
 DIST text-size-1.1.0.crate 12380 BLAKE2B 0fb559e971e7f33bb4ee6e20e796f813023ef1798713b224ba42827ce3a8cbc6dc1991c653ddf7219a3d3696a3d1718d6fea7b72b60ae8f543597f5e19d8f0e8 SHA512 24e9d77e37c62b6ad05ee7dcdb5c9fe60c0f5cea1418bc0bf462ce789a1c13704b317e6503db533eff47527c87728bb98f9a34e473f8e09df35e21c08ca93048
@@ -128,14 +142,18 @@ DIST tikv-jemalloc-ctl-0.4.2.crate 19153 BLAKE2B 59c4556605dac98657991280e1e5515
 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.3.1.crate 42386 BLAKE2B 9fa7dc7c4967bc3ba3f7e5fbef54a7b6fca46f6520aed2482d355b1f6434ac702e073df19034908f214e5c0ffaaa3bdb41c7d394d9f828dbeaa177158ee99ad2 SHA512 ad07998e9bacccf8ce2bcb01fea8008c6514ad73c15c6426453cfdbb432dac7d588d05551b179c83ca062ea02f0853e97e2b9712da0b8dc20ddab4c0efd5afd2
+DIST tinyvec-1.5.0.crate 42745 BLAKE2B 24d6f60d08b53e067ef783db4f6e51a9edd9f73fa9e3511791c1c00a861c6676f18043127351ecfc49771a760eeb7db53b584ee882dee6bdaefe5e6ba5053cda SHA512 b4d1624965ed6b7e8ea45d80fd7332b5733d7b5e78f8167d13c9b9e8eaf3c586268c2f88ea0c51211808def997f8e751214e3de757b19076807adf7aca8aba82
 DIST tinyvec_macros-0.1.0.crate 1817 BLAKE2B a3d1966bf57c11afcd026269135a6189f149f905bb70b47537c0a7bcaef0bfc6c89bdcbdb0f6cb8e5255632855134631c683fc90606a254ec8ba818fd5ef0794 SHA512 d6afc83a3c70cde916a6ff599e2772588e4bbfa7a5b1c7e5c8aa0f4a8a5c9426182497a644e4a88194ece986d38fa64b6c8eda9eb1630441c8e65a8741a45873
 DIST tracing-0.1.26.crate 68583 BLAKE2B dbdeb4081dddb777d52afd1afb043e018e72f99ce6c4fbb16cb14e618da9c794ee594252cdd7a6d4a7c149a8ea86d63f6e4f1d75ad3bd76590d70af107616eac SHA512 19ddccaebb2d3b2230a6ceda5f72af29200ae760e8d411c2073e7338a6ca2231c8b2b14180eabec78dd521ab7b48996966b0419725adf8c67a03d1775ec834be
+DIST tracing-0.1.28.crate 71369 BLAKE2B b583ef29cbd83e843794a3cf73d27999dcf085854dadff4539b08db98b401bcda67676ad0b3392045b5b1fcf85553090c138c3a475ccfefac2dac417e3e29836 SHA512 2dd9909d35f2147493e628b94bba6a1fc9a5b1557ff06d582174f71a36717393f4a6c19dbb9af5bfd5d64841d419a9db61a6fe3e81f64c0533a06379bdc931b3
 DIST tracing-attributes-0.1.15.crate 20632 BLAKE2B 77e78d3dde799de16610d35f6d30bf15e03e8724ea80302a661fdd958a25574c7d6620f480669917dc94152bf0dd1237310523d881f4971f4a5e837ff26e0da0 SHA512 750836fab24caa68bbd8f19c953a45d2d1bc7adb9fae65b113b8b9bc1cec97b9f6088b15bea3c1c8c7a106345440037c880485e4e4f4d1e5690ca4841ff135a4
+DIST tracing-attributes-0.1.16.crate 21685 BLAKE2B 92543437f79b776d92cb8ce1cec7cc58d991c45a25c9ffaed2de99f646a76971a95d7eb60f69c04b1d8d0fa8583dd2d1feb2b2842bf3ea7b3ae4ad9e4988f506 SHA512 44ebcb45c0b98f9345de807678af6aba1e369ea2c35db63a94c69f90549d7b2aa5909a8641ee0cbe9cf021661618a6b626ade4d5e8e36414c1c3afae0896e393
 DIST tracing-core-0.1.19.crate 50079 BLAKE2B 4eb551d147eb17d96f9248dc780ebb305c622173d98fb429fc17ee6544e30f499883973c1d7c80d322a509c69df632fd47ec6be5ed0e7fd2e04e3751d7d40252 SHA512 27db417a15eeb736b695374650994029c41a7ac50b6b7ab0a76a02aca0473be14a2d4aa0a27029071d6b864760f32977a9fb3e47144dc5f3b79fdd1a42c7bd4f
+DIST tracing-core-0.1.20.crate 50446 BLAKE2B 7c665c7607d4c9f873194d0d8dd37ae84a7ac9ac424b85332669bbd4bac60274f27041199fb67fae6b8153ed09e04fd99e09e239de98846697a46a6c509fe0ec SHA512 bbf9c0802e04bf5e2fd192af7e00b2807319661212e88dae9ef4284886c34fc58ce6e9b17e77522e108b2c38f47357bed220e1832fcc6b464e0bec059b57b388
 DIST tracing-log-0.1.2.crate 14915 BLAKE2B 72967c7262a8fb2b1b9c693ae19d84424a037e09b9f1b1b94852e39caa0a0ca30c846b2cfcf94b378c9ccd2aab67af2e4809e2e733d22f173cd57a3842a022fa SHA512 c4e146026ea7b27e79c630da9994dfafb90f9bdd581f51cbd5a5f985b0e60b2412937214e0365203148eb91f0a5ef3644e64757dadaa10287a097ad85989b620
 DIST tracing-subscriber-0.2.20.crate 109378 BLAKE2B 95a64ccc0daf2e3f66f372e9bfef4998da7f0d84343993c476743ddf3d3cb1e00de1dfae2afbaa6eaa677eb40ca2e61fbe7a8e3f570012357ebe6a04371cba16 SHA512 c002aa312e09a452bc65c3f3cdd07770a9cd296775daae8c720b431a966b1e185a621606a39cab6922b952957fe8b6b82cc058d55101ddc1623420dbc5049d3a
+DIST tracing-subscriber-0.2.24.crate 148080 BLAKE2B 38c1b16a792613cbf80d4913ce826b60dde396954d0b5cc87a4ce78721fc92612210ae58204dd89c7350607a3935b2690f833b9907fcd07571c5c6387b7cd0d7 SHA512 140221b6a2c8017d52bec54d8b4cd3734d70d35a2ee864a6364bff3270ee146b1ec80e96adba4cda3135696be214643c1064cc069c51dfb371ed31f2e301fd43
 DIST tracing-tree-0.1.10.crate 12828 BLAKE2B 13a8c7f6c544ea1975d8301d42e899eff717597de8659335eba6cd9a6d2f13cbe3e2e49d6943a6a73bb0d1a448e5f9f542dae5144d41911f1f9191cf782f393b SHA512 42d1fb14fb0a01aa3eed5a9aa6aa4dcb6439ebf5e32ebfcf85c416e0007be13952cc223ea15665bbb5fab2138593bb7ec315689bf8fc03a3dc45899672e63af9
-DIST ungrammar-1.14.4.crate 8254 BLAKE2B 8b12ebc4e6eae5123b9935335591b2738b63afd51d90316582a4b1a6e0d729146831dd870f5fb6292cba944f6771507a78de3a8fd4984b1a7bfbf4380dab5f35 SHA512 54ec2ac2ba6f1c531389ab34aea72a48ac93a50284a6dcb027d6fa368c47fbfa14fc886031f983ef9d1a5e260ca189e860f6c9230914bbb730751deb9af12d8b
 DIST ungrammar-1.14.5.crate 8339 BLAKE2B b1fef752e313cb42c12e81a83e4b39240a09b1b31a5828215ec3d82262b023db2713d4da9884fe3b6d9100598457434532cbdce55eb3ddde523e8e8e274ef9c3 SHA512 b67cdc43ab97d336f13eeebcee08b386e5b7cfb8013b3c87895b9ed6613447a1d39fa91e50cbaeefa5ecbfb98e9fc2792e6519340be76ab18e297c3aabb2ee9b
 DIST unicase-2.6.0.crate 23478 BLAKE2B 6e580108ac81b1cbee70e5bd331f43b12f266dae4f4f758bb8f5f073bd1af61943ee0de34cc27769525b19da8c24f8dea4941d0f5454594ab0cc8b78071ff053 SHA512 7e76a5f344e32c56cf87223585d87a56c79627b52bba0b29eb6de82de874b2964accededa8e9b5741f57944b6750fba5c61e679a50d4fd5a5646f431e2f4f188
 DIST unicode-bidi-0.3.6.crate 33737 BLAKE2B 90cb2d05bcafd32a237b747e290f3dba186d069845e50ffdcd7e62a2ddd73f4e8fc27ad972d86453ff375fab50fd5ec47ac323413e351fb7d4b80f1536519d7f SHA512 a1013539b0da1609d9c37cc1d8359efa93bd88b4ae176d25398e6c44d93b615835a54b184641f00313b14cf46542b1e92278b0dc1bd00dfca0566467b21857e7
diff --git a/dev-util/rust-analyzer/rust-analyzer-20210920.ebuild b/dev-util/rust-analyzer/rust-analyzer-20211004.ebuild
similarity index 88%
rename from dev-util/rust-analyzer/rust-analyzer-20210920.ebuild
rename to dev-util/rust-analyzer/rust-analyzer-20211004.ebuild
index eb62aa50c2..57d2bcedfe 100644
--- a/dev-util/rust-analyzer/rust-analyzer-20210920.ebuild
+++ b/dev-util/rust-analyzer/rust-analyzer-20211004.ebuild
@@ -8,7 +8,7 @@ CRATES="
 	adler-1.0.2
 	always-assert-0.1.2
 	ansi_term-0.12.1
-	anyhow-1.0.43
+	anyhow-1.0.44
 	anymap-0.12.1
 	arbitrary-1.0.2
 	arrayvec-0.7.1
@@ -34,7 +34,7 @@ CRATES="
 	crossbeam-utils-0.8.5
 	dashmap-4.0.2
 	derive_arbitrary-1.0.2
-	dissimilar-1.0.2
+	dissimilar-1.0.3
 	dot-0.1.4
 	drop_bomb-0.1.5
 	either-1.6.1
@@ -42,7 +42,7 @@ CRATES="
 	expect-test-1.1.0
 	filetime-0.2.15
 	fixedbitset-0.2.0
-	flate2-1.0.21
+	flate2-1.0.22
 	form_urlencoded-1.0.1
 	fs_extra-1.2.0
 	fsevent-sys-4.0.0
@@ -54,32 +54,32 @@ CRATES="
 	home-0.5.3
 	idna-0.2.3
 	indexmap-1.7.0
-	inotify-0.9.3
+	inotify-0.9.4
 	inotify-sys-0.1.5
-	instant-0.1.10
+	instant-0.1.11
 	itertools-0.10.1
 	itoa-0.4.8
 	jod-thread-0.1.2
 	kqueue-1.0.4
 	kqueue-sys-1.0.3
 	lazy_static-1.4.0
-	libc-0.2.99
+	libc-0.2.103
 	libloading-0.7.0
 	libmimalloc-sys-0.1.22
 	lock_api-0.4.5
 	log-0.4.14
 	lsp-server-0.5.2
-	lsp-types-0.89.2
+	lsp-types-0.90.0
 	matchers-0.0.1
 	matches-0.1.9
 	memchr-2.4.1
-	memmap2-0.3.1
+	memmap2-0.5.0
 	memoffset-0.6.4
 	mimalloc-0.1.26
 	miniz_oxide-0.4.4
 	mio-0.7.13
 	miow-0.3.7
-	notify-5.0.0-pre.12
+	notify-5.0.0-pre.13
 	ntapi-0.3.6
 	num_cpus-1.13.0
 	object-0.26.2
@@ -95,7 +95,7 @@ CRATES="
 	pin-project-lite-0.2.7
 	proc-macro2-1.0.29
 	pulldown-cmark-0.8.0
-	pulldown-cmark-to-cmark-6.0.3
+	pulldown-cmark-to-cmark-6.0.4
 	quote-1.0.9
 	rayon-1.5.1
 	rayon-core-1.9.1
@@ -103,7 +103,7 @@ CRATES="
 	regex-1.5.4
 	regex-automata-0.1.10
 	regex-syntax-0.6.25
-	rowan-0.14.0
+	rowan-0.14.1
 	rustc-ap-rustc_lexer-725.0.0
 	rustc-demangle-0.1.21
 	rustc-hash-1.1.0
@@ -116,13 +116,13 @@ CRATES="
 	semver-1.0.4
 	serde-1.0.130
 	serde_derive-1.0.130
-	serde_json-1.0.67
+	serde_json-1.0.68
 	serde_repr-0.1.7
 	sharded-slab-0.1.3
-	smallvec-1.6.1
+	smallvec-1.7.0
 	smol_str-0.1.18
 	snap-1.0.5
-	syn-1.0.76
+	syn-1.0.77
 	synstructure-0.12.5
 	termcolor-1.1.2
 	text-size-1.1.0
@@ -131,15 +131,15 @@ CRATES="
 	tikv-jemalloc-ctl-0.4.2
 	tikv-jemalloc-sys-0.4.2+5.2.1-patched.2
 	tikv-jemallocator-0.4.1
-	tinyvec-1.3.1
+	tinyvec-1.5.0
 	tinyvec_macros-0.1.0
-	tracing-0.1.26
-	tracing-attributes-0.1.15
-	tracing-core-0.1.19
+	tracing-0.1.28
+	tracing-attributes-0.1.16
+	tracing-core-0.1.20
 	tracing-log-0.1.2
-	tracing-subscriber-0.2.20
+	tracing-subscriber-0.2.24
 	tracing-tree-0.1.10
-	ungrammar-1.14.4
+	ungrammar-1.14.5
 	unicase-2.6.0
 	unicode-bidi-0.3.6
 	unicode-normalization-0.1.19
@@ -178,7 +178,7 @@ RESTRICT="mirror"
 SLOT="0"
 IUSE=""
 
-DEPEND="|| ( >=dev-lang/rust-1.54.0[rls] >=dev-lang/rust-bin-1.54.0[rls] )"
+DEPEND="|| ( >=dev-lang/rust-1.55.0[rls] >=dev-lang/rust-bin-1.55.0[rls] )"
 RDEPEND="${DEPEND}"
 
 src_unpack() {
diff --git a/dev-util/rust-analyzer/rust-analyzer-99999999.ebuild b/dev-util/rust-analyzer/rust-analyzer-99999999.ebuild
index d43bfd8c1f..6469994367 100644
--- a/dev-util/rust-analyzer/rust-analyzer-99999999.ebuild
+++ b/dev-util/rust-analyzer/rust-analyzer-99999999.ebuild
@@ -25,7 +25,7 @@ RESTRICT="mirror"
 SLOT="0"
 IUSE=""
 
-DEPEND="|| ( >=dev-lang/rust-1.54.0[rls] >=dev-lang/rust-bin-1.54.0[rls] )"
+DEPEND="|| ( >=dev-lang/rust-1.55.0[rls] >=dev-lang/rust-bin-1.55.0[rls] )"
 RDEPEND="${DEPEND}"
 
 src_unpack() {
diff --git a/eclass/R-packages.eclass b/eclass/R-packages.eclass
index a072e5cc2f..6cbf9d7d35 100644
--- a/eclass/R-packages.eclass
+++ b/eclass/R-packages.eclass
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-inherit eutils toolchain-funcs
+inherit eutils optfeature toolchain-funcs
 
-EXPORT_FUNCTIONS src_unpack src_prepare src_compile src_install
+EXPORT_FUNCTIONS src_unpack src_prepare src_compile src_install pkg_postinst
 
 SRC_URI="mirror://cran/src/contrib/${PN}_${PV}.tar.gz"
 HOMEPAGE="https://cran.r-project.org/package=${PN}"
@@ -32,7 +32,6 @@ R-packages_src_prepare() {
 	default
 }
 
-
 R-packages_src_compile() {
 	MAKEFLAGS="AR=$(tc-getAR) CFLAGS=${CFLAGS// /\\ } CXXFLAGS=${CXXFLAGS// /\\ } FFLAGS=${FFLAGS// /\\ } FCFLAGS=${FCFLAGS// /\\ } LDFLAGS=${LDFLAGS// /\\ }" R CMD INSTALL . -l "${WORKDIR}" "--byte-compile" || die
 }
@@ -62,3 +61,9 @@ R-packages_src_install() {
 	insinto "/usr/$(get_libdir)/R/site-library"
 	doins -r "${WORKDIR}/${PN//_/.}"
 }
+
+R-packages_pkg_postinst() {
+	if [ -v SUGGESTED_PACKAGES ]; then
+		optfeature "having the upstream suggested packages" "${SUGGESTED_PACKAGES}"
+	fi
+}
diff --git a/eclass/node.eclass b/eclass/node.eclass
deleted file mode 100644
index 47b7a57b10..0000000000
--- a/eclass/node.eclass
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# @ECLASS: node.eclass
-# @MAINTAINER: Alessandro Barbieri
-# @AUTHOR:
-# Alessandro Barbieri
-# msirabella
-# @BLURB: Eclass used to create and maintain node based packages
-# @DESCRIPTION: Node eclass for nodejs' based packages
-
-EXPORT_FUNCTIONS src_prepare src_compile src_install src_test src_configure
-
-SLOT="0"
-PN_LEFT="${PN%%+*}"
-PN_RIGHT="${PN#*+}"
-NODEJS_DEPEND="net-libs/nodejs"
-NODEJS_RDEPEND="${NODEJS_DEPEND}"
-NODEJS_BDEPEND="
-	app-misc/jq
-	net-misc/rsync
-
-	net-libs/nodejs[npm]
-"
-#	|| ( net-libs/nodejs[npm] dev-node/npm )
-
-DEPEND="${NODEJS_DEPEND}"
-RDEPEND="${NODEJS_RDEPEND}"
-BDEPEND="${NODEJS_BDEPEND}"
-
-NODE_MODULE_PREFIX="${T}/prefix"
-NPM="npm"
-#NPM_FLAGS=""
-
-case "${PN}" in
-	*+*)
-	SRC_URI="mirror://npm/@${PN_LEFT}/${PN_RIGHT}/-/${PN_RIGHT}-${PV}.tgz -> ${P}.tgz"
-	;;
-
-	*)
-	SRC_URI="mirror://npm/${PN}/-/${P}.tgz"
-	;;
-esac
-case "${PN}" in
-	*types+*)
-	S="${WORKDIR}/${PN_RIGHT}"
-	;;
-
-	*)
-	S="${WORKDIR}/package"
-	;;
-esac
-
-node_src_prepare() {
-	#remove version constraints on dependencies
-	jq 'if .dependencies? then .dependencies[] = "*" else . end' package.json > package.json.temp || die
-	mv package.json.temp package.json || die
-	jq 'if .devDependencies? then .devDependencies[] = "*" else . end' package.json > package.json.temp || die
-	mv package.json.temp package.json || die
-
-	#here we trick npm into believing there are no dependencies so it will not try to fetch them
-	jq 'with_entries(if .key == "dependencies" then .key = "deps" else . end)' package.json > package.json.temp || die
-	mv package.json.temp package.json || die
-	jq 'with_entries(if .key == "devDependencies" then .key = "devDeps" else . end)' package.json > package.json.temp || die
-	mv package.json.temp package.json || die
-
-	# are those useful?
-	rm -fv npm-shrinkwrap.json package-lock.json yarn.lock pnpm-lock.yaml || die
-
-	#delete some trash
-	find . -iname 'code-of-conduct*' -maxdepth 1 -exec rm -rv "{}" \; || die
-	find . -iname 'code_of_conduct*' -maxdepth 1 -exec rm -rv "{}" \; || die
-	find . -iname 'contributing*' -maxdepth 1 -exec rm -rv "{}" \; || die
-	find . -iname 'contribution*' -maxdepth 1 -exec rm -rv "{}" \; || die
-	find . -iname 'dockerfile*' -maxdepth 1 -exec rm -rv "{}" \; || die
-	find . -iname 'issue_template*' -maxdepth 1 -exec rm -rv "{}" \; || die
-	find . -iname 'license*' -maxdepth 1 -exec rm -rv "{}" \; || die
-	find . -iname 'licence*' -maxdepth 1 -exec rm -rv "{}" \; || die
-	find . -iname 'pull_request_template*' -maxdepth 1 -exec rm -rv "{}" \; || die
-
-	default
-}
-
-node_src_configure() {
-	#path to the modules
-	export NODE_PATH="/usr/$(get_libdir)/node_modules"
-	export npm_config_prefix="${NODE_MODULE_PREFIX}"
-	#path to the headers needed by node-gyp
-	export npm_config_nodedir="/usr/include/node"
-#	export npm_config_tmp="${T}"
-
-	in_iuse test || export NODE_ENV="production"
-
-	"${NPM}" config set offline true || die
-	"${NPM}" config set audit false || die
-	"${NPM}" config set fund false || die
-}
-
-node_src_compile() {
-	"${NPM}" install ${NPM_FLAGS} --global || die
-}
-
-node_src_install() {
-	#restore original package.json
-	jq 'with_entries(if .key == "deps" then .key = "dependencies" else . end)' package.json > package.json.temp || die
-	mv package.json.temp package.json || die
-	jq 'with_entries(if .key == "devDeps" then .key = "devDependencies" else . end)' package.json > package.json.temp || die
-	mv package.json.temp package.json || die
-
-	#should I delete all the dotfiles?
-	rm -rvf $(find . -iname ".[!.]*") || die
-
-	#install some files in the docdir
-	find . -iname "authors*" -maxdepth 1 -exec dodoc "{}" \; -exec rm "{}" \; || die
-	find . -iname "changelog*" -maxdepth 1 -exec dodoc "{}" \; -exec rm "{}" \; || die
-	find . -iname "changes*" -maxdepth 1 -exec dodoc "{}" \; -exec rm "{}" \; || die
-	find . -iname "copyright*" -maxdepth 1 -exec dodoc "{}" \; -exec rm "{}" \; || die
-	find . -iname "history*" -maxdepth 1 -exec dodoc "{}" \; -exec rm "{}" \; || die
-	find . -iname "notice*" -maxdepth 1 -exec dodoc "{}" \; -exec rm "{}" \; || die
-	find . -iname "readme*" -maxdepth 1 -exec dodoc "{}" \; -exec rm "{}" \; || die
-	find . -iname "security*" -maxdepth 1 -exec dodoc "{}" \; -exec rm "{}" \; || die
-
-	#copy files instead of symlinks
-	rsync -aLAX "${NODE_MODULE_PREFIX}/" "${ED}/usr" --exclude /bin || die
-
-	if [ -d "${NODE_MODULE_PREFIX}/bin" ] ; then
-		#keep the symlinks
-		rsync -aAX "${NODE_MODULE_PREFIX}/bin/" "${ED}/usr/bin" || die
-	fi
-}
-
-node_src_test() {
-	npm test || die
-}
diff --git a/gui-apps/nwg-launchers/Manifest b/gui-apps/nwg-launchers/Manifest
index 57dd98bad8..9a762f9dc0 100644
--- a/gui-apps/nwg-launchers/Manifest
+++ b/gui-apps/nwg-launchers/Manifest
@@ -1,2 +1,2 @@
-DIST nwg-launchers-0.4.4.tar.gz 50749 BLAKE2B da5539a4d786819aa71ff3cfb0f769a930999a4bbe62dc96932a46dff8a214123e174d8e78825ea41622b8b6a2c863f52777c7e73770961dd08c33a9a8a259e1 SHA512 d373bbc2c9f99a133d1aca23be73ea680af93071f37e02382ce12ad8d1c0650bddd3aa87853a3f2dfb69f49c272bfd4f88433c1533c211936a5e6b46c79e05c5
 DIST nwg-launchers-0.5.0.tar.gz 52715 BLAKE2B 0a9cec7a809688e05da86fa7ba0da140c1d5cf273ee3fddae66ce88dccaf21cc65dfccb7deaca1be1d50ce2ac5173f0bcc8d70b61544daa392ab1f451e533724 SHA512 c2c343cd99071332664565d1c2244d97a4fc19e710c84c78ac7dca100c49dfbf5b12d56029cc47f45af29720be358ee69e24bdcfad6d0a383a0520f9215bc817
+DIST nwg-launchers-0.6.3.tar.gz 64054 BLAKE2B 1ab920a390da76f3acf2c0012f63a3f121e6601b3d827b07a387bde15d91897640620b18bae2d1035152a64adcc8d45b595c3fa48a059aea9dc203b3ecab10f7 SHA512 36bb9179a8231d8200dddffd18b3e38a047a87828c95fd2dd0fe2a525856ea17bbd9fe51f4549ca4d3a6db555b94d30a606c0a874021b69f1af34f57a9f6ac28
diff --git a/gui-apps/nwg-launchers/nwg-launchers-0.4.4.ebuild b/gui-apps/nwg-launchers/nwg-launchers-0.6.3.ebuild
similarity index 83%
rename from gui-apps/nwg-launchers/nwg-launchers-0.4.4.ebuild
rename to gui-apps/nwg-launchers/nwg-launchers-0.6.3.ebuild
index 8b26640731..82163e8891 100644
--- a/gui-apps/nwg-launchers/nwg-launchers-0.4.4.ebuild
+++ b/gui-apps/nwg-launchers/nwg-launchers-0.6.3.ebuild
@@ -22,15 +22,16 @@ SLOT="0"
 RDEPEND="
 	x11-libs/gtk+:3
 	dev-cpp/gtkmm:3.0
-	dev-cpp/nlohmann_json"
+	dev-cpp/nlohmann_json
+	layershell? ( gui-libs/gtk-layer-shell )"
 DEPEND="${RDEPEND}"
 
 RESTRICT="mirror"
 
-IUSE="+bar +dmenu +grid"
+IUSE="+bar +dmenu +grid layershell"
 
 src_configure() {
-	meson_src_configure $(meson_use bar) $(meson_use dmenu) $(meson_use grid)
+	meson_src_configure $(meson_use bar) $(meson_use dmenu) $(meson_use grid) $(meson_feature layershell layer-shell)
 }
 
 src_install() {
diff --git a/media-gfx/ttfautohint/Manifest b/media-gfx/ttfautohint/Manifest
index 5929dc565c..d16155e0ed 100644
--- a/media-gfx/ttfautohint/Manifest
+++ b/media-gfx/ttfautohint/Manifest
@@ -1 +1,2 @@
 DIST ttfautohint-1.8.3.tar.gz 3458637 BLAKE2B 28ca1daa5dc60f099e9524a3e6bede157569f730b50acb055862404b22bf348f34e5ae2465c3ebb9e9dd02d2ff6e0f3a8c47fa5c6e3b72bbdedacbaa393b4992 SHA512 cbf50a99d984955a9c23590870ae09c0954f0c1d3e8e9db4e8139d8e22d6f6a636eb8ea9c8a8322b020fcbbe70dcdbc36670a40356017033f559cb4f87226abf
+DIST ttfautohint-1.8.4.tar.gz 3539332 BLAKE2B 314c5196f01828d180d3b3e9b09c66fad9c8a8958f36003c8ae0d54b945391cb53c40f92cf57ff70e57b5a21a6aa46bc14ff9419d4b877421fdc2500ce9004e3 SHA512 983517c360f8e65ccbf17f28f045f1c0a45078707f2e30f465a7b6df4014f0ec212780ea2703bc16be1a3c6ede70f71ea3051c067fbfd06eff40ae3b20840eec
diff --git a/media-gfx/ttfautohint/ttfautohint-1.8.4.ebuild b/media-gfx/ttfautohint/ttfautohint-1.8.4.ebuild
new file mode 100644
index 0000000000..858d5e5fd5
--- /dev/null
+++ b/media-gfx/ttfautohint/ttfautohint-1.8.4.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools qmake-utils
+
+DESCRIPTION="A library for automated hinting of truetype fonts"
+HOMEPAGE="https://www.freetype.org/ttfautohint/index.html"
+SRC_URI="https://download.savannah.gnu.org/releases/freetype/${P}.tar.gz"
+
+KEYWORDS="~amd64"
+LICENSE="|| ( FTL GPL-2+ )"
+SLOT="0"
+IUSE="doc qt5"
+
+RDEPEND="
+	media-libs/harfbuzz
+	media-libs/freetype
+	qt5? ( dev-qt/qtgui:5 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-apps/help2man"
+
+src_prepare() {
+	default
+	#set version
+	sed -e "s|m4_esyscmd.*VERSION])|${PV//_/-}|" -i configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local _q="$(qt5_get_bindir)"
+	local myeconfargs=(
+		--disable-static
+		$(use_with doc)
+		$(use_with qt5 qt)
+	)
+
+	QMAKE="${_q}/qmake" MOC="${_q}/moc" UIC="${_q}/uic" RCC="${_q}/rcc" econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+	emake "${PN}.1" $(usex qt5 "${PN}GUI.1" '') -C frontend
+}
+
+src_install() {
+	default
+	doman frontend/*.1
+	find "${ED}" -name '*.la' -delete || die
+	find "${ED}" -name '*.a' -delete || die
+}
diff --git a/media-libs/svt-hevc/Manifest b/media-libs/svt-hevc/Manifest
index dca20f77e8..f0a9094702 100644
--- a/media-libs/svt-hevc/Manifest
+++ b/media-libs/svt-hevc/Manifest
@@ -1 +1,2 @@
 DIST svt-hevc-1.5.0.tar.gz 1218974 BLAKE2B 0922688ae159cba3316728344f729a2216d196c2935e865118b4e24c543c276606f63bcb09353aace3308c9051012172529fc509429e37fb408bd22420d5459e SHA512 e24c48b05c09f348ff39515b8eaa9723d012157ec395520d21adf5654f4e56082a8d46a9ba8c38ee536e78b59cf48d2eb93fadb6e8416a27541003a08593580c
+DIST svt-hevc-1.5.1.tar.gz 1220295 BLAKE2B e70dc07f74746cb69561818b642d8ce5efd9e731b3376889556ddea0f647f8deaa4edf7a4993d86a5b1100db37d02f928d53eeaa594b7d5c582b92c30761e470 SHA512 f5b9d9a090cb04ada0a3f310522f00b619ae628b8474fe7e1c7f562a017b5a9d0c8c58ab9a35b43cb19f2568fbc59e0395dcd517b7983924b175393ad2ba4299
diff --git a/media-libs/svt-hevc/svt-hevc-1.5.0.ebuild b/media-libs/svt-hevc/svt-hevc-1.5.0.ebuild
index e85af88c78..4519a7918a 100644
--- a/media-libs/svt-hevc/svt-hevc-1.5.0.ebuild
+++ b/media-libs/svt-hevc/svt-hevc-1.5.0.ebuild
@@ -20,7 +20,7 @@ fi
 LICENSE="AOM BSD-2"
 SLOT="0/1"
 
-DEPEND="dev-lang/nasm"
+BDEPEND="dev-lang/nasm"
 
 src_prepare() {
 	append-ldflags -Wl,-z,noexecstack
diff --git a/media-libs/svt-hevc/svt-hevc-1.5.1.ebuild b/media-libs/svt-hevc/svt-hevc-1.5.1.ebuild
new file mode 100644
index 0000000000..fa50dca2ab
--- /dev/null
+++ b/media-libs/svt-hevc/svt-hevc-1.5.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic cmake
+
+DESCRIPTION="Scalable Video Technology for HEVC (SVT-HEVC Encoder)"
+HOMEPAGE="https://github.com/OpenVisualCloud/SVT-HEVC"
+
+if [ ${PV} = "9999" ]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/OpenVisualCloud/SVT-HEVC.git"
+else
+	SRC_URI="https://github.com/OpenVisualCloud/SVT-HEVC/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64"
+	S="${WORKDIR}/SVT-HEVC-${PV}"
+fi
+
+LICENSE="AOM BSD-2"
+SLOT="0/1"
+
+BDEPEND="dev-lang/nasm"
+
+src_prepare() {
+	append-ldflags -Wl,-z,noexecstack
+	cmake_src_prepare
+}
diff --git a/media-libs/svt-hevc/svt-hevc-9999.ebuild b/media-libs/svt-hevc/svt-hevc-9999.ebuild
index e85af88c78..fa50dca2ab 100644
--- a/media-libs/svt-hevc/svt-hevc-9999.ebuild
+++ b/media-libs/svt-hevc/svt-hevc-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit flag-o-matic cmake
 
@@ -20,7 +20,7 @@ fi
 LICENSE="AOM BSD-2"
 SLOT="0/1"
 
-DEPEND="dev-lang/nasm"
+BDEPEND="dev-lang/nasm"
 
 src_prepare() {
 	append-ldflags -Wl,-z,noexecstack
diff --git a/media-plugins/gst-plugins-qt5/Manifest b/media-plugins/gst-plugins-qt5/Manifest
new file mode 100644
index 0000000000..b8849d87de
--- /dev/null
+++ b/media-plugins/gst-plugins-qt5/Manifest
@@ -0,0 +1 @@
+DIST gst-plugins-good-1.18.4.tar.xz 3277572 BLAKE2B 8acfb975d19eabc681184d0096328051a9a02e5f849599dbad1233a0e9254e1a2d2bef75d8afdc779a7ca01a71b15d1e83a843749c0ef5f7ab2b5818067ab898 SHA512 764c66383c93e57f9c5e7742002013e07e7b25750d6974d6c07744433e8ceb7570e829e68278e2bc5214f77158311a6b3bfb013d615cf66205d8d7a9e2d54b86
diff --git a/media-plugins/gst-plugins-qt5/files/gst-dont-use-volatile-to-mean-atomic-1.18.4.patch b/media-plugins/gst-plugins-qt5/files/gst-dont-use-volatile-to-mean-atomic-1.18.4.patch
new file mode 100644
index 0000000000..fd12de3ee0
--- /dev/null
+++ b/media-plugins/gst-plugins-qt5/files/gst-dont-use-volatile-to-mean-atomic-1.18.4.patch
@@ -0,0 +1,249 @@
+From 612102fdbc3f813bf9d3406165692b5f742e51a6 Mon Sep 17 00:00:00 2001
+From: Matthew Waters <matthew@centricular.com>
+Date: Thu, 18 Mar 2021 19:52:53 +1100
+Subject: [PATCH] gst: don't use volatile to mean atomic
+
+volatile is not sufficient to provide atomic guarantees and real atomics
+should be used instead.  GCC 11 has started warning about using volatile
+with atomic operations.
+
+https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1719
+
+Discovered in https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/issues/868
+
+Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/merge_requests/911>
+---
+ ext/jack/gstjack.c             |  6 +++---
+ ext/jack/gstjackaudiosink.c    |  2 +-
+ ext/jack/gstjackaudiosrc.c     |  2 +-
+ ext/pulse/pulsesink.h          |  2 +-
+ ext/qt/gstqsgtexture.cc        |  2 +-
+ ext/qt/gstqtglutility.cc       |  2 +-
+ ext/qt/qtglrenderer.cc         |  6 +++---
+ ext/qt/qtitem.cc               |  2 +-
+ ext/qt/qtwindow.cc             |  4 ++--
+ ext/vpx/gstvpxdec.c            |  2 +-
+ ext/vpx/gstvpxenc.c            | 16 ++++++++--------
+ gst/audioparsers/gstac3parse.h |  2 +-
+ sys/rpicamsrc/gstrpicamsrc.c   |  2 +-
+ sys/ximage/ximageutil.c        |  2 +-
+ 14 files changed, 26 insertions(+), 26 deletions(-)
+
+diff --git a/ext/jack/gstjack.c b/ext/jack/gstjack.c
+index ca98dc405..fdd507d87 100644
+--- a/ext/jack/gstjack.c
++++ b/ext/jack/gstjack.c
+@@ -28,7 +28,7 @@
+ GType
+ gst_jack_connect_get_type (void)
+ {
+-  static volatile gsize jack_connect_type = 0;
++  static gsize jack_connect_type = 0;
+ 
+   if (g_once_init_enter (&jack_connect_type)) {
+     static const GEnumValue jack_connect_enums[] = {
+@@ -50,7 +50,7 @@ gst_jack_connect_get_type (void)
+ GType
+ gst_jack_transport_get_type (void)
+ {
+-  static volatile gsize type = 0;
++  static gsize type = 0;
+ 
+   if (g_once_init_enter (&type)) {
+     static const GFlagsValue flag_values[] = {
+@@ -84,7 +84,7 @@ gst_jack_client_free (gpointer jclient)
+ GType
+ gst_jack_client_get_type (void)
+ {
+-  static volatile gsize jack_client_type = 0;
++  static gsize jack_client_type = 0;
+ 
+   if (g_once_init_enter (&jack_client_type)) {
+     /* hackish, but makes it show up nicely in gst-inspect */
+diff --git a/ext/jack/gstjackaudiosink.c b/ext/jack/gstjackaudiosink.c
+index ee7cea8c0..6e8d04ae5 100644
+--- a/ext/jack/gstjackaudiosink.c
++++ b/ext/jack/gstjackaudiosink.c
+@@ -131,7 +131,7 @@ gst_jack_audio_sink_free_channels (GstJackAudioSink * sink)
+ static GType
+ gst_jack_ring_buffer_get_type (void)
+ {
+-  static volatile gsize ringbuffer_type = 0;
++  static gsize ringbuffer_type = 0;
+ 
+   if (g_once_init_enter (&ringbuffer_type)) {
+     static const GTypeInfo ringbuffer_info = {
+diff --git a/ext/jack/gstjackaudiosrc.c b/ext/jack/gstjackaudiosrc.c
+index 1d2cf82ee..d43a447a7 100644
+--- a/ext/jack/gstjackaudiosrc.c
++++ b/ext/jack/gstjackaudiosrc.c
+@@ -151,7 +151,7 @@ gst_jack_audio_src_free_channels (GstJackAudioSrc * src)
+ static GType
+ gst_jack_ring_buffer_get_type (void)
+ {
+-  static volatile gsize ringbuffer_type = 0;
++  static gsize ringbuffer_type = 0;
+ 
+   if (g_once_init_enter (&ringbuffer_type)) {
+     static const GTypeInfo ringbuffer_info = { sizeof (GstJackRingBufferClass),
+diff --git a/ext/pulse/pulsesink.h b/ext/pulse/pulsesink.h
+index 86f3dcdbb..51ec86a25 100644
+--- a/ext/pulse/pulsesink.h
++++ b/ext/pulse/pulsesink.h
+@@ -72,7 +72,7 @@ struct _GstPulseSink
+   GstStructure *properties;
+   pa_proplist *proplist;
+ 
+-  volatile gint format_lost;
++  gint format_lost;
+   GstClockTime format_lost_time;
+ };
+ 
+diff --git a/ext/qt/gstqsgtexture.cc b/ext/qt/gstqsgtexture.cc
+index 1f0a2e6e1..00e2ddad0 100644
+--- a/ext/qt/gstqsgtexture.cc
++++ b/ext/qt/gstqsgtexture.cc
+@@ -35,7 +35,7 @@ GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT);
+ 
+ GstQSGTexture::GstQSGTexture ()
+ {
+-  static volatile gsize _debug;
++  static gsize _debug;
+ 
+   initializeOpenGLFunctions();
+ 
+diff --git a/ext/qt/gstqtglutility.cc b/ext/qt/gstqtglutility.cc
+index acb89b6e1..d2c092202 100644
+--- a/ext/qt/gstqtglutility.cc
++++ b/ext/qt/gstqtglutility.cc
+@@ -66,7 +66,7 @@ gst_qt_get_gl_display ()
+ {
+   GstGLDisplay *display = NULL;
+   QGuiApplication *app = static_cast<QGuiApplication *> (QCoreApplication::instance ());
+-  static volatile gsize _debug;
++  static gsize _debug;
+ 
+   g_assert (app != NULL);
+ 
+diff --git a/ext/qt/qtglrenderer.cc b/ext/qt/qtglrenderer.cc
+index 2ad5601fc..52965fd0b 100644
+--- a/ext/qt/qtglrenderer.cc
++++ b/ext/qt/qtglrenderer.cc
+@@ -22,7 +22,7 @@ GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT);
+ static void
+ init_debug (void)
+ {
+-  static volatile gsize _debug;
++  static gsize _debug;
+ 
+   if (g_once_init_enter (&_debug)) {
+     GST_DEBUG_CATEGORY_INIT (GST_CAT_DEFAULT, "qtglrenderer", 0,
+@@ -115,7 +115,7 @@ typedef enum
+ 
+ struct SharedRenderData
+ {
+-  volatile int refcount;
++  int refcount;
+   SharedRenderDataState state;
+   GMutex lock;
+   GCond cond;
+@@ -130,7 +130,7 @@ shared_render_data_new (void)
+ {
+   struct SharedRenderData *ret = g_new0 (struct SharedRenderData, 1);
+ 
+-  ret->refcount = 1;
++  g_atomic_int_set (&ret->refcount, 1);
+   g_mutex_init (&ret->lock);
+ 
+   return ret;
+diff --git a/ext/qt/qtitem.cc b/ext/qt/qtitem.cc
+index 2869ea92b..da2b70190 100644
+--- a/ext/qt/qtitem.cc
++++ b/ext/qt/qtitem.cc
+@@ -112,7 +112,7 @@ void InitializeSceneGraph::run()
+ 
+ QtGLVideoItem::QtGLVideoItem()
+ {
+-  static volatile gsize _debug;
++  static gsize _debug;
+ 
+   if (g_once_init_enter (&_debug)) {
+     GST_DEBUG_CATEGORY_INIT (GST_CAT_DEFAULT, "qtglwidget", 0, "Qt GL Widget");
+diff --git a/ext/qt/qtwindow.cc b/ext/qt/qtwindow.cc
+index 9360c3337..7c44ac54e 100644
+--- a/ext/qt/qtwindow.cc
++++ b/ext/qt/qtwindow.cc
+@@ -103,7 +103,7 @@ QtGLWindow::QtGLWindow ( QWindow * parent, QQuickWindow *src ) :
+   QQuickWindow( parent ), source (src)
+ {
+   QGuiApplication *app = static_cast<QGuiApplication *> (QCoreApplication::instance ());
+-  static volatile gsize _debug;
++  static gsize _debug;
+ 
+   g_assert (app != NULL);
+ 
+@@ -152,7 +152,7 @@ QtGLWindow::beforeRendering()
+ 
+   g_mutex_lock (&this->priv->lock);
+ 
+-  static volatile gsize once = 0;
++  static gsize once = 0;
+   if (g_once_init_enter(&once)) {
+     this->priv->start = QDateTime::currentDateTime().toMSecsSinceEpoch();
+     g_once_init_leave(&once,1);
+diff --git a/ext/vpx/gstvpxdec.c b/ext/vpx/gstvpxdec.c
+index 19a24870c..adf842813 100644
+--- a/ext/vpx/gstvpxdec.c
++++ b/ext/vpx/gstvpxdec.c
+@@ -79,7 +79,7 @@ gst_vpx_dec_post_processing_flags_get_type (void)
+     {C_FLAGS (VP8_MFQE), "Multi-frame quality enhancement", "mfqe"},
+     {0, NULL, NULL}
+   };
+-  static volatile GType id = 0;
++  static GType id = 0;
+ 
+   if (g_once_init_enter ((gsize *) & id)) {
+     GType _id;
+diff --git a/gst/audioparsers/gstac3parse.h b/gst/audioparsers/gstac3parse.h
+index 0e7af5acd..81e2104d5 100644
+--- a/gst/audioparsers/gstac3parse.h
++++ b/gst/audioparsers/gstac3parse.h
+@@ -62,7 +62,7 @@ struct _GstAc3Parse {
+   gint                  blocks;
+   gboolean              eac;
+   gboolean              sent_codec_tag;
+-  volatile gint         align;
++  gint                  align;
+   GstPadChainFunction   baseparse_chainfunc;
+ };
+ 
+diff --git a/sys/rpicamsrc/gstrpicamsrc.c b/sys/rpicamsrc/gstrpicamsrc.c
+index 2aa28f488..6ab601631 100644
+--- a/sys/rpicamsrc/gstrpicamsrc.c
++++ b/sys/rpicamsrc/gstrpicamsrc.c
+@@ -292,7 +292,7 @@ gst_rpi_cam_src_sensor_mode_get_type (void)
+         "640x480 4:3 60.1-90fps", "640x480-fast"},
+     {0, NULL, NULL}
+   };
+-  static volatile GType id = 0;
++  static GType id = 0;
+   if (g_once_init_enter ((gsize *) & id)) {
+     GType _id;
+     _id = g_enum_register_static ("GstRpiCamSrcSensorMode", values);
+diff --git a/sys/ximage/ximageutil.c b/sys/ximage/ximageutil.c
+index 57c9392c7..018b60515 100644
+--- a/sys/ximage/ximageutil.c
++++ b/sys/ximage/ximageutil.c
+@@ -26,7 +26,7 @@
+ GType
+ gst_meta_ximage_api_get_type (void)
+ {
+-  static volatile GType type;
++  static GType type;
+   static const gchar *tags[] = { "memory", NULL };
+ 
+   if (g_once_init_enter (&type)) {
+-- 
+GitLab
+
+
diff --git a/media-plugins/gst-plugins-qt5/gst-plugins-qt5-1.18.4.ebuild b/media-plugins/gst-plugins-qt5/gst-plugins-qt5-1.18.4.ebuild
new file mode 100644
index 0000000000..c11f6a8884
--- /dev/null
+++ b/media-plugins/gst-plugins-qt5/gst-plugins-qt5-1.18.4.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+GST_ORG_MODULE=gst-plugins-good
+
+inherit gstreamer-meson
+
+DESCRIPTION="Qt5 QML video sink plugin for GStreamer"
+KEYWORDS="~amd64"
+IUSE="+egl orc wayland +X"
+
+REQUIRED_USE="
+	wayland? ( egl )
+"
+
+RDEPEND="
+	>=media-libs/gst-plugins-base-${PV}:${SLOT}[egl?,opengl,wayland?,X?]
+	media-libs/mesa[egl?,X?]
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	egl? ( dev-qt/qtgui:5[eglfs] )
+	wayland? ( dev-qt/qtwayland:5 )
+	X? ( dev-qt/qtx11extras:5 )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/gst-dont-use-volatile-to-mean-atomic-1.18.4.patch"
+)
+
+GST_PLUGINS_BUILD_DIR="qt"
diff --git a/media-plugins/gst-plugins-qt5/metadata.xml b/media-plugins/gst-plugins-qt5/metadata.xml
new file mode 100644
index 0000000000..bae7748a82
--- /dev/null
+++ b/media-plugins/gst-plugins-qt5/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gentoo@tastytea.de</email>
+		<name>Ronny (tastytea) Gutbrod</name>
+	</maintainer>
+	<longdescription lang="en">
+	GStreamer plugin for the Qt Qml elements
+
+	Includes the following elements:
+	* qmlgloverlay – A filter that renders a QML scene onto a video stream
+	* qmlglsink – A video sink that renders to a QQuickItem
+	* qmlglsrc – A video src that captures a window from a QML view
+</longdescription>
+	<use>
+		<flag name="egl">Enable EGL support.</flag>
+	</use>
+</pkgmetadata>
diff --git a/media-video/av1an/Manifest b/media-video/av1an/Manifest
deleted file mode 100644
index e657d4a6a4..0000000000
--- a/media-video/av1an/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST av1an-1.12.tar.gz 38440 BLAKE2B 19163ae77622c99255e5c5c06a9d89f315766d069d2f7c17414fab8cdd92e76cefc71103cf8afc2543b6b05136d1be32d1feefb88fba7837bea7f338647520c6 SHA512 2e55e595ff943324dbee5f91b4d6d85e52c052258cefd775bf78021893037d0bd1fd2e95ad4fb9303e3dac42fcb56107762faf0fe616fa2243303826463a9025
diff --git a/media-video/av1an/av1an-1.12.ebuild b/media-video/av1an/av1an-1.12.ebuild
deleted file mode 100644
index 39f132b53e..0000000000
--- a/media-video/av1an/av1an-1.12.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Cross-platform framework to streamline encoding"
-HOMEPAGE="https://github.com/master-of-zen/Av1an"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/master-of-zen/Av1an.git"
-else
-	SRC_URI="https://github.com/master-of-zen/Av1an/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}"/${P^}
-fi
-
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	dev-python/scenedetect[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-	dev-python/tqdm[${PYTHON_USEDEP}]
-	media-libs/libaom[examples]
-	media-libs/opencv[python,${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	distutils-r1_src_prepare
-	sed -e '/opencv-python/d'\
-		-e '/scenedetect/d' \
-		-i setup.py || die
-}
diff --git a/media-video/av1an/av1an-9999.ebuild b/media-video/av1an/av1an-9999.ebuild
deleted file mode 100644
index 39f132b53e..0000000000
--- a/media-video/av1an/av1an-9999.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Cross-platform framework to streamline encoding"
-HOMEPAGE="https://github.com/master-of-zen/Av1an"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/master-of-zen/Av1an.git"
-else
-	SRC_URI="https://github.com/master-of-zen/Av1an/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}"/${P^}
-fi
-
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	dev-python/scenedetect[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-	dev-python/tqdm[${PYTHON_USEDEP}]
-	media-libs/libaom[examples]
-	media-libs/opencv[python,${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	distutils-r1_src_prepare
-	sed -e '/opencv-python/d'\
-		-e '/scenedetect/d' \
-		-i setup.py || die
-}
diff --git a/media-video/av1an/metadata.xml b/media-video/av1an/metadata.xml
deleted file mode 100644
index cd174bd3ef..0000000000
--- a/media-video/av1an/metadata.xml
+++ /dev/null
@@ -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>telans@posteo.de</email>
-        <name>James Beddek</name>
-    </maintainer>
-</pkgmetadata>
diff --git a/media-video/ffsubsync/Manifest b/media-video/ffsubsync/Manifest
index 2a956b3594..c439335e71 100644
--- a/media-video/ffsubsync/Manifest
+++ b/media-video/ffsubsync/Manifest
@@ -1 +1 @@
-DIST ffsubsync-0.4.11.tar.gz 3818585 BLAKE2B 2f17da90306b4060553508b445c59eff4d73dfebf57754924a0836d791054a41e5f84e34813d85ea528136d8d1c64e71dd41e843b752015b9de6fac1edb38689 SHA512 decb4ff110c723228271961692bb12eac12c0e8c7b574d23d22fe760f0bcee3ad44811ce8ef8a7ee03a68ae9d15721ede363e6b0389ff44d48f521b045489ccb
+DIST ffsubsync-0.4.18.tar.gz 3821259 BLAKE2B 79c1d7ed1316b1c91f23de442988c0234c89f3f51a605f3982aa32c880f2bb33f0bd280906d3b2ea3c3f9de4b1453b0c053b16cd382ee55ea24f692f81b6cd04 SHA512 be3243b8a24c163509f519105e509a26e8fac76ba2305b07c413ade1c645043bc90f9d0c862f346d911e5897bc1b97f5c34d9c210146df0aab24345b0541204b
diff --git a/media-video/ffsubsync/ffsubsync-0.4.11.ebuild b/media-video/ffsubsync/ffsubsync-0.4.18.ebuild
similarity index 93%
rename from media-video/ffsubsync/ffsubsync-0.4.11.ebuild
rename to media-video/ffsubsync/ffsubsync-0.4.18.ebuild
index 84410fb6e4..789c74400e 100644
--- a/media-video/ffsubsync/ffsubsync-0.4.11.ebuild
+++ b/media-video/ffsubsync/ffsubsync-0.4.18.ebuild
@@ -28,6 +28,10 @@ RDEPEND="
 	dev-python/webrtcvad[${PYTHON_USEDEP}]
 "
 
+PATCHES=(
+	"${FILESDIR}"/"${P}"-remove-future_annotations.patch
+)
+
 distutils_enable_tests pytest
 
 python_prepare_all() {
diff --git a/media-video/ffsubsync/files/ffsubsync-0.4.18-remove-future_annotations.patch b/media-video/ffsubsync/files/ffsubsync-0.4.18-remove-future_annotations.patch
new file mode 100644
index 0000000000..c8e743adc2
--- /dev/null
+++ b/media-video/ffsubsync/files/ffsubsync-0.4.18-remove-future_annotations.patch
@@ -0,0 +1,176 @@
+Removes the dependency from future-annotations, since the ebuild does
+not support <dev-lang/python-3.7, using the __future__ module instead.
+Patch by Nicola Smaniotto.
+
+diff --git a/ffsubsync/__init__.py b/ffsubsync/__init__.py
+index 1ce6e51..965cb46 100644
+--- a/ffsubsync/__init__.py
++++ b/ffsubsync/__init__.py
+@@ -1,4 +1,4 @@
+-# -*- coding: future_annotations -*- 
++from __future__ import annotations 
+ import logging
+ import sys
+ 
+diff --git a/ffsubsync/aligners.py b/ffsubsync/aligners.py
+index 6c7afc7..d777eff 100644
+--- a/ffsubsync/aligners.py
++++ b/ffsubsync/aligners.py
+@@ -1,4 +1,4 @@
+-# -*- coding: future_annotations -*- 
++from __future__ import annotations 
+ import logging
+ import math
+ from typing import TYPE_CHECKING
+diff --git a/ffsubsync/constants.py b/ffsubsync/constants.py
+index 99d08e9..176e786 100644
+--- a/ffsubsync/constants.py
++++ b/ffsubsync/constants.py
+@@ -1,4 +1,4 @@
+-# -*- coding: future_annotations -*-
++from __future__ import annotations
+ from typing import TYPE_CHECKING
+ 
+ if TYPE_CHECKING:
+diff --git a/ffsubsync/ffmpeg_utils.py b/ffsubsync/ffmpeg_utils.py
+index ee96da3..10dd923 100644
+--- a/ffsubsync/ffmpeg_utils.py
++++ b/ffsubsync/ffmpeg_utils.py
+@@ -1,4 +1,4 @@
+-# -*- coding: future_annotations -*-
++from __future__ import annotations
+ import logging
+ import os
+ import platform
+diff --git a/ffsubsync/ffsubsync.py b/ffsubsync/ffsubsync.py
+index d10e969..6005b5c 100755
+--- a/ffsubsync/ffsubsync.py
++++ b/ffsubsync/ffsubsync.py
+@@ -1,5 +1,5 @@
+ #!/usr/bin/env python
+-# -*- coding: future_annotations -*-
++from __future__ import annotations
+ import argparse
+ from datetime import datetime
+ import logging
+diff --git a/ffsubsync/ffsubsync_gui.py b/ffsubsync/ffsubsync_gui.py
+index a8c7ba1..b29607c 100755
+--- a/ffsubsync/ffsubsync_gui.py
++++ b/ffsubsync/ffsubsync_gui.py
+@@ -1,5 +1,5 @@
+ #!/usr/bin/env python
+-# -*- coding: future_annotations -*-
++from __future__ import annotations
+ import logging
+ import os
+ import sys
+diff --git a/ffsubsync/file_utils.py b/ffsubsync/file_utils.py
+index cfb3867..2aa7a9a 100644
+--- a/ffsubsync/file_utils.py
++++ b/ffsubsync/file_utils.py
+@@ -1,4 +1,4 @@
+-# -*- coding: future_annotations -*- 
++from __future__ import annotations 
+ import six
+ import sys
+ 
+diff --git a/ffsubsync/generic_subtitles.py b/ffsubsync/generic_subtitles.py
+index 65c3729..a293eab 100644
+--- a/ffsubsync/generic_subtitles.py
++++ b/ffsubsync/generic_subtitles.py
+@@ -1,4 +1,4 @@
+-# -*- coding: future_annotations -*-
++from __future__ import annotations
+ import copy
+ from datetime import timedelta
+ import logging
+diff --git a/ffsubsync/sklearn_shim.py b/ffsubsync/sklearn_shim.py
+index d127e6a..f9d060d 100644
+--- a/ffsubsync/sklearn_shim.py
++++ b/ffsubsync/sklearn_shim.py
+@@ -1,4 +1,4 @@
+-# -*- coding: future_annotations -*-
++from __future__ import annotations
+ """
+ This module borrows and adapts `Pipeline` from `sklearn.pipeline` and
+ `TransformerMixin` from `sklearn.base` in the scikit-learn framework
+diff --git a/ffsubsync/speech_transformers.py b/ffsubsync/speech_transformers.py
+index 21a042a..ead16de 100644
+--- a/ffsubsync/speech_transformers.py
++++ b/ffsubsync/speech_transformers.py
+@@ -1,4 +1,4 @@
+-# -*- coding: future_annotations -*-
++from __future__ import annotations
+ from contextlib import contextmanager
+ import logging
+ import io
+diff --git a/ffsubsync/subtitle_parser.py b/ffsubsync/subtitle_parser.py
+index 92a01db..74a7b5b 100755
+--- a/ffsubsync/subtitle_parser.py
++++ b/ffsubsync/subtitle_parser.py
+@@ -1,4 +1,4 @@
+-# -*- coding: future_annotations -*-
++from __future__ import annotations
+ from datetime import timedelta
+ import logging
+ from typing import TYPE_CHECKING
+diff --git a/ffsubsync/subtitle_transformers.py b/ffsubsync/subtitle_transformers.py
+index fbb498b..f18151d 100644
+--- a/ffsubsync/subtitle_transformers.py
++++ b/ffsubsync/subtitle_transformers.py
+@@ -1,4 +1,4 @@
+-# -*- coding: future_annotations -*-
++from __future__ import annotations
+ from datetime import timedelta
+ import logging
+ import numbers
+diff --git a/ffsubsync/version.py b/ffsubsync/version.py
+index fadd2c7..ef01e83 100644
+--- a/ffsubsync/version.py
++++ b/ffsubsync/version.py
+@@ -1,4 +1,4 @@
+-# -*- coding: future_annotations -*-
++from __future__ import annotations
+ import os
+ from ffsubsync.constants import SUBSYNC_RESOURCES_ENV_MAGIC
+ from ffsubsync._version import get_versions
+diff --git a/tests/test_alignment.py b/tests/test_alignment.py
+index 13d60d0..9aa476e 100644
+--- a/tests/test_alignment.py
++++ b/tests/test_alignment.py
+@@ -1,4 +1,4 @@
+-# -*- coding: future_annotations -*- 
++from __future__ import annotations 
+ import pytest
+ from ffsubsync.aligners import FFTAligner, MaxScoreAligner
+ 
+diff --git a/tests/test_integration.py b/tests/test_integration.py
+index dd470a5..7f36769 100644
+--- a/tests/test_integration.py
++++ b/tests/test_integration.py
+@@ -1,4 +1,4 @@
+-# -*- coding: future_annotations -*-
++from __future__ import annotations
+ 
+ import filecmp
+ import os
+diff --git a/tests/test_misc.py b/tests/test_misc.py
+index 135f4ae..3168493 100644
+--- a/tests/test_misc.py
++++ b/tests/test_misc.py
+@@ -1,4 +1,4 @@
+-# -*- coding: future_annotations -*-
++from __future__ import annotations
+ import pytest
+ from ffsubsync.version import make_version_tuple
+ 
+diff --git a/tests/test_subtitles.py b/tests/test_subtitles.py
+index ae6f42b..29ffa21 100644
+--- a/tests/test_subtitles.py
++++ b/tests/test_subtitles.py
+@@ -1,4 +1,4 @@
+-# -*- coding: future_annotations -*- 
++from __future__ import annotations 
+ import itertools
+ from io import BytesIO
+ from datetime import timedelta
diff --git a/media-video/jellyfin-media-player/Manifest b/media-video/jellyfin-media-player/Manifest
index 18935d4911..80d47935da 100644
--- a/media-video/jellyfin-media-player/Manifest
+++ b/media-video/jellyfin-media-player/Manifest
@@ -1 +1,2 @@
 DIST jellyfin-media-player-1.6.0.deb 35572220 BLAKE2B 098de5c0df97a4274ab7e1a335c88f9eb96b2fae093233f9a967a1ba9c1ffc63d7cc86d30d4ee818052b483d6ce9b3598103b864294c928d0e2272e0a6b16754 SHA512 b0f4f3657ed0b00206c8b1b9ae4a23572b72d8951c8c4630ceee0b7b350ab74f82f661f3a1c566ff057ea78d94f95b8f8dca65245ffed553fdd3552f6a796172
+DIST jellyfin-media-player-1.6.1.deb 35587804 BLAKE2B d21427396f8a3e31036b26a6cd1311fbfa0f3b421ed2d9510cfd4473937c03fc73717c12922287a73340e641f65f90158538b0d4b8f3b23a2771b0cac5709599 SHA512 e08013c5316bb234dae859859f7eed88c5817c6898ff92ff8c011ccbe7e0fa834ee932361225ba7fa0913df0592f0ae87085323b9ea4ee6cc10a6e69bc49db88
diff --git a/media-video/jellyfin-media-player/jellyfin-media-player-1.6.1.ebuild b/media-video/jellyfin-media-player/jellyfin-media-player-1.6.1.ebuild
new file mode 100644
index 0000000000..a81487fd44
--- /dev/null
+++ b/media-video/jellyfin-media-player/jellyfin-media-player-1.6.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 xdg unpacker
+
+MY_PV="${PV}-1"
+
+DESCRIPTION="Jellyfin Desktop Client based on Plex Media Player"
+HOMEPAGE="https://github.com/jellyfin/jellyfin-media-player"
+SRC_URI="https://github.com/jellyfin/${PN}/releases/download/v${PV}/${PN}_${MY_PV}_amd64-groovy.deb -> ${P}.deb"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-libs/libcec
+	dev-qt/qtdbus
+	dev-qt/qtquickcontrols2
+	dev-qt/qtwebchannel
+	dev-qt/qtwebengine
+	dev-qt/qtx11extras
+	dev-qt/qtxml
+	media-libs/libsdl2
+	media-video/mpv[libmpv]
+"
+
+QA_PREBUILT=".*"
+
+S="${WORKDIR}"
+
+src_install() {
+	doins -r usr
+	fperms +x /usr/bin/jellyfinmediaplayer
+	rm -r "${ED}"/usr/share/doc/ || die
+}
diff --git a/media-video/jellyfin-mpv-shim/Manifest b/media-video/jellyfin-mpv-shim/Manifest
deleted file mode 100644
index 293f6caff6..0000000000
--- a/media-video/jellyfin-mpv-shim/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST jellyfin-mpv-shim-2.0.1.tar.gz 1493065 BLAKE2B 69f5bdef06b0e4cf075c209c0177aa886e00416e3d2504e876893b1e71683d2ec674a325105202fcd3d8f245b8f1998a45fc8d6d535dff16c9ad2d034fb81c0b SHA512 ff4398c590fa7fb7fbf09a1079872ab9e0a9603d451f5e6eb527ea975367f19cc2e446fef7ffc03d2f95e7b0b1ec3289fd5d3914c2b1c4032655efd1459030c0
diff --git a/media-video/jellyfin-mpv-shim/jellyfin-mpv-shim-2.0.1.ebuild b/media-video/jellyfin-mpv-shim/jellyfin-mpv-shim-2.0.1.ebuild
deleted file mode 100644
index d162db33c5..0000000000
--- a/media-video/jellyfin-mpv-shim/jellyfin-mpv-shim-2.0.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-PYTHON_REQ_USE="tk"
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="MPV Cast Client for Jellyfin"
-HOMEPAGE="https://github.com/jellyfin/jellyfin-mpv-shim"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3+ MIT Unlicense"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="
-	$(python_gen_cond_dep '
-		dev-python/python-mpv[${PYTHON_USEDEP}]
-		>=dev-python/jellyfin-apiclient-python-1.7.2[${PYTHON_USEDEP}]
-		>=dev-python/python-mpv-jsonipc-1.1.9[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-	')
-"
-RDEPEND="
-	${DEPEND}
-	dev-libs/libappindicator:3=
-	$(python_gen_cond_dep '
-		dev-python/flask[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pystray[${PYTHON_USEDEP}]
-		>=dev-python/pywebview-3.3.1[${PYTHON_USEDEP}]
-		dev-python/werkzeug[${PYTHON_USEDEP}]
-	')
-"
diff --git a/media-video/jellyfin-mpv-shim/metadata.xml b/media-video/jellyfin-mpv-shim/metadata.xml
deleted file mode 100644
index cd174bd3ef..0000000000
--- a/media-video/jellyfin-mpv-shim/metadata.xml
+++ /dev/null
@@ -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>telans@posteo.de</email>
-        <name>James Beddek</name>
-    </maintainer>
-</pkgmetadata>
diff --git a/net-im/go-sendxmpp/Manifest b/net-im/go-sendxmpp/Manifest
index adf4638930..1d693828da 100644
--- a/net-im/go-sendxmpp/Manifest
+++ b/net-im/go-sendxmpp/Manifest
@@ -1,5 +1,21 @@
+DIST github.com%2Fgabriel-vasile%2Fmimetype%2F@v%2Fv1.3.1.mod 112 BLAKE2B 7689b22d45c4abe01628ae0f52e58cfac6e21706443bc82c10562051a973bdd9177dbe91b714e91f6e4c85099d4a2bbf265fc245bddbd8a7b526f1f9a977a58d SHA512 7d15653e7e944a3b7abe4b28e24224b43503c94ee270f93f1eff721be0072169994c4ce725f7508d3a7192fe9e76bb6accbdccd36f4d5508dce18055aacc8bfd
+DIST github.com%2Fgabriel-vasile%2Fmimetype%2F@v%2Fv1.3.1.zip 24879539 BLAKE2B 58e9be32bbdd4a9b4aa8f8b12ea824947eec15f34dd04d0bf98116e8a5e533b46fb38c73338bb4539421fd091539642fbdb794c220ad74b7ac7afbc6b99bab2b SHA512 bddd76bacb609d8b83ab70bd18c3d1d2f138d34cf6dced7f2e898ce5fc860fd6d62884b961d60a5e981092eacb04057c9d4016618624397390191736687b45aa
 DIST github.com%2Fmattn%2Fgo-xmpp%2F@v%2Fv0.0.0-20200309091041-899ef71e80d2.mod 32 BLAKE2B bb6ee50a0e4b439bb0c8ea35961567768bcae1957e6e7d9d4b78f4a91bcecaf8c9d5624de322eb45ef748105368e1fe38034a708101dca295168e6adf79f9193 SHA512 c167f2bd42e1fd473d58dc74fdcfcaf12a53133995a513fef5e08841ced5f9de07ec911f617d49501a235e8349b07b6625f4f80464fa439beb28586951227e50
 DIST github.com%2Fmattn%2Fgo-xmpp%2F@v%2Fv0.0.0-20200309091041-899ef71e80d2.zip 18709 BLAKE2B 8577068c5d92982672aadf4a0281fa934989199c8946046c09c75d33fa297a4a680624aea37437f7835486c1efdc0e27475986e45e65164bd0e28b712a746d94 SHA512 74f64f361670ece0d94d6485e951f2e9fd46b7bfea92cae5d1958007d56033e358f1f83bd390008552cf12a6977c44f5f3b75cd7efbfb61efe6fc5d9528bab60
+DIST github.com%2Fmattn%2Fgo-xmpp%2F@v%2Fv0.0.0-20210723025538-3871461df959.mod 32 BLAKE2B bb6ee50a0e4b439bb0c8ea35961567768bcae1957e6e7d9d4b78f4a91bcecaf8c9d5624de322eb45ef748105368e1fe38034a708101dca295168e6adf79f9193 SHA512 c167f2bd42e1fd473d58dc74fdcfcaf12a53133995a513fef5e08841ced5f9de07ec911f617d49501a235e8349b07b6625f4f80464fa439beb28586951227e50
+DIST github.com%2Fmattn%2Fgo-xmpp%2F@v%2Fv0.0.0-20210723025538-3871461df959.zip 20309 BLAKE2B 5f57ec5e51a4f6c016b00f25de10d180a35d6644876fffa11bcbb2b20d6ebd854afd57eb2323bb146d6fc61bb0dcb80c040848089c5e8667b675c1bfd2e48471 SHA512 a2ab930fe2f3356b4b61245a920db233a929a19f562750f075b5e11089bca6f71ee44214d7af91f80fc78461e5a93b10aa45a7db684c67b454ec67ca0fb56cef
 DIST github.com%2Fpborman%2Fgetopt%2F@v%2Fv0.0.0-20190409184431-ee0cd42419d3.mod 33 BLAKE2B 00f9f8e688d302c27f668e5d5f943b1cc058e090d7e2d32e70d56a9782f7cb3c62a4dc399d3cf97321a07702d3fdf170dec82175b8f0af3865fa3e261d982772 SHA512 20529318383fec61da3ad57a44f1b1d21011b6db36d5f04ba7ef7008a722724a09bda8d706166620ca3e346cd42c295b1c698d650d5549bef8173546288702d7
 DIST github.com%2Fpborman%2Fgetopt%2F@v%2Fv0.0.0-20190409184431-ee0cd42419d3.zip 81903 BLAKE2B 884525ed9223c8c2257a9211386023342e11c31ae47ff5379f9b4da27b79f76e8b7224b6306da99372c31eae19b7c471318c3dc771da75d07ee47d3861958420 SHA512 92238084eec7c35c43aa23c5b49eb47e47fa7de69ddcd2030d425f1c679e6b1acdadd8fc9d68c9001082e913bb179e44774dd6d3f5177c0ec17a10e4f01ac3ab
+DIST github.com%2Fpborman%2Fgetopt%2Fv2%2F@v%2Fv2.1.0.mod 45 BLAKE2B 5271e906de3f986c13185a62ca783ae1f7ba4b2d88669040fdccedce8af496b7595a5757d75b2a20198818c7eaa01f37471b0ed6b9793965e4d23858c51ba75e SHA512 9990e84cffa9777543bdce26e4348a827ec7b236890cbe46b218e97da0c9dd35d4a2322ce33f8d3f1a237c312b9e4c4a76af3dcac8f02ede68b3172d473a38b3
+DIST github.com%2Fpborman%2Fgetopt%2Fv2%2F@v%2Fv2.1.0.zip 36834 BLAKE2B 79f103ff1bdb4953621341ebc194e61e44750fff6548b0986d429ea50e1e7556fd87b12177c2a4576b354ba321750719d8562e5dacd420faa162a69d5241159c SHA512 00bc26e4c904c4e77855c495c3e2718605268b7f431166e02ea3244fe7c30436d7b82428c1ad4a346440f688c7ccdaa6ab4ee0643c7ec61f6aca08fc783b027e
+DIST go-sendxmpp-0.1.1.tar.bz2 915976 BLAKE2B 30cf381d369ede8825f4b3d4224f9ea9da55905caeab8742c42667b0bed4ac39470a49a66612c909662731dc10624e5287cea6b913888cc1667d340c636665f7 SHA512 8e5105de517912d7b2292840000d7da1bc10d8389b01c993cbd0c2f1f0f80982865958204e92b0d13fedeb11ba0da82b405b6f48023120bb7e0beafab541294c
 DIST go-sendxmpp-0_pre20200423.tar.bz2 34808 BLAKE2B 04756049f73c36421fa540f25994a305f3c193ab4f2bfb87ac9e27524ac527a2e71391c7aa11a323518b51c664683264b0e0bfc5ce80ed1c243bddc2681a8c9a SHA512 545774f827ff0f8d0ecc583aad9298a173511888a0c285d28d7d5c59764a319fdbe8c34aee36b900de290a3de78cdefc8dd3a12a37c54f8d6079b302a3dd6b9b
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210505024714-0287a6fb4125.mod 179 BLAKE2B a505fef7e073e6305a5a8b8c3494942da61a944af095abe6caa2774152b7427437d74405967eeb6b38b114a14f0e09e72d00de2a6eba1f4694293a08daaa826b SHA512 a1c24164598eb8a5e5005b0df0cf9b3efd285c90efe6472a0474907f368166c243942765f182d8cc65f23159cd0a8b52c547ab14ee67c4261f768e31d05ed5e5
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210505024714-0287a6fb4125.zip 1562577 BLAKE2B be084b9db5b7601d516d4e461e93b188b9238df70eb64e67b7286aa6c2ae4dc41963b592891f550e722e3a51bb77e14933cff571675ad99f71616ab8e91398f6 SHA512 5c6276225544403e3d96a991d6f1e9c87fc993b5c00f74e948234cb18a1e8b4eca5b22cfc4a6b260195a702b9d61f9fa9a20a339ea1853973ee5aeb3945d3947
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210908191846-a5e095526f91.mod 179 BLAKE2B a505fef7e073e6305a5a8b8c3494942da61a944af095abe6caa2774152b7427437d74405967eeb6b38b114a14f0e09e72d00de2a6eba1f4694293a08daaa826b SHA512 a1c24164598eb8a5e5005b0df0cf9b3efd285c90efe6472a0474907f368166c243942765f182d8cc65f23159cd0a8b52c547ab14ee67c4261f768e31d05ed5e5
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210908191846-a5e095526f91.zip 1570825 BLAKE2B 8608478f8b64dcfcf6a1d44c9ebf94298e76060495f4b87bc02b220df2ae0cd30930e0c0b89251f57482694598c9a2f2eff10ea52a7e4ad73273b315dc558d06 SHA512 76481c4f4ef6850919e83c9f25fdb7dc23ef9b2159e25776063a4b301d9020acd4de13abd84058eb384617ab43a25ae4477554b54f5838399a5603f7579476cd
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210423082822-04245dca01da.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod 95 BLAKE2B 8385688f2081360fc2694f05d128ff0c587ef131e1b5757a942d9335870200e06545318afb1a7d1f059d060f51fe94fc16a48a1d7ec31a9a83e07b3c93f34ce3 SHA512 a3401e3d20dc1aaaebbf3c296a783668003f2182ed77ec830431f97339e07eda1859fe8c3c7fdfb0125b3ed331d23208519df520f86e20c1a05c822b3d766b08
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
diff --git a/net-im/go-sendxmpp/go-sendxmpp-0.1.1.ebuild b/net-im/go-sendxmpp/go-sendxmpp-0.1.1.ebuild
new file mode 100644
index 0000000000..39249bd318
--- /dev/null
+++ b/net-im/go-sendxmpp/go-sendxmpp-0.1.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+EGO_SUM=(
+	"github.com/gabriel-vasile/mimetype v1.3.1"
+	"github.com/gabriel-vasile/mimetype v1.3.1/go.mod"
+	"github.com/mattn/go-xmpp v0.0.0-20210723025538-3871461df959"
+	"github.com/mattn/go-xmpp v0.0.0-20210723025538-3871461df959/go.mod"
+	"github.com/pborman/getopt/v2 v2.1.0"
+	"github.com/pborman/getopt/v2 v2.1.0/go.mod"
+	"golang.org/x/net v0.0.0-20210505024714-0287a6fb4125"
+	"golang.org/x/net v0.0.0-20210505024714-0287a6fb4125/go.mod"
+	"golang.org/x/net v0.0.0-20210908191846-a5e095526f91"
+	"golang.org/x/net v0.0.0-20210908191846-a5e095526f91/go.mod"
+	"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod"
+	"golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod"
+	"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod"
+	"golang.org/x/text v0.3.6/go.mod"
+	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+)
+go-module_set_globals
+
+DESCRIPTION="A little tool to send messages to an XMPP contact or MUC"
+HOMEPAGE="https://salsa.debian.org/mdosch/go-sendxmpp"
+SRC_URI="
+	https://salsa.debian.org/mdosch/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2 -> ${P}.tar.bz2
+	${EGO_SUM_SRC_URI}
+"
+S="${WORKDIR}/${PN}-v${PV}"
+
+LICENSE="BSD-2 BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
+src_compile() {
+	go build || die
+}
+
+src_install() {
+	default
+
+	dobin go-sendxmpp
+}
diff --git a/net-im/nheko/Manifest b/net-im/nheko/Manifest
index b4ca85359c..66478361d1 100644
--- a/net-im/nheko/Manifest
+++ b/net-im/nheko/Manifest
@@ -1,2 +1,2 @@
-DIST nheko-0.8.1.tar.gz 1176445 BLAKE2B 5ef1523b23b1512d56cd6109f05ec3f710629a561ddf8e766d8f3f3a2d3bdd65d6a83da381f3e53bfbd1ee470243dae8ff488880973dadc166cc82e52d03abbe SHA512 180c876121338ea6d45e85d11a3cfd1f988a084a650becacfa5a9cbb4a556a0f47625194e3d9870bb6692b15d16c5ac75999e241f08a2828ec471b3d64c1eb62
 DIST nheko-0.8.2.tar.gz 1232245 BLAKE2B cb7397a2247c280cac23efe4a5983e43ebe9a6cacbadfdb3798b856633bd9e9c1ac1c56750373817373691d5d3624aec815040743d44c60dcb900f8616498d8f SHA512 907b5fd770c2e451ee4d5a4483810cf87529f643d584784b2f3c471b54229243842313206bbd38c8b6ca9a91bf505b683d6741bdce8ea24407ae4178da579465
+DIST nheko-0.9.0_pre20211003.tar.gz 1378662 BLAKE2B 84c1a0cc49b2f230e80e79bcf2681d4395d43bae521d8c5f38df06788fb93633e0a70db2a6df9cc0a72b94d0d40cea72a559a93edcc1c0f248c17ffd27d2d278 SHA512 be5f16ec446d1ab373bcc19afae1f2f1b90d701403c19e47ee172a716606640f8af7135f614aa6a8a913b9a864ce77af41ee5ae8270eaf40a3fc8a1797726920
diff --git a/net-im/nheko/metadata.xml b/net-im/nheko/metadata.xml
index 4a3f8ed7d4..3da1318332 100644
--- a/net-im/nheko/metadata.xml
+++ b/net-im/nheko/metadata.xml
@@ -8,4 +8,8 @@
 	<upstream>
 		<remote-id type="github">Nheko-Reborn/nheko</remote-id>
 	</upstream>
+	<use>
+		<flag name="video">Enables video calls</flag>
+		<flag name="voip">Enables audio calls</flag>
+	</use>
 </pkgmetadata>
diff --git a/net-im/nheko/nheko-0.8.1.ebuild b/net-im/nheko/nheko-0.8.1.ebuild
deleted file mode 100644
index e89aaaa6d7..0000000000
--- a/net-im/nheko/nheko-0.8.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg
-
-DESCRIPTION="Desktop client for Matrix using Qt and C++14"
-HOMEPAGE="https://github.com/Nheko-Reborn/nheko"
-SRC_URI="https://github.com/Nheko-Reborn/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtmultimedia:5[gstreamer,qml]
-	dev-qt/qtquickcontrols2:5
-	dev-qt/qtgraphicaleffects:5
-	dev-qt/qtsvg:5
-	dev-qt/qtconcurrent:5
-	app-text/cmark
-	<dev-libs/mtxclient-0.5.0
-	dev-cpp/nlohmann_json
-	dev-libs/qtkeychain
-"
-DEPEND="
-	${RDEPEND}
-	dev-libs/spdlog
-	dev-libs/tweeny
-	<dev-db/lmdb++-1.0.0
-"
-BDEPEND="dev-qt/linguist-tools:5"
-
-src_prepare() {
-	cmake_src_prepare
-	xdg_src_prepare
-}
-
-# # Preparation for when gstreamer >= 1.18 lands in ::gentoo.
-# MY_GSTREAMER_V="1.18"
-#
-#	voip? (
-#		>=media-libs/gstreamer-${MY_GSTREAMER_V}
-#		>=media-plugins/gst-plugins-meta-${MY_GSTREAMER_V}[opus,vpx]
-#		>=media-libs/gst-plugins-base-${MY_GSTREAMER_V}[opengl]
-#		>=media-libs/gst-plugins-good-${MY_GSTREAMER_V}
-#		>=media-libs/gst-plugins-bad-${MY_GSTREAMER_V}
-#		>=media-plugins/gst-plugins-dtls-${MY_GSTREAMER_V}
-#		>=media-plugins/gst-plugins-srtp-${MY_GSTREAMER_V}
-#		>=media-plugins/gst-plugins-webrtc-${MY_GSTREAMER_V}
-#		net-libs/libnice
-#	)
diff --git a/net-im/nheko/nheko-0.8.2.ebuild b/net-im/nheko/nheko-0.8.2.ebuild
deleted file mode 100644
index 462407d6a1..0000000000
--- a/net-im/nheko/nheko-0.8.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg
-
-DESCRIPTION="Desktop client for Matrix using Qt and C++14"
-HOMEPAGE="https://github.com/Nheko-Reborn/nheko"
-SRC_URI="https://github.com/Nheko-Reborn/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtmultimedia:5[gstreamer,qml]
-	dev-qt/qtquickcontrols2:5
-	dev-qt/qtgraphicaleffects:5
-	dev-qt/qtsvg:5
-	dev-qt/qtconcurrent:5
-	app-text/cmark
-	>=dev-libs/mtxclient-0.5.1
-	dev-cpp/nlohmann_json
-	dev-libs/qtkeychain
-"
-DEPEND="
-	${RDEPEND}
-	dev-libs/spdlog
-	>=dev-db/lmdb++-1.0.0
-"
-BDEPEND="dev-qt/linguist-tools:5"
-
-src_prepare() {
-	cmake_src_prepare
-	xdg_src_prepare
-}
-
-# # Preparation for when gstreamer >= 1.18 lands in ::gentoo.
-# MY_GSTREAMER_V="1.18"
-#
-#	voip? (
-#		>=media-libs/gstreamer-${MY_GSTREAMER_V}
-#		>=media-plugins/gst-plugins-meta-${MY_GSTREAMER_V}[opus,vpx]
-#		>=media-libs/gst-plugins-base-${MY_GSTREAMER_V}[opengl]
-#		>=media-libs/gst-plugins-good-${MY_GSTREAMER_V}
-#		>=media-libs/gst-plugins-bad-${MY_GSTREAMER_V}
-#		>=media-plugins/gst-plugins-dtls-${MY_GSTREAMER_V}
-#		>=media-plugins/gst-plugins-srtp-${MY_GSTREAMER_V}
-#		>=media-plugins/gst-plugins-webrtc-${MY_GSTREAMER_V}
-#		net-libs/libnice
-#	)
diff --git a/net-im/nheko/nheko-0.9.0_pre20211003.ebuild b/net-im/nheko/nheko-0.9.0_pre20211003.ebuild
new file mode 100644
index 0000000000..c214fa70f0
--- /dev/null
+++ b/net-im/nheko/nheko-0.9.0_pre20211003.ebuild
@@ -0,0 +1,57 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg
+
+MY_COMMIT="c43c2bd4b9481f761e9f1b16453f0e7f5b1beabe"
+DESCRIPTION="Desktop client for Matrix using Qt and C++14"
+HOMEPAGE="https://github.com/Nheko-Reborn/nheko"
+SRC_URI="https://github.com/Nheko-Reborn/${PN}/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_COMMIT}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="video voip"
+REQUIRED_USE="video? ( voip )"
+
+MY_GST_V="1.18"
+RDEPEND="
+	app-text/cmark
+	>=dev-db/lmdb++-1.0.0
+	>=dev-libs/mtxclient-0.5.2_pre20210916
+	>=dev-libs/qtkeychain-0.12.0
+	dev-libs/spdlog
+	dev-qt/qtconcurrent:5
+	dev-qt/qtgraphicaleffects:5
+	dev-qt/qtmultimedia:5[qml]
+	dev-qt/qtquickcontrols2:5
+	dev-qt/qtsvg:5
+	voip? (
+		dev-qt/qtmultimedia:5[gstreamer]
+		>=media-plugins/gst-plugins-dtls-${MY_GST_V}
+		>=media-plugins/gst-plugins-meta-${MY_GST_V}[opus]
+		>=media-plugins/gst-plugins-srtp-${MY_GST_V}
+		>=media-plugins/gst-plugins-webrtc-${MY_GST_V}
+		video? (
+			>=media-libs/gst-plugins-base-${MY_GST_V}[opengl]
+			>=media-plugins/gst-plugins-meta-${MY_GST_V}[v4l,vpx]
+			>=media-plugins/gst-plugins-qt5-${MY_GST_V}
+			>=media-plugins/gst-plugins-ximagesrc-${MY_GST_V}
+			x11-libs/xcb-util-wm
+		)
+	)
+"
+DEPEND="
+	dev-cpp/nlohmann_json
+	${RDEPEND}
+"
+BDEPEND="dev-qt/linguist-tools:5"
+
+src_prepare() {
+	use voip || sed -i '/^pkg_check_modules(GSTREAMER/d' CMakeLists.txt || die
+
+	cmake_src_prepare
+}
diff --git a/net-misc/wayback_machine_downloader/Manifest b/net-misc/wayback_machine_downloader/Manifest
index 0a742dec40..5288839a4f 100644
--- a/net-misc/wayback_machine_downloader/Manifest
+++ b/net-misc/wayback_machine_downloader/Manifest
@@ -1 +1,2 @@
 DIST wayback_machine_downloader-2.3.0.gem 10752 BLAKE2B 6f6feeca8871800b5299da982ee24ce070fdf80075996a2c18bd7d20a8231c5ca195367d34fc2e2893c664c480aa4ae9876a594b319248c74fbb8aa8cd28e04f SHA512 f3723b9cb32473f14bfae4dd2fcd3b2470710ec34690ae93e4c66c6146eaa626e7e1275098895e74dfb0b30a12b1f567a89b4fdc5496b6eaaf52de8ff0ddbd44
+DIST wayback_machine_downloader-2.3.1.gem 10752 BLAKE2B a368d528fe9f0f09ccd6a34f10990239a2e162b092862d3212989103e7e9e4838bf9466705cdfb43ffda53eb18b47d49a18d56b28f7a3103855e24396d17a47e SHA512 382a2646323554d1409594bcb447b25459d37bb9bb6675f77db94304936cb8ebfa1d3492a81acbc59a192d1d676ee8b076e0ca5e0ebdfb1b3f2ae2fdddab0635
diff --git a/net-misc/wayback_machine_downloader/wayback_machine_downloader-2.3.1.ebuild b/net-misc/wayback_machine_downloader/wayback_machine_downloader-2.3.1.ebuild
new file mode 100644
index 0000000000..c8c52a93bb
--- /dev/null
+++ b/net-misc/wayback_machine_downloader/wayback_machine_downloader-2.3.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27 ruby30"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Download an entire website from the Wayback Machine"
+HOMEPAGE="https://github.com/hartator/wayback-machine-downloader"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="test"
+PROPERTIES="test_network"
diff --git a/net-misc/xmrig-mo/Manifest b/net-misc/xmrig-mo/Manifest
deleted file mode 100644
index 007797c1ec..0000000000
--- a/net-misc/xmrig-mo/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST xmrig-mo-6.12.1-mo2.tar.gz 1684464 BLAKE2B 76422786292a59fb2cd47cb5e84a21b273fa901ca599c50571f9aab5c0c951b7525da65119402eaadbce05434d98fdaed4d429fce4f27ece614ed9100872c440 SHA512 f37d3e74705cb9f2b11d341f81c1917ca51fe2dc2d6294b901637f55239620ecc8068def08ffc4bdc8a534889c11624b06fc3293b184e045e3d9d18b779786c1
diff --git a/net-misc/xmrig-mo/metadata.xml b/net-misc/xmrig-mo/metadata.xml
deleted file mode 100644
index aa4c1e6f95..0000000000
--- a/net-misc/xmrig-mo/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>telans@posteo.de</email>
-    <name>James Beddek</name>
-  </maintainer>
-  <longdescription lang="en">
-    XMRig High performance, open source, cross platform RandomX,
-    CryptoNight, AstroBWT and Argon2 CPU/GPU miner. Algorithm switching,
-    when used with the MoneroOcean mining pool.
-  </longdescription>
-  <upstream>
-    <remote-id type="github">MoneroOcean/xmrig</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/net-misc/xmrig-mo/xmrig-mo-6.12.1.ebuild b/net-misc/xmrig-mo/xmrig-mo-6.12.1.ebuild
deleted file mode 100644
index 887bcedc3d..0000000000
--- a/net-misc/xmrig-mo/xmrig-mo-6.12.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake optfeature
-
-MO_PV="mo2"
-DESCRIPTION="RandomX, CryptoNight, KawPow, AstroBWT and Argon2 miner for the MoneroOcean pool"
-HOMEPAGE="https://moneroocean.stream/ https://github.com/MoneroOcean/xmrig"
-SRC_URI="https://github.com/MoneroOcean/xmrig/archive/v${PV}-${MO_PV}.tar.gz -> ${P}-${MO_PV}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="+ssl"
-
-DEPEND="
-	dev-libs/libuv:=
-	sys-apps/hwloc:=
-	ssl? ( dev-libs/openssl:= )
-"
-
-S="${WORKDIR}/xmrig-${PV}-${MO_PV}"
-
-src_prepare() {
-	cmake_src_prepare
-	sed -i '/notls/d' cmake/OpenSSL.cmake || die
-	sed -i 's/1;/0;/g' src/donate.h || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		# TODO: Create expanded USE flag for all of the PoW algos.
-		-DWITH_TLS=$(usex ssl)
-		# TODO: opencl USE flag.
-		-DWITH_OPENCL=OFF
-		# TODO: cuda USE flag.
-		-DWITH_CUDA=OFF
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	newbin "${BUILD_DIR}/xmrig" xmrig-mo
-	dodoc -r doc/*.md
-	einstalldocs
-}
-
-pkg_postinst() {
-	elog "Increase the vm.nr_hugepages sysctl value so that XMRig can allocate with huge pages."
-	elog "XMRig-MoneroOcean has been installed as /usr/bin/xmrig-mo"
-	elog "in order to differentiate between the original XMRig"
-	optfeature "CPU specific performance tweaks" sys-apps/msr-tools
-}
diff --git a/profiles/categories b/profiles/categories
index f52870fe68..b099bef949 100644
--- a/profiles/categories
+++ b/profiles/categories
@@ -1,3 +1 @@
-dev-dotnet
-dev-js
 dev-R
diff --git a/profiles/package.use.mask b/profiles/package.use.mask
index 29315e71e8..209a2960be 100644
--- a/profiles/package.use.mask
+++ b/profiles/package.use.mask
@@ -37,3 +37,13 @@ sys-cluster/nanox gasnet
 # https://github.com/bsc-performance-tools/extrae/issues/30
 # https://github.com/bsc-performance-tools/extrae/issues/38
 sys-cluster/extrae dyninst
+
+# Alessandro Barbieri <lssndrbarbieri@gmail.com> (2021-10-01)
+# can't locate MPI cxx headers
+# https://public.gitlab.polimi.it/DAER/mbdyn/-/issues/91
+sci-physics/mbdyn mpi
+
+# Alessandro Barbieri <lssndrbarbieri@gmail.com> (2021-10-01)
+# superlu renamed some files
+# https://public.gitlab.polimi.it/DAER/mbdyn/-/issues/97
+sci-physics/mbdyn superlu
diff --git a/sci-libs/ensmallen/Manifest b/sci-libs/ensmallen/Manifest
index d74da89b97..f69c4c39a2 100644
--- a/sci-libs/ensmallen/Manifest
+++ b/sci-libs/ensmallen/Manifest
@@ -1,5 +1,2 @@
-DIST ensmallen-2.14.2.tar.gz 1262697 BLAKE2B c3ecd10271a476cdb03de0a74dd1e7d250273481b540d9cadb44ff7292cdb1f4abbefaf7c1a90bd33c68928f766db8afafd45f253735a36de9def6ab222597bb SHA512 9f29d70f66748d6131b44fc2a580e9fc07131a3aeecaa9f6113fd635eaff8b52db90e487a389393a1976dcccb8c1f5850ea50e03308af90b58ba1c12fde2bd21
-DIST ensmallen-2.15.0.tar.gz 1266409 BLAKE2B 379ea897d3b29440e89d65cb60c65dca3c34a530dd8a4cee321349d177455b020d4aa19ee1e701b46a325a8f56028c236ab80b0383bee84018952034106f7161 SHA512 7e8ea0d64788287e58ee14e922c81c18e1804a23dba3d144fe6e66de8a81dfd3755c9f36a1e8a480aa6e15f0f7b1ff886e0aeecde0be35993db0ba69ca7e12e0
-DIST ensmallen-2.15.1.tar.gz 1266496 BLAKE2B 7ff803207c59be03fa47e7fddafb49176d307fbea89f5688bd591898fb36d7d8ee018dec933b59a06063dc6c2a7117d3ec0d330cd37d475e4f387528f2d86f6a SHA512 4f0cda1ad0d02e823042fb6af03635677e3d5cac28f7f13fab20fc7f4b3d7fbe1b182777c573187a403eff5e5fd7e1e577e290a4b624a9c2a71cbfd347e14afa
-DIST ensmallen-2.16.0.tar.gz 1264948 BLAKE2B a58de7e7d8aa88988b08d76c2a5746daf9074ccc39bc8df9d21b61d745741d6521922b578e01b60e0d1657f84f377f411172a01d50bbcd30cca7142da0baeb7b SHA512 39afc19936710d5595218292f5d6a055b4f644ca157f9fc2329fb18b71318b9f613dc26169921e1fda3dd949d06847dee4f09f13c1902a92e38826e122c1adc5
 DIST ensmallen-2.16.2.tar.gz 1294240 BLAKE2B b388f2c99f289dd20f6d94b5b185d872abc553637c6081ea3a80a3c82ce9ac8b1327496bf3eae6dc5cbf5f4ae12a9fd1e8ccf9c296007f9af9cbfc7560cd0301 SHA512 290932f8e423be7c57d8ba38783a29798df52a7505ded7683f969fa30391398edcca584daca1b1c42977f06180a802d4c3640a9ec24cd787a3914723e4eb6f8d
+DIST ensmallen-2.17.0.tar.gz 1318322 BLAKE2B cb74a3bc0118c9e702cc7e4d17326f12df45d5fadc63c8881c5dd2b9a79b004189369e1c7fcb2fc84e0bf7331da3937bffdf75b982de52314487f25191053164 SHA512 49dff47d50beabc74c0eb045f0e995348bc1cc022596de1780cad3e8fc6e6ef6cf97fb23f22c78a0662c377c1dd53d087df799d0fa98ebcc97c03c475b67fd07
diff --git a/sci-libs/ensmallen/ensmallen-2.15.0.ebuild b/sci-libs/ensmallen/ensmallen-2.15.0.ebuild
deleted file mode 100644
index bd1c0530b9..0000000000
--- a/sci-libs/ensmallen/ensmallen-2.15.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="header only C++ library for numerical optimization"
-HOMEPAGE="https://ensmallen.org"
-SRC_URI="https://github.com/mlpack/ensmallen/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="openmp test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="sci-libs/armadillo[lapack]"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_OPENMP=$(usex openmp)
-		-DBUILD_TESTS=$(usex test)
-	)
-	cmake_src_configure
-}
diff --git a/sci-libs/ensmallen/ensmallen-2.15.1.ebuild b/sci-libs/ensmallen/ensmallen-2.15.1.ebuild
deleted file mode 100644
index bd1c0530b9..0000000000
--- a/sci-libs/ensmallen/ensmallen-2.15.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="header only C++ library for numerical optimization"
-HOMEPAGE="https://ensmallen.org"
-SRC_URI="https://github.com/mlpack/ensmallen/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="openmp test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="sci-libs/armadillo[lapack]"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_OPENMP=$(usex openmp)
-		-DBUILD_TESTS=$(usex test)
-	)
-	cmake_src_configure
-}
diff --git a/sci-libs/ensmallen/ensmallen-2.16.0.ebuild b/sci-libs/ensmallen/ensmallen-2.16.0.ebuild
deleted file mode 100644
index bd1c0530b9..0000000000
--- a/sci-libs/ensmallen/ensmallen-2.16.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="header only C++ library for numerical optimization"
-HOMEPAGE="https://ensmallen.org"
-SRC_URI="https://github.com/mlpack/ensmallen/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="openmp test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="sci-libs/armadillo[lapack]"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_OPENMP=$(usex openmp)
-		-DBUILD_TESTS=$(usex test)
-	)
-	cmake_src_configure
-}
diff --git a/sci-libs/ensmallen/ensmallen-2.14.2.ebuild b/sci-libs/ensmallen/ensmallen-2.17.0.ebuild
similarity index 98%
rename from sci-libs/ensmallen/ensmallen-2.14.2.ebuild
rename to sci-libs/ensmallen/ensmallen-2.17.0.ebuild
index bd1c0530b9..2dc0d0e834 100644
--- a/sci-libs/ensmallen/ensmallen-2.14.2.ebuild
+++ b/sci-libs/ensmallen/ensmallen-2.17.0.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
 
 inherit cmake
 
diff --git a/sci-physics/mbdyn/Manifest b/sci-physics/mbdyn/Manifest
new file mode 100644
index 0000000000..e4c3170d80
--- /dev/null
+++ b/sci-physics/mbdyn/Manifest
@@ -0,0 +1 @@
+DIST mbdyn-ae57618c4e7b030b59707b8c156a6e2a94a6efd0.tar.bz2 3949822 BLAKE2B 26d27d16173f8f615973c51f7877c87f2e4aef414b9253afacbf6bcc37a5e4b995f4b9de044ed557a9a46d49ed2012e30d253cc6b5f0a1d47cd2cb3d95ca9c77 SHA512 01337f5653300847a2ccf7c332109d1052549d7ba189319630029a9dd8e7a08e06c12b1071d3eea05fafecb393793561b656ad8744d0a3754850a100e8029190
diff --git a/sci-physics/mbdyn/files/mbdyn-octave-no-global-install.patch b/sci-physics/mbdyn/files/mbdyn-octave-no-global-install.patch
new file mode 100644
index 0000000000..340a1458db
--- /dev/null
+++ b/sci-physics/mbdyn/files/mbdyn-octave-no-global-install.patch
@@ -0,0 +1,11 @@
+--- a/utils/Makefile.am	2021-09-05 14:28:23.674273509 +0200
++++ b/utils/Makefile.am	2021-09-05 14:28:56.501524237 +0200
+@@ -336,7 +336,7 @@
+ 	@printf "Octave package file \"%s\" created\n" $(PKG_FILE)
+ 
+ install-exec-local-oct: $(PKG_FILE)
+-	@$(OCTAVE_CLI) -qfHW --eval "pkg install -global $<"
++	@$(OCTAVE_CLI) -qfHW --eval "pkg install -local $<"
+ 	@printf "package \"%s\" installed\n" $(PKG_NAME)
+ else
+ install-exec-local-oct:
diff --git a/sci-physics/mbdyn/files/mbdyn-respect-libtool.patch b/sci-physics/mbdyn/files/mbdyn-respect-libtool.patch
new file mode 100644
index 0000000000..50b93ebf53
--- /dev/null
+++ b/sci-physics/mbdyn/files/mbdyn-respect-libtool.patch
@@ -0,0 +1,14 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -1653,9 +1653,9 @@
+ 		AC_DEFINE(HAVE_LTDL_H,1,[define if you have <ltdl.h>])
+ 		AC_CHECK_LIB(ltdl, lt_dlinit,[have_lt_dlinit=yes],[have_lt_dlinit=no])
+ 		if test $have_lt_dlinit = "yes" ; then
+-			eval `libtool --tag=CC --config|grep '^wl='`
++			eval `$LIBTOOL --tag=CC --config|grep '^wl='`
+ 			LIBS="$LIBS -lltdl"
+-			EXPORT_DYNAMIC_FLAG_SPEC=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
++			EXPORT_DYNAMIC_FLAG_SPEC=`($LIBTOOL --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
+ 			have_runtime_loading=yes
+ 			MODULE_LOADPATH=$libexecdir
+ 		fi
diff --git a/sci-physics/mbdyn/mbdyn-1.7.3_p20210925.ebuild b/sci-physics/mbdyn/mbdyn-1.7.3_p20210925.ebuild
new file mode 100644
index 0000000000..5750bf3dff
--- /dev/null
+++ b/sci-physics/mbdyn/mbdyn-1.7.3_p20210925.ebuild
@@ -0,0 +1,301 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+COMMIT="ae57618c4e7b030b59707b8c156a6e2a94a6efd0"
+MYP="${PN}-${COMMIT}"
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit autotools fortran-2 pam python-single-r1
+
+DESCRIPTION="A general purpose Multibody Dynamics analysis software"
+HOMEPAGE="https://www.mbdyn.org"
+SRC_URI="https://public.gitlab.polimi.it/DAER/mbdyn/-/archive/${COMMIT}/${MYP}.tar.bz2"
+S="${WORKDIR}/${MYP}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+#	mbdyn-module-FMU # needs fmi-library
+#	mbdyn-module-aerodyn # needs aerodyn
+#	mbdyn-module-cudatest # needs cuda
+IUSE_MBDYN_MODULE="
+	mbdyn-module-asynchronous_machine
+	mbdyn-module-autodiff_test
+	mbdyn-module-ballbearing_contact
+	mbdyn-module-bullet
+	mbdyn-module-charm
+	mbdyn-module-constlaw-f90
+	mbdyn-module-constlaw-f95
+	mbdyn-module-constlaw
+	mbdyn-module-cont-contact
+	mbdyn-module-controller
+	mbdyn-module-convtest
+	mbdyn-module-cyclocopter
+	mbdyn-module-damper-gandhi
+	mbdyn-module-damper-graall
+	mbdyn-module-damper-hydraulic
+	mbdyn-module-damper
+	mbdyn-module-diff
+	mbdyn-module-dot
+	mbdyn-module-drive-test
+	mbdyn-module-drive
+	mbdyn-module-dummy
+	mbdyn-module-eu2phi
+	mbdyn-module-fab-electric
+	mbdyn-module-fab-motion
+	mbdyn-module-fab-sbearings
+	mbdyn-module-fabricate
+	mbdyn-module-flightgear
+	mbdyn-module-friction
+	mbdyn-module-friction3
+	mbdyn-module-hfelem
+	mbdyn-module-hid
+	mbdyn-module-hunt-crossley
+	mbdyn-module-hydrodynamic_plain_bearing
+	mbdyn-module-hydrodynamic_plain_bearing2
+	mbdyn-module-imu
+	mbdyn-module-indvel
+	mbdyn-module-inline_friction
+	mbdyn-module-inplane_friction
+	mbdyn-module-journal_bearing
+	mbdyn-module-leapmotion
+	mbdyn-module-loadinc
+	mbdyn-module-marble
+	mbdyn-module-md
+	mbdyn-module-mds
+	mbdyn-module-minmaxdrive
+	mbdyn-module-multi_step_drive
+	mbdyn-module-muscles
+	mbdyn-module-namespace
+	mbdyn-module-nodedistdrive
+	mbdyn-module-nonsmooth-node
+	mbdyn-module-ns
+	mbdyn-module-octave
+	mbdyn-module-randdrive
+	mbdyn-module-rollercoaster
+	mbdyn-module-rotor-loose-coupling
+	mbdyn-module-scalarfunc
+	mbdyn-module-switch_drive
+	mbdyn-module-tclpgin
+	mbdyn-module-template
+	mbdyn-module-template2
+	mbdyn-module-triangular_contact
+	mbdyn-module-udunits
+	mbdyn-module-uni_in_plane
+	mbdyn-module-wheel2
+	mbdyn-module-wheel4
+"
+IUSE="${IUSE_MBDYN_MODULE//_/-} ann arpack autodiff blender boost bullet chaco crypt
+debug eig ginac jdqz +mbc metis mpi multithread-naive netcdf octave openblas
+pam pastix pmpi python qrupdate rt sasl schur sparse superlu taucs tests threads
+udunits +y12"
+
+#	dev-libs/blitz
+RDEPEND="
+	dev-libs/libltdl
+	virtual/blas
+	virtual/lapack
+
+	ann? ( sci-libs/ann )
+	arpack? ( sci-libs/arpack )
+	blender? ( media-gfx/blender:= )
+	boost? ( dev-libs/boost )
+	bullet? ( sci-physics/bullet )
+	chaco? ( sci-mathematics/chaco )
+	crypt? ( virtual/libcrypt )
+	ginac? ( sci-mathematics/ginac )
+	jdqz? ( sci-libs/jdqz )
+	mbdyn-module-damper? ( sci-libs/gsl )
+	mpi? ( virtual/mpi[cxx] )
+	metis? ( sci-libs/metis )
+	netcdf? ( sci-libs/netcdf-cxx:* )
+	octave? ( sci-mathematics/octave )
+	openblas? ( sci-libs/openblas )
+	pam? ( sys-libs/pam )
+	pastix? ( sci-libs/pastix )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]')
+	)
+	qrupdate? ( sci-libs/qrupdate )
+	sasl? ( dev-libs/cyrus-sasl )
+	sparse? (
+		sci-libs/klu
+		sci-libs/umfpack
+	)
+	superlu? ( sci-libs/superlu_mt )
+	taucs? ( sci-libs/taucs )
+	threads? ( dev-libs/libatomic_ops )
+	udunits? ( sci-libs/udunits )
+"
+#	rtai? ( sys-libs/rtai )
+DEPEND="
+	${RDEPEND}
+	blender? ( sys-apps/pkgcore )
+"
+BDEPEND="python? ( dev-lang/swig )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-octave-no-global-install.patch"
+)
+#	"${FILESDIR}/${PN}-respect-libtool.patch"
+REQUIRED_USE="
+	mbdyn-module-bullet? ( bullet )
+	mbdyn-module-octave? ( octave )
+	mbdyn-module-udunits? ( udunits )
+	mbdyn-module-wheel4? ( ginac )
+	multithread-naive? ( threads )
+	pmpi? ( mpi )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	schur? (
+		|| ( chaco metis )
+		mpi
+	)
+"
+#	?? ( rt rtai )
+
+pkg_setup() {
+	fortran-2_pkg_setup
+}
+
+src_prepare() {
+	default
+	eautoreconf
+	#from bootstrap.sh
+	if test -d contrib ; then
+		for i in `find contrib -name 'bootstrap.sh'` ; do
+			dir=`echo "${i}" | sed "s/\(.*\)\/bootstrap\.sh/\1/"`
+			pushd "${dir}" || die
+			eautoreconf
+			popd || die
+		done
+	fi
+}
+
+src_configure() {
+	python_setup
+#	append-cxxflags "-I/usr/include/openmpi/ompi/mpi/cxx/"
+	local myconf=(
+		--disable-static
+		--disable-Werror
+		--enable-runtime-loading
+		--with-lapack
+		--without-charm
+		--without-g2c
+		--without-goto
+		--without-harwell
+		--without-pardiso
+		--without-rtai
+		--without-static-modules
+		--without-strumpack
+		--without-wsmp
+
+		$(use_enable autodiff)
+		$(use_enable crypt)
+		$(use_enable debug)
+		$(use_enable eig)
+		$(use_enable mbc)
+		$(use_enable multithread-naive)
+		$(use_enable netcdf)
+		$(use_enable octave)
+		$(use_enable octave octave-utils)
+		$(use_enable python)
+		$(use_enable schur)
+		$(use_enable tests install_test_progs)
+		$(use_enable threads multithread)
+
+		$(use_with ann)
+		$(use_with arpack)
+		$(use_with boost)
+		$(use_with bullet)
+		$(use_with ginac)
+		$(use_with jdqz)
+		$(use_with metis)
+		$(use_with openblas)
+		$(use_with pam)
+		$(use_with pastix)
+		$(use_with qrupdate)
+		$(use_with rt)
+		$(use_with sasl sasl2)
+		$(use_with sparse klu)
+		$(use_with sparse suitesparseqr)
+		$(use_with sparse umfpack)
+		$(use_with superlu)
+		$(use_with taucs)
+		$(use_with threads)
+		$(use_with y12)
+	)
+
+	if ( use autodiff && use sparse ); then
+		myconf+=( "--enable-sparse-autodiff" )
+	else
+		myconf+=( "--disable-sparse-autodiff" )
+	fi
+	if ( use debug && use mpi ); then
+		myconf+=( "--enable-debug-mpi" )
+	else
+		myconf+=( "--disable-debug-mpi" )
+	fi
+	if use mpi; then
+		if use pmpi; then
+			myconf+=( "--with-mpi=pmpi" )
+		else
+			myconf+=( "--with-mpi" )
+		fi
+	else
+		myconf+=( "--without-mpi" )
+	fi
+
+	declare -A mbdynmodules
+	for m in ${IUSE_MBDYN_MODULE} ; do
+		mbdynmodules[${m//_/-}]="${m/mbdyn-module-/}"
+	done
+
+	local usemodules=""
+	for u in ${IUSE_MBDYN_MODULE//_/-} ; do
+		use ${u} && usemodules+=" ${mbdynmodules[${u}]}"
+	done
+
+	# remove leading whitespace characters
+	usemodules="${usemodules#"${usemodules%%[![:space:]]*}"}"
+
+	myconf+=( "--with-module=\"${usemodules}\"" )
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	mkdir -p "${HOME}/octave" || die
+#	octave --exec "pkg prefix ${T}" || die
+	emake DESTDIR="${D}" install
+
+	if use blender; then
+		local blenderslots="$(pquery -I media-gfx/blender --one-attr slot)"
+		local blenderscriptdir
+		for i in $blenderslots ; do
+			blenderscriptdir="/usr/share/blender/${i}/scripts/"
+			insinto "${blenderscriptdir}"
+			doins -r contrib/blenderandmbdyn
+		done
+	fi
+
+	if use python; then
+		local site="${D}/$(python_get_sitedir)"
+		mkdir -p "${site}" || die
+		mv "${D}/usr/libexec/mbpy" "${site}" || die
+	fi
+
+	use pam && dopamd etc/pam.d/mbdyn
+
+	mkdir -p "${D}/usr/share/octave/mbdyn" || die
+	mv "${D}"/usr/share/octave/*.m "${D}/usr/share/octave/mbdyn" || die
+
+	if use octave; then
+		insinto "/usr/share/octave/mbdyn"
+		doins -r contrib/MLS/.
+	fi
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/sci-physics/mbdyn/metadata.xml b/sci-physics/mbdyn/metadata.xml
new file mode 100644
index 0000000000..58bd967bce
--- /dev/null
+++ b/sci-physics/mbdyn/metadata.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>lssndrbarbieri@gmail.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://public.gitlab.polimi.it/DAER/mbdyn/-/issues</bugs-to>
+	</upstream>
+	<use>
+		<flag name="ann">With ANN<pkg>sci-libs/ann</pkg> support</flag>
+		<flag name="arpack">With <pkg>sci-libs/arpack</pkg> math library</flag>
+		<flag name="autodiff">Enable automatic differentiation in order to compute the Jacobian matrix</flag>
+		<flag name="blender">Install <pkg>media-gfx/blender</pkg> plugins</flag>
+		<flag name="boost">With <pkg>dev-libs/boost</pkg> support</flag>
+		<flag name="bullet">With <pkg>sci-physics/bullet</pkg> support</flag>
+		<flag name="chaco">With <pkg>sci-mathematics/chaco</pkg> model partitioning support</flag>
+		<flag name="crypt">Enable crypt</flag>
+		<flag name="eig">Enable direct eigensolution</flag>
+		<flag name="ginac">With <pkg>sci-mathematics/ginac</pkg> support</flag>
+		<flag name="jdqz">With <pkg>sci-libs/jdqz</pkg> math library</flag>
+		<flag name="mbc">Enable MBC - multibody communication library</flag>
+		<!--<flag name="mbdyn-module-FMU">This is a module to import and cosimulation of FMUs, developed using FMI standards, for MBDyn</flag>-->
+		<!--<flag name="mbdyn-module-aerodyn">This is MBDyn's module for the wind-turbine aerodynamics library AeroDyn</flag>-->
+		<flag name="mbdyn-module-asynchronous-machine">The purpose of this code is the simulation of an asynchronous electrical machine as a part of a multibody model</flag>
+		<flag name="mbdyn-module-autodiff-test">This element implements a inline joint with friction</flag>
+		<flag name="mbdyn-module-ballbearing-contact">ball bearing contact</flag>
+		<flag name="mbdyn-module-bullet"><pkg>sci-physics/bullet</pkg> module</flag>
+		<flag name="mbdyn-module-charm">This module implements a user-defined induced velocity element based on CDI's CHARM free wake</flag>
+		<flag name="mbdyn-module-constlaw-f90">This directory contains an example of run-time loadable constitutive law written in Fortran 90</flag>
+		<flag name="mbdyn-module-constlaw-f95">This directory contains an example of run-time loadable constitutive law written in Fortran 95</flag>
+		<flag name="mbdyn-module-constlaw">This directory contains an example of run-time loadable constitutive law</flag>
+		<flag name="mbdyn-module-cont-contact">continuous contact</flag>
+		<flag name="mbdyn-module-controller">controller module</flag>
+		<flag name="mbdyn-module-convtest">convergence test module</flag>
+		<!--<flag name="mbdyn-module-cudatest"></flag>-->
+		<flag name="mbdyn-module-cyclocopter">This module implements induced velocity models for cycloidal rotors</flag>
+		<flag name="mbdyn-module-damper-gandhi">Gandhi, F. and Chopra, I., "An analytical model for a nonlinear elastomeric lag damper and its effect on aeromechanical stability in hover" Journal of the American Helicopter Society, Vol. 39, 1994, pp. 59-69.</flag>
+		<flag name="mbdyn-module-damper-graall">GRAALL Damper Constitutive Law</flag>
+		<flag name="mbdyn-module-damper-hydraulic">Hydraulic Damper Constitutive Law</flag>
+		<flag name="mbdyn-module-damper">It implements a 1D constitutive law based on a generic nonlinear rheological formula, whose coefficients are computed by means of parameter identification from experimental measurements</flag>
+		<flag name="mbdyn-module-diff">diff drive module</flag>
+		<flag name="mbdyn-module-dot">dot language module</flag>
+		<flag name="mbdyn-module-drive-test">drive test module</flag>
+		<flag name="mbdyn-module-drive">example of run-time loadable drive</flag>
+		<flag name="mbdyn-module-dummy">Dummy module --- does nothing, used to test the infrastructure</flag>
+		<flag name="mbdyn-module-eu2phi">converts three Euler angles into the corresponding Euler vector</flag>
+		<flag name="mbdyn-module-fab-electric">Library of electric components for "digital fabrication" machines</flag>
+		<flag name="mbdyn-module-fab-motion">Library of motion transmission components for "digital fabrication" machines</flag>
+		<flag name="mbdyn-module-fab-sbearings">Library of bearings for "digital fabrication" machines</flag>
+		<flag name="mbdyn-module-fabricate">Library of components of "digital fabrication" machines</flag>
+		<flag name="mbdyn-module-flightgear">flightgear module</flag>
+		<flag name="mbdyn-module-friction">eXperimental friction model</flag>
+		<flag name="mbdyn-module-friction3">eXperimental friction model (2nd try)</flag>
+		<flag name="mbdyn-module-hfelem">Harmonic Excitation Element</flag>
+		<flag name="mbdyn-module-hid">This module registers a file driver that captures the input from HID USB devices (only tested with some joysticks)</flag>
+		<flag name="mbdyn-module-hunt-crossley">HuntCrossley constitutive law</flag>
+		<flag name="mbdyn-module-hydrodynamic-plain-bearing">This module implements a hydrodynamic plain bearing according to Hans Juergen Butenschoen 1976 Das hydrodynamische zylindrische Gleitlager endlicher Breite unter instationaerer Belastung</flag>
+		<flag name="mbdyn-module-hydrodynamic-plain-bearing2">module hydrodynamic plain bearing2</flag>
+		<flag name="mbdyn-module-imu">implements two uses of a IMU</flag>
+		<flag name="mbdyn-module-indvel">This module implements a dummy induced velocity model</flag>
+		<flag name="mbdyn-module-inline-friction">This element implements a inline joint with friction</flag>
+		<flag name="mbdyn-module-inplane-friction">In plane friction</flag>
+		<flag name="mbdyn-module-journal-bearing">This element implements a journal bearing with lugre friction</flag>
+		<flag name="mbdyn-module-leapmotion">leapmotion hand</flag>
+		<flag name="mbdyn-module-loadinc">load increment normalization</flag>
+		<flag name="mbdyn-module-marble">marble model for icecube robot</flag>
+		<flag name="mbdyn-module-md">MD module</flag>
+		<flag name="mbdyn-module-mds">mds module</flag>
+		<flag name="mbdyn-module-minmaxdrive">minmaxdrive module</flag>
+		<flag name="mbdyn-module-multi-step-drive">multi step drive module</flag>
+		<flag name="mbdyn-module-muscles">muscle module</flag>
+		<flag name="mbdyn-module-namespace">namespace module</flag>
+		<flag name="mbdyn-module-nodedistdrive">node dist drive module</flag>
+		<flag name="mbdyn-module-nonsmooth-node">Defines a unilateral constraint in form of a contact between a node and one or more planes, optionally with friction</flag>
+		<flag name="mbdyn-module-ns">ns1 module</flag>
+		<flag name="mbdyn-module-octave">octave module</flag>
+		<flag name="mbdyn-module-randdrive">rand drive module</flag>
+		<flag name="mbdyn-module-rollercoaster">rollercoaster module</flag>
+		<flag name="mbdyn-module-rotor-loose-coupling">rotor loose coupling</flag>
+		<flag name="mbdyn-module-scalarfunc">example of run-time loadable scalar function</flag>
+		<flag name="mbdyn-module-switch-drive">switch drive module</flag>
+		<flag name="mbdyn-module-tclpgin">tcl plugin</flag>
+		<flag name="mbdyn-module-template">template module; use it as guideline for user-defined elements</flag>
+		<flag name="mbdyn-module-template2">template module; use it as guideline for user-defined elements</flag>
+		<flag name="mbdyn-module-triangular-contact">This element implements unilateral contact with friction between an arbitrary rigid body, represented by a triangular mesh, and a set of nodes with arbitrary offsets</flag>
+		<flag name="mbdyn-module-udunits">This module adds a namespace "units" with the only function "convert", which is thus invoked as "units::convert"</flag>
+		<flag name="mbdyn-module-uni-in-plane">This element implements the unilateral contact between a point and a plane</flag>
+		<flag name="mbdyn-module-wheel2">Connects 2 structural nodes: Wheel Ground</flag>
+		<flag name="mbdyn-module-wheel4">L. Gagnon, M. J. Richard, P. Masarati, M. Morandini, and G. Dore. Multibody simulation of tires operating on an uneven road. In Multibody Dynamics 2011, 4-7 July 2011</flag>
+		<flag name="metis">With <pkg>sci-libs/metis</pkg> model partitioning support</flag>
+		<flag name="mpi">With MPI support</flag>
+		<flag name="multithread-naive">Enable multithread naive solver</flag>
+		<flag name="netcdf">Enable NetCDF based binary output</flag>
+		<flag name="octave">Enable <pkg>sci-mathematics/octave</pkg> support</flag>
+		<flag name="openblas">With <pkg>sci-libs/openblas</pkg> implementation</flag>
+		<flag name="pam">With <pkg>sys-libs/pam</pkg> support</flag>
+		<flag name="pastix">With <pkg>sci-libs/pastix</pkg> math library</flag>
+		<flag name="pmpi">With pmpi for MPI profiling</flag>
+		<flag name="qrupdate">With <pkg>sci-libs/qrupdate</pkg> library</flag>
+		<flag name="rt">With POSIX realtime support</flag>
+		<flag name="sasl">With <pkg>dev-libs/cyrus-sasl</pkg> support</flag>
+		<flag name="schur">Enable Schur parallel solver</flag>
+		<flag name="sparse">Enable sparse solvers</flag>
+		<flag name="superlu">With <pkg>sci-libs/superlu</pkg> math library - eXperimental</flag>
+		<flag name="taucs">With <pkg>sci-libs/taucs</pkg> math library - eXperimental</flag>
+		<flag name="tests">Enable installation of some test programs which are otherwise not installed</flag>
+		<flag name="threads">With threads</flag>
+		<flag name="y12">With Y12 sparse math library</flag>
+		<flag name="udunits">With <pkg>sci-libs/udunits</pkg></flag>
+	</use>
+</pkgmetadata>
diff --git a/sys-apps/intel-cmt-cat/intel-cmt-cat-4.2.0-r2.ebuild b/sys-apps/intel-cmt-cat/intel-cmt-cat-4.2.0-r2.ebuild
index aee2b7962c..09341e17b6 100644
--- a/sys-apps/intel-cmt-cat/intel-cmt-cat-4.2.0-r2.ebuild
+++ b/sys-apps/intel-cmt-cat/intel-cmt-cat-4.2.0-r2.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1 perl-module
 
 DESCRIPTION="User space software for Intel(R) Resource Director Technology"
 HOMEPAGE="
-	http://www.intel.com/content/www/us/en/architecture-and-technology/resource-director-technology.html
+	https://www.intel.com/content/www/us/en/architecture-and-technology/resource-director-technology.html
 	https://github.com/intel/intel-cmt-cat
 "
 SRC_URI="https://github.com/intel/intel-cmt-cat/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/sys-apps/procs/Manifest b/sys-apps/procs/Manifest
index 684c988a2f..14978df494 100644
--- a/sys-apps/procs/Manifest
+++ b/sys-apps/procs/Manifest
@@ -2,8 +2,18 @@ DIST addr2line-0.14.1.crate 31201 BLAKE2B 52564dd603a9c02694ea41bafc91bf20aaf683
 DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1
 DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
 DIST anyhow-1.0.40.crate 34534 BLAKE2B 79a3731153f8e3ace906b9a360521147fd055f7401a99ea2373501ade7e49ecdb280dd59b6a3b9b2f88e90857302e71f772c767e62cb702e32c8343fd4b0f741 SHA512 5efc7347a7fa72abce9a8b3b76649abb00d73c16c5125aa4b6faaa7040eb5138d7d9470b66c186825c9651272f5c359578503d0866ce7242ea7ca9dc05087165
+DIST anyhow-1.0.41.crate 34561 BLAKE2B 32889ec5ad2750e97f9d5486c7b367edc2fbaf19480bbe8114a2deed3f78e4c3e2cc31304a33fd60bc70c33c17ed8020f6df0c05a958f4016d363803dc5a08b8 SHA512 c6fba5fbb5646d195fdbda65003a8741188d49db02b805a84e695c81a054d9d5265b1c296c23d65cf089af35ce470083de88e1b65aadcc3ce33c8fb22b9cb91f
 DIST arrayref-0.3.6.crate 10035 BLAKE2B 88292fa4b3ad4fccd03772c2f0eca04cc13373fe094358bac57d7523c256d89f3087603e5bcb2a0b15d8b2ecd48e904a822b2cb800276a9c47ad6c6b660d9d34 SHA512 368341d00706c1250ff081b0d99c36c9af694a62ff4f4d8c837234340295771ca49c5439b24b6e1a4f2c3c5821764e98881dcb22d793f83de632fd5cb457671f
 DIST arrayvec-0.5.2.crate 27838 BLAKE2B 51e2eacae0ef148f3f52d21ae00794e540e7ce4c013fb496dd1347ad91ffbbca199381fffbb064225f829216f6c5e915edfa64833f91fabdd13c3f011d86491f SHA512 1896b5f64b4dbdcff8ad234bda4ea8129bcacf87839347304717e94ee9f369cf5f4371755e453ff7d72817edb8f7fdbc726d77cc4f28ed05148dc89c7714b004
+DIST async-channel-1.6.1.crate 12574 BLAKE2B 5c5c8f1cf1458d952637a439a1534e68bcb4a1cf478cec6b6d224387f56c59dc6cffd2e3621dc24e03e20df3fdbda5b8855fccfbbc26a2aa03656aff3a17d02f SHA512 797b1f5b4c07853f78670e62b67fb787c329ffa2c89475a3767a963d524a69dce082cc7f3a2878d9c990f00ae2d9cd7e0d21743fc4186769c238467bdb20c65e
+DIST async-executor-1.4.1.crate 15490 BLAKE2B 2d85825f9deec4a89eae4be6c2899d22bd96f095413598abe2a58ca07e6b8745ee02a6e1db6a3be034159c7844e55009d6da9845116647c0b021dca115acf6be SHA512 24f8403f7cf7639a9477c0a4ee6fba8ebf73fc64b5c896ff07b5b9ea787ca65fa2e642e46a0ba3796e76774d46373e6ea6a20309feaf1f801281aea20cf82578
+DIST async-global-executor-2.0.2.crate 11665 BLAKE2B 7cbe0c3b4193061ab5e36a9679d09e9046eb11cf8cfcddebfe6d86f6a9a09b6af9aac0bd3d673db1fef278542be2b417316147bad395ca7cd0ccc6ae43b87408 SHA512 13d2d0b400832b1965cba680505fd65b87a45a4ab69c110a4a67394e726d340331fe292f6b1079de277d447688a1b97c15c095d106e132d02628892b825a3612
+DIST async-io-1.4.1.crate 31478 BLAKE2B 241c1b3ee0aefeac562e210b4206016d8bf9e4dcfadab878bd53795884f96a1eb66a02db821b27c5ec410b90628c3e065638625c468c9a4fd696572dfa8d4e4c SHA512 c7381e16814920524e291b1e363fa72245e2dc47f7753cd10bbf505e7e993c50c81f0867d3bd41158f194cc3adf57e95304934b239d585780e6650a819f611f5
+DIST async-lock-2.4.0.crate 16144 BLAKE2B 0f1f798409576d079d8c41aadc74f7671d9a94454cfdef15e341004f13e529c08c15aafae003a80972115b6420d87a2efbcb1a82fca0756d51f072e4130d152b SHA512 c3eade585da23e3aca17be6110290461bc2cb39b9fcca9c35d8ce71669883d8d1ca42fdca64686126dbf063f289b0142c508b7eb852babd702f2cebc4c4290da
+DIST async-mutex-1.4.0.crate 10223 BLAKE2B ce1a32be713c33680081ef5d14ae159fa3ad6ff569430d8336268898a7adddad86472865afccb4c2b7c37dc50cfd8501239828f263e952b88bad23c0a795af42 SHA512 5957912e28f9e5a09cf85a0f0ee44e9396161469cedf343bb37dbeddc1dd1bfcfdf4f162fae6e2543edce3e148fb34bf80864e2f35f18e6d4f6fc9190b1179bd
+DIST async-std-1.9.0.crate 222169 BLAKE2B f8c1360d515d151b5534ac46d38088b77dba7cfbb0228a03973d9907aa8666ba973279261b3cfd88b5503c8a5e014f4d95b5f26d9aab82b381a1c111c62ae9ab SHA512 1f0a156e1f020d07218a151d4860ca0ff5d9b84a6f33afa5da8e4b05f266d458187a703a75d1db19dc4d2a6df70ffd51148017d9f95963efea10675f87ce4b56
+DIST async-task-4.0.3.crate 28770 BLAKE2B 66186991db90632ffb43c1e6a46a3a6c44fbee1e021b9af7999fe6400477e482d00e79bc8e299e4ed0b05d8d70ebe9a2b824c081e90a79544c53cdcc423527ec SHA512 cbd625c6bb72cb9af3b4a7ba168130125ec180952a55828fff2998b40d341ee1b1b5a0eae07944e9dbaa6a4acb19a1f96200721b6abd61594ffd88c6e4e1a904
+DIST atomic-waker-1.0.0.crate 11771 BLAKE2B 4e94bf07e1df3b605bd0f8e8f8750323a5fa7a4d9c703b2183323aea8293021ac3028c6b03482941330c598db78aca0af4df06d346dbf581f617c2c333a997cd SHA512 cbc3e12c10f20e1b6d9a03097159a098c5e3a50a941b742891bd39bf0f7310986bda3e1e4c2ea0dfc82a70d9d57342889c46c11fe0d328372a6b3abecf7fa9a6
 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
 DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
 DIST backtrace-0.3.56.crate 73377 BLAKE2B ef13597495bc655bb01ffe3d5724ef487d48dce598d9522c737c694ebed1f4c78d8e6bb1b80c817409ec4eb8c99b4835b254ee92a2c2befd1cce2034d0b3567a SHA512 0baf075eb3a964f27306863c19a2961121b52758b58d12ec7dfb508fbae2f3136e8be21d2d9f63ca5b54d4e9db78d9cdbe65fa27b31c42b65c182ccd79a0d7e6
@@ -12,34 +22,39 @@ DIST base64-0.13.0.crate 62070 BLAKE2B b957f65cdb1e28baeca0cefc92fa98be797409b7d
 DIST base64-0.9.3.crate 37993 BLAKE2B c0943b223d0d35438c647aa53fec5f85e65a78a5d272e4c65865bf182607b44c45b3ed1a0353e081a9dc5d9f4c9cda6cc6b8d68929a2676a512a7907cc94d8b6 SHA512 4790e4de201123e7b3e3c8a574c92089e38900a67f1bb4868987da4088785ea05e4258559c1c32be67341c2ba8a19deacd156492d8383949e1c9a6ae218b7eeb
 DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
 DIST blake2b_simd-0.5.11.crate 34096 BLAKE2B 480fc200ce3fa3bb364ae05590fe26f59efb6f81fc2fcb7ae1593671677daa6f1b526d800099d002239e2ad435b919e9b32778021c0790954383079a49a90965 SHA512 4a7657db637869465637cb9a65cb82e7a119c554bd4d532aaf84f9cc77a494fda07d07db89c73e92e5bf4844bb1be53062fc61120e839e414e938e487e7f2257
-DIST byte-unit-4.0.11.crate 10875 BLAKE2B ef7038806390a662b7b982fd6f0aeb9ca865549c25e0af4901d9eede0b263ded1a20312e7e1d947159c7e358e310f14a2707e7591faa940813811c0baaae95da SHA512 5b89f7557bf44dc2fe5f86cf6b55fedcbb4b879a46eebcdbf0f9c0d420bb7bca745e80648fbdfc8d32a98f7b85010cccf44a0f892005dcbb513103304c0e0836
+DIST blocking-1.0.2.crate 18571 BLAKE2B 30e69dce433ba3c0d153275b5a56407237de93a50d7a3f9b97505b17899400f8cc8c3dede3f63fca26d5d49e88c3c9ee7ba91401061dedc41358efe24a9bf2b9 SHA512 f9048544161cb3098ec7362487c8df4ece972445dfc94196cc2cbe7faa2b6f3f3e5abe56310675c798636148b0b709d864fb94959d36976043886feb149adb66
+DIST bumpalo-3.6.1.crate 133836 BLAKE2B d67f19bd68e87c1c1360c77df2cd9b11e66f4db3ed5468463d266d2ce187006f2b2117f647a9c331838b8ce6c50519db2f9645fbce190ade2c10a0284b29fa06 SHA512 0d923bda2c98bae60d8ca09d63dc12b67c8fb5addd4a675e27b619bb41b36d3dfc0742696fb53e5fa538790814cf2401d15b110216daf49e5a2ce046bd540866
 DIST byte-unit-4.0.12.crate 10873 BLAKE2B d684c907e9eca3277303e03b3f2c0696307b7a0f96d8bc5269b953667d051bab8778e6d458724d21a284598e1e58fd29338244dc47922c7d7c2861519bf56c83 SHA512 a5d482a504ae0056b11ff4f9a407b0805a8de60897f66f73a20e32106e765584777f13eb203468630f2dace2e2408b9399e9bd532ed073498002752ae179cea0
 DIST byteorder-1.4.3.crate 22512 BLAKE2B d39c546ba7346df315297fc53da4bfc77ecb1f38567ddb788549ee31cae2719a8bc0b7d1f1705abb3cff033aa57af004987d90748f5a31765273b3223a011c0d SHA512 8c8000eb8ecf40351c9ce36a3a8acd7a02f81786d1b11aab85adfeffa0f2267ed74df29b2ca5d1d38128484d1d3cad2b673aa0d0441dcd0620dfd3934bb888fa
 DIST bytes-0.5.6.crate 46291 BLAKE2B 6d33ab47d04f2e469db2add31db118f95cad53002be7969738923d62a4fe3605ccbe9fbcae6d8741310c543625e80d9adac7d9e9fed01b71cb3943ddd015d920 SHA512 a1caa1f58754f4d2e54b8df8d0ca0083ee5282f5e4d3bb5b1735022933dd2e66fb3f39c7a82216bf7a7e29591695c2e10c8b7144c83ac598e34193f2425a32cc
 DIST bytes-1.0.1.crate 48142 BLAKE2B 3ffe07c5429d7d2df821c04325b8dc84b343c634b4699e9c08b07181e741c06233a0501d987b95f513be57ac169537bd0812defd118305e0648ef41f6802d19a SHA512 885d3229e51c0deffe06824e81e8a016e3244106e7ed382a721a938cd2e69fcad7f5e757f95cb07ee1be83de04fcf98f9774f8f2e07aaa9a1ff068eaabf2fe87
+DIST cache-padded-1.1.1.crate 8798 BLAKE2B 3f2b16f0fefcc5acf692684329e38ff59492d4c299413d25e1634ab27a59512b7453cad28b26f34f2b66db3d3c0b4b26f41df042305b7db2b8ca79d36704e8a4 SHA512 72c36ef2f66a097cf2fcbc06b82fa3d5451ecf2de1ee1513fbeb34c6752436109f9e453bec3aab7e1f89723c24f7c230cf4bff6caa09855402c8f92c1ccf49b5
 DIST cc-1.0.67.crate 53486 BLAKE2B 42fd02a5886df50857075c909819c8afcf091cee6b7bc517848786f287f4559e70a07f0a0f42a742baa2665465dfdb2139ecac7e93f1a41b16eab30556eb0259 SHA512 f1ad4abdaad2667b190d1f8df8515f603107be1f69bdbdc02b5159764a6ed18b3f672d6b06af50c7f2fd3e6e3dad5df0fcd0dda762d909ba0922c769f1efbe05
 DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST chrono-0.4.19.crate 155663 BLAKE2B c92c273fb6475bbb2546dfb75eaa23321bc8f9a5fa8a7c652f527649b96ff8718fa932f52b500b02a4acae7837df5bdb14f69cb821d4962be2790dbd1d023a54 SHA512 a119349bfc2243a249f1d18b1ae548a04b30fecb75913a56f26d1ff8c0eb53097a2674d9141e2094018191cbbc1620843fbddaf52999824e077c1157f0907980
 DIST clap-2.33.3.crate 201925 BLAKE2B bec9c866481c5b3fddeb314f68af9bce38fc421e42816182de3209e8ea3447b72cf033e6251eea27fe974eff8085b7d98cdd2911b5cc0ec6b4bf4c750deb8a25 SHA512 3eb0fd648e2e3f9e5ff69a5e6cf0d867304fe18523accd036f28a86de368e4774088a6936c108ccc045092c539fe7f7494ea96420ebf6b4bec16880cea84bedf
+DIST concurrent-queue-1.2.2.crate 15859 BLAKE2B 97eb49d7f6270999f24d37e7a3967c0abcbf584637388c4507f89fd5284120759c9845219c463cf066f6568191b874fefddd7edee9292ed02183123161074514 SHA512 84e348dc3d40c73c11c54ecd0f1e6cf7fd6c7033f4723a428ed1c09bc9548cf317a0d8182144b689cb9781190b9c8ce4374717012eccee54a11ed0869dee10fc
 DIST console-0.14.1.crate 22844 BLAKE2B 2e7a1480fc10ba92d4d5c601b87a0dac840b71c6c44679acf0a90667f37a40528ff2155130aa72be2ade1fdef4e6512dfb404b0eff181d77fbafb00c25dd6c5c SHA512 2c85d1938faca5163dd7eede2a8a07569e536c92fd0fbc7f6e6ed91c60fa7f947f0ae101817ed943b0668c4d98ddfd3149033c83614786b5d841b19a8b011c91
 DIST constant_time_eq-0.1.5.crate 4936 BLAKE2B 882dbf33f20954205fcc5b6e39863db8969d184b697fd51ef462f6890c1a754e3fae67bcc7db685d8cc26abe6e3871d3b80aa542489ba9551a0c95a49f7a6dc2 SHA512 a4e0155a7ad72babcfd418d832d362b3fca7333aaaf36c246b00e948983837c3c93378b86e37c5fa7626fe137e3b6d77276ccc61624a7f4ab914605905a88a01
 DIST crc32fast-1.2.1.crate 38172 BLAKE2B 80801a345f4c5ed8a5fd335bbf672eac1733a1c2b333dc8a8e0254338148ce7b34402201a8d2d7434dd1b057f33d99d3a8f02610ea50b54115d80bb8da28b2b0 SHA512 4c04236bb15a5c63b712c62652777917e947823abb20a0d0b372c850ec1c8695faa414e8de73904f1f1a296d7b00a6206cde8da404cf4cdaa2e8408e64b62b5e
 DIST crossbeam-utils-0.8.3.crate 37268 BLAKE2B e9a77f143afab79fc1984902ea756a15e43bbd6c8251b5a2f9fd574522539814098b17da03ac5222177332042303f129e0c2729db6bc80e8f76bf4b097d973d4 SHA512 2e89ceea586873e957a31b510f8e8cb0c6675def32ea6b9a9483166b47f69c1ad448a79d897796883b696bf77cb0fcb1d0ac28ee779146f6500ca9a54aa7b4fb
-DIST crossterm-0.18.2.crate 108404 BLAKE2B ba276975b3440f4d976c4f66aca2f46f2b8cc4715610e4fc6d3e1de2c98570639b68e4464393fbcb575091e3e8bc3af2ce567775b31a1bb9532cd8a42ef8c15a SHA512 21673eb1efa4b353b48c4d2e4780505fb1deb5ab5767787acf5f7133ef45e83176ad8d020804052e6b283135e72e1fa623b8e37417f805102a39d98cd72a4f18
 DIST crossterm-0.19.0.crate 104572 BLAKE2B 13b341870516c5ce4f3ac1d4f40567a2a465d65f9dbe9f627821bd6dde994fa5f8d9802a1b42f19ff91d5511ef7d03a0b62361fe8addbb18e74c624dbe66c9e9 SHA512 c46c095d73be48a3c1875806547ba708a40abfc8e5cd89514162e0d1636675c4f4e2857ac3b4b32239d14f7ab57a61018b6a919160b2136ae761dbbde726b932
-DIST crossterm_winapi-0.6.2.crate 14962 BLAKE2B eddfed3ac40885c230c75d56c16ab447de950a8cdd2f003e65e2331712401f7ba2e228134fc1012d7a09d7fe080ca279fca6f4fe9c4d611c6a3a485eedd6565d SHA512 39e1c184b921f8cf69d6d7419fa93be2a6f4d3b5ca2461b9f9025133789d813ab37d2c4f4782ff48d466b2644a4d7b341fe1004520b6b4e6f4c7c7d5d4837124
 DIST crossterm_winapi-0.7.0.crate 15187 BLAKE2B 5407aca29ccb36473b34527d977fd3fe9d190d2dd940da7077535351458fc0a06af114c145a0f3e741402f2df98a98605a8fb02e2e07c5bb107679a24260fc96 SHA512 5efbe7992b4a19725b5992e0b29a77673e8ecc03d28da35580a5cddaeb32b7e30c7bdb53a2392ebb5b1218617045c306d78451f109d5b836f0e00dcab59e0dfd
+DIST ctor-0.1.20.crate 9328 BLAKE2B bc2f4ce53f6b7d6a2fb441317a3f91b8852c541261f95f0b7d12adb35ec1c943810242ce71e514445479c5d225b735cd50fa4dfb514e6b121be753555ab3c30c SHA512 877f4663f8079a368d198a3351e98551c6d8123dd5e53b812529b77b09f1c08296e6df817d7429e4c70a73a6203fd98bce5ec2ce7b09baabe4f348bd54a9c0dd
 DIST directories-3.0.2.crate 15593 BLAKE2B a4ecfc7968a0eaa1ae34c7cb0a33aaa3dc0b1d972fcc013fe6349a03e21bba1740950c62fc0d096945b4b29c275081ea0d7d1d57fd659acb22004f75a090a230 SHA512 9bccbb99a832d092dbce0ce5ae98c2e1eb58febf0fbbf410152bb0d62324141957ed04284c71809a692fc2d2ba0e9b41854d892e68269893850ea3645a9549f8
 DIST dirs-1.0.5.crate 12908 BLAKE2B 0a5c1428087adeca310d7db53850ca0ee4b27df34a7629f13ca0f3c69c019c0ca2339949022317ec55ca0be35aa721e0a9040d9c9d011e1516d99772ccf8f730 SHA512 12ebc3e92511373b11c2b7913b7bf74f8022344758057a2c71e36ec262e7ea6ac386bc75c323317406f1b25e965e047ddb308ff5017a1e607b48b978414e7416
 DIST dirs-sys-0.3.6.crate 10626 BLAKE2B 6da8e4a1e51a4e06ab742ce5eb75155ff9b7cbe83f06947a0bfcda711ae1e0dbe51f9a1e1733ba771f2daddb2b8b14e343b9615608c1d9a8fb927b033c161b15 SHA512 79b6bfda14aafa3839365496e1b1926f763d3569e4e138a59f4acae15c38ec9a3bdcaa64293b03b536141c897c2bf68a67d7ae5670d86215080aa313e53d39e5
 DIST dockworker-0.0.22.crate 68589 BLAKE2B 4ad8fd10c4c518d3b274a26d597bfcc2907ceabd10c020451e1262e8ac2672ac07bf6f536a748db0c9786b17820e0b3a5eeadf572572ecbc42b9b2260170e14f SHA512 32d7260f06d73a63204ce922ea636782cc9cbdf303498f4406afe03da382f89e7d1ee0624b8b392887b16ac5653d19352797f2b2dfe8ae398f17450ea1553e86
+DIST dockworker-0.0.23.crate 68038 BLAKE2B 6ca1f79c44cf9a048c2f2a5cb365bd572532cdf5a26180b2f18d8fdf2b19741dcf85da85ea94be4a821fe071261564faca0e240d38549a82796c44081549430f SHA512 86569395304a9b24bb71492b9eaf4da12cb2f6036971de7d3beafc3d19df23b7134b4fcc5aeb8d913343a0c5c19bfab17ecc99f646de20fc80287e258e46bf15
 DIST either-1.6.1.crate 13641 BLAKE2B e5f40c40a5edb6dcb07a10bf79183cbe42438f1f70f3932dce72f6f6e91f75f24d17d82bc447507def4dad4345ffc9dd9162dde778afb253bdb1218e91887949 SHA512 4bfe56920e30cbc8eb4f90162db618f7dca653b42db35ab6a7045d3fd9a24ceb1778b1f79613850bdb1a87ad3794fa0d73015e46c48d513f368d8c3776fc9ddf
 DIST encode_unicode-0.3.6.crate 45741 BLAKE2B e1e3792bc2bf9db7df33a516d0d755eef5eff1249aa9b2fd7f0dfcb155786c566fb619c9b2d73425a8625c8593988b117e9676c341f65e8795ddc838bf9881c4 SHA512 64193d6ac75f66d58ed864169b5d6228ede36dcf100614395e086bc8e847a3ddd287734d88e8ed50f38c679a99c80ec68449175a67d8ee03b02ec1cfa9d55e77
 DIST errno-0.2.7.crate 8960 BLAKE2B 5035ddeae88e3adb6ee5dd274cd5e1f8340f7525ef39c165abac5db46ac999a6afc9715323b26eb384df446225b6d6e0e3af928c843692f4885570dcea4afefc SHA512 2d22a44159176d1f898569fe892fec795fb2b9bc35ba735c7275a1dc23c2f9e31bffa2f1d36c4b02230f623206c954e4bbbd704d606e5ff5ccc5e73fb2f536ab
 DIST errno-dragonfly-0.1.1.crate 1370 BLAKE2B 8cc4cec5a33af40aa3578ed95d097acf532f3a0a774c653111763a955c90682089f65ca422bf2d22e1fec1a3a053860a0cffc5b44d40745042d167cdd933ded3 SHA512 04d2db15d92ed8e770ff4fd0e200c78ee9235d0f856c163373fdc3fbc063e01daa91f958db212b977c49406e2287dda34e98901f1b1516a6a467ea2cc501d074
+DIST event-listener-2.5.1.crate 16237 BLAKE2B e1b2c4415cc155aec0ee2187250820d98640d4b4966b8703366bf98d3652d03faf627f0d20adf2feed946d68ef273cc12a87a7ea0fdb9bd8075123c52896b343 SHA512 c7762f9b7814d6172940310cc2a52567741affa34b894877ac0577c902057f26f228c185a66a31bd6fc0b2f0d50b2c8cddaa2748c8983ebfb59aaf23324811a2
 DIST failure-0.1.8.crate 37582 BLAKE2B 007652720edab76efca83ef23a6f29dfec2a8949e88f697a4609257d158d345ebd617577df9cda69a25cae70e02f96479f427ee3059362771a4a1459bc4bd1c9 SHA512 a8762c978c286f921ef9c46dd17f57656739b339656ad237f6fb43062a8b2ad97cb98b977ae04735312d5328894b45c512fe42e33a9bdc4ea898330816b7a884
 DIST failure_derive-0.1.8.crate 4950 BLAKE2B c068f2a122e1137aa8a31e3a3c4c333f1e66f1b93df144f5a07772167f9085241292b85c55adf33851c319a418bac19fd31f4fb22b87ebbbf2814cbc815b77b3 SHA512 3f11adeb616a2d57e1a33ec2a5eb71c79a5df7946a27b74acc7c89a67c5dc6d01222731b37b405e33493570a98c96c7d2c7b8535928d7cf82536bcd9f0df809c
+DIST fastrand-1.4.1.crate 11224 BLAKE2B 2ab15e9cdc2fd7d7ad6b8a47837a1f3ac1e5b282e6c25a5bf845522903cd5132100df237fe43ef19ea2138a7b05a20548a51f65d52b883627ad3b02e1fd54096 SHA512 643a3c0425c59e8ad24ebe98493b6abf2d68ed1fbd03b520eb5b85cbb00bc8def103ec9688486eef63c53792e2ec5d005d106fc073ec66fc6a89b09793a975f0
 DIST filetime-0.2.14.crate 14358 BLAKE2B 7d50e71b5a556bc24a6bcf737ec07f185c6d6a2ba2717d91aaba71ec15d1981c47dd6010e5a4278f8996e05bd49d04f3481f0b9e3156a8ad1da1cf39a84796d6 SHA512 f2e6e41b8b705c510e1f1932451ab8a0acc6a4f84a7a21880c7e69639a6aace7c5ed4f694ebf47d04ae6ff227f8d6c6733f2c4bcb953088531dd91b37262e45b
 DIST flate2-1.0.20.crate 74036 BLAKE2B c5a1270debdb42f8612c0db9b684d339dfb668dfa3b06f6dcef94b43c115daee99c3558562d605da5ba1a554930030083baa8128036e9999d47907f29687ee0e SHA512 1415cba53183b7ae0f3396859186b92001060a78fbee10dd0dd4c8a93119aeb78bd8d782735c292badc1ae6d369badc6fa1a0105835614a6f70e82b080d8549b
 DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
@@ -51,6 +66,7 @@ DIST futures-channel-0.3.13.crate 31089 BLAKE2B 051e50bffb13b5bf13b7d972aded2530
 DIST futures-core-0.3.13.crate 13835 BLAKE2B aabbbd83d26ebe974d31d4cf0a8db3faee7a902b05cbad2cf85907528d70d5d9a0c57ba006b243357dd45a0c7b053ca7608224550da3dc5cb9b86cca1efac13c SHA512 f5a424fbf6984633740a05fe6f9ea0741d7433e9a34f2e360377391d1921f8a4ade756b543bcf165f8cc45e286b59c0d2e8242f86809926898fe4390895ed37f
 DIST futures-executor-0.3.13.crate 17112 BLAKE2B a40884bfda2a6e168f447dfc25b69a0d7329d2bf07aac1b66498e5812c8038c994b4555d50f52f3a977993c3d43893d042b5baee74c89b3ce98decdd3ed2685c SHA512 4e8a31ad24c791a627ba9d328ff002ac520c88f28a266145166def5dbb6ee852b4d65e9394d51ee8b0409f9e1b616a15e320a43c05223357004c82e092676cf5
 DIST futures-io-0.3.13.crate 9059 BLAKE2B f2e6586b50827b12e27a181d6e8acd501dfa587facc37e31dabd015fb70fbdac0a959ef2802e15a5a223179daaec050b45c6c87408c93b5e2f6aa956d27f4c06 SHA512 56353b9f5a6ee5d3f6a5edc0f031248b41280d60ca9108d196e106aade750c8acaf864cce6b4490faada917f2fc6eea919a49ad68a6bef039a88ef88a381a4b8
+DIST futures-lite-1.11.3.crate 36241 BLAKE2B 5f8d3eb8de85807b5882ac011ea3d07cc719bc5705503aff4d5147362a3b5526d53e29c118ae74300aece105841630933814573d72c9ed721e7e7f1a238e80be SHA512 ea314fe3b3d1022df46fe83e2ea1101774d0f37dabb1f9f24403dbc0bfe1aa7ca59a0cb70463a4fd6eb5eaadc74f70a843d8c128bcc13a909d6f85617fad6522
 DIST futures-macro-0.3.13.crate 9683 BLAKE2B e96b0c047dce0a7123c19d85fbb6e5a073ef8c547ecce48aea5ece04b96d597ea84bf5109c173f3d28802187e3124441b2ec2264c5103706f51a6d634cfc8906 SHA512 11b39bc563bac0cb993a35909270b1c3d62daba1ee5876d2cf8259d1dbc7f26147c399a0dabaad50c7f0a6d0e4ca50d456684ade64cedd009c093c9cf9fe2b38
 DIST futures-sink-0.3.13.crate 7660 BLAKE2B 59877d01be11bcc51b2df4560643287edafa8b319468d42fa1968e8ad42e65017a4884443058e3d6a8ada7e4e7f205f0a522d27ccc0fc36779d17dacf499bc89 SHA512 befc8b6979dc36419fb1c41bde0d8e7cdc66100b14cce54b1ca3d2a676a595d2c2b856448110f1b3e64b2a043b17a5c2304cedc650b41d1d807b9cbaa2380cea
 DIST futures-task-0.3.13.crate 11118 BLAKE2B 84986a8a9c4ffae6b65821d35e63c1574e87410710e8255766c46a6f8f58b5c3d7853d6eb6103f5932b9108c6d4e00c1429a0e469b26371c7e524ff7d14d3814 SHA512 2989781a67a5fad9b7e9320155d01829fe5f2b04f2a2958ba20eb2ba51734b5d1ead3d3abd7ed5051478aefd3938c682e30d87a16a108546a812950ae50363bb
@@ -60,6 +76,7 @@ DIST getch-0.2.1.crate 1571 BLAKE2B b0400216c72a562f3ece426766c5872402bba4c89f1e
 DIST getrandom-0.1.16.crate 25077 BLAKE2B 0cbe96c27e78100c181a064e5fe524efa9a7a267fe60f8336d2ae0125883acd5d575ff17d1d56607255d9b2c30cb9d962026fdea1a5c3c29a5e0760d27c3136a SHA512 c5450c522c07c7a38b326f9a9062bac7d089630219d577ea4b55abad4e0c31d17b7cde385fc43912dfa100b42334e7a52422c55fda8b738caae428c6f9addb53
 DIST getrandom-0.2.2.crate 26010 BLAKE2B f2df79db0fff4a4e57bb5c748932dd7a8d24f7072f9a81fa92159ea79de29a70e7b834af6ffc5178e898af456188f16476043e9be4dd25c6e7edde06d93cbb8a SHA512 f498fe00c9887748a0be88fbd698a6087ccb79874cfeb35a18f90994603be29cb2aacfbc65fb8ba967190ccbc41ff9ff56bfff1de40811e1bc99a08b0568f59b
 DIST gimli-0.23.0.crate 702175 BLAKE2B 9acdb3afc092e43b25a11639407eba7258d25e6dd57c1f1aa18d17ac7c2ad73b422f85d850947498deb3ad8c1b8001077f9b636f7c1c11a4215b957c990483f7 SHA512 b5dce7b563ce7b8dd6cfec5258793323d370f217779d0d57265bbbe2b1eb2704dbf0f25c189ae6e9079989b6ac7d5341e10fe49457577e482a3904c745c89b5a
+DIST gloo-timers-0.2.1.crate 5832 BLAKE2B 961384f97970b0ad543d9f38f48735909c4fab6b89a7490eeaf365e9fa94263d45e359444b5149804a515162b507184c59f91d4341643532e9f58b387036145e SHA512 c05881434f81aca49e7bccfcf0d1122f0320a59332d610c6891b452a521b7a66f3a98e59605a62e9145535e78df37e268b581a54b223a7ed3d3f79d6df82309d
 DIST h2-0.2.7.crate 156989 BLAKE2B 2f75a2f82391c994299e01fae5958dc7e21b78e38b8ade83a0c90698f54d232e6f0068bed88b98314e702bff773e8753c600ecf6b638b5bc1c7e692ef636d289 SHA512 6157bcd335d303246478f45b8740dca687f693dbbb462a0ea9560af12d1fe12a9c680c57c1e7ea0b0842137ee66cde827f273e0faa619db3b6180c5587bd0fc9
 DIST hashbrown-0.9.1.crate 77734 BLAKE2B d59002253112cf92173c3c1b305fd03fb7318ef187d7e033433baf6a354db046d1f3fe0387b3cf500fbcc0f83d2b2076527ba7cda2695f7627eca0bc3e3487c1 SHA512 dfa4742111f6fe757b7fa97f04c7b4a78ce9708c87e8e09ecf3c28f2566e48af9885fda380ed918cec37b5c696110fbdd30273aba6e7d2221c9e65f72af064fd
 DIST heck-0.3.2.crate 54718 BLAKE2B 6514f604361932e0a8e1a86786d3ec7218d95f8b3b3bcfc9e21c5fddc58ebe28bc0781e2ad24de4dd4296da85e97c742d8473370c99a593e7e5fc7df00fc9b4c SHA512 cbc72c3473ab14fe445491b1d9586d50de9a462af344638b871f7309fa805069a1405bcb1e0859b561f48583fc71045f38d03b92332d35131c67e140ccd241ad
@@ -77,10 +94,13 @@ DIST indexmap-1.6.2.crate 50225 BLAKE2B 38f40c5aae0c5dc5da515e610007983b2d581994
 DIST instant-0.1.9.crate 5213 BLAKE2B fe208faa09852079c603930e88b7d0392a89a55d3b934ad45ffb0c9e44df5ef7e8189ba2fa12452f1c8a6416d6f7c0655365ba959bedf2b78228613944be8278 SHA512 3915f67c3629ec93296d56c4cda0cf97b29b1a70930a9d546abb9518139d4c2f35062563a5094e84841ddb1f00b0f3df9dc00801d96c01994765221edf03ef7c
 DIST iovec-0.1.4.crate 8720 BLAKE2B aa1b4cd98ebe47901c0959cf1d8eb2586a803d0453e2a8bdd5c63442b32886dbcb37650aa218c748fd45c9fe3a7fdf20569eae5b19716487b139caae1526da4c SHA512 e23fcaac239807daea20ddcf2cdd4fb858ba1aa970ce6248f70f0fba5bff7ebdb27247c0997ac0ff2791178f86ff9657e473d8f64b86c644763e5b3474edd158
 DIST itoa-0.4.7.crate 12099 BLAKE2B 0e4ffbaad504565056f74c3ef560a87eff321a0da6d7a2c8fa35813c207713c22d77080c3b830fefbb21370dd29cfbc6a2807044485b38ac1e0c9c1de3ccebc5 SHA512 c61eb50aa00591af28698b45c528c36bd92088f7cd2f453cf686a1824f4656292638bebc468cf67f903473a5045f22777af623cc0515ef3bf25146b89a7c454f
+DIST js-sys-0.3.51.crate 67124 BLAKE2B 4f4c28c1ea1a490551ff759ccc494536b099fee6d2eaa597f6ef5ab22e7dbcb72ee870df5550205efbee181aea8cf6623abdb6ecc35418eb17ebd2bf3f56877b SHA512 e352238ec085a9381c27fbd849000c8a26d71d947b75ccabecf941612a87e446c45f793eaa152062e7c699cdae74512a016d44ed06f3298b4cc7d32ae5139f5e
 DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b
+DIST kv-log-macro-1.0.7.crate 16842 BLAKE2B ad3c028863d78730e4b2bb2e8cb980581b13d741b5dd2b76435ae91f5a7498a1e9f99178a0c9370b693a3af6a95c0682ff0d63e81a2515a267c6564d50ec3683 SHA512 aa7d79ae599930dcbca06f77590d9623dce461b118435dae1a4128fa8f38149a820109fe4bd1f19944b67285cf1b41bbf78e94b47e561dff1af683953c55a697
 DIST language-tags-0.2.2.crate 12754 BLAKE2B ea59a130fa723b1537e451d5a51914391fc0d375d40df1d8b3ccda64819e918332e344585523d3ba61bb0394899fc1663cf7a452aafd4a7e694f8d70627f1bc1 SHA512 54a6c7d1bc985860c194c842d7b5ec731d0e06f9c77ead8cb0156bd34addd957d0bbf8b6a9dfc6bef5ea31e39f84ab447d1ccec3c178a6c18c4a222a51e1abc6
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
 DIST libc-0.2.94.crate 511713 BLAKE2B 6ad3fe9aa5ea5fb06a7b2beeb68fa245e5ed7d19aa7e4b21c9e2ab73da11a9249913e604f0f87fbcc82676cceee16f14403cd2f27ae462730e1682c539666283 SHA512 316717d2e46b57c200d67d0ebb4fb162cb1f0b688895b9eb6075924cda3be8ba7fae85319692682178b6fc5cb2764e8b3a9d3e7ce234fd8a21a0a9c453ca174c
+DIST libc-0.2.97.crate 517712 BLAKE2B ad769579a8e89e9e0ea6a08b8fd82b69a3a299721d63b63efcb436b333021c097933565e86f4b66ffcce6a589718bed2aacb36b80a936dd3dda763b9c0c240d7 SHA512 9b94a43d7da1e419900f7a016d5eb958bc42a006e1bb621ab8e2be2167e91f05cee81144c25e81a85c1b1ea2a26ff88980a4cc292fd42db8b09c5c49bf5531ed
 DIST libproc-0.9.1.crate 20247 BLAKE2B 9cb3d9363b8ca6498b6b1316b9ef249a3eb05f636119ff2d7121c6293a6897505a529da31fea146206412b2953677be8a368934871ff8242c951fb1e3fcbdeaa SHA512 810f3781af27b4a8e26cdb92c9b5e40bba32f4916aae34ac13a9882b2f89292839d6127bae989360b30ea285cd29098d0a0c120fd673523614dd061b30615e40
 DIST lock_api-0.4.2.crate 20375 BLAKE2B 0b24bdf98aaee9870f558971f437e728c8e52a853cc886a0de30cb9a84c2733175e6152a2d7ff1f28a83df5443091b16ac5410cb67d05ce464e01db64ba98cb0 SHA512 815de5198ba4a952490fbc7e08e899ce855588d794c22890839ad55caa81642745fa6bf81a2a2fc8f6713575f0d1b801a2f2107ed7c405101011927b6b40be31
 DIST log-0.4.14.crate 34582 BLAKE2B ddfba35947ae1f5905cd9ecb9eb862a78af6f00ee8b8fe6258b369b140928fe677a02b1b3ca5bdec36ff2b16abd85a9f49688fd5f3d1ba2b2905e7f96b8a84c1 SHA512 796100167663d85a7bc4244cd305e9b3f0a1b1520764b63464698eb136318d0928c40c16f5d19d9f602a5bf769851275bbd48d66b088b0c37be7a6fb62def7cc
@@ -102,7 +122,9 @@ DIST num-integer-0.1.44.crate 22216 BLAKE2B e1c08427e006cde6f2084adadb6086e87e6d
 DIST num-traits-0.2.14.crate 45476 BLAKE2B ae310d9d5640acc3e45e1e5d1d2f519539795922c0058ee940c94c94b6654b39358b7c18dd23a276f2c1b16a30dd4de4cbc8575bcda6a5c11e70665d670e6439 SHA512 c3028eca9f7b718de0db3a36cf3e462bdba43562d52c9b809ed4cc0aa6af403aea542d6d4da743cd1dd541397815a3c5a84cef4d6e40122994e4be6a62319b2e
 DIST num_cpus-1.13.0.crate 14704 BLAKE2B e7a26e597ad5e45309393a9500b031ba64a77831320cbb96d7861139a2f7a453b7ba06a3255439b43ac1e2e36269b0a350d514020d3cd82c2513b57934b3ebbc SHA512 e75ec298fa682be84bf4efb6cf40126da9233ef25f07e887c2fa7421ee78790204564e6406c8219466651f47421e27f69eca690bb9cdfc982b644d78cc10de3f
 DIST object-0.23.0.crate 203889 BLAKE2B 41dd20ad5b43b026d032b50360bcb1efff7aab471342da1ab787d820722f4374fef8df48eae722016893618f0e1af3014e42c56a57ea8792594b5fee676a4d6b SHA512 6352624a9071bef53e4b7209b3f8cd5168d54174962565d76f8eb9201dc84dc3b26f08c81ac954bc9d4c55032a022abb35d160817bb434ef27f76949290bc7ef
+DIST once_cell-1.7.2.crate 28250 BLAKE2B a30a55f6d6e820c691928173a9ce70a60486b28e3e79e8a01a08d87ca0bfb1725b967cc9e070cf53e71b924f73fc2eec2cf67190fc743361b60d82290762725d SHA512 30cf51249bb73e9881cfbc6a54ead7a3db709d560da8d420fd85cf248e66c727b92e8351b7c0c682913cff12b3f984684a272a69c965c56f8343948eb5a194d6
 DIST pager-0.16.0.crate 9623 BLAKE2B f8ee06ff3d311dcdc32a53d00dca1094daca1179005586cacfaa5def4c3be23a7457de97d23045a527085e445053ab6021dc9ede96ede2edb094d69c5a83a3e5 SHA512 c2ca31769968429dd986ee822b11d7e2c1045f6920384a8b5b913f68eda5169026fce0ecb67a0c65ba392930ce00a3e4ff17acb8122286a941c46161f8cd5174
+DIST parking-2.0.0.crate 9714 BLAKE2B e3ecd48e90289fe173b1419ad3f68350dd05359461c5842e52304e20fef9b5e089803e0c0a8e85b249a546f61cf8624367e6ec164ef7638850b451d325851075 SHA512 21c5723dc0281ade1c2cd6a1c2215ba70eb47a721a4a594ef1e54061bc79579ffe9c31f06e534fd847f936ed265cd65a59dfa9e38880f8bd42c6e8ac70a13f93
 DIST parking_lot-0.11.1.crate 39854 BLAKE2B 5a097d7016811de4ca7d21e8a811a96b2e857b5224b176cf7a3bc160c0a0678c9100423e3c096c5056e2df3a4dcba17a590cc64eb1d648355c153c5cdf9db228 SHA512 17e394ac8b62656177a12fcfd246d9bb59be468a5ac174e4d6d8b4ffd0411497d3ce943ca5deab184cebf5c1bbca97b4273f79bf210c78d7f4b6f5e9d68026a2
 DIST parking_lot_core-0.8.3.crate 32147 BLAKE2B 5218cfbff706c4388fef31c885c7a5d53566005775a3c440c6a2890efb189a4edfe8e99f6499cac36038846628a915ac988c15e1ebab1b3a3ffb53a64631dc19 SHA512 1dba5a7e68ee007918fb210ff308f7382ed1c54d2fe6db36a8246453434246b71e6795db107c83ca39c2bddf5e4a27da7978a464b53d41e150e744d81e75b341
 DIST percent-encoding-2.1.0.crate 9748 BLAKE2B f3ff35ac683724b15e40c85e0fb8ececb07b61beeea82b7020f02d27df05a8a3535f157b3cd688533e414d6541de7de8640ef4756706d8061af0fec94ba04ab3 SHA512 98af4dfa7c6a3cf0d5aa929c436f9eb1ba1b576a944513f1284e6df2ad06be7cab9eba145d888d50af88f8c970bacc702b323041bec6d4fa1dc34095186c628a
@@ -113,14 +135,15 @@ DIST pin-project-internal-1.0.5.crate 27351 BLAKE2B c69ac995c79ad7589c86ffc5c41b
 DIST pin-project-lite-0.1.12.crate 16854 BLAKE2B 48ecd648fd7a7694a48144e9e3f05a3e2878e52a5e5ecf2c6cc2cdc556957282bbaa3bb04f6418cbcfb254cceab5a0bca92173cf293db5cfc9c9589ec1597543 SHA512 4285eb45548b1827b54890162c68698e50d3747eba7b4c1c75a8104124846bc745a40d9acce18115bd06993d7d8f11232168e5e6f4159d3d273ff800706e5bc4
 DIST pin-project-lite-0.2.6.crate 25494 BLAKE2B 851a8388c3837d8516d98b561a3ae95b584e7b0e56cb04a300b45e5a97b4c81bde991a9625f42a596244f3f8638c26d6ddf46cdc7697aa24c823e991d0c107db SHA512 21b298896a10c2b21e481f5769a9ce557ec376819681599699f0881769d2dd378bd0bfdf7c43cc16eb521c48c67207e63373622fff84ff26da88703a57461461
 DIST pin-utils-0.1.0.crate 7580 BLAKE2B 457e1287202f16d1873b24bf4f1de1828300128c4ba3131758e64f9784d36d47365f22d85493c3a85d854f0d8dbb4c6cef3a0f5b064014dc03943e58b7ba9178 SHA512 828422b8440cc82ac6b0743e0112fa7540d437aed457564999092b1462cd7672cd6b1f0201b67075431aeedd3d9c5127468a3dd028744109944f7f023c82fd70
+DIST polling-2.0.3.crate 17603 BLAKE2B 69480ec1eb2070573f67d9f21e8b2f62ebe257d7234a9f51a111eb9cac26aed7190c136aa170564d228be707068d814a1c407e77bbc7d5b643e834c9207032f1 SHA512 c6c621bf5fa47b4626c70fd01942fc9d801c11adc6374a905e1195e9e57618e5678879a9db56504202bcd558f96cd038b0fe54e142d0b65d2013550561f0bbab
 DIST proc-macro-error-1.0.4.crate 25293 BLAKE2B ef918c5efaf2545ab38787c8d0c07315af00431139e4dff66346bf798e3a429f91d12a79776c150412fdda0b158a72badd5e1044ac4d6917f8482d4b5a7110b7 SHA512 8a47bc9d3e24e9561d1e384d8f5a633284c2cf9b5e6733c5f9d1dbfe1870ccc8e2152482852e50b551cecb68e009148585b910ffb0508a7b4875598eaf8657db
 DIST proc-macro-error-attr-1.0.4.crate 7971 BLAKE2B 98e2925881c2be186e22c2c439697e91d43f807eb61a5d13e3b0b4321ed50a74f3d699942c04b89b6fea0f156bb5d19ebcf22f9cd4b98a7e6917c437600ed823 SHA512 2606afa9ec78d7dad4500c98d3a5ecbd02c6b53ab829c742bed7f57b322a95238ab4e01cf268746815f1424fd9b02eddfa30e72f98c66106f57765f3d3116495
 DIST proc-macro-hack-0.5.19.crate 15556 BLAKE2B 98c22fc3e5f5fa8b6f44d15de42b6ffcc82ba3f98a07ffa48bcbc5d3abcfca6af136c5d0d8c7f1ca34261ed8f8c9c17a394231f97a4c342c81aa7f8b9e74b203 SHA512 9e4cbec41056438287f5b23086264c86e2f0cdc193064006556736377b2954229de13a585149b9995002c9aee3334ee2a80ae4afdcc96cabe7ed2bf718476952
 DIST proc-macro-nested-0.1.7.crate 6495 BLAKE2B c27ad92b57837ab1ce220958846253ed29de12ee1ed849948e5202913371d877bb648e6880ac3e6619b8d48342e1fe105df56a0abda1b13bd62262bea4c85fff SHA512 dc5d898c6d5588d279aa0852193105bbb3824798a05875e2181c66da8c3849fcb32189d9b213cad09054242aa4ae9cb602f9c2d1b5e7302963bac244bbaa27c2
 DIST proc-macro2-1.0.24.crate 37716 BLAKE2B e2bdbc7cc9ea254529e322f6a2eb44002b4994fc4a00df32012f66740e8e73ae70820dd40b7fcfcf024f3c7784ab9add5cc1db37f4c72d5af5c8f00164ebc145 SHA512 c3d23a5136c55d734084ce1d76d54f237fc1003074af102c2ad96d851ac496ffc7513ddc505a68af4051c9d6de09725a0ecb6e76ebcdd77a1c056f8f9242c9be
 DIST procfs-0.9.1.crate 95051 BLAKE2B 62ed9f2ade0af58f6cc765da0bbb8540e8a1325f7532dca522accdcfd9a6a3b1b05321770114baf7092f16d38a1f77eabd43d9cd42c8bfdfaacbc25387fe2ff3 SHA512 9946c82b85dcaa53b0f0d98e48fe764b1f196f850eef29ac8abd1f7732c3200fbcf40b616186da43eef7ad8acdb288f5350a0ff176ceb338135f3d2ce38cbbbb
-DIST procs-0.11.5.tar.gz 1076231 BLAKE2B ceb7ca24bc1d4bae718dca74e91ff3b2b312c30ed207db76923dd981896b05ae5f28fc5dd11ca3b80875a5e89a31f837dfb7bb4f876bbfaa080e354b41bbc545 SHA512 48d96fcbf2f0d7108f84aa13cd69d8355dff4ff3246cc22fe01ffb173e1584d43589f2194c85adb6dcd0503222b6923a350059511ee95b81e95319fdb49ad456
 DIST procs-0.11.6.tar.gz 1076256 BLAKE2B 06e18259da72da03d535b081feef4eb5f7537144f9cdfd461dfc8bb4f0e8d66d4310c8677cfea265ff16527fb126cd0cdae292c421b16e9f4ef225d7a59f4aff SHA512 23fc568d2552d432eb182d7bf82b05b621ec1e0a44e45a10fdaec63b8a816b580ac88e3b43093ed9539e98d9dd2fb71c74af8423ecc33e9f5c8605eec748d06c
+DIST procs-0.11.9.tar.gz 1079425 BLAKE2B 085411f788ff6b6d5b4c2558205b875cfe497e6d31ea8a7fe161220b9af7a7a22000d0a04179f60adde5d5858277bb9fd28e145365a989a3c6479f93bf1139e5 SHA512 c657d7fd47364400f88deac83ebf86e917b6a60c5cd949f8b5f09059a2294702dd01c526dc875dd2643313fcf3e0e9dbac1715a35fd80b8560558f5393bab2ff
 DIST quote-1.0.9.crate 25042 BLAKE2B 26ef31e89fd2f0cc21ff65f8072f30c7977ac634d2536cf9845a0894d6659f62a96cd0a6ee48f7706036c2c1b898ef8c9167bd62714ad0c9cba4fb02f30922af SHA512 dd6cdaea183b85400531ef01e56657edbec0d8f7c27898c1e591b72dff755fa5875b33ca320bd65be0e9aecfc6a61ec119a4bd1291e9f2057fca642ab5b198c8
 DIST redox_syscall-0.1.57.crate 17087 BLAKE2B 88e3ffcfd752e757f8fadfd4edca367f9185f09e609c329bb36f179183cf103dc182aae701c14afb717d2b4c3d72ba307b49fc671cc97aa7c9d03df1a7a1835f SHA512 c6e187087060084b7173ed0d9d0e982e4259d4f76522112268c02ff20751382e3bc8e119da6153170f5c54bd5b9cb028910f2f85c1c842099205dccd44659184
 DIST redox_syscall-0.2.5.crate 23449 BLAKE2B 2d676dfe40f62285463a25f90ecf24ddb8548f91db1dffd779aaf9c1210bf1eb9c7c535b0d04ac7a483e0724d24ac1d1ed6c78884ad2631a53a870488b7578bc SHA512 f1625eaba110129942893e4cae548d22b6892d275124d29540c947d958e5bb7231309fe052cf15bddb23e0e8f0cdaadd002db5bdc3be578e843c46c175526adc
@@ -133,9 +156,7 @@ DIST rustc-demangle-0.1.18.crate 19913 BLAKE2B fd0b955e9f552d5a3759dec05bf5f971d
 DIST ryu-1.0.5.crate 49570 BLAKE2B 3bfba4a5f290a429de7ac3b86823b2a973f40eb6f48c15329173d95964d31ada36f2618be4b36774a03f97f2ce61364900c6a3ad5465a294e2df311a1f4104ed SHA512 d1708ffa3112a684edf2956b6730ead040401d38f1457cde074eaaa59c249007dc8b925629e7f6df89f7ea757e9d0826649d685cc8ede0a04d50296048bf476c
 DIST safemem-0.3.3.crate 7778 BLAKE2B 6ebc0e234054919687e8a369bc30ca6b007d0e4f8147157ba1a90c290b7f0b490e5c21a6d4406671e26ac073f9e4e06a2bc9b1f21eb152b05c4022a3a4ef3793 SHA512 2e4852ca91160f9f1e764b75145d794726a5f6c162cc99ecbf9cae20474a06cb3a0dfc245b895c51342240f6875423010b33e36d038b8b419a37e4820a9caf72
 DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
-DIST serde-1.0.125.crate 75144 BLAKE2B 0823f4cec3704ce5232c266fcb69323dbcd93d2d15712abcc8cc61a2d123d662ae8153a32b3723324ea55a40f2b9101ed654cced45c500fcf399b9d7ccc113b8 SHA512 ed2819d678e7405e2d8a0cc1b43540abf2ad8871eeda4985af5e37016a42b938d7429c4e865cec2ae5364cc7fbe1052a5a46ea51b42c3ed5b9c7c1acb596ac3b
 DIST serde-1.0.126.crate 75138 BLAKE2B 51f37473483da8a05670a213f02e119173e4c97a49313cf855ff3e547bb0969fcd84ccb7d1554e7c1761b388ac5cd917cd7e680e3ac23d2504412f75401c0937 SHA512 f22ec92b2eaed0819610ae2c4471eb12aa3a4209f5fbfe829c2329010813837d11ffc02d7809335df6a978cf7944095fae79c7593324dfd49becc7633dd626ed
-DIST serde_derive-1.0.125.crate 54155 BLAKE2B c99e9e806831dccb3ccca20675e11f603a7348c433a641a46cf9a448a7a8b7ee242d0d6110780089b08e88b8f33aef5b75e8b1d25e2e6d242a44e9093b2badfa SHA512 dd4e247c9581b437157f37e355bc3335a3927417920acce72e73d6fe05a80e19fb3160c72abede7842e7d54749c33a94335fe9f3468c2f561267b863df368a6f
 DIST serde_derive-1.0.126.crate 54189 BLAKE2B fa3ca8ef2e7d9bd29e682ac7df066bab05301c2b92dc8f12d254a7e8b29e8d8a83d5405def3050db00f7e396fdd14f18cfac7918a5218d4b6822463c7c0f5c5d SHA512 e3c430b82def037d2f1dcc96ff7dc075636c81ab8f12e07ba09d232bc8224204c7b0cddc994c1ec98400e50340e03d6bad0dfa624b4d869e5f29d72b293d30bf
 DIST serde_json-1.0.64.crate 115138 BLAKE2B c61a404db9800cfb4e2ac29d4e287a7c8f388b62407d5e25e07514e2840fdf9c127476db35cb556b56143755c64c26be1c6b1facc7529067b06946ac8f54a573 SHA512 55a45dd4c60fd93d2d9331f6a8eac39fdfece9ddc1aae45ea27e3dfa81352f08c71bf03906ba99d0feb5df8d847b68547ecaa8eb5a2c76011ebbe8d4cd5bfc2d
 DIST signal-hook-0.1.17.crate 27085 BLAKE2B 0e58cb64b07cb8c76a043f603edbf27bcc92040a1aadb2d0c96993b1ea1a55ef63a222ec51e1396d95bb4907016e1dbf20ba3f0c1915303828f187af44ba2df4 SHA512 253d1478d7a6491a0b423637a706c941cc2a9707d32d29126f48af808daf8acd88e59013936f8e164df687c04e3a8f5c201b5eeb1952e3269b1419efdb4df94f
@@ -143,14 +164,16 @@ DIST signal-hook-registry-1.3.0.crate 17786 BLAKE2B fbd4284bc1020145b92557a99628
 DIST slab-0.4.2.crate 10136 BLAKE2B e30cad459bbbb69c4b56a573c47f4188714e0da298d87015c35a86c9315dc2d4308f27d7758846069b0cf94c93f10c44b0f8895427cdf1c93ae20adbb21b5977 SHA512 f9fd70d0cc5180393cebbe87fe984de0c103db1c2c2648fb7a0ee22cdabf37a7338fd511538f00e9a5564365cce2879afe19bf77c435870197bd6cafef5d6661
 DIST smallvec-1.6.1.crate 26444 BLAKE2B ca6c50a63acdd93a2131654d99e50545a6e2d08eb3e2bd57d4a8ee073d90c08195ee442745a8d62a68179ce7bb8e229b7ff8c6fcf46372a9844bc9280b7c85cb SHA512 9e6061c8211a4485ab54eb541adf40748e1fc3fdfab0849e38e5fd34fc6cc69ae78bd065b788692385a6b8157b031c2fe373900e13d3e56e94fc08d574edaaad
 DIST socket2-0.3.19.crate 33782 BLAKE2B 1ab3c61a439c1594e19c4a14958d0a85b54666532d16eaa9a1e40e586b7707b1c7b5a751fb373f16bcc26510abc25e0321808e721c0b33b7b04416b9f6cbc5bb SHA512 113d902ca0b966bc0bcad71e3b7d715c79cd075d9dd7fc4140a042bac91b3ce692fb0f1fd0216fa3f6286920b4a92e1a4c342d7ae8d1d98ded36e7480ddafec9
+DIST socket2-0.4.0.crate 37949 BLAKE2B 10cad25fc39a2141913c82eb1d33c14cc7cf54ef7323c0031558aac89b1045f7433a81a8bba83f21523a3ed0ec793189d6333ed19ad06cfc1b70c28d730aa9a6 SHA512 7731bf377bc2f6f06b95d563452bdf1405aafebabc9211f4bd3a13847cc154ae9cff0951130e630fad9f7a53eadd30dfb92b918ae239d7cdec57c327f2cc464d
 DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
 DIST structopt-0.3.21.crate 50761 BLAKE2B e48bbec27a34ef80f28e21d42b5acc8b2cf012e1944a6b7f6395f4bd420281e18767dacabed0ca37d94ad26e73ed201c9df06d5cd781a4c107b5741eb0880e53 SHA512 df8592f10456a5b1a7bc7b290357c069ce4eba14d2558ecd6face231e49c748a8892c31ffad000b426e8180d3e4dd607329db91f4b5617e971b2edda5bab42f1
 DIST structopt-derive-0.4.14.crate 20116 BLAKE2B cfeb48f5e4906ca24b61afc085a5dc41edc6f69c6060a1cd7e01b844b076928111e4be2f24b3cb28e7704c09bdbbb3c3a1b2f9012ae9e23cc5f795af91fb1245 SHA512 bc20dd9d10c6dc1f5975b074a63eb84b49385ad272b62d8526962e88b28cada3998c3944dedaf8560d6577871747b875cd399dfe06851472c0a1c81fced429a0
 DIST syn-1.0.63.crate 231524 BLAKE2B 43398bc3ca9069db4d44af3b28e5e48034d6ac4f38bd1e3da8c77c9d1468d3d9f6f7b7c6711d1dd232d5f2d9477c5929a18368a003be42f6254f270cf5d6a74a SHA512 a0da342e44dc6509f35dad8534acd93bf1a9e3104c2d9eb9d66c38a25036c5aae0503bfee3e09d2e42cc117022b328b6d966444dfb434b780c78fea64dfb14b6
+DIST syn-1.0.67.crate 231889 BLAKE2B 28807964411994b126e132c42b1361d55788a641da24773d1f1006373d3c21048f78553682441766b7257e5b4a4a1833954075fd2c4965f949d8465ee57a3ca7 SHA512 06a5f203c7e4c6f6bed489bea7e171cc8f29020401eb32405373a838526c6a5bed47e1310f41636d475358c420b82837bc7c1f90374fa6d0e842dd0224de3552
 DIST synstructure-0.12.4.crate 18105 BLAKE2B 8e7efdfa8681da8473903aa22e8cc55abcede012b29a91d65076042c89a21048b44b774ca5c3f788222dd32fa634ac20f58ce241eff610498cac19f659280d29 SHA512 ab3024644719c4afc9c06a4d3c499fd4934c104409d38197a46d62c9ce30414f88b3e7bcdd7f245cfd207489fb54ba41e5cfc1db94b0dd12fb01e9c00c861c47
 DIST tar-0.4.33.crate 45448 BLAKE2B 380f20835bf04624c87201f54f575ce6f94a2ddcee4e58917777ce069fcc822101994d8b9f1f3a249d25e62d59527001807842e650edc9fbf7cdf55f65615da9 SHA512 69c5932790c2448d6d754a622066564027414ceff5b555c928f55f627c9e5e7c192e0c13f93af48d64d37d4f9f56c0cf8feeb3fe17d3861b277c66bcb8b1d9ec
-DIST termbg-0.2.0.crate 11533 BLAKE2B f99387e4eb4016a7874828763224327e845bda957ab97176ed9582f5027a45596c6aead82ce02432b00f1eaafcbd85a2bfb435ea688e4e0521a094d26f1f9ff9 SHA512 94b8cadec3899575f4dc1b05232c5035d0d969485b0dd0a98a2bb0c7d4b1f1bdbbac7823d639b8622b0258fa6c6c21ad59dc4fb761353ef0bfffe4f642258b6b
 DIST termbg-0.2.2.crate 11672 BLAKE2B 6a4abc2dcedbf148c7ae0738c815b8004444e73e3fef40dd9c885c9edc60e9643a94a79d2231dbaaf71978f4751db834c85b63d6211d3238b66e121d644c611b SHA512 e03a94880502d421f5f6c72fba4f48ddea2949ab83e8c2590cc4d031694077d0ab8d805d8f909a9d5784385b8dbe93b3b34f0c110c07d7a3e0d638c9201af699
+DIST termbg-0.3.0.crate 14972 BLAKE2B 185d9ae741a2aab9b4605ecfd9d2f428a8f848b6454d1ccf5ac1ec757244bc48e34c2e68b045174989eb952d0896c85158122adf32d21d1b19b6ae4ed7a48f66 SHA512 9a4fc85f50741dc4eb77f8a6df63bbb5e914ad009844d7da79221444c950b0bd9f952a3b3de591ecaf02729f9c275e74ed191d36c0e12e9c3328bf5c5a0cff0d
 DIST terminal_size-0.1.16.crate 8755 BLAKE2B 33cfd9a62bdb77bd096563330ee5f07465d69c16659294a9e6ebeccf3d49e17473185fb84c2a4b50d29b084da0633b2ac4bf41801b0bd17f5c927d9bf68fdce7 SHA512 afefb529a80249ec398b444f593b6010b2a85e65e29557373cec72ee18bac5a5359aa2da3cda28d494f34c8eaddfc8a82029fb936d49726261ae0c5557bd5c17
 DIST termios-0.2.2.crate 8966 BLAKE2B df99537abec76fe65a51bb5172d69cf0626045447b5aebc9e388b9b36b685f99919f032075ff6a3da82612b6fee5a0fa57d347136b66a761dc24b84ca4128749 SHA512 ded990bf8c1fa2bc31087ce077903eb8955687cd8ada25b82c4ab030ce3a73cede0ed4c599963c2d0c05c51e2a0c26f0d29d328b364342d21a73eaf4fc153f2c
 DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
@@ -178,12 +201,22 @@ DIST unix_socket-0.5.0.crate 12261 BLAKE2B 833c47f6359554cb76cbac50ed91380a2dbe4
 DIST url-2.2.1.crate 65434 BLAKE2B e9180c56afaf9dd781812b3650b28cee14a2330629e708bb8a67144f6c12e3781d07fae68166990bebaae60190a1a88dfa1d087d4982ed04d8cdfa59ae4a0d7e SHA512 f2065e68dd917cc174c222a44127ac10a59d25a87ccce6b88ac1e1e775856fd7d5931d728296db355117f94e71e12404fdd68a283545b543a2e00a659a6997ed
 DIST users-0.11.0.crate 21980 BLAKE2B c106e9ed67b9ad766bb7318506261579768185aea3d956d9e8b2adb52349525fe69703ee3bb2e4fb02aa223bfa6fc92a14d8128412623f70654254f842d7322c SHA512 e28028f895780bd59a11069b81b87470a287a447e42566cfb8de0e2d4ba8c90a3ce92901e253dcd2628383c8ed06c10714bc0181a57bf257f7edb3510936e596
 DIST utf8-width-0.1.4.crate 2995 BLAKE2B a314ab41d6544aa024a1a8dd4c52f5fddbf53a3847256329ddd779d1a6af7391fb156a33d39551416dffcf8a17bad5709cd5a97e0177ce21ba511291a87901eb SHA512 4777d0f4c971c33eedd808c110e48fdedc92336c17292e6df0704637c8d63905e1b0b6825fe958eef8e4e98327aac7126897b8681b80fb22c916b3a352ae0660
+DIST value-bag-1.0.0-alpha.7.crate 25101 BLAKE2B fed39744838121917d9783e4705a0de60a5d9495e6b18fefc5171f24196223f2f370dd1cde803769e286958c98f433dd4f368cd26e3830c9a8fb9c6812d33524 SHA512 e53e974f5b653ecab3653ae070a5d66f8db3986a1c7203d9714dbcd9d03c7bf468b85c13b9de0461a3bf8acd5b9526d215e67700b21d8d8a9b0ab3c7c5648143
 DIST vec_map-0.8.2.crate 14466 BLAKE2B 8f109fbff19604b82ea2aa61c952e2ce9b5597ccc8e1ef4e847648e2de08dece8c4debe92889edeccb8d393645fd0b62436b49d236ded7ad181c4a51239a9539 SHA512 4f1ef59bc2c437e79f1f84fe021bce5aa8ccd581f500f3d5776913d5f17d45b03ccee64f5bd03d47656318cfc9344a1f4311079d471fa409a8e4e94c143973f9
 DIST version_check-0.9.2.crate 11979 BLAKE2B 6568f8d4652fb470162bb2251be2260a6bf83e107a4f957ed91117938d5da48c42bedfb5e6622bcd6c37950805666b78984577bd8dae687dbb39e452078bd97c SHA512 b88a9d545ef103fe6d0eebe7ddcf328fc21fcb02c60828b347cfc35afd957669e652a94d880ef992450c167df3505838bc649e0d83896542fa13a149875acf26
 DIST void-1.0.2.crate 2356 BLAKE2B 41578fb5507f94e7d135f9595cec107ed00a926f4968df8b59792d1676ba5b6980cd67310f820fc37a9c14ebe43a171833fa8dfc09eac5dd42f2ebe808632a83 SHA512 1cc7d282600dc0164d7e410aa895d5dc99de1174991549c6733c94cc2027026517f66797751d737869eae58c560fa26edbf43f36b3015eb2fd99828fe40e0aa1
+DIST waker-fn-1.1.0.crate 7114 BLAKE2B e510eec0490f0caca3930000cecccde209ad387d1657c380f95122c68ccc15fcbe0684315d0aea28f094f2c65f7b7b08ae62f6ec95e0d67fc47e6af0ba4589e9 SHA512 80f612597534d9f8bdcd5e6bdff740805efe28242822bc6db360e114a23cb47ff88c74b8ab855bc764f0a73545e85a69d76bce1441e5899a36e41ca270695dc5
 DIST want-0.3.0.crate 6550 BLAKE2B d97ac51dd5e49bec27cd196711110679013bb7aca520235db3f38c7d4399a2a17b9cf599cd0811137df957f2341e75442d48483dc7aed6910f0eed7a78ddad37 SHA512 7e7af8ddcc6faed3e3d18384a000339617187b74b0adf111a02bc15fdb152c88007844d6fe6f35a47a13f3384a19ee4723b884623de7d45c6619d76aa6699404
 DIST wasi-0.10.0+wasi-snapshot-preview1.crate 26964 BLAKE2B 525db01649a5981ee82ad80a1a4bab9baffd235262452675619f36a1b454017a74593c53c129f8c30b865994bbe30ef19cebaad9d245ccf54b9b07ef70d5d8ec SHA512 88e2da617f50d9ebfb1e0c5857321fb86b5ee88ae8a8d199d3cc092e0f39688a2cb68503f7c6bb09dd6bc50a9a03597a1eb2e032150fbd0d0b8afa02ad771c88
 DIST wasi-0.9.0+wasi-snapshot-preview1.crate 31521 BLAKE2B 716bdd2ec46d0bc9911c5e5e29fc783840559931b2563d8619675fc11da9527ddbe653a0f1ce0b782ee0c5f7a3131aba2b0867d415f003aa9c2389357569e7dc SHA512 dbe641f796ee3a5daafcaafc911ecc6dff170340f477c2df7a61fb4858a85aefc2637c9e61973ecce66a987aa8e08a736273a4aad3ef47eaf61ed4268dbf9c47
+DIST wasm-bindgen-0.2.74.crate 158439 BLAKE2B 28a0be539d0bdec4e23d4c5a613ec0727c00112d1da1948c050d4ce6f5f42a07fce6d1f2fafa7a66ecee9183fee9a7c23845e12eb50d206f760bfc76dad41491 SHA512 21ac04c54be9f3d3f32edbcffcd24cb9401418e0a398a3f00b6d4a0302bb32b7b044b513163a12952b09b9465b07ec7e4c26a83ad88f8ae39ac5fdc9439a1af5
+DIST wasm-bindgen-backend-0.2.74.crate 25434 BLAKE2B 211365a4407865646376bc40fbfd9865715b137aadc18f267a9d32be8e0e585d05286f8a40cba20060e3591e3a5afa49f678bac6546cde7ef88c2bde36909724 SHA512 df9fdca6c48ecf1926552c4fe06a5936f7ea0523d62e0c62f104ce5eeae7ced1fa33875e2d3ef43d58a6395f77dd37e4882850443eb1d6aa59f0ec0bcf537cfb
+DIST wasm-bindgen-futures-0.4.24.crate 14759 BLAKE2B 608e230509509508130e955d839cb1cef0b3f4c2ce4b69ec61e6357397b9d476e63b69335510f18289de74d63dd007486b5bb74020b9e79344d4c2bb91db0825 SHA512 a1b2220c7760300fe07937b039eb6dbb86e0110f5600d366a6a365ab74ca7894ff251902a78bf5aa3757cdc55a9de316e24fa26c68bbfda4ecabdc42e273a385
+DIST wasm-bindgen-macro-0.2.74.crate 11536 BLAKE2B 65cd4b6206cc3f8303f89a76628cf54f7e31b31857eac3cc2c377b4a11f7c32548faf6a87f4a821e4ac6f66ca8d36427f4563eac8cc84e2612d5a9438b8df861 SHA512 34c7f3703ee1ee2060ba6ae638bc69193d32ced9e30c40d75bae1431efdd76b4f3adca8f9a72fb7c75f894de42a478556828e1a3854e436427bbd5dc6dc7b838
+DIST wasm-bindgen-macro-support-0.2.74.crate 17831 BLAKE2B 29f3828f58b0e8eaae04e1d73bbf0b4cea7b75c1a5ae4348938a5f77d9eb1a1ee13dd137f9750f4c8defa6f2f5444d66b6715bc5052c57a603bf3a94cb05a428 SHA512 feab4a3661a879d5fdef852531e3261060db46f1d80106926bc8a8294a19adb104a9cfb59f3fead693abf3707118084a063906248d3f4c566b43e9aa9c2983b4
+DIST wasm-bindgen-shared-0.2.74.crate 7163 BLAKE2B 076464004d12495342a4b24f1dedc629f0ebb49993fce74271a5e59cd39e9a38ceea9a287716c65c2e61744c829388f7cdd7597a541da22b4f794b8bc3d44094 SHA512 4613c677d04abcabe6132f8f2a5a24f622cb1cb0c084f535e2f97584acba7a0faa12fd0636186b58756a7e4a82f364b04ea73330d7841940917f5e3324d0e60a
+DIST web-sys-0.3.51.crate 651133 BLAKE2B 330aaa7323a516eb840b2a6ff0ee2e076ed70990c04679dca328d5eeae9aac01fb07a4e2852615715f14abe368989f84f159ac72a4c320c01437056dd7dec706 SHA512 fd0e1ec156d88699adc271d092dd1adf4d41cd554b2b49e2c53423eabbc2215b539a435d1b9146dccc40282339d766565ccdedef82febcafca43cb6e1437e5fc
+DIST wepoll-sys-3.0.1.crate 25807 BLAKE2B c6078643e6d3e47dc1028008a12eefca1c238e6057c3b8699f2a70ac2609973d9c4f76baa81f9b6e566228b0820172a132e7f9f438aadd0066d6067040fcff23 SHA512 f1a5e91ac284d9542cbdc891000309d67d9651058db3a7307e4a2378178920ae7e04525ae625d18e45c54c269b320061120c459b046a5f3f0373c1d15fc8d239
 DIST which-4.1.0.crate 7684 BLAKE2B 4d8eb0a263c14b506f446fa808d9326c6e4e781cc2d79a1f6efcf7b9bb9a294d3266a2f3de4526ac0ec08ca65a18622ac064e9ae1e86dd1b325b122f684371f8 SHA512 4fffd3dd4ac73f5c232ee8a53bbc948a7295a2a51ec3f792d5d0aa84ceb6c2322fc11b35d29f5d3181c763b34c434c5ea2807ae6cc3393cd30d68b0fd44c7a22
 DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
diff --git a/sys-apps/procs/procs-0.11.5.ebuild b/sys-apps/procs/procs-0.11.5.ebuild
deleted file mode 100644
index 1799a70966..0000000000
--- a/sys-apps/procs/procs-0.11.5.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 2017-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CRATES="
-addr2line-0.14.1
-adler-1.0.2
-ansi_term-0.11.0
-anyhow-1.0.40
-arrayref-0.3.6
-arrayvec-0.5.2
-atty-0.2.14
-autocfg-1.0.1
-backtrace-0.3.56
-backtrace-sys-0.1.23
-base64-0.9.3
-base64-0.13.0
-bitflags-1.2.1
-blake2b_simd-0.5.11
-byte-unit-4.0.11
-byteorder-1.4.3
-bytes-0.5.6
-bytes-1.0.1
-cc-1.0.67
-cfg-if-0.1.10
-cfg-if-1.0.0
-chrono-0.4.19
-clap-2.33.3
-console-0.14.1
-constant_time_eq-0.1.5
-crc32fast-1.2.1
-crossbeam-utils-0.8.3
-crossterm-0.18.2
-crossterm_winapi-0.6.2
-directories-3.0.2
-dirs-1.0.5
-dirs-sys-0.3.6
-dockworker-0.0.22
-either-1.6.1
-encode_unicode-0.3.6
-errno-0.2.7
-errno-dragonfly-0.1.1
-failure-0.1.8
-failure_derive-0.1.8
-filetime-0.2.14
-flate2-1.0.20
-fnv-1.0.7
-form_urlencoded-1.0.1
-fuchsia-zircon-0.3.3
-fuchsia-zircon-sys-0.3.3
-futures-0.3.13
-futures-channel-0.3.13
-futures-core-0.3.13
-futures-executor-0.3.13
-futures-io-0.3.13
-futures-macro-0.3.13
-futures-sink-0.3.13
-futures-task-0.3.13
-futures-util-0.3.13
-gcc-0.3.55
-getch-0.2.1
-getrandom-0.1.16
-getrandom-0.2.2
-gimli-0.23.0
-h2-0.2.7
-hashbrown-0.9.1
-heck-0.3.2
-hermit-abi-0.1.18
-hex-0.4.3
-http-0.2.3
-http-body-0.3.1
-httparse-1.3.5
-httpdate-0.3.2
-hyper-0.13.10
-hyperlocal-0.7.0
-hyperx-1.3.0
-idna-0.2.2
-indexmap-1.6.2
-instant-0.1.9
-iovec-0.1.4
-itoa-0.4.7
-kernel32-sys-0.2.2
-language-tags-0.2.2
-lazy_static-1.4.0
-libc-0.2.94
-libproc-0.9.1
-lock_api-0.4.2
-log-0.4.14
-matches-0.1.8
-memchr-2.3.4
-mime-0.3.16
-miniz_oxide-0.4.4
-mio-0.6.23
-mio-0.7.9
-mio-named-pipes-0.1.7
-mio-uds-0.6.8
-miow-0.2.2
-miow-0.3.6
-named_pipe-0.2.4
-net2-0.2.37
-nix-0.15.0
-ntapi-0.3.6
-num-integer-0.1.44
-num-traits-0.2.14
-num_cpus-1.13.0
-object-0.23.0
-pager-0.16.0
-parking_lot-0.11.1
-parking_lot_core-0.8.3
-percent-encoding-2.1.0
-pin-project-0.4.27
-pin-project-1.0.5
-pin-project-internal-0.4.27
-pin-project-internal-1.0.5
-pin-project-lite-0.1.12
-pin-project-lite-0.2.6
-pin-utils-0.1.0
-proc-macro-error-1.0.4
-proc-macro-error-attr-1.0.4
-proc-macro-hack-0.5.19
-proc-macro-nested-0.1.7
-proc-macro2-1.0.24
-procfs-0.9.1
-quote-1.0.9
-redox_syscall-0.1.57
-redox_syscall-0.2.5
-redox_users-0.3.5
-redox_users-0.4.0
-regex-1.4.4
-regex-syntax-0.6.23
-rust-argon2-0.8.3
-rustc-demangle-0.1.18
-ryu-1.0.5
-safemem-0.3.3
-scopeguard-1.1.0
-serde-1.0.125
-serde_derive-1.0.125
-serde_json-1.0.64
-signal-hook-0.1.17
-signal-hook-registry-1.3.0
-slab-0.4.2
-smallvec-1.6.1
-socket2-0.3.19
-strsim-0.8.0
-structopt-0.3.21
-structopt-derive-0.4.14
-syn-1.0.63
-synstructure-0.12.4
-tar-0.4.33
-termbg-0.2.0
-terminal_size-0.1.16
-termios-0.2.2
-textwrap-0.11.0
-thiserror-1.0.24
-thiserror-impl-1.0.24
-time-0.1.44
-tinyvec-1.1.1
-tinyvec_macros-0.1.0
-tokio-0.2.25
-tokio-macros-0.2.6
-tokio-util-0.3.1
-toml-0.5.8
-tower-service-0.3.1
-tracing-0.1.25
-tracing-core-0.1.17
-tracing-futures-0.2.5
-try-lock-0.2.3
-unicase-2.6.0
-unicode-bidi-0.3.4
-unicode-normalization-0.1.17
-unicode-segmentation-1.7.1
-unicode-width-0.1.8
-unicode-xid-0.2.1
-unix_socket-0.5.0
-url-2.2.1
-users-0.11.0
-utf8-width-0.1.4
-vec_map-0.8.2
-version_check-0.9.2
-void-1.0.2
-want-0.3.0
-wasi-0.9.0+wasi-snapshot-preview1
-wasi-0.10.0+wasi-snapshot-preview1
-which-4.1.0
-winapi-0.2.8
-winapi-0.3.9
-winapi-build-0.1.1
-winapi-i686-pc-windows-gnu-0.4.0
-winapi-x86_64-pc-windows-gnu-0.4.0
-ws2_32-sys-0.2.1
-xattr-0.2.2
-"
-
-inherit cargo
-
-DESCRIPTION="A modern replacement for ps"
-HOMEPAGE="https://github.com/dalance/procs"
-SRC_URI="
-	https://github.com/dalance/procs/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	$(cargo_crate_uris ${CRATES})
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-RESTRICT="mirror"
-QA_FLAGS_IGNORED="usr/bin/procs"
diff --git a/sys-apps/procs/procs-0.11.9.ebuild b/sys-apps/procs/procs-0.11.9.ebuild
new file mode 100644
index 0000000000..aa5ff68d03
--- /dev/null
+++ b/sys-apps/procs/procs-0.11.9.ebuild
@@ -0,0 +1,239 @@
+# Copyright 2017-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+	addr2line-0.14.1
+	adler-1.0.2
+	ansi_term-0.11.0
+	anyhow-1.0.41
+	arrayref-0.3.6
+	arrayvec-0.5.2
+	async-channel-1.6.1
+	async-executor-1.4.1
+	async-global-executor-2.0.2
+	async-io-1.4.1
+	async-lock-2.4.0
+	async-mutex-1.4.0
+	async-std-1.9.0
+	async-task-4.0.3
+	atomic-waker-1.0.0
+	atty-0.2.14
+	autocfg-1.0.1
+	backtrace-0.3.56
+	backtrace-sys-0.1.23
+	base64-0.9.3
+	base64-0.13.0
+	bitflags-1.2.1
+	blake2b_simd-0.5.11
+	blocking-1.0.2
+	bumpalo-3.6.1
+	byte-unit-4.0.12
+	byteorder-1.4.3
+	bytes-0.5.6
+	bytes-1.0.1
+	cache-padded-1.1.1
+	cc-1.0.67
+	cfg-if-0.1.10
+	cfg-if-1.0.0
+	chrono-0.4.19
+	clap-2.33.3
+	concurrent-queue-1.2.2
+	console-0.14.1
+	constant_time_eq-0.1.5
+	crc32fast-1.2.1
+	crossbeam-utils-0.8.3
+	crossterm-0.19.0
+	crossterm_winapi-0.7.0
+	ctor-0.1.20
+	directories-3.0.2
+	dirs-1.0.5
+	dirs-sys-0.3.6
+	dockworker-0.0.23
+	either-1.6.1
+	encode_unicode-0.3.6
+	errno-0.2.7
+	errno-dragonfly-0.1.1
+	event-listener-2.5.1
+	failure-0.1.8
+	failure_derive-0.1.8
+	fastrand-1.4.1
+	filetime-0.2.14
+	flate2-1.0.20
+	fnv-1.0.7
+	form_urlencoded-1.0.1
+	fuchsia-zircon-0.3.3
+	fuchsia-zircon-sys-0.3.3
+	futures-0.3.13
+	futures-channel-0.3.13
+	futures-core-0.3.13
+	futures-executor-0.3.13
+	futures-io-0.3.13
+	futures-lite-1.11.3
+	futures-macro-0.3.13
+	futures-sink-0.3.13
+	futures-task-0.3.13
+	futures-util-0.3.13
+	gcc-0.3.55
+	getch-0.2.1
+	getrandom-0.1.16
+	getrandom-0.2.2
+	gimli-0.23.0
+	gloo-timers-0.2.1
+	h2-0.2.7
+	hashbrown-0.9.1
+	heck-0.3.2
+	hermit-abi-0.1.18
+	hex-0.4.3
+	http-0.2.3
+	http-body-0.3.1
+	httparse-1.3.5
+	httpdate-0.3.2
+	hyper-0.13.10
+	hyperlocal-0.7.0
+	idna-0.2.2
+	indexmap-1.6.2
+	instant-0.1.9
+	iovec-0.1.4
+	itoa-0.4.7
+	js-sys-0.3.51
+	kernel32-sys-0.2.2
+	kv-log-macro-1.0.7
+	lazy_static-1.4.0
+	libc-0.2.97
+	libproc-0.9.1
+	lock_api-0.4.2
+	log-0.4.14
+	matches-0.1.8
+	memchr-2.3.4
+	mime-0.3.16
+	miniz_oxide-0.4.4
+	mio-0.6.23
+	mio-0.7.9
+	mio-named-pipes-0.1.7
+	mio-uds-0.6.8
+	miow-0.2.2
+	miow-0.3.6
+	named_pipe-0.2.4
+	net2-0.2.37
+	nix-0.15.0
+	ntapi-0.3.6
+	num-integer-0.1.44
+	num-traits-0.2.14
+	num_cpus-1.13.0
+	object-0.23.0
+	once_cell-1.7.2
+	pager-0.16.0
+	parking-2.0.0
+	parking_lot-0.11.1
+	parking_lot_core-0.8.3
+	percent-encoding-2.1.0
+	pin-project-0.4.27
+	pin-project-1.0.5
+	pin-project-internal-0.4.27
+	pin-project-internal-1.0.5
+	pin-project-lite-0.1.12
+	pin-project-lite-0.2.6
+	pin-utils-0.1.0
+	polling-2.0.3
+	proc-macro-error-1.0.4
+	proc-macro-error-attr-1.0.4
+	proc-macro-hack-0.5.19
+	proc-macro-nested-0.1.7
+	proc-macro2-1.0.24
+	procfs-0.9.1
+	quote-1.0.9
+	redox_syscall-0.1.57
+	redox_syscall-0.2.5
+	redox_users-0.3.5
+	redox_users-0.4.0
+	regex-1.4.4
+	regex-syntax-0.6.23
+	rust-argon2-0.8.3
+	rustc-demangle-0.1.18
+	ryu-1.0.5
+	safemem-0.3.3
+	scopeguard-1.1.0
+	serde-1.0.126
+	serde_derive-1.0.126
+	serde_json-1.0.64
+	signal-hook-0.1.17
+	signal-hook-registry-1.3.0
+	slab-0.4.2
+	smallvec-1.6.1
+	socket2-0.3.19
+	socket2-0.4.0
+	strsim-0.8.0
+	structopt-0.3.21
+	structopt-derive-0.4.14
+	syn-1.0.67
+	synstructure-0.12.4
+	tar-0.4.33
+	termbg-0.3.0
+	terminal_size-0.1.16
+	termios-0.2.2
+	textwrap-0.11.0
+	thiserror-1.0.24
+	thiserror-impl-1.0.24
+	time-0.1.44
+	tinyvec-1.1.1
+	tinyvec_macros-0.1.0
+	tokio-0.2.25
+	tokio-macros-0.2.6
+	tokio-util-0.3.1
+	toml-0.5.8
+	tower-service-0.3.1
+	tracing-0.1.25
+	tracing-core-0.1.17
+	tracing-futures-0.2.5
+	try-lock-0.2.3
+	unicode-bidi-0.3.4
+	unicode-normalization-0.1.17
+	unicode-segmentation-1.7.1
+	unicode-width-0.1.8
+	unicode-xid-0.2.1
+	unix_socket-0.5.0
+	url-2.2.1
+	users-0.11.0
+	utf8-width-0.1.4
+	value-bag-1.0.0-alpha.7
+	vec_map-0.8.2
+	version_check-0.9.2
+	void-1.0.2
+	waker-fn-1.1.0
+	want-0.3.0
+	wasi-0.9.0+wasi-snapshot-preview1
+	wasi-0.10.0+wasi-snapshot-preview1
+	wasm-bindgen-0.2.74
+	wasm-bindgen-backend-0.2.74
+	wasm-bindgen-futures-0.4.24
+	wasm-bindgen-macro-0.2.74
+	wasm-bindgen-macro-support-0.2.74
+	wasm-bindgen-shared-0.2.74
+	web-sys-0.3.51
+	wepoll-sys-3.0.1
+	which-4.1.0
+	winapi-0.2.8
+	winapi-0.3.9
+	winapi-build-0.1.1
+	winapi-i686-pc-windows-gnu-0.4.0
+	winapi-x86_64-pc-windows-gnu-0.4.0
+	ws2_32-sys-0.2.1
+	xattr-0.2.2
+"
+
+inherit cargo
+
+DESCRIPTION="A modern replacement for ps"
+HOMEPAGE="https://github.com/dalance/procs"
+SRC_URI="
+	https://github.com/dalance/procs/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	$(cargo_crate_uris ${CRATES})
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+RESTRICT="mirror"
+QA_FLAGS_IGNORED="usr/bin/procs"
diff --git a/sys-apps/sysz/Manifest b/sys-apps/sysz/Manifest
new file mode 100644
index 0000000000..1879efcb90
--- /dev/null
+++ b/sys-apps/sysz/Manifest
@@ -0,0 +1 @@
+DIST sysz-1.4.0.tar.gz 7451 BLAKE2B ee052fb4ab4ff2632be13966f56b7c4f4df86121e92087674c3f8df353c53c338a2128eb279d33f66a9651126413e381fbc82b896eb3af41781d045ab31d752e SHA512 c2700b5cb2b9a72215ec0ecb76b24f8aa2f43ade64ad394d7d37761d3ef7c6936c515b11617baa36727739b56795ec7f154ead7ab9eda8ab926f27e9f60c8343
diff --git a/sys-apps/sysz/metadata.xml b/sys-apps/sysz/metadata.xml
new file mode 100644
index 0000000000..81beb195dd
--- /dev/null
+++ b/sys-apps/sysz/metadata.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>lssndrbarbieri@gmail.com</email>
+    <name>Alessandro Barbieri</name>
+  </maintainer>
+  <upstream>
+    <bugs-to>https://github.com/joehillen/sysz/issues</bugs-to>
+    <remote-id type="github">joehillen/sysz</remote-id>
+  </upstream>
+  <longdescription lang="en">
+Features
+
+See and filter both system and user units simultaneously.
+Supports all unit types.
+Units ordered by service, timer, socket, and the rest.
+Runs sudo automatically and only if necessary.
+Filter units by state using ctrl-s or the --state option.
+Run daemon-reload with ctrl-r.
+Has short versions of systemctl commands to reduce typing.
+Runs status after other commands (start, stop, restart, etc).
+Select multiple units, states, and commands using TAB.
+Only prompts commands based on current state (e.g. show "start" only if the unit is inactive).
+  </longdescription>
+</pkgmetadata>
diff --git a/sys-apps/sysz/sysz-1.4.0.ebuild b/sys-apps/sysz/sysz-1.4.0.ebuild
new file mode 100644
index 0000000000..c4437c3e14
--- /dev/null
+++ b/sys-apps/sysz/sysz-1.4.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="An fzf terminal UI for systemctl"
+HOMEPAGE="https://github.com/joehillen/sysz"
+SRC_URI="https://github.com/joehillen/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Unlicense"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=app-shells/bash-4.3
+	>=app-shells/fzf-0.27.1
+	virtual/awk
+"
+#	removed to make GURU CI happy
+#	sys-apps/systemd
+
+DOCS=( README.md CHANGELOG.md )
+
+src_compile() {
+	:
+}
+
+src_install() {
+	dobin "${PN}"
+	einstalldocs
+}
diff --git a/sys-auth/keystone/Manifest b/sys-auth/keystone/Manifest
index a93d9075ae..3ab51e8c4d 100644
--- a/sys-auth/keystone/Manifest
+++ b/sys-auth/keystone/Manifest
@@ -1,2 +1,2 @@
-DIST keystone-18.0.0.tar.gz 1679326 BLAKE2B 714df5a1d7c6d601d1743a2dd3bac57c1006aeb9361241edf4205c583b6df6763411c27aa0d420aa94ee2a8cc581678013cc27ae8a97747f903d61fc852afb6e SHA512 48aa9aae46e0f61596222aa37def152cdb48876afb7edc1eadf84ea91c8bd2f6bfd645d64e9bfb82cf9d041d7ae432c34d25e34130b32b4815d9a73cea903ffc
-DIST keystone.conf.sample-18.0.0 107458 BLAKE2B c1d826acdd671638fc4542864811bda8baa237cfbf24438fa0cedc12e6f29047178cfb1b837c0aef035410848ce3e473e58b51f0eadee4c61eb75f214c65c35a SHA512 6488a1c3eac0d1376db0950cda65c62ba04dc03d896a6c0465ea09b870e5d077ed5012a84657defb9f63db25ce320c884f72c4083e4a233f18930120194ba73b
+DIST keystone-20.0.0.0rc1.tar.gz 1729520 BLAKE2B 69d870dacf786a8e7ef8474027e83e15950432d232f221715f850ae731dcc6d6620684c6118d95333d674de1a7e2790919ffc1f09e553e25b2eedb999c5c38d3 SHA512 9ff450d80270f9fe037f0e21f8322de10a0f80c51b59226b8c62f3dc8b07e5af49c63aa33c6682203e295c1eb54842332a02c9ad7b4e9dd64653d1ee4536944e
+DIST keystone.conf.sample-20.0.0.0_rc1 107458 BLAKE2B c1d826acdd671638fc4542864811bda8baa237cfbf24438fa0cedc12e6f29047178cfb1b837c0aef035410848ce3e473e58b51f0eadee4c61eb75f214c65c35a SHA512 6488a1c3eac0d1376db0950cda65c62ba04dc03d896a6c0465ea09b870e5d077ed5012a84657defb9f63db25ce320c884f72c4083e4a233f18930120194ba73b
diff --git a/sys-auth/keystone/keystone-18.0.0.ebuild b/sys-auth/keystone/keystone-20.0.0.0_rc1.ebuild
similarity index 71%
rename from sys-auth/keystone/keystone-18.0.0.ebuild
rename to sys-auth/keystone/keystone-20.0.0.0_rc1.ebuild
index c30bc0bea7..2dd4e531de 100644
--- a/sys-auth/keystone/keystone-18.0.0.ebuild
+++ b/sys-auth/keystone/keystone-20.0.0.0_rc1.ebuild
@@ -1,37 +1,32 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-PYTHON_COMPAT=( python3_8 )
+EAPI=8
+
 DISTUTILS_USE_SETUPTOOLS=rdepend
+MYP="${P/_/}"
+PYTHON_COMPAT=( python3_8 )
 
 inherit distutils-r1
 
 DESCRIPTION="The Openstack authentication, authorization, and service catalog"
-HOMEPAGE="https://launchpad.net/keystone"
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/victoria/keystone.conf.sample -> keystone.conf.sample-${PV}"
-	EGIT_REPO_URI="https://github.com/openstack/keystone.git"
-	EGIT_BRANCH="stable/victoria"
-else
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/victoria/keystone.conf.sample -> keystone.conf.sample-${PV}
-	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
+HOMEPAGE="
+	https://opendev.org/openstack/keystone
+	https://launchpad.net/keystone
+	https://pypi.org/project/keystone
+"
+SRC_URI="
+	https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/victoria/keystone.conf.sample -> keystone.conf.sample-${PV}
+	https://tarballs.openstack.org/${PN}/${MYP}.tar.gz
+"
+S="${WORKDIR}/${MYP}"
 
+KEYWORDS="~amd64"
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="+sqlite ldap memcached mongo mysql postgres test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
+IUSE="+sqlite ldap memcached mongo mysql postgres"
 
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="
-	${CDEPEND}"
 RDEPEND="
-	${CDEPEND}
 	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
 	>=dev-python/flask-1.0.2[${PYTHON_USEDEP}]
 	>=dev-python/flask-restful-0.3.5[${PYTHON_USEDEP}]
@@ -41,7 +36,6 @@ RDEPEND="
 	)
 	mysql? (
 		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
-		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
 		>=dev-python/sqlalchemy-1.3.0[${PYTHON_USEDEP}]
 	)
 	postgres? (
@@ -56,17 +50,16 @@ RDEPEND="
 	>=dev-python/bcrypt-3.1.3[${PYTHON_USEDEP}]
 	>=dev-python/scrypt-0.8.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-6.8.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-context-2.22.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-db-6.0.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
 	>=dev-python/oslo-log-3.44.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-3.0.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-1.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-upgradecheck-0.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-3.7.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-2.18.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-upgradecheck-1.3.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
 	>=dev-python/oauthlib-0.6.2[${PYTHON_USEDEP}]
 	>=dev-python/pysaml2-5.0.0[${PYTHON_USEDEP}]
@@ -74,7 +67,6 @@ RDEPEND="
 	>=dev-python/dogpile-cache-1.0.2[${PYTHON_USEDEP}]
 	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
 	>=dev-python/pycadf-1.1.0[${PYTHON_USEDEP}]
-	!~dev-python/pycadf-2.0.0[${PYTHON_USEDEP}]
 	>=dev-python/msgpack-0.5.0[${PYTHON_USEDEP}]
 	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
 	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
@@ -83,7 +75,6 @@ RDEPEND="
 	)
 	mongo? (
 		>=dev-python/pymongo-3.0.2[${PYTHON_USEDEP}]
-		!~dev-python/pymongo-3.1[${PYTHON_USEDEP}]
 	)
 	ldap? (
 		>=dev-python/python-ldap-3.1.0[${PYTHON_USEDEP}]
@@ -95,7 +86,33 @@ RDEPEND="
 		www-servers/gunicorn[${PYTHON_USEDEP}]
 	)
 	acct-user/keystone
-	acct-group/keystone"
+	acct-group/keystone
+"
+DEPEND="
+	${RDEPEND}
+	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/bashate-0.5.1[${PYTHON_USEDEP}]
+		>=dev-python/stestr-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/freezegun-0.3.6[${PYTHON_USEDEP}]
+		>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
+		>=dev-python/oslo-db-6.0.0[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/lxml-4.5.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/webtest-2.0.27[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/tempest-17.1.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	)
+"
+
+REQUIRED_USE="
+	|| ( mysql postgres sqlite )
+	test? ( ldap )
+"
+
+distutils_enable_tests pytest
 
 python_prepare_all() {
 	# it's in git, but not in the tarball.....
@@ -108,14 +125,6 @@ python_prepare_all() {
 	distutils-r1_python_prepare_all
 }
 
-python_test() {
-	nosetests -I 'test_keystoneclient*' \
-		-e test_static_translated_string_is_Message \
-		-e test_get_token_id_error_handling \
-		-e test_provider_token_expiration_validation \
-		-e test_import --process-restartworker --process-timeout=60 || die "testsuite failed under python2.7"
-}
-
 python_install_all() {
 	distutils-r1_python_install_all
 
@@ -132,7 +141,7 @@ python_install_all() {
 
 	fowners keystone:keystone /etc/keystone /etc/keystone/httpd /var/log/keystone
 	# stupid python doing stupid things
-	rm -r "${ED}"/usr/etc
+	rm -r "${ED}/usr/etc" || die
 }
 
 pkg_postinst() {
diff --git a/sys-cluster/nova/Manifest b/sys-cluster/nova/Manifest
index 6a71dd61ee..35ff283772 100644
--- a/sys-cluster/nova/Manifest
+++ b/sys-cluster/nova/Manifest
@@ -1,2 +1,2 @@
-DIST nova-22.2.1.tar.gz 9274586 BLAKE2B fb44f5cbd544c08d92aef48ef2858806245f1f36f2edc1a86a03189b460431add656d00dea830bf4fd324c79bf0d0e057b06836b25f554eea6416af3c2821bce SHA512 59df339bb00d4a7e087cc9caf6d6efcb1e5205ea8889502d00c4c22eb4acc6c0f19383de76f260382d56e145fad01088c3fd28f41d26441303e13b3b839ddcce
-DIST nova.conf.sample-22.2.1 187107 BLAKE2B e577126b67f2cc1aa6597f89b1632007f726ad85875d5f27041d0f9ac88923b944fe7f45ae2b3332157713b5f93034dad4da2860917b025649a52d7d71986612 SHA512 4149f8f19a573e8717f521183ba330853742bb6731f0e9ef02842d3be1c188ea3a2cdbeb6043086869360b9b1174a17e221c4ad1f543f74220c46cf31b1ca970
+DIST nova-24.0.0.0rc2.tar.gz 9359645 BLAKE2B 3f1e09c17957025600d9cfab3340c64a424ad71e15baafd741b9fc25d95494b7489d1f54128b08ce0edcc02eb8ba8f856bad78c1937619a3db1dfff3a4ebaf91 SHA512 431acd7158af539dd8c7231708000e8a2c558471e25e62472e2f0dd7c69eea09e5aeb67d63415c5a28a2bd6405f4556906abc4e8853e3c3dae85ba31d5df5bb8
+DIST nova.conf.sample-24.0.0.0_rc2 187107 BLAKE2B e577126b67f2cc1aa6597f89b1632007f726ad85875d5f27041d0f9ac88923b944fe7f45ae2b3332157713b5f93034dad4da2860917b025649a52d7d71986612 SHA512 4149f8f19a573e8717f521183ba330853742bb6731f0e9ef02842d3be1c188ea3a2cdbeb6043086869360b9b1174a17e221c4ad1f543f74220c46cf31b1ca970
diff --git a/sys-cluster/nova/nova-22.2.1.ebuild b/sys-cluster/nova/nova-24.0.0.0_rc2.ebuild
similarity index 64%
rename from sys-cluster/nova/nova-22.2.1.ebuild
rename to sys-cluster/nova/nova-24.0.0.0_rc2.ebuild
index a47ef15f47..25d20f7058 100644
--- a/sys-cluster/nova/nova-22.2.1.ebuild
+++ b/sys-cluster/nova/nova-24.0.0.0_rc2.ebuild
@@ -1,61 +1,50 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
+MYP="${P//_/}"
 PYTHON_COMPAT=( python3_8 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1 linux-info multilib udev
+
+inherit distutils-r1 linux-info udev
 
 DESCRIPTION="Cloud computing fabric controller"
-HOMEPAGE="https://launchpad.net/nova"
-
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/victoria/nova.conf.sample -> nova.conf.sample-${PV}"
-	EGIT_REPO_URI="https://github.com/openstack/nova.git"
-	EGIT_BRANCH="stable/victoria"
-else
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/victoria/nova.conf.sample -> nova.conf.sample-${PV}
-	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
+HOMEPAGE="
+	https://launchpad.net/nova
+	https://opendev.org/openstack/nova
+	https://pypi.org/project/nova
+"
+SRC_URI="
+	https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/victoria/nova.conf.sample -> nova.conf.sample-${PV}
+	https://tarballs.openstack.org/${PN}/${MYP}.tar.gz
+"
+S="${WORKDIR}/${MYP}"
 
+KEYWORDS="~amd64"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="+compute compute-only iscsi +memcached +mysql +novncproxy openvswitch postgres +rabbitmq sqlite"
-REQUIRED_USE="
-	!compute-only? ( || ( mysql postgres sqlite ) )
-	compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite )"
-
-CDEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="
-	${CDEPEND}
-	app-admin/sudo"
 
 RDEPEND="
-	${CDEPEND}
+	>=dev-python/pbr-5.5.1[${PYTHON_USEDEP}]
 	compute-only? (
-		>=dev-python/sqlalchemy-1.2.19[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.4.13[${PYTHON_USEDEP}]
 	)
 	sqlite? (
-		>=dev-python/sqlalchemy-1.2.19[sqlite,${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.4.13[sqlite,${PYTHON_USEDEP}]
 	)
 	mysql? (
 		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
-		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.2.19[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.4.13[${PYTHON_USEDEP}]
 	)
 	postgres? (
 		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.2.19[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.4.13[${PYTHON_USEDEP}]
 	)
 	>=dev-python/decorator-4.1.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.22.0[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.30.1[${PYTHON_USEDEP}]
 	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-4.17.0[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-4.20.0[${PYTHON_USEDEP}]
 	>=dev-python/lxml-4.5.0[${PYTHON_USEDEP}]
 	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
 	>=dev-python/cryptography-2.7[${PYTHON_USEDEP}]
@@ -64,7 +53,6 @@ RDEPEND="
 	>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
 	>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
 	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
 	>=dev-python/sqlalchemy-migrate-0.13.0[${PYTHON_USEDEP}]
 	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
 	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
@@ -72,40 +60,37 @@ RDEPEND="
 	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
 	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
 	>=dev-python/python-cinderclient-3.3.0[${PYTHON_USEDEP}]
-	!~dev-python/python-cinderclient-4.0.0[${PYTHON_USEDEP}]
 	>=dev-python/keystoneauth-3.16.0[${PYTHON_USEDEP}]
-	>=dev-python/python-neutronclient-6.7.0[${PYTHON_USEDEP}]
+	>=dev-python/python-neutronclient-7.1.0[${PYTHON_USEDEP}]
 	>=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.23.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.11.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.25.1[${PYTHON_USEDEP}]
 	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
 	>=dev-python/websockify-0.9.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.29.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-6.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.22.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-4.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-8.6.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-3.1.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-4.4.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.21.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-upgradecheck-0.1.1[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-4.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.44.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-4.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-upgradecheck-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-4.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-10.0.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-messaging-10.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-privsep-1.33.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.40.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-3.7.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-privsep-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-5.0.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-2.5.0[${PYTHON_USEDEP}]
 	>=dev-python/rfc3986-1.2.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
 	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
 	>=dev-python/oslo-versionedobjects-1.35.0[${PYTHON_USEDEP}]
-	>=dev-python/os-brick-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/os-resource-classes-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/os-traits-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/os-vif-1.14.0[${PYTHON_USEDEP}]
-	>=dev-python/os-win-4.2.0[${PYTHON_USEDEP}]
+	>=dev-python/os-brick-4.3.1[${PYTHON_USEDEP}]
+	>=dev-python/os-resource-classes-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/os-traits-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/os-vif-1.15.2[${PYTHON_USEDEP}]
+	>=dev-python/os-win-5.4.0[${PYTHON_USEDEP}]
 	>=dev-python/castellan-0.16.0[${PYTHON_USEDEP}]
 	>=dev-python/microversion-parse-0.2.1[${PYTHON_USEDEP}]
 	>=dev-python/os-xenapi-0.3.4[${PYTHON_USEDEP}]
@@ -115,10 +100,11 @@ RDEPEND="
 	>=dev-python/retrying-1.3.3[${PYTHON_USEDEP}]
 	>=dev-python/os-service-types-1.7.0[${PYTHON_USEDEP}]
 	>=dev-python/taskflow-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}]
 	>=dev-python/zVMCloudConnector-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/futurist-1.8.0[${PYTHON_USEDEP}]
 	>=dev-python/openstacksdk-0.35.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
 	dev-python/libvirt-python[${PYTHON_USEDEP}]
 	app-emulation/libvirt[iscsi?]
 	app-emulation/spice-html5
@@ -143,11 +129,43 @@ RDEPEND="
 		>=sys-block/open-iscsi-2.0.873-r1
 	)
 	acct-user/nova
-	acct-group/nova"
+	acct-group/nova
+"
+DEPEND="
+	${RDEPEND}
+	app-admin/sudo
+	test? (
+		>=dev-python/types-paramiko-0.1.3[${PYTHON_USEDEP}]
+		>=dev-python/ddt-1.2.1[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-3.0.0[${PYTHON_USEDEP}]
+		dev-python/psycopg:2[${PYTHON_USEDEP}]
+		>=dev-python/pymysql-0.8.0[${PYTHON_USEDEP}]
+		>=dev-python/python-barbicanclient-4.5.2[${PYTHON_USEDEP}]
+		>=dev-python/python-ironicclient-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.8.0[${PYTHON_USEDEP}]
+		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
+		>=dev-python/gabbi-1.35.0[${PYTHON_USEDEP}]
+		>=dev-python/wsgi_intercept-1.7.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-vmware-3.6.0[${PYTHON_USEDEP}]
+	)
+"
 
+REQUIRED_USE="
+	!compute-only? ( || ( mysql postgres sqlite ) )
+	compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite )
+	test? ( mysql )
+"
 #PATCHES=(
 #)
 
+distutils_enable_tests pytest
+
 pkg_setup() {
 	linux-info_pkg_setup
 	CONFIG_CHECK_MODULES="BLK_DEV_NBD VHOST_NET IP6_NF_FILTER IP6_NF_IPTABLES IP_NF_TARGET_REJECT \
diff --git a/sys-cluster/scr/scr-3.0_pre1.ebuild b/sys-cluster/scr/scr-3.0_pre1.ebuild
index b640a48d2e..08524304d1 100644
--- a/sys-cluster/scr/scr-3.0_pre1.ebuild
+++ b/sys-cluster/scr/scr-3.0_pre1.ebuild
@@ -13,7 +13,7 @@ inherit cmake python-single-r1 fortran-2 docs
 
 DESCRIPTION="Scalable Checkpoint / Restart Library"
 HOMEPAGE="
-	http://computing.llnl.gov/projects/scalable-checkpoint-restart-for-mpi
+	https://computing.llnl.gov/projects/scalable-checkpoint-restart-for-mpi
 	https://github.com/LLNL/scr
 "
 SRC_URI="https://github.com/LLNL/scr/archive/refs/tags/v${MYPV}.tar.gz -> ${P}.tar.gz"