Sync with portage [Tue Nov 23 12:25:20 MSK 2021].

2 years ago · 126e64f45a
parent 6610928491
commit 126e64f45a
672 changed files with 5793 additions and 4911 deletions
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-accessibility/Manifest.gz
+++ b/app-accessibility/Manifest.gz
--- a/app-accessibility/caribou/caribou-0.4.21-r4.ebuild
+++ b/app-accessibility/caribou/caribou-0.4.21-r4.ebuild
@ -15,7 +15,7 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"

 COMMON_DEPEND="
 	${PYTHON_DEPS}
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@ -2,6 +2,7 @@ DIST awscli-1.20.65.tar.gz 2091702 BLAKE2B e8295cf4e859c1e642077f4014fdea333292e
 DIST awscli-1.21.12.tar.gz 2097963 BLAKE2B e752cb1369be9ee26b517ba1226d3e16fad0a075c7f82eb1fcce3a3076aa67c5dcf4bdefcc6c29166ac7a96a2aa59da24636ddf1d3eb9bd21f3f05e665581de3 SHA512 90f39476b86ce97c0b47910b2d5cf5c512f142c1bf1620d0fa2384bfb40e54f812269e7f1ff72951ee13f37e6c918061c2d592b4e96e46116032810e1eb6bcb1
 DIST awscli-1.21.5.tar.gz 2095418 BLAKE2B 152d0ac70e9e0120fb9b10451904af52035bce84168c055695e7dc93e56648bd7689f20ac0ecdbdfc54ccb846d51b33027d2e9ee09c5e5d1e915c0ec05b0fbfe SHA512 e3063252a50fc6033669a0ff80f82d73764a6728d623d75a27f0652e779cbeb452454d887bf5bd70199a7394df40f9758b14619778c6428a164d590e6c8aaa89
 DIST awscli-1.22.10.tar.gz 2115079 BLAKE2B 72945d915fb932ff2d243eeca8c21976ecbf2f3e8de8e39765f0fb6885d1a715f7cdc32d695cfa89698c0850f6f32f8f28f8bab32b44ffaea13c944803a32607 SHA512 86af3d002802d4e6a7f4b1f046cb5d665a7715b03c0ed35277ed349a9eb80421aa77848b958f9c4fcb55af8113b1b2e1909d70746aed54e03655e136c1824e49
+DIST awscli-1.22.11.tar.gz 2116193 BLAKE2B c4e89882e5a8b37172f06ecf9cf911a0598b8a745390d9e73d11ec608d512bdd4831486f6a5dd03774c1df75f23eaec6bd36dd44a9efbb44f3a599c669e48363 SHA512 8c405704e6992996d46711e1410822a5a73f0fdcd1aaa1dddeef37b27863b1378034bd26009ebdd7f986ff120da3b98556819bebd3598279de86a5b845d8f4f3
 DIST awscli-1.22.5.tar.gz 2111679 BLAKE2B 970e472e8de43664d060023fdab9f54ce848c5655d8aa417efeae1b1efb52989fd021817521db9dc9cd64580cabbf0c30f3d0178034bdb1edf41feebbc690f46 SHA512 9177fe9da0fb8e9e28777bbf8f2c3fe089a08851b57a49fecefab43417fff187584638d17394289bf6df3d18d9052fd958bd3fbc8064327120af04a0cbe30494
 DIST awscli-1.22.6.tar.gz 2112080 BLAKE2B 5fffb3d5d0cbbcea813114bbfc89df64f58e83135c88ab914ac4327185310075e7e19e34a51e6cf85f9d2e804fb75cc69e2f7967ea69c67ff1987e054b5756c1 SHA512 3bf7cf59f947708c0d8e6ec992498d0e58a1a2ccb6a330bced0e2eece9989ef9097e08034354a6c265da08346e37611862f3dbb96d35d9787d3013f6220b7de2
 DIST awscli-1.22.7.tar.gz 2112524 BLAKE2B f3aeaa85d8be945ee2c64e45b1cd74eaa89cd035c4650f2a35144c113c8b073a7856e680fd1c67ee54f382ab4ad593cbe4752b53b2637b3c587ecdfa22b6819e SHA512 07c96caddb099e507b0e9b75dac79249a8b26a1ca43a3be842079dfe8af399647dec5c330e6b75059955c132b0c5e179cac2edb2b814c51b47a7777d7f7d5373
--- a/app-admin/awscli/awscli-1.22.11.ebuild
+++ b/app-admin/awscli/awscli-1.22.11.ebuild
@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="https://pypi.org/project/awscli/"
+#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/aws-cli-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+# botocore is x.(y+1).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1)).$(ver_cut 3-)"
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/rsa[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests --install pytest
+
+src_prepare() {
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	distutils_install_for_testing
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit}
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
--- a/app-admin/gam-server/gam-server-0.1.10-r3.ebuild
+++ b/app-admin/gam-server/gam-server-0.1.10-r3.ebuild
@ -0,0 +1,86 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+GNOME_ORG_MODULE="gamin"
+GNOME_TARBALL_SUFFIX="bz2"
+
+inherit autotools flag-o-matic gnome.org
+
+DESCRIPTION="Library providing the FAM File Alteration Monitor API"
+HOMEPAGE="https://www.gnome.org/~veillard/gamin/"
+SRC_URI="${SRC_URI}
+	mirror://gentoo/gamin-0.1.9-freebsd.patch.bz2
+	https://pkgconfig.freedesktop.org/releases/pkg-config-0.26.tar.gz" # pkg.m4 for eautoreconf
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-solaris"
+IUSE="debug kernel_linux"
+
+RDEPEND=">=dev-libs/glib-2:2
+	>=dev-libs/libgamin-0.1.10
+	!app-admin/fam
+	!<app-admin/gamin-0.1.10"
+
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	mv -vf "${WORKDIR}"/pkg-config-*/pkg.m4 "${WORKDIR}"/ || die
+
+	# Fix compile warnings; bug #188923
+	eapply "${WORKDIR}/gamin-0.1.9-freebsd.patch"
+
+	# Fix file-collision due to shared library, upstream bug #530635
+	eapply "${FILESDIR}/${PN}-0.1.10-noinst-lib.patch"
+
+	# Fix compilation with latest glib, bug #382783
+	eapply "${FILESDIR}/${PN}-0.1.10-G_CONST_RETURN-removal.patch"
+
+	# Fix crosscompilation issues, bug #267604
+	eapply "${FILESDIR}/${PN}-0.1.10-crosscompile-fix.patch"
+
+	# Enable linux specific features on armel, upstream bug #588338
+	eapply "${FILESDIR}/${P}-armel-features.patch"
+
+	# Fix deadlocks with glib-2.32, bug #413331, upstream #667230
+	eapply "${FILESDIR}/${P}-ih_sub_cancel-deadlock.patch"
+
+	# Drop DEPRECATED flags
+	sed -i -e 's:-DG_DISABLE_DEPRECATED:$(NULL):g' server/Makefile.am || die
+
+	sed -i \
+		-e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
+		-e 's:AM_PROG_CC_STDC:AC_PROG_CC:' \
+		configure.in || die #466948
+
+	eapply_user
+
+	# autoconf is required as the user-cflags patch modifies configure.in
+	# however, elibtoolize is also required, so when the above patch is
+	# removed, replace the following call with a call to elibtoolize
+	AT_M4DIR="${WORKDIR}" eautoreconf
+}
+
+src_configure() {
+	# Solaris' patchs adds this to configure, but it conflicts with
+	# Gentoo's FreeBSD patch.
+	[[ ${CHOST} == *-solaris* ]] && append-libs socket nsl
+
+	if ! has_version virtual/pkgconfig; then
+		export DAEMON_CFLAGS="-I${EPREFIX}/usr/include/glib-2.0 -I${EPREFIX}/usr/$(get_libdir)/glib-2.0/include"
+		export DAEMON_LIBS="-lglib-2.0"
+	fi
+
+	econf \
+		--disable-debug \
+		--disable-libgamin \
+		--without-python \
+		$(use_enable kernel_linux inotify) \
+		$(use_enable debug debug-api)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+}
--- a/app-admin/gnome-system-log/gnome-system-log-3.9.90-r1.ebuild
+++ b/app-admin/gnome-system-log/gnome-system-log-3.9.90-r1.ebuild
@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome2
+
+DESCRIPTION="System log viewer for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Attic/GnomeUtils"
+
+LICENSE="GPL-2+ CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="
+	>=dev-libs/glib-2.31:2
+	sys-libs/zlib:=
+	>=x11-libs/gtk+-3.9.11:3
+	x11-libs/pango
+"
+RDEPEND="${DEPEND}
+	gnome-base/gsettings-desktop-schemas"
+
+BDEPEND="
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+"
+
+src_configure() {
+	gnome2_src_configure \
+		--enable-zlib \
+		ITSTOOL=$(type -P true)
+}
--- a/app-admin/hddtemp/hddtemp-0.3_beta15-r29.ebuild
+++ b/app-admin/hddtemp/hddtemp-0.3_beta15-r29.ebuild
@ -18,7 +18,7 @@ SRC_URI="

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ~ppc64 ~riscv sparc x86"
 IUSE="network-cron nls selinux"

 DEPEND=""
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
--- a/app-arch/engrampa/engrampa-1.24.2.ebuild
+++ b/app-arch/engrampa/engrampa-1.24.2.ebuild
@ -8,7 +8,7 @@ MATE_LA_PUNT="yes"
 inherit mate optfeature readme.gentoo-r1

 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 fi

 DESCRIPTION="Engrampa archive manager for MATE"
--- a/app-arch/file-roller/file-roller-3.40.0.ebuild
+++ b/app-arch/file-roller/file-roller-3.40.0.ebuild
@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/FileRoller"
 LICENSE="GPL-2+ CC-BY-SA-3.0"
 SLOT="0"
 IUSE="libnotify nautilus"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"

 # gdk-pixbuf used extensively in the source
 # cairo used in eggtreemultidnd.c
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
--- a/app-crypt/kali-archive-keyring/Manifest
+++ b/app-crypt/kali-archive-keyring/Manifest
@ -1 +1 @@
-DIST kali-archive-keyring_2015.2.tar.xz 6448 BLAKE2B 5fe0c7d9e6ac145d046e1d7bcd1002c1799aba7224462691a0f940c5ee362c134c47cce9a60b71476f6b66f2cf6937262fb665dd29faed7e40dbd5a8a11f340f SHA512 3f680fb31f0723f0c4b8aa7053488637c23ef2804a688ad307365c6eaa71b9559dba31c8aee6e9804b9f03e24397c077f4f057e58da8f7e06ffc5d36003d23ad
+DIST kali-archive-keyring_2020.2.tar.xz 11388 BLAKE2B 134a3351ac0f1b3a899ef16ee1419b93c656200882b70c5f69e99cfc587d35d2e402792070ce5b7176743d1f70972687d2f2d5aaa3722f684a5976fc3be360d3 SHA512 5c2868c03acb7aef85cd8924da40fb80263879de45cafefb9c9e6c68928081d287cf3fc05ee5dd3c0cb1c938843dc831ccc9672bc7a70689a9c535cb22c92d16
--- a/app-crypt/kali-archive-keyring/kali-archive-keyring-2015.2.ebuild
+++ b/app-crypt/kali-archive-keyring/kali-archive-keyring-2015.2.ebuild
@ -1,17 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="GnuPG archive keys of the Kali archive"
-HOMEPAGE="https://www.kali.org"
-SRC_URI="http://http.kali.org/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="app-crypt/jetring"
-
-MAKEOPTS+=' -j1'
--- a/app-crypt/kali-archive-keyring/kali-archive-keyring-2020.2.ebuild
+++ b/app-crypt/kali-archive-keyring/kali-archive-keyring-2020.2.ebuild
@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="GnuPG archive keys of the Kali archive"
+HOMEPAGE="https://www.kali.org"
+SRC_URI="https://http.kali.org/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+BDEPEND="app-crypt/jetring"
+
+src_compile() {
+	# Bug #826686
+	addpredict "/run/user/$(id -u)/gnupg/"
+	default
+}
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
--- a/app-emulation/fs-uae-launcher/Manifest
+++ b/app-emulation/fs-uae-launcher/Manifest
@ -1,2 +1,3 @@
 DIST fs-uae-launcher-3.1.26.tar.gz 9656516 BLAKE2B 1b8d12ef91631dedf412976e81529ac7138b7f688ad6ae1ad55bfd3625590ee00aab89d229d2aa64eec577d291a6e634362c557428534c355fdb39e878f40253 SHA512 0e4e542bebfe2d8f862005c016fe70319dd6c5e1e413be9b0ce0421bb95253ba6eb92337989cc86210094b9b02a6ad86da4725f1a65d50673703fa6c6cb58f37
 DIST fs-uae-launcher-3.1.43.tar.xz 7785544 BLAKE2B 504d97dbc2bff7bc6abe065854e51b1ce51d40aec582586473629a77626c750510b4f885d3679a734d2dc7c889e9b18f41c27ea924ea7134641de2df16a0b404 SHA512 df19c4a3897b089daaee869226dfe2adfa990e0f8e30772e482e27a21c64f7d9d3369e8d6b0c72ac6119e207e9978f2052a7d681fe4f40b99e5ec48161e2a0fe
+DIST fs-uae-launcher-3.1.46.tar.xz 7820988 BLAKE2B 9c6bb28c00a41f71067d13ec40f947bf20d447dcc32b3d1e9053204b70699bc6b8ad89776421a8feb6ecad325b320e4b11e32abd65002650583c14890a41f85c SHA512 f96d01a0e2f985e02238fde482457d1859e04bde3c5a43dfbabc47c57ae7fea89970174931d95eb1679fc1ef6be0d52bef40e33f8d66e79fd0327af863290c06
--- a/app-emulation/fs-uae-launcher/fs-uae-launcher-3.1.43.ebuild
+++ b/app-emulation/fs-uae-launcher/fs-uae-launcher-3.1.43.ebuild
@ -14,7 +14,7 @@ HOMEPAGE="https://fs-uae.net/"
 SRC_URI="https://fs-uae.net/files/FS-UAE-Launcher/Stable/${PV}/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ppc64"
 IUSE="lha"
 RESTRICT="test" # The test files are just boilerplate.

--- a/app-emulation/fs-uae-launcher/fs-uae-launcher-3.1.46.ebuild
+++ b/app-emulation/fs-uae-launcher/fs-uae-launcher-3.1.46.ebuild
@ -0,0 +1,70 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8,9} )
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1 xdg
+
+DESCRIPTION="PyQt5-based launcher for FS-UAE"
+HOMEPAGE="https://fs-uae.net/"
+SRC_URI="https://fs-uae.net/files/FS-UAE-Launcher/Stable/${PV}/${P}.tar.xz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+IUSE="lha"
+RESTRICT="test" # The test files are just boilerplate.
+
+RDEPEND="
+	app-emulation/fs-uae
+	$(python_gen_cond_dep '
+		dev-python/PyQt5[${PYTHON_USEDEP},declarative,gui,network,opengl,widgets]
+		dev-python/pyopengl[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		lha? ( dev-python/python-lhafile[${PYTHON_USEDEP}] )
+	')
+"
+
+BDEPEND="
+	sys-devel/gettext
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0.0-ROMs.patch
+)
+
+python_compile_all() {
+	emake
+}
+
+python_install() {
+	local dir=${EPREFIX}/usr/share/${PN}
+	distutils-r1_python_install --install-lib="${dir}" --install-scripts="${dir}"
+}
+
+python_install_all() {
+	dosym ../share/${PN}/${PN} /usr/bin/${PN}
+	emake install-data DESTDIR="${D}" prefix="${EPREFIX}"/usr
+	mv "${ED}"/usr/share/doc/{${PN},${PF}} || die
+}
+
+pkg_postinst() {
+	elog "Some important information:"
+	elog
+	ewarn " - Do not use QtCurve, it will crash PyQt5!"
+	elog
+	elog " - By default, FS-UAE creates its directories under Documents/FS-UAE."
+	elog "   If your Documents directory is not configured according to the XDG"
+	elog "   user diretory spec, ~/FS-UAE will be used as a fallback."
+	elog
+	elog " - You can override this by putting the path to the desired base"
+	elog "   directory in a special config file. The config file will be read"
+	elog "   from ~/.config/fs-uae/base-dir by both FS-UAE and FS-UAE Launcher"
+	elog "   if it exists."
+	elog
+	elog "   Alternatively, you can start FS-UAE and/or FS-UAE Launcher with"
+	elog "   --base-dir=/path/to/desired/dir"
+}
--- a/app-emulation/fs-uae/Manifest
+++ b/app-emulation/fs-uae/Manifest
@ -1,2 +1,3 @@
 DIST fs-uae-3.1.35.tar.gz 4817547 BLAKE2B 5f75a1e262ba8d642401a03ac5b2494be37b8bab8f014a48208cc6e0b2e33373a7ce6146065f41404d8fcbd60fe71582319abe51521336c2d7c04668c3adacd9 SHA512 96bec936f867fc42eb9f61058887c027da0bab1c8df196ab62a714b1f28c92aafe6c4a61d441e5c7b5d8aee28c90d68812d0f6049c610e2ef9eebdd7e3edf013
 DIST fs-uae-3.1.48.tar.xz 3562468 BLAKE2B 99bcf1a7b4def97802ee1ce243aef7687d38c9e343e9c730f929e632916f3f36d6089ad289efda445c904f8fda1b75592f255fa77ee2b2687b0d32a95c996857 SHA512 05e56043f03225fd1ae71d1deade8807a8ae443068087914167fded8cc4a26cf8bb4209b5af3c609d41d001c42033ded7560e9ec642cb2ecfee99025c1f54c2f
+DIST fs-uae-3.1.59.tar.xz 3635036 BLAKE2B bf2723a2e9d478b1bb10cf724d3e4443abfe89a415a7956a64f7566d53d2432a59105bb8b6d3de4a2cffd0527d9ce554af0b177c1d49f273599ed97bbb4c9cd5 SHA512 346c255bf8faee14f28cf2a45f2cb4b1e8bae72be32c4fb7443db856de81265af634c566b0e6904ce924f51a93acbb8ef3a2bd25281285172619e73673171b82
--- a/app-emulation/fs-uae/fs-uae-3.1.59.ebuild
+++ b/app-emulation/fs-uae/fs-uae-3.1.59.ebuild
@ -0,0 +1,114 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools xdg
+
+DESCRIPTION="Integrates the most accurate Amiga emulation code available from WinUAE"
+HOMEPAGE="https://fs-uae.net/"
+SRC_URI="https://fs-uae.net/files/FS-UAE/Stable/${PV}/${P}.tar.xz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+IUSE="fmv glew +jit"
+
+RDEPEND="
+	dev-libs/glib:2
+	media-libs/libpng:0=
+	media-libs/libsdl2[opengl,X]
+	media-libs/openal
+	sys-libs/zlib
+	virtual/opengl
+	x11-libs/libdrm
+	x11-libs/libX11
+	fmv? ( media-libs/libmpeg2 )
+	glew? ( media-libs/glew:0= )
+"
+
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+"
+
+BDEPEND="
+	app-arch/zip
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0.0-libmpeg2.patch
+	"${FILESDIR}"/${PN}-3.0.0-Xatom.h.patch
+	"${FILESDIR}"/${PN}-3.1.35-deepbind.patch
+)
+
+src_prepare() {
+	default
+	AT_NO_RECURSIVE=1 eautoreconf
+
+	# Ensure bundled libraries are not used. Udis86 is unused
+	# regardless. Only FLAC headers are bundled and the library is never
+	# used? Lua is bundled but differs from upstream. We keep the
+	# default of disabling the Lua feature anyway as it is unfinished.
+	rm -r libmpeg2/ libudis86/ || die
+}
+
+src_configure() {
+	# Qt and Udis86 are unused.
+	econf \
+		--enable-a2065 \
+		--enable-action-replay \
+		--enable-aga \
+		--enable-arcadia \
+		--enable-bsdsocket \
+		--enable-caps \
+		--enable-cd32 \
+		--enable-cdtv \
+		--enable-codegen \
+		--enable-dms \
+		--enable-drivesound \
+		--enable-fdi2raw \
+		--enable-gfxboard \
+		--disable-lua \
+		--enable-netplay \
+		--enable-ncr \
+		--enable-ncr9x \
+		--enable-parallel-port \
+		--enable-prowizard \
+		--enable-savestate \
+		--enable-scp \
+		--enable-serial-port \
+		--enable-slirp \
+		--enable-softfloat \
+		--enable-qemu-cpu \
+		--enable-qemu-slirp \
+		--enable-uaenative \
+		--enable-uaenet \
+		--enable-uaescsi \
+		--enable-uaeserial \
+		--disable-udis86 \
+		--enable-vpar \
+		--enable-xml-shader \
+		--enable-zip \
+		--without-cef \
+		--with-glad \
+		--without-qt \
+		$(use_enable jit) \
+		$(use_enable jit jit-fpu) \
+		$(use_with fmv libmpeg2) \
+		$(use_with glew)
+}
+
+src_install() {
+	default
+
+	# Needed for QEMU-UAE.
+	insinto /usr/include/uae
+	doins src/include/uae/{api,attributes,log,ppc,qemu,types}.h
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	elog "Install app-emulation/fs-uae-launcher for a better graphical interface."
+}
--- a/app-emulation/wine-mono/Manifest
+++ b/app-emulation/wine-mono/Manifest
@ -6,3 +6,5 @@ DIST wine-mono-6.3.0-x86.msi 86689280 BLAKE2B 5c3cbe92dc055e97fa6dc894659cbd2666
 DIST wine-mono-6.3.0-x86.tar.xz 44392520 BLAKE2B bdaa64005564a134605f924f256a709e40cb713bd1f24f2ac5e82a095e353a81487c74813c88e74ed02905cc23a3bf50e99e908a3536a9671f4920d9093cbe75 SHA512 d39bcbaa65e4299711351516e74d559887b152caa3731cc72bbb23412ed76f5b8cf124c2f46241b677b074277c680120a645f738cdcd840ff60465b20deda3b7
 DIST wine-mono-6.4.0-x86.msi 86398976 BLAKE2B d1d553f6115618744bea65d7e88fdf19bfdf677ad5c948d9d598fe461ad668f778e5a8ae2084c584c9d6dae9bee68b85f9837c20016ab82c2401644dcfa06c1a SHA512 5e0eda47bd73b4f1d2d4017c1e6f1d14c9801067e085e9c991532c50454dd22b6594bd05733b4aae8a1010e8b443ff2bdbe70398880ea569142b33e253892f12
 DIST wine-mono-6.4.0-x86.tar.xz 44177712 BLAKE2B de08e829ade18be0d0896742aa66f3dd9ab96eb0c994ae164f0fc64fb6306dd278714bbea3cd20d9a04625bc502764a875d57fa530489a22d4f69cbe20696cfb SHA512 4e793ab755e3a4b5ff1dd0354756a9635482db6fd98fc90cb710edfd5e1f553e124913e323681bc82827655a5b1056d33c1f9632b5ea1e3e72d547cd780f2d2e
+DIST wine-mono-7.0.0-x86.msi 86433280 BLAKE2B 9d164bf10f9c790a1f518624321a77965800742c84677a6372cd57b1f51bdd16a2d61ee85f868e84be9b07d4c3f5a7afa770e98637f698c2337c42d42890cf58 SHA512 d7af2a68c3b48cab93ddd489f674ab9064d69d5ca0b6c91e58713dd0408af9fb1ff82ef8847d91645d96df40cd5526c6735d621064a3598166ab5f51d1e0d076
+DIST wine-mono-7.0.0-x86.tar.xz 45085800 BLAKE2B 504c57acce486c19a54bf33cdb4b9444c07a58a7f56ced0c93178886a91fa5d94a61f6e26aa885f3e3a2cceb2ff792f01006a4b16fa5bb88c3d25ddff02fefd7 SHA512 a3977563c5eb6418eaeda25e5b39bd2ef1faf305d514979211e049280c4577718ca48c8566e527b97a58fc465b310dd600093a616102573e12e8985794d828a6
--- a/app-emulation/wine-mono/wine-mono-7.0.0.ebuild
+++ b/app-emulation/wine-mono/wine-mono-7.0.0.ebuild
@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Wine Mono is a replacement for the .NET runtime and class libraries in Wine"
+HOMEPAGE="https://www.winehq.org/"
+SRC_URI="
+	!shared? ( https://dl.winehq.org/wine/${PN}/${PV}/${P}-x86.msi )
+	shared? ( https://dl.winehq.org/wine/${PN}/${PV}/${P}-x86.tar.xz )
+"
+
+LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+shared"
+
+DEPEND="!!app-emulation/wine:0"
+
+S="${WORKDIR}"
+
+src_install() {
+	insinto /usr/share/wine/mono
+	if use shared; then
+		doins -r "${P}"
+	else
+		doins "${DISTDIR}/${P}-x86.msi"
+	fi
+}
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@ -1,9 +1,10 @@
 DIST gentoo-wine-patches-20210925.tar.xz 59836 BLAKE2B c6d41db309bf0470d0e8ef771d791240209f77d967031943232218e8e737987a4a74847d89d6bf8739ff0698b28b656a8b9ac830ee1da457be2aab27ededb123 SHA512 721d4d7b6a2c4336555a7faed7202a8ad6872ee37e4daea6fab2b5ff5bf5d73ce41f25d0bd4fd9b45e2c522cb19c1349144a40be32ccdd7ded7f61055d6d85c8
-DIST wine-6.18.tar.xz 24860880 BLAKE2B 411b74e92bf895f20e53ad7a203bd3fe84f1b414d8720b402bc17150fd663161e65be05b1fd5630dcc7a32fc6eba27dd0685f7b852dfb5852ea4f7fdb5af15a5 SHA512 d8f54f8fbb61b4af2a6f97328d33b0389ab0fb6a9dac97b2832af3d911a9f23c08653f40ec77f7c0eedd694c4a1c1228fe9dd4d859d8b3d7419e21847de7bcfe
+DIST gentoo-wine-patches-20211122.tar.xz 59796 BLAKE2B 21460e6adf4934a52f8841f76f234a764c2dc1ac77eeed1cee10adafec3aa723640ebd4b51559e9ef433070ac731c4648620bd9e75e99f31b2e2f494cf01f02d SHA512 a18cb320617e2157977032c38c322177a2d248f14e43051d38de595af171495546c93d5e71e0dbe1a4f326a2dc819bb03dcfd04454ac85bbcd6b1975ae5d9d96
 DIST wine-6.19.tar.xz 24894356 BLAKE2B 227424c5ff4887b8adca1452ded242d20793d8b5ea8cc8fc94d73f18d294bda5674d48102d6f61e6a5b0e1f76aaa4885ec530bd96b1ea70923bae479254d59d2 SHA512 6d58bca9a4b8ed94f34a532da6403341f325a30d8e1b78997de009ecaafad655d15733823d7d1c8bd906efc568a649f8b7bee5c10f2e271e449d6e1eaa8f7ce4
 DIST wine-6.20.tar.xz 26921644 BLAKE2B 2db2bdd0b0c65855d96bc407ea54aa289dd0324715eb7fc068dd57b6b90ee7b331997fd9f68942f02ef45ef9f6eb10e7efaad79d0f97721626fc50ef2e47cc49 SHA512 dc0c29194ffd0ddcc2e34d8f7ac236f039e21cdde8cb959ddf16b4b67eb1d6332c9d1a780d0872669a1083db55e105eebaf3d7a6cc5aa749e91efab88bd1f958
 DIST wine-6.21.tar.xz 26973172 BLAKE2B 7e73e04419d50b12269c281b68b002fb7ef29519c63e6c45074fa919b067ee145d328aad6507578db84940c3ac379c0469758d1a211d7d213d1833ee8c15c096 SHA512 2c6d58c8c5c37497b2b3935f71afd636c274d1d4ad3f9ca2fd9982a9ed5910888cc20841bd9175446aab2fef7813d7700458edbaad6028ad34e7444a887a9220
-DIST wine-staging-6.18.tar.gz 9663936 BLAKE2B cd1a0314aa3bf890d57432e0680e13927a7ef4c50f47fe9bc17980208a77137508703d9b3155cfee6a340d954e832e99d66663d26518b425c4e60d8a3fd0ad2e SHA512 f718b4a6f314e8db4f6ad4cb41449d251d973b0942072411a70749398cec9d60ebcf29078cf00a895f665ea7e7846c3fd7e5553d04b3b451ae757c95fb49af58
+DIST wine-6.22.tar.xz 27031604 BLAKE2B ed1cf0499f8f827e88a1a899db3c5243d016696fdb1189b321cac398749f9360956f0cd473b2ee04052f0db750550a983b089c4f151edac535b7d440c9a2e048 SHA512 5326d500a2c5884e3ff004557a0360f8ff5c29ae42fdc256a13012ab746371dd403c87715efa00e43bf181fbc6d0647372e3e40944e5673b069f6e4f4cc700b5
 DIST wine-staging-6.19.tar.gz 9690585 BLAKE2B de5c172b600e8de59241e93a8938d4f6a943f97d1cccaba2aa2551886893848f43df5d2e375b588deabe722ff34d80ff62dfed376d41d309c6a36e03678b771e SHA512 f46d82dc034b0c701d00c70395edc306f6dcd3cd70091bb544c86c035e4221a370f6a1c39de4575e6cbb4eb587f5257d50ad5ada51fb6fee9f57b90dc0358034
 DIST wine-staging-6.20.tar.gz 9643278 BLAKE2B b5f0a74c575541303eaf12e9706f8917b795fc0d5f065e7292329cec7da145f9c7db25bebfcf4d703bf561206f22c9a49a95e8471629009dac4679c6f028b918 SHA512 9b5650d065976ab5b0bcb2f65895bf7b6bf139d376fc5cff421d493a6f6a849cb57e33243d1fad9ca1943cfbfdee8d8a3a4d530722163b15a0830d616f06e1e3
 DIST wine-staging-6.21.tar.gz 9627829 BLAKE2B b743b67c6f26871894b16d8cd9e7ed39a1d1dd6204516453628435ee23df7644433508edc7c7dd2881686926427e683c36a29acdc744c89d2c2bd4c5f50a13ea SHA512 b74ad7f96f2831b2635557c16cb616754e31c490b5b935d1d197d6cc8e61ca75805f801e22223b936a3794af57be94344d3a06dcfce92db7e036b6c3751ef294
+DIST wine-staging-6.22.tar.gz 9608891 BLAKE2B b1fb62e82ea746a4872c4dcb8e243a44248732e4d3512e8c489e230422fc51861b5a8f1996ae12e432c5ef7eeb8cae693f9afe862d2bde150f1d6eab46534f6a SHA512 3839cdcd7ffead2cf933b59eb038856eccde7b28e599b61e10e2745ff4d2bfeefcc43262bbc96c97510560584de759ef0616b0f5e391de608fb08176502cb830
--- a/app-emulation/wine-staging/wine-staging-6.22.ebuild
+++ b/app-emulation/wine-staging/wine-staging-6.22.ebuild
@ -30,7 +30,7 @@ S="${WORKDIR}/${MY_P}"

 STAGING_P="wine-staging-${MY_PV}"
 STAGING_DIR="${WORKDIR}/${STAGING_P}"
-GWP_V="20210925"
+GWP_V="20211122"
 PATCHDIR="${WORKDIR}/gentoo-wine-patches"

 DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging patchset"
@ -48,15 +48,13 @@ fi

 LICENSE="LGPL-2.1"
 SLOT="${MY_PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gcrypt +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks +unwind usb v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gssapi gstreamer kerberos kernel_FreeBSD ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test +threads +truetype udev +udisks +unwind usb v4l vkd3d vulkan +X +xcomposite xinerama"
 REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
 	X? ( truetype )
 	elibc_glibc? ( threads )
 	osmesa? ( opengl )
 	pipelight? ( staging )
 	test? ( abi_x86_32 )
-	themes? ( staging )
-	vaapi? ( staging )
 	vkd3d? ( vulkan )" # osmesa-opengl #286560 # X-truetype #551124

 # FIXME: the test suite is unsuitable for us; many tests require net access
@ -75,21 +73,18 @@ COMMON_DEPEND="
 	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
 	capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
 	cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
-	faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] )
 	fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
-	gcrypt? ( dev-libs/libgcrypt:=[${MULTILIB_USEDEP}] )
-	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
-	gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
+	gphoto2? (
+		media-libs/libgphoto2:=[${MULTILIB_USEDEP}]
+		virtual/jpeg:0=[${MULTILIB_USEDEP}]
+	)
 	gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
 	gstreamer? (
 		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
 		media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
 	)
-	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
 	kerberos? ( virtual/krb5:0=[${MULTILIB_USEDEP}] )
-	lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
 	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
-	mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
 	netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
 	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
 	odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
@ -100,32 +95,21 @@ COMMON_DEPEND="
 	)
 	osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
 	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
-	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
 	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
 	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
 	sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] )
 	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
 	staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
-	themes? (
-		dev-libs/glib:2[${MULTILIB_USEDEP}]
-		x11-libs/cairo[${MULTILIB_USEDEP}]
-		x11-libs/gtk+:3[${MULTILIB_USEDEP}]
-	)
 	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
 	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
 	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
 	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
 	usb? ( virtual/libusb:1[${MULTILIB_USEDEP}]  )
 	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
-	vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] )
 	vkd3d? ( >=app-emulation/vkd3d-1.2[${MULTILIB_USEDEP}] )
 	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
 	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
-	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-	xml? (
-		dev-libs/libxml2[${MULTILIB_USEDEP}]
-		dev-libs/libxslt[${MULTILIB_USEDEP}]
-	)"
+	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )"

 RDEPEND="${COMMON_DEPEND}
 	app-emulation/wine-desktop-common
@ -133,7 +117,7 @@ RDEPEND="${COMMON_DEPEND}
 	!app-emulation/wine:0
 	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
 	gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:6.4.0 )
+	mono? ( app-emulation/wine-mono:7.0.0 )
 	perl? (
 		dev-lang/perl
 		dev-perl/XML-Simple
@ -167,10 +151,9 @@ usr/share/applications/wine-uninstaller.desktop
 usr/share/applications/wine-winecfg.desktop"

 PATCHES=(
-	"${PATCHDIR}/patches/${MY_PN}-5.0-winegcc.patch" #260726
+	"${PATCHDIR}/patches/${MY_PN}-6.22-winegcc.patch" #260726
 	"${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615
 	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
-	"${PATCHDIR}/patches/${MY_PN}-5.9-Revert-makedep-Install-also-generated-typelib-for-in.patch"
 )
 PATCHES_BIN=()

@ -472,26 +455,20 @@ multilib_src_configure() {
 		--sysconfdir="${EPREFIX}/etc/wine"
 		$(use_with alsa)
 		$(use_with capi)
-		$(use_with lcms cms)
 		$(use_with cups)
 		$(use_with udisks dbus)
-		$(use_with faudio)
 		$(use_with fontconfig)
 		$(use_with ssl gnutls)
 		$(use_enable gecko mshtml)
-		$(use_with gcrypt)
 		$(use_with gphoto2 gphoto)
-		$(use_with gsm)
 		$(use_with gssapi)
 		$(use_with gstreamer)
 		--without-hal
-		$(use_with jpeg)
 		$(use_with kerberos krb5)
 		$(use_with ldap)
 		# TODO: Will bug 685172 still need special handling?
 		$(use_with mingw)
 		$(use_enable mono mscoree)
-		$(use_with mp3 mpg123)
 		$(use_with netapi)
 		$(use_with nls gettext)
 		$(use_with openal)
@ -500,7 +477,6 @@ multilib_src_configure() {
 		$(use_with osmesa)
 		$(use_with oss)
 		$(use_with pcap)
-		$(use_with png)
 		$(use_with pulseaudio pulse)
 		$(use_with threads pthread)
 		$(use_with scanner sane)
@ -517,14 +493,10 @@ multilib_src_configure() {
 		$(use_with X xfixes)
 		$(use_with xcomposite)
 		$(use_with xinerama)
-		$(use_with xml)
-		$(use_with xml xslt)
 	)

 	use staging && myconf+=(
 		--with-xattr
-		$(use_with themes gtk3)
-		$(use_with vaapi va)
 	)

 	local PKG_CONFIG
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
@ -30,7 +30,7 @@ S="${WORKDIR}/${MY_P}"

 STAGING_P="wine-staging-${MY_PV}"
 STAGING_DIR="${WORKDIR}/${STAGING_P}"
-GWP_V="20210925"
+GWP_V="20211122"
 PATCHDIR="${WORKDIR}/gentoo-wine-patches"

 DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging patchset"
@ -117,7 +117,7 @@ RDEPEND="${COMMON_DEPEND}
 	!app-emulation/wine:0
 	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
 	gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:6.4.0 )
+	mono? ( app-emulation/wine-mono:7.0.0 )
 	perl? (
 		dev-lang/perl
 		dev-perl/XML-Simple
@ -151,10 +151,9 @@ usr/share/applications/wine-uninstaller.desktop
 usr/share/applications/wine-winecfg.desktop"

 PATCHES=(
-	"${PATCHDIR}/patches/${MY_PN}-5.0-winegcc.patch" #260726
+	"${PATCHDIR}/patches/${MY_PN}-6.22-winegcc.patch" #260726
 	"${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615
 	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
-	"${PATCHDIR}/patches/${MY_PN}-5.9-Revert-makedep-Install-also-generated-typelib-for-in.patch"
 )
 PATCHES_BIN=()

--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@ -1,8 +1,9 @@
 DIST gentoo-wine-patches-20200523.tar.xz 59740 BLAKE2B 951d7f305a6e5b3759c8095629d48de4830b8a0c9558de859a9e02d9824fe85553fda2bc0820ca97022a0ca63ac28473dadfe827821220445dbf1a7fd15c7c98 SHA512 46eea45c982b475e3ff444cbd87c6a0a235fc8dcaf3d83d89655a10ed8841a9ddb09e5a638a05803f3bf2c3bd34165c16067aba561efa4c183ee396dc31cdf75
 DIST gentoo-wine-patches-20210925.tar.xz 59836 BLAKE2B c6d41db309bf0470d0e8ef771d791240209f77d967031943232218e8e737987a4a74847d89d6bf8739ff0698b28b656a8b9ac830ee1da457be2aab27ededb123 SHA512 721d4d7b6a2c4336555a7faed7202a8ad6872ee37e4daea6fab2b5ff5bf5d73ce41f25d0bd4fd9b45e2c522cb19c1349144a40be32ccdd7ded7f61055d6d85c8
+DIST gentoo-wine-patches-20211122.tar.xz 59796 BLAKE2B 21460e6adf4934a52f8841f76f234a764c2dc1ac77eeed1cee10adafec3aa723640ebd4b51559e9ef433070ac731c4648620bd9e75e99f31b2e2f494cf01f02d SHA512 a18cb320617e2157977032c38c322177a2d248f14e43051d38de595af171495546c93d5e71e0dbe1a4f326a2dc819bb03dcfd04454ac85bbcd6b1975ae5d9d96
 DIST wine-6.0.1.tar.xz 24210540 BLAKE2B 2075e59024e75594e0be0851db33981ebfcc57477bb9864055a938db0e39b8480f3c501b1d1fc39a9eee52303ad71ef71d24a0fb546697eecf3bb098f13317f1 SHA512 06b720d6adbbb7e2f15b963e4f3f1ff06e6d0d3973064d866ae720e6380bab8881fd1ebf16665435f5f7976b2c6dc72fd20631678a28e9d4d7b068c30cd22bb0
 DIST wine-6.0.2.tar.xz 24217772 BLAKE2B 176614736055892b7203313edc52e2926807c93b0bb97d59f65fbf284fd9cb138e4555fb7cd5a6c7c867367fdc50c89f12d7360ca0db947a7f04594f35f14775 SHA512 6cf002c6a06161665614c9f977dfa402bae8e657c0744dd824575066cdeb676bb9d61ebfc3c4b6f76486077a7457fe91cbe5bbadb467279a61e5a320da587696
-DIST wine-6.18.tar.xz 24860880 BLAKE2B 411b74e92bf895f20e53ad7a203bd3fe84f1b414d8720b402bc17150fd663161e65be05b1fd5630dcc7a32fc6eba27dd0685f7b852dfb5852ea4f7fdb5af15a5 SHA512 d8f54f8fbb61b4af2a6f97328d33b0389ab0fb6a9dac97b2832af3d911a9f23c08653f40ec77f7c0eedd694c4a1c1228fe9dd4d859d8b3d7419e21847de7bcfe
 DIST wine-6.19.tar.xz 24894356 BLAKE2B 227424c5ff4887b8adca1452ded242d20793d8b5ea8cc8fc94d73f18d294bda5674d48102d6f61e6a5b0e1f76aaa4885ec530bd96b1ea70923bae479254d59d2 SHA512 6d58bca9a4b8ed94f34a532da6403341f325a30d8e1b78997de009ecaafad655d15733823d7d1c8bd906efc568a649f8b7bee5c10f2e271e449d6e1eaa8f7ce4
 DIST wine-6.20.tar.xz 26921644 BLAKE2B 2db2bdd0b0c65855d96bc407ea54aa289dd0324715eb7fc068dd57b6b90ee7b331997fd9f68942f02ef45ef9f6eb10e7efaad79d0f97721626fc50ef2e47cc49 SHA512 dc0c29194ffd0ddcc2e34d8f7ac236f039e21cdde8cb959ddf16b4b67eb1d6332c9d1a780d0872669a1083db55e105eebaf3d7a6cc5aa749e91efab88bd1f958
 DIST wine-6.21.tar.xz 26973172 BLAKE2B 7e73e04419d50b12269c281b68b002fb7ef29519c63e6c45074fa919b067ee145d328aad6507578db84940c3ac379c0469758d1a211d7d213d1833ee8c15c096 SHA512 2c6d58c8c5c37497b2b3935f71afd636c274d1d4ad3f9ca2fd9982a9ed5910888cc20841bd9175446aab2fef7813d7700458edbaad6028ad34e7444a887a9220
+DIST wine-6.22.tar.xz 27031604 BLAKE2B ed1cf0499f8f827e88a1a899db3c5243d016696fdb1189b321cac398749f9360956f0cd473b2ee04052f0db750550a983b089c4f151edac535b7d440c9a2e048 SHA512 5326d500a2c5884e3ff004557a0360f8ff5c29ae42fdc256a13012ab746371dd403c87715efa00e43bf181fbc6d0647372e3e40944e5673b069f6e4f4cc700b5
--- a/app-emulation/wine-vanilla/wine-vanilla-6.22.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-6.22.ebuild
@ -24,7 +24,7 @@ else
 fi
 S="${WORKDIR}/${MY_P}"

-GWP_V="20210925"
+GWP_V="20211122"
 PATCHDIR="${WORKDIR}/gentoo-wine-patches"

 DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
@ -35,7 +35,7 @@ SRC_URI="${SRC_URI}

 LICENSE="LGPL-2.1"
 SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks +unwind usb v4l vkd3d vulkan +X +xcomposite xinerama +xml"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gssapi gstreamer kerberos kernel_FreeBSD ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks +unwind usb v4l vkd3d vulkan +X +xcomposite xinerama"
 REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
 	X? ( truetype )
 	elibc_glibc? ( threads )
@ -59,20 +59,18 @@ COMMON_DEPEND="
 	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
 	capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
 	cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
-	faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] )
 	fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
-	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
-	gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
+	gphoto2? (
+		media-libs/libgphoto2:=[${MULTILIB_USEDEP}]
+		virtual/jpeg:0=[${MULTILIB_USEDEP}]
+	)
 	gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
 	gstreamer? (
 		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
 		media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
 	)
-	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
 	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
-	lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
 	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
-	mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
 	netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
 	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
 	odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
@ -83,7 +81,6 @@ COMMON_DEPEND="
 	)
 	osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
 	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
-	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
 	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
 	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
 	sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] )
@ -97,11 +94,7 @@ COMMON_DEPEND="
 	vkd3d? ( >=app-emulation/vkd3d-1.2[${MULTILIB_USEDEP}] )
 	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
 	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
-	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-	xml? (
-		dev-libs/libxml2[${MULTILIB_USEDEP}]
-		dev-libs/libxslt[${MULTILIB_USEDEP}]
-	)"
+	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )"

 RDEPEND="${COMMON_DEPEND}
 	app-emulation/wine-desktop-common
@ -109,7 +102,7 @@ RDEPEND="${COMMON_DEPEND}
 	!app-emulation/wine:0
 	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
 	gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:6.4.0 )
+	mono? ( app-emulation/wine-mono:7.0.0 )
 	perl? (
 		dev-lang/perl
 		dev-perl/XML-Simple
@ -139,10 +132,9 @@ usr/share/applications/wine-uninstaller.desktop
 usr/share/applications/wine-winecfg.desktop"

 PATCHES=(
-	"${PATCHDIR}/patches/${MY_PN}-5.0-winegcc.patch" #260726
+	"${PATCHDIR}/patches/${MY_PN}-6.22-winegcc.patch" #260726
 	"${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615
 	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
-	"${PATCHDIR}/patches/${MY_PN}-5.9-Revert-makedep-Install-also-generated-typelib-for-in.patch"
 )
 PATCHES_BIN=()

@ -400,25 +392,20 @@ multilib_src_configure() {
 		--sysconfdir="${EPREFIX}/etc/wine"
 		$(use_with alsa)
 		$(use_with capi)
-		$(use_with lcms cms)
 		$(use_with cups)
 		$(use_with udisks dbus)
-		$(use_with faudio)
 		$(use_with fontconfig)
 		$(use_with ssl gnutls)
 		$(use_enable gecko mshtml)
 		$(use_with gphoto2 gphoto)
-		$(use_with gsm)
 		$(use_with gssapi)
 		$(use_with gstreamer)
 		--without-hal
-		$(use_with jpeg)
 		$(use_with kerberos krb5)
 		$(use_with ldap)
 		# TODO: Will bug 685172 still need special handling?
 		$(use_with mingw)
 		$(use_enable mono mscoree)
-		$(use_with mp3 mpg123)
 		$(use_with netapi)
 		$(use_with nls gettext)
 		$(use_with openal)
@ -427,7 +414,6 @@ multilib_src_configure() {
 		$(use_with osmesa)
 		$(use_with oss)
 		$(use_with pcap)
-		$(use_with png)
 		$(use_with pulseaudio pulse)
 		$(use_with threads pthread)
 		$(use_with scanner sane)
@ -444,8 +430,6 @@ multilib_src_configure() {
 		$(use_with X xfixes)
 		$(use_with xcomposite)
 		$(use_with xinerama)
-		$(use_with xml)
-		$(use_with xml xslt)
 	)

 	local PKG_CONFIG
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
@ -24,7 +24,7 @@ else
 fi
 S="${WORKDIR}/${MY_P}"

-GWP_V="20210925"
+GWP_V="20211122"
 PATCHDIR="${WORKDIR}/gentoo-wine-patches"

 DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
@ -102,7 +102,7 @@ RDEPEND="${COMMON_DEPEND}
 	!app-emulation/wine:0
 	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
 	gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:6.4.0 )
+	mono? ( app-emulation/wine-mono:7.0.0 )
 	perl? (
 		dev-lang/perl
 		dev-perl/XML-Simple
@ -132,10 +132,9 @@ usr/share/applications/wine-uninstaller.desktop
 usr/share/applications/wine-winecfg.desktop"

 PATCHES=(
-	"${PATCHDIR}/patches/${MY_PN}-5.0-winegcc.patch" #260726
+	"${PATCHDIR}/patches/${MY_PN}-6.22-winegcc.patch" #260726
 	"${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615
 	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
-	"${PATCHDIR}/patches/${MY_PN}-5.9-Revert-makedep-Install-also-generated-typelib-for-in.patch"
 )
 PATCHES_BIN=()

--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
--- a/app-misc/beancounter/beancounter-0.8.10-r2.ebuild
+++ b/app-misc/beancounter/beancounter-0.8.10-r2.ebuild
@ -1,13 +1,13 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=5
+EAPI=8

 inherit perl-module

 DESCRIPTION="Finance performance calculation engine with full data acquisition, SQL support"
-HOMEPAGE="http://dirk.eddelbuettel.com/code/beancounter.html"
-SRC_URI="http://eddelbuettel.com/dirk/code/${PN}/${PN}_${PV}.tar.gz"
+HOMEPAGE="https://dirk.eddelbuettel.com/code/beancounter.html"
+SRC_URI="https://eddelbuettel.com/dirk/code/${PN}/${PN}_${PV}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
@ -21,12 +21,13 @@ DEPEND="dev-perl/Date-Manip
 	mysql? ( dev-perl/DBD-mysql )
 	sqlite? ( dev-perl/DBD-SQLite )
 	postgres? ( dev-perl/DBD-Pg )"
+RDEPEND="${DEPEND}
+	dev-perl/DBI"

-RDEPEND="${DEPEND} dev-perl/DBI"
 mydoc="README example.beancounterrc beancounter_*.txt "

 src_install() {
 	perl-module_src_install
 	# rm unwanted READMEs
-	rm "${D}"usr/share/doc/${PF}/{README.Debian,README.non-gnu} || die
+	rm "${ED}"/usr/share/doc/${PF}/{README.Debian,README.non-gnu} || die
 }
--- a/app-misc/conmux/Manifest
+++ b/app-misc/conmux/Manifest
@ -1 +1,2 @@
+DIST autotest-0.16.4.tar.gz 14699617 BLAKE2B faae9fe2472ef6cde5868368d81eeb6b855af7684b407b307d14dbd7e8800506c4234b38b254a58b4d915290dcd61e6c9f2eb4d04cd3b929462b0a6d8ffc52cf SHA512 e209d008d7987610f20b7f0c932f8909a82bdde4c13f0362f54f5872464c76f1e3da5760d8eb0f42567249dee4db5f7802478be5c9798b46e2b421f31aa1cbdd
 DIST conmux-0.15.1.tar.gz 50713 BLAKE2B d764d63f03318614ad0d7088911dee02fbd36d24da7dc988bb3db03cda3e60c5b185f50b5545b086e2a3a7b278aa47af7bfd211c39c88f7ada32e83666eea0c5 SHA512 8138d6d10b4382709828277503d1c23c52fd43109ebad79073be9003c39a9e62c2b7d9d6e78a9e81797c22871985e50a58df0d538ff63e3f580c9a229b520107
--- a/app-misc/conmux/conmux-0.16.4.ebuild
+++ b/app-misc/conmux/conmux-0.16.4.ebuild
@ -0,0 +1,70 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit perl-module
+
+DIST_TEST="skip"
+
+MY_PN="autotest"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A console multiplexor"
+HOMEPAGE="https://github.com/autotest/autotest"
+SRC_URI="https://github.com/autotest/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~x86"
+
+RDEPEND="dev-perl/IO-Multiplex
+	dev-perl/URI"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.16.4_unexpected-paths.patch
+)
+
+S="${WORKDIR}"/${MY_P}/conmux
+
+src_prepare() {
+	default
+	# manual installation of drivers and helpers
+	sed -i -e "/include/d" Makefile || die "Failed to fix Makefile"
+}
+
+src_install() {
+	perl_set_version
+	emake BASE="${ED}/usr" install
+	# helpers and drivers have been removed in src_prepare
+	insinto /usr/share/${PN}/
+	doins -r drivers/  helpers/
+	fperms -R 0750 /usr/share/${PN}/{drivers,helpers}/
+	keepdir /etc/${PN}
+	# no need to have the init script in /sbin
+	rm "${ED}"/usr/sbin/start || die "failed to remove init script"
+	# console is too generic. Make it conmux-console instead
+	mv "${ED}"/usr/bin/console "${ED}"/usr/bin/${PN}-console || \
+		die "failed to rename console to conmux-console"
+	# Fix up directory for the module
+	perl_set_version
+	keepdir ${VENDOR_LIB}/${PN}
+	mv "${ED}"/usr/lib/Conmux.pm "${ED}"/${VENDOR_LIB}/. || \
+		die "failed to move the Conmux.pm module"
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newinitd "${FILESDIR}"/${PN}-registry.initd ${PN}-registry
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	newconfd "${FILESDIR}"/${PN}-registry.confd ${PN}-registry
+	dodoc README
+}
+
+pkg_postinst() {
+	elog
+	elog "If you have more than one serial ports and you want to use all"
+	elog "of them with conmux, copy and paste the 'conmux' init.d and conf.d"
+	elog "files as many times as you want, pointing each conf.d file to the"
+	elog "device's configuration file."
+	elog
+	elog "See /etc/conf.d/conmux for more information"
+	elog
+}
--- a/app-misc/conmux/files/conmux-0.16.4_unexpected-paths.patch
+++ b/app-misc/conmux/files/conmux-0.16.4_unexpected-paths.patch
@ -0,0 +1,11 @@
+--- a/Makefile
+++ b/Makefile
+@@ -18,8 +18,6 @@
+ 	@[ -d $(BASE)/bin ] || mkdir $(BASE)/bin
+ 	@[ -d $(BASE)/lib ] || mkdir $(BASE)/lib
+ 	@[ -d $(BASE)/sbin ] || mkdir $(BASE)/sbin
+-	@[ -d $(BASE)/log ] || mkdir $(BASE)/log
+-	@[ -d $(BASE)/etc ] || mkdir $(BASE)/etc
+ 	for f in $(BINS); do \
+ 	    rm -f $(BASE)/bin/$$f; \
+ 	    cp -p $$f $(BASE)/bin/$$f; \
--- a/app-misc/smtm/smtm-1.6.10-r1.ebuild
+++ b/app-misc/smtm/smtm-1.6.10-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=5
@ -6,8 +6,8 @@ EAPI=5
 inherit perl-module

 DESCRIPTION="Stock ticker, profit/loss calculator and chart tool"
-HOMEPAGE="http://eddelbuettel.com/dirk/code/smtm.html"
-SRC_URI="http://eddelbuettel.com/dirk/code/smtm/smtm_${PV}.tar.gz"
+HOMEPAGE="https://eddelbuettel.com/dirk/code/smtm.html"
+SRC_URI="https://eddelbuettel.com/dirk/code/smtm/smtm_${PV}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
--- a/app-misc/smtm/smtm-1.6.10-r2.ebuild
+++ b/app-misc/smtm/smtm-1.6.10-r2.ebuild
@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit perl-module
+
+DESCRIPTION="Stock ticker, profit/loss calculator and chart tool"
+HOMEPAGE="https://eddelbuettel.com/dirk/code/smtm.html"
+SRC_URI="https://eddelbuettel.com/dirk/code/${PN}/${PN}_${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="examples"
+
+DEPEND="dev-perl/Tk
+	dev-perl/Date-Manip
+	dev-perl/HTML-Parser
+	dev-perl/Finance-YahooQuote
+	dev-perl/libwww-perl"
+
+src_install() {
+	perl-module_src_install
+	if use examples; then
+		docompress -x usr/share/doc/${PF}/examples
+		dodoc -r examples
+	fi
+}
--- a/app-misc/tracker/tracker-2.3.6-r1.ebuild
+++ b/app-misc/tracker/tracker-2.3.6-r1.ebuild
@ -14,7 +14,7 @@ LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0/2.0"
 IUSE="gtk-doc +miners networkmanager stemmer"

-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 #RESTRICT="!test? ( test )"

 PV_SERIES=$(ver_cut 1-2)
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
--- a/app-text/atril/atril-1.24.1.ebuild
+++ b/app-text/atril/atril-1.24.1.ebuild
@ -10,7 +10,7 @@ PYTHON_COMPAT=( python3_{7..9} )
 inherit mate python-any-r1 virtualx

 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 fi

 DESCRIPTION="Atril document viewer for MATE"
--- a/app-text/chasen/Manifest
+++ b/app-text/chasen/Manifest
@ -1 +1 @@
-DIST chasen-2.4.4.tar.gz 845720 BLAKE2B ae18e71d78588c108f747abc6f28835f90d0a2c84616a01d87acea2ae5e0e54ef6ff296ebb9dbdce9047a223bd34203cf2763e9b3d4fb28522a4add7bc823860 SHA512 4551d28be6c0de7a585decf03cf5b56def3d181cfdfd975565ac7236e2c3e8cc0bcf5331f1ae309a914f95c6715e13ba3e9d80ebbd6e86c2316a43b7ed831075
+DIST chasen-2.4.5.tar.xz 671064 BLAKE2B 3b9867f794a54c4b0552807c54694e9f52082d9712c9e64aa55840b70f3a3800a514d1cd36260ee7397d1e98f28909e9b3e1f5c14d64f28f666b876e130aeb3e SHA512 7a17fe9d534cdc07c147fd7d9350aba381390943f4cfd899393076efe8e6a80aae029a8d4833e91ffa945b3e52d6598c16db257c9cc8d7792b7a1f90b7a1948e
--- a/app-text/chasen/chasen-2.4.4-r3.ebuild
+++ b/app-text/chasen/chasen-2.4.4-r3.ebuild
@ -1,39 +1,38 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI="5"
+EAPI="8"

-inherit epatch perl-module
+inherit perl-module

 DESCRIPTION="Japanese Morphological Analysis System, ChaSen"
-HOMEPAGE="http://chasen-legacy.sourceforge.jp/"
-SRC_URI="mirror://sourceforge.jp/chasen-legacy/32224/${P}.tar.gz"
+HOMEPAGE="https://chasen-legacy.osdn.jp/"
+SRC_URI="mirror://sourceforge.jp/${PN}-legacy/56305/${P}.tar.xz"

 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ppc ~ppc64 ~riscv x86 ~sparc-solaris"
 IUSE="perl static-libs"

+RDEPEND="virtual/libiconv"
 DEPEND=">=dev-libs/darts-0.32"
-RDEPEND="${DEPEND}
-	perl? ( !dev-perl/Text-ChaSen )"
 PDEPEND=">=app-dicts/ipadic-2.7.0"

-src_prepare() {
-	epatch "${FILESDIR}"/${P}-cve-2011-4000.patch
-}
+PATCHES=( "${FILESDIR}"/${PN}-uar.patch )

 src_configure() {
 	econf $(use_enable static-libs static)
-	if use perl ; then
-		cd "${S}"/perl
+
+	if use perl; then
+		cd "${S}"/perl || die
 		perl-module_src_configure
 	fi
 }

 src_compile() {
 	default
-	if use perl ; then
+
+	if use perl; then
 		cd "${S}"/perl || die
 		perl-module_src_compile
 	fi
@ -41,7 +40,8 @@ src_compile() {

 src_test() {
 	default
-	if use perl ; then
+
+	if use perl; then
 		cd "${S}"/perl || die
 		perl-module_src_test
 	fi
@ -49,12 +49,11 @@ src_test() {

 src_install() {
 	default
+	find "${ED}" -name '*.la' -delete || die

-	if use perl ; then
+	if use perl; then
 		cd "${S}"/perl || die
 		perl-module_src_install
 		newdoc README README.perl
 	fi
-
-	find "${ED}" -name '*.la' -delete || die
 }
--- a/app-text/chasen/files/chasen-2.4.4-cve-2011-4000.patch
+++ b/app-text/chasen/files/chasen-2.4.4-cve-2011-4000.patch
@ -1,21 +0,0 @@
-diff --git a/lib/chalib.c b/lib/chalib.c
-index 5d79e13..cddf51b 100644
--- a/lib/chalib.c
-+++ b/lib/chalib.c
-@@ -306,9 +306,14 @@ chasen_sparse_main(char *input, FILE *output)
-      */
-     while (*input) {
- 	int c = 0, len, cursor;
-	if ((crlf = strpbrk(input, "\r\n")) == NULL)
-+	if ((crlf = strpbrk(input, "\r\n")) == NULL) {
- 	    len = strlen(input);
-	else {
-+	    if (len >= CHA_INPUT_SIZE) {
-+		len = CHA_INPUT_SIZE - 1;
-+		crlf = input + CHA_INPUT_SIZE - 2;
-+		c = 0;
-+	    }
-+	} else {
- 	    len = crlf - input;
- 	    c = *crlf;
- 	    *crlf = '\0';
--- a/app-text/chasen/files/chasen-uar.patch
+++ b/app-text/chasen/files/chasen-uar.patch
@ -0,0 +1,44 @@
+--- a/lib/print.c
+++ b/lib/print.c
+@@ -997,20 +997,20 @@
+ static int
+ get_compound(mrph_data_t *data, char *headword, darts_t *da, long index)
+ {
+-    mrph_t mrph;
+    mrph_t *mrph = data->mrph;
+     int has_next, hw_len;
+     char *base = da_get_lex_base(da) + index;
+ 
+     hw_len = ((short *)base)[0];
+     has_next = ((short *)base)[1];
+     base += sizeof(short) * 2;
+-    memcpy(&mrph, base, sizeof(da_lex_t));
+-    mrph.headword = headword;
+-    mrph.headword_len = hw_len;
+-    mrph.is_undef = 0;
+-    mrph.darts = da;
+    memcpy(mrph, base, sizeof(da_lex_t));
+    mrph->headword = headword;
+    mrph->headword_len = hw_len;
+    mrph->is_undef = 0;
+    mrph->darts = da;
+ 
+-    get_mrph_data(&mrph, data);
+    get_mrph_data(mrph, data);
+ 
+     return has_next;
+ }
+@@ -1028,10 +1028,13 @@
+         cha_printf_mrph(lat, path_num, mdata, format); 
+     } else {
+ 	mrph_data_t data;
+	mrph_t m;
+ 	long index = mdata->compound;
+ 	int has_next = 1;
+ 	char *headword = mrph->headword;
+ 
+	data.mrph = &m;
+
+ 	while (has_next) {
+ 	    has_next = get_compound(&data, headword, mrph->darts, index);
+ 	    if (!has_next) {
--- a/app-text/opensp/opensp-1.5.2-r3.ebuild
+++ b/app-text/opensp/opensp-1.5.2-r3.ebuild
@ -1,79 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit epatch flag-o-matic
-
-MY_P=${P/opensp/OpenSP}
-
-DESCRIPTION="A free, object-oriented toolkit for SGML parsing and entity management"
-HOMEPAGE="http://openjade.sourceforge.net/"
-SRC_URI="mirror://sourceforge/openjade/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc nls static-libs test"
-RESTRICT="!test? ( test )"
-
-DEPEND="net-libs/libnsl:0=
-	nls? ( sys-devel/gettext )
-	doc? (
-		app-text/xmlto
-		app-text/docbook-xml-dtd:4.1.2
-	)
-	test? (
-		app-text/docbook-xml-dtd:4.5
-		app-text/openjade
-		app-text/sgml-common
-	)"
-RDEPEND="net-libs/libnsl:0="
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-1.5-gcc34.patch \
-		"${FILESDIR}"/${P}-fix-segfault.patch
-}
-
-src_configure() {
-	export CONFIG_SHELL=${BASH}  # configure needs bash
-
-	# The following filters are taken from openjade's ebuild. See bug #100828.
-	# Please note!  Opts are disabled.  If you know what you're doing
-	# feel free to remove this line.  It may cause problems with
-	# docbook-sgml-utils among other things.
-	#ALLOWED_FLAGS="-O -O1 -O2 -pipe -g -march"
-	strip-flags
-
-	econf \
-		--enable-http \
-		--enable-default-catalog="${EPREFIX}"/etc/sgml/catalog \
-		--enable-default-search-path="${EPREFIX}"/usr/share/sgml \
-		--datadir="${EPREFIX}"/usr/share/sgml/${P} \
-		$(use_enable nls) \
-		$(use_enable doc doc-build) \
-		$(use_enable static-libs static)
-}
-
-src_compile() {
-	emake pkgdocdir="${EPREFIX}"/usr/share/doc/${PF}
-}
-
-src_test() {
-	# Skipping tests known not to work
-	emake SHOWSTOPPERS= check
-	SANDBOX_PREDICT="${SANDBOX_PREDICT%:/}"
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		pkgdocdir="${EPREFIX}"/usr/share/doc/${PF} \
-		install
-
-	find "${ED}" -name '*.la' -delete || die
-
-	dodoc AUTHORS BUGS ChangeLog NEWS README
-}
--- a/app-text/po4a/Manifest
+++ b/app-text/po4a/Manifest
@ -1,2 +1,3 @@
 DIST po4a-0.63.tar.gz 4067940 BLAKE2B 4cfa4163c21f5f8b783a5bdc29595f10cd172f7813de5617ed67a25bef547697084511a6f3897c47acb9158f15b3fcd97600bec7e23ba560cffe7cc646ce4c39 SHA512 556859b73728249795df22676a3cde1cbf575c608ad20f267fe7a6ee224d0262db2db19df8b7369ebf1ab568c017548ff118ae035608cca7a4d0963db8acd633
 DIST po4a-0.64.tar.gz 4121565 BLAKE2B a579aabb4245501be4ec7c319e8cef91db2e10883a09ef5a7eaf2d97aad64e8e59f25101c20286c955067fef2f58bc08c9865d5d608dd72913a38eaaff0ac542 SHA512 3d51aaa5894365087523b82e218819ba8a92d3cbc1b389648526f26fbbf37ccaa7ed6643bb388e5fa73a7a1abadee2b4ee2ebbcac14790c56567bf1a3e766fb0
+DIST po4a-0.65.tar.gz 4152612 BLAKE2B 81d330f234cae10f228b5de7e8417f79d7008f827faf676a68c83b05044a2198c1c03f8d19d8bbbfdb71a83cb93abc319e7e6ac5ce57704294d0f3b858bb9b56 SHA512 eea2ddc1344d371ee685e73dc3c3b1b58d24f8bae7edbe7f2112bfead1c481c6796d02c5f7d9fc9bbac57bd93c4194ade51368bb8b29ba62aee333a7afa2e7e6
--- a/app-text/po4a/files/po4a-0.60-man.patch
+++ b/app-text/po4a/files/po4a-0.60-man.patch
--- a/app-text/po4a/po4a-0.63-r1.ebuild
+++ b/app-text/po4a/po4a-0.63-r1.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"
 PLOCALES="af ar ca cs da de eo es et eu fr hr hu id it ja kn ko nb nl pl pt pt_BR ru sl sr_Cyrl sv uk vi zh_CN zh_HK"

 inherit perl-module plocale
@ -19,16 +19,15 @@ RESTRICT="!test? ( test )"
 RDEPEND="app-text/opensp
 	dev-libs/libxslt
 	dev-perl/Locale-gettext
+	dev-perl/Pod-Parser
 	dev-perl/SGMLSpm
 	dev-perl/TermReadKey
 	dev-perl/Text-WrapI18N
 	dev-perl/Unicode-LineBreak
 	dev-perl/YAML-Tiny
-	sys-devel/gettext
-	dev-perl/Pod-Parser"
+	sys-devel/gettext"
 DEPEND="${RDEPEND}"
-BDEPEND="
-	app-text/docbook-xml-dtd:4.1.2
+BDEPEND="app-text/docbook-xml-dtd:4.1.2
 	app-text/docbook-xsl-stylesheets
 	dev-perl/Module-Build
 	test? (
@ -37,7 +36,7 @@ BDEPEND="
 		virtual/latex-base
 	)"

-PATCHES=( "${FILESDIR}"/${PN}-0.60-man.patch )
+PATCHES=( "${FILESDIR}"/${PN}-man.patch )

 DIST_TEST="do"

--- a/app-text/po4a/po4a-0.64.ebuild
+++ b/app-text/po4a/po4a-0.64.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"
 PLOCALES="ace af ar ca cs da de eo es et eu fr hr hu id it ja kn ko nb nl pl pt pt_BR ru sl sr_Cyrl sv uk vi zh_CN zh_HK zh_Hant"

 inherit perl-module plocale
@ -12,7 +12,7 @@ SRC_URI="https://github.com/mquinson/${PN}/releases/download/v${PV}/${P}.tar.gz"

 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"

@ -36,7 +36,7 @@ BDEPEND="app-text/docbook-xml-dtd:4.1.2
 		virtual/latex-base
 	)"

-PATCHES=( "${FILESDIR}"/${PN}-0.60-man.patch )
+PATCHES=( "${FILESDIR}"/${PN}-man.patch )

 DIST_TEST="do"

--- a/app-text/po4a/po4a-0.65.ebuild
+++ b/app-text/po4a/po4a-0.65.ebuild
@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+PLOCALES="ace af ar ca cs da de eo es et eu fr hr hu id it ja kn ko nb nl pl pt pt_BR ru sl sr_Cyrl sv uk vi zh_CN zh_HK zh_Hant"
+
+inherit perl-module plocale
+
+DESCRIPTION="Tools to ease the translation of documentation"
+HOMEPAGE="https://po4a.org/"
+SRC_URI="https://github.com/mquinson/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="app-text/opensp
+	dev-libs/libxslt
+	dev-perl/Locale-gettext
+	dev-perl/Pod-Parser
+	dev-perl/SGMLSpm
+	dev-perl/TermReadKey
+	dev-perl/Text-WrapI18N
+	dev-perl/Unicode-LineBreak
+	dev-perl/YAML-Tiny
+	sys-devel/gettext"
+DEPEND="${RDEPEND}"
+BDEPEND="app-text/docbook-xml-dtd:4.1.2
+	app-text/docbook-xsl-stylesheets
+	dev-perl/Module-Build
+	test? (
+		app-text/docbook-sgml-dtd:4.1
+		dev-perl/Test-Pod
+		virtual/latex-base
+	)"
+
+PATCHES=( "${FILESDIR}"/${PN}-man.patch )
+
+DIST_TEST="do"
+
+src_prepare() {
+	plocale_find_changes "${S}/po/bin" '' '.po'
+
+	rm_locale() {
+		PERL_RM_FILES+=( po/{bin,pod}/${1}.po )
+	}
+	plocale_for_each_disabled_locale rm_locale
+
+	perl-module_src_prepare
+}
--- a/app-text/qpdfview/qpdfview-0.4.18_p1.ebuild
+++ b/app-text/qpdfview/qpdfview-0.4.18_p1.ebuild
@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~grozin/${P}.tar.bz2"

 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 IUSE="cups +dbus djvu fitz +pdf postscript +sqlite +svg synctex"

 REQUIRED_USE="?? ( fitz pdf )"
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
--- a/dev-java/bndlib/bndlib-2.1.0.ebuild
+++ b/dev-java/bndlib/bndlib-2.1.0.ebuild
@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A swiss army knife for OSGi"
-HOMEPAGE="http://www.aqute.biz/Bnd/Bnd"
-SRC_URI="https://github.com/bndtools/bnd/archive/${PV}.REL.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-
-CDEPEND="dev-java/libg:0
-	dev-java/osgi-compendium:0
-	dev-java/osgi-core-api:0
-	dev-java/osgi-enterprise-api:0"
-
-# Tests appear broken and cause a circular dependency.
-# test? ( dev-java/bnd-junit:0 )
-DEPEND=">=virtual/jdk-1.5
-	${CDEPEND}
-	test? ( dev-java/junit:4 )"
-
-RDEPEND=">=virtual/jre-1.5
-	${CDEPEND}"
-
-S="${WORKDIR}/bnd-${PV}.REL/biz.aQute.${PN}"
-
-EANT_BUILD_TARGET="build"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-# Tests appear broken and cause a circular dependency.
-RESTRICT="test"
-
-java_prepare() {
-	# Move the correct build.xml into place, needed for testing.
-	cp ../cnf/build.xml . || die
-
-	# Remove bundled jar files.
-	find . -name '*.jar' -delete > /dev/null
-
-	if ! use test ; then
-		rm -rf src/aQute/bnd/test || die "Failed to remove tests."
-	fi
-}
-
-src_compile() {
-	local extra_cp=""
-
-	if use test ; then
-		extra_cp=":$(java-pkg_getjars --build-only junit-4)"
-	fi
-
-	EANT_EXTRA_ARGS="-Dgentoo.classpath=$(java-pkg_getjars libg):$(java-pkg_getjars osgi-compendium):$(java-pkg_getjars osgi-core-api):$(java-pkg_getjars osgi-enterprise-api)${extra_cp}" \
-		java-pkg-2_src_compile
-}
-
-EANT_TEST_GENTOO_CLASSPATH="junit-4,bnd-junit"
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_newjar generated/biz.aQute.${PN}.jar
-}
--- a/dev-java/icu4j/icu4j-70.1.ebuild
+++ b/dev-java/icu4j/icu4j-70.1.ebuild
@ -67,16 +67,8 @@ JAVA_TEST_EXCLUDES=(
 	"com.ibm.icu.dev.test.calendar.TestCase" # java.lang.IllegalArgumentException: Test class can only have one constructor
 	"com.ibm.icu.dev.test.bidi.TestData" # Invalid test class 1. Test class should have exactly one public constructor
 	# following kills 98 tests and and avoids 9 test failures
+	# coverage tests fail because test handlers for the parametrized tests are not defined so the tests are broken and cannot succeed
 	"com.ibm.icu.dev.test.serializable.CoverageTest"
-	"com.ibm.icu.impl.icuadapter.NumberFormatJDK"
-	"com.ibm.icu.impl.icuadapter.TimeZoneJDK"
-	"com.ibm.icu.impl.jdkadapter.CalendarICU"
-	"com.ibm.icu.impl.jdkadapter.DateFormatSymbolsICU"
-	"com.ibm.icu.impl.jdkadapter.DecimalFormatICU"
-	"com.ibm.icu.impl.jdkadapter.DecimalFormatSymbolsICU"
-	"com.ibm.icu.impl.jdkadapter.NumberFormatICU"
-	"com.ibm.icu.impl.jdkadapter.SimpleDateFormatICU"
-	"com.ibm.icu.impl.jdkadapter.TimeZoneICU"
 )

 src_prepare() {
--- a/dev-java/jgoodies-looks/Manifest
+++ b/dev-java/jgoodies-looks/Manifest
@ -1,2 +1 @@
 DIST jgoodies-looks-2_6_0.zip 2444893 BLAKE2B 97d00131cf07f609141c97e4fd3e6b3c93f67dc879eb0ad99469c602e7e30b0d78dc4bd59202db1a3a503dec6c92ea061a176ef11e6c5f4fc26a86c697cf961f SHA512 1c33413379f391109d1db35bdf301acf0cc6d66bf8aa1026280015946bddb230b4cc1d233b700d46a519fb02c169df4670c874058f5e636e1e924a9d3a42442a
-DIST looks-2_3_1.zip 2105839 BLAKE2B 590412d7ed00d68a3fd8f8e5402802ca69039f2619e542619de787c6e9b4b2019096e87b7809e3b1f5a7d72963da3657fae7e465a245ef1ab0a5630219a968ed SHA512 61278cc0b8556ce19cfb5bdaaab2b42d7035fcdf71d614a8d3673629d5b04c5698e2be521df3e0518e781f78c03a8d3f466f1fdfba525f679e9de7409faf1088
--- a/dev-java/jgoodies-looks/jgoodies-looks-2.3.1-r1.ebuild
+++ b/dev-java/jgoodies-looks/jgoodies-looks-2.3.1-r1.ebuild
@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source examples"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PN="looks"
-MY_PV="${PV//./_}"
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="JGoodies Looks Library"
-HOMEPAGE="http://www.jgoodies.com/"
-SRC_URI="http://www.jgoodies.com/download/libraries/${MY_PN}/${MY_P}.zip"
-
-LICENSE="BSD"
-SLOT="2.0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	>=virtual/jdk-1.4
-	app-arch/unzip"
-
-RDEPEND=">=virtual/jre-1.4"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-# bug #150970
-EANT_FILTER_COMPILER="jikes"
-# jar target fails unless we make descriptors.dir an existing directory
-# update: it's where it looks for all.txt file
-EANT_EXTRA_ARGS="-Ddescriptors.dir=${S}"
-
-EANT_BUILD_TARGET="jar-all"
-
-java_prepare() {
-	# remove the bootclasspath brokedness, make building demo optional
-	epatch "${FILESDIR}/${P}-build.xml.patch"
-
-	# unzip the look&feel settings from bundled jar before we delete it
-	unzip -j looks-${PV}.jar META-INF/services/javax.swing.LookAndFeel \
-		|| die "unzip of javax.swing.LookAndFeel failed"
-	# and rename it to what build.xml expects
-	mv javax.swing.LookAndFeel all.txt || die
-
-	java-pkg_clean
-}
-
-src_install() {
-	java-pkg_dojar build/looks.jar
-
-	dodoc RELEASE-NOTES.txt
-	dohtml README.html
-	use doc && java-pkg_dojavadoc build/docs/api
-	use source && java-pkg_dosrc src/core/com
-	use examples && java-pkg_doexamples src/demo
-}
--- a/dev-java/jide-oss/Manifest
+++ b/dev-java/jide-oss/Manifest
@ -1,3 +1 @@
-DIST jide-oss-3.6.12.tar.gz 4751908 BLAKE2B 731e2c2308e1a7d118a348e3f88258078e16b15f0b3c5bd2ab2ded72d75c4a4c2649e6928d9fbdd1ba7d7b99589a7c1090cb10798e678c44f830df26f0afedff SHA512 a2a60a2af653a1c20099fe81479aadfd252eed086c1009c20a17b561502748cca1cc4b016fe184a60dcb281fd5843c63ad876ca93062bb788e55b485d0e46124
-DIST jide-oss-3.6.18.tar.gz 4752506 BLAKE2B dae7fa89da88295ef5aee03e54778c971b44cc2fc6c017d2e9b24ff9454b9691c34849c9649435ac0a04b28f7fb1ac6b1c147e7fb632e2e30461cf388b3dee7f SHA512 c35f4e5b0462247bb8cc207e1f2120f6a861e796893ce6e7c55e06cab76da84402b3465d420f3fc8d09490f0eb98361d3609bb1675beb9fbf145be4c0bd5ea8c
 DIST jide-oss-3.7.12.tar.gz 4819086 BLAKE2B 9f84b8f9e87b6e74844e11c925546b9a43ae99476c91b84be9269dd8e31658889c3cf38cd67c4a5ec94419d8c5ccecb600c55f747d15e3427e01eb146b0ee755 SHA512 f17ab94fd77237fa0891eb87972b0630a0709fbd7e5d07e6d8389fd18668747d13ca9f631f81cf1153f7d233131a0500e8e76dabf8d33fdce846db14f9958456
--- a/dev-java/jide-oss/jide-oss-3.6.12.ebuild
+++ b/dev-java/jide-oss/jide-oss-3.6.12.ebuild
@ -1,30 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="JIDE Common Layer (Professional Swing Components)"
-HOMEPAGE="https://github.com/jidesoft/jide-oss"
-SRC_URI="https://github.com/jidesoft/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-2-with-exceptions"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6"
-
-java_prepare() {
-	rm -rv libs/ src/com/jidesoft/plaf/aqua/ || die
-}
-
-src_install() {
-	java-pkg_newjar ${P}.jar ${PN}.jar
-	dodoc README.txt
-
-	use doc && java-pkg_dojavadoc javadoc
-	use source && java-pkg_dosrc src/*
-}
--- a/dev-java/jide-oss/jide-oss-3.6.18.ebuild
+++ b/dev-java/jide-oss/jide-oss-3.6.18.ebuild
@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="JIDE Common Layer (Professional Swing Components)"
-HOMEPAGE="https://github.com/jidesoft/jide-oss"
-SRC_URI="https://github.com/jidesoft/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-2-with-exceptions"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6"
-
-S="${WORKDIR}/${P}"
-
-src_prepare() {
-	default
-	rm -rv libs/ src/com/jidesoft/plaf/aqua/ test/ || die
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	einstalldocs
-}
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
--- a/dev-lang/starlark-rust/Manifest
+++ b/dev-lang/starlark-rust/Manifest
@ -2,8 +2,10 @@ DIST Inflector-0.11.4.crate 17438 BLAKE2B eaf0c7f983b3186e9bc89353021a10592f2877
 DIST ahash-0.7.6.crate 38030 BLAKE2B aca3661477fcd7822d6d10970151e05c28e1615f8cd7ddaac064b15102027e404b19b0f3f16dd76145048594ea1c22ae27dd08cc05c411efbae9ec7a1ef55ce9 SHA512 61354688b6fb096359faefb6f34be958cd2215d56b88c22c737d24183eaad433f811bc9e64f927e4852c87d2799c22fda82b55cfbef2ed6357ff74f0c4ffec68
 DIST aho-corasick-0.7.18.crate 112923 BLAKE2B 4f6947d1aacf89ccfab0592cdc55fa61ef09cea38231d3f758765dbce328a810c0b588be4ba96e81d64955379ee005722d22a7aec39caea6e72342245d7ca34f SHA512 7a23b16231a90d23ee60ad4c81bc225410599a4560d33d3a203138fc540c39cf1000100fed3aed40dcc371c3635656a3792545dca5dd1aefbde00d8774eebd00
 DIST annotate-snippets-0.9.0.crate 31491 BLAKE2B d62d0d0da8b38d570f6efac995ec9014074d44500fb8634d2215187d063cda2c523c37d690551a536c8a1e30b8fbb2974b577b695a02fd4c236520fae5fefb9f SHA512 bdcdf3ce7fae0232a804604b3580ca8b68d29f8cb67f10fd39411b2ca2dc4c497dc9882bbcddecb15977809bdc58f8a946f25ce0152d27e4d128b3dd83087d9c
+DIST annotate-snippets-0.9.1.crate 31829 BLAKE2B 6919f78127653f9f022667b0ee7cb80bd2ef95220698e033031c6f4d3ff3341ed260e8baf776d032291538503e26577fc8fa82e99bcdc032985fb297351586a3 SHA512 e1e8b262a6681730ad068c29d7e0f3879acf0c7138721f606851228bd5d90292f24ac2c225fe49f26264e7d35de5ed3904850e522da8cd2c44a67f7db36f2d8e
 DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
 DIST anyhow-1.0.41.crate 34561 BLAKE2B 32889ec5ad2750e97f9d5486c7b367edc2fbaf19480bbe8114a2deed3f78e4c3e2cc31304a33fd60bc70c33c17ed8020f6df0c05a958f4016d363803dc5a08b8 SHA512 c6fba5fbb5646d195fdbda65003a8741188d49db02b805a84e695c81a054d9d5265b1c296c23d65cf089af35ce470083de88e1b65aadcc3ce33c8fb22b9cb91f
+DIST anyhow-1.0.48.crate 41346 BLAKE2B 9ba28706c0048f24312c1d8c753b6fb82bbcc22f24840c3d429a87813582bf05c45ed60b290c7abf54070969d4e42199a410d6a7bf02df788a119a96b4f201d0 SHA512 473b95883ae170b03e2097d924dd6e664604bce5e76a592e8abe763869ddca52de668244099f8f023c3709ae19934c3e1c4cc77610204820ae271b8b05c72d31
 DIST ascii-canvas-3.0.0.crate 10575 BLAKE2B fc40c40551e3e1b2bec6ae5a85ee8b0a1ab1ef3425cdd19ec6dd47d849205004781a2c8f51470417fe7556cf8524cc63b84a532532c5081604adbcd92d286b44 SHA512 216056640604f5faba6d46e2c94ff75234fec83d3bc2dc7cf34dd279706362874e3a513c717b23bc591da07cc3088458913c4e9aa5f280550c93d261095c8703
 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
 DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
@ -12,19 +14,27 @@ DIST beef-0.4.4.crate 14801 BLAKE2B 8b6e7cec0503d0fa05becf60a9d9a9073f6eb81f61f3
 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 bstr-0.2.16.crate 330346 BLAKE2B 75a345f3a5d428ec7278cd10fa676f5bb72685c65c4fe68163943cf3142b43ac45d458bce9323447b201ffcc91aa82cd8c762cb1954c055e34b1a5cebc686ee8 SHA512 33e82e5637efdc2f404ab9405331ae135df12586785491c3e61e70ea8406c67e2109e550cc70a4ab8e95d054e8519c48257fd3b55ef0b67b2530914a9a0b0fac
+DIST bstr-0.2.17.crate 330350 BLAKE2B 90c3a48d78b73d7e36a3da9fda0beae6e91ce534d17198ea8ceee0b613d03297f9dd8bca30e1ec5da01d1da359a1da72b2c2771b77c82bebab5006cafd665192 SHA512 883eac8210d14f89517b4dd5e25d02c97cf31602ec74498b5e186112ba0f154d47de8d1c41a8f4e5503f3b53c064e2c976b60bbfd63fc28b186bc006e00f20c2
 DIST bumpalo-3.7.0.crate 134261 BLAKE2B 15c4944abc803537c57076dfa8f5fb4b59949909450edd9e043a6cd438ddd227820e20e95236324c06e40cb27ec1e4d958bebf3d38df90f0723b8e30df79b6ef SHA512 0b570e1baee530b5c3f775330ead7cf5f8878eab75e5a6a61b5d3f64d4d82912cb26de1c098ec9492c29c7a04fc49565db97a54373c546d8ef58aab276d77c59
+DIST bumpalo-3.8.0.crate 79835 BLAKE2B 3937c4ca9d7c5e2ffee229c8f5503c6a59f2fabfa3b7c81fefbf5df816efc5f601aaca4b606a62e647262acafa34146aa0906eedc09368e16eb76b3c6722e8e1 SHA512 c9825e7638bd54f97877adee8ac8f6a2cee308050c3f446f9da3996688ec3d779cb6eb935a440329794fb534958a6e89749b44a9bb27dfd219a963f64a6bcac1
 DIST cast-0.2.6.crate 11541 BLAKE2B 2da4df626c9462bbd6fd616c6f9734e4551ec5b73ff7700a0247c2eca9870fd37a9caa6d21361300eaa884d59ed80dc254c44dcc5ccbbb039b3e6ef529cb5f9a SHA512 822048824ecacfbdcc165837bff71ac9028e6737358bdb0e906bc3a2d08cf1b2d25de07a03dbf471cfdb650fc4e9a890a62a25c9af106a99fbb7ef91ffbb72ae
+DIST cast-0.2.7.crate 11222 BLAKE2B 8a09b6493d68b08539b38fef39ac3abae829c8b899d5243bda3c3d8acada44f4c57416e3247c82a9a4b82180d7f96c96f048b8cdbf21a8fc184ca6957b237ad9 SHA512 24d204acf21366e088f721714c48bb6431895882263ef3a08f6644abbca5c06f430729fa8bbb4c9f37c95a6baa1b824d3fad95c5f0889e92587490d51bebb4d6
 DIST cc-1.0.68.crate 55936 BLAKE2B 9bbbeda78b8c3aca487e770cddbe11bf4686424bd33d023ad66e1fbdfc8dcbc17fd85c15905e0edbed8745202c01aea13d4f03a7f8f655e5806da152565419aa SHA512 faca9aa91488808f920f1d88422cc8a69790aa6dbd7bd2cc5d08a579d248faafd0fd675e8499e56aef6715398c278db1fa2079511d211d41aa65741de5d5ac8c
+DIST cc-1.0.72.crate 57495 BLAKE2B b2057ca53aacafa063a4eaa907bfb65aa32ce01a74a90b9085c8243a87723cee8ce79e4904f9d205f9d451598ee34495f8879d27c189477ca43bd39b88b5ea2e SHA512 e9a5b283b2a1fee1030009068c1f87291ec1dab7584a0892f27cc7e523c8fdfd5d986281d9aec1a00af706af1e61d7e64c245c74be7b39c8c022ae2d4f87de8d
 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 clap-2.33.3.crate 201925 BLAKE2B bec9c866481c5b3fddeb314f68af9bce38fc421e42816182de3209e8ea3447b72cf033e6251eea27fe974eff8085b7d98cdd2911b5cc0ec6b4bf4c750deb8a25 SHA512 3eb0fd648e2e3f9e5ff69a5e6cf0d867304fe18523accd036f28a86de368e4774088a6936c108ccc045092c539fe7f7494ea96420ebf6b4bec16880cea84bedf
 DIST convert_case-0.4.0.crate 8098 BLAKE2B cd038a7b0d52a9e183a96cbd548a8deefbe0c60d6aea15d7c6f92a4bbf991444d401b5cd3c944f3d37019e7e3db2a648e321402e13803768556f32c08ec00084 SHA512 e17e92b94b030e39f368ef0dd0288dbb45f77c8ce3034c1a6fd2fd43f38cf10a1af5aa7bebdfb447c335d9593c32dde7262e13f97c271c419c6106cf47dc01e1
 DIST criterion-0.3.4.crate 111110 BLAKE2B 1a27f32745dfedcddd1b41f1d9fa2096cecb11d90c4126bc0d7a52a14c4b97d99204a7156e55c2ca5e525d4b648a82f3126f5d2b6c3d97ce424d1d7fde9656ae SHA512 e54f73d39e54f74758710d14c970ab928b86595b2ecc3759c218e4a57a2d618f8d425049763669de6ac48ff97dda72eecbce2e48b731cf0c11a240cc20e9fb86
+DIST criterion-0.3.5.crate 110662 BLAKE2B deac65befe648cabfca827b8c37a57a0c48ba1edf34b6e32799117dba9147eceee91b652244b2eb5523c88d8521ae3800d05fbec13b3b3548eabdb13a56f2763 SHA512 ad5d0cf9270c3be5d76c87ada41198d0fbdcdd9831f092ae7179b57e16df153d2aebc0bb70ad7b6fc98966240a902ed5f6fc7adf044be0420bbaa95b951e5be1
 DIST criterion-plot-0.4.3.crate 17226 BLAKE2B cf896d08a208e9e317aa7b9095086660e57e5d8e6552b3615b027847e64fd4cf135d361bca7ee45fbe55163739285907320e9a39fbd28506fcb2ba56e091497c SHA512 69620d5b215757ddd818606d1a979c411de803032391be3b56e1c1ff73fbea992ae5e6c14cd78b519eeab806a34320468b44adb04fd1c67076163658f03d2844
+DIST criterion-plot-0.4.4.crate 22546 BLAKE2B ab1326f804cbfbedcb415baadfee2d11b4a67544856fd94dae0f3f3a9bfe46550d23a29a0c8a3a84da6e18565dfb330580aaddfd69a42284499a36b2ae596fef SHA512 4f8fdfdf4ed5e1c410b8e133b36bf9add3d86d56bb23d75d37d92b1095b81850915209c7e4d19fd6aec7cf1b1270a9b968b8e37adc491cfc76b6df71c4619943
 DIST crossbeam-channel-0.4.4.crate 86868 BLAKE2B 88629c72c0be41bb3a0d7dc92f6908d46cb397223449da5b2c990b7660e09dfd3e3f3fb708d13586f5dbf199d62f781f1f7e0b73d279de0ef810f7bcf25b3f27 SHA512 2933721d6af3126f492f112f3d662fc40fb49139a84c72d33b6c2b0aa94fe964acb302fe726e999be4292a1410d3ee896169a0434dccfbf44d166008719846d3
 DIST crossbeam-channel-0.5.1.crate 86919 BLAKE2B b223d0dcacbb09850d457825cb2a018494d798d0000a20eed3f54b1152e41ebca4698e7d50e81f467b86543779155ad08566da9496eee36aa06644b69cf5d7eb SHA512 f15aff67e9105584f5fe41e1ee650ae4fdd0d0ca0fa9202ee83c6f6025398a300decaa50d1b4682e8afb9bd6e11e95b69bcf23f68ae117419aa84df14ee7747b
 DIST crossbeam-deque-0.8.0.crate 20756 BLAKE2B 6bb602547cb0ca65552a9b981502221f1d3570422d22c867f654ba677e5c95aa5f81ed0022a498d3408c3f69291e1805b49fcfbfaff0d9a6075b75be3bf926ea SHA512 4efa73dcb9ef40b841039d24ffaf9bd7c63f8c0233bba1e0728fd5558702b4ef0af117543834c527335e99384d3c80d56293e891c9d94440f51f454b1b90c399
+DIST crossbeam-deque-0.8.1.crate 20852 BLAKE2B 0e7a2616b82c5e501c0f74935adfea3ee09db5475408be83db8f1b6faab4cd5509de2e029bdf6df90435e474ef91f3fc8d482ce3a72966b2a3bec5967666bdc4 SHA512 44a4fe1d4ab7457e2b0950be787b76b15e1bb0b1c108d032381ce3fe99bf7bf76f3d1718085660083d813e2639e66fdd3635d9186e85a9eb7267063b117eaca4
 DIST crossbeam-epoch-0.9.5.crate 43883 BLAKE2B c0ee0879c583bd1051b63d29eccac37ceb9f9446ee8cb64756b2e3d95a30c5c11bc79d9d460be4ef4b62513049e28900a96085031f805d064e81b5eae4bc297a SHA512 ad822e967e5ef45fa0c4a939f057f44146f1f051032fd032355a75c0f45ae4e0a55e1d31c80bc67c01ff8d9c87a51aba7ccfe9a440f061fd8225c879aa663064
 DIST crossbeam-utils-0.7.2.crate 34338 BLAKE2B 3cb287c7741c4d5b0551331634a75b066f07fb4b55fa2b347370506467a05923254b1c4dca667de59ed91ff91f5496b37f40f13d3e9885a1b4f639f5b6748433 SHA512 e375f24c007bcf660d9e297527ed938f678a55696ca7b555b96fee7e0b94c31db2d3f4355675aa0baeadba68b9755ec92dc3a09a37b5db48e3723b926fd4a8f3
 DIST crossbeam-utils-0.8.5.crate 38414 BLAKE2B 8a10162cbc54f77737602b6f8574b65a02765577f0e2f59d71e1d87662180fe24a781df542f3e765c4d64b7a0666575157e000766dac138bd4fc0356944092ad SHA512 fd4d2ae10340bb96c22b31190b300aab54e96b8089fd62489e102c76a944e6a16c582a90bc40f5e188f13f841293a4b9becf30830c2ece04f3ce78c29066532f
@ -34,6 +44,7 @@ DIST csv-core-0.1.10.crate 25668 BLAKE2B 8e9a56c26e75f4c4c9e90a21cc30c60cc3fff17
 DIST debugserver-types-0.5.0.crate 18075 BLAKE2B 9748c6852e5b9291820eab35be0f56f49e12b7592e5594b98f5fb662d7ef22db1eb3be45b6065ac448522fd8d9cd6c70a4828dfcbbc98bf10cf2cec91606d6f7 SHA512 20f780d6f1b6e4cbe8381122b8c9bbb7026ad0621c548b5724efb8b95b65e60027af4d25e7f01cbecc622d8e6e93900f5c43947eb636b2b8de0efd8201a22e02
 DIST derivative-2.2.0.crate 48076 BLAKE2B 56d27e27493c3b818ad45703efda607a0a0d9a48b0d43785b6a013443b8b964b67bb5b5284d242358415c5fb81b86b02079ee7c0595ec07bc658240eb114b887 SHA512 3c65ecdabd2dc202be3d83b06f96b6f68504fe542ede7e2285093c6d360a33ec76a3787c436c6e5ff8f59d430436a4b8ce2f908cf7b2b08cd8b0045de4e5d1da
 DIST derive_more-0.99.14.crate 54790 BLAKE2B 07aceaef8944e5525fc0c43e3ef827606d68f385250ec21c591e10dc365e6d2ef1175bada1abc5a66dd579b758c84654e51f0ef000f2e3d7c11d623b86dc3fdb SHA512 68ee2034b472a28e49afdfb87e03c12851695d2844d838d031d4c14c011dae6a2dc174a1280f8a422c12471b03973f7ea16704c863096adbd4650c1d4b599b8c
+DIST derive_more-0.99.16.crate 56233 BLAKE2B b6b53faf639b99c8c689cd9696bb81c57ad9998217c81914a71d932b497fa79f062dea7f20d8ff2439b0330359ad29f2f46fbb14f194228d72a1a438cc9f9a27 SHA512 45105c783ba9e8a5745179352cec20efd2717278fefaa3aa7a932012375bfc1238004fd9dd60ec53c8abbb2c38ae5ecc3a84ea0f7a883726ea9df9ce8692e7b9
 DIST diff-0.1.12.crate 10223 BLAKE2B 369f305661f1da31207f3801ed1841dbce12451ac9c3e9d3736f7158ece433af9b2e42c29063e5d93bb86b1d300e503caa9c3ce7dd0b25553f91d72a9eea5298 SHA512 0e81331c0424e9369963e23894a6412b65a3ed4f3154ccc184fc84cf1c5985b81c586a6b34e8c6c0e5c3afba38fb15277cfd89e7f50c85bd5d8d4d24ba670d16
 DIST dirs-next-2.0.0.crate 11689 BLAKE2B f5022bc51dd50bad4ad0fd05b159a4117aca47afbea66dc42c8306ca58f3a550165afbcf9f5f721ef5ad8d357eaff305c6f6e42789354a910d5f1d05d3b7b7c6 SHA512 6ccb732da8ccf7bf35952c22a3b0caa8238319feb0a6cd3b0957e6be12548a2ce507c69cb6d3cbd2adfb37e13e6521c6229da5999edb0e47a292a41c3ea1a766
 DIST dirs-sys-next-0.1.2.crate 10681 BLAKE2B 71431533dbfd6016cc309c14a842ac8d43577abe768e69bd2caaf7d19d743f3ca95b9b0be1747077282089c64485f3d4e24bec8e56d4d883f25e494d328fbf3a SHA512 b3c40a8e93d4f9f4a890718076e14779aedd67a79da61b466788268c1eaea19aa493f043a7e410f5023a23d5509e639a6fc6681fbee30e252a601091cfffa2d5
@ -46,35 +57,50 @@ DIST fs2-0.4.3.crate 13138 BLAKE2B a8c53130014affc276544360425718c480fe6b6583675
 DIST gazebo-0.2.1.crate 22298 BLAKE2B 104e76794825f897c8fe641296a64d8e530b9f2a1a93d546463f9b9acb7fff4e8785198ac790d16e7eb76e271ed8465faf95a2ecb6e1e5d1b8588ab7c9b274d9 SHA512 2f4d8a385bce0dff9e2b3a9a8d677cf33f940228e3a028823f118a318cbd7d81c30c1652fb19eb1fad046a7e326f7946fa3050686621739e746b70fb007fd60d
 DIST gazebo-0.2.2.crate 22503 BLAKE2B e88503e72153b0aa8aa9c3993639e4960ac9916cdc1de7b0d5543cf9543b9fbced04ad79ae4f1a6938407e3a8522fdf8d4178021d34375bb74d8434f695227d6 SHA512 2d78550ecdb07d171ca78b4f2efeeb2bb1fb68b7a49519ec33583e184a49143556c808bd5737af1b68e010c6252e8f2be226d7f6239f2ec71539111aba093988
 DIST gazebo-0.4.1.crate 28314 BLAKE2B bce81192c7db2716888b622498f3a833d51ba62b8ddff1ea8e4c108bec6c35457a6188447dd2fa6498e2c314e87ad10902578069f463c0aa6a796dd093c7fe0d SHA512 c483a0d65235ffc1ca2dd8d6e33140b1f238700809a47dc6c93b6a33a21a310a7e13ecede51ea80aa2c0a36866ded0137ce0df99c669cafed7d10db4e4b1198e
+DIST gazebo-0.4.4.crate 29277 BLAKE2B f0f8aa9a9962379dcad643dabad9a20371771f794c8fc2c6bf1ce6dce9e1a6db7ace94a60506158a912fa39dad3dc50df75a3b43f60efd23dc233f28ff7594a7 SHA512 396b9154d384560301ff636d1d04f8e473d92ef7fdf7e7b3b34b5337af84894b7a1599c296596517c63b18d9be64b61d5eccd7fcf037152e8263886a504e036d
 DIST gazebo_derive-0.1.1.crate 10002 BLAKE2B 953680dc207f82ef4bab99601b3a8898da32ef6ff61ee51debafc4b1209b916bc583a3890bb313627cc6e215886bf45a6d928f3d525e6ac7c873bfe0e432c79e SHA512 d8c66392d81d45f21885e992ec6fa27e09703eb33ab3abad847c8d4570e07e28ce39778d34343591582a4233d0bbaba2eb2023e600619eb5998dff7d60eda723
 DIST gazebo_derive-0.4.1.crate 13385 BLAKE2B a50f1fd4648338310b7abd5597ee94fc99273096bb7931f64740e739c9c74ea5de1dbc45d309982b383a19fdfb20135af109a44fc45334304c4911ea6da44f42 SHA512 baa6e1ad727f0a3ae8d548e477a3f5be22e264f1b3d5ec661e25e353d5a1d1ef23eb9c96b21a0ebd0fcb4162ae626556ba413e1c6be797e02f26ba67ccaebd3b
 DIST getrandom-0.2.3.crate 26261 BLAKE2B 3e52a87b9355f850e07e5080c20e1ab3acfa927bae28c63bb8bfd6a773ad77be96d3ba770c344631cc0f2d9a95aac920790173168b102e25f50480ee96663569 SHA512 e6da64ed529cb0fc000b613f75187ed6b20f716e721d8a02ac2ae39c507fb9f6189ebb66b522d28584eff1e7e9efc274cad6bfe43f464f58053701e1d51c603d
 DIST half-1.7.1.crate 36168 BLAKE2B 632fefc24ad4b44c64ef6d3da745392ac016580baa5ba898c45bf41598ebb9ea86bb11c041b8813df73aaa755e323cc762b9e95b834aff7118d0d77e1834e7d5 SHA512 cd678b9277fd909083b67eb86c1fe92f464c92e1932246c6793dd835069aac5af6b9dc16bfbdcfbcdd75d3a641bc1f2240effd83dff6068a41b6c54d3739f73e
+DIST half-1.8.2.crate 41874 BLAKE2B c3c5c01771f05b7af652abb8e5490dde7afd04de130537e67845fe7ed58904e7ad66c7286a4e7deca3641876a6d12c5b6e95883fee2809c8e685d2f79cf96610 SHA512 5eb128e41b8b7f9769a669834b2f8380b115395bf2a2a181732bf6c71234d978dbc4c527fddadaa7bd7fae9add77958b27616bfa1767fd123d3cfb887663292e
 DIST hashbrown-0.11.2.crate 85713 BLAKE2B 402f9f1bdcb92631206f9b72923ee35e28db8623e87469c0f1496664bc7185077013ab3c8aea68268241e5b2504f10cddc613a350abd4291050deda6c112e559 SHA512 c21ca68fd49bbb741901f59fed04cc124b8da99e2a4dfc26e2e5e1140637872b344612a01691bd30cc771575c571be15f756c84dde225441699cd2322af2ad6c
 DIST hashbrown-0.9.1.crate 77734 BLAKE2B d59002253112cf92173c3c1b305fd03fb7318ef187d7e033433baf6a354db046d1f3fe0387b3cf500fbcc0f83d2b2076527ba7cda2695f7627eca0bc3e3487c1 SHA512 dfa4742111f6fe757b7fa97f04c7b4a78ce9708c87e8e09ecf3c28f2566e48af9885fda380ed918cec37b5c696110fbdd30273aba6e7d2221c9e65f72af064fd
 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 idna-0.2.3.crate 271023 BLAKE2B 157ece18825fd3f8055581ccbd14191a6923da4c806ce51b3d6376682878db000a1b873f744c8e9e1966e4c1f8393643bcb603deae299ed0bd87847b0bd2c591 SHA512 1278bd561ce329e1dc7a6f24a10f83d9a068af5d15a088414f3921c6728b0d54f4d60d6f4d0d5a786596ad226263e1e50c3842f192d5758aa4665ba4ed5c269f
+DIST indenter-0.3.3.crate 6587 BLAKE2B dc4a73eb90bf05ec939634d3f1543f57c8b612e44e0fb3b38329ed2b9bdedcaedce84eb3f542f71c726b00c7cd273c3c390f827da170b5ba361cf669de4d1d3f SHA512 6585964939ee84739cdd19576faef467703415777e159ab2ff8b0f2a371fb2cd6c7a83dff4df954e9bea35844a43b72d93131dd4d23d328e9f365950ad831a71
 DIST indexmap-1.6.2.crate 50225 BLAKE2B 38f40c5aae0c5dc5da515e610007983b2d581994293f2eac747a3fd78c9cefb9faff64555e0c6dda146e9d1332d59f23c353c6758e63f99b6c4676123723ec67 SHA512 1509b6aa6b3b84fa15b98026052f6d5f0f1aedd065b02b24e31b799f8db68d5770e9a8302ef10e1ad16817256dbc03c55593928a48eddb252d25de7e0b7e6406
+DIST indexmap-1.7.0.crate 50363 BLAKE2B b45318ae2a6e1f008494db77a3159eea3fed4f77eb04ae65599be9392d6ef78d4677b65d04fefab8f917f6808fee821a33bcf53a50b88785fae5ef6848e3a08a SHA512 9b882b4a7068a686acaee0a08bd4f3b35b58d36e786358cf14a3436eb61339649e64f1757331cc7833a2fa364c76eb6b75cf0c732afaeb202113de1e66b72ab9
+DIST indoc-1.0.3.crate 13137 BLAKE2B ac50bb2bbeb989d78ea583595b9b4518c6a71c0a3b3fdd07581dae0c56525d55d631a81151e4592cb632c1821a0fe4166471246fbe542f16e747895a6d564cd7 SHA512 7567c260678386226a3fa6839a7a4d603091096a8df19039584c296b4953cc333ec1dca0a13d1192ea6433743d5ff44ab78b4e8a89414f6ae93d5401d3d2e3f1
+DIST instant-0.1.12.crate 6128 BLAKE2B 728923f757c1ee4e4a7afb90e460eed81392068961240a538e5c6468e15a0b6491f590fb5f6cc46e6d78901ca232351f65abb9f2f230d8f4983c5e58c4011902 SHA512 fae494c00111c51c840f9dd6a10febe403e27ebb933dd16633a213e9c20f2bc11adeb431c71f8a6713bf88f270a010941e15d83df294e658791934f83a5d2407
 DIST itertools-0.10.1.crate 116219 BLAKE2B 7d354daf7b069515ec7fe77ff2f4f07ecf870735d7ca166fd6b10ba89431cc27bf264c648efd2052206e8edd8f596485b913071453f37e5de47da44e935db79f SHA512 8626eee66aa598e16f5322a6fc55b17c622656f58635c990f5cbd8faeb4739690b0abb3efac4a9a3073752e9f2a51a0ba29401edb12e0f6bf9bddd8d1b394dbc
 DIST itertools-0.9.0.crate 96429 BLAKE2B 36d3b1dec7ece85639337f1a40a00330a5216ea8c460d13e52f0f9fea71bed5b3914cc4a7e05b407ed41e0dbc2292ae5873b3481297edcd92ec547866d044b8c SHA512 1c6650060750f3073140c4a77fc4d1acffa7d18320012807df0e20ab06ddb39afa7f086d89626e3909f89dc1f0408c9ccee4dd9454ca1f7a6a145bb213e7c5ce
 DIST itoa-0.4.7.crate 12099 BLAKE2B 0e4ffbaad504565056f74c3ef560a87eff321a0da6d7a2c8fa35813c207713c22d77080c3b830fefbb21370dd29cfbc6a2807044485b38ac1e0c9c1de3ccebc5 SHA512 c61eb50aa00591af28698b45c528c36bd92088f7cd2f453cf686a1824f4656292638bebc468cf67f903473a5045f22777af623cc0515ef3bf25146b89a7c454f
+DIST itoa-0.4.8.crate 11926 BLAKE2B e5a648b490908d0ffa3a0832342ad11264eb4357939bb39aad014aed3938bb60e82703b7e31929a458525061e9bc40539d33753bdbd722a03b6804e57dd1f70c SHA512 6911d269ff3ed7350e4f0dcfc6e9e0d70e25833e1e7cfcc57d5b8aff1f47b8be4f2e9baf1b92e5517cff63492be489b6d29b48dd9bb642e428acaa431216b68e
 DIST js-sys-0.3.51.crate 67124 BLAKE2B 4f4c28c1ea1a490551ff759ccc494536b099fee6d2eaa597f6ef5ab22e7dbcb72ee870df5550205efbee181aea8cf6623abdb6ecc35418eb17ebd2bf3f56877b SHA512 e352238ec085a9381c27fbd849000c8a26d71d947b75ccabecf941612a87e446c45f793eaa152062e7c699cdae74512a016d44ed06f3298b4cc7d32ae5139f5e
+DIST js-sys-0.3.55.crate 70499 BLAKE2B 6108d6bf4be72dc93db5c2f45d59dcbd7b94edc02ccb368a05bdc0e259768be4708e449647b254bc3c542a366492a02f0569d08e69c00249f58b07a566cdf97a SHA512 bd51d61684b3683d5b80df42eb80cb2e4688096bf14fcbd30234503709b1730ab25c7b58112516aeb5d7f44ae20e0ba08bdfddb0518a20603bbb4ca74544d4ac
 DIST lalrpop-0.19.6.crate 227279 BLAKE2B 081aba3e6169f458892755f30fb3399b045d407b7033ce778d03119f27c73a899283e9ea30413a5b7f3a97c9c78e462efa13c596d81165bd154e5734b8e9405e SHA512 ec8fe968b606a156dffdc262ad586454d9ebad19489e0c561b61d56139545094a4f55cf2262c6a917db4affecf90982d1842da3e309bd1b4b62397e5af90edd8
 DIST lalrpop-util-0.19.6.crate 10236 BLAKE2B 24deb1ea5e38063112d228cc811329ca2b3f1d3824842226faf14a7d03b61187043e8cc03bbd7372d99927e31d0d0c48b09868e2e1e73bd119475f8ad021cd99 SHA512 b254a09f71342a7a80d469dd896db8d5e0b69b1ff4f4d9c6ccf69447bcf8722dfb1c43de666e9f8444c54a529c7b6196ead1cdb78ad50d8c49acd210e646d391
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
+DIST libc-0.2.108.crate 559475 BLAKE2B eb8b0250136aa57e89d256d8401fb590d74a1447039324ab4572786185a2f4b7a955c356c8cab63b019619617313fafd5b7c44dd09cfa3cc92dbb9b7fb714580 SHA512 a29f0c5cc7e4b653c2bc33c92dc90b5d3a7132d4409d6b92b94fa9fe1391d8cf57a63d339ca0602f2efac28d3dc3beb854cf9a6d03bf027fef5e5276fc5b1487
 DIST libc-0.2.97.crate 517712 BLAKE2B ad769579a8e89e9e0ea6a08b8fd82b69a3a299721d63b63efcb436b333021c097933565e86f4b66ffcce6a589718bed2aacb36b80a936dd3dda763b9c0c240d7 SHA512 9b94a43d7da1e419900f7a016d5eb958bc42a006e1bb621ab8e2be2167e91f05cee81144c25e81a85c1b1ea2a26ff88980a4cc292fd42db8b09c5c49bf5531ed
+DIST lock_api-0.4.5.crate 25199 BLAKE2B c91adefaa0dc3efa786957794b67cf219f5159909179282c13c7e3b68d73a0acebac29438cfcb39b75cbe87bc181e981ab4ff2776134621d8ea92e7a6aaf966a SHA512 d6cd948a4183a73e8b91b9167d551e72dd75820c76123fb0839f8389c7872d2c46dbcf5785d7600ecc4e27f3d214f476585b9c39e85f70500eb8d012e5ff9535
 DIST log-0.4.14.crate 34582 BLAKE2B ddfba35947ae1f5905cd9ecb9eb862a78af6f00ee8b8fe6258b369b140928fe677a02b1b3ca5bdec36ff2b16abd85a9f49688fd5f3d1ba2b2905e7f96b8a84c1 SHA512 796100167663d85a7bc4244cd305e9b3f0a1b1520764b63464698eb136318d0928c40c16f5d19d9f602a5bf769851275bbd48d66b088b0c37be7a6fb62def7cc
 DIST logos-0.11.4.crate 9324 BLAKE2B 6af99113ef9ebae1b64f05fb68b2c513476e6bf925a0bf5c9a85d1451461633165ef2b037e7eba48e31b3d4977a6636a7752947126bb2b23358eca6ddb295e98 SHA512 3767672b9abf0c00b4ec3b0f764e856a890d5559795f354f85338041af1372c26e908ddead9eebb57b38c6c0b2b5706217ab55de6b7f8baaaece2a503999874f
 DIST logos-derive-0.11.5.crate 29466 BLAKE2B 311010767675c6313a6b79fe210478141ff67be167a26f53d5642e35aa9d2ec0630f31caeee64deef2a9122f5de4bd12097e023431d423103e6e39ea984cbab5 SHA512 9c5167162b30ee13e8aa05aeb7e272b1f34dbb587cdc2c20545dad8cbb3d574b542f2e7e9f2e60d55760edc934459d3a57f9c4734f7681ebd191330a8a50e5e0
 DIST lsp-server-0.3.4.crate 11483 BLAKE2B 7ac90daa84af70018060efbc9b100fb8bd4d93cb58f6e20ec23b2fef13c987a87a425b64f8f63da3f8b0dd4cc28b156636417fb02d5fc522b8e34b8b51666bd3 SHA512 ce4c95625b3bbf3dee0df1a0b718a599de18a5f3d04631e98b6b970d422153559394f2e36e0d6b60b26c4591a288ed933b9ec6f3c3f0ddee25af7486ce53524f
 DIST lsp-server-0.5.0.crate 10467 BLAKE2B 579f4482f58e035e4d591d2f66fba325db23342c6f4f78c6150dc8de693b26bbc253a4688f589cbfb00aa834052850efc9718b544d9214341aed30101dfba5aa SHA512 29c15ccbaae5fc00f719e804bbf188d3349680879c3f6ec855b84dc2167cc4690ebbd708bc7b37bdb4c391e376f5822b63181db81638ab4ab16a45e7d55e072a
+DIST lsp-server-0.5.2.crate 15018 BLAKE2B 90567a348794c9b53929cd0f1b877e7820e204ca39747d1ccad5bc53a98cfa3b0bb73137b8f121a2f3dc4b3e774eb78f943687345e72aa500511f53afb704296 SHA512 deac4de563a8f1fd4bf475f62b6597946ff287a4000b17f6e7736b2d30b5837c17c6dee0f41c0b0f9b4f6f76ac56dd587471168663f38711bbb95cdc1c5e6129
 DIST lsp-types-0.73.0.crate 36411 BLAKE2B 1ef3f94fbaa467c61159f0898e90f9f3d0094d52598e0b1009d7825e6da1e94347486237db9e651fe6153b577470f9765e7d1514d7101a05566c0dd090f579a7 SHA512 124df3ca0f25501b19930151ac692d5d3ffae7820a5179ebea88e8cdffa051cd29a325ec18b3aa77d0af70f90c9349ea0417ad2f5916ba0f546b7b183b2ffc52
 DIST lsp-types-0.89.0.crate 48915 BLAKE2B 9085fe0b7520df246c475a6c9a8a4d8cca1a71c2ad01caf6786cdd81792e76643070be86f4bba14acfc52ac6dfd6ba88a033de9c6d22f04fc03bd98f127b1866 SHA512 34134dea7fce71054657b7bd7623a36dd522152a2cc38f4479fec5c5cae170179f62b97003e0fb604e1473c4a4f17c1030095fa6e593923495647491c1d9a0e4
+DIST lsp-types-0.89.2.crate 49933 BLAKE2B 00c23d427672f539e1187de55717edc2ebd4518e483e460b4ed19370810ec08142273c00bfde0dd97df68cf77b27485af387d05dc47309cab25f0bb6ac739ca1 SHA512 a1ba7c572c5d9aff31e57f63de7ef7224a558c9b798a7c175c8ebece1f75b122c0d8dc7bb3952fdb8f711b659996d9824ab2cd606f7197d710d7f50c3540fb42
 DIST maplit-1.0.2.crate 8871 BLAKE2B 3cf975d35de2d2fbd50227a6d2c5e72227e99197b620c8f29be97bd3666ec162deeef0d9e6bd327a063f175201beeb73c4ed27272449b1df0b78238b2d36ca22 SHA512 917b5cf665e12b687035c895b60b2ae05622963f495f5693515fd24d56f49e95a06ffced68606d061bd20822c655100035930673fd4b0d4790168763b6961a9f
 DIST matches-0.1.8.crate 2216 BLAKE2B f18176110921b1cf6e58d52d12f1d1a3455ce2dc04421fbf1b392f66cdd81a88e924571fa27e307a06301d83b04f3b8a0ca3ae40d2da6f2decb8aac4e2801fbb SHA512 98b58f6a2694b03a7dd1be69ebf7e3ad14483fc8e4cb6e6c26a4937e4e660e843efb4dd04a7312dd9659ca02acd3775678f73b8faac44a76ffafaf873c22f590
+DIST matches-0.1.9.crate 2246 BLAKE2B de155202636c6a03ed68cdb21e8ef96e19b45be040a82943d2d7e5192c0ab5c253ab6d65f0b30b2689e21da79cba684af5be6e63c48266681aceba356f6eea41 SHA512 6a2809687d30ff04ea97bf9d1610d746e097699a4c3625ffd1b7b1e4a9673ece9d559058c9f760b99d6ab509024f7b338e7cfa6fe767499c983efa98bfb98305
 DIST maybe-uninit-2.0.0.crate 11809 BLAKE2B 5e517b8c59f9ae4f1a4f86b48679ea64d62450ec2519c8caaa914479ce9e5b3aff24707e2e37272ba74bb60499afdc602fff17756337b0c50a9184edbd8b8805 SHA512 3006fc009c7c743d9147a4122e677cdeb2546f7bb46963b2f266839614eb906f9d763c161044fd0bf3f7b54124ac0734ac9ae7f7151b1a7a5f45cbc739976434
 DIST memchr-2.4.0.crate 63392 BLAKE2B a3f30546c3b58ff4eba534bd7046446e96ad793718edfd3379bd125c47eb270728c4aed4aed1c6afa27032f74078b2b2ddddd5cc6044e117e2b956bb13f902a6 SHA512 b142e308a5aef8e45910411789031e194349ee540c4ced0e2384d864dc1913299fb63a161ceb5228256e97d0949661b7f83a169ef9d4b78afbd9004cb7b8a2fb
+DIST memchr-2.4.1.crate 64977 BLAKE2B 31479718c118093b684bed946eae0706d77d9d275bd49f5aeff4de490f479abd60c7dc462150eafffc6d6fc1da0853123b78be038826b775d2a41a4c39d93ab5 SHA512 d8912e3902a2126f86159bdc998532a2890b882cbb7d59b5a470fffcad4c32281e045f2fff48a235aa4189f1928866bf3d33b699d50866ad6b6c272bba7adb11
 DIST memoffset-0.6.4.crate 7664 BLAKE2B 098783d0fde7268b16fc5c9f5df005b93daac18092f04d981559b9f0fa310344c6fbbb93d42587ec7107a5c4e8d757508377dadf03471dbd7022f3bdb5b3da4b SHA512 bf8d05b72571ccdef32a93cc4489ab4cb7abd41415d55572d1dfb983053afe3eb2615e968d87a326af90c5702b9959150f985a4186acfd61df9b69a74e99713d
 DIST new_debug_unreachable-1.0.4.crate 2561 BLAKE2B 5c9831b04e2a44b2dd27816df0a331a8108991a84ebdfefe4e42f325ec3519ee50e89a99d490020a65a3d75acc371316c2253d2c6382453a0b15f4c3d5b96520 SHA512 6f964bb322aa8f2ff92078381dd720527600c6449e237b703278cbcf47b39a2581fddfc2f34ebb7cf31229e33d58de48bb5050e083fec6dad9aefddc1d771c85
 DIST nix-0.19.1.crate 213462 BLAKE2B 6abc355e7635272adf3933ec5835704a1b1b13b2d2a0e1a4d93280d91093184c7a0a115b75aecd44420b5f4f8e766fa0a86ae3cb96f71ab91bcbd0455a2bcc09 SHA512 0ac549babd0ea438825ad875dbaa4563d8eb90d83160dde429c0a97bb77d4ed3f19f1ad17437c61da69aed3f23382d464e99bbed0199678f7de41cd38953b51c
@ -82,7 +108,10 @@ DIST num-traits-0.2.14.crate 45476 BLAKE2B ae310d9d5640acc3e45e1e5d1d2f519539795
 DIST num_cpus-1.13.0.crate 14704 BLAKE2B e7a26e597ad5e45309393a9500b031ba64a77831320cbb96d7861139a2f7a453b7ba06a3255439b43ac1e2e36269b0a350d514020d3cd82c2513b57934b3ebbc SHA512 e75ec298fa682be84bf4efb6cf40126da9233ef25f07e887c2fa7421ee78790204564e6406c8219466651f47421e27f69eca690bb9cdfc982b644d78cc10de3f
 DIST once_cell-1.8.0.crate 28925 BLAKE2B 7681b1a7497b5711e663773c1a7e076f333c06c10d3f289079a781c36f050c1620cc279742ea8e5b15ec48f3d6038a6079bbda7fee3ae8e1128bd916d53ed43a SHA512 88e55c9433225ce85a08353168c87fca2237615482160a5c28f3ac17f06d48c63e0c21b5f7ef81f82ca133436e371802ea099453844f1c111003bcb6ba89e827
 DIST oorandom-11.1.3.crate 10068 BLAKE2B 443ced49f63015823866257a36a88e566f75adaa79511c1c73f1190ec8855ca590d2b6ece07c2ad5e9e47a89f7891af6e9e43b7d74d9ac57cb3551e60b50aca1 SHA512 51ae60ef51da56d7673f36a6c5b99b743580c5f5be54fdcb54b69e5e2f6bbba3267f96b74e7cd6dee6962dfa6696fd9ed073f22726a2861b8f2601946a8efab9
+DIST parking_lot-0.11.2.crate 39869 BLAKE2B 67c555e87b68f5763a7790563fd8d542e126bcb77f91267f3b76c51fd73060a2c32dcb91f9d0db7ea772e555d91576c8d7ff48053a9c35fbd3b749d2459a660c SHA512 526b176363dffa59501c18324bb723a3846ef5b0ff9bf1d890e40ad10e7023284f7c8012eda87520eaa94515ee828d9ef52692a9ed590a55e176383d6d472f9e
+DIST parking_lot_core-0.8.5.crate 32466 BLAKE2B 44d9cb65444ea93fded7e216e3bdbe2256ba1611f5cb6f80d67a01e71d428b81e6c7fc73cb928e2125f34bac0abf4d1da39f622e813dff89b01fed7632308b7e SHA512 c4315df551748d1ae77655e4d9f8c90f911498856e5358009e9e02e410bb8085f006f369188b0753a298371ebd74a5c383d848b65e31b55f3462381308c83a00
 DIST paste-1.0.5.crate 17669 BLAKE2B fa8eafd98dec09e488cb7ce0600c18554887249f1f1dd4c4cf3d1902b7ace184324a4b9afe16a7f16bbbac0d7b15885649bcf8a33473413e37fcfe3fa1b57c4a SHA512 c363e56e1b9bc2e401827c292625951cf577ede568033cee53da2ec2383c4ca17082b52b82477c48d65881a8c76f535a66768022d1eae2cd5f55218dbfb9be22
+DIST paste-1.0.6.crate 17808 BLAKE2B 8659076678f659ab0bc5d9c626d405f1f545742c79222348ad6d974beeef4541663e166247433c617829e5e65fb7a5b4d00656d95d37bad214bcfb2182d45677 SHA512 cf7795c64ded12c16ed7bc90a29bb36156abc8c424066c62d3eff8831a86b4133965d87b8b76b17ed5487ec286fc80e05fff1180833dee4b48f0429016bea25e
 DIST percent-encoding-2.1.0.crate 9748 BLAKE2B f3ff35ac683724b15e40c85e0fb8ececb07b61beeea82b7020f02d27df05a8a3535f157b3cd688533e414d6541de7de8640ef4756706d8061af0fec94ba04ab3 SHA512 98af4dfa7c6a3cf0d5aa929c436f9eb1ba1b576a944513f1284e6df2ad06be7cab9eba145d888d50af88f8c970bacc702b323041bec6d4fa1dc34095186c628a
 DIST pest-2.1.3.crate 77986 BLAKE2B 210638cdc2cc5e389d2248fbc06b8163dd5ddd77974a04d32f674e7f959acb3c5efc7f26100b6ceb7c346ee06a39db0e11ad5b793a1bc09dba679e6a5a4aa2f1 SHA512 08a36d4571cc0e912ae87e1f2116424b3d4139b653dd9a446fec8ff39cd9a691e8305c86cf75d227b5349197ada4ce79912ac25f0726b98a0642981ac4673c83
 DIST petgraph-0.5.1.crate 147173 BLAKE2B 3b74b2965ecdb37a82439111ad849581254698c8701d8d5bdb050f4a30cce05016511928443cf65dac394dd45584279a933435a77ef3c610a64c73cc5a68ff9a SHA512 c3d5f53b1a0900084b0693a6f3a849bb9b443b1b6fd1ad88bce8beb12ed1b45f2399b68db3366ba15f33c2d5682e052b733dbde76fb1b646b7bb1e660a38d8bd
@ -90,20 +119,26 @@ DIST phf_shared-0.8.0.crate 2860 BLAKE2B db48d88ad6e7aa6bdb2f6750ab66063a55d005b
 DIST pico-args-0.4.2.crate 11565 BLAKE2B 2dd0dd6679d418fba0f6bab93a8216cbb9182431dd7e0819e382db2fa1632bb5ed17cfc2bd7da90df41024066d26cc82188dd4693e6b4f7eeec44d440edfb12d SHA512 a6e46bc8d086091a37a0edf418d5414eaa5ef57a508aa81c352c66281cc2c88c97611b7eedd4f5f18c7a8169f48aa3bfdc7a5eb7b3cb570cbf871eed5e867ea1
 DIST plotters-0.3.1.crate 8595577 BLAKE2B 7c500c43c2b2875d9dc17e4eab57cbd8a470c6064deadf4e78c429abe2f1e97511f64bc67782b4e03e7cc47c8ac54aadfa5f7cc8c27d3b4453d2ee8252896c99 SHA512 c7bcdf9da56c2d1c03053f61256d44d2384fac1a9a7e0db058090c13b359bce76a2a96bbcbfde04fdcde0a9dd3db8a1a22bc57508b0b6e4a374c8b35ec6c9707
 DIST plotters-backend-0.3.0.crate 13492 BLAKE2B b9963648fd1a95f557bc92781c292ab0917ef373666cba95b0a1d3821253cfe8de19677f65973fddcd96bcd2d37bc817cdd783680dcc26be9556813baf413d29 SHA512 2071a4e249277a25cabf2f39c8fbf68ee5246b853c3f054fa49ff5356492b770419ca7dd7e481465b764fe8a1606491a2ff49a3215c3a5dd7c7b28779c54f3ad
+DIST plotters-backend-0.3.2.crate 13524 BLAKE2B cfd42df0fcea4e5ee944a6b8c48e3b7fcecefd6d97f07e1c333067193c211da9eba29fb56e9fc8b861cfa2d1baa3c042fddb494bb66b9109656b26bde7901f7d SHA512 116bc6866094a2ec40a9ab9363378566ff37eeb4a4e3805562dd3e95f1d5e8664b54d3dc858a2c9974b125e308e46b77c294de2a655f836d342712c32f0242a3
 DIST plotters-svg-0.3.0.crate 7488 BLAKE2B 87e22fec00b61737f3ca630fec669b277470455da19de52ea5098bdebc1061c03a15dbe0cb498f321f168d64369493f0d8c4260490a19989b5fe6bcbabb4ad18 SHA512 a706b4db5160d30d1e1e2d718b511a9c3f875947ea989d981e7cf221aab3d7b1c41ceb7704956683f2ad5415e698463c0eceb1e3e60fe1f794ac90f4dd175d82
+DIST plotters-svg-0.3.1.crate 7596 BLAKE2B ac8dffc5dea833c0506c472567056be0804e5519828b68f7b3bec9ee63dd59f9aa828c10732a50e004214512df06c7eaf164eb9613cda75b2753270fa358c0d6 SHA512 4d3cd02534440dc26f5eaa3b4966081901626c61d9fabe0092fed87c48929cb9be070d9c34486fc7c7bef308337ff4890d30f9581a613549e507db60dd9d8876
 DIST precomputed-hash-0.1.1.crate 1640 BLAKE2B 64a37ef3edd317f771e833bb394f7c19bc9b8c844156c831d2b550692c7e2e36bce44ecf18dd9f2d0f0511346eaf0d2a0ebe792fc288ca0e94a93933f2051846 SHA512 a118a98286a47e2f0cf35d2678d0325c18b9b7d5bdf40ceadc16483b282307fd1498434d5bdfa25477a4f420d97c34d786e42e9fa70431b788b4b8fde9718e05
 DIST proc-macro-error-1.0.4.crate 25293 BLAKE2B ef918c5efaf2545ab38787c8d0c07315af00431139e4dff66346bf798e3a429f91d12a79776c150412fdda0b158a72badd5e1044ac4d6917f8482d4b5a7110b7 SHA512 8a47bc9d3e24e9561d1e384d8f5a633284c2cf9b5e6733c5f9d1dbfe1870ccc8e2152482852e50b551cecb68e009148585b910ffb0508a7b4875598eaf8657db
 DIST proc-macro-error-attr-1.0.4.crate 7971 BLAKE2B 98e2925881c2be186e22c2c439697e91d43f807eb61a5d13e3b0b4321ed50a74f3d699942c04b89b6fea0f156bb5d19ebcf22f9cd4b98a7e6917c437600ed823 SHA512 2606afa9ec78d7dad4500c98d3a5ecbd02c6b53ab829c742bed7f57b322a95238ab4e01cf268746815f1424fd9b02eddfa30e72f98c66106f57765f3d3116495
 DIST proc-macro2-1.0.27.crate 38625 BLAKE2B a55e2404e3c7444c6da8aca6c0e7702b865ec56cfd2c20fec319e737fc83b00bbf505c15dadaa8740d5a6d07c089ed4854a173049b1be9872bba132ae7cbc8db SHA512 3227bcaa726e88bfdb1b4d1243a4eb216ad2394a7a3b4b258de342ac76a1ab1a39a07f28f3490e42e2c2034176bf0d84b1c1fcadba2444c0abcc5878b02f93a4
+DIST proc-macro2-1.0.32.crate 41003 BLAKE2B e8da70dae2ee75aa2c344602e55cbbf9ee5316ff6182c870b64f9fe4b33e60b9fb1a22137acf357615331f2e4079ab1e8964a2cb0234fa439d1b3d8d514c2eff SHA512 8631714c226c8a6fb330a529f42214216057eca85cfa63afd3de8600d2638e2be45efa54155ce73625883bcbabc2c56cb865ad9dda04e2c7092d955caed48abf
+DIST quote-1.0.10.crate 29960 BLAKE2B fbd4e3e0e0f452e64b30399fdfaef318cead505d05f0c61db61a7aa3cd5a3300220b4ba2656603f88bc0b535390ab4d0ec101a919ace1d442a3e979f08e8d48f SHA512 08613679b564ea7d750117d3a2907ba957d5d595bdfa8016344f99a232c72c6b08acb882dff45c34c9e4c8f93f879fb308b36125572722aac04fbc6bb0c666f0
 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
+DIST redox_syscall-0.2.10.crate 23582 BLAKE2B 7253dd96415e7b70df488c208d86c250c670b1245ac6573a59085faabbde9e33fabfacd233e7d737e365493db14008c180274b41ea0a4af5f6f98eec666a873f SHA512 ef012eb4bffe32119e50ecdbef4cc31f6e84a344e94f026484fe4e2c904f94053a8b6249fb6bd8ada31b3ecfbf0096085283bb68aeb62b1b01b57f35794aee92
 DIST redox_syscall-0.2.9.crate 23533 BLAKE2B edff38a41e57f40f9285d43deaacea32d518f5d87382d535b0349f123569613d50e7b45a70e4013f35632485951967a5157146593811102f3c0a7d9177f07fed SHA512 4f3c9dcb925c57253fa27f6355482d4f984fe31c4f562f2cd22e953c6f1f475e0687003e495167f400f77d2594ffb9a69548454db8086da5913c00643ecd337f
 DIST redox_users-0.4.0.crate 13023 BLAKE2B 66d0d1169f98a27a00930c86365f289c38659c0d7b248a6870d1c144dfe63c9752429b2912006527d42aa321f9605892ffa85257eeff1ae148254bf370dafd02 SHA512 4058ffb2fd57631eb6346c8839262653af3f2e670a69bb5739d64adeef7347849b18e191c594303da1f5e29b4a3cb000161fc1b3ea4b7f94585977597a2574b9
 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 rustc_version-0.3.3.crate 12119 BLAKE2B a8cfe3dcbaf436b74e9798ee1296ea7aa372cfa26788b7a84c9ce7ab3de5c5e00c6962e4310aed9bef8584e3c30298bf1bec1ac23c3b70c6aea32394359712e8 SHA512 37732b3b28eca41de205db34479c75b31af4ddd811f0f1606933eb31e25e5ed3966a41a8b7d338be20fcf47540629824c41a267436c185a98f8acfdce608b5cf
+DIST rustc_version-0.4.0.crate 12175 BLAKE2B 6fda2ce03eab45d7193fa0d70175cc7ffb56b7be85fb1314092bdcfd3948ea145420569ace3a47218a4a2a6e44a818862cea6dd8cfb945475496f63b591c29da SHA512 f66da7c6efe431db06cd01180d84ba67fcd38f8cd6ef693762957c00ccc2211f23c08079d7f184776e08f28d2d6ca3bdb5f5016f7de245c6193d4722891ba1db
 DIST rustversion-1.0.5.crate 16984 BLAKE2B 314d4a7b78a91fe6a0f35d850ef7a4dda72859fec7f603307154d2b25722ef6be71d5986991b4958009ba066d3078a53131691b0d375677985b9e351876dcd15 SHA512 43f3ed12e007e0a7bf0ecbe44edec5ff092c88973903ad8032b12d678d98d8827a9e51040fa157b0d5b07d26a5b6cd314b410553fec46689b3a31b392c24770a
 DIST rustyline-7.1.0.crate 88494 BLAKE2B 0ea586c8f99eba7f604df6e70c7daff1e90870d00801632c64494c59fcdf0d4ac39bb4085cd34396118e79b187a09dca12d47c176c13863735405734d8ade396 SHA512 c3e7a505b28eb4904e290dff077b69898344ed7be28698a9e45c7664957d192fcd0ec8c98c13d1d154078e28a88a5784987856a170c325c22dcc5285d9fd673f
 DIST ryu-1.0.5.crate 49570 BLAKE2B 3bfba4a5f290a429de7ac3b86823b2a973f40eb6f48c15329173d95964d31ada36f2618be4b36774a03f97f2ce61364900c6a3ad5465a294e2df311a1f4104ed SHA512 d1708ffa3112a684edf2956b6730ead040401d38f1457cde074eaaa59c249007dc8b925629e7f6df89f7ea757e9d0826649d685cc8ede0a04d50296048bf476c
@ -113,40 +148,62 @@ DIST schemafy_core-0.5.2.crate 2667 BLAKE2B be9a8f71189277b4e4d5be735bdf760c05cc
 DIST schemafy_lib-0.5.2.crate 7858 BLAKE2B 8d4d9c4fcb65a9d376f19418b1101cc54ae7df061c3aa6295b774cb9b946fcfd09443cb12ad56eda292fb21f45004685fe582b6a8a84c56ec0a892801df15ae6 SHA512 9646ea8b33b75b949f9da2745986b714df8018956c7b6f5dfe23adb50a15106abd3c1281631b244c616bd10cf6436d4d74892734779f0004dc20c8f3bbe4a4b6
 DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
 DIST semver-0.11.0.crate 20826 BLAKE2B 9006a801dab95e7a28605f623984b467221c3207b64af251bce3fb4fa74f731c4a3b9f95081bac59f754fab215782856edd98dd763b66563010498b97e8f35d9 SHA512 bdbd8eba37071ec1d24d372cc34ac4d82b6d914e7396ed51276e80d4d299864507a9d837ef381f6c4868981b7ca35514050ab8d7a621d43697a9c4b4bd5d8573
+DIST semver-1.0.4.crate 29375 BLAKE2B 534a89125c4483fc99c44f7b104870be1471d478ba4f709819ae700767f4d6d0bdc98955897e33566651cbecadb4d4dc223204e4504ba4820c2d3919ef4fa775 SHA512 82ef2b4a3533360de1c645dba02b57a2670fdc51709a07be4a63b94055335225764d42d70f9617ed3aeb4c4de121da24e73b0e2c5c781501e9ee32dff756ebd9
 DIST semver-parser-0.10.2.crate 23176 BLAKE2B a946a635d207f14a59f3b5db3d0a6dd8ea283bfade3fc15f07bd9f19087bc12203591a17d697692ca12abf3618481d53f4e7492b80e7233a519bfefa49b95da0 SHA512 154a6905eb5fb854450a0bd00381f93ededd6f1a992103a53464429195102eb266c7e8681e89cf952223a51427fa17c0a36e3b7c2eb6d375b309e5fd3d721f1a
 DIST serde-1.0.126.crate 75138 BLAKE2B 51f37473483da8a05670a213f02e119173e4c97a49313cf855ff3e547bb0969fcd84ccb7d1554e7c1761b388ac5cd917cd7e680e3ac23d2504412f75401c0937 SHA512 f22ec92b2eaed0819610ae2c4471eb12aa3a4209f5fbfe829c2329010813837d11ffc02d7809335df6a978cf7944095fae79c7593324dfd49becc7633dd626ed
+DIST serde-1.0.130.crate 75305 BLAKE2B 3973b70d8e06ab7c2f35e19f23739e8e4dd75dcdcddd818771be5daca8c61f6e2a7a830b4ccb8b3e3898769d7afdeb39ff217bcbf40bbd00867c13bc4668f905 SHA512 e6d6444abadcdac95ff15cdab53736adc9ddd1b6441d67158b6b41e68bee4b7763f9c2d80a857f879f40620429e8f04a90b01380c8c88da45a273c3ad13cfff3
 DIST serde_cbor-0.11.1.crate 43947 BLAKE2B 4c1dc444089276b4bfb1b1237eeaefbb6954fa8b613e539fa6eabe01ddda990be50c5e5ce72e5f765835224e9de4fb0fdb26d2fada2b18d6b03f77665e2c41cc SHA512 165192ed999cfdbe162abd3aff92f86f4300ffa9347e57fda2ef3c32c69a18183d468db059d9dd80218bf01de15fec6fde7cf6dbb8cc2a6158785484353f2192
+DIST serde_cbor-0.11.2.crate 44570 BLAKE2B facc8d16886dde89125b7d69e9e77ff586c61993c3493fe4089ff03c53e6c0808c6da45a83337d3be7414dd82f3d6a7f3d43167473e49e586a7e817d47ef3014 SHA512 12ddcbd5de0d85f2da6e078e3ccfdf2115125084d57eb93d7e9b45bca6a86daf79dcc79c8e54260c56240c3b5e814b1481ac28c3aa1d1b4b982ef5956b5cc3cd
 DIST serde_derive-1.0.126.crate 54189 BLAKE2B fa3ca8ef2e7d9bd29e682ac7df066bab05301c2b92dc8f12d254a7e8b29e8d8a83d5405def3050db00f7e396fdd14f18cfac7918a5218d4b6822463c7c0f5c5d SHA512 e3c430b82def037d2f1dcc96ff7dc075636c81ab8f12e07ba09d232bc8224204c7b0cddc994c1ec98400e50340e03d6bad0dfa624b4d869e5f29d72b293d30bf
+DIST serde_derive-1.0.130.crate 54703 BLAKE2B 35db74464913a93da88b80cf29e4983bcc4377e397618064b1cb397ecbc9e6620c863e4d365153d03ab77ec6dbe9b1d03f8f86aba1adb76fc6d697f39ea7316f SHA512 d3ca974bf8856ed8a73af4eaff69941b35eef187d7e348d6d2ef9ee79eccad893e66270c7d814ac3871e09e21e603d34d7d1f24b182d9b39e9219acd42a7baa8
 DIST serde_json-1.0.64.crate 115138 BLAKE2B c61a404db9800cfb4e2ac29d4e287a7c8f388b62407d5e25e07514e2840fdf9c127476db35cb556b56143755c64c26be1c6b1facc7529067b06946ac8f54a573 SHA512 55a45dd4c60fd93d2d9331f6a8eac39fdfece9ddc1aae45ea27e3dfa81352f08c71bf03906ba99d0feb5df8d847b68547ecaa8eb5a2c76011ebbe8d4cd5bfc2d
+DIST serde_json-1.0.71.crate 115468 BLAKE2B f026211992b5c6638e0451f556084d9acc56362b27abc466d1561ab53894f140d2ac58463bc9b5f64b2ffdf6d30048a9eededac554f89bc395faeab5b7b13ec4 SHA512 cbc5fc4a824c6911a2d60545bbc05f51258466d288dc991001df37af594c221c1c53b5e4119bb786a63c9ee17e132e73da1220312685129d472d3ee03aa01036
 DIST serde_repr-0.1.7.crate 10173 BLAKE2B 30bca6a616e55f44def56ab1f85cbb141727a872466f161f562798db005473d520e6a4dba89b631cfe11f1a38cbc1db2fb0ef921f0245e0990a6744f9987e95a SHA512 4e3e87b1c97ee587e88be56d67f287e43252de474a3becdefb4b768eda661db5d78f665d7d93720a40d9f5bd27fd9ab6213d66713ec89bcc2063092b16625a18
 DIST siphasher-0.3.5.crate 9455 BLAKE2B 73a09ba949dc4ea670a01e4cfc4f34d8f6ab53facd656beadda396fee087b36afd895e2acba5fecb796fb629b0f56bca84f971970c2f771ed84f74f667f9708d SHA512 4887f7b7b4c0df55c185249a16041052e16ad1f7c80d69ca69dba76af7b25095f2ace3d5b2a33346797f74b63c476a67055929c2856a6b4dff60e8fe2147f8ae
+DIST siphasher-0.3.7.crate 10097 BLAKE2B 455b5ca81418aee667b4fe16092435e025353267e14cf4f911f5d48a18d9a46be04452ce1451a272f8b2073ecf606c6834b6d06b49687474bb7ac226383aa7e7 SHA512 4a8ef56085742de7ad638194b21ff3e315aef6de9b7590e736071859ffa2aa4a28cdea7e05ecfa781fa35a40505086a36d84bdb3ec40d679f9b83c2edffc4d3d
+DIST smallvec-1.7.0.crate 27459 BLAKE2B a740a4b7448a4c8d1bef59cfb6dc9a52145e40eeb38028c64c880f31800cd3a4cb8be17394742239dfa7fb692c749f9edf70e6df02abd7a1bff288eec38ba24e SHA512 d061e0059cd6bd1636424374848aa1d4edd21f75605844a7855ff5d343dbdb71e6eb14bd70de7947ae7ab58f04ff096a5e77aa9a1ac14cef59f657685c846156
 DIST smawk-0.3.1.crate 12840 BLAKE2B 937471e3ec3431f174264ce41e7a9c8ac781f5ce3638afe6219173730f5a0d0cec2b482ca72eeee34d5765c75db1707433b2c5b5004cd6d6fa4809f606b26813 SHA512 d6a050e873da5c90de3ff9fd02166de3be4c03931de9cac5307e6c16a71b8db1db6e8309eaa38ad408b20e0cc98eb4133595ad7aea96f62ebdcea579a643b65f
 DIST starlark-0.4.0.crate 403045 BLAKE2B 7d0f76b627c787a65450b444ab35a3cbfebbefbd59ab458030af5789b7ce140d920be5ec37625fb3d1499724bb37d6900887bfaade9907cb36de621579ac88e8 SHA512 52fff866d95e7cd1ba81b9dca4adfc9ea9efd6d1d8bed106718c1b8041c4311ad8ab2f87d77b50c1e312c5da6f9a12bf18e2541f3b15c7e2e5c30baf68a7f444
+DIST starlark-0.6.0.crate 554791 BLAKE2B a9f4d6051b609dab2b6a441080c15887fea2bf20d9750a685b7577033d35c368b03cd46f079602022bc994546de6b6a3f920f3dbd0ec67cdbd78aab275b2eb86 SHA512 473c51c8c51cdfb472779b77c0206e6ddb4c9336d2330dab2b8580e67e782849c73bf43265c4471ebf7bed5fd3f159f69707f362c06c9859ec7c0174e820b3aa
 DIST starlark-rust-0.4.0.tar.gz 474742 BLAKE2B bb95bd9b0d8932efcc0921752a1bc576efe846f2b61c7a91a3b336e5b79bd02da90348ea07de24c292f1e70a739a5aa11ff673a6a19e0267a034f04df80afb54 SHA512 ef94e2849c44345e908f78dcef0d1bcc0480f94bcbd43ba4946860c0c53d27f459ef136299d23a82edb198fa582c42060d4d5c6e92be0a307a5392db4ee2dda9
 DIST starlark-rust-0.5.0.tar.gz 526571 BLAKE2B 66b64be38e8fbfa5c278d262a6c9ad68b1c12feff322eea85e2cffd3aba3ee438684c60834cc36a532ecf1b608ea2c65df3259d6b45215c083060c926e5d698b SHA512 769fc64864764693b6388a2cfffd61353e3df2903293fd4713736f02fcecff18dcd3908ee5b8d36a6d0194698a056f081d853b620739fc2caeb1aa455ae5ffa1
+DIST starlark-rust-0.6.0.tar.gz 636914 BLAKE2B 19dd602bca3df0fba75de53dc59371286f94f2a7bbaa2b591673e56bb13ddd2979fbc3be89694ab84ef283f1e62246a5d2bdcd848cb430b7fa79b7cedb6b0f96 SHA512 2d1a2e21175728ece8b03fb653b3998d886a2c3cfbb27ca72238bcf8aeab649cba188854ab3d94b8222fe349be06722178dc352d456ef1c9ca5b0f3bc2df7707
+DIST starlark_derive-0.6.0.crate 20865 BLAKE2B 1a157a9d540673dd57cc5d2152f1019c8d524f147bfecd11dce674717323befd5de19ade624167d31aa5dce7e3634f30da459599413c985c1d1aa5d78752a90a SHA512 0384cd299baf9cfd3668b6be417f5caabea04d940cdb570936167b7a0704283b022a7926490446604d9aa2f654630ebc87ac062d9625be2757ea992f82d9888e
 DIST starlark_module-0.4.0.crate 10711 BLAKE2B 0f6ae47f013a3030f4358c85ee4cd07288f385a948f1a53f84c298b313993817a33731b1afbb3e40b9e04900d28b6b1bb2bfc71d67dc8b4284081cedb6ebbfdc SHA512 61eed47cf90ff5bc6959b3c9f44c042817a7b5a0e2374dd1b9a9cb44f1d0e9ba1ca5cef2f6f6cc15ae920549e572017448c5079a3cfa20981288448d2b26e9e0
 DIST static_assertions-1.1.0.crate 18480 BLAKE2B 358dd5ac413d06f62da0388e2016c5fcb8ec68fd7dceb0dbbcb97665c032b7509b7e083c20701648b6a9174485f117c02682ae4bde7ef037e80a85cdf6a0c86e SHA512 46d0e35f77941dee6f60f574c130472248063dc38494c1c4f84f7c048244cc2a58a86fe17c0990e3f0f01406b75ed385a13d00058612b27cf0e867c8d31c92ee
 DIST string_cache-0.8.1.crate 14423 BLAKE2B af0c9b9f52a246d5537ac2831be6aea462ce253b086baf6fb1773f760d566ba70917b686c2c732f60cff4c30068c5800b7c26f73763e9ef825b2fa619f6a7c00 SHA512 476aa99da2d83de7eabe68b3dc2d064cb549e2caa2b708459f883cc0a8f27bed1b1607abb1481959cc26046cfd4c44886bb87bbef5aba95a195a9d850311915b
+DIST string_cache-0.8.2.crate 15770 BLAKE2B 36e2984684931fb15371dd0aeb30d93312153daf65f8b8c720c16327b169078763c0c7b70a00c9670a0c8c3b1099c9a98488c893f8e90eb03952cc0e694b6fe2 SHA512 d4ae1fbea4de469e342ba1a0d4c0f26386633dcc46c0cb9adbb7983e565476a57aedf1798e65f21ee5326f96880ee2bb4a5dc1621ff7e7d0ca23fb3536dc98aa
+DIST strsim-0.10.0.crate 11355 BLAKE2B bcb25ad0a7284e24e4f17ebe0ccb621bdc4118e499b50b094d98aa7e8fcc0b96716c9953c3516ce7ea78309d41d424892ded595259696a5bbffdcb07802b5c2f SHA512 78b318532addfcf5c1ccc1e14539e258aab9d3cd893cc45d82342549bde838c177d90f13c560671f8f32929af47d0b467db35e6876bd7697d8b3f9e055aeeac1
 DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
 DIST structopt-0.3.21.crate 50761 BLAKE2B e48bbec27a34ef80f28e21d42b5acc8b2cf012e1944a6b7f6395f4bd420281e18767dacabed0ca37d94ad26e73ed201c9df06d5cd781a4c107b5741eb0880e53 SHA512 df8592f10456a5b1a7bc7b290357c069ce4eba14d2558ecd6face231e49c748a8892c31ffad000b426e8180d3e4dd607329db91f4b5617e971b2edda5bab42f1
+DIST structopt-0.3.25.crate 52296 BLAKE2B 07fb1f601ff0233c5ccc15fdc45ccc6bc06636c261c96c7554c516c4cfd1f38a9541cca67c670985bfe7984da04a0cfcbdf37a83479ce1aeea9b795c7d323889 SHA512 f07c505fbabfd880ee5f931e8a3ed8a1d01fc0a66a78c0cc04a2600d2f5cb2d699ac41719062c5c4d2cb06a64ce1433641837bb7d9fb755018ce95844216811d
 DIST structopt-derive-0.4.14.crate 20116 BLAKE2B cfeb48f5e4906ca24b61afc085a5dc41edc6f69c6060a1cd7e01b844b076928111e4be2f24b3cb28e7704c09bdbbb3c3a1b2f9012ae9e23cc5f795af91fb1245 SHA512 bc20dd9d10c6dc1f5975b074a63eb84b49385ad272b62d8526962e88b28cada3998c3944dedaf8560d6577871747b875cd399dfe06851472c0a1c81fced429a0
+DIST structopt-derive-0.4.18.crate 20996 BLAKE2B 2ae17e0d365a7ce7a4d0e007513623ee0d5acf45afdc3844114e02975b855fd1a9f7df404a24044cf33a3a4cc4142eccc34d1e97925646d54d460a89baa28275 SHA512 68a7f9c2ed987993fdd8bb7e81c31969a1fdf5351c58cba9de61a2f5957aba1626be4b0742f31d4de502301675ba24b0d91dd3acb24f5607bdeec83070626a57
 DIST syn-1.0.73.crate 232706 BLAKE2B c580f9ab914c54e731c8503c9b9d577d05032edb6bd12d7a183a3c0e3532fcf24196479a9ee40d09cb7e09ba6d94add36e338331affc2625058ce54419621ee4 SHA512 b37beb1b6d483cfdbc44d806af9955cdf52c4b0d5f918782019b089d06e107c7e23ced343a3bece20235a24752783795ebba8e603b61a6302e82ee7027843d8b
+DIST syn-1.0.81.crate 234144 BLAKE2B 7258c4a0ad0eb0c807912c297233eeb195d22b44cb2078e13e43eb90f1c82ecda6f7672ab072832ce130ccb953c1bb23c8440a3df77b714f462fe39cc6e6e1a3 SHA512 288ddaf4dc5ad2fdb3bc36800d94b53e2bfe9ac74a61a5d158bfcad3728955bebac6a900a5881c7d4abde4f3759515a1dd877e1421c226b85aff99a5ee649390
 DIST term-0.7.0.crate 37082 BLAKE2B cb7947c696f71fc68bab3b25cc6cbde74b92380fdde5447399b06de99534b0cb2160963792824ac74a350444ce41a4fa16d6a9792a68d84578a15ab37ab76ca2 SHA512 9de6e836f1fd205b3b58645ec880eaabfc0fd8991e3980ef90bc6184b370a14676edb688a2a75bce412dd8ebd97345aef742afe5b964250e2b6f84e6b15b486a
 DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
 DIST textwrap-0.14.2.crate 52016 BLAKE2B db80b15ba23db718064ef0214578ea6aa4f0ee3b76723adaca131be26b770324205f2ead13c8f5c1e438ae1b5c9476cf1ede8f4ed82426c9d99d9406f2b83191 SHA512 521ab37e03aae8fcce5b909541399fc90a23020e353f95102c658fa94ffc56b9bdff43f47fb3da6e30f5c9cc9447fab72fe21d7276dfa21fe5a1a5a1c874e371
 DIST thiserror-1.0.25.crate 16690 BLAKE2B a03107d70186d46870050ef86cb1f49aa99d91e509bd9ab22ee6cbac28d37176b2bafbadedc237a25d233abf7816cb3d85d88c140f172ede40d309ddaa1223dc SHA512 f408c2722060c6f707b9afcc1d9f3cb175bcf955263c4e643ef7ee935fd68299af835f4ad489ace814a7bcad6dc428eec5df2858453834d0b6154d22a38ba1da
+DIST thiserror-1.0.30.crate 17748 BLAKE2B b9d8a8f824de03c57af43d0ef8f2e157321e7e6a220660581299a38988e7bd43733126fc9b8d8b8ae38ac1d788ef08fbcb2352beb5ddc014113e0058c2bf60d0 SHA512 0e6cbc160ee1b6236a9073dec225a4290e7a82632ee7cec00bf02797b04851adb2d3071fa268b54f7fa9fe22eeada55a83d44fbddf824520023608eda8ea2e99
 DIST thiserror-impl-1.0.25.crate 13364 BLAKE2B 9b0eb7a6fd5f290d7a666de6065edc210ab9ef35960c424258d5039f24433baef7d1228ac2e962e8ef9dcb673979c9d3c09ef3f3d20533fe2ad1500bfcb20015 SHA512 a2d2f39d3c1e5a722d7020672f63fc312dd9f8ed73863971814f1fd12faac4ea5d8546e06b26838d8224b1f91161011f51dda476848b2555153203ee9f7ee3ca
+DIST thiserror-impl-1.0.30.crate 15230 BLAKE2B bdfd4451304a2ef4ddbecb48eb1a1307e6eeadab0860c785a2b6a5e7de270ac42ac4f11e46eb9dba77ec5a86b203d9baf8e4fd5c83cdaa10e2af34a95d29d2e5 SHA512 465b1d4eb79075d8abb11f5c260d68847ea52806a2f519515705b03da376fffb3686bebb23c11462b1c59e1ae5b3ee96d834c62cac69862c491001b1ff7cbb46
 DIST tiny-keccak-2.0.2.crate 20129 BLAKE2B 105a2d2af36cc053cd95721ea563108f33b8a3feb2ae84c75a04a65ed5d548dfe35d8b2e48977a82f725c0ebcf914f21157c547f4a74bb4d98c2e894385139be SHA512 c0219f23361eb07e0a68575c461a36b7286d9bdebae89080d9e259178d402b0c7762ccf33e65a16951ea168392322c44a24eb55189cf143e22d09d6dfc4acec1
 DIST tinytemplate-1.2.1.crate 26490 BLAKE2B af39d96f33f63238e455a4e38fde1d1730fd9661ae68be7b05df6ef9d2ab1a04db1332cc4ec9deb6da3a8e22b124df81b0fa8916d8491b808742bb733c8e48be SHA512 0cc080057e096f0796e72004343e1a8332c2e8a12e43f6ade150ebf632e9c29c7ad04de0b940cd57df81efdc4d07a6607da9b86a30d8383e39ac3d7be185edb9
 DIST tinyvec-1.2.0.crate 41625 BLAKE2B d7ffe63aa2f076ecf57a2c8af3269abc7c811b7e19c3bb6ce4830f9d12a9942620a43786f4f578000d01883a9cc33105619e4357b29d64babb9d6313ad99bbd1 SHA512 eae5ef44a90995a3e7186e52c1d90447f677b9b6db2f4e120e5c32f2077f324f000a16474e347eae702b7fa2a487f3e5ff06baa2082f3904ecf404c27ceae74e
+DIST tinyvec-1.5.1.crate 44942 BLAKE2B d02f610dfb599ae4957d81140bb8945f4cae49c1b7ec5de4bd4a7d07a1334cd00557993dfae2516d506f362305025bd1a6617d55efdad8ebb549fe573e9e6f21 SHA512 80b68058e3264b3fbc537debf01b6b60d438bf5cba6ad366083cb440ed6b45587f367d3a134ec6fab769495b94413d0eca47544b26959a2c35b1a997423eb849
 DIST tinyvec_macros-0.1.0.crate 1817 BLAKE2B a3d1966bf57c11afcd026269135a6189f149f905bb70b47537c0a7bcaef0bfc6c89bdcbdb0f6cb8e5255632855134631c683fc90606a254ec8ba818fd5ef0794 SHA512 d6afc83a3c70cde916a6ff599e2772588e4bbfa7a5b1c7e5c8aa0f4a8a5c9426182497a644e4a88194ece986d38fa64b6c8eda9eb1630441c8e65a8741a45873
 DIST ucd-trie-0.1.3.crate 44615 BLAKE2B 491f604d63446dbccf5176333edd159ac56261a9aa76efecf57e9a11ae017a6cba975658a4ffdd310561704fb0831686fb7770b1142b4ac495f01e26de51b099 SHA512 54d43b3824669aa20b725c7747f4fb65bd24e620670c968c1bb0094a0503773acda921b50a0b200c1ea0f84e1e059883c1704bfa5a856d2e2ccda116fb8c3e2b
 DIST unicode-bidi-0.3.5.crate 33423 BLAKE2B 26434df7646ca6fc3b655ac2482c2be70700bd84fdd31d016f49b5276b23308d1f9258d40ff97a4090e3dd603d3a19f8fe45c13c5dcde6b00816dcee1695c7d3 SHA512 4541d84db17eef16da6ea59f1ff7103549ff338d6ffabef21e75fbfcfdb1a3fd0f8e8fe18abab7b6117e997cefeaa5e87fb01fed8fedbcd0657fc913743de8ad
+DIST unicode-bidi-0.3.7.crate 33759 BLAKE2B 4d5224062c829b5e48d26ca727bb60d10d7c663cfca24762331b36a2819a70e7d43d2b6b64ba64751d9b686949142b53346a52027d400acf8cb1e1b1895b2796 SHA512 6eeafec87a504ac968b59dd3168714e555b5b374cfbb5a6a9c962445c423f82b68ee54d1b732c5939eb17fdbb804f9b3affe828745bf4ff34e8a1587df2bc8bf
 DIST unicode-linebreak-0.1.2.crate 69293 BLAKE2B 825dc2a29d86314cff3492cac71add2cd48948284d9e9b684580186f4c021c8ce1e288d21cc47493eb19a158385ec602f0cd5608a7618e38667c1cc7445a302d SHA512 170db67d6d74df913dffc921986b92df8a2ba68776ddb17c8ffca51d0d4bee597a5460591e7ba593c1eaec8b6227956f4e0f9b11d217aed4ee85cf46f1be5277
 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-width-0.1.9.crate 16745 BLAKE2B 38d4b92e47a284d6881a8073089be59a73d82b91efe5522f55be977f95f479890b6c02cd519544729f1b1e62eb21bcfff8c5f5382917f953603b760e39cf1ea7 SHA512 0f5ec46c57e3b5e50cb8430c89db8d9c129e80ca11a9c398b5312bfe95001e19ca3efbfeb01c3ac09c4ce7e26c6ee1f352f7e114ecef78cefd68c54d2d50f5f4
 DIST unicode-xid-0.2.2.crate 14955 BLAKE2B 6c6da49ac08dbd8b3248272224d6bff96b9cd1f36029b1937a58a0b929c3a48326053305ed49e73edd70f572f5abbc4817cedc899c69e3457805ad056669f6af SHA512 92ffd0dd34e3ca235ecf110b38c447d3ec1faa23d76c112457f28d432f92fa6b5f428bc5e1bfd278f361f55426dd96e19ecb0d3eff6cf250892f069c52bd89a8
+DIST unindent-0.1.7.crate 8346 BLAKE2B cbf76fd18e49332e61275ab204cef1fc4dee58091307f8cbe2107d3a8441551055541583f1d643d4d15f9cc17a8405f540f0c53548f5b2379dd70791a03640cb SHA512 d3f4543f97f1386f63306a206074de1d10077ae968ea6eb6638545eeaf8cef662e1c84a15788e9df640eeb6af4cbc187721ec01af43984e4eeb2dfb0423c6d70
 DIST url-2.2.2.crate 68555 BLAKE2B f8e59f784b6c2e16bacfba36ad68670a6af17c16ea3b0866b5aa98e5bf4686cf1b1aac9b1f0a0ea3b89a01e044a2ca37830416f42d147158ea8e88f23fd28ac2 SHA512 f9b6ad99d69ff303283b3fd9e98945fbd6cb411a3d141badcbb3a0566723a451375e6dd5d5357e3eb7a1b5b1ee5756a2347c43817db2de6fe35b9004b090e077
 DIST utf8-ranges-1.0.4.crate 8575 BLAKE2B 686bfd854cdcb7510b07751630089f4f0cb0884017792288a63a4a8fa00e6cf1a10b38c39142e57d5b4d1f494c95f3445f343f1b34fc1883dbacfd708d8c13b6 SHA512 acd7008c92ed23cc0ad3fbacecfba2169781687c6aaa475ef5388fe416391cd209218a2cb19b9d4fc87a2a616f1dd67129d39978fe1b58be134a013f90cd53d4
 DIST utf8parse-0.2.0.crate 13392 BLAKE2B 05296f48fe429a871f42e729e3540ec3a974a69892c6bc9da95e23c0aee2163c9b115a9614eb1943363076793e17ac4c89e28066a9816cab30c451524a5832c0 SHA512 1f6a2eca32e42c8e4b53d28c4fea54c426ed66fc01447b3cf8fc0fd75694453eadbe3ba000ac8ee0347d16dbfec47681254117949109081798eab5370886827c
@ -156,11 +213,17 @@ DIST void-1.0.2.crate 2356 BLAKE2B 41578fb5507f94e7d135f9595cec107ed00a926f4968d
 DIST walkdir-2.3.2.crate 23516 BLAKE2B 473f2b51aafd6ac17e5c3da8d545d179b31486b3a65ab39fbd8bd7fbb2ebcc24bebf01781200a26a68f0b1cb464f5763a919aead3b03eba5a7e1be6efec5500b SHA512 6c44071354faf37720ec4117ded34c8d530489542ee107ac26a7a56ef4a882b9003e22e84f1d61f6078643521343e35aa1f7b57c838779e78e5937a667bf82da
 DIST wasi-0.10.2+wasi-snapshot-preview1.crate 27505 BLAKE2B 4eb8644b945633d6e856ad80dd74990be19eb6af99823b147163384f61d471e2d9ec054d78a7064072344be53783e57073e8fffc6d5555c149b4834a9bf31dba SHA512 06977a294d76369a3867c45abdd8a87ea5c84e5a3681075ba0d14af1aee3114ff24495c7e7f7fe1e6e42230e65fba0e062898e69bc89e0209af62c2d14094ec7
 DIST wasm-bindgen-0.2.74.crate 158439 BLAKE2B 28a0be539d0bdec4e23d4c5a613ec0727c00112d1da1948c050d4ce6f5f42a07fce6d1f2fafa7a66ecee9183fee9a7c23845e12eb50d206f760bfc76dad41491 SHA512 21ac04c54be9f3d3f32edbcffcd24cb9401418e0a398a3f00b6d4a0302bb32b7b044b513163a12952b09b9465b07ec7e4c26a83ad88f8ae39ac5fdc9439a1af5
+DIST wasm-bindgen-0.2.78.crate 162111 BLAKE2B a3311e67900961b35a59ead7a8972dcee37671921c0f524895c821658a7b1246403d4674bee1735f1b2b94aa789d5376edd02afe4c8ebda110f4344ef58c9225 SHA512 bedeb2828d1e74b1e373bdf34dc2eaec70dd523e9ed96a341da1ab3729a7cf8470a828ddb9cfd4cf15af6e2fff75b4368553ab4f6f02c8dec9419dcdd7578de9
 DIST wasm-bindgen-backend-0.2.74.crate 25434 BLAKE2B 211365a4407865646376bc40fbfd9865715b137aadc18f267a9d32be8e0e585d05286f8a40cba20060e3591e3a5afa49f678bac6546cde7ef88c2bde36909724 SHA512 df9fdca6c48ecf1926552c4fe06a5936f7ea0523d62e0c62f104ce5eeae7ced1fa33875e2d3ef43d58a6395f77dd37e4882850443eb1d6aa59f0ec0bcf537cfb
+DIST wasm-bindgen-backend-0.2.78.crate 25576 BLAKE2B 03dc6b255ab9e30f9eb54f81638eb02a05a0b994ddd51f47852bca376a02080fcce596453d688f5e8e7b5a814fd081b9709c1215f7e9f9fec0e4a7a6cba1000c SHA512 00a0ec9afb65c084b64cf9d25f778ab03bf2368a1e0ff213e07b8fe742a125ddae00c7b4d693225d6d798618b0441d4dea3c175cacdb37fdd75b0a46ba3a287b
 DIST wasm-bindgen-macro-0.2.74.crate 11536 BLAKE2B 65cd4b6206cc3f8303f89a76628cf54f7e31b31857eac3cc2c377b4a11f7c32548faf6a87f4a821e4ac6f66ca8d36427f4563eac8cc84e2612d5a9438b8df861 SHA512 34c7f3703ee1ee2060ba6ae638bc69193d32ced9e30c40d75bae1431efdd76b4f3adca8f9a72fb7c75f894de42a478556828e1a3854e436427bbd5dc6dc7b838
+DIST wasm-bindgen-macro-0.2.78.crate 11700 BLAKE2B 9f1538d79a39555f643b9ac6bfe026c259dfd129c45fdcc33cfbeeba2acb2a26ff4c9df83a3d11674c5ef8e9393af7a4d0cd7e3bd08b7eca0fa55986c893c5e3 SHA512 3389922198b0d5c19163f4de345e0cd7a3c0609d48ff933bd5af0cfb205463632878b5d60bfeeb8dd8f8a98f28f23c5185dd6d8389f599f31176297c944b595d
 DIST wasm-bindgen-macro-support-0.2.74.crate 17831 BLAKE2B 29f3828f58b0e8eaae04e1d73bbf0b4cea7b75c1a5ae4348938a5f77d9eb1a1ee13dd137f9750f4c8defa6f2f5444d66b6715bc5052c57a603bf3a94cb05a428 SHA512 feab4a3661a879d5fdef852531e3261060db46f1d80106926bc8a8294a19adb104a9cfb59f3fead693abf3707118084a063906248d3f4c566b43e9aa9c2983b4
+DIST wasm-bindgen-macro-support-0.2.78.crate 17858 BLAKE2B 8378f639a94797d2d149f2cd836f56143a498d3be5fc30eced6fe4fc2e1bfe14a70f3165cdc5cc1c88f0162efec75b64e56aa9819596984afa97003601b933ce SHA512 84d9867407a7caa942ab11f0ad1c343839bf51793930cdc3ebc5279ca370062eda006540448cc401f6afa078dbb1523b348ae69f4c6d7ccc9a7b8fa1ff895236
 DIST wasm-bindgen-shared-0.2.74.crate 7163 BLAKE2B 076464004d12495342a4b24f1dedc629f0ebb49993fce74271a5e59cd39e9a38ceea9a287716c65c2e61744c829388f7cdd7597a541da22b4f794b8bc3d44094 SHA512 4613c677d04abcabe6132f8f2a5a24f622cb1cb0c084f535e2f97584acba7a0faa12fd0636186b58756a7e4a82f364b04ea73330d7841940917f5e3324d0e60a
+DIST wasm-bindgen-shared-0.2.78.crate 7206 BLAKE2B ee60946d3a90a2760d8cb045657de659c6367aed2d98efd60074cb57f6b06aedf9ac44fed3d41c20299c5edc095cac5537a365fdb01183f3e60b6323da581935 SHA512 a808b7a7909e4a287ccced1b251ad4c1230399c84c05e246127b6a91fa4ed328d6a24316dbdc1843db71a5bd78cfd80113424f9984e0777323d74e3125607134
 DIST web-sys-0.3.51.crate 651133 BLAKE2B 330aaa7323a516eb840b2a6ff0ee2e076ed70990c04679dca328d5eeae9aac01fb07a4e2852615715f14abe368989f84f159ac72a4c320c01437056dd7dec706 SHA512 fd0e1ec156d88699adc271d092dd1adf4d41cd554b2b49e2c53423eabbc2215b539a435d1b9146dccc40282339d766565ccdedef82febcafca43cb6e1437e5fc
+DIST web-sys-0.3.55.crate 664827 BLAKE2B 1864f320e6c9b80c6b4b4fd8941d66cf9368a9b0cebcb86d3486b99f65456748b46c507a1bb761611c4825d412986f5bd8c8fc38c3bda3dad2e9de213467ee51 SHA512 ddf191f009d49388bf60ee31650eff1ff884f01822989a226c559b9560aebd90681fadd34e7437f555d627a0a3139ebe267375618eadac8c17ace5fd47650764
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
--- a/dev-lang/starlark-rust/starlark-rust-0.6.0.ebuild
+++ b/dev-lang/starlark-rust/starlark-rust-0.6.0.ebuild
@ -0,0 +1,209 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES="
+Inflector-0.11.4
+ahash-0.7.6
+aho-corasick-0.7.18
+annotate-snippets-0.9.1
+ansi_term-0.11.0
+anyhow-1.0.48
+ascii-canvas-3.0.0
+atty-0.2.14
+autocfg-1.0.1
+beef-0.4.4
+bitflags-1.3.2
+bit-set-0.5.2
+bit-vec-0.6.3
+bstr-0.2.17
+bumpalo-3.8.0
+cast-0.2.7
+cc-1.0.72
+cfg-if-1.0.0
+clap-2.33.3
+convert_case-0.4.0
+criterion-0.3.5
+criterion-plot-0.4.4
+crossbeam-channel-0.5.1
+crossbeam-deque-0.8.1
+crossbeam-epoch-0.9.5
+crossbeam-utils-0.8.5
+crunchy-0.2.2
+csv-1.1.6
+csv-core-0.1.10
+debugserver-types-0.5.0
+derivative-2.2.0
+derive_more-0.99.16
+diff-0.1.12
+dirs-next-2.0.0
+dirs-sys-next-0.1.2
+either-1.6.1
+ena-0.14.0
+fixedbitset-0.2.0
+fnv-1.0.7
+form_urlencoded-1.0.1
+fs2-0.4.3
+gazebo-0.2.2
+gazebo-0.4.4
+gazebo_derive-0.1.1
+gazebo_derive-0.4.1
+getrandom-0.2.3
+half-1.8.2
+hashbrown-0.11.2
+heck-0.3.3
+hermit-abi-0.1.19
+idna-0.2.3
+indenter-0.3.3
+indexmap-1.7.0
+indoc-1.0.3
+instant-0.1.12
+itertools-0.9.0
+itertools-0.10.1
+itoa-0.4.8
+js-sys-0.3.55
+lalrpop-0.19.6
+lalrpop-util-0.19.6
+lazy_static-1.4.0
+libc-0.2.108
+lock_api-0.4.5
+logos-0.11.4
+logos-derive-0.11.5
+log-0.4.14
+lsp-server-0.5.2
+lsp-types-0.89.2
+maplit-1.0.2
+matches-0.1.9
+memchr-2.4.1
+memoffset-0.6.4
+new_debug_unreachable-1.0.4
+nix-0.19.1
+num-traits-0.2.14
+num_cpus-1.13.0
+once_cell-1.8.0
+oorandom-11.1.3
+parking_lot-0.11.2
+parking_lot_core-0.8.5
+paste-1.0.6
+percent-encoding-2.1.0
+pest-2.1.3
+petgraph-0.5.1
+phf_shared-0.8.0
+pico-args-0.4.2
+plotters-0.3.1
+plotters-backend-0.3.2
+plotters-svg-0.3.1
+precomputed-hash-0.1.1
+proc-macro2-1.0.32
+proc-macro-error-1.0.4
+proc-macro-error-attr-1.0.4
+quote-1.0.10
+rayon-1.5.1
+rayon-core-1.9.1
+redox_syscall-0.2.10
+redox_users-0.4.0
+regex-1.5.4
+regex-automata-0.1.10
+regex-syntax-0.6.25
+rustc_version-0.3.3
+rustc_version-0.4.0
+rustversion-1.0.5
+rustyline-7.1.0
+ryu-1.0.5
+same-file-1.0.6
+schemafy-0.5.2
+schemafy_core-0.5.2
+schemafy_lib-0.5.2
+scopeguard-1.1.0
+semver-0.11.0
+semver-1.0.4
+semver-parser-0.10.2
+serde-1.0.130
+serde_cbor-0.11.2
+serde_derive-1.0.130
+serde_json-1.0.71
+serde_repr-0.1.7
+siphasher-0.3.7
+smallvec-1.7.0
+smawk-0.3.1
+starlark-0.6.0
+starlark_derive-0.6.0
+static_assertions-1.1.0
+string_cache-0.8.2
+strsim-0.8.0
+strsim-0.10.0
+structopt-0.3.25
+structopt-derive-0.4.18
+syn-1.0.81
+term-0.7.0
+textwrap-0.11.0
+textwrap-0.14.2
+thiserror-1.0.30
+thiserror-impl-1.0.30
+tinytemplate-1.2.1
+tinyvec-1.5.1
+tinyvec_macros-0.1.0
+tiny-keccak-2.0.2
+ucd-trie-0.1.3
+unicode-bidi-0.3.7
+unicode-linebreak-0.1.2
+unicode-normalization-0.1.19
+unicode-segmentation-1.8.0
+unicode-width-0.1.9
+unicode-xid-0.2.2
+unindent-0.1.7
+url-2.2.2
+utf8parse-0.2.0
+utf8-ranges-1.0.4
+vec_map-0.8.2
+version_check-0.9.3
+walkdir-2.3.2
+wasi-0.10.2+wasi-snapshot-preview1
+wasm-bindgen-0.2.78
+wasm-bindgen-backend-0.2.78
+wasm-bindgen-macro-0.2.78
+wasm-bindgen-macro-support-0.2.78
+wasm-bindgen-shared-0.2.78
+web-sys-0.3.55
+winapi-0.3.9
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-util-0.1.5
+winapi-x86_64-pc-windows-gnu-0.4.0
+yansi-term-0.1.2
+"
+
+inherit cargo
+
+DESCRIPTION="A Rust implementation of the Starlark language"
+HOMEPAGE="https://github.com/facebookexperimental/starlark-rust"
+SRC_URI="$(cargo_crate_uris ${CRATES})
+	https://github.com/facebookexperimental/starlark-rust/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+# Nightly rust-1.53.0 required for https://bugs.gentoo.org/796824
+BDEPEND="${RUST_DEPEND}
+	>=dev-lang/rust-1.53.0[nightly]"
+
+# RUSTFLAGS support needed: https://bugs.gentoo.org/796887
+QA_FLAGS_IGNORED=".*"
+
+src_prepare() {
+	sed -e 's:#!\[feature(const_mut_refs)\]:\0\n#![feature(const_panic)]:' \
+		-i starlark/src/lib.rs || die
+	default
+}
+
+src_test() {
+	source "${FILESDIR}/test/features.bash" || die
+	test-features_main "${PWD}/target/release/starlark" || die
+}
+
+src_install() {
+	dobin target/release/starlark
+	ln "${ED}/usr/bin/starlark"{,-rust} || die
+	dodoc -r {docs,{CHANGELOG,README}.md}
+}
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
--- a/dev-libs/intel-compute-runtime/Manifest
+++ b/dev-libs/intel-compute-runtime/Manifest
@ -1,4 +1,3 @@
-DIST intel-compute-runtime-21.41.21220.tar.gz 4753783 BLAKE2B a340c2b5c1199498a68aa66c1d88367b99bc2404f35da10135030aa68462a909808fb2358dbc3d75357e00ccf30bb259a325a3d4523d862c0da358eae7528f65 SHA512 df397688423dbe0ec2e61c9a9c8b6ee1ee4451a95ef01aefcc2a0ed956e6b8273a4e9975c9aca592b51b4ce85324f5bdcd6a835f8eab40a0e715eb10000f1ceb
 DIST intel-compute-runtime-21.42.21270.tar.gz 4761371 BLAKE2B 5dd2886e4b2a84a2247d2bb70667805531f099881431d9e8052c870d4081378cbbb43ea3f595c890f9d1930b9d054c0813da3f8b1c5509ad2090c78a4d683ed5 SHA512 f913bb116e84c0bd477578e75e10b67ef9c42bb447c2afdeefd9bb8ae291e53b019937d6e474e749a9bf98741366c8e76e5a8dcd23f8a9fac48e306e8dc9a648
 DIST intel-compute-runtime-21.43.21438.tar.gz 4840204 BLAKE2B 6de3075132b9a48e97e30e66c6e09dd24f51cabddf55622f2c7490d38bd1ad25e4853206a0a8a3c4c34ac3eb774e44974c47089182652ae2d234044b72d1d048 SHA512 e8f98d9c8c0a01794d57276706ec4212a3fb082c8ac04dc76ceb0e30fecbd8d35405baaa45685fd4b241e8b04a15db16aef75bf1929c81ff879af46e5be00d1e
 DIST intel-compute-runtime-21.44.21506.tar.gz 4851449 BLAKE2B beb49e8bbbfab098bb07943def326463b50f3a4b659368c5b24aadede582331c2c15d4d047e3bbae3d0ca32752c4a05861b0c0a325f30e91bc865276722116b6 SHA512 ae8ca2780602c53f13379ea798462fff1c136967186da21c5b714ed5ab405cb815e0e5e9e60cf8586cef151424270db624b473748d2756ee5768dba4cc020ea6
--- a/dev-libs/intel-compute-runtime/intel-compute-runtime-21.41.21220.ebuild
+++ b/dev-libs/intel-compute-runtime/intel-compute-runtime-21.41.21220.ebuild
@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-MY_PN="${PN/intel-/}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Intel Graphics Compute Runtime for oneAPI Level Zero and OpenCL Driver"
-HOMEPAGE="https://github.com/intel/compute-runtime"
-SRC_URI="https://github.com/intel/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="+l0 +vaapi"
-
-RDEPEND="
-	dev-libs/libnl:3
-	dev-libs/libxml2:2
-	>=dev-util/intel-graphics-compiler-1.0.8744
-	>=dev-util/intel-graphics-system-controller-0.2.4
-	>=media-libs/gmmlib-21.2.1
-	>=virtual/opencl-3
-	l0? ( >=dev-libs/level-zero-1.5.0 )
-	vaapi? (
-		x11-libs/libdrm[video_cards_intel]
-		x11-libs/libva
-	)
-"
-
-# for Khronos OpenGL headers
-DEPEND="
-	${RDEPEND}
-	media-libs/mesa
-"
-
-BDEPEND="virtual/pkgconfig"
-
-DOCS=( "README.md" "FAQ.md" )
-
-PATCHES=( "${FILESDIR}/${PN}-21.31.20514-no_Werror.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_WITH_L0="$(usex l0)"
-		-DDISABLE_LIBVA="$(usex !vaapi)"
-		-DKHRONOS_GL_HEADERS_DIR="${ESYSROOT}/usr/include"
-		-DOCL_ICD_VENDORDIR="${EPREFIX}/etc/OpenCL/vendors"
-
-		# If enabled, tests are automatically run during
-		# the compile phase and we cannot run them because
-		# they require permissions to access the hardware.
-		-DSKIP_UNIT_TESTS="ON"
-	)
-
-	cmake_src_configure
-}
--- a/dev-libs/intel-compute-runtime/intel-compute-runtime-21.42.21270.ebuild
+++ b/dev-libs/intel-compute-runtime/intel-compute-runtime-21.42.21270.ebuild
@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}"

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="+l0 +vaapi"

 RDEPEND="
--- a/dev-libs/libmateweather/libmateweather-1.24.1.ebuild
+++ b/dev-libs/libmateweather/libmateweather-1.24.1.ebuild
@ -8,7 +8,7 @@ MATE_LA_PUNT="yes"
 inherit mate

 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 fi

 DESCRIPTION="MATE library to access weather information from online services"
--- a/dev-libs/libtimezonemap/libtimezonemap-0.4.6-r1.ebuild
+++ b/dev-libs/libtimezonemap/libtimezonemap-0.4.6-r1.ebuild
@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/libt/${PN}/${PN}_${PV}.orig.tar.gz -> ${PN}_$

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"

 DEPEND="dev-libs/glib:2
 	dev-libs/gobject-introspection:0=
--- a/dev-libs/plasma-wayland-protocols/Manifest
+++ b/dev-libs/plasma-wayland-protocols/Manifest
@ -1,3 +1,2 @@
 DIST plasma-wayland-protocols-1.3.0.tar.xz 39052 BLAKE2B 4024ac8c31c1620eb88b027084e9219368f570719cdb53ccff30594de7ebd5e0c01c8baf580d9c19115aa4632bc960fd8e44fd6bf97919e61faf24c1a43fbfdf SHA512 4c0466bbbe07399d4c54d4f04d7bee92826a6009c61fd7e6898c04d12e906c68fce25c520583225aef18737071b71b85814070a769a4f00e2a71b709568c1695
-DIST plasma-wayland-protocols-1.4.0.tar.xz 41160 BLAKE2B 1b308c948c2a568c20c7578255d3f70ebd648b921a2ea7a9ef7c8f72f8c91a6f3c4f987b10618c7eccda2c0d0ea28abef66ff78010923c08a83ad482e9524ef7 SHA512 4f38f440943fa129527455ff26aac9fd460f59fa332becbb338847eb68c01d8e0bbcf4abd1fb6c8fee996a8260c8b19543d206cfe3534ea8f929012079ecafb0
 DIST plasma-wayland-protocols-1.5.0.tar.xz 41488 BLAKE2B 1235506ffb69fdbabd2d8a0b6c9b477a50c83431571b000a10907caa16b178ddbe628d63b4fdf2c98905fdb8a8fdd0699ca13dc3b718ab672b08719f9f434ea3 SHA512 bec83ee401e71fff3c5a38768034b0dfc1dd191af634b9ffa765bf86d9c14143abc2c5abd743dc53cc6c0aac1dbbf79104683c9ff5c6d880b03e71399806a6d7
--- a/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.4.0.ebuild
+++ b/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.4.0.ebuild
@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_NONGUI=true
-KFMIN=5.82.0
-inherit ecm kde.org
-
-DESCRIPTION="Plasma Specific Protocols for Wayland"
-HOMEPAGE="https://invent.kde.org/libraries/plasma-wayland-protocols"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0"
--- a/dev-libs/tree-sitter/Manifest
+++ b/dev-libs/tree-sitter/Manifest
@ -1 +1,2 @@
 DIST tree-sitter-0.20.0.tar.gz 2876764 BLAKE2B 058f62c2067ce5fcf9440f281c63908f93fda09a6b3604d7196b9c56a15ba88ded7d75f9c21b4c5c4209f587fb5f326ae655cb5f5d84b46bfd783b2147048568 SHA512 a51fa0af45a6a99bb74ff53c15a4d7939eb24c6720e65ec7a96f74ffbce54801f14539e071ec6a4891dae778d7dea5edcecc6dd57716cc70a891c9e6cfa55013
+DIST tree-sitter-0.20.1.tar.gz 2903038 BLAKE2B 092b3110ca2dd2dc2f6298dad98c2400064ba7b7bce90cdf7c50bdfabf0bf52629f5315728b578ae46efc1a4c2f71ff024ffae202205a3b563188e3537565359 SHA512 172e9b2fba5d4610f663934dff1cf4580d09631a3d8d5d7249b6a80288aa9fdda9f5eac50a501935a87414563b46f843c3d98a1f7e45302a5c61dd3c08159606
--- a/dev-libs/tree-sitter/tree-sitter-0.20.1.ebuild
+++ b/dev-libs/tree-sitter/tree-sitter-0.20.1.ebuild
@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Tree-sitter is a parser generator tool and an incremental parsing library."
+HOMEPAGE="https://github.com/tree-sitter/tree-sitter"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-No-static-libs-gentoo.patch"
+)
+
+src_prepare() {
+	default
+	tc-export CC
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
+}
--- a/dev-lua/Manifest.gz
+++ b/dev-lua/Manifest.gz
--- a/dev-lua/luarocks/Manifest
+++ b/dev-lua/luarocks/Manifest
@ -1 +1,2 @@
 DIST luarocks-3.7.0.tar.gz 247576 BLAKE2B b1e119ec897bc8122441445dc215e628d2415dacba9b23c2b075f82a01e21e6e9a8eeab5a3345355d85c566ff9f85ab29194580674521d4d92725b01377ee940 SHA512 cc3c555c488da9f95a118eedb74cb9e2a38b572e172958843dabebce125524e58a13ac65e89a349deb8fef13b6de751074fc3adbb430ab55d4e4109288119153
+DIST luarocks-3.8.0.tar.gz 249787 BLAKE2B 2bfff5af400abfdf17a0eacd1f29838dd77751f2ba085d6c6fc18dfc971ea796523781ff2488566d42c01d005bd5037171bf1aabbfdd664746c55674e3ca32c7 SHA512 6c30884c60da57706228a9870f510a1bce435b2d5d67c63c5f2958b152c7a2b334bd74a016995871e3b05b98374f4c4e008993ede81f9fc564980e183bdf06b2
--- a/dev-lua/luarocks/luarocks-3.8.0.ebuild
+++ b/dev-lua/luarocks/luarocks-3.8.0.ebuild
@ -0,0 +1,86 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit lua-single
+
+DESCRIPTION="A package manager for the Lua programming language"
+HOMEPAGE="https://luarocks.org"
+SRC_URI="https://luarocks.org/releases/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+RESTRICT="test"
+
+RDEPEND="${LUA_DEPS}"
+
+DEPEND="
+	net-misc/curl
+	dev-libs/openssl:0
+	${RDEPEND}
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		$(lua_gen_cond_dep 'dev-lua/busted[${LUA_USEDEP}]')
+		$(lua_gen_cond_dep 'dev-lua/busted-htest[${LUA_USEDEP}]')
+		${RDEPEND}
+	)
+"
+
+src_prepare() {
+	default
+
+	# If 'dev-lang/lua' is a new, fresh installation, no 'LUA_LIBDIR' exists,
+	# as no compiled modules are installed on a new, fresh installation,
+	# so this check must be disabled, otherwise 'configure' will fail.
+	sed -e '/LUA_LIBDIR is not a valid directory/d' -i configure || die
+}
+
+src_configure() {
+	local myeconfargs=(
+		"--prefix=${EPREFIX}/usr"
+		"--rocks-tree=$(lua_get_lmod_dir)"
+		"--with-lua-include=$(lua_get_include_dir)"
+		"--with-lua-interpreter=${ELUA}"
+		"--with-lua-lib=$(lua_get_cmod_dir)"
+	)
+
+	# Since the configure script is handcrafted,
+	# and yells at unknown options, do not use 'econf'.
+	./configure "${myeconfargs[@]}" || die
+}
+
+src_test() {
+	busted --lua=${ELUA} || die
+}
+
+src_install() {
+	default
+
+	{ find "${D}" -type f -exec sed -i -e "s:${D}::g" {} \;; } || die
+}
+
+pkg_postinst() {
+	local lua_abi_ver
+	if use lua_single_target_luajit; then
+		lua_abi_ver="5.1"
+	else
+		lua_abi_ver=${ELUA#lua}
+	fi
+	elog
+	elog "To manage rocks for a Lua version other than the current ${CATEGORY}/${PN} default (${lua_abi_ver})"
+	elog "you can use the command-line option --lua-version, e.g."
+	elog
+	elog "    luarocks --lua-version 5.3 install luasocket"
+	elog
+	elog "(use 5.1 for luajit). Note that the relevant Lua version must already be present in the system."
+	elog
+}
--- a/dev-perl/Manifest.gz
+++ b/dev-perl/Manifest.gz
--- a/dev-perl/MooX-late/MooX-late-0.100.0.ebuild
+++ b/dev-perl/MooX-late/MooX-late-0.100.0.ebuild
@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Easily translate Moose code to Moo"

 SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ~x86"
+KEYWORDS="amd64 ~hppa ppc x86"

 RDEPEND="
 	>=dev-perl/Moo-2.0.0
--- a/dev-perl/Sub-HandlesVia/Sub-HandlesVia-0.16.0.ebuild
+++ b/dev-perl/Sub-HandlesVia/Sub-HandlesVia-0.16.0.ebuild
@ -9,7 +9,7 @@ inherit perl-module

 DESCRIPTION="alternative handles_via implementation"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ~x86"
+KEYWORDS="amd64 ~hppa ppc x86"

 RDEPEND="
 	dev-perl/Class-Method-Modifiers
--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
--- a/dev-php/pecl-amqp/Manifest
+++ b/dev-php/pecl-amqp/Manifest
@ -1,2 +1,3 @@
 DIST amqp-1.10.2.tgz 107350 BLAKE2B dd32873d5288ced2ef2c05e6b131f35c31a3514a98d5d3cb8784a989ca1d8637c5ddc7ffa2d73f5bfc2daa4fe718ecf1f08c7ceae64d2e613ef430d18161393b SHA512 a17176bcc02d35a9686d3ca120cca98d808b2a896733f41a28b5d29d43127a0a45b012bc6566de3604f41b8bcc453408a37a8254bcf47e940ebe12bb6f4d4265
+DIST amqp-1.11.0RC1.tgz 108361 BLAKE2B f8b0eadb9af8b7e0bdb0dac948f4705ed6ff09c210c6ec9c4a6d5ed2707f9a04ce43fee5e3631815c3c0a3aa7e05ebee0fabf74c39fb586372b5796dc83f7203 SHA512 c12a43126e4ad1418d43a07aa2400fb9d9506181912ed4e0892aba078147384afe083051e034b3941eb5e0d40241c92eec2de64d5dd17b60b3c11c876662f0aa
 DIST amqp-1.11.0beta.tgz 108054 BLAKE2B 821359d165f4152e423164692b7f7faf367ae33674fd9dd08e4fa91e7b0f33924a81c81e54153e4bcd76336059691751d331059e6f61b34612aea68b4571d6b4 SHA512 e2625cf5e4f1614911d824aa8ab40600502847847808104f101fa409ad0a5df3007594e8a012620bb3ae26632fe20068905100cc2dac35973f9b8e5457d41768
--- a/dev-php/pecl-amqp/pecl-amqp-1.11.0_rc1.ebuild
+++ b/dev-php/pecl-amqp/pecl-amqp-1.11.0_rc1.ebuild
@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+USE_PHP="php7-3 php7-4 php8-0 php8-1"
+MY_P="${PN/pecl-/}-${PV/_rc/RC}"
+PHP_EXT_S="${WORKDIR}/${MY_P}"
+PHP_EXT_PECL_FILENAME="${MY_P}.tgz"
+
+inherit php-ext-pecl-r3
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="PHP Bindings for AMQP 0-9-1 compatible brokers"
+LICENSE="PHP-3.01"
+SLOT="0"
+IUSE=""
+
+S="${PHP_EXT_S}"
+
+# Tests require running rabbitmq-server on localhost which requires epmd
+# which only accepts /var/run/epmd.pid as pidfile.
+RESTRICT="test"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND=">=net-libs/rabbitmq-c-0.5.2:=[ssl]"
+DEPEND="${RDEPEND}"
+PHP_EXT_ECONF_ARGS=()
--- a/dev-php/pecl-dbase/Manifest
+++ b/dev-php/pecl-dbase/Manifest
@ -1,3 +1 @@
-DIST dbase-7.0.1.tgz 33588 BLAKE2B 50cc5b4e0096dbdd7067e9c05cb7b580ff5a9d548ec6acb8a777fa3ba62ac4fa06b30e040bdec2a77b87736cdd0684a662aab344db11806e6ca2c6824cee6908 SHA512 8aa743545e807773be6a3f74cd9ae686a982a5455e494ff2bc0e3fe6f1fdf25574702054253eaefc55a6e9529b3e70c8390a02bd317b74db17bfe6b7797d4ba2
-DIST dbase-7.1.0.tgz 36986 BLAKE2B d5baa2165f41afcfe4faee60565ee1003abe069e2fff0b84421926c3436e1af20fa1e6d7a8641d2984399328e76a1e0555572b766c9c1d938d82ed546b25a750 SHA512 3adf45dbaa183933761065d8320c556585878514684bb3e848b8fc4d9bbaa9808f74994b4c49f0e107c10baee4ab54eb5b85b721002873dc6c978332400fae4c
 DIST dbase-7.1.1.tgz 37583 BLAKE2B 7131e6219aa263259e7892b8a4bb29051bf3b9688532e73c77032f6d0ef86c94bc6a4f75461c8901995383e86fcc4828d175132064cb181e3de9f9e57f502282 SHA512 bdcd0be903fec5760e23ba9cbaef9a0f21c8a5388c7ccee56b4932a0cbb1e35ec5424f1130fd94068c4074d38c4ecc387ff93f7f01f6249fce7a64af494af0bc
--- a/dev-php/pecl-dbase/pecl-dbase-7.0.1.ebuild
+++ b/dev-php/pecl-dbase/pecl-dbase-7.0.1.ebuild
@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-USE_PHP="php7-2 php7-3 php7-4"
-
-inherit php-ext-pecl-r3
-
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="dBase database file access functions"
-LICENSE="PHP-3.01"
-SLOT="7"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-PHP_EXT_ECONF_ARGS=( )
--- a/dev-php/pecl-dbase/pecl-dbase-7.1.0.ebuild
+++ b/dev-php/pecl-dbase/pecl-dbase-7.1.0.ebuild
@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-USE_PHP="php7-2 php7-3 php7-4 php8-0"
-
-MY_PV="${PV/_rc/RC}"
-PHP_EXT_PECL_FILENAME="dbase-${MY_PV}.tgz"
-
-inherit php-ext-pecl-r3
-
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="dBase database file access functions"
-LICENSE="PHP-3.01"
-SLOT="7"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PHP_EXT_PECL_FILENAME%.tgz}"
-PHP_EXT_S="${S}"
--- a/dev-php/pecl-dbase/pecl-dbase-7.1.1.ebuild
+++ b/dev-php/pecl-dbase/pecl-dbase-7.1.1.ebuild
@ -3,10 +3,7 @@

 EAPI="7"

-USE_PHP="php7-2 php7-3 php7-4 php8-0"
-
-MY_PV="${PV/_rc/RC}"
-PHP_EXT_PECL_FILENAME="dbase-${MY_PV}.tgz"
+USE_PHP="php7-3 php7-4 php8-0 php8-1"

 inherit php-ext-pecl-r3

@ -19,6 +16,3 @@ IUSE=""

 DEPEND=""
 RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PHP_EXT_PECL_FILENAME%.tgz}"
-PHP_EXT_S="${S}"
--- a/dev-php/pecl-dio/pecl-dio-0.2.0-r1.ebuild
+++ b/dev-php/pecl-dio/pecl-dio-0.2.0-r1.ebuild
@ -7,10 +7,7 @@ PHP_EXT_NAME="dio"
 PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"

-USE_PHP="php7-3 php7-4 php8-0"
-
-MY_PV=${PV/_rc/RC}
-PHP_EXT_S="${WORKDIR}/${PN/pecl-/}-${MY_PV}"
+USE_PHP="php7-3 php7-4 php8-0 php8-1"

 inherit php-ext-pecl-r3

@ -20,5 +17,3 @@ DESCRIPTION="Direct I/O functions for PHP"
 LICENSE="PHP-3.01"
 SLOT="0"
 IUSE=""
-
-S="${PHP_EXT_S}"
--- a/dev-php/pecl-eio/Manifest
+++ b/dev-php/pecl-eio/Manifest
@ -1,2 +1,3 @@
 DIST eio-2.0.4.tgz 74118 BLAKE2B 0228f0ca91ed6410614242e7ea1ddadaa1d1aa8211b3ea6f730c0711e4339bc158d661c5addee685d750a51e654874d35a04cf011d2a02ad06ab3f249b893753 SHA512 a74464752af5792c527b9149a7edff574952cac0b5b09e1e7ff3b7c0a2cc88ab171d916d94d508b9f92aa40bd5262a5b9f8d4ba239908f13ebcb89c6513da4d0
 DIST eio-3.0.0RC2.tgz 89591 BLAKE2B 7923f8715870cfd744148980e3ad6de8373384d85e45abc687be2cde22fd425a33b8c80fbd1226e23dbac417533826dfbf639fed751bfc2a88e118750e38d626 SHA512 23e7d88720222ac3f58015ba140e3338e100cf72cf64276fd7e0f0d63a5e50f878ab0a4a742eac7b51484c56ee438fcc3f7cbf7b1da5db44e0178a5098a4a6ae
+DIST eio-3.0.0RC4.tgz 89689 BLAKE2B 2b8cc414d212ec7d3345621a1190ef4e2b2a286ea76569dd39f6a1ce9a77e77bbb6959d9d25be59ab4fea617cb4c16bfcc726d6d1c8aee0dfa87c2cdcbd9f095 SHA512 126f189eb1ccce6093c764b9910bd844561ff644efeaeb762dd5eccb34122b0012160168f223f46d82dd6bf55ebcd1561c96bc69c408b2c8a37c0d2a04d619e4
--- a/dev-php/pecl-eio/pecl-eio-3.0.0_rc4.ebuild
+++ b/dev-php/pecl-eio/pecl-eio-3.0.0_rc4.ebuild
@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+MY_PN="${PN/pecl-}"
+MY_PV="${PV/_rc/RC}"
+MY_P="${MY_PN}-${MY_PV}"
+PHP_EXT_NAME="eio"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+PHP_EXT_PECL_FILENAME="${MY_P}.tgz"
+PHP_EXT_S="${WORKDIR}/${MY_P}"
+DOCS=( README.md )
+
+USE_PHP="php7-3 php7-4 php8-0 php8-1"
+inherit php-ext-pecl-r3
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="PHP-3.01"
+
+DESCRIPTION="PHP wrapper for libeio library"
+LICENSE="PHP-3"
+SLOT="0"
+IUSE="debug"
+
+S="${PHP_EXT_S}"
+
+src_configure() {
+	local PHP_EXT_ECONF_ARGS=("--with-eio" "$(use_enable debug eio-debug)" )
+	php-ext-source-r3_src_configure
+}
--- a/dev-php/pecl-geoip/files/fix-failing-tests-php8-1-1.1.1.patch
+++ b/dev-php/pecl-geoip/files/fix-failing-tests-php8-1-1.1.1.patch
@ -0,0 +1,71 @@
+diff --git a/tests/014.phpt b/tests/014.phpt
+index 40f3ef8..93bc1f7 100644
+--- a/tests/014.phpt
+++ b/tests/014.phpt
+@@ -8,10 +8,9 @@ Checking timezone info with (some) empty fields
+ <?php
+ 
+ var_dump(geoip_time_zone_by_country_and_region('US','MA'));
+-var_dump(geoip_time_zone_by_country_and_region('US',NULL));
+var_dump(geoip_time_zone_by_country_and_region('US',''));
+ var_dump(geoip_time_zone_by_country_and_region('DE'));
+-var_dump(geoip_time_zone_by_country_and_region(NULL,''));
+-var_dump(geoip_time_zone_by_country_and_region(NULL,NULL));
+var_dump(geoip_time_zone_by_country_and_region('',''));
+ 
+ ?>
+ --EXPECTF--
+@@ -21,6 +20,3 @@ string(%d) "Europe/%s"
+ 
+ Warning: geoip_time_zone_by_country_and_region(): You need to specify at least the country code. in %s on line %d
+ bool(false)
+-
+-Warning: geoip_time_zone_by_country_and_region(): You need to specify at least the country code. in %s on line %d
+-bool(false)
+diff --git a/tests/016.phpt b/tests/016.phpt
+index 83c5250..9b2f056 100644
+--- a/tests/016.phpt
+++ b/tests/016.phpt
+@@ -8,10 +8,8 @@ Checking geoip_region_name_by_code with (some) empty fields
+ <?php
+ 
+ var_dump(geoip_region_name_by_code('CA',''));
+-var_dump(geoip_region_name_by_code('CA',NULL));
+ var_dump(geoip_region_name_by_code('CA',1));
+ var_dump(geoip_region_name_by_code('','QC'));
+-var_dump(geoip_region_name_by_code(NULL,'QC'));
+ var_dump(geoip_region_name_by_code(1,'QC'));
+ 
+ ?>
+@@ -19,12 +17,6 @@ var_dump(geoip_region_name_by_code(1,'QC'));
+ 
+ Warning: geoip_region_name_by_code(): You need to specify the country and region codes. in %s on line %d
+ bool(false)
+-
+-Warning: geoip_region_name_by_code(): You need to specify the country and region codes. in %s on line %d
+-bool(false)
+-bool(false)
+-
+-Warning: geoip_region_name_by_code(): You need to specify the country and region codes. in %s on line %d
+ bool(false)
+ 
+ Warning: geoip_region_name_by_code(): You need to specify the country and region codes. in %s on line %d
+diff --git a/tests/019.phpt b/tests/019.phpt
+new file mode 100644
+index 0000000..9493ea3
+--- /dev/null
+++ b/tests/019.phpt
+@@ -0,0 +1,13 @@
+--TEST--
+Checking geoip_country_code_by_name_v6 (if IPv6 DB installed)
+--SKIPIF--
+<?php if (!extension_loaded("geoip") || !defined("GEOIP_COUNTRY_EDITION_V6") || !geoip_db_avail(GEOIP_COUNTRY_EDITION_V6)) print "skip"; ?>
+--INI--
+--FILE--
+<?php
+
+var_dump( geoip_country_code_by_name_v6('2001:4860:4860::8888') );
+
+?>
+--EXPECT--
+string(2) "US"
--- a/dev-php/pecl-geoip/pecl-geoip-1.1.1-r5.ebuild
+++ b/dev-php/pecl-geoip/pecl-geoip-1.1.1-r5.ebuild
@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=6
+EAPI=7

 PHP_EXT_NAME="geoip"
 DOCS="README ChangeLog"
-USE_PHP="php7-2 php7-3 php7-4 php8-0"
+USE_PHP="php7-3 php7-4 php8-0 php8-1"

 inherit php-ext-pecl-r3

@ -22,4 +22,5 @@ RDEPEND="${DEPEND}"
 PATCHES=(
 	"${FILESDIR}/fix-failing-tests-1.1.1.patch"
 	"${FILESDIR}/php8-support-1.1.1.patch"
+	"${FILESDIR}/fix-failing-tests-php8-1-1.1.1.patch"
 )
--- a/dev-php/pecl-gnupg/files/php-8.1-support-1.5.0.patch
+++ b/dev-php/pecl-gnupg/files/php-8.1-support-1.5.0.patch
@ -0,0 +1,55 @@
+diff --git a/phpc.h b/phpc.h
+index 4b55747..70fb317 100644
+--- a/phpc/phpc.h
+++ b/phpc/phpc.h
+@@ -51,6 +51,12 @@
+ 	memcpy(&PHPC_OBJ_GET_HANDLER_VAR_NAME(_name), \
+ 		zend_get_std_object_handlers(), sizeof(zend_object_handlers))
+ 
+/* for arginfo */
+#ifndef ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX
+#define ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(name, return_reference, required_num_args, type, allow_null) \
+        ZEND_BEGIN_ARG_INFO_EX(name, 0, return_reference, required_num_args)
+#endif
+
+ /* ZEND_ACC_CTOR and ZEND_ACC_DTOR is removed in 7.4 */
+ #ifndef ZEND_ACC_CTOR
+ #define ZEND_ACC_CTOR 0
+diff --git a/gnupg_keylistiterator.c b/gnupg_keylistiterator.c
+index 215aaa0..9b285ee 100644
+--- a/gnupg_keylistiterator.c
+++ b/gnupg_keylistiterator.c
+@@ -90,14 +90,28 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_gnupg_void_iterator_method, 0, 0, 0)
+ ZEND_END_ARG_INFO()
+ /* }}} */
+ 
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_gnupg_current, 0, 0, IS_MIXED, 0)
+ZEND_END_ARG_INFO()
+
+#define arginfo_gnupg_key arginfo_gnupg_current
+
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_gnupg_valid, 0, 0, _IS_BOOL, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_gnupg_next, 0, 0, IS_VOID, 0)
+ZEND_END_ARG_INFO()
+
+#define arginfo_gnupg_rewind  arginfo_gnupg_next
+
+
+ /* {{{ method list gnupg_keylistiterator */
+ static zend_function_entry gnupg_keylistiterator_methods[] = {
+ 	PHP_ME(gnupg_keylistiterator, __construct, arginfo_gnupg_void_iterator_method, ZEND_ACC_PUBLIC)
+-	PHP_ME(gnupg_keylistiterator, current, arginfo_gnupg_void_iterator_method, ZEND_ACC_PUBLIC)
+-	PHP_ME(gnupg_keylistiterator, key, arginfo_gnupg_void_iterator_method, ZEND_ACC_PUBLIC)
+-	PHP_ME(gnupg_keylistiterator, next, arginfo_gnupg_void_iterator_method, ZEND_ACC_PUBLIC)
+-	PHP_ME(gnupg_keylistiterator, rewind, arginfo_gnupg_void_iterator_method, ZEND_ACC_PUBLIC)
+-	PHP_ME(gnupg_keylistiterator, valid, arginfo_gnupg_void_iterator_method, ZEND_ACC_PUBLIC)
+	PHP_ME(gnupg_keylistiterator, current, arginfo_gnupg_current, ZEND_ACC_PUBLIC)
+	PHP_ME(gnupg_keylistiterator, key, arginfo_gnupg_key, ZEND_ACC_PUBLIC)
+	PHP_ME(gnupg_keylistiterator, next, arginfo_gnupg_next, ZEND_ACC_PUBLIC)
+	PHP_ME(gnupg_keylistiterator, rewind, arginfo_gnupg_rewind, ZEND_ACC_PUBLIC)
+	PHP_ME(gnupg_keylistiterator, valid, arginfo_gnupg_valid, ZEND_ACC_PUBLIC)
+ 	PHPC_FE_END
+ };
+ /* }}} */
--- a/dev-php/pecl-gnupg/pecl-gnupg-1.5.0.ebuild
+++ b/dev-php/pecl-gnupg/pecl-gnupg-1.5.0.ebuild
@ -10,7 +10,7 @@ PHP_EXT_ZENDEXT="no"
 PHP_EXT_PECL_FILENAME="${MY_P}.tgz"
 PHP_EXT_S="${WORKDIR}/${MY_P}"

-USE_PHP="php7-3 php7-4 php8-0"
+USE_PHP="php7-3 php7-4 php8-0 php8-1"

 inherit php-ext-pecl-r3

@ -24,3 +24,5 @@ IUSE=""

 DEPEND="app-crypt/gpgme app-crypt/gnupg"
 RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/php-8.1-support-1.5.0.patch" )
--- a/dev-php/pecl-raphf/pecl-raphf-2.0.1-r2.ebuild
+++ b/dev-php/pecl-raphf/pecl-raphf-2.0.1-r2.ebuild
@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PHP_EXT_NAME="raphf"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+PHP_EXT_ECONF_ARGS=""
+PHP_INI_NAME="30-${PHP_EXT_NAME}"
+
+USE_PHP="php7-3 php7-4 php8-0 php8-1"
+
+inherit php-ext-pecl-r3
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="A reusable, persistent handle and resource factory API"
+LICENSE="BSD-2"
+SLOT="7"
+IUSE=""
--- a/dev-python/Faker/Faker-9.8.3.ebuild
+++ b/dev-python/Faker/Faker-9.8.3.ebuild
@ -0,0 +1,29 @@
+# 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 Python package that generates fake data for you"
+HOMEPAGE="https://github.com/joke2k/faker"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
+	>=dev-python/text-unidecode-1.3[${PYTHON_USEDEP}]
+	!dev-ruby/faker"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP},tiff]
+		dev-python/random2[${PYTHON_USEDEP}]
+		dev-python/validators[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
--- a/dev-python/Faker/Manifest
+++ b/dev-python/Faker/Manifest
@ -1,2 +1,3 @@
 DIST Faker-9.8.1.tar.gz 1198229 BLAKE2B 8877a9da582fcd81b8b374c344343c9ba4a21d1cd0160694300030b2ace4b7b517fb8a62c1f0ffeacf3a950703b882ff5b484d54fdabc5b9c8b49658c45d421f SHA512 a93d625311358100c7a1dfe33dfda64b5890dd25e8d6e3dd095329ab2156c76abf3f00fe6b2c335316bbe3f42322adda2bcae3a9a312ddf4778d8143796667a0
 DIST Faker-9.8.2.tar.gz 1198270 BLAKE2B 1a7ea02b43afe0ff494ee39dac4259e9eb67fa3230b9b5744a96b4913ac471ed3ccf29f91b2db02124dfefc232a9fae05ce7ddc6e9fd0cbf27bd94468a7702b6 SHA512 37a35a02ea81a871e77378ceecdd65a63c97dd82ba9aec04c2a8f7a827e5bdb264a6ed0927c534a67bf4b06886dcb2a98a188798fe7c860135deb8d6aa6e36e3
+DIST Faker-9.8.3.tar.gz 1192380 BLAKE2B 90acea6d0d78307bc9e1e0d44ec2a1761f1039fdd0a3aad9ac495c139b87a055e8b43dc44bd7722aea52379506858548dbd6cd25c62697b3953f748e4ed053e5 SHA512 943adddc32ac275a030442c3ec0a529c3b97b35de9f245c027d21a90dcf7115753e1419b6b31c8d01f867c71a67fd469b75933d5475b343c47efc43be42df084
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
--- a/dev-python/autobahn/Manifest
+++ b/dev-python/autobahn/Manifest
@ -1 +1,2 @@
+DIST autobahn-21.11.1.tar.gz 365165 BLAKE2B 91a12bf1fa9acd056246d86675c76fbcdb4de8914f4ab5e2c8ec06cf8e822cc1a72f8a7b39b520405cce32e2f32024ebbaa48ba024e1dc71b50da4e6f8913e19 SHA512 5a23272046ef67821e86c6bfe766273b3ba73a75fbc51c7864c2ab83ffb8d4e119022980f8b71c453118bf15b26ede8042aa0114e54caebbfb33555208093ac2
 DIST autobahn-21.3.1.tar.gz 351296 BLAKE2B d018c8820a1accc779decdb8d392d3ff6225f80674b468145a8f29b275d6f0b1021a226dc8bc72915a792591e6d4ae8d6a33a96cf705241990ac401c8342e2c5 SHA512 dd6bf6eba6f2880860c6fa42e3925bb15d36bfb9d2354ddeb0165972848e81a308723b7f9dcd6ec3426b6286f71cb2da453590810e5d891523d92acf9fd64c52
--- a/dev-python/autobahn/autobahn-21.11.1.ebuild
+++ b/dev-python/autobahn/autobahn-21.11.1.ebuild
@ -0,0 +1,114 @@
+# 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 optfeature
+
+MY_P=${PN}-$(ver_rs 3 -)
+
+DESCRIPTION="WebSocket and WAMP for Twisted and Asyncio"
+HOMEPAGE="https://pypi.org/project/autobahn/
+	https://crossbar.io/autobahn/
+	https://github.com/crossbario/autobahn-python"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="test xbr"
+RESTRICT="!test? ( test )"
+
+# The order of deps is based on their appearance in setup.py
+# All extra deps should be included in test and in optfeature
+RDEPEND="
+	>=dev-python/zope-interface-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/twisted-20.3.0[${PYTHON_USEDEP}]
+	>=dev-python/attrs-20.3.0[${PYTHON_USEDEP}]
+	>=dev-python/txaio-21.2.1[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	>=dev-python/hyperlink-21.0.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/wsaccel-0.6.3[${PYTHON_USEDEP}]
+		>=dev-python/snappy-0.6.0[${PYTHON_USEDEP}]
+		>=dev-python/msgpack-1.0.2[${PYTHON_USEDEP}]
+		>=dev-python/ujson-4.0.2[${PYTHON_USEDEP}]
+		>=dev-python/cbor2-5.2.0[${PYTHON_USEDEP}]
+		>=dev-python/cbor-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/py-ubjson-0.16.1[${PYTHON_USEDEP}]
+		>=dev-python/flatbuffers-1.12[${PYTHON_USEDEP}]
+		>=dev-python/pyopenssl-20.0.1[${PYTHON_USEDEP}]
+		>=dev-python/service_identity-18.1.0[${PYTHON_USEDEP}]
+		>=dev-python/pynacl-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/pytrie-0.4[${PYTHON_USEDEP}]
+		>=dev-python/pyqrcode-1.2.1[${PYTHON_USEDEP}]
+		>=dev-python/cffi-1.14.5[${PYTHON_USEDEP}]
+		>=dev-python/argon2-cffi-20.1.0[${PYTHON_USEDEP}]
+		>=dev-python/passlib-1.7.4[${PYTHON_USEDEP}]
+
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	if use xbr ; then
+		eerror "***************"
+		eerror "Required xbr dependencies are incomplete in Gentoo."
+		eerror "So this functionality will not yet work"
+		eerror "Please file a bug if this feature is needed"
+		eerror "***************"
+	else
+		# remove xbr components
+		export AUTOBAHN_STRIP_XBR="True"
+	fi
+
+	# avoid useless rust dependency
+	sed -i -e '/cryptography/s:>=3.4.6::' setup.py || die
+
+	# remove twisted plugin cache regen in setup.py
+	# to fix tinderbox sandbox issue
+	sed -e 's/regenerate Twisted plugin cache/DO NOT & in Gentoo\nexit()/' \
+		-i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	einfo "Testing all, cryptosign using twisted"
+	local -x USE_TWISTED=true
+	cd "${BUILD_DIR}"/lib || die
+	"${EPYTHON}" -m twisted.trial autobahn || die "Tests failed with ${EPYTHON}"
+	unset USE_TWISTED
+
+	einfo "RE-testing cryptosign and component_aio using asyncio"
+	local -x USE_ASYNCIO=true
+	epytest autobahn/wamp/test/test_wamp_{cryptosign,component_aio}.py
+	unset USE_ASYNCIO
+
+	rm -f "${BUILD_DIR}"/lib/twisted/plugins/dropin.cache || die
+}
+
+pkg_postinst() {
+	optfeature "C-based WebSocket acceleration" "dev-python/wsaccel"
+	optfeature "non-standard WebSocket compression support" "dev-python/snappy"
+	optfeature "accelerated WAMP serialization support" \
+		"dev-python/msgpack dev-python/ujson dev-python/cbor2 dev-python/cbor dev-python/flatbuffers dev-python/py-ubjson"
+	optfeature "TLS transport encryption" \
+		"dev-python/pyopenssl dev-python/pynacl dev-python/pytrie dev-python/pyqrcode dev-python/service_identity"
+	optfeature "WAMP-SCRAM authentication" \
+		"dev-python/cffi dev-python/argon2-cffi dev-python/passlib"
+	optfeature "native SIMD acceleration" "dev-python/cffi"
+
+	python_foreach_impl twisted-regen-cache
+}
+
+pkg_postrm() {
+	python_foreach_impl twisted-regen-cache
+}
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@ -2,6 +2,7 @@ DIST boto3-1.18.65.tar.gz 429858 BLAKE2B fbc80e0d8d10f6d02fcf9b86c6b4be03a9c9083
 DIST boto3-1.19.12.tar.gz 436654 BLAKE2B f92e756bc9f98105e3126e41cf0d6fab948bbd79f088ee4e0f0f5f319d4a6e542c0702b487404b316f794b304c43f9c26da026257476341971a7ce241538f506 SHA512 e6b20730f35bb422a2f74e978adc0bac77aa18b4e80eab5175dc117cf2762a7d8e53d390c50df24dada6f1d071d78309c69598ffb3f8d93fd45a3d1f772a866f
 DIST boto3-1.19.5.tar.gz 433567 BLAKE2B 52c12a4dd18d6f02326f8002b345cc5df224455fc862daa700326ae1df258979211d2753f01e1a106f237de393e483dc8926bb4ef0e08bafa575f20811dccd55 SHA512 fad05102f0c3e7e30a3342009f6b3ae28f52758f17a0c22b4da9a03dd10d7f9149ea2ec0119f55ec7280824bd8173653271821e82fcd54ef9fb9161b2d62df70
 DIST boto3-1.20.10.tar.gz 443886 BLAKE2B 891c5d45eed9fc0afac3e6e87f5f7d2100da779b6d863146d8a0804ed8caa732024d21cbd396a681067088080fc9b4e9afc3634d0f3e2483fa8ad5203e703054 SHA512 36ea0170aa62dba8f01f49d975c34dc3fa180ea82d583619844755d9eb8f5e5d141bce2ac044c1fee8dba4ce71ad5dc93b527e5ed4efbf303ef8abaae90b0a47
+DIST boto3-1.20.11.tar.gz 444945 BLAKE2B ead4a78e67c12dfeccfe2c55e88ff9ed0ed2d024d04a89f82f31c87fe01ddbb425ddcd0ce54955c02b4fc8468b3684a5289bd3a3da5fd5e472f8b8a88e75c26f SHA512 d68ee2b61f3aeb34b137a347c41e96da0d3f04fb700369886e5081290f29fb479f84992c92d5dc79cee67b8c74146590669f99ff21a6bfd2e04c8aff33b3d5d7
 DIST boto3-1.20.5.tar.gz 439166 BLAKE2B c140e15e497e6cdf6b4b77bb99e0a0f5ac01d5b5793f8bfb210b52bbc09e39e6fe06a957951375e0795210dc1c3b2a0afd2f498bc88e449d9e6846f2b357f016 SHA512 2823466e4851684253d4ce42a8c34e5cbdad6d04c823040fe2cebdf0cffb14d5d3f40e28d57ebec14533fab04ba74f27c25f078ddb8791b8f52d0424e11b39fc
 DIST boto3-1.20.6.tar.gz 440133 BLAKE2B b154714261372cebb8643d529b66fe3a42d30e056cf2a454092d598c51d0cdef723980834be6a36abb892d3022ae8ef67053b22bb176f540e67c3f37422155d8 SHA512 d8d66a761f03beeca10fea8446de1136d418a93b21065aebfefcafe2abfd9b5bbfa243594f54647ad80547e48348086e2be2de129b89f9ca71f308579f11a0b7
 DIST boto3-1.20.7.tar.gz 440428 BLAKE2B f1b2b36799e6c22a40c04226443f15f9174d68a02d2f731df84f6ff0962158e9d940ae5bc04d25fe99a74f105946026ccb66547838734294d649d661071c1e3b SHA512 85493a85789caa5453a4dafa1472c8ecd75c05a819227909092ae03690243eb103c1588cb10e5e5277ab9df49673b9b54fda064a412bdcf6b9e11238b277f450
--- a/dev-python/boto3/boto3-1.20.11.ebuild
+++ b/dev-python/boto3/boto3-1.20.11.ebuild
@ -0,0 +1,59 @@
+# 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="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest tests/{functional,unit}
+}
--- a/Show More
+++ b/Show More