Sync with portage [Mon Mar 14 20:38:15 MSK 2022].

2022-03-14 20:38:15 +03:00 · 2022-03-14 20:38:15 +03:00 · ab58ac0bf3
commit ab58ac0bf3
parent 892991f471
633 changed files with 10213 additions and 7159 deletions
--- a/30
+++ b/30
@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512

-MANIFEST Manifest.files.gz 29607 BLAKE2B 394858c54422169c765b69bb149b9a3c7fe26ce6b8160ebe02212f67a47bbbd5c97795bdb4aef0e6fe4f2e15e2db9fe86b87bd47f81180c7041c884d5c5210a7 SHA512 d9fd4eb3be9cfdcabd48eec689ba1b30339f31a802e0116d8929450bf4a89459febeccf9c5bd03f0e7509ad234d21a953c475e9a9a746f7c20b6fba846d8e027
-TIMESTAMP 2022-03-14T06:09:12Z
+MANIFEST Manifest.files.gz 29606 BLAKE2B d1d807557786302abcafd0768f4e0ac0c4a257bba0d1f058eca32939f1da89055a9caa0bf90f85c68a9fb7151b2714a7e47cebff6dc01763367cdd349b9e63a7 SHA512 330a10e660880631a4346cd540e0646ff24b30a3959eb68d27c48e1451ca9110d699cb4a27fa92d4d2f900a5ffb329776660dd21edffb1a18a73d652486a6275
+TIMESTAMP 2022-03-14T17:09:19Z
 -----BEGIN PGP SIGNATURE-----

-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmIu3AhfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmIvdr9fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBqHxAAsdNLNV3ZgBrwaS/Z1SBPxDlQLrdpUOx3ZiQcJrk8FhM1q8+wZ/Im5Th3
-ZI+lhuXvUEJ45eHilxzqLLuwOJtPScS006T3kTHzJwhKs6TtaO6Vtly52ES17w1B
-swSvYSbrHImaUuDt8s0EYzhokFBikPZFFt9RKfjrCnMbC+BmDSXZyOOaJf/8vlP6
-ntJqLd9JFg9crwGnkJnf6Do9uob/jDF2f34JcbfQzzoio30vm+oGRpuPr/mDqoQY
-09a2+o/riLP0uR4wedjoiuElOFGLlXmtIdYbOJa34ASqSAACVRaJ7YsWlnRe4ypr
-DrOG001/+1iP8oTtyRNPAKNvQ0qa3ocikTogsOD/JbK1Kllc0Bbwn7SbZbMF00uS
-mU2Zqy9y+ONQzWXJNQChiBKoI8Qi8wBE0PzEGLEL4rhfnfmzOG1NmoOMPe/r89bJ
-ZpjOKqTOCCmgtvI3haUl6Umyck6jCVFw0WdtlAYi8Uhyvq161vfMJ9zBNCghCSU8
-+HYqwpht3b3Ll9UWJk6V4zS1+0abw5OopUn1bioBXVcf7SzdbWBC6+ibyU8Re1le
-132np2CSlwDQfmDU+C5rITwrnehNqzHlREbUotot/wndBA++pBC5P3YeUDsMYr5J
-VdWcZccrhxFgdfazkgs3Wnpgjj1awBWO2EoybMELwRUcHwEKefA=
-=WGE/
+klDi5Q//XZEOiqmB4rES+9WhLXnDdpaI2mj3iCVppvNf+EhWVuCQ36GDcqe1udPT
+OHFAAc4JXB0vmQZ9NRclCXLo/hzNMQoxMxXEidFsUrMnGewEmdZ477dKmeIEwd01
+8s884Z6fQxNVw0LQ3UadqVE7zkGzAOT54zhuCEEl6G2A5pJh0Fx4oiena0LmNxI6
+Ku+Rf7ojTMemGl+sGDb+QDEx33JxmC0acm8VHZFwS6vh8/GxzcDf+oY+oEsbUASS
+FLh3MyX/JVHji4AhuguZa6cK0i01DHlfQG2ah2/1yFT0WRFi7FzF0XpIzYwNn7Da
+9PW4vZ2Iqis+DmRyInMFsCN37Pg46aQlAOKzlFAXUnomGtwQT8XcKSKT4BfXPXUY
+mrhFdgJg5UuxOsHtSJvoReLKYcZ0Nys4n9VrL4aQZxebxl/WkWZxE2BPyDHhGGJG
+WfpB4z4D7r/p6Txg7pvIvGH4HFL4N/CAmFX0W0eLTVQroKZX7aUKDHxslmMlCjEL
+ROomjn6JRgt7nju8KPtfR5RVxt6ScGJE+mbx47x//TShqis6IPG1+GAoDyoYWFKn
+p5U8fPGIdGNfmar1LfPaHSDkneprfFFw34yA/AlNNo65JDEPC9paEjZGzD9kf42b
+mDXFSLsXSplO0kQDK6wFS71RNoo1tx0r1AFz1uLFgeoUnV7jt1w=
+=qDcn
 -----END PGP SIGNATURE-----
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@ -1,7 +1,9 @@
 AUX apache-tools-2.4.7-Makefile.patch 1695 BLAKE2B 8fac145613ac9f587e49bc6932c5712b7d7cad0d91422e11701edd24152e1d33907cbf31e3bef709555253759cea72199d4537df5d20d3ce9ca5dc898ba26779 SHA512 f597ce5503e590ed5b2621c04dcf0a571a73b70f144df7fe4e5fb7329a4f1558a5eb16913fe3d7c58ac1030f46cd2b1882e08d0f62106fbf8d40a8677c6b9448
 DIST httpd-2.4.51.tar.bz2 7653609 BLAKE2B a0743327f0411f5cb8b7d0426bf78db0f370e3d587f3a4c4bb7de0e4499effa3f44f5998e19e9ca3ed7b6fc9a8c0867cbe62134b5af7e6ed6c3bc29770b797df SHA512 9fb07c4b176f5c0485a143e2b1bb1085345ca9120b959974f68c37a8911a57894d2cb488b1b42fdf3102860b99e890204f5e9fa7ae3828b481119c563812cc66
 DIST httpd-2.4.52.tar.bz2 7439184 BLAKE2B caa3f96226eeaf2f7ab625a73e820e7c6c5661a80983fa1cd2f4ab5366fcad03e1f47ad02ab060662ceb941fc777b1fb8a269ec5f0d9c6f7a3d93756e995d713 SHA512 97c021c576022a9d32f4a390f62e07b5f550973aef2f299fd52defce1a9fa5d27bd4a676e7bf214373ba46063d34aecce42de62fdd93678a4e925cfcbb2afdf6
+DIST httpd-2.4.53.tar.bz2 7431942 BLAKE2B 44acd51a2c18ae66878d64922947f2f24f0ddf8a5fa70718f788572032e18dafd06888fed3cf559e63e2a9e69d9b0a8dcc79e11fc9d8f216b5b073f769494727 SHA512 07ef59594251a30a864cc9cc9a58ab788c2d006cef85b728f29533243927c63cb063e0867f2a306f37324c3adb9cf7dcb2402f3516b05c2c6f32469d475dd756
 EBUILD apache-tools-2.4.51-r1.ebuild 2429 BLAKE2B 9778488e729d774813606ced8edf05428d7659a4fb05b4f80c25f90691a744353311362848c370f3af033d47687c48382855670dfd2dc1ae03a4eb52cb624616 SHA512 c33f563a395c24430c0808d08f8a9f4454f6b8b0b62b358d39d7fbcd949de748c89b3c61a68a23519f4c9cb188a99436ed625c9300ff7304f97e9fb872b9671a
 EBUILD apache-tools-2.4.51.ebuild 2494 BLAKE2B 2dc2cb347c7eac724fb85c0ee7a5f7131ff3cc71636f1a87141fa4c1fd3c9e7208e87182fb2ff819f5268a553a10fdc1e978bbe2f18a833d34cc9864409c6b18 SHA512 d185502697cd6e5939db0ac2d7cfc170cddfbb1904a545f9ef822693414ec978062787eaa4ce78ad90e85025735b1982dd5beddb261764aed43d3a39dbf9fbca
 EBUILD apache-tools-2.4.52.ebuild 2424 BLAKE2B 24485510edbd0ba093e37135cd4d68d1a451748300a827ae16b854621f76ba4c0fb92fef8323109061437deeb43892f7474579422b14e01db0bbed35978d7b43 SHA512 414f684ca49898e1601d5192c573d985bef78c1680f13a522d548f7b698319405010d9cfe56cd0f6afd21afbc810769d5f370e16fea257b207b1095419623e21
+EBUILD apache-tools-2.4.53.ebuild 2429 BLAKE2B c753423f46d843ee132f9aa120bb9607cefc566d9e93f5b74364730c041791e5e68997a6561928d44900a4246a59ee09e5b5c2f7b83093cc7265e553f73bea2c SHA512 31463fa7373f674e0a949783cba260f3cc1826ff4239de2cc948c1e8fb1da8e8451e19f03190b1fabe921b42641f1e680f4c0ef74ca32571c0bd757d6d0bca3a
 MISC metadata.xml 469 BLAKE2B d94d7a27ad1d65eb651c92ff82f5e8f4181737a65ad8dae29843693c4fd639d15b82e419f39ff12273c964b2cd4cbb6eb9850ef358e02b6ebe6a25a2fe2f5877 SHA512 409c831b4c337d40b71fd41a48c5aa9ad4e922baa86d931e3aa2bd556c2312154022fa5297daa03084da08d7f9739e37be87446f25c784c30b3df992b0165189
--- a/app-admin/apache-tools/apache-tools-2.4.53.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.53.ebuild
@ -0,0 +1,101 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit toolchain-funcs
+
+DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
+HOMEPAGE="https://httpd.apache.org/"
+SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris"
+IUSE="ssl"
+RESTRICT="test"
+
+RDEPEND=">=dev-libs/apr-1.5.0:1=
+	dev-libs/apr-util:1=
+	dev-libs/expat
+	dev-libs/libpcre
+	virtual/libcrypt:=
+	kernel_linux? ( sys-apps/util-linux )
+	ssl? ( dev-libs/openssl:0= )"
+DEPEND="${RDEPEND}
+	sys-devel/libtool"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/httpd-${PV}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.4.7-Makefile.patch" #459446
+)
+
+src_prepare() {
+	default
+
+	# This package really should upgrade to using pcre's .pc file.
+	cat <<-\EOF >"${T}"/pcre-config
+	#!/bin/bash
+	flags=()
+	for flag; do
+		if [[ ${flag} == "--version" ]]; then
+			flags+=( --modversion )
+		else
+			flags+=( "${flag}" )
+		fi
+	done
+	exec ${PKG_CONFIG} libpcre "${flags[@]}"
+	EOF
+	chmod a+x "${T}"/pcre-config || die
+}
+
+src_configure() {
+	# Brain dead check.
+	tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
+
+	tc-export PKG_CONFIG
+
+	local myeconfargs=(
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/apache2/modules
+		--sbindir="${EPREFIX}"/usr/sbin
+		--with-z="${EPREFIX}"/usr
+		--with-apr="${SYSROOT}${EPREFIX}"/usr
+		--with-apr-util="${SYSROOT}${EPREFIX}"/usr
+		--with-pcre="${T}"/pcre-config
+		$(use_enable ssl)
+		$(usex ssl '--with-ssl="${EPREFIX}"/usr' '')
+	)
+	# econf overwrites the stuff from config.layout.
+	ac_cv_path_PKGCONFIG="${PKG_CONFIG}" \
+	econf "${myeconfargs[@]}"
+	sed -i \
+		-e '/^LTFLAGS/s:--silent::' \
+		build/rules.mk build/config_vars.mk || die
+}
+
+src_compile() {
+	emake -C support
+}
+
+src_install() {
+	emake -C support DESTDIR="${D}" install
+	dodoc CHANGES
+	doman docs/man/{dbmmanage,htdigest,htpasswd,htdbm,ab,logresolve}.1 \
+		docs/man/{htcacheclean,rotatelogs}.8
+
+	# Providing compatiblity symlinks for #177697 (which we'll stop to install
+	# at some point).
+	pushd "${ED}"/usr/sbin >/dev/null || die
+	local i
+	for i in *; do
+		dosym ${i} /usr/sbin/${i}2
+	done
+	popd >/dev/null || die
+
+	# Provide a symlink for ab-ssl
+	if use ssl ; then
+		dosym ab /usr/bin/ab-ssl
+		dosym ab /usr/bin/ab2-ssl
+	fi
+}
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@ -14,6 +14,7 @@ DIST awscli-1.22.62.tar.gz 2167585 BLAKE2B 39141893c979b0047a45a9aea210d03340fc8
 DIST awscli-1.22.63.tar.gz 2167746 BLAKE2B e72126578c9bac30c6d66bdd178961a7a36a045788d8079e8f0ab4c85d18c29454255a13f089c03ef53bdce0949d168c858d03b59cf5d5326fb3de9925a3f487 SHA512 4d8a6ee8b81445fbb51dbb31e899bebb5610b0a1291654eb9b6555685dcb85528c2b928f587d9ff98507f60d2b199ac71c48f6e204e7eb2ce2ba5d7abdd31ec0
 DIST awscli-1.22.70.tar.gz 2177284 BLAKE2B 1ba770ba1b1404d6ff31d95ee198cba41321fe79d618d8b2ab8258da75f9cc56d5af95851dbed837b65e4fdbd82193639da5614551fe2d7f0ebc20df44531615 SHA512 0f246e82cee70b8d16e1fc7e30aae67554f5186eb2a0251295b25eafe23d7b29293059be7ebffbe7a45c665d0bae210699093b86bf7b3e188017018d8329af84
 DIST awscli-1.22.71.tar.gz 2177492 BLAKE2B 2634de77b67aedf1684370b18da614d8092da277d099a25aa9ca054743e851df0e4ace5ff8fd884faebb012ad4cc8f0c94892a6c2bc2e1f284c28663b029198b SHA512 a404177ee0b5012553dfa95734d424f744ecc3b4a800ccf6d7f27a0f3b9a93722e4f53e4aed095306ba575328686ef1768095cd796b11064e0b707fadcd1e90c
+DIST awscli-1.22.73.tar.gz 2178216 BLAKE2B 14cd910f0218c015c3f349f57f268b818737d12cede273d6d306eff5be7e68690df19bc1e3eaaf4d7069d233f171a12edd9144febf5f877c49189f0aa6786441 SHA512 a708eafb38891ef1119c9ebe690ef6a1ad8f21605621ddf63820f2a54bf5612d62179922b59150de67dca4d266c55198fdd69db04a234b8051c0b5e5c8fd6cc7
 EBUILD awscli-1.22.31.ebuild 1653 BLAKE2B 35b3764561e364a6cf1d0f5156102732e442915c3502ae4c10f9e9c11459d855bc96c4a0c484c57ae10f7e709d9e3b9d2639128cbdec2205fc522ddf724d61f7 SHA512 896ef21b47189c5dc605fd2a87728f62387766d081f07bfef380295a2b1d4a73b039ddc88c064377953c0fe7f580ec19acfc1b8bb5fbe145f1557081d492c799
 EBUILD awscli-1.22.37.ebuild 1653 BLAKE2B 35b3764561e364a6cf1d0f5156102732e442915c3502ae4c10f9e9c11459d855bc96c4a0c484c57ae10f7e709d9e3b9d2639128cbdec2205fc522ddf724d61f7 SHA512 896ef21b47189c5dc605fd2a87728f62387766d081f07bfef380295a2b1d4a73b039ddc88c064377953c0fe7f580ec19acfc1b8bb5fbe145f1557081d492c799
 EBUILD awscli-1.22.46.ebuild 1646 BLAKE2B 08f020b021c432e5082460aa2ad3cc88986dbae494994c83a78ca3a8fa131ed1067f4d03762c52fc4f40a0dcd63c84b65e9b744b33a271ff6a7254938b71069c SHA512 e2fd156b4a7230bf87c25af17674b7309672d433b57ae7161c8fdff5366f9e30df23f3e381e48e9650107abadb639b2782635f84ca18a52c32e85f464c5976d1
@ -30,4 +31,5 @@ EBUILD awscli-1.22.62.ebuild 1841 BLAKE2B 17bc1585f68744ac39fbadcfb106022e2d6c27
 EBUILD awscli-1.22.63.ebuild 1841 BLAKE2B 17bc1585f68744ac39fbadcfb106022e2d6c274fcc7c28151bd069c19aa4f9263af9f8ceb834113b8263228a2a5addfa14c58e65bffe22a2d8743734fe0a50a8 SHA512 1c98e9021e1c4ab175e67c06cf13f83b267f29723d6b651c0277a28701c1ad53edb6aa2833d0cf65e88d30deb35becffe286b9dc1e0093fb298760f890cbc773
 EBUILD awscli-1.22.70.ebuild 1841 BLAKE2B 17bc1585f68744ac39fbadcfb106022e2d6c274fcc7c28151bd069c19aa4f9263af9f8ceb834113b8263228a2a5addfa14c58e65bffe22a2d8743734fe0a50a8 SHA512 1c98e9021e1c4ab175e67c06cf13f83b267f29723d6b651c0277a28701c1ad53edb6aa2833d0cf65e88d30deb35becffe286b9dc1e0093fb298760f890cbc773
 EBUILD awscli-1.22.71.ebuild 1841 BLAKE2B 17bc1585f68744ac39fbadcfb106022e2d6c274fcc7c28151bd069c19aa4f9263af9f8ceb834113b8263228a2a5addfa14c58e65bffe22a2d8743734fe0a50a8 SHA512 1c98e9021e1c4ab175e67c06cf13f83b267f29723d6b651c0277a28701c1ad53edb6aa2833d0cf65e88d30deb35becffe286b9dc1e0093fb298760f890cbc773
+EBUILD awscli-1.22.73.ebuild 1841 BLAKE2B 17bc1585f68744ac39fbadcfb106022e2d6c274fcc7c28151bd069c19aa4f9263af9f8ceb834113b8263228a2a5addfa14c58e65bffe22a2d8743734fe0a50a8 SHA512 1c98e9021e1c4ab175e67c06cf13f83b267f29723d6b651c0277a28701c1ad53edb6aa2833d0cf65e88d30deb35becffe286b9dc1e0093fb298760f890cbc773
 MISC metadata.xml 334 BLAKE2B 84c9f50e6c0d015aad36a7f625cddf90cf1137a8c2d445cc641cd4890d64261187c10fde59ee1a6c19b98cfdb6ff534c66ae7a7a48a00ec62d6984c9a1891750 SHA512 a845de531df2cd75abf23cdbfa613e586855b95ac4e96566ef193708d7ecf2ec7f7db72fd31b8af0ac4ccd57e51da9c6d129d426bfdc6c4feb57d7df8647f160
--- a/app-admin/awscli/awscli-1.22.73.ebuild
+++ b/app-admin/awscli/awscli-1.22.73.ebuild
@ -0,0 +1,65 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+inherit bash-completion-r1 distutils-r1 multiprocessing
+
+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"
+
+# awscli 1.22.55 → botocore 1.24.0
+# so botocore is x.(y+2).(z-55)
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(( $(ver_cut 3-) - 55))"
+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}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests 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
+	# strip overzealous upper bounds on requirements
+	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit} \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
+
+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-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
--- a/app-editors/ecrire/Manifest
+++ b/app-editors/ecrire/Manifest
@ -1,3 +1,3 @@
 DIST ecrire-0.2.0.tar.xz 43852 BLAKE2B 75c29848a2c849ae15bf8e14e59bfd9ec76281ca5f8d4be92d330abee5de0c024102f0aa69669df5f2ce5fa28a4b75f49281d4a437288762b0658cc4ebec0ff9 SHA512 6158ac063bdcecf13b2f45448aebcf624d9fe3029d8b2e4bbe40104fbfb5627b02f76112901dfe5617c27dce7ebbf95c277ec6def031efb8a8f1034c092836ef
-EBUILD ecrire-0.2.0-r1.ebuild 575 BLAKE2B c9c9be81806d83844dd6a6d6d0348bed37e170b833bedbb29aafd37f6be856ebd8884ddba456fe03bebc0d06e40da35ce8b3780dbf7697224dd74d93034362f4 SHA512 b2688fcf3669f223b973f15e97ca1963c526ff1b9989e1b6c729effc59ea362e45f7fb13e16c21e0c6589dd35361f99b3f12808c8e030d2482e5f451d16091a6
+EBUILD ecrire-0.2.0-r1.ebuild 573 BLAKE2B 1acd4068085a0e673d962cc4d6dfe178336f1181efb02294b033b8e85a0b3d15476b736f4246e1be8ee76d103a523fa32ba1e9d9aea8ba34faaacfd8cc8f8d65 SHA512 f06d34cfda9926612defc9ff51c04e0caffb68086ca849ce6c63785fa6cb68351293de1db286131f0fa2e021555dfb43895ae1a6ffeaeb0da53183c7fefd6729
 MISC metadata.xml 255 BLAKE2B 6fe10a1f843a8b2494606052a69206e32fdd5edf3ca6bdfb661cf6f8e39c0e16fb652acb8697d339770f3559c56a4ba964a0e959b3e0bb456d09ee7570f0d9e9 SHA512 235170971553178916cc484a07e1c665c94cd0a7ec442d2190d3608f7a3441dd2fe08fea666ca23d151077c10c908bc1da0e57355fab43be02711be35531b362
--- a/app-editors/ecrire/ecrire-0.2.0-r1.ebuild
+++ b/app-editors/ecrire/ecrire-0.2.0-r1.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://download.enlightenment.org/rel/apps/ecrire/${P}.tar.xz"

 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="nls"

 DEPEND="|| ( dev-libs/efl[X] dev-libs/efl[wayland] )
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@ -4,11 +4,11 @@ AUX xen-4.16-efi.patch 696 BLAKE2B 2bc3db7286d7ea24c762e914012c71d3fe6dc4d8c4755
 AUX xen-4.16-no-symlink.patch 1044 BLAKE2B 3f5cb93403e3cd606a5eabb8b0e7facb3c95ae7f805c4bfa0e5a357342b845f6f260915f9eac46573bd9813fa602702df6254ad4b946fccb32cfea7514cc86b3 SHA512 0d1a8c8dbfdd57dac6d9732afcf4d0da1746ecbfa06689eb343b3d54167a784c9b9b65555f4cabd8f30a97692c511ee16c7787cdc3d335f7e39c2e3f8fc86ccf
 DIST xen-4.15.1-upstream-patches-3.tar.xz 49644 BLAKE2B 261d45d726ba9b06a817fd4f4e9d2a83e516cd637f73dff50ccb9b046d562e14bee47fc64795c0406947fb06988679047a19e5851482fbf85701bcc495225258 SHA512 8d8b7e42f9a401f6d3a7cb87b980714aa14dadbeadb3a26f495b6a1892d1a04de244490255b589952f565d0a0b8c69fd527c0168d40e974e0f77cecda25e7cb3
 DIST xen-4.15.1.tar.gz 40800852 BLAKE2B 39475ea33f029fb0e84b82b4a2b13fd613bab01e3ef6c241dfede3d190ee9be53c99b62121d37d83b1e078764b3e4d88d1dfb99be1b5623691e56519850c6798 SHA512 8d3cbdf708f46477e32ee7cbd16a490c82efa855cecd84ee712b8680df4d69c987ba9ab00ff3851f627b98a8ebbc5dab71f92f142ed958ee2bc538bc792cd4b9
-DIST xen-4.15.2-upstream-patches-0.tar.xz 33368 BLAKE2B f22c0e9ce6b859a2741f09c0c52479e8acb38440b631882850993fcfcdc445c28fbeac4353df6bac1b2be89e39a99bae1a920796d505f888e3701a98f17ed29d SHA512 10a996cd87404ff6536119deeedfe67143c02475c4ca2d7f741e087197aaffa10c5831aad1f9ee2f9070461dd8cdc7af4851fbafb634a2f65235603d6fb0848f
+DIST xen-4.15.2-upstream-patches-1.tar.xz 43148 BLAKE2B 0f5b43ecd32d3a91444e92387cec69bbfd4fa5bd182dfaf7e6fb9980fe6e6244e83e420e9c5f8eb525ffc073c0f473c05f4fa7d8bbe5a185fcd6fc33a16323a8 SHA512 83d9199811e529bbcda7f349fdbece15719f0678114640389fc674e62899aea1daece3ccbf667928825884924ea1085f448056f79728bfea75730a1ef0405d5c
 DIST xen-4.15.2.tar.gz 40773378 BLAKE2B 7c3e3bb066505f9838cd7c56d85debc64e5ed32cf4d4edf699ff843db49bee916e6eb46d07e5cd9021c2644bba0628a2aa567f60ace26c6d7ee5922643e04104 SHA512 1cbf988fa8ed38b7ad724978958092ca0e5506e38c709c7d1af196fb8cb8ec0197a79867782761ef230b268624b3d7a0d5d0cd186f37d25f495085c71bf70d54
-DIST xen-4.16.0-upstream-patches-0.tar.xz 25168 BLAKE2B f572cca630e0461fba86eeec27043d949a7c0500ab47138572829394ae4354d5955af4a64b669abb932346bba1902511e35ede905b38fa1b2bd3b624c35470cf SHA512 d49d80bf687ba1046e82e7ad0196cb3fcdf595df0757d4f6e390bd0c6ba156ec012ea61cc606fbf3ceb03a9cd21f8acc6c45092a11b5a9a916bae80ff2d6c181
+DIST xen-4.16.0-upstream-patches-1.tar.xz 61124 BLAKE2B 11cd00b93a7f4af24ebced7e450d38624e317eaa455e5aa7cd50bff09700b349e47016863bb0523a68a1113627ef1cd3c1e269504de50ed54bf71b1908bc0ba4 SHA512 ef624b11b4ecd3d1ea05050744f5b0d45b1eb3d87f5f0e8b89e6aa489cd50e99478a4ff59df151241963a8acc8601662bd1ccd63b586ebdde291e9bfad21c54f
 DIST xen-4.16.0.tar.gz 44982322 BLAKE2B 7e16a93b3f1131e2b10307fabc10641a9c5983173155b9a35eaf6ff317b6a747bccf6b8c87c06686830acc2c4bd3e19e5867eb443eabac9a1e4ee59124dfa87f SHA512 2869ed90d1779c9754d7f2397f5fc67a655304d9c32953ac20655ef96cb154521d8fce9f23915ac0c91f984dc54f72c67e5e619e2da318b5997748f44cf21b87
 EBUILD xen-4.15.1-r3.ebuild 4408 BLAKE2B 8f72ece7a8fbc12f62409f98b5064feedcde24969010a1c7fdc84eb0421a317e05ca9066531b3dccf430a78414866d0e33e8d883ff8e8e4a4cdc720aeb7d6093 SHA512 ec445722ff6f1b6bdaa568f36a4ffb643ce35f72df8d5fc4c05c4016deb9582ece7e01010edaadecc645d84373eebc5030d139fa291fb23288eecac0d0fe3555
-EBUILD xen-4.15.2.ebuild 4410 BLAKE2B 3a9c4e88f317eaf426ce796e44f29b11c2a9d8c78c78a8cb7e9591c55a29094bbcf60fd3db8d7dc8085d89b3addfb85164abd1fec32db7a1b4025c5c358662d5 SHA512 628102f23854f20c5c564cf9f182cee7c10f7d53fa70dbdbeec39ef2d0d12f07592dacf71d2a74349ec21b74ca1c599f4e9d55f580163430c267f89dc22a935b
-EBUILD xen-4.16.0-r3.ebuild 4530 BLAKE2B 7e8f3d51a4fcf4bec8acdbc50283ca04948acf6a678a8cb42999d31318b9ee59361794c8ae75941a78fd6fd1686df35fe982b73f8a26e426be3073eb7dfc25d6 SHA512 0a22f50b4f62453cadd0ee2ab0e2fd277f617795d67de2ccc359148aa8ae67d6f2f92f6e5c34b2fad5882db18212ec26494e30782d85cba1906ddbfeb5acceaf
+EBUILD xen-4.15.2-r1.ebuild 4410 BLAKE2B e2e423d9007e7b5ddeedcd93805703fbdf535ae9c49e954347ce9db1dfe7b02eb340db1925dddb0683f2c5bd037f4b99a7696ca5247b90f7a2d0f7b27f84e157 SHA512 9f72d6dc897f3c8b6d6cfb1c58612754be21a63c67ea022b6c982566f1e441424ecaadbe8445aa1d43782da5cbd4fc71efc88345a7e08d6c1b31ea2c2ee5713a
+EBUILD xen-4.16.0-r4.ebuild 4530 BLAKE2B cf4b20851fbcf1a890c5585534ec2e3ec511235ac87bc8fe523907c48166a2d91e543deadb3c3833ca5bc8396fb4f8166e22e60e21563dd62eca03343175361e SHA512 2b90652ae245142d0ef43c0f31bc4f6930a91d984804fcd9eb3f42ac8eb04b4d9fc9e2e115432567a1727c50c56f88dd3db594870e441cba8bf0ecb6b2417919
 MISC metadata.xml 773 BLAKE2B 3d0c64f8bfaf753ee92681f9da2dfabd6196952b5694244b806cb6cdac02fedd10d8c8defb4f4211664e135cce38c671f543faab58575ae2d603efcb9b2a48b8 SHA512 16993794d7f578562112533f97bb76d1a2fafd0dce038dbd879a4a65d5fc893251f1d188cdc1a2b9f955a27581f76a26409cc0c90706c86514c05e81501966b9
--- a/app-emulation/xen/xen-4.15.2-r1.ebuild
+++ b/app-emulation/xen/xen-4.15.2-r1.ebuild
@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]]; then
 	SRC_URI=""
 else
 	KEYWORDS="~amd64 ~arm -x86"
-	UPSTREAM_VER=0
+	UPSTREAM_VER=1
 	SECURITY_VER=
 	GENTOO_VER=

--- a/app-emulation/xen/xen-4.16.0-r4.ebuild
+++ b/app-emulation/xen/xen-4.16.0-r4.ebuild
@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]]; then
 	SRC_URI=""
 else
 	KEYWORDS="~amd64 ~arm -x86"
-	UPSTREAM_VER=0
+	UPSTREAM_VER=1
 	SECURITY_VER=
 	GENTOO_VER=

--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
--- a/app-i18n/enca/Manifest
+++ b/app-i18n/enca/Manifest
@ -1,3 +1,3 @@
 DIST enca-1.19.tar.xz 465412 BLAKE2B fefd58502cf345f9b88d620d5af349d72b9e2af70d61c9b5aa3632cf91011110dc1fa08e78dd04c02c5a333adfefeb88f529f3cadcb75d0cea2b500a5a70c057 SHA512 6678639992685180457bbef7b0da6e475071ec6935dfd672188fc242ef80b906e75eff9a206e07989893d0ef4ae5eb500f1d0bbd6b4d58146c94bb143b5fb296
-EBUILD enca-1.19-r3.ebuild 1608 BLAKE2B a510824a2b96486b5881e58a7eda7b1695126b208fb082b08e7d3a6c97ab65d677f0a9ad73e127acf47b0a3c2c0edf2a92bca8293cb9553e120ffc51a9ebbedc SHA512 8e2b778ec92849efedf8d30e9e00c9bd7078fbc71fef311d0dd101768d76976f7ce48dfc8701b0a57672c711b3ca187fee0ac5e60b619bb79147cd0ab5fd4935
+EBUILD enca-1.19-r3.ebuild 1615 BLAKE2B d30dd057cb45f557a7d733703729f13e6369d43792e9ab135c9fc4cba88908bfbbde1c89a4a28ba50eefc7f1e6ec346a56f036ac17d8ec3a990cbeb1f9756682 SHA512 839b088ddcbfbca4d0410a995ee5e9eb6ee4706737945530604720e8a74e26bce9cc29aef3d8a6359ac27382b4042768057100ee784639021b8e103fc9c93cdc
 MISC metadata.xml 243 BLAKE2B bc2d1e6252be7bd416cf860f1524a3dce0e725e3000d6cee6d3996fa2ccaf3204cefb28089e9eb23558f9632431142fcf777a092b8a27ddf668333713d6107ec SHA512 35a89d38fcac8095f36e5b262259d1b60883c27e545f82a4849c5b85d45922abae8335be7b5e291d97a5fe7308f36d900e31d3682a2691ad1f6ace3570149798
--- a/app-i18n/enca/enca-1.19-r3.ebuild
+++ b/app-i18n/enca/enca-1.19-r3.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@ -11,7 +11,7 @@ SRC_URI="https://dl.cihar.com/${PN}/${P}.tar.xz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc +iconv recode"

 BDEPEND="doc? ( dev-util/gtk-doc )"
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@ -3,6 +3,8 @@ AUX 3.3.1-drop-some-tests.patch 1206 BLAKE2B ee550c04d7f6adb179bf5473b2cbd4e54bf
 AUX 3.3.1-sbin-path-sh-test.patch 808 BLAKE2B 8ee354287c9f5319edf43217d54f4ca564e607c6c06e3dff04033a9dc2c87a7cf0bb688c49561acd69cf22b2ee59493468bc55d070b4565fc83a9cf7e917308d SHA512 3446b51ae833698dab9b7c163059947f122f4c72c49a8cad8f160a1a912bf57ac41ef4ca706e81bc6563f53f0f4c608b78da3cc66a040697a857554cde65cf5a
 AUX README.gentoo 732 BLAKE2B b869bd411bf505339adec5a6c35731bf26f8910bcf82919c15df7f8e2a8bc6ebf4baf6964ff27ce572e738c657696b1cd1446a18996a2270a620c3374f629f98 SHA512 20a0892d7e9c4aa7736bf5dbca485e848f817390325186bb2dd054ac56259679f0accf5b4c3b18c9cd398c43d1bb393b0423be26a4c15adfe070d6f06741f693
 DIST fish-3.3.1.tar.xz 3489152 BLAKE2B 61b2bf96526d957d3f9706df5a76d4d9b4ccf55a1ff2b7b66f1a0d5d126a220df9984551f5adb06dcedbfb5674b93c4f3d75ef991585980a29d4dd84f7697559 SHA512 fc50ca44fab3f2d942284d4f714150f7ccf1e49c73da36f8d4ae4a33a9b3280f98bed15848839f5d443b4274fd0ff90174bafa6a8e9a4da226dda63d7766a660
+DIST fish-3.4.0.tar.xz 3292216 BLAKE2B 3691e5387a8392d7d43b3b0f8b893e83e246c3532684e95a19c7b2eb4ebe80bcf04aaa1b965f5c4f6d782d0ae52269bb1cdafef76845b02f9f99d4c82ea77ce3 SHA512 463ee8d86815520c6de9777fd2b5975f06cc0842137c86cca7ae0331e95d74e755bf6f4b0bdea7e96c11371436ff9f97ce483ae026daa1e8d385f6cad8860ed4
 EBUILD fish-3.3.1-r1.ebuild 2457 BLAKE2B 5a530482f82025a5488895402b2f7612f29033db93c1f9521396a2941fa40250f512e12a40cfde123a27b9b9cbb4a6b4b1e82f981e7ae9deabf206793e0a8a15 SHA512 b0b5718ff2c16ebd4ac66446419c6efc28da139abbd229b625d888dc6c32d00e834d3a1052433302aa659c1106d1f4a5026e071f285f91814d9dc8a1daba8d04
-EBUILD fish-9999.ebuild 2348 BLAKE2B af2401d4a21c80523902e9e4e8e26ecc48edda89791aecd4235b1891ff01b32db6e28768b57b7e8d7a19447ea8fc36382ab7d0ccfd0f4b008e02b244eff8e15e SHA512 ab8b454ca0af953bd6769ea05c5e7b9c2a256a6ec869a16cdaf318d3c229290d6ae5497d22bcb88a650f2aa7ef7cee89cf9a53f37e221b976d537d05bab7ff0a
+EBUILD fish-3.4.0.ebuild 2349 BLAKE2B 4e212e82dedfed6c979b47b6b2b2c5d3dd66cb9d094b5fd5e60167fceadec22659c5c28c6669794567f96a57ab0ddee698b9f4be7360f65cc2095b44bbb276c1 SHA512 7add0d8184d0c4a23dc6798437c438aab7e6ee7bde898474c601471d85387e8e94ba13f9ff1c4e8841382179836385109ec62d6671ef202ee1d195733b672c94
+EBUILD fish-9999.ebuild 2349 BLAKE2B 4e212e82dedfed6c979b47b6b2b2c5d3dd66cb9d094b5fd5e60167fceadec22659c5c28c6669794567f96a57ab0ddee698b9f4be7360f65cc2095b44bbb276c1 SHA512 7add0d8184d0c4a23dc6798437c438aab7e6ee7bde898474c601471d85387e8e94ba13f9ff1c4e8841382179836385109ec62d6671ef202ee1d195733b672c94
 MISC metadata.xml 740 BLAKE2B 8f383c1f0b775432795ac55d8c4dd4e7b28f418fe3fe4d05221b3daf8f5c872c698cfff748f0c210ac13b87d84664a7b3333e837966f4d9df98e9474e737a48d SHA512 f551a872a95868d682641941a012cc8e08c53c8ad66bf31e3a4ee1b266244ac011cfdb6ffafb94910af0371274e94e4785507932d6fa0b1735e3bc7562fcbed1
--- a/app-shells/fish/fish-3.4.0.ebuild
+++ b/app-shells/fish/fish-3.4.0.ebuild
@ -0,0 +1,102 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake python-any-r1 readme.gentoo-r1
+
+DESCRIPTION="Friendly Interactive SHell"
+HOMEPAGE="http://fishshell.com/"
+
+MY_PV="${PV/_beta/b}"
+MY_P="${PN}-${MY_PV}"
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git"
+else
+	SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+doc nls test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/libpcre2-10.32:=[pcre32]
+	sys-apps/coreutils
+	sys-libs/ncurses:=[unicode(+)]
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+	nls? ( sys-devel/gettext )
+	test? (
+		${PYTHON_DEPS}
+		dev-tcltk/expect
+		$(python_gen_any_dep '
+			dev-python/pexpect[${PYTHON_USEDEP}]
+		')
+	)
+"
+# we don't need shpinx dep for release tarballs
+[[ ${PV} == 9999 ]] && DEPEND+=" doc? ( dev-python/sphinx )"
+
+S="${WORKDIR}/${MY_P}"
+
+python_check_deps() {
+	use test || return 0
+	has_version -d "dev-python/pexpect[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	# workaround for https://github.com/fish-shell/fish-shell/issues/4883
+	sed -i 's#${TEST_INSTALL_DIR}/${CMAKE_INSTALL_PREFIX}#${TEST_INSTALL_DIR}#' \
+		cmake/Tests.cmake || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_BINDIR="${EPREFIX}/bin"
+		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
+		-DCURSES_NEED_NCURSES=ON
+		-DINSTALL_DOCS="$(usex doc)"
+		-DWITH_GETTEXT="$(usex nls)"
+	)
+	# release tarballs ship pre-built docs // -DHAVE_PREBUILT_DOCS=TRUE
+	if [[ ${PV} == 9999 ]]; then
+		mycmakeargs+=( -DBUILD_DOCS="$(usex doc)" )
+	else
+		mycmakeargs+=( -DBUILD_DOCS=OFF )
+	fi
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	keepdir /usr/share/fish/vendor_{completions,conf,functions}.d
+	readme.gentoo_create_doc
+}
+
+src_test() {
+	# some tests are fragile, sanitize environment
+	local -x COLUMNS=80
+	local -x LINES=24
+
+	# very fragile, depends on terminal, size, tmux, screen and timing
+	if [[ ${PV} != 9999 ]]; then
+		rm -v tests/pexpects/terminal.py || die
+	fi
+
+	cmake_build test
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
--- a/app-shells/fish/fish-9999.ebuild
+++ b/app-shells/fish/fish-9999.ebuild
@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=7
+EAPI=8

 PYTHON_COMPAT=( python3_{8..10} )

@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git"
 else
 	SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 fi

 LICENSE="GPL-2"
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
--- a/dev-cpp/rapidyaml/Manifest
+++ b/dev-cpp/rapidyaml/Manifest
@ -1,19 +1,10 @@
 AUX rapidyaml-0.3.0-libdir.patch 450 BLAKE2B 3058bfbeaa85a81396baf3048d32e7289b4e95c84fb623c4354122689c728fc3fa4e5930262e9058a2f1fbcf73384e1c0dda6cd5d8c701dc1c3091b972dc223f SHA512 2be0a933d8ceaff2f35febdf9098e0e93f40dfea30ccb27b5eb314a2e35f1c58e3b1fb21d2b54dc4cd1df7c5392c82ed739aeb2ab6da5e9d0d70bba1a29a61bf
-AUX rapidyaml-0.3.0-no-download.patch 833 BLAKE2B 57384e4349935acdaeec5b99a1b34090363939f7107db30a6022e974ad6c3f26ba6e02f835a93ced0c1570b968e65432495f4171d1f74d03fcec8bc9b40e2880 SHA512 02651715c80520cba1679a53206a3bd75d802401d22606e58fcbeb66e013c0d6a620b0fa08befc3a5d240919f64665d5eb5aec190eee1136e2df3267bb23214d
 AUX rapidyaml-0.3.0-system-gtest.patch 287 BLAKE2B 00569e1a19fb791bc0ba1c7a8b2b691db478f7e224a842e33c57d0f11d59275fac137e4a193261db7763e5d9a95b98cf17c2ae467bed29617a1f0c5b4544b607 SHA512 119827a88ccd82e8a78fb82593431f8fbb0efc3155043b9587d5909a7d0a944d01703d8f0a9179e6127c5484a292a94c761ca7f22069aa02f03c2a03ba730b8e
 AUX rapidyaml-0.3.0-tests-no-install.patch 315 BLAKE2B 653c4f80092950636f8ef2ce0f1a4dcb8b3af1af83928ac0f75be35fc6b69805f457370783ef64d577f1a1b1b5992eb252b82092f20d61e2add683b9841007cc SHA512 fcdf198dd628023919579661a09de04f8cc863520cb915069dc850124e2a4baf7304eaa1ac41edaa39cf6085afeb9b3feae4b41b3c7e9d7d4696f109a334c389
 AUX rapidyaml-0.4.0-no-download.patch 821 BLAKE2B 9b4122343ce2afdaffeffe7eaf9193395db2d7fc924e44cd75f735e697276501102d058ba95ced225993f0423b0bdef778c3fdfd95b59dcdcd718d96e6e2a4ae SHA512 4dd4c91704308d931a61f3841297d1f95986fc7bc9ab03d0c44583f061762b0af1240e6f6ad8784de2185c45fe09fb87bcc34f07bed655f13c80395ff6eaf121
-DIST c4fs-1abba005074022f07d2d9d11ec6a786f2a1f1380.tar.gz 22104 BLAKE2B ea9a063de87962d620e98bad573b1eef9a65cffdacdeab241fd91982f3da93ab01b1bfd6fd87eac5def0b8523f6f2ce32e9321385fb07a6f108dcb68630af1f5 SHA512 00aa29f818a13301df3506ae2b0bc8b527a6d292eb09ccc69681c2ad92ec270aeb635680543dfe1e761a82206c97f8347337a152728eb49d918284e043d32096
-DIST c4fs-603fce2ad34820c43b1ad60070a77d792636f5aa.tar.gz 22166 BLAKE2B 9be9936f93a58dd58ff011fe8db5103a884125b2906131a9a26d624bb77bfb6a924af08b519d19ef1a9f176bd5271a6c4e586ea0e9814bcd42095df426249a92 SHA512 f27d460aa30302d067f44d83a10c846e5d3ad9a3a710b5d0209fac3c2fb5ac62fa247fdc8192ab94b2274dc4061bd9b4cc46c3dac6c96f0da8dc200f9bedb562
 DIST c4fs-f78cbd86a77c976395c9834726a14a1bba059af0.tar.gz 22163 BLAKE2B c3ed63e9e92dbcba63faa415d4de56ce275fb3b493238235930c629362d75e08ca2f6ec2ad34fda12154544b9972e45b75c24c5a9c80d9d7a68febe6f6e462c8 SHA512 c25d1122851ef2d46b00a2fd5083313c742758530a0d5a9c0353ccd637fbe38228ef8fb45bc8addf9006cc7655dec4b4fc571af13dcedf75f19c551c5011e377
-DIST c4log-b8b86f33fc7539661e302171ee6dcc4a17859e67.tar.gz 11983 BLAKE2B 8f2f18e85e01ffe76a2705d181260c7f1c0979009c09c6037097c7711d590f576816e39e869b30cad7b8134114eef55edad327e6224b09c6ba34dd389917af22 SHA512 a3f8f78ffe38426bab2f79748ecadb07e688d98ac75f907a9898ea93f0e7b1818253846412de24f4f755e0a7099aa886515cdd0b28b8c87786ad656a85bd3f9b
 DIST c4log-e29915ceeaf9fffb18ba43fb9d6d446d20a1cb4d.tar.gz 11985 BLAKE2B 15cc7c1bd9a1693e5419e4904e1cb30f297c7003e1480014f7782d35d0222cb000643901e6afffbe13bdbb61aa10aa4ce759c5333b327b81d3ade1e043283310 SHA512 93f4e8854cf3a5f00beb9a427004a360961caf47c53aaa817f5ca43f4cab7bad6333ba35aad24d1e7aecea75f9f3a8628527ccb0be241bdec25c5aebfb0be8e3
-DIST rapidyaml-0.3.0-src.tgz 696476 BLAKE2B 30b077e3ddff56f68108a02545efc77ae3684273891f36db61b714a9af414f1f01d147a7132619647796c863ec6ae2f2586c8bfe9e1c2d3c6e7e99d11d41ee8e SHA512 52a469b18c484d8def9239f6f7697f3c3b7760855c7af68a36988cc5a8031e1f5f900819b2af9770722628d0c14fa2cc776d1c07db7a8e85602c4d00aa4199a2
-DIST rapidyaml-0.4.0-src.tgz 910642 BLAKE2B cd6813d7bbf855383ef3fce572adda20b7974bc2191b36c7b3bfccec7f14cd798c024693894f350e653d2a91924f40c3d27b89edb5596673a1541bbab1b8ed61 SHA512 c1d25ae75140d7396ecef41abbd60c048efc6e3b7ea9fd8ed5651ca2cfc737c46b2f9f23bbafa47b804b02ba6e67bdafe1e97acbedf7c483d32467a23ce8807a
 DIST rapidyaml-0.4.1-src.tgz 910816 BLAKE2B b9ef92045009b1b38d9142b2856e747edf446261c2271ee580a3aa51a3b5a2b0dfbdbcd1da6c520697dff092e9918f273d77e3f1b1e1a6ee28305aac648e6b4e SHA512 99051f452d61262188cb824623dd950cf51e0db48f519e45e7ed1edf40f3445f73547f1fc0de6b5654a7a6986d48fd3659f72f2d46019af77349957ee14cdd79
 DIST yaml-test-suite-6e6c296ae9c9d2d5c4134b4b64d01b29ac19ff6f.tar.gz 99765 BLAKE2B d55a605623c988a4c58daa6dd155980129ffefe86570d55b1ce2514dfa77c352e0467b12e95d6e2bd38cc0454f0b30c3109c088841ddbe423b8bbb7d9e41bc9b SHA512 4ab0e52369d085e696196ef1aab8ecb4f0218e48e8ce33c4ecc863942639141601cb1c83b41027eceddc20a6a4cebfc51abcb83779007e890b87d79c76394946
-DIST yaml-test-suite-bcd49a2d4919c1b1ac3b9d6e5ebe6b140b5089e3.tar.gz 54806 BLAKE2B 6574bed549759a1f3df7bcaa8051ab5e37ebb6dec878e1935dbf8f5c234f852c9ea037f90cc7bb93306cc5b1cd95f6fa8df885e51131eae50c9187d360110185 SHA512 814a654b6b04cf4e9b89ae40ba7daddb8f013da96e929ed618764c55dd23a45d8a97c456f526548cd95d673bcada3650383c3626bbbd0caa3fbdbc4b94496a6f
-EBUILD rapidyaml-0.3.0.ebuild 2014 BLAKE2B 8e48717d5eed3bcb342362fff22f2b140dab2e78e52e1c82e936766bde0bfe41d04c9386075950a8dab3a4bc6b0bf21ffd8e47ae5e78b43e67d636db05bbb46c SHA512 3a64ba8c56013146a09f90ffa7e7a7bfe74ed3a81860c0bd6e46bd0083245339e7f9d800a0f661121a5f6ffc14ec09645ebcea2b52f095491196cff7eb8cb8be
-EBUILD rapidyaml-0.4.0.ebuild 2068 BLAKE2B 755c9a3f431e2e1aa37ed9fe2152fc9a6a491aab67d6bf37d99dc177e031e2232a82da8a0bbcb0e46e352028c18ea683ad278edf842897c1dd64d2cbdf0a93f4 SHA512 67f88462082249a6a23aa9464bbc8c929372b3cdcfbacee6edb2648efd18719265d2da9a32b90381e13ccb8fc002c8cf3f6dedb65acfed6595607906631bed35
 EBUILD rapidyaml-0.4.1.ebuild 2075 BLAKE2B 4eda64eb090318f63afecb5aa0494819b5d5608341b64967e1411ab5f682dde87fe4e0454dcf4eaa45431ffc1225e3c88483b894f54cd90b3f76fcc5a565ace3 SHA512 b6d9a300f42ff568259bac7551b4bfc9d49020fcd9cfcca07bc9a5ecb921c76a1d565688c6bfb67d9e72df366ad1c06dd9cbe1c4bb2a14f062b72fb6e3d51a37
 MISC metadata.xml 375 BLAKE2B ae9fc516e43fb6561964a17a58c9c2eefffeaa918a62c325c0b72847c60dad692c107f5ea27a2b6abbf93f73bc27f8a24a00f57dfcbf72bb0f6bd9a5344b6ea2 SHA512 263bb4123527bc4e48c2d9ccc4d797e943be1a5924dd8504c09f028728297c46d3e17e0716ea50a6a35fbfd3561043711ac554776a6c538543ae51ba11ab72a1
--- a/dev-cpp/rapidyaml/files/rapidyaml-0.3.0-no-download.patch
+++ b/dev-cpp/rapidyaml/files/rapidyaml-0.3.0-no-download.patch
@ -1,23 +0,0 @@
--- a/ext/testbm.cmake
-+++ b/ext/testbm.cmake
-@@ -1,4 +1,2 @@
- # these are used both for testing and benchmarking
-c4_require_subproject(c4fs REMOTE
-    GIT_REPOSITORY https://github.com/biojppm/c4fs
-    GIT_TAG master)
-+c4_require_subproject(c4fs SUBDIRECTORY ext/c4fs)
--- a/test/CMakeLists.txt
-+++ b/test/CMakeLists.txt
-@@ -103,10 +103,5 @@
- 
-    c4_require_subproject(c4log REMOTE
-        GIT_REPOSITORY https://github.com/biojppm/c4log
-        GIT_TAG master)
-+    c4_require_subproject(c4log SUBDIRECTORY ../ext/c4log)
- 
-    set(tsdir ${ed}/yaml-test-suite)
-    c4_download_remote_proj(yaml-test-suite tsdir
-        GIT_REPOSITORY https://github.com/yaml/yaml-test-suite
-        GIT_TAG bcd49a2d4919c1b1ac3b9d6e5ebe6b140b5089e3)
-+    set(tsdir ${CMAKE_SOURCE_DIR}/ext/yaml-test-suite)
-     set(suite_dir ${tsdir}/src)
--- a/dev-cpp/rapidyaml/rapidyaml-0.3.0.ebuild
+++ b/dev-cpp/rapidyaml/rapidyaml-0.3.0.ebuild
@ -1,80 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-C4FS_COMMIT="1abba005074022f07d2d9d11ec6a786f2a1f1380"
-C4LOG_COMMIT="b8b86f33fc7539661e302171ee6dcc4a17859e67"
-YAMLTS_COMMIT="bcd49a2d4919c1b1ac3b9d6e5ebe6b140b5089e3"
-C4FS_P="c4fs-${C4FS_COMMIT}"
-C4LOG_P="c4log-${C4LOG_COMMIT}"
-YAMLTS_P="yaml-test-suite-${YAMLTS_COMMIT}"
-
-DESCRIPTION="Library to parse and emit YAML, and do it fast"
-HOMEPAGE="https://github.com/biojppm/rapidyaml/"
-SRC_URI="
-	https://github.com/biojppm/rapidyaml/releases/download/v${PV}/${P}-src.tgz
-	test? (
-		https://github.com/biojppm/c4fs/archive/${C4FS_COMMIT}.tar.gz -> ${C4FS_P}.tar.gz
-		https://github.com/biojppm/c4log/archive/${C4LOG_COMMIT}.tar.gz -> ${C4LOG_P}.tar.gz
-		https://github.com/yaml/yaml-test-suite/archive/${YAMLTS_COMMIT}.tar.gz -> ${YAMLTS_P}.tar.gz
-	)"
-S="${WORKDIR}/${P}-src"
-
-LICENSE="MIT Boost-1.0 BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="debug test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( dev-cpp/gtest )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-libdir.patch
-	"${FILESDIR}"/${P}-no-download.patch
-	"${FILESDIR}"/${P}-system-gtest.patch
-)
-
-DOCS=( README.md ROADMAP.md changelog )
-
-src_prepare() {
-	if use test; then
-		mv ../${C4FS_P} ext/c4fs &&
-			rmdir ext/c4fs/ext/c4core &&
-			ln -s ../../c4core ext/c4fs/ext || die
-
-		mv ../${C4LOG_P} ext/c4log &&
-			rmdir ext/c4log/ext/c4core &&
-			ln -s ../../c4core ext/c4log/ext || die
-
-		mv ../${YAMLTS_P} ext/yaml-test-suite || die
-
-		PATCHES+=( "${FILESDIR}"/${P}-tests-no-install.patch )
-	fi
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DRYML_BUILD_API=no # TODO if a consumer needs it
-		-DRYML_BUILD_TESTS=$(usex test)
-		-DRYML_DBG=$(usex debug)
-		-D_{ARCHIVE,LIBRARY}_INSTALL_DIR=$(get_libdir)
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	cmake_build test
-}
-
-src_install() {
-	cmake_src_install
-
-	# remove shared private library that is statically linked
-	rm "${ED}"/usr/$(get_libdir)/libc4core.so* || die
-}
--- a/dev-cpp/rapidyaml/rapidyaml-0.4.0.ebuild
+++ b/dev-cpp/rapidyaml/rapidyaml-0.4.0.ebuild
@ -1,81 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-# see *-no-download.patch
-C4FS_COMMIT="603fce2ad34820c43b1ad60070a77d792636f5aa"
-C4LOG_COMMIT="e29915ceeaf9fffb18ba43fb9d6d446d20a1cb4d"
-YAMLTS_COMMIT="6e6c296ae9c9d2d5c4134b4b64d01b29ac19ff6f"
-C4FS_P="c4fs-${C4FS_COMMIT}"
-C4LOG_P="c4log-${C4LOG_COMMIT}"
-YAMLTS_P="yaml-test-suite-${YAMLTS_COMMIT}"
-
-DESCRIPTION="Library to parse and emit YAML, and do it fast"
-HOMEPAGE="https://github.com/biojppm/rapidyaml/"
-SRC_URI="
-	https://github.com/biojppm/rapidyaml/releases/download/v${PV}/${P}-src.tgz
-	test? (
-		https://github.com/biojppm/c4fs/archive/${C4FS_COMMIT}.tar.gz -> ${C4FS_P}.tar.gz
-		https://github.com/biojppm/c4log/archive/${C4LOG_COMMIT}.tar.gz -> ${C4LOG_P}.tar.gz
-		https://github.com/yaml/yaml-test-suite/archive/${YAMLTS_COMMIT}.tar.gz -> ${YAMLTS_P}.tar.gz
-	)"
-S="${WORKDIR}/${P}-src"
-
-LICENSE="MIT Boost-1.0 BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="debug test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( dev-cpp/gtest )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.3.0-libdir.patch
-	"${FILESDIR}"/${PN}-0.3.0-system-gtest.patch
-	"${FILESDIR}"/${P}-no-download.patch
-)
-
-DOCS=( README.md ROADMAP.md changelog )
-
-src_prepare() {
-	if use test; then
-		mv ../${C4FS_P} ext/c4fs &&
-			rmdir ext/c4fs/ext/c4core &&
-			ln -s ../../c4core ext/c4fs/ext || die
-
-		mv ../${C4LOG_P} ext/c4log &&
-			rmdir ext/c4log/ext/c4core &&
-			ln -s ../../c4core ext/c4log/ext || die
-
-		mv ../${YAMLTS_P} ext/yaml-test-suite || die
-
-		PATCHES+=( "${FILESDIR}"/${PN}-0.3.0-tests-no-install.patch )
-	fi
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DRYML_BUILD_API=no # TODO if a python consumer needs it
-		-DRYML_BUILD_TESTS=$(usex test)
-		-DRYML_DBG=$(usex debug)
-		-D_{ARCHIVE,LIBRARY}_INSTALL_DIR=$(get_libdir)
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	cmake_build test
-}
-
-src_install() {
-	cmake_src_install
-
-	# remove shared private library that is statically linked
-	rm "${ED}"/usr/$(get_libdir)/libc4core.so* || die
-}
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
--- a/dev-db/timescaledb/Manifest
+++ b/dev-db/timescaledb/Manifest
@ -1,3 +1,5 @@
 DIST timescaledb-2.5.2.tar.gz 2773859 BLAKE2B 918768e21ea43de2678c2ce12c5ea9faa9794eb48d4f1003c898d5510330d25c319b30323692facff78f95ee417a4cd4ec0e78363de17c4746aeb3f42c0b5bba SHA512 28cc4b4a786c62651aa9e499bb82bbc079307ed237a8c2478d5fbd4d6aaa9bb43bf3c1df971f76921d25112761a79dc9dec31d663fa31caca38b0c822f2026b0
+DIST timescaledb-2.6.0.tar.gz 2863860 BLAKE2B 14b7bbfcfe1ca874ef24a7d31f3855f78cde0be57022251e1b1eb141819e19af45a2269123583a2d97c08c778aed38d9662cd4a6ff9c44281a605b8c0faed1ec SHA512 b076a44e3b30e99986dba710079cdc1a38b59a9d65ecd9f78fa16f3b762f253d7a9236a34a4d7e7beb29c1051113ea8877973e07ed3116012c9d2175a77e2edc
 EBUILD timescaledb-2.5.2-r1.ebuild 1434 BLAKE2B d1c472204d3055d48060bd78c12aea4a98ea23b3b242d41d2fefa85fe0c9d5035ed4277d6ee42d1ec12540475e4eb586e08e87e88c871fa4d1fabd064e45a234 SHA512 cf76e892e19dd4d1f2ccdb9f2bbf73cfd52fbb4ab4ee8ba1e9dec7a35beb15196e7e5b3d783662e1669920ea0e77c5f00a1edf2d418de697d72dbb8b5c7065dd
+EBUILD timescaledb-2.6.0.ebuild 1434 BLAKE2B d1c472204d3055d48060bd78c12aea4a98ea23b3b242d41d2fefa85fe0c9d5035ed4277d6ee42d1ec12540475e4eb586e08e87e88c871fa4d1fabd064e45a234 SHA512 cf76e892e19dd4d1f2ccdb9f2bbf73cfd52fbb4ab4ee8ba1e9dec7a35beb15196e7e5b3d783662e1669920ea0e77c5f00a1edf2d418de697d72dbb8b5c7065dd
 MISC metadata.xml 424 BLAKE2B 8cbf1315da7aa52b81fb2b141d7d34100cd838667ec366ba000fb914251cddd35632d9f9b8f6200bf4b679683db9c487522d18bedb4b371f92651c26a3e6121b SHA512 8e8b90dec46092f8d7dd36e67fa000e3f4c108f80903ebd3dad4965bbb4797bf952208afa7e90646946207382547fdd59d4d282379a898a3121b91f86e090c20
--- a/dev-db/timescaledb/timescaledb-2.6.0.ebuild
+++ b/dev-db/timescaledb/timescaledb-2.6.0.ebuild
@ -0,0 +1,67 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+POSTGRES_COMPAT=( 12 13 14 )
+POSTGRES_USEDEP="ssl"
+
+inherit postgres-multi cmake
+
+DESCRIPTION="Open-source time-series SQL database"
+HOMEPAGE="https://www.timescale.com/"
+SRC_URI="https://github.com/timescale/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+IUSE="proprietary-extensions"
+LICENSE="POSTGRESQL Apache-2.0 proprietary-extensions? ( timescale )"
+
+KEYWORDS="~amd64"
+
+SLOT=0
+
+RESTRICT="test"
+
+DEPEND="${POSTGRES_DEP}"
+RDEPEND="${DEPEND}"
+
+CMAKE_IN_SOURCE_BUILD=yes
+CMAKE_BUILD_TYPE="RelWithDebInfo"
+BUILD_DIR=${WORKDIR}/${P}
+
+src_prepare() {
+	postgres-multi_src_prepare
+	postgres-multi_foreach cmake_src_prepare
+}
+
+timescale_configure() {
+	local CMAKE_USE_DIR=$BUILD_DIR
+	local mycmakeargs=( "-DPG_CONFIG=/usr/bin/pg_config${MULTIBUILD_VARIANT}" "-DREGRESS_CHECKS=OFF" )
+
+	# licensing is tied to features, this useflag disables the non-apache2 licensed bits
+	if ! use proprietary-extensions ; then
+		mycmakeargs+=("-DAPACHE_ONLY=ON")
+	fi
+	cmake_src_configure
+}
+
+src_configure() {
+	postgres-multi_foreach timescale_configure
+}
+
+timescale_src_compile() {
+	local CMAKE_USE_DIR=$BUILD_DIR
+	cmake_src_compile
+}
+
+src_compile() {
+	postgres-multi_foreach timescale_src_compile
+}
+
+timescale_src_install() {
+	local CMAKE_USE_DIR=$BUILD_DIR
+	cmake_src_install
+}
+
+src_install() {
+	postgres-multi_foreach timescale_src_install
+}
--- a/dev-embedded/Manifest.gz
+++ b/dev-embedded/Manifest.gz
--- a/dev-embedded/rpi-eeprom/Manifest
+++ b/dev-embedded/rpi-eeprom/Manifest
@ -5,10 +5,7 @@ DIST rpi-eeprom_12.5-1.debian.tar.xz 11808 BLAKE2B 82eccb61fbac25c9f20343ebccd45
 DIST rpi-eeprom_12.5.orig.tar.gz 13662998 BLAKE2B 6c3937f4c4a950c6cc78285134bb8ee0b5459e9c9ba39ac020c6cd5e0b0bb6d6647d788c81ff1d639a87dd825d8b5fcaa29318f63823e56f6884ec4ce9a52361 SHA512 82608eee6106380b09657d729013e953f50bba2a45084fb9d38238142505a4f51f1f7c586dbd10a29e79b02d0b82670498f3dae16e368506a8187f1076d790fc
 DIST rpi-eeprom_13.3-1.debian.tar.xz 12768 BLAKE2B 823b1f25cda98cb2888b6b423b6120f5c1474735c58933ac11fe9380fa31fcbef260afb2ebcced423301bee207c171c5ccea3ba9c8cc4dae579c2dba55a60cba SHA512 0b8e15b1c827506dcdf7a6f19acd1ceb32f0901b9c438994af7f1e38a0ced05b7f123225ae8ecca4147ce04e1d7500ddcdfaeddeb90f0342af2dee9e4ffbfe04
 DIST rpi-eeprom_13.3.orig.tar.gz 17497524 BLAKE2B f65fc9b6a98dd3a4d3f4095e03279d832a64d0f12f9edd7e7af2b8afe8b290f4db6ec39e755df9fb5b317930235bf1c7205be4b3f838f6cbbf92e1d80574b342 SHA512 d5885444fd90a5f24c94a3af4f093744f4a63947a119059c851cd6639e572138205a48f7cd126c3deafe104e76985197e1fa36c8aa72a16bb173f11750b85151
-DIST rpi-eeprom_13.9-1.debian.tar.xz 13256 BLAKE2B f03573a67a1bc103cc0a3bfb398ba925f5505ab561f33d0f73aed7eb5d106f0ac382a9a287d703d66a38bdfbaf0941f56a70637c37c728a92e14ff3ec1c16da6 SHA512 da86291d8629eedd66c4359a3571b548f6b0de7533c6baeeddb3fffcca1352c0873f4058b1e6cefe017dbd1fb9389762a691d510dc22406a3a6036727d92ee69
-DIST rpi-eeprom_13.9.orig.tar.gz 19693981 BLAKE2B 7314a2696b1db7f7de1b51d814aa7dc149607082ec7bfaf7c5e383067e4cc3e49efa36f8077ebbbb54393cf5177a65f1d99fe5b002ffb217d4be3e09dd39286c SHA512 5076ecf2485415565e84c413827b2813d3ebb9a7e23b2f595ce7dfdc91946f3c23f23634e4666d27398b02e70959ed3c6f0f7381599acb0b3d18e5773658b89f
 EBUILD rpi-eeprom-11.0_p1.ebuild 2989 BLAKE2B 7c203d49ef924e609b7c13525c47e524651b5511beb91785ccf72506748eefeeccfa8ba33a63c480490dfe108b014afb9ecdb1770916f892c9f0fe8a3479d8b5 SHA512 8e059764c4adea3db587694c989428dc8d378b4d5b45392ccf098de65918a6c24ff854004eca156c071679eedb50f4a4cbf63fe263d5b2e6ab0ec80cc418d8a0
 EBUILD rpi-eeprom-12.5_p1-r1.ebuild 3009 BLAKE2B 29ce9339662f1430deacaf551ae26a0f07373013f2eae4f1b25bcea109d81682ec4434831c8496329bbe7dc483319387263fc8784491d448f2cd0359e48e79f5 SHA512 587810a696f471c952303ea4c6c04191c9dfb3a87a2217180da4b3b8786101dc895c1799e69461829f469ed5c83771a9102c0119a1b644dab5b0927f674438f1
 EBUILD rpi-eeprom-13.3_p1-r1.ebuild 3025 BLAKE2B 3f9190ccf19fc65499d9a1b2837fbe3eb498d6a439a3dabb61d1553a0e7da1bb34e24d64f5bcfd1498fcd0b19bf087de5b6b8901f9a0b9ef2808f5dbd7914e1e SHA512 3a34415f6a4dc3d762f7366428de02a6631a67cf5f607b51c3db75f54b2b0f0b4a3d863df93e38e59453812eb867570dbc5a0ccc548d3240bba1f5010a27e078
-EBUILD rpi-eeprom-13.9_p1.ebuild 3028 BLAKE2B 5ccfe24170fb8655f46f37e918365606dad03d4674a7855264ac1bde741a0a85189b637799099185b9997ccc962c227ac244e6553cd8901f3e3807bf567f2dbe SHA512 d908f086acfdfc13f43c2b0dbc61dd0437cff8a6e49e1c55f826d935728186c94eff4c26492cf2c56e79c82b012a364023f9c14e07a7f492e44640ae3a7fbf79
 MISC metadata.xml 596 BLAKE2B 075812117456e8457ad55e184a322ff86f8bc18a8470fcd52d63ec20e88c81db064ff5f6b023e7400d51d603886cb154a0a1485613cb326b8897f99c5c06c330 SHA512 9ebe09182734a60c3ed3a9e30b2cf9b9433f546e1f4cfc9d75b48813e61dc875b71593300e6bc628650cfbae49fc722713cfc88c8e0a387efe0dd6cca991fa2f
--- a/dev-embedded/rpi-eeprom/rpi-eeprom-13.9_p1.ebuild
+++ b/dev-embedded/rpi-eeprom/rpi-eeprom-13.9_p1.ebuild
@ -1,94 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8,9,10} )
-
-inherit python-r1 systemd
-
-MY_P="${PN}-$(ver_cut 1-2)"
-MY_BASE_URL="https://archive.raspberrypi.org/debian/pool/main/r/${PN}/${PN}_$(ver_cut 1-2)"
-DESCRIPTION="Updater for Raspberry Pi 4 bootloader and the VL805 USB controller"
-HOMEPAGE="https://github.com/raspberrypi/rpi-eeprom/"
-SRC_URI="${MY_BASE_URL}-$(ver_cut 4).debian.tar.xz
-	${MY_BASE_URL}.orig.tar.gz"
-S="${WORKDIR}"
-
-LICENSE="BSD rpi-eeprom"
-SLOT="0"
-KEYWORDS="~arm ~arm64"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="sys-apps/help2man"
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${PYTHON_DEPS}
-	sys-apps/flashrom
-	sys-apps/pciutils
-	|| (
-		>=media-libs/raspberrypi-userland-0_pre20201022
-		>=media-libs/raspberrypi-userland-bin-1.20201022
-	)"
-
-src_prepare() {
-	default
-	sed -i \
-		-e 's:/etc/default/rpi-eeprom-update:/etc/conf.d/rpi-eeprom-update:' \
-		"${MY_P}/rpi-eeprom-update" || die "Failed sed on rpi-eeprom-update"
-	sed -i \
-		-e 's:/usr/bin/rpi-eeprom-update:/usr/sbin/rpi-eeprom-update:' \
-		"debian/rpi-eeprom.rpi-eeprom-update.service" || die "Failed sed on rpi-eeprom.rpi-eeprom-update.service"
-}
-
-src_install() {
-	pushd "${MY_P}" 1>/dev/null || die "Cannot change into directory ${MY_P}"
-
-	python_scriptinto /usr/sbin
-	python_foreach_impl python_newscript rpi-eeprom-config rpi-eeprom-config
-
-	dosbin rpi-eeprom-update rpi-eeprom-digest
-	keepdir /var/lib/raspberrypi/bootloader/backup
-
-	for dir in critical stable beta; do
-		insinto /lib/firmware/raspberrypi/bootloader
-		doins -r firmware/${dir}
-	done
-
-	dodoc firmware/release-notes.md
-
-	help2man -N \
-		--version-string="${PV}" --help-option="-h" \
-		--name="Bootloader EEPROM configuration tool for the Raspberry Pi 4B" \
-		--output=rpi-eeprom-config.1 ./rpi-eeprom-config || die "Failed to create manpage for rpi-eeprom-config"
-
-	help2man -N \
-		--version-string="${PV}" --help-option="-h" \
-		--name="Checks whether the Raspberry Pi bootloader EEPROM is \
-			up-to-date and updates the EEPROM" \
-		 --output=rpi-eeprom-update.1 ./rpi-eeprom-update || die "Failed to create manpage for rpi-eeprom-update"
-
-	doman rpi-eeprom-update.1 rpi-eeprom-config.1
-
-	newconfd rpi-eeprom-update-default rpi-eeprom-update
-
-	popd 1>/dev/null || die
-
-	pushd debian 1>/dev/null || die "Cannot change into directory debian"
-
-	systemd_newunit rpi-eeprom.rpi-eeprom-update.service rpi-eeprom-update.service
-	newdoc changelog changelog.Debian
-
-	popd 1>/dev/null || die
-
-	newinitd "${FILESDIR}/init.d_rpi-eeprom-update-1" "rpi-eeprom-update"
-}
-
-pkg_postinst() {
-	elog 'To have rpi-eeprom-update run at each startup, enable and start either'
-	elog '/etc/init.d/rpi-eeprom-update (for openrc users)'
-	elog 'or'
-	elog 'rpi-eeprom-update.service (for systemd users)'
-	elog '/etc/conf.d/rpi-eeprom-update contains the configuration.'
-	elog 'FIRMWARE_RELEASE_STATUS="critical|stable|beta" determines'
-	elog 'which release track you get. "critical" is recommended and the default.'
-}
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
--- a/dev-java/cal10n/Manifest
+++ b/dev-java/cal10n/Manifest
@ -0,0 +1,3 @@
+DIST cal10n-0.8.1.tar.gz 358264 BLAKE2B 1561d2ea7309e470b5bf5990d166af1974ddbfc766ee14101bef33d3b41e5d18bcadbe1ba769eb028d6a41c43b7498c29118a5d7c7b4a93bd55d0a9db5d42eb4 SHA512 882146cddcc8489f08c7354b2029448cc084932fbb6c448271dbfc9ddb11740744bfe161a4e4d58071fc010bc3891d094681584a7a559514d443dcceedafbca2
+EBUILD cal10n-0.8.1.ebuild 3461 BLAKE2B 5fa50f46a378a5c62b29fd3cfeb84c78c0466beb9936dadfb4be4568d17ed6671bbbfb9c52ad2d3c2f0766ef174be24e43d27bcc3a01e9f67bc3df2d5da68cdd SHA512 3a4ac9b39c69a7c39730f766d8b0b947a9149f390ef3dcca53f17fa64b109881d4a8488ba04aaf4533327be6efdb867f270837c3217ff913c07ea6160bc2a33d
+MISC metadata.xml 314 BLAKE2B 9a158ffea633bbed9cd2f7d24c6783bed4c200214d8ab6b7463b7093f9aab9e545cd86a8723d89b7466172e4d50be85acd800ef5f48ec407e773256e35454071 SHA512 6e703050f8faa8ed9c3b4b8b85cb503876ac1b9cf06ff248b70dd4416f06803110f54ba412fcd5cb5ebea38a6aff8d1369520539decfb5a5c75d34442812a1c6
--- a/dev-java/cal10n/cal10n-0.8.1.ebuild
+++ b/dev-java/cal10n/cal10n-0.8.1.ebuild
@ -0,0 +1,67 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="ch.qos.cal10n:cal10n-api:0.8.1"
+# JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="java library for writing localized messages using resource bundle"
+HOMEPAGE="http://cal10n.qos.ch/"
+SRC_URI="https://github.com/qos-ch/cal10n/archive/v_${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+S="${WORKDIR}/cal10n-v_${PV}/${PN}-api"
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+# There are compilation errors in test phase:
+# warning: Supported source version 'RELEASE_5' from annotation processor 'ch.qos.cal10n.verifier.processor.CAL10NAnnotationProcessor' less than -source '8'
+# src/test/java/ch/qos/cal10n/util/Fruit.java:30: error: Failed to locate resource bundle [fruits] for locale [fr] for enum type [ch.qos.cal10n.util.Fruit]
+# public enum Fruit {
+#        ^
+# src/test/java/ch/qos/cal10n/util/Fruit.java:30: error: Failed to locate resource bundle [fruits] for locale [en] for enum type [ch.qos.cal10n.util.Fruit]
+# public enum Fruit {
+#        ^
+# src/test/java/ch/qos/cal10n/sample/Minimal.java:34: error: Missing or empty @LocaleData annotation in enum type [ch.qos.cal10n.sample.Minimal]. See http://cal10n.qos.ch/codes.html#missingLDAnnotation
+# public enum Minimal {
+#        ^
+# src/test/java/ch/qos/cal10n/sample/Labels.java:9: error: Missing or empty @LocaleData annotation in enum type [ch.qos.cal10n.sample.Labels]. See http://cal10n.qos.ch/codes.html#missingLDAnnotation
+# public enum Labels {
+#        ^
+# src/test/java/ch/qos/cal10n/sample/Host.java:8: error: Missing or empty @LocaleData annotation in enum type [ch.qos.cal10n.sample.Host.OtherColors]. See http://cal10n.qos.ch/codes.html#missingLDAnnotation
+#   public enum OtherColors {
+#          ^
+# src/test/java/ch/qos/cal10n/sample/Furnitures.java:33: error: Failed to locate resource bundle [furnitures] for locale [en_UK] for enum type [ch.qos.cal10n.sample.Furnitures]
+# public enum Furnitures {
+#        ^
+# src/test/java/ch/qos/cal10n/sample/Countries.java:33: error: Key [CH] present in enum type [ch.qos.cal10n.sample.Countries] but absent in resource bundle named [countries] for locale [en]
+# public enum Countries {
+#        ^
+# src/test/java/ch/qos/cal10n/sample/Countries.java:33: error: Key [BR] present in resource bundle named [countries] for locale [en] but absent in enum type [ch.qos.cal10n.sample.Countries]
+# public enum Countries {
+#        ^
+# src/test/java/ch/qos/cal10n/sample/Countries.java:33: error: Key [CH] present in enum type [ch.qos.cal10n.sample.Countries] but absent in resource bundle named [countries] for locale [fr]
+# public enum Countries {
+#        ^
+# src/test/java/ch/qos/cal10n/sample/Countries.java:33: error: Key [CN] present in enum type [ch.qos.cal10n.sample.Countries] but absent in resource bundle named [countries] for locale [fr]
+# public enum Countries {
+#        ^
+# src/test/java/ch/qos/cal10n/sample/Countries.java:33: error: Key [BR] present in resource bundle named [countries] for locale [fr] but absent in enum type [ch.qos.cal10n.sample.Countries]
+# public enum Countries {
+#        ^
+# 11 errors
+
+# JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+# JAVA_TEST_SRC_DIR="src/test/java"
+# JAVA_TEST_RESOURCE_DIRS="src/test/resources"
--- a/dev-java/cal10n/metadata.xml
+++ b/dev-java/cal10n/metadata.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">qos-ch/cal10n</remote-id>
+	</upstream>
+</pkgmetadata>
--- a/dev-java/slf4j-api/Manifest
+++ b/dev-java/slf4j-api/Manifest
@ -1,3 +1,5 @@
 DIST slf4j-1.7.32.tar.gz 2277207 BLAKE2B d16c93ddc4667700a868d872a58b64248c8594fafa37e05ed300a71061c58ec2b3f1e0036326ff42ebdd57d5df3576e8ec2d8ae6090439b5d8e6f1fa0c555332 SHA512 512c33cb812058a7419eb717e55ad9a0522e602339f088e7295bb0bfb3cf39972412a74479896c14e8c48124d8c2adc4c4d78735f4747b4fa9742ddac2ae07fa
+DIST slf4j-1.7.36.tar.gz 2276203 BLAKE2B 930de76047c694b4e566ba743ee90a2efb062358b03209137f686c4bf4ead122aa84c18b79615e5a67f1a890abdc1b8f70f62b7803f7b8e45c766ff8254836d4 SHA512 1384c771aa04d9d351854cf8ddeef66ee9f43df53890a05413c48c14cf1cb78a457bb4b2a6e2f064f1c1ab68b2eaa1d326fc03bb6b7c145915660a2c873692d0
 EBUILD slf4j-api-1.7.32.ebuild 1467 BLAKE2B 8cfde573d5913ad88f7cff6bcbb226673f23409cad31f95d9efe0623f7ab3b3bfa4b874aa3ebc73e2a574fd173a6bf6cf58cb4067d7d6aab444f972bafb6d7a3 SHA512 fbc3751468b574e01f974b682f3f0938161d144b0320ed28efcfb5356ea9e7218275d42bb3c29f4ffa84a6ed76d7399aa9b1277c36be2d470852b414f0dd924d
+EBUILD slf4j-api-1.7.36.ebuild 1451 BLAKE2B 3e1f960f76250d6d306ccb3011f9662cb2c7010fc500e34dbdb2be4abd5a99b69bf2aaebbcf499e80f7b830b2f4abdc46aabfe2bae8c1f2e98b5a428bd528c44 SHA512 3d6e6b4376ee020f65111532826dd9b8fd5b7853b533e39f780abcce1338feb95000dab61fcaf6669ee6ccfb618770fdb32184b313c1ecf93cdec14c93624967
 MISC metadata.xml 367 BLAKE2B 086e22a444bd6a3dfab4f0a74e4900ed1f1a7be81b47932e192ebe4d6d1e8d65b63f064848e5cd3f0ad03a40c54e863d48acad905e09b918b9f24fe255820883 SHA512 d80fd3fc9ad1da46807f41251cf2a9bc384ef6566c24627482b4d7d5d3c46c672dcdd19037fd80a482079af86662fd07d35cb33b34c2e14911de7f3fc6b5e3a4
--- a/dev-java/slf4j-api/slf4j-api-1.7.36.ebuild
+++ b/dev-java/slf4j-api/slf4j-api-1.7.36.ebuild
@ -0,0 +1,62 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/qos-ch/slf4j/archive/v_1.7.36.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild slf4j-api-1.7.36.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.slf4j:slf4j-api:1.7.36"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="The slf4j API"
+HOMEPAGE="https://www.slf4j.org"
+SRC_URI="https://github.com/qos-ch/slf4j/archive/v_${PV}.tar.gz -> slf4j-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+"
+BDEPEND="app-arch/zip"
+
+DOCS=( LICENSE.txt ../README.md )
+
+S="${WORKDIR}/slf4j-v_${PV}/${PN}"
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+JAVA_TEST_EXCLUDES=(
+	# java.lang.InstantiationException - not run by upstream anyway
+	"org.slf4j.helpers.MultithreadedInitializationTest"
+)
+
+src_prepare() {
+	default
+	java-pkg_clean
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+
+	# remove org/slf4j/impl/ from the jar file
+	zip -d ${PN}.jar org/slf4j/impl/\* || die "Failed to remove impl files"
+}
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}
--- a/dev-java/slf4j-nop/Manifest
+++ b/dev-java/slf4j-nop/Manifest
@ -1,3 +1,5 @@
 DIST slf4j-1.7.32.tar.gz 2277207 BLAKE2B d16c93ddc4667700a868d872a58b64248c8594fafa37e05ed300a71061c58ec2b3f1e0036326ff42ebdd57d5df3576e8ec2d8ae6090439b5d8e6f1fa0c555332 SHA512 512c33cb812058a7419eb717e55ad9a0522e602339f088e7295bb0bfb3cf39972412a74479896c14e8c48124d8c2adc4c4d78735f4747b4fa9742ddac2ae07fa
+DIST slf4j-1.7.36.tar.gz 2276203 BLAKE2B 930de76047c694b4e566ba743ee90a2efb062358b03209137f686c4bf4ead122aa84c18b79615e5a67f1a890abdc1b8f70f62b7803f7b8e45c766ff8254836d4 SHA512 1384c771aa04d9d351854cf8ddeef66ee9f43df53890a05413c48c14cf1cb78a457bb4b2a6e2f064f1c1ab68b2eaa1d326fc03bb6b7c145915660a2c873692d0
 EBUILD slf4j-nop-1.7.32.ebuild 1301 BLAKE2B 9924a22bb70803bc12abecd59a408cd17b1c0792a025bbf09b0ec2053ad3fe6536e8d880d4001c9a17d17f5e901a48594a3a5a6d2f790a8f1a57279255d119a0 SHA512 421482239d512d1cb830ffbb3a6c3001c7ad8a2a10062950bdee585b2488d8b8b60c2a76f8bdd1a570c463ad3787fd024f775e74a8e7bf460587a14054e1018f
+EBUILD slf4j-nop-1.7.36.ebuild 1290 BLAKE2B e4b8b9deeecfe0e40495d98809ab65bae779ee3dc2e2373ab780a9dbb2a61630ce17234665e14dda9e0ad09d6b8ae0ea384d4f04ed10d13bc44555fe07d6a588 SHA512 7a7edbb2e786d9479d1f393da17c5aba55c0466f93e49a285c3564a261cea3cf6eac067eb0056f6f7889d3f86445f18982f403e5fea67eaee50082fafaa0f94c
 MISC metadata.xml 243 BLAKE2B d1937cd00ce74d225075f1cf0e2584ce3f3d04b4ab3bd4ce636326ef8ed6ccaa54535a1c126025464e48a272959a579e08ceb008b8bacb2160f8f623fea5b6b3 SHA512 5431123c80f2e11811efde927819546af19c9ca93c9810399fe784c77ad2201696a081ed146df5b59fbf78ffb39cf8633cd6805e16ca82244aa8458c2ab8c4fd
--- a/dev-java/slf4j-nop/slf4j-nop-1.7.36.ebuild
+++ b/dev-java/slf4j-nop/slf4j-nop-1.7.36.ebuild
@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/qos-ch/slf4j/archive/v_1.7.36.tar.gz --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild slf4j-nop-1.7.36.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.slf4j:slf4j-nop:1.7.36"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="SLF4J NOP Binding"
+HOMEPAGE="https://www.slf4j.org"
+SRC_URI="https://github.com/qos-ch/slf4j/archive/v_${PV}.tar.gz -> slf4j-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# Common dependencies
+# POM: pom.xml
+# org.slf4j:slf4j-api:1.7.36 -> >=dev-java/slf4j-api-1.7.36:0
+
+CP_DEPEND="
+	~dev-java/slf4j-api-${PV}:0
+"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CP_DEPEND}
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}"
+
+DOCS=( LICENSE.txt ../README.md )
+
+S="${WORKDIR}/slf4j-v_${PV}/${PN}"
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_prepare() {
+	default
+	java-pkg_clean
+}
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}
--- a/dev-java/slf4j-simple/Manifest
+++ b/dev-java/slf4j-simple/Manifest
@ -1,3 +1,5 @@
 DIST slf4j-1.7.32.tar.gz 2277207 BLAKE2B d16c93ddc4667700a868d872a58b64248c8594fafa37e05ed300a71061c58ec2b3f1e0036326ff42ebdd57d5df3576e8ec2d8ae6090439b5d8e6f1fa0c555332 SHA512 512c33cb812058a7419eb717e55ad9a0522e602339f088e7295bb0bfb3cf39972412a74479896c14e8c48124d8c2adc4c4d78735f4747b4fa9742ddac2ae07fa
+DIST slf4j-1.7.36.tar.gz 2276203 BLAKE2B 930de76047c694b4e566ba743ee90a2efb062358b03209137f686c4bf4ead122aa84c18b79615e5a67f1a890abdc1b8f70f62b7803f7b8e45c766ff8254836d4 SHA512 1384c771aa04d9d351854cf8ddeef66ee9f43df53890a05413c48c14cf1cb78a457bb4b2a6e2f064f1c1ab68b2eaa1d326fc03bb6b7c145915660a2c873692d0
 EBUILD slf4j-simple-1.7.32.ebuild 2070 BLAKE2B 667450fd16ceadd7db4f9e36554f6b04f6c9af3789c70d43a47dd854557c479f445c082403305a46aac48c68ea40af0851a538a2bcf934a2ce430803321d643b SHA512 a25934419b0a2d871540ee12d014affaf1d1bb470d0329b4bc88cbbc01f1d9f2c4a56277f7f1841b53d8a4c298f2d72af867058c81b8683bd8297ba4ec2e6d98
+EBUILD slf4j-simple-1.7.36.ebuild 1960 BLAKE2B 36fa684f82aa54402087b117f10576bbacf8344cd3fef736fef68d7aa19820afd86842b524923b1917cc08a7af321b4ee98f5b89b57336fa83daf7646f233aab SHA512 5c447b402760cf02c93d8f7db41a4dd6ccab015fdfb896341de27ef95adc6f3a008c6b5c79d2e935f521f7e31d465818554976a108e3e5ef5c6a85a32cee36e9
 MISC metadata.xml 367 BLAKE2B 086e22a444bd6a3dfab4f0a74e4900ed1f1a7be81b47932e192ebe4d6d1e8d65b63f064848e5cd3f0ad03a40c54e863d48acad905e09b918b9f24fe255820883 SHA512 d80fd3fc9ad1da46807f41251cf2a9bc384ef6566c24627482b4d7d5d3c46c672dcdd19037fd80a482079af86662fd07d35cb33b34c2e14911de7f3fc6b5e3a4
--- a/dev-java/slf4j-simple/slf4j-simple-1.7.36.ebuild
+++ b/dev-java/slf4j-simple/slf4j-simple-1.7.36.ebuild
@ -0,0 +1,77 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/qos-ch/slf4j/archive/v_1.7.36.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild slf4j-simple-1.7.36.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.slf4j:slf4j-simple:1.7.36"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="SLF4J Simple binding"
+HOMEPAGE="https://www.slf4j.org"
+SRC_URI="https://github.com/qos-ch/slf4j/archive/v_${PV}.tar.gz -> slf4j-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# Common dependencies
+# POM: pom.xml
+# org.slf4j:slf4j-api:1.7.36 -> >=dev-java/slf4j-api-1.7.36:0
+
+CP_DEPEND="
+	~dev-java/slf4j-api-${PV}:0
+"
+
+# Compile dependencies
+# POM: pom.xml
+# test? junit:junit:4.13 -> >=dev-java/junit-4.13.2:4
+# test? org.slf4j:slf4j-api:1.7.36 -> >=dev-java/slf4j-api-1.7.36:0
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CP_DEPEND}
+	test? (
+		~dev-java/slf4j-api-${PV}:0
+	)
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}"
+
+DOCS=( LICENSE.txt ../README.md )
+
+S="${WORKDIR}/slf4j-v_${PV}/${PN}"
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4,slf4j-api"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+
+JAVA_TEST_EXCLUDES=(
+	# java.lang.InstantiationException
+	"org.slf4j.helpers.MultithreadedInitializationTest"
+
+	# java.lang.AssertionError: 1284 < 1263+16
+	"org.slf4j.helpers.SimpleLoggerMultithreadedInitializationTest"
+)
+
+src_prepare() {
+	default
+	java-pkg_clean
+	cp {../slf4j-api/,}src/test/java/org/slf4j/helpers/MultithreadedInitializationTest.java || die
+	cp {../slf4j-api/,}src/test/java/org/slf4j/LoggerAccessingThread.java  || die
+}
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
--- a/dev-libs/efl/Manifest
+++ b/dev-libs/efl/Manifest
@ -2,5 +2,5 @@ AUX efl-1.25.1-libavif-fix.patch 2477 BLAKE2B 36ad24c7ba88a34e4da0d69cfda74b3a7a
 DIST efl-1.25.1.tar.xz 72306872 BLAKE2B 060d729380ba62677307c5346da1786e879c14c4e40f0a3288c8cb81ece08f4ac501d989495b1c3dcbfeb19a86d23130892ae874861de5684c867aef60cb07d6 SHA512 cd281c2299aa6f74f0204e59a13dc254135e6dc40641e0a437c6f5025efe517d415f0915f69e123123319a9bbddb748aec1948ed0b5eb386e028cf45b244bed8
 DIST efl-1.26.2.tar.xz 168537016 BLAKE2B b7ca59dbcd483edf31e68aae4df512a195a8239935febf8497ce039eb18696ca84e4f6d0206818c84f6e1f625abf3e730fc812304459e5615feca2c3fa07092c SHA512 d8478b6f197600c5abb7e2fcc030f8938e6726dde5e1947df4b042e6e9c77b0f31770b6b86a76ee2be52bf5354e02716bd7e5daf0771d149004d9447e432dc32
 EBUILD efl-1.25.1-r13.ebuild 8244 BLAKE2B 33ed2bf2ffc2954ff3d485c0da4580b41c8df9847b4dd95ec886f491324239de06f97b6d123b2c38d33be28031d073721b90667be88ce3bc8de8ac32b2790867 SHA512 de0a9aea7d4e66c4b4fc11f2b0951b2f3296e9b84cb4bf0df5d6c5a723b21e325b8fc5d6258b76e4504b7759208bf8e52907b51113d86b3304f8d0938a90edaf
-EBUILD efl-1.26.2.ebuild 8229 BLAKE2B 463e8595c5e09e32383f017a85eccfa1e76daef69c982b91dcb044e6be006568a1e555a2bb9293d15cb1973e0e67d045eae5feebb22ea2664e5e8dcccc9cff4a SHA512 f08bcf284fc99ea70a0e0606da15ec7eb0c6077ebadb5e209ccc43d6c1322bd74ea240d19e3b13e876f2f3c74a1481419eea70a754c10bba6458e60737a76092
+EBUILD efl-1.26.2.ebuild 8227 BLAKE2B 5aa82c221486d054cb831e2f9b4fae5a5b27906612d63d9ddbd7f05976cf6e1a91698999756d5ea46566b0f0c571f3d3d9c6be8ebab97c27bf659fea5e977518 SHA512 a70429f35861d4f7fcc3cd384a270c0572c95273e86d2a160c9873cccf02181b0d6c00c246b29d55f15f09540dea20fdd51297d60d1e06354dc89128aefdf4c6
 MISC metadata.xml 1943 BLAKE2B 192127f421b9e9216ac8b9b2b161dd99bff9ae0286e1051bd541e4102046ebd23d835d2a0745d5ec82e9ce2b56e37569b2b3e0532f7d2daa485c17eda17bebd8 SHA512 c7a8d0dcfddfa4e1b2f0fce817e9daf3f07c014eeeeb3a7cf4d43df89b35aab24872e5fad1dcf3bf00213dbbb309436a49e005d8ce94095b1810067e5b68b250
--- a/dev-libs/efl/efl-1.26.2.ebuild
+++ b/dev-libs/efl/efl-1.26.2.ebuild
@ -20,7 +20,7 @@ SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${P}.tar.xz"

 LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv x86"
 IUSE="+X avif bmp connman cpu_flags_arm_neon dds debug drm +eet efl-one elogind examples fbcon
 	+fontconfig fribidi gif gnutls glib +gstreamer harfbuzz heif hyphen ibus ico
 	jpeg2k json nls mono opengl +pdf physics pmaps postscript psd pulseaudio raw scim
--- a/dev-libs/libclc/Manifest
+++ b/dev-libs/libclc/Manifest
@ -1,11 +1,9 @@
 DIST llvmorg-13.0.0.tar.gz 147270176 BLAKE2B 628f316b580e1edf3a58d4825b724df759e6ed2a4116802470c04562caefc392fa325c91f388036365a2e45a9595cca6d3557fab12984fc8bcfef29c9116d822 SHA512 8004c05d32b9720fb3391783621690c1df9bd1e97e72cbff9192ed88a84b0acd303b61432145fa917b5b5e548c8cee29b24ef8547dcc8677adf4816e7a8a0eb2
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
-DIST llvmorg-14.0.0-rc2.tar.gz 158069989 BLAKE2B 06dcf5d82cd100bd792eadb3816cb297a11dc64dc8b699ccb2eac8ef0da4f10a24ba1984376427b638def6c8c8ae5bc9562e1cc30281fc55f044aa2a9657fc81 SHA512 c77d8c6db2ee6536f7e980465d5a3eb34403c6529e2012a4778ce76a559a6d639cf4c5ec84f965287d4b0739a73dc3e65d7deb27815d74c35e823839e579d2a3
 DIST llvmorg-14.0.0-rc4.tar.gz 158082013 BLAKE2B 0e717898d8f1ed160e525a68aba56a84b7d31856ea72fdb8fa02e863c5a2074245a38d4a4aa7d178beab1ea64aa92d0ba9dcad4373ebb03868070bf718112107 SHA512 a942848aa5042b97bab6d0d5bcee11ea2f85f1244d7eaadb8f7000bf104b2160e6034c04e3755501dd178bc99c26669cf4aca40edb4bba598fdde6bcf3f40ddc
 EBUILD libclc-13.0.0.ebuild 1431 BLAKE2B 023945ee57d09ff8763d18d0076733f929d7d0834757e9c7bcc02398512899a3c004a5c79d25f3c33418114824d03e78d904022f889cd7420eafb95a1d3543a0 SHA512 536fea5a39a795ea8984cafd271617291c6da14ebb39214a448a835e62e80fcd1ce004e69b770a22c78e1660209f76efd4fd2e6dc90b0b431b710dadb7f9824b
 EBUILD libclc-13.0.1.ebuild 1432 BLAKE2B 59269e3486b7baf86062f3734ba52750acbce0a8d93b6a925e5654f24611c2d9055306518b60a271857d9735591c102f86501b21f034135ab6afb98183a2bc45 SHA512 948fc251abdd2ade60a4b0fb57cb9c9a365c3c0082535e00c24c54c489aeb15e33735099c76054b8c71873eb0953910b12cfc883203538b8514dc34a3437e865
 EBUILD libclc-14.0.0.9999.ebuild 1443 BLAKE2B a1074740140a14cd68ee7491b4d1dc3d296accaa269a82cb4f98f8a3c49935a43a61e43bcd9c8da4435040117fdc170dd153771d5581f765f9375be98fb72ded SHA512 540a4bbfed08807ae4fda13516126d85c4fa5e0756d2143a2bd2b4c61d9c0cc538ff34a77d7147bd54ed315af9739b273d0b5f63921496bb8f99dba5b014d6a0
-EBUILD libclc-14.0.0_rc2.ebuild 1443 BLAKE2B 96d9dc2863ff6e20917576d1775b8e30d6a36dd25b35582e75d9f05d7771507d76f35ef31c75ffb95f38c30ffdb740189e84901809ffa6f8853acf700959bac4 SHA512 a0424e1b83d6af76f4e3d4d51b1c25bfe62841cbdc849fcc7841db1b9cc91c85a24efefed00d34d2c2e6bb66b93090917f8734ba00615fd8aafeb7902d4a04e4
 EBUILD libclc-14.0.0_rc4.ebuild 1443 BLAKE2B 96d9dc2863ff6e20917576d1775b8e30d6a36dd25b35582e75d9f05d7771507d76f35ef31c75ffb95f38c30ffdb740189e84901809ffa6f8853acf700959bac4 SHA512 a0424e1b83d6af76f4e3d4d51b1c25bfe62841cbdc849fcc7841db1b9cc91c85a24efefed00d34d2c2e6bb66b93090917f8734ba00615fd8aafeb7902d4a04e4
 EBUILD libclc-15.0.0.9999.ebuild 1464 BLAKE2B eb3defea1ec4f77f431b772f9fc0f8695344e4d80a0a42a9620e983bf12fe6c965380fd26bfc6b17bef66ae26893cd2d63df948dee58981492c1e4731e3fb838 SHA512 6c06c48e42969f10cff381407be3d8d1e02752529ea8dc9944fb11d97f680a687951f83900225585d8df0a37d1341c33c18f3f3a082119e8b8b9045b411040cf
 MISC metadata.xml 395 BLAKE2B fe71cab225f1879c7bfcb591a2bf96aaf7c2d454a3b83a8f4730e36c609d7064a9f0a3c9cd105eb11248a80e552a6ddddaaf69db0ec7c955356698a63042f9d9 SHA512 160750cbd7da115c3b9d070a73afac330c6841cb4a0d3102c65f4e9396c008d82431e14f66fae1c7ec83199a97d3749b662cb01d9d769ee20bd6d08666f5565c
--- a/dev-libs/libclc/libclc-14.0.0_rc2.ebuild
+++ b/dev-libs/libclc/libclc-14.0.0_rc2.ebuild
@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit cmake llvm llvm.org python-any-r1
-
-DESCRIPTION="OpenCL C library"
-HOMEPAGE="https://libclc.llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( MIT BSD )"
-SLOT="0"
-KEYWORDS=""
-IUSE_VIDEO_CARDS="video_cards_nvidia video_cards_r600 video_cards_radeonsi"
-IUSE="${IUSE_VIDEO_CARDS}"
-REQUIRED_USE="|| ( ${IUSE_VIDEO_CARDS} )"
-
-LLVM_MAX_SLOT=14
-BDEPEND="
-	|| (
-		sys-devel/clang:14
-		sys-devel/clang:13
-		sys-devel/clang:12
-		sys-devel/clang:11
-		sys-devel/clang:10
-	)
-	${PYTHON_DEPS}"
-
-LLVM_COMPONENTS=( libclc )
-llvm.org_set_globals
-
-llvm_check_deps() {
-	has_version -b "sys-devel/clang:${LLVM_SLOT}"
-}
-
-pkg_setup() {
-	# we do not need llvm_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local libclc_targets=()
-
-	use video_cards_nvidia && libclc_targets+=(
-		"nvptx--"
-		"nvptx64--"
-		"nvptx--nvidiacl"
-		"nvptx64--nvidiacl"
-	)
-	use video_cards_r600 && libclc_targets+=(
-		"r600--"
-	)
-	use video_cards_radeonsi && libclc_targets+=(
-		"amdgcn--"
-		"amdgcn-mesa-mesa3d"
-		"amdgcn--amdhsa"
-	)
-	# TODO: spirv
-	[[ ${#libclc_targets[@]} ]] || die "libclc target missing!"
-
-	libclc_targets=${libclc_targets[*]}
-	local mycmakeargs=(
-		-DLIBCLC_TARGETS_TO_BUILD="${libclc_targets// /;}"
-		-DLLVM_CONFIG="$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config"
-	)
-	cmake_src_configure
-}
--- a/dev-libs/mimalloc/Manifest
+++ b/dev-libs/mimalloc/Manifest
@ -1,7 +1,4 @@
-DIST mimalloc-2.0.3.tar.gz 917461 BLAKE2B 4b803881ab75afa358cb2dd251268c0934472074bf1983c3851a9d4f8c8ec0ea3907b52c40b0efe1cc09916cf4c5aa93f786a606e0b999536118b91bb5800310 SHA512 275a5249d09a57c9a039714fc6eef24ae778496954972419f3ac8e33f3d12e9837ba0691a3c08a4ab807c26b868aad3a5b2c28ee10ecaa60fe21ffe1d416f08f
 DIST mimalloc-2.0.5.tar.gz 1125567 BLAKE2B 9148ba4af7620eec36e1dde0f6fd2d1e3e9937bd2286ac790a727052402c3286b55387236de3a77e4405983c080bb7acae8deb3334cf9103fcf3f90250080204 SHA512 d164392ace523a3fa0aa00fc58d8a9e8fbe913f07957e19ca977675b389e6d2a2eaf4772e72cae0d87aabb960f3fd6ea3923a066ece4ba4fdaa0c6860cfa414d
-EBUILD mimalloc-2.0.3-r1.ebuild 749 BLAKE2B f581007255bc05b525bd6228261bcce96187616f2a298ea559e676e455189a7f145f84b8408f947c37829156fad1ba657b2c4154ff7877de51d7dc4bb11b5b7f SHA512 38d2743da1011d71ab7d396d3dcc76e6a7d7bc30d2b0a697cc17fc4013e3c8d3ec0ab0b655fe6fab638ef33bf1d9bfa162cfafa5d9d1bdc97b8be436476da584
 EBUILD mimalloc-2.0.5-r1.ebuild 776 BLAKE2B f969d9c42f6aaf6d1dfdd2e25033bae22e17ce1eac11b8bc542d6709b05d15e8a9c88601f8b3cbe3b3c9552ddeee5f8d0f72f2f5c6870551b5fde9c26ddd3d5b SHA512 816481dbb9515bf7f792eb9232f76d42bda9d8cc461455536973b6caf46dbd541c21e655f6756cba7df0a60d6bf95170a3f94f991c33fc73414710182c194049
 EBUILD mimalloc-2.0.5-r2.ebuild 687 BLAKE2B 5ef83444ab509531e923a058f1343bd9ddd100f3c9a47be3680abdf7e8bed60e8d2504757134699097f7b6c6606e94dc198596945cdb57f236ad9ba77beb5c4c SHA512 eb2e98d4642f151ca70bdefd6c91d1688553ee97ddce5da9c9a1e6571a474eb922c25ee20c97ed3e78abb9dc54e450d9e0a7eae5c02ffddfb5959fcc591894b5
-EBUILD mimalloc-2.0.5.ebuild 749 BLAKE2B f581007255bc05b525bd6228261bcce96187616f2a298ea559e676e455189a7f145f84b8408f947c37829156fad1ba657b2c4154ff7877de51d7dc4bb11b5b7f SHA512 38d2743da1011d71ab7d396d3dcc76e6a7d7bc30d2b0a697cc17fc4013e3c8d3ec0ab0b655fe6fab638ef33bf1d9bfa162cfafa5d9d1bdc97b8be436476da584
 MISC metadata.xml 431 BLAKE2B 6b4122d0fc6609b5ee6d4fd345727301fdf1bf0943507240002d4a574aeb84622a1be6af2f095d231c9d3da303de39485234b7136a91a2d819a5434859eeea35 SHA512 9506d3cd5946abbad9a051e8cda535d361040d015e57b3b0f73a7a144e63d88e972aa427d52373ddc96b60868ee5d21e0f74b6001332343f2f57971ee27e5ab4
--- a/dev-libs/mimalloc/mimalloc-2.0.3-r1.ebuild
+++ b/dev-libs/mimalloc/mimalloc-2.0.3-r1.ebuild
@ -1,36 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="A compact general purpose allocator with excellent performance"
-HOMEPAGE="https://github.com/microsoft/mimalloc"
-SRC_URI="https://github.com/microsoft/mimalloc/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/2"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-src_configure() {
-	local mycmakeargs=(
-		# TODO: build hardened variant?
-		#-DMI_SECURE=$(usex hardened)
-
-		-DMI_INSTALL_TOPLEVEL=ON
-		-DMI_BUILD_TESTS=$(usex test)
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	rm "${ED}/usr/$(get_libdir)/mimalloc.o" || die
-
-	find "${ED}" -name '*.a' -delete || die
-}
--- a/dev-libs/mimalloc/mimalloc-2.0.5.ebuild
+++ b/dev-libs/mimalloc/mimalloc-2.0.5.ebuild
@ -1,36 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="A compact general purpose allocator with excellent performance"
-HOMEPAGE="https://github.com/microsoft/mimalloc"
-SRC_URI="https://github.com/microsoft/mimalloc/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/2"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-src_configure() {
-	local mycmakeargs=(
-		# TODO: build hardened variant?
-		#-DMI_SECURE=$(usex hardened)
-
-		-DMI_INSTALL_TOPLEVEL=ON
-		-DMI_BUILD_TESTS=$(usex test)
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	rm "${ED}/usr/$(get_libdir)/mimalloc.o" || die
-
-	find "${ED}" -name '*.a' -delete || die
-}
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
--- a/dev-ml/llvm-ocaml/Manifest
+++ b/dev-ml/llvm-ocaml/Manifest
@ -2,14 +2,12 @@ DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45c
 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
 DIST llvmorg-13.0.0.tar.gz 147270176 BLAKE2B 628f316b580e1edf3a58d4825b724df759e6ed2a4116802470c04562caefc392fa325c91f388036365a2e45a9595cca6d3557fab12984fc8bcfef29c9116d822 SHA512 8004c05d32b9720fb3391783621690c1df9bd1e97e72cbff9192ed88a84b0acd303b61432145fa917b5b5e548c8cee29b24ef8547dcc8677adf4816e7a8a0eb2
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
-DIST llvmorg-14.0.0-rc2.tar.gz 158069989 BLAKE2B 06dcf5d82cd100bd792eadb3816cb297a11dc64dc8b699ccb2eac8ef0da4f10a24ba1984376427b638def6c8c8ae5bc9562e1cc30281fc55f044aa2a9657fc81 SHA512 c77d8c6db2ee6536f7e980465d5a3eb34403c6529e2012a4778ce76a559a6d639cf4c5ec84f965287d4b0739a73dc3e65d7deb27815d74c35e823839e579d2a3
 DIST llvmorg-14.0.0-rc4.tar.gz 158082013 BLAKE2B 0e717898d8f1ed160e525a68aba56a84b7d31856ea72fdb8fa02e863c5a2074245a38d4a4aa7d178beab1ea64aa92d0ba9dcad4373ebb03868070bf718112107 SHA512 a942848aa5042b97bab6d0d5bcee11ea2f85f1244d7eaadb8f7000bf104b2160e6034c04e3755501dd178bc99c26669cf4aca40edb4bba598fdde6bcf3f40ddc
 EBUILD llvm-ocaml-11.1.0.ebuild 3054 BLAKE2B 0498a14f644a956cf1a495c4b10687328cdd7044b4cf90e09d51c3c93c3f8e7eae29e93b605e7079975cf9b585e14e0c50c85f6b210d6516395f3278f0c2cace SHA512 28ac245ce6fb5caafec11a501e4a8e7a39bf15bad171b445f9b6faf82b8c3a4416925c42ac022bddf262332ca275de3969735b99e642df8c3b64ab3b7d04f85a
 EBUILD llvm-ocaml-12.0.1.ebuild 3060 BLAKE2B ed1223c503df5487c666642a02df41095eb724b46a79c1204f8ce2ff6b9eb650fbb46907d00e721c1ecb5df6648afdefeca6dabca456ab54656fc45871beff80 SHA512 57cdf97cf5a401a5ec33f15f8fb1c83998a7503b4ebcab1c2e35c2b35519d9b30f4b25598ddc2f8e6757f6de42a6a5878ab43e50fd45f1df0db6549a204b1680
 EBUILD llvm-ocaml-13.0.0.ebuild 2596 BLAKE2B 4d22e0d0f89b14f338f0dde0701819d5d94f4c298bf024b06c4d13601f6a61e1ecfd7e7db50c8ab1f7c34e0bb9bbed26c5e61e2ddac80bd6766cf1b163f3626a SHA512 aaba7713d7acaff78ab9949765bd2e095bdf7c32a006653967f9a031113b3c3911b01e55c460f67e38da3574bd2dc8d81026a55cad2aea775363287e01b72684
 EBUILD llvm-ocaml-13.0.1.ebuild 2596 BLAKE2B 4125904f29738c9d1df5dda7737d2edb1e68512f66b561d4ab4b24ebaa457da1a13ab830ab911b5016e05cb48696aff0f6cd1753615e33e8b06f5b086deb020f SHA512 7b80a864207d4c0ef50725a5e9e64c6ff0956b4dfd3f6c55f4363f44703a7113205a39a53624e288562b08ca3191bd11cd7615ecb53395e07777ae7161a173c4
 EBUILD llvm-ocaml-14.0.0.9999.ebuild 2598 BLAKE2B ece82974470a98526e86f37905d839403c05f53e9674bb5e5a6143389f26330ac2521765d34d90ca0e3e1ca3cfca94298dc17e2381fa43c7ae7b6c0ecaf4536e SHA512 d2386f680a121db6c6b4776a90a70aa8c4efe28cd3587fb1b2ed97506ad981d87ceb3aa998a486303b4d81a613ed86dd2eea787cb7250e233e5cce3990180064
-EBUILD llvm-ocaml-14.0.0_rc2.ebuild 2598 BLAKE2B ece82974470a98526e86f37905d839403c05f53e9674bb5e5a6143389f26330ac2521765d34d90ca0e3e1ca3cfca94298dc17e2381fa43c7ae7b6c0ecaf4536e SHA512 d2386f680a121db6c6b4776a90a70aa8c4efe28cd3587fb1b2ed97506ad981d87ceb3aa998a486303b4d81a613ed86dd2eea787cb7250e233e5cce3990180064
 EBUILD llvm-ocaml-14.0.0_rc4.ebuild 2598 BLAKE2B ece82974470a98526e86f37905d839403c05f53e9674bb5e5a6143389f26330ac2521765d34d90ca0e3e1ca3cfca94298dc17e2381fa43c7ae7b6c0ecaf4536e SHA512 d2386f680a121db6c6b4776a90a70aa8c4efe28cd3587fb1b2ed97506ad981d87ceb3aa998a486303b4d81a613ed86dd2eea787cb7250e233e5cce3990180064
 EBUILD llvm-ocaml-15.0.0.9999.ebuild 2598 BLAKE2B ece82974470a98526e86f37905d839403c05f53e9674bb5e5a6143389f26330ac2521765d34d90ca0e3e1ca3cfca94298dc17e2381fa43c7ae7b6c0ecaf4536e SHA512 d2386f680a121db6c6b4776a90a70aa8c4efe28cd3587fb1b2ed97506ad981d87ceb3aa998a486303b4d81a613ed86dd2eea787cb7250e233e5cce3990180064
 MISC metadata.xml 217 BLAKE2B 23799663344acc2d532fc6fa7dd798813aef7293fcab616d6300b15a6e603b6d17ca63d5153eb8da1b976215d8e3775e8d3a67026bacc9693993d48ec1cb69a9 SHA512 e13d0436d3a3a449723277a37ae4c5a673139b6da818adf7ad7654d94d3948ed8607b1c27e83e963bf450bd2d5a650c985e27ff5a531db9813cb4ab10b985dd6
--- a/dev-ml/llvm-ocaml/llvm-ocaml-14.0.0_rc2.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-14.0.0_rc2.ebuild
@ -1,112 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit cmake llvm llvm.org python-any-r1
-
-DESCRIPTION="OCaml bindings for LLVM"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0/${PV}"
-KEYWORDS=""
-IUSE="debug test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-lang/ocaml-4.00.0:0=
-	dev-ml/ocaml-ctypes:=
-	~sys-devel/llvm-${PV}:=[debug?]
-	!sys-devel/llvm[ocaml(-)]"
-
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-lang/perl
-	dev-ml/findlib
-	>=dev-util/cmake-3.16
-	test? ( dev-ml/ounit2 )
-	${PYTHON_DEPS}"
-
-LLVM_COMPONENTS=( llvm cmake third-party )
-LLVM_USE_TARGETS=llvm
-llvm.org_set_globals
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-
-		-DBUILD_SHARED_LIBS=OFF
-		-DLLVM_BUILD_LLVM_DYLIB=ON
-		-DLLVM_LINK_LLVM_DYLIB=ON
-		-DLLVM_OCAML_OUT_OF_TREE=ON
-
-		# cheap hack: LLVM combines both anyway, and the only difference
-		# is that the former list is explicitly verified at cmake time
-		-DLLVM_TARGETS_TO_BUILD=""
-		-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
-		-DLLVM_BUILD_TESTS=$(usex test)
-
-		# disable various irrelevant deps and settings
-		-DLLVM_ENABLE_FFI=OFF
-		-DLLVM_ENABLE_TERMINFO=OFF
-		-DHAVE_HISTEDIT_H=NO
-		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
-		-DLLVM_ENABLE_EH=ON
-		-DLLVM_ENABLE_RTTI=ON
-
-		-DLLVM_HOST_TRIPLE="${CHOST}"
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-
-		# disable go bindings
-		-DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
-
-		# TODO: ocamldoc
-	)
-
-	use test && mycmakeargs+=(
-		-DLLVM_LIT_ARGS="$(get_lit_flags)"
-	)
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	# also: custom rules for OCaml do not work for CPPFLAGS
-	use debug || local -x CFLAGS="${CFLAGS} -DNDEBUG"
-	cmake_src_configure
-
-	local llvm_libdir=$(llvm-config --libdir)
-	# an ugly hack; TODO: figure out a way to pass -L to ocaml...
-	cd "${BUILD_DIR}/${libdir}" || die
-	ln -s "${llvm_libdir}"/*.so . || die
-
-	if use test; then
-		local llvm_bindir=$(llvm-config --bindir)
-		# Force using system-installed tools.
-		sed -i -e "/llvm_tools_dir/s@\".*\"@\"${llvm_bindir}\"@" \
-			"${BUILD_DIR}"/test/lit.site.cfg.py || die
-	fi
-}
-
-src_compile() {
-	cmake_build ocaml_all
-}
-
-src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-llvm-bindings-ocaml
-}
-
-src_install() {
-	DESTDIR="${D}" \
-	cmake -P "${BUILD_DIR}"/bindings/ocaml/cmake_install.cmake || die
-
-	dodoc bindings/ocaml/README.txt
-}
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
--- a/dev-python/adblock/Manifest
+++ b/dev-python/adblock/Manifest
@ -1,65 +1,44 @@
-DIST adblock-0.3.13.crate 7691310 BLAKE2B 0d9958235c123ff09256f6512c04474c4dee10c855b7161e32f3dae517959bb16815adbc22787648a1441e04a0ae94b89369c6bf9e3c61715638a4c452676a1f SHA512 f534c49d60118e170f674415a20075f15a7e45187d9461a0025acaf3fb9a94388ed7f99d15484a0354d8953798dd8ae720ca77f6faa59551e9d99d937a3bdbb4
 DIST adblock-0.4.3.crate 7700164 BLAKE2B 836e8b60366c0bb23702883a8d9aef7eaa54dff6996ebb6a82f39880d93edb23f93e23299085a1756bb22115633f4534cd7ba0379e1dcb1ff6b1880d3e5576f4 SHA512 3fe7e139a6376ab2becfef7db9f54c850442dcbb44a61e2a116a1be6a59ab214659293f513f3c6daf7855d677b761f19ce99cf3be444d8f03c1dae90aa915f98
-DIST adblock-0.5.1.tar.gz 22899 BLAKE2B e669798103c6a4cb808eed1ab96efac2a6ccb62cd32ea6856d4b8613983f203a58864f8d9eb996ec9ab0a4c1a4fe1e719d22071610e0f3315f8d921786b45a88 SHA512 c4137cc6b2ec439c7b7d8c2d039a75d62c988c8154f0334a1e75784633afc84886ac8228843fcc293be4b37bc9a8d9973a845e692a3ff18058f903717bcca3fd
 DIST adblock-0.5.2.tar.gz 24574 BLAKE2B 84efcd6c6bc60030aee76eaa80acf67640d97ec1b386dc18aaf92c79b8ff60b35f545b4cf8980a1ab55f558939541f31dc8889073f1b3fd68d90ba6221a1f284 SHA512 f69bbde5a510882cd71454153ed12f0697517e030f9fb6774c5b166daf0db9f754a965085fc5e612c7dd3d093a31e22c1a9c064b167429d2aae4e93e3ca7bf7e
 DIST addr-0.14.0.crate 90210 BLAKE2B a0dcb422d853b76187542aaa2880aafade57716130a38172a91fd4d3d0c51d9e7f2b23eec5af84b188b8b661c48f46fab25797489a3bd5c84e0732b326178877 SHA512 18d6cecbbeb2ea11f2b4f40356d8a2de5aad45e57ac5f13dc9cd98cff4250b7612aadfb73935775c657e728ca10bc8313e601354f239a96e63ef90a8d2f6b870
 DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1
 DIST aho-corasick-0.7.18.crate 112923 BLAKE2B 4f6947d1aacf89ccfab0592cdc55fa61ef09cea38231d3f758765dbce328a810c0b588be4ba96e81d64955379ee005722d22a7aec39caea6e72342245d7ca34f SHA512 7a23b16231a90d23ee60ad4c81bc225410599a4560d33d3a203138fc540c39cf1000100fed3aed40dcc371c3635656a3792545dca5dd1aefbde00d8774eebd00
-DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
 DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
 DIST base64-0.13.0.crate 62070 BLAKE2B b957f65cdb1e28baeca0cefc92fa98be797409b7dabd15e0e88db6cdfb89779b662cba9f2270fbf3b7b66948fdc46c118b8040a78ab72049c48a928fa802bee0 SHA512 991a72999839daa232f508c5b24e7d3225e8a26db8d1d0e747881b115af9e408b92374e163b31e0b0d324c1c2e57e8e38d66861b61eb0a1dba87bb5871940151
-DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
 DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
 DIST byteorder-1.4.3.crate 22512 BLAKE2B d39c546ba7346df315297fc53da4bfc77ecb1f38567ddb788549ee31cae2719a8bc0b7d1f1705abb3cff033aa57af004987d90748f5a31765273b3223a011c0d SHA512 8c8000eb8ecf40351c9ce36a3a8acd7a02f81786d1b11aab85adfeffa0f2267ed74df29b2ca5d1d38128484d1d3cad2b673aa0d0441dcd0620dfd3934bb888fa
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
-DIST crc32fast-1.2.1.crate 38172 BLAKE2B 80801a345f4c5ed8a5fd335bbf672eac1733a1c2b333dc8a8e0254338148ce7b34402201a8d2d7434dd1b057f33d99d3a8f02610ea50b54115d80bb8da28b2b0 SHA512 4c04236bb15a5c63b712c62652777917e947823abb20a0d0b372c850ec1c8695faa414e8de73904f1f1a296d7b00a6206cde8da404cf4cdaa2e8408e64b62b5e
 DIST crc32fast-1.3.2.crate 38661 BLAKE2B ce3762b03d24d5367d89738991c060f4b3af7840e0a7ac7fc17d01ed438caf964bbaefad0fc4d0c438dafa5a578429ddd353c71197f8b54b1ec441395f2f7ee0 SHA512 a683943e252afdb1b9d626a07533ed11cf7a63af603c19640056c5d2b9c884ad9aff33ac54c0853ffca2f6cf94b0730eae6c05abf3e53e55e709d180c8152357
 DIST either-1.6.1.crate 13641 BLAKE2B e5f40c40a5edb6dcb07a10bf79183cbe42438f1f70f3932dce72f6f6e91f75f24d17d82bc447507def4dad4345ffc9dd9162dde778afb253bdb1218e91887949 SHA512 4bfe56920e30cbc8eb4f90162db618f7dca653b42db35ab6a7045d3fd9a24ceb1778b1f79613850bdb1a87ad3794fa0d73015e46c48d513f368d8c3776fc9ddf
-DIST flate2-1.0.20.crate 74036 BLAKE2B c5a1270debdb42f8612c0db9b684d339dfb668dfa3b06f6dcef94b43c115daee99c3558562d605da5ba1a554930030083baa8128036e9999d47907f29687ee0e SHA512 1415cba53183b7ae0f3396859186b92001060a78fbee10dd0dd4c8a93119aeb78bd8d782735c292badc1ae6d369badc6fa1a0105835614a6f70e82b080d8549b
 DIST flate2-1.0.22.crate 76026 BLAKE2B a6b7630a31a4d3768540662380f6eb1ae162174947ed76ea8781021467547bbf8733642996e391453d3f074f2101d15ce65f5995cd07834351abd8c3b759df5f SHA512 c76fa3b097774f1da884b969285bb3aa7fac489446845c93dec1afe6b94bfa11f708e6718d5e4460022b9398a698378a210c3b25e9e676d2bde9d5be1a63261f
 DIST form_urlencoded-1.0.1.crate 8773 BLAKE2B e2d2224dbd85d053343aea29ef1bd540fb8be12fd600289e9c048e3b74bfb009d0770f8296556309ef756086f22feec4713dfed1006e1101075c8897be5471cc SHA512 3ab371c223561a27ffbd35cf648ef4a9145d47bba9d71900a7c54cfc2f089175e9361f6352331a9a7fa018923b15e7a3553c8f9ff9fae80e1626e641a5faff68
-DIST idna-0.2.2.crate 271070 BLAKE2B 3a07d53ea832d53a2e99ed3345d748b6299f6b4e6d4c33de17fd5ed70b9a46727272c9facf1bbb79e2981a4ad1953cabeb53d71cefcdc2a1e9e9f57c4a9f0d22 SHA512 71be89a626b087ca3a33576857799c15634263e2bbe43290750eaa6b074088cb6b54b3f778930e3dcc796a883daf662c0935178d4f096c751027bbe727124212
 DIST idna-0.2.3.crate 271023 BLAKE2B 157ece18825fd3f8055581ccbd14191a6923da4c806ce51b3d6376682878db000a1b873f744c8e9e1966e4c1f8393643bcb603deae299ed0bd87847b0bd2c591 SHA512 1278bd561ce329e1dc7a6f24a10f83d9a068af5d15a088414f3921c6728b0d54f4d60d6f4d0d5a786596ad226263e1e50c3842f192d5758aa4665ba4ed5c269f
 DIST indoc-0.3.6.crate 9663 BLAKE2B ca7a1f4d3cbedbee0ba0a3f19c4b3352ff90927eef744b7e4f1d60855d4dc4265202972e81e0fc06d1222d8d5fb322efc4ef669af7396b251248a1e45c91def2 SHA512 e900aa3b001df0fdbf1f543d8b679af317e85a1f95e26fc556213f2826a4f6c82d8c4f3f82de435e3591f8bc14e78eb22668d901dcbe2287f46740e0291afacd
 DIST indoc-impl-0.3.6.crate 7933 BLAKE2B 93e232e360e8f02943ef9a9cabf16bc863d792d8096b8d9a13a07f0b7b396db590abf83b5444f082317059dad7578ffae974dbc8a7e56fbdbab817b7d2534725 SHA512 18406587ee56a09dd2062cee456af697efa903343de42c0ff618a64ddf2bf7efed5da02e7220fed2636c555a6ae18059018f5c3c9b44ba8d3e5a34ea5b53c806
 DIST instant-0.1.12.crate 6128 BLAKE2B 728923f757c1ee4e4a7afb90e460eed81392068961240a538e5c6468e15a0b6491f590fb5f6cc46e6d78901ca232351f65abb9f2f230d8f4983c5e58c4011902 SHA512 fae494c00111c51c840f9dd6a10febe403e27ebb933dd16633a213e9c20f2bc11adeb431c71f8a6713bf88f270a010941e15d83df294e658791934f83a5d2407
-DIST instant-0.1.9.crate 5213 BLAKE2B fe208faa09852079c603930e88b7d0392a89a55d3b934ad45ffb0c9e44df5ef7e8189ba2fa12452f1c8a6416d6f7c0655365ba959bedf2b78228613944be8278 SHA512 3915f67c3629ec93296d56c4cda0cf97b29b1a70930a9d546abb9518139d4c2f35062563a5094e84841ddb1f00b0f3df9dc00801d96c01994765221edf03ef7c
 DIST itertools-0.10.3.crate 118661 BLAKE2B 0095d6e7f14ddda69605d09f74e8cc881eec1a1d234f705e667d7f9e738ef157b7ddee066855cbcad7f134bf79b99a4a4c77bff3371397a567cd34d98b68bf97 SHA512 9d17357eb68159edf4f4ccd2eb9895672c7fb633803166d5e24ee12350639eaf66f1c822910518185cd1f1ca5d9c3e228dd37525e6c337ba3fc7ce967f9bfc85
-DIST itertools-0.9.0.crate 96429 BLAKE2B 36d3b1dec7ece85639337f1a40a00330a5216ea8c460d13e52f0f9fea71bed5b3914cc4a7e05b407ed41e0dbc2292ae5873b3481297edcd92ec547866d044b8c SHA512 1c6650060750f3073140c4a77fc4d1acffa7d18320012807df0e20ab06ddb39afa7f086d89626e3909f89dc1f0408c9ccee4dd9454ca1f7a6a145bb213e7c5ce
 DIST libc-0.2.118.crate 575669 BLAKE2B 4fd78839fa3ab2050e772c3868d6ae2cc72c60f422c1aaa21fb079b4b0d62763b51298ac97bcb5d4f298e7ab8ebcfc8ecf32de8cfa7ede73f46c809dd1dedb83 SHA512 ec7cea3be1bebc7a4317dc892c14e4ee857529debe1572f6d57ed3536298483e4225b57dabc05a048541ddfc3162e54a111998ae78bed6befc09368ca097422d
-DIST libc-0.2.93.crate 510944 BLAKE2B 93ca2d32f5c1a1cb00ac75601dc3550de058e6d66c14309eed4c98a56be97aab6512d6b8b7574fdbf5a453f1400c9120eeb12e4f90970819f5c19ee544a975f5 SHA512 e82bd56c282b7473de50ec730646ae64384661e533f78b19bdd737d7a637cc93ca6f4e0b576d901576413a48d274635b917ec4b0c5144b5196155b04015ca94e
-DIST lock_api-0.4.3.crate 20351 BLAKE2B ffec5616daf545ed4d2ed7cd21fa6340b1892b76702a089474b58320b6379767efd249088f8638e087100a09e4610de7652b718b60c992c64a287c2ebc73b3b4 SHA512 4dda8d993138efe0ffc94206c576e52a879a6cc4e90ffc98caabdfe720649a34c0fda206c4a7b6cc3a99140e619de1da05864218cff6f702e5540165d30573c5
 DIST lock_api-0.4.6.crate 25215 BLAKE2B af1d28010f7c340dc0857afbaf8acd2396228cabca26e52f79526cc4eafb072c2aee8987bdd9ace4ba87c272f6fc816fc6f62a69e4d7e66a5c6e91ae3e824ede SHA512 ba14d341564eba91bb5ec58bb2e0d6c87e70b3694c4609396f0c0f4afc0c6c105a88cb99c303b1e9761b0fc6cae56f79ba6a7663b063454ab1ede4d49274906d
-DIST matches-0.1.8.crate 2216 BLAKE2B f18176110921b1cf6e58d52d12f1d1a3455ce2dc04421fbf1b392f66cdd81a88e924571fa27e307a06301d83b04f3b8a0ca3ae40d2da6f2decb8aac4e2801fbb SHA512 98b58f6a2694b03a7dd1be69ebf7e3ad14483fc8e4cb6e6c26a4937e4e660e843efb4dd04a7312dd9659ca02acd3775678f73b8faac44a76ffafaf873c22f590
 DIST matches-0.1.9.crate 2246 BLAKE2B de155202636c6a03ed68cdb21e8ef96e19b45be040a82943d2d7e5192c0ab5c253ab6d65f0b30b2689e21da79cba684af5be6e63c48266681aceba356f6eea41 SHA512 6a2809687d30ff04ea97bf9d1610d746e097699a4c3625ffd1b7b1e4a9673ece9d559058c9f760b99d6ab509024f7b338e7cfa6fe767499c983efa98bfb98305
-DIST memchr-2.4.0.crate 63392 BLAKE2B a3f30546c3b58ff4eba534bd7046446e96ad793718edfd3379bd125c47eb270728c4aed4aed1c6afa27032f74078b2b2ddddd5cc6044e117e2b956bb13f902a6 SHA512 b142e308a5aef8e45910411789031e194349ee540c4ced0e2384d864dc1913299fb63a161ceb5228256e97d0949661b7f83a169ef9d4b78afbd9004cb7b8a2fb
 DIST memchr-2.4.1.crate 64977 BLAKE2B 31479718c118093b684bed946eae0706d77d9d275bd49f5aeff4de490f479abd60c7dc462150eafffc6d6fc1da0853123b78be038826b775d2a41a4c39d93ab5 SHA512 d8912e3902a2126f86159bdc998532a2890b882cbb7d59b5a470fffcad4c32281e045f2fff48a235aa4189f1928866bf3d33b699d50866ad6b6c272bba7adb11
 DIST miniz_oxide-0.4.4.crate 49938 BLAKE2B 3403416bf9d10b67ef976eb23be64216027c67c56225efd08c87f8269017cb5174ae64f35d18acb66c7a1b831347791cee5af565f3ddfb31ae4210221604b0c4 SHA512 2c6e484a8a53c6b1fb84e2bf9518919e6e5ba84e7716c0bb8e33b53dc0d3432c35f28f19c18368e27c94f6df66b7674f514ef889cf1b19f546bedfb6e6ebaf6f
 DIST num-traits-0.2.14.crate 45476 BLAKE2B ae310d9d5640acc3e45e1e5d1d2f519539795922c0058ee940c94c94b6654b39358b7c18dd23a276f2c1b16a30dd4de4cbc8575bcda6a5c11e70665d670e6439 SHA512 c3028eca9f7b718de0db3a36cf3e462bdba43562d52c9b809ed4cc0aa6af403aea542d6d4da743cd1dd541397815a3c5a84cef4d6e40122994e4be6a62319b2e
-DIST once_cell-1.8.0.crate 28925 BLAKE2B 7681b1a7497b5711e663773c1a7e076f333c06c10d3f289079a781c36f050c1620cc279742ea8e5b15ec48f3d6038a6079bbda7fee3ae8e1128bd916d53ed43a SHA512 88e55c9433225ce85a08353168c87fca2237615482160a5c28f3ac17f06d48c63e0c21b5f7ef81f82ca133436e371802ea099453844f1c111003bcb6ba89e827
 DIST once_cell-1.9.0.crate 30702 BLAKE2B 3d492e64db120d8a23c08490a34d376a006e46b28bb5f0f44c3a955896e6e597c67ced35daeb4ccc7f7748f142d3bf2cb1d81ee61a99dc6526c48730c86a2fdc SHA512 cfdb6aa4bcc0f50d4c37eb69867d2deefa70323a7b607e55180b7d417b7188c4f2889417fd04fc51671c65eac75c7d9e7eda06a87dedb846056def66d14eaa46
-DIST parking_lot-0.11.1.crate 39854 BLAKE2B 5a097d7016811de4ca7d21e8a811a96b2e857b5224b176cf7a3bc160c0a0678c9100423e3c096c5056e2df3a4dcba17a590cc64eb1d648355c153c5cdf9db228 SHA512 17e394ac8b62656177a12fcfd246d9bb59be468a5ac174e4d6d8b4ffd0411497d3ce943ca5deab184cebf5c1bbca97b4273f79bf210c78d7f4b6f5e9d68026a2
 DIST parking_lot-0.11.2.crate 39869 BLAKE2B 67c555e87b68f5763a7790563fd8d542e126bcb77f91267f3b76c51fd73060a2c32dcb91f9d0db7ea772e555d91576c8d7ff48053a9c35fbd3b749d2459a660c SHA512 526b176363dffa59501c18324bb723a3846ef5b0ff9bf1d890e40ad10e7023284f7c8012eda87520eaa94515ee828d9ef52692a9ed590a55e176383d6d472f9e
-DIST parking_lot_core-0.8.3.crate 32147 BLAKE2B 5218cfbff706c4388fef31c885c7a5d53566005775a3c440c6a2890efb189a4edfe8e99f6499cac36038846628a915ac988c15e1ebab1b3a3ffb53a64631dc19 SHA512 1dba5a7e68ee007918fb210ff308f7382ed1c54d2fe6db36a8246453434246b71e6795db107c83ca39c2bddf5e4a27da7978a464b53d41e150e744d81e75b341
 DIST parking_lot_core-0.8.5.crate 32466 BLAKE2B 44d9cb65444ea93fded7e216e3bdbe2256ba1611f5cb6f80d67a01e71d428b81e6c7fc73cb928e2125f34bac0abf4d1da39f622e813dff89b01fed7632308b7e SHA512 c4315df551748d1ae77655e4d9f8c90f911498856e5358009e9e02e410bb8085f006f369188b0753a298371ebd74a5c383d848b65e31b55f3462381308c83a00
 DIST paste-0.1.18.crate 12259 BLAKE2B ed72b93a27166b0989743c2528d4a41f4b87ffdd0c588557d11a5f37f85d5b8f03ced86150af6209f9fa8d0f6efee705769b26a2f4dc3363f35cc3ac12c0e6ad SHA512 a4d9c75f6f358d6c86eb0a66cdf22eedec180db37358ca2870a992e215d5b389b7991837d8f2769742ac1b093674cb4352ef9d6754a249253472fbcb3a81c001
 DIST paste-impl-0.1.18.crate 9451 BLAKE2B e465c4c7eef44d02eb1b61b5290090513607b452f4adc11487947b7047ddc44905d7a02df827feb2142f0e74583afdd9648c1c66086f10e1bd861b663200bf8c SHA512 c635efee46cb251b76ee9427432f81a0d944cdf1d0a95693d824c6085e7dea7e1e3f48c692ae27946f69e4e78d8080220058acf98e5c8a78482007349f8a7a4b
 DIST percent-encoding-2.1.0.crate 9748 BLAKE2B f3ff35ac683724b15e40c85e0fb8ececb07b61beeea82b7020f02d27df05a8a3535f157b3cd688533e414d6541de7de8640ef4756706d8061af0fec94ba04ab3 SHA512 98af4dfa7c6a3cf0d5aa929c436f9eb1ba1b576a944513f1284e6df2ad06be7cab9eba145d888d50af88f8c970bacc702b323041bec6d4fa1dc34095186c628a
 DIST proc-macro-hack-0.5.19.crate 15556 BLAKE2B 98c22fc3e5f5fa8b6f44d15de42b6ffcc82ba3f98a07ffa48bcbc5d3abcfca6af136c5d0d8c7f1ca34261ed8f8c9c17a394231f97a4c342c81aa7f8b9e74b203 SHA512 9e4cbec41056438287f5b23086264c86e2f0cdc193064006556736377b2954229de13a585149b9995002c9aee3334ee2a80ae4afdcc96cabe7ed2bf718476952
-DIST proc-macro2-1.0.26.crate 38233 BLAKE2B e44a5d98fbf75130c0eeb8fad6d025ce66fe41cc5ef882f418bd8c9e5d228d712020e309dad68e2f862e5f9216a1103fd6e69953e17c213166467b335f604802 SHA512 e6d39cc0d5ec644e3fb424347bde0a82a8ce8549745a1a827bf4dc21f6248471935b5499c3b6d1b7a129f0ddc560754254c528ac39fb1fce2ec3bd9520afc3e2
 DIST proc-macro2-1.0.36.crate 41411 BLAKE2B d7d99aed41080b65680736d92dd027e21c9e9e0b03601915c000f5dea8f2b2d9126b116af32f2fb04b4fa407775f0131423055d0b62fdbfe87fa4ba7ec098beb SHA512 f31b0f2356af2746321c4f808ac9af87d21a5657c103ed6bc1383855e40caf49246cc8ec1edff58eacf193424abfc2163148b7298e527714e65e602f14b2e50a
-DIST psl-2.0.18.crate 182781 BLAKE2B 514b0a0b14ed8c342f7424b63fe10d7b0cd6fa0636b2954f898f1c915633b813d509c2e9ceb6dc7e5148787d7497dca6ed877f3b981ada35967b9abca5e3461b SHA512 b3c621f9aa823f3b5b7b4927a834f1b35093797c973d1a6eca1b1d9fa4bcd5b16885687d20f924a4c538f6681ba6c03d2461d47b77849b05fbb69e19e8b46865
 DIST psl-2.0.71.crate 185202 BLAKE2B eafd3ea188b198c5a3ee958ef7173cc26ffa6731fbe70d3b6eb1fcbec9feb413d9c050e6d4fae275f7f62a7e99e52eb72575b0f553e2c2f66aa1ad3bf96bd32f SHA512 90426d7b91a0d1fe16344a68dc5ffacc02b4b92a4cada0300628314f61242a0866e072ed3df3092236f0cc358f5b7d38810e3310450591432160dea1f75411fb
 DIST psl-types-2.0.10.crate 7929 BLAKE2B f93b5169c2c4c4d94d686f4e3d5efb1f8a59f7806618c829cd31e25257a2e3c34584ccc6781a36c081a62a8ebe45392b0795eab85640cc0512efd721f83e5563 SHA512 3ee7c50829d2468677896936f899c521b4acd5f78a8ed90b0e50b8245bcb6bfeec4838529654c443201e6ddc84cfc8dcdd767abd50fa7c3470a6595e5f3e5939
-DIST psl-types-2.0.7.crate 3423 BLAKE2B 2e5cf2d7bf395ca990390c3d35cd15596240e6850732657324dfcbb1518502f6cd168bf76138103d861ccd79f2766fd65883980c0958e186e7d0e1e7fff3671b SHA512 ce10e5afff09996c29a8ced4be2e2c30bf549390c578fd9112490485710e1c406d84165394cf4ef2e412923db88dc5c08111b91e72b813fca757e7e43c6adcc3
 DIST pyo3-0.15.1.crate 370722 BLAKE2B b755c93d8dca8e778b886ed1d16e83ddca483d0f6c932b3241edb2e1211306cb0257d2a6bc31ba4298335f277898e59aad67e9f675ed4ad9a2bb9d596400bda3 SHA512 9168911db76f2c9629615c997accfc4234bf91cc72293dcdb3db14b4e93f93af9df3b3aa7900384121719aeda4a0b6dd68c0cb380bfe5424724b0be5303c02e6
 DIST pyo3-build-config-0.15.1.crate 22095 BLAKE2B 47803b389f30f15f487daf96d32e374ebc83b1b41ddee1d2dcadd1a0fbaef40c4c1af2312b86ec085637e3192b1bd213c93b5f4e8dee173d81e510f480fa6953 SHA512 a9aae6bb4a4a56f7857262276bf1c95510912a367e32470b871f2fe2d6adbffd87247ed2e3b5fa2dfd273a3b0e139d92f25f3228e15c6d8c206c6ba919f38a9c
 DIST pyo3-macros-0.15.1.crate 7555 BLAKE2B c7d87c150678efbb5dd6ef98da9997676ef3e7f8628a79f01a3ecbf94cc8b2d0752573d894fd769fb8791f30bcfd03a5c9f76cce73c00be90c1488faed63198d SHA512 1969b5ec6dd26ff2d534fe43143e44b91b66e05c61281b64f96fda47ff7826f625c658412d7587520df7455a67cd970a9aa49c7544ffb70a425314a0cff65060
 DIST pyo3-macros-backend-0.15.1.crate 46111 BLAKE2B fabde516114a001e7f9ec1a1f422c5819ad5bceb4db36ecf2ef5dfde397d4d3c7dc7a8acf11cafde4156594e90a4f95d51dbefa43ee8bc172441d3f81eb299b2 SHA512 6c62fd1bc50666f63f9854947e9d88ae385159d90d026e0179d91aa151fef8403b23f55eab6f3340b1455b23d411083780c49198afacc267b49a52ee9c4999a4
 DIST quote-1.0.15.crate 27281 BLAKE2B 5612633415d30e26e646a968ab7a64ecdc978b02efdbd40dfecf5afa489c21bbc6a9c93ecce2a2b45519db6be3384bb372cfc9f597846e8399f7c2b57e8b34e1 SHA512 76403bfac4e9a018b29ddf8f911135206d4fdc266db38a95cc92f6159a8b436d39d64c4ae6c3fd16ad83117270ed329b6a151d589cab46c75443c57b533dfaeb
-DIST quote-1.0.9.crate 25042 BLAKE2B 26ef31e89fd2f0cc21ff65f8072f30c7977ac634d2536cf9845a0894d6659f62a96cd0a6ee48f7706036c2c1b898ef8c9167bd62714ad0c9cba4fb02f30922af SHA512 dd6cdaea183b85400531ef01e56657edbec0d8f7c27898c1e591b72dff755fa5875b33ca320bd65be0e9aecfc6a61ec119a4bd1291e9f2057fca642ab5b198c8
 DIST redox_syscall-0.2.10.crate 23582 BLAKE2B 7253dd96415e7b70df488c208d86c250c670b1245ac6573a59085faabbde9e33fabfacd233e7d737e365493db14008c180274b41ea0a4af5f6f98eec666a873f SHA512 ef012eb4bffe32119e50ecdbef4cc31f6e84a344e94f026484fe4e2c904f94053a8b6249fb6bd8ada31b3ecfbf0096085283bb68aeb62b1b01b57f35794aee92
-DIST redox_syscall-0.2.5.crate 23449 BLAKE2B 2d676dfe40f62285463a25f90ecf24ddb8548f91db1dffd779aaf9c1210bf1eb9c7c535b0d04ac7a483e0724d24ac1d1ed6c78884ad2631a53a870488b7578bc SHA512 f1625eaba110129942893e4cae548d22b6892d275124d29540c947d958e5bb7231309fe052cf15bddb23e0e8f0cdaadd002db5bdc3be578e843c46c175526adc
 DIST regex-1.5.4.crate 236581 BLAKE2B 6efaf69d1a99dc3a2e04b2d1a96b036f631e9a0ad0d3aa57263febd47f7ec12765526f06f9c52a5497bf0d9b455f1d1b39e011adc4c28530c44b65c8a453efc0 SHA512 1a9208358c4ab87c19ec91bcf5c1e35dede46f3a0c0097061b7b53fa77a1e5ad38090d243aab274956f09c491e5fbe3b3b35a91db079b82a2dde2fd9fbad4c19
 DIST regex-syntax-0.6.25.crate 293293 BLAKE2B d5ca0dbc26b03c6a1818026f9a69cd226ec934e7c64094d0ebe843052b648617ffae7aa3a074f8da46d03c46996d8b547d8916576342000bd9711089b3e57d73 SHA512 a3d31f82aadc6be1796f76c03152ff24f37fe42d6ce27fb98e2f55ab102f86502bc37ccd563f6e0eba61aab20d002184c618517b678b3b93cb8f0497cc046ca5
 DIST rmp-0.8.10.crate 23541 BLAKE2B f51f12ac191a8cbb4377956bb15d774e464b94fde7abc3f008fd2b6be10ad027ef3a95e854c6461e393b3e1b4c42e43b3a594e9d05283782af8e0893c1d4d629 SHA512 54739648c57e5fd917c60e1f692f5a0e357a95e9b7b1cab08af99f5ac1000b53427a646b6ef019f1e3cbb3861218acf0e8e300133ede4426107045a0abacd87a
@ -67,32 +46,21 @@ DIST rmp-serde-0.13.7.crate 16676 BLAKE2B d30ee72fa0a1b897c4866ab53e39d673bed182
 DIST rmp-serde-0.15.5.crate 28657 BLAKE2B bf2db6d713e8c105b337c06b97c5ba607d509fd0de1356c7b711eff47b77f5e5246a8d2b6c876f8db4baa9c0f308cbb5b447a2a5327734711701b9d8ea6f13e5 SHA512 d546e170452eb58fd684cd0b4c150b99005a39611f40cf2b6f2919822246d36206e94808569ff8249f14e50f17989b885ef6016477bab9d16be5a18a0c8428fa
 DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
 DIST seahash-3.0.7.crate 28697 BLAKE2B 59d83fd8f83e3c369bc5532e55dd35c93d867fe41e2b0dab6b1aafb46be5c605b1f531127cb766959c9f1b24d138201471e7bc071ea5c14db3d3bdef05e6b1c5 SHA512 03e78c8669c2a20c223772f63df943b173598d8f4714a7bc399c97bd3ec091eda1b5f12dd11f821f45e5178927a4f7621911dc228f5ab5f52f28f9eed12d13c0
-DIST serde-1.0.125.crate 75144 BLAKE2B 0823f4cec3704ce5232c266fcb69323dbcd93d2d15712abcc8cc61a2d123d662ae8153a32b3723324ea55a40f2b9101ed654cced45c500fcf399b9d7ccc113b8 SHA512 ed2819d678e7405e2d8a0cc1b43540abf2ad8871eeda4985af5e37016a42b938d7429c4e865cec2ae5364cc7fbe1052a5a46ea51b42c3ed5b9c7c1acb596ac3b
 DIST serde-1.0.136.crate 76158 BLAKE2B 44603c8eede428dce4211350497a443385ff0ddb0b43799170411110fd8908a56e9df801c72695723f4fcff5eb33384bcf92ef58eecb9c4924d5d9cc30e2f6c9 SHA512 d043ccfd6a1dc9a114a1a95530a63ed9342688d31d3aadeec600a9a9d47aad328be35b6f80080400ea4bb3f820ddd18cc5ce1e6ea1db28e02752962061e71019
-DIST serde_derive-1.0.125.crate 54155 BLAKE2B c99e9e806831dccb3ccca20675e11f603a7348c433a641a46cf9a448a7a8b7ee242d0d6110780089b08e88b8f33aef5b75e8b1d25e2e6d242a44e9093b2badfa SHA512 dd4e247c9581b437157f37e355bc3335a3927417920acce72e73d6fe05a80e19fb3160c72abede7842e7d54749c33a94335fe9f3468c2f561267b863df368a6f
 DIST serde_derive-1.0.136.crate 54776 BLAKE2B 687524001bf61c42266d91a7263661ab80aa9556e570975a39bdf56a5cb1a2ec3ad1baf22dff586c7ad4ff66d035555d0a9d4a431c49402dcad6d79d0ef40cee SHA512 92c99455a5a9ac0fe45eb6ff1ad3ea55db860031fb912ace3755d1d2aad0dd880b2d83add4d41872823bd60557ebe1cb36e898bf0ac975b1093caa9819f7c289
-DIST smallvec-1.6.1.crate 26444 BLAKE2B ca6c50a63acdd93a2131654d99e50545a6e2d08eb3e2bd57d4a8ee073d90c08195ee442745a8d62a68179ce7bb8e229b7ff8c6fcf46372a9844bc9280b7c85cb SHA512 9e6061c8211a4485ab54eb541adf40748e1fc3fdfab0849e38e5fd34fc6cc69ae78bd065b788692385a6b8157b031c2fe373900e13d3e56e94fc08d574edaaad
 DIST smallvec-1.8.0.crate 27992 BLAKE2B d02897eb4d3901805be86cafd5d3dc6768b31c2ee4d0a9d7eb455e2a21be2864ea83589f4ffde102dbbafb66e3c197707af770b5ef184b8e244d992189644b84 SHA512 17687cfa6aaf95a1df063adc3a412a7c41918a0d003eaac90f7d9e859fb8fa1d652eedee17a4cb3aaae9b33a2043f89e796519e3a7a3992b292f04049bf80b0c
-DIST syn-1.0.69.crate 231954 BLAKE2B 1dde7e78cdbf5c5b93d0196e008dd4e92e4367f8e88395d6157b92a58cd9317dbb6e47caf2d570a5a9fb6b4fdd4fdea5e414eb9b04e054ec4e4dde8bb9f36a96 SHA512 6934423e48f8d6b1e403fe5e4bb2e180f472f125f4337b7d9889788c16cf11d79d1673ed06178604279e0b8a04bd80f7efba187cc8fa44c535457eb1b4f51c20
 DIST syn-1.0.86.crate 235126 BLAKE2B 89973130279128cab73443ee36c8e0d7bc83364ef91d0f086a40c136e26e612428b867a54a1da8ee5b1778cedeafc7403180bd84df2c21017ad5bb76bc0c9138 SHA512 1462dc9fbf0a89b023421064908c7e349ede23c986eddcb8d260559b5e1346fe0206c88e5317eea7e8293ea58b94466d486fae3aa57a1dee4220f5431b1fb68a
-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 twoway-0.2.1.crate 30486 BLAKE2B c310409093241ac85e94850483074e54001bef5a091dba08c993e579668fc8e9b42585949fb64dda4269973f31c58e33925c650a5d9f08f944bdce1a9b460c9e SHA512 feb79492b6ff96488da2ef9f10320560b1cfcd0bed5a9f5fdc587e671e94618c81992a824a07f28383a7da25a906f6151efa4b41de38e4afd3b454a790544b2f
 DIST twoway-0.2.2.crate 30454 BLAKE2B 3d349c555e0df87b6fe4910611c5759e6ffc5287dc1994ea47c8e17ce0d636f0ba219d73aa68af21a560d926caa4a417ac0d4b6d2d60b6f2832b9849339b77a8 SHA512 dcaa31226ca9c0d67e6eb85fbf97c8089ffae66daacd55cb043677807a76b09c6e4b6533b6c6c9ee06b0a09ac7b9d1c3bbd3ad31cb2d4748f59a784fc489d9f2
 DIST unchecked-index-0.2.2.crate 8325 BLAKE2B 25c7bbee1d3b90bad05a91131ce1647a48b97e08a745e9cc8b829e1e9c2e1a6b650715ae7747105df07096607fc929ad7b8d54f06e23c662c1750bb4c7e7ca1b SHA512 3634e077fab98284e6e99bbb1fa6691f58d2c39ece67c65c89f8142820f0bb1836553a107f49eec0c72455c47807bd8bc1aba940029a6e27b4b79b9be79b2ca5
-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-normalization-0.1.17.crate 100345 BLAKE2B 2579748ab87f6d74ab8e845d88c1990e4ef32e46e38f9a1841e3381d257d973f2f8a9da359c8e3f11790a888acf81f548ed3b749a67bb3e95acf3b744dd063f3 SHA512 727b4844a4eb103375dff7d88d620e1fb581cbdf2523f07a5c1673ff333d772d48ffae7658bfe4816a5bb42de5f68a96e15be9341c540a0f746c2990eeccb3d6
 DIST unicode-normalization-0.1.19.crate 107353 BLAKE2B 4c69d50efcae131eb4b91d385a64b49412a11ba913b3c0364cd04ad107d59e31adbda74d34ed13a065d9a7825d79fb740e82a4dc66b7813a9837af4352ac9e16 SHA512 7459e9d2867308cac80a98d8dd0b0cce797e2830ea5ff55b878f7a37a6f5e1f0bc14340e1a29955298d660ba2be57754a1478d74851b1b90576dd5bc4231729f
-DIST unicode-xid-0.2.1.crate 14392 BLAKE2B 7f8f91b9c4df55f2137b754208d4f2997a290acfc9393ee2dcda8195eda25cb342e56ad123f56bb298d93db5248a749c18a982423c9a0e85ce93f7a1eb55d289 SHA512 91e862137e837baea82829431cfed36634fdb05339f00c756eb5a4b429ef0bb871f5133d11adf9a023fa22168c8a0cf194ff3669779f04f219d48fc4fac339d2
 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.1.crate 65434 BLAKE2B e9180c56afaf9dd781812b3650b28cee14a2330629e708bb8a67144f6c12e3781d07fae68166990bebaae60190a1a88dfa1d087d4982ed04d8cdfa59ae4a0d7e SHA512 f2065e68dd917cc174c222a44127ac10a59d25a87ccce6b88ac1e1e775856fd7d5931d728296db355117f94e71e12404fdd68a283545b543a2e00a659a6997ed
 DIST url-2.2.2.crate 68555 BLAKE2B f8e59f784b6c2e16bacfba36ad68670a6af17c16ea3b0866b5aa98e5bf4686cf1b1aac9b1f0a0ea3b89a01e044a2ca37830416f42d147158ea8e88f23fd28ac2 SHA512 f9b6ad99d69ff303283b3fd9e98945fbd6cb411a3d141badcbb3a0566723a451375e6dd5d5357e3eb7a1b5b1ee5756a2347c43817db2de6fe35b9004b090e077
 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-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
-EBUILD adblock-0.5.1.ebuild 2257 BLAKE2B 95ebfadb0fa75e2c8b79e4c4e8d3b9c9472972890e7359d665564d758ec95429418c6d7bef5432d5c74697aeca62a4a30e1ce70004d3df3b164cce5f8451b89c SHA512 5f4ec67d31ff71f6b14686317da6dcdb7a3a8edb6bf38be6b315c54b2955d4381ccd0c7b5f3e8761517ee56a3892cf9cce1b149342e0455603a8a3de8c281c35
-EBUILD adblock-0.5.2.ebuild 2281 BLAKE2B 239e0e38e584c3e4144a05d63219ae1919311160c8ce830841213af40f98dc145e0765dfd763e696b18aed2ca1e15ccff5ba94126661561e9d42b9dd1bec1021 SHA512 17451a16e8521b2770127f8bef240e10d8acebcd5c9357281adc9b9dc051153914296ebbc8573a3e7840558fae1f3e2245049f179a150e3f5954abf79cddbd23
+EBUILD adblock-0.5.2.ebuild 2280 BLAKE2B be395166166b36a270a3b66e599769766ff9cfe2d2946ffd1f3ca32c346e584235e14bb90719562642631a03de562660cf993d3315d0ea3bb089f3073776d1c9 SHA512 b55db2898c5b4e765f17fe1d3cbc74882a885c7beb6651de09907ceaea83d35e8b846f7dad19eb8c7c01bcc9207120160c59679ab65e32cb51ff31e8f36f71c7
 MISC metadata.xml 488 BLAKE2B c6813b6b4c00dc1282ab21a9e37b4c035c9d75cdd1c0bf0a2903e4f40d074eedf5ae972b68aac91f46146e339bcd3cf799c45b96c94e6209d100811c2254daff SHA512 3f62c544ec8f4b2da7f04e3af1a81a702d719a0957a187ace37e638c1f00e0d3dbc67728e6915a05a6cb0bcb46366670c2e0a5837734cd0a51b7c3b021d4ffae
--- a/dev-python/adblock/adblock-0.5.1.ebuild
+++ b/dev-python/adblock/adblock-0.5.1.ebuild
@ -1,111 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES="
-	adblock-0.3.13
-	addr-0.14.0
-	adler-1.0.2
-	aho-corasick-0.7.18
-	autocfg-1.0.1
-	base64-0.13.0
-	bitflags-1.2.1
-	byteorder-1.4.3
-	cfg-if-1.0.0
-	crc32fast-1.2.1
-	either-1.6.1
-	flate2-1.0.20
-	form_urlencoded-1.0.1
-	idna-0.2.2
-	indoc-0.3.6
-	indoc-impl-0.3.6
-	instant-0.1.9
-	itertools-0.9.0
-	libc-0.2.93
-	lock_api-0.4.3
-	matches-0.1.8
-	memchr-2.4.0
-	miniz_oxide-0.4.4
-	num-traits-0.2.14
-	once_cell-1.8.0
-	parking_lot-0.11.1
-	parking_lot_core-0.8.3
-	paste-0.1.18
-	paste-impl-0.1.18
-	percent-encoding-2.1.0
-	proc-macro-hack-0.5.19
-	proc-macro2-1.0.26
-	psl-2.0.18
-	psl-types-2.0.7
-	pyo3-0.15.1
-	pyo3-build-config-0.15.1
-	pyo3-macros-0.15.1
-	pyo3-macros-backend-0.15.1
-	quote-1.0.9
-	redox_syscall-0.2.5
-	regex-1.5.4
-	regex-syntax-0.6.25
-	rmp-0.8.10
-	rmp-serde-0.13.7
-	scopeguard-1.1.0
-	seahash-3.0.7
-	serde-1.0.125
-	serde_derive-1.0.125
-	smallvec-1.6.1
-	syn-1.0.69
-	tinyvec-1.2.0
-	tinyvec_macros-0.1.0
-	twoway-0.2.1
-	unchecked-index-0.2.2
-	unicode-bidi-0.3.5
-	unicode-normalization-0.1.17
-	unicode-xid-0.2.1
-	unindent-0.1.7
-	url-2.2.1
-	winapi-0.3.9
-	winapi-i686-pc-windows-gnu-0.4.0
-	winapi-x86_64-pc-windows-gnu-0.4.0"
-PYTHON_COMPAT=( python3_{8..10} )
-inherit cargo python-r1
-
-DESCRIPTION="Python wrapper for Brave's adblocking library, which is written in Rust"
-HOMEPAGE="https://github.com/ArniDagur/python-adblock"
-SRC_URI="
-	https://github.com/ArniDagur/python-adblock/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
-	$(cargo_crate_uris)"
-S="${WORKDIR}/python-${P}"
-
-LICENSE="Apache-2.0 BSD MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-RDEPEND="${PYTHON_DEPS}"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-util/maturin
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/toml[${PYTHON_USEDEP}]
-	)"
-
-QA_FLAGS_IGNORED=".*/site-packages/${PN}/${PN}.abi3.so"
-
-src_compile() {
-	maturin build $(usev !debug --release) --no-sdist --skip-auditwheel || die
-
-	mv target/$(usex debug{,} release)/lib${PN}.so ${PN}/${PN}.abi3.so || die
-}
-
-src_test() {
-	python_foreach_impl epytest
-}
-
-src_install() {
-	python_foreach_impl python_domodule ${PN}
-
-	dodoc CHANGELOG.md README.md
-}
--- a/dev-python/adblock/adblock-0.5.2.ebuild
+++ b/dev-python/adblock/adblock-0.5.2.ebuild
@ -79,7 +79,7 @@ S="${WORKDIR}/python-${P}"

 LICENSE="Apache-2.0 BSD MIT MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
--- a/dev-python/alembic/Manifest
+++ b/dev-python/alembic/Manifest
@ -1,5 +1,5 @@
 DIST alembic-1.7.5.tar.gz 1229596 BLAKE2B dbedcc43f60b2b28adc17b1c0c753b22993127acd5aab04bbf4a47920e11894498618d353eb544b48c0c5698d7cf6f96fba39a98df723a611810e71e24809b0e SHA512 4223116c3610f3196335c1fb2032a9a236c3e6ec4e4ca5cb85ccc3667d614e77d51d9fee1ee0173a32451198929428c1fcf39afd90b6df32584b076e0a4ab1a4
 DIST alembic-1.7.6.tar.gz 1235649 BLAKE2B 5e12cf09927c7851ad5c95b7047865eec6ca01d3ce94045be3601855370e1cce8371d16ee4141a953a8ea0ffaafaa68c08499416283c7996b086b7b5967c8790 SHA512 dca97722ac70654dfa23d673b776d064af13bf1e59219131d7716d7ce183508361bad713d7d0986c8a56dd66c58a59fafc1c3b3ef80507eaf6368e48f9c1a059
 EBUILD alembic-1.7.5.ebuild 884 BLAKE2B f3d62f2ebf0e5c87be25aa30761108b2f0210ae2508026b354c9431ea73ff51f0878c38ca3f1a6a38632834e83b49c9bed94a277d2646b7d684d0fb1c9adc93b SHA512 eec90de5278a58c0c1e42c60b36a6074d738cf9b6dde86b22e4a8edf56ea748491e4b1af4d7f14b9654ce4ff63e3b36db2de743f237ac7edfb3591aabb254027
-EBUILD alembic-1.7.6.ebuild 918 BLAKE2B 8104d86b61ca37a9409fda606f5acb3d89802ac23b0b196625bed67b0541f3d5baf588045613da596dd3b2edf02f17f22a9bfa566bd016ee100d54af3f0b1a43 SHA512 faa7f3c6bd8c25070affd7930e5861fb706e54c77cf153f3eab0524f220ad83d2eebf99929f9681fb90967093afc6203f5363f839cbf603e756e1ef1feb987ef
+EBUILD alembic-1.7.6.ebuild 925 BLAKE2B 59970ccde5f3fcf3646b5d507ca5388ae5083f903060c0c5d32f66c7844a0a6eaf85a4913763473af52e540b0e84e9c7ab90fc1e257a2eb3f8776ec147bcbbfb SHA512 df196708b8ea242cb6798f2c924aa1f26a78cea7f0ff9e7d1ae599d2c1a245a208d73e7456034b0bb45e8a5cc5c598a8038d6a327eb545a879340196ec009dc9
 MISC metadata.xml 516 BLAKE2B 08b11ebed2913b00e0a8c0044a50e3ca7bc0e51fcad180725c90445227fed1aed58ed89b4bed58ef5c050c3eee3c19da33aabce5cd1f7835f4b560e67ccc7744 SHA512 b4afb6af57562e6065f03db71da0dbdfc9c4337e54cbaddfa257ee7bad48dbeecfaccd765901bf65279e34cf96be3975f983017858904716a36bf8c18f33db79
--- a/dev-python/alembic/alembic-1.7.6.ebuild
+++ b/dev-python/alembic/alembic-1.7.6.ebuild
@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE="doc"

 RDEPEND="
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@ -1,5 +1,7 @@
 DIST astroid-2.10.0.tar.gz 417686 BLAKE2B a4aa0451134403abf8e56ccd9dae106d2a92b2bd53c6772c952984ea5603b44ef5c13b9822b4fda0a146ad96a7412a602c2c46313938dea30cfb390fc55ee54d SHA512 34b52cd2e6636009369ec55a5781caaf8e8b0766b7ba4e70ff1f55d275a673266e0293f65145ff38637d6da353679314d0fbf182416146b89e210a68e39d86f0
+DIST astroid-2.11.0.tar.gz 412098 BLAKE2B 022c940913ae71ca0280a2ae47c19a6c82ea69b4f2a1c1ce0e2f00dac7a37b26f7ee2fa798db4f5d230e021ac5096b79d48b12d389d0c754dc17bde301c1712f SHA512 82423c9cf6da4e041621218acc81b9a301e4c1f532a74863c89040654d61457a89481004556a4795f021f0fc52b5f79412a35e9e43a1de33189dcae305cefdff
 DIST astroid-2.9.3.tar.gz 409069 BLAKE2B 152dbe8ab2fee3964dc8cc714a5ba48c71b5994c77d1e20683bcf028483aca22d5be5772e72d056cfd3d1f59562b447366d61fc35a2b67d545f069a8f7975e84 SHA512 7bb3bf2d456c0d22325444e641961c34eaddcddf50c97ee9f5b5c8755232cf1b65a315258403b40bb7dcad15c4f9b6b73ab0eb607525a48a65f52406969eca04
 EBUILD astroid-2.10.0.ebuild 1393 BLAKE2B 82e0a985a022d7f8aec57ad6041c47a40d660f2b0deedaa792a126e46ad38208fe4f0456361c08d608f2ae206a6db6f7c8cfa1972a8c6cbe79a50aea6acdbd43 SHA512 657a2bde8ec50f205236b3024eea16a875a1881a7313fa39f8d06c713d26d19a890759c4dd96fec25b2110e7f694c49b4a76eaf6871a6fec193762aa0dfa16b0
+EBUILD astroid-2.11.0.ebuild 1390 BLAKE2B a505bc47a393b96daae7473338866384d60aa291a3f4bba29a1337958c3cea6ca0e5e538b4b1a1044e51c7ee3666e4faaaeebe4d8b5ec2ca03f727513fffd749 SHA512 31c1a84e11b941a225a1454c13e5daef31dce932a770c4d513668ccb6e64e7327e54e7d8b67e3bd72381da289c160da0b0335b48fab34421e37fc9ebb806d474
 EBUILD astroid-2.9.3.ebuild 1305 BLAKE2B 8ed0e241b8c820dfce1228a811ab24f9e96898f61037c5d66c5db327218b1740a13f87078c60977e2a923c193ea59a9cbcb1197a35fabdcdb09e8b1370251e78 SHA512 f89e842c114311520ef5d55ffa00410986ed1c19b9eb132e1b1b527e74cb6e0605548704b6129013a3d2c11542902ba25ca1df1c0e65692cfb9939cc407e7ada
 MISC metadata.xml 1143 BLAKE2B 1f6c4e004277eebed2e29cb935ef01e5f18fb0a526f99f0e875ae3815308dce0483b5274b4e23bed076464aa62a035937a7a3817e2d4a5fb9211b9043271e04c SHA512 56b07d0f08a49772661bc3d233cf1f628aa7c241c51b91d75dfbd44995e169d8ab5bbd99863d7b9b67792486346982a7b8eebefb462e7e212cd7dff920d80840
--- a/dev-python/astroid/astroid-2.11.0.ebuild
+++ b/dev-python/astroid/astroid-2.11.0.ebuild
@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Abstract Syntax Tree for logilab packages"
+HOMEPAGE="
+	https://github.com/PyCQA/astroid/
+	https://pypi.org/project/astroid/"
+SRC_URI="
+	https://github.com/PyCQA/astroid/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+# Version specified in __pkginfo__.py.
+RDEPEND="
+	>=dev-python/lazy-object-proxy-1.4.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-3.10[${PYTHON_USEDEP}]
+	<dev-python/wrapt-2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# no clue why it's broken
+		tests/unittest_modutils.py::GetModulePartTest::test_known_values_get_builtin_module_part
+		tests/unittest_brain_dataclasses.py::test_pydantic_field
+	)
+
+	# Faker causes sys.path_importer_cache keys to be overwritten
+	# with PosixPaths
+	epytest -p no:faker
+}
--- a/dev-python/autobahn/Manifest
+++ b/dev-python/autobahn/Manifest
@ -5,5 +5,5 @@ DIST autobahn-22.2.2.tar.gz 375443 BLAKE2B a321cfeaa35e7da5aa58ade0da3bc5891baab
 EBUILD autobahn-21.11.1.ebuild 3781 BLAKE2B 79d993bf0786e339d01350c147328059106034c34802a4ee84652580e36caeadd4bd4791aef6852eab30c8bf47a6e342d32f277796f4332c3ceb2dbe3afc0144 SHA512 7ce7daf204d5c1eef5f91e4f1ab78ae4df142ec3f7da889929481c27c85e6e12610fd0052ed3cadbb7a90876d133621d02b61ed4b41aeaf2419d5e2142a136a5
 EBUILD autobahn-22.1.1.ebuild 3807 BLAKE2B a536172a653a5a90fa454eff3aee2722fbd397edf109ed4997c47adf6148ef29bfddff73ce6d1740178301d231d26708eebf68619613c594b42be2d9c0e6dfe8 SHA512 98432eb7daeb4784d297067bddf13b8899a83bae8edc153a8b35da0f48ebf04c0408fb1c2b5d922a396374ac91da4ea9ae1d067f176c8e9ce4d00677900420cf
 EBUILD autobahn-22.2.1.ebuild 3748 BLAKE2B 06413de7b627bf9572b888c892a74e401b470c6c5ca9e8543eb59235e231f0dde2a5fac2cf5239c430e5e14467f44c217944a936036c94f5a11c9280fa69e17f SHA512 a98374356e737e8b056d23fc2fa60c4f9b197aee65115465aa9617098168e169c3318e2be4760c5126318c338293756510258c29f0d61d620a3a285e1d4fe50d
-EBUILD autobahn-22.2.2.ebuild 3748 BLAKE2B 06413de7b627bf9572b888c892a74e401b470c6c5ca9e8543eb59235e231f0dde2a5fac2cf5239c430e5e14467f44c217944a936036c94f5a11c9280fa69e17f SHA512 a98374356e737e8b056d23fc2fa60c4f9b197aee65115465aa9617098168e169c3318e2be4760c5126318c338293756510258c29f0d61d620a3a285e1d4fe50d
+EBUILD autobahn-22.2.2.ebuild 3755 BLAKE2B 37431d4180b7b7eff30117bc40d3b0115118689b7246247948595497efbebd40980d20bc692d5dcc8eb679afb22bb231047b8ee91c9aad5d639dc6bc79c8c55a SHA512 d0e0ecba2d65905466cc7772316fe18ffd236f083513f50142895dcc33ee200265226cc1d15ca96b261047b42329776300f47d329e21828baf475bb930dcce31
 MISC metadata.xml 596 BLAKE2B 07cc4fbcb4c6fde6b1bb49a0a30fa8d2ef7ff4424397e29053a6ac89d87acd9fa7b1897c5381910d53f590192945a89a5b987fcdb9595e42f67f23333010a0ba SHA512 4d4cecf09593ec201711b13de1820e59f007f745b41611471ec737da4d679323787ac06a3a987cede9bf2c8dff71c9dbcb197e6a9c9109cf4d3a34d9247f9962
--- a/dev-python/autobahn/autobahn-22.2.2.ebuild
+++ b/dev-python/autobahn/autobahn-22.2.2.ebuild
@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}"

 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 IUSE="test xbr"
 RESTRICT="!test? ( test )"

--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@ -7,6 +7,7 @@ DIST boto3-1.21.0.tar.gz 468664 BLAKE2B 7d118b2d91a7d8fa38c27a218fc2eb8e8964f097
 DIST boto3-1.21.1.tar.gz 469079 BLAKE2B c2a30539709c7c9741e3a34d5d352a31a0997cfadc29bb3b86c32c602229077414485b77c58718f2a519a5bb2ec8a3d7bfe1d6ef2daf26a8a4ae3c804c636464 SHA512 a94d195cbcee2b18877502eca9a79f231519f63712c7522ede23357d1117885e1fd2cce91d3698527d7f19140e08d68dd7272ef1278b9cbad86c77d81aa2661b
 DIST boto3-1.21.15.tar.gz 476516 BLAKE2B 306c7ee69dec5ff1fbd76ed32aaebdf0f52cdc49df600562f49cd543e5f331c6dbf88001070022043b9fd01c651af83b1c8c0966292c90791831f2e9d9fc4a84 SHA512 9d431fcbdcd42658cd52094b97c151fd10a68f2c83a457dccdf7991c8358c17b32faa09e3941f6d6e72bad8cda1b93dcfae8d78585dae43790c0ec248f0ab15d
 DIST boto3-1.21.16.tar.gz 476669 BLAKE2B 5ff8130a168841cd885f1f3f4752a5362910f0fd3c0598bab9db6f36c91570b4ef2ef598c46ebc5af870d9a12f12343213d44786923b3e0388bcc929d51fbca9 SHA512 86abc6903761ef740e3144a70acc9c3ef6f06e980a81b5384f8ad382080e8a5865df4e84b04ad54d6160ac2e9b7e1ff088395508ceb80861177f55b3a4eeeaab
+DIST boto3-1.21.18.tar.gz 477263 BLAKE2B 3d27a261bca3b7dbbab2eadd5be686e5b87b297a7a243d27a5424195e027abfb8e378296e760104f5de48a2e1a860bde5b658f7ff4c64520eab3df9f85bf78ae SHA512 4750a5ad6858df03c5c5367035de02f5a0123f46397992a7573542f5348eb0d864e3bbd6e009d7a62ccedef0316d1a2443649a87e922aa9c6dbdc4e1c9238e59
 DIST boto3-1.21.2.tar.gz 469425 BLAKE2B a49c1280610bcb0564ad357570712224abdc032e807926be7bc0d0652503381b2b854e94ced12c95765f9c30ff62128ec0bff4d38d33e8a7a3d5a8d397de084b SHA512 bcd578c8b0665fc2951897d67279a7075d451a47cad70b59047c1cf66e26fd07f9f90ff8c69f9bc21038042dc6398944c02ebcc355dc8750d0613a11a0c3a2c6
 DIST boto3-1.21.3.tar.gz 469833 BLAKE2B 97efa041762cbb1b2f493195ca680a6c1631c6f599c631ec33939295d41df03ff1faae2d9178e60a34343a9b2fba33759cbd3d07222e8fabdc923e1a7dc8464f SHA512 57552b96dad6694dc7df34a83fa3822843e9f912c92146e1d11e2bf66fc85c89624752207389a612fa672556a9a02d62af573cbc9c2e264a97e933eb7f18a728
 DIST boto3-1.21.4.tar.gz 470233 BLAKE2B 3e6d8c5264ac66829e468633700e155ac935aae9fb148d892c90bb629699a4fd726f4e73aa399d98fafbffd71c215d141d682e49850f6d046a4513ab6dda8208 SHA512 2366cb0c415ee0497912a2369b3f3981562324556f5e7137d0b52069c63c778406802e2434bec122a047ac14dbdc44e51f6bc3c90fcee12d315aa30c21d45f0c
@ -23,6 +24,7 @@ EBUILD boto3-1.21.0.ebuild 1455 BLAKE2B 06260869e53624d765eb42b1ebbe0ee8e3635468
 EBUILD boto3-1.21.1.ebuild 1455 BLAKE2B 06260869e53624d765eb42b1ebbe0ee8e36354688ce77a6cd2dd08b8f4dbb725507a9ed2fd1703a1e644f0dd52b8958af7498f3c02e4a97d885855213f0662a4 SHA512 4eb5ddbcfb36364401a53d189e3f371cbc26f1205cfc7a1bcdcac05c54ba0574c90daba7572e5f58fac58500d49f6a2c9dcb10e5a3330cfc7c134b5a6aa3083e
 EBUILD boto3-1.21.15.ebuild 1570 BLAKE2B 53ee8a19917c517edba8c435e535cfbfaa85beac364578971c97d2eba3669f2500c2d13420a2efd447b50e6d29d48ad6ee9aff62dd11d73012884018dd1e3b80 SHA512 e55368dd8e440d6220915a691aad0aa8e8cdcb3e191030b4d406efbdabfb5ab8e56b81ccad728bcbf56c7f363f7f1b3238ec314765bcbe52b5f245c3b4e04ae0
 EBUILD boto3-1.21.16.ebuild 1570 BLAKE2B 53ee8a19917c517edba8c435e535cfbfaa85beac364578971c97d2eba3669f2500c2d13420a2efd447b50e6d29d48ad6ee9aff62dd11d73012884018dd1e3b80 SHA512 e55368dd8e440d6220915a691aad0aa8e8cdcb3e191030b4d406efbdabfb5ab8e56b81ccad728bcbf56c7f363f7f1b3238ec314765bcbe52b5f245c3b4e04ae0
+EBUILD boto3-1.21.18.ebuild 1570 BLAKE2B 53ee8a19917c517edba8c435e535cfbfaa85beac364578971c97d2eba3669f2500c2d13420a2efd447b50e6d29d48ad6ee9aff62dd11d73012884018dd1e3b80 SHA512 e55368dd8e440d6220915a691aad0aa8e8cdcb3e191030b4d406efbdabfb5ab8e56b81ccad728bcbf56c7f363f7f1b3238ec314765bcbe52b5f245c3b4e04ae0
 EBUILD boto3-1.21.2.ebuild 1455 BLAKE2B 06260869e53624d765eb42b1ebbe0ee8e36354688ce77a6cd2dd08b8f4dbb725507a9ed2fd1703a1e644f0dd52b8958af7498f3c02e4a97d885855213f0662a4 SHA512 4eb5ddbcfb36364401a53d189e3f371cbc26f1205cfc7a1bcdcac05c54ba0574c90daba7572e5f58fac58500d49f6a2c9dcb10e5a3330cfc7c134b5a6aa3083e
 EBUILD boto3-1.21.3.ebuild 1455 BLAKE2B 06260869e53624d765eb42b1ebbe0ee8e36354688ce77a6cd2dd08b8f4dbb725507a9ed2fd1703a1e644f0dd52b8958af7498f3c02e4a97d885855213f0662a4 SHA512 4eb5ddbcfb36364401a53d189e3f371cbc26f1205cfc7a1bcdcac05c54ba0574c90daba7572e5f58fac58500d49f6a2c9dcb10e5a3330cfc7c134b5a6aa3083e
 EBUILD boto3-1.21.4.ebuild 1455 BLAKE2B 06260869e53624d765eb42b1ebbe0ee8e36354688ce77a6cd2dd08b8f4dbb725507a9ed2fd1703a1e644f0dd52b8958af7498f3c02e4a97d885855213f0662a4 SHA512 4eb5ddbcfb36364401a53d189e3f371cbc26f1205cfc7a1bcdcac05c54ba0574c90daba7572e5f58fac58500d49f6a2c9dcb10e5a3330cfc7c134b5a6aa3083e
--- a/dev-python/boto3/boto3-1.21.18.ebuild
+++ b/dev-python/boto3/boto3-1.21.18.ebuild
@ -0,0 +1,62 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1 multiprocessing
+
+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 ~riscv ~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}]
+		dev-python/pytest-xdist[${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} \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@ -8,6 +8,7 @@ DIST botocore-1.24.0.tar.gz 8767222 BLAKE2B 9cdcb7677544230f006783d5a666c39c0ec2
 DIST botocore-1.24.1.tar.gz 8768807 BLAKE2B 649633afa85cab9fb248ed9907e2ea3e57aae7325f4f53271669fbb7fa3f6932ce693878905bfe09e1dd1102a05e4be9dec58f9d3f53778a759c5afd85be6e32 SHA512 192113e6d072897d6eead85d31f44ee3051ab4610718cbb7b49bfc1e1b884fda9b9f793445275d6ecd678fea12b789fa137c41d1effcafd2ab50cbce81a57927
 DIST botocore-1.24.15.tar.gz 8820413 BLAKE2B 1a842d811b0471ee6881fc6fbae9726912636c9a83ed9e1395ae96705f6ef47cbb5d6b134a011da747951b7570e722af5a60c949e9301d509a79f431a797ca70 SHA512 d614d6f065a77e5d4dda9c8dbe401feae4e83398c5d2508b0807984fc8783b31cd6c507663c90a08daa5ccbf95b450633928599cd340227ab5dc90ea00fa1bbe
 DIST botocore-1.24.16.tar.gz 8820938 BLAKE2B 53e88eac6f0a0eff43b7f934d978e06d86debb5a99f112c576281978499d29627a5f8f0ca988ff05c8f24d08336d7a1bc0206037c8f0a89b2485b66af2b81294 SHA512 fac23333998ff790bc06829d576593f7031964d3399bd0cd71ffe160574ed98b88e64dc0cc84ca3eb04f6da130a8906d02f092e57d4074150e13611fbcacce33
+DIST botocore-1.24.18.tar.gz 8823998 BLAKE2B 0b3e94ad6ee5257642cc24c1c0966b92b0e759cb3d7dc4560e3b5eee2511e53a8c5fdfca559e8f891e5869a0b9d619ea1a3d050cdfbe202d9e57a855be64112f SHA512 8e92bfd9ae6f2067139c9296cd07d5bbc6e53ae3d748318dd16c47bd292d53e18ffafcdb5b25d7e18966d09e46376c45de45fceadf3422f7215c6a1aeded982e
 DIST botocore-1.24.2.tar.gz 8770474 BLAKE2B ed0f5920ae29bc5d51ca5d304f3cc13feb3ca45667d397f77e982d283f1b5551eccdbf41c0e274f56c59cca3398e47c6790d97374f189d4a9411107b0fd7490c SHA512 93811544f756419d6a0a9f49dc836e8c580c7c8ab49f90a541f2f8a24203959976a974056a0953f4d137a19254059e25c356843fb5df91a6d752d23c004f0c34
 DIST botocore-1.24.3.tar.gz 8770454 BLAKE2B 35c77a5a65a75844594673d3a1af23b087cf88ed7c61177a3f422d4261f907c9ccd1b3beb9eb6f67dcc23084b27078d49e34102ebaa2b868da8b19b1c6e677b4 SHA512 313a1a94b985641257b3ee6b7dbfab88fd28efbfcec2cee6e5826ee6e65b174892c9ad9afa2b46caa4b262feb1e731823875d8981c6bd092f5f423ad4cac9430
 DIST botocore-1.24.4.tar.gz 8775103 BLAKE2B c23256daab72fd60dbc9c3cb665816970bb168d6e63e0d53bc16dbda6cdeec30a87a864a6a3107f104c3e9d7aabdd1bbe5e43105a8fccad606cf5ac250282738 SHA512 73a717b454ce715446e75852b37207691118106e45fd0484101527adbb7e9062d78b200bb650e183bb1a40c0a4d9b0e1c9cc8621e5b5c2d9e7a5de6d46c34297
@ -24,6 +25,7 @@ EBUILD botocore-1.24.0.ebuild 1531 BLAKE2B ddb98d36cda5e9bed25cef2d3b8373af5221e
 EBUILD botocore-1.24.1.ebuild 1531 BLAKE2B ddb98d36cda5e9bed25cef2d3b8373af5221ec3b9a875ca72b46ab87d28722ef72ed56c2367db06b94d88019f8e1018a54633f5c46c5e16043b73e20982d39a1 SHA512 48b442363bac3a1d262e66b154c5f9abe6037bfc56e0c5393cb706c17c1f5f2d042f4a00032c58602bf1181750e90522a3fdf479fb0909ca2de9cf1404d9aa55
 EBUILD botocore-1.24.15.ebuild 1646 BLAKE2B dd0c215ddae91bb93f37f150ea10ee1efdae56f39d878f977f5abad8918d9da64063345faeef31d7c7f0beddcc7374810380ab0b049fdac9f1f49d58976ae788 SHA512 ce261fe481bb083270a8c8e706556164b2eea45a5091590d30b0671f3e4948ad03b46d37e555096cb244405c8a56db12fcd0c46fc85122640bd3818760e5851f
 EBUILD botocore-1.24.16.ebuild 1646 BLAKE2B dd0c215ddae91bb93f37f150ea10ee1efdae56f39d878f977f5abad8918d9da64063345faeef31d7c7f0beddcc7374810380ab0b049fdac9f1f49d58976ae788 SHA512 ce261fe481bb083270a8c8e706556164b2eea45a5091590d30b0671f3e4948ad03b46d37e555096cb244405c8a56db12fcd0c46fc85122640bd3818760e5851f
+EBUILD botocore-1.24.18.ebuild 1646 BLAKE2B dd0c215ddae91bb93f37f150ea10ee1efdae56f39d878f977f5abad8918d9da64063345faeef31d7c7f0beddcc7374810380ab0b049fdac9f1f49d58976ae788 SHA512 ce261fe481bb083270a8c8e706556164b2eea45a5091590d30b0671f3e4948ad03b46d37e555096cb244405c8a56db12fcd0c46fc85122640bd3818760e5851f
 EBUILD botocore-1.24.2.ebuild 1531 BLAKE2B ddb98d36cda5e9bed25cef2d3b8373af5221ec3b9a875ca72b46ab87d28722ef72ed56c2367db06b94d88019f8e1018a54633f5c46c5e16043b73e20982d39a1 SHA512 48b442363bac3a1d262e66b154c5f9abe6037bfc56e0c5393cb706c17c1f5f2d042f4a00032c58602bf1181750e90522a3fdf479fb0909ca2de9cf1404d9aa55
 EBUILD botocore-1.24.3.ebuild 1531 BLAKE2B ddb98d36cda5e9bed25cef2d3b8373af5221ec3b9a875ca72b46ab87d28722ef72ed56c2367db06b94d88019f8e1018a54633f5c46c5e16043b73e20982d39a1 SHA512 48b442363bac3a1d262e66b154c5f9abe6037bfc56e0c5393cb706c17c1f5f2d042f4a00032c58602bf1181750e90522a3fdf479fb0909ca2de9cf1404d9aa55
 EBUILD botocore-1.24.4.ebuild 1531 BLAKE2B ddb98d36cda5e9bed25cef2d3b8373af5221ec3b9a875ca72b46ab87d28722ef72ed56c2367db06b94d88019f8e1018a54633f5c46c5e16043b73e20982d39a1 SHA512 48b442363bac3a1d262e66b154c5f9abe6037bfc56e0c5393cb706c17c1f5f2d042f4a00032c58602bf1181750e90522a3fdf479fb0909ca2de9cf1404d9aa55
--- a/dev-python/botocore/botocore-1.24.18.ebuild
+++ b/dev-python/botocore/botocore-1.24.18.ebuild
@ -0,0 +1,67 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	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() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+	)
+
+	epytest tests/{functional,unit} \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
--- a/dev-python/cbor2/Manifest
+++ b/dev-python/cbor2/Manifest
@ -1,3 +1,3 @@
 DIST cbor2-5.4.2.tar.gz 85847 BLAKE2B 1ad8b7bf54343ad7e969c797a444653e9cf501139facb98f92727be4d31148acedff29885e99c1535a44bcc9add4e4a1890c8f4605c2b82c9975821ee029d7bb SHA512 86e79ae19120dc39e79aa410b1e75df1d82b40c0523865989310f2d7214bfd824bf86ba158b2f695542ef2f34c76c8c4d5b28dbbb9815ee923444b00e86940d4
-EBUILD cbor2-5.4.2.ebuild 669 BLAKE2B 5bae6f3f157d80b20eda389412be063cafb07a2b15cf02799623be54f727d265d2649732773e7bfb8afc7707b1cc56e0588d6cb49c2f6f945fe663b25387eefe SHA512 4f848249b74d4e30192eeeb66bcdb8c28c6f0c4e952f7740843d7a7ef99ec0b64f264bb9b3e04aa5548e80ad27feeba81425039e0ea746b3ad9d89f2d0ebb4ee
+EBUILD cbor2-5.4.2.ebuild 676 BLAKE2B 5be645bfe7a0d4f2a5ce9e6308352f4f50e11b3ca10495e851d45065744d6f3b1d0ed366b5fb8726177f41fe217b392755136011a84e76595079cb545709a87b SHA512 5753259f9110a72348214a25bc06c6c7cad27090c931853cfff18bc7f02a859bf500edbc2da03b593e0cde0cac6e40760da79bb18ac5a454b2642a117cc43bac
 MISC metadata.xml 995 BLAKE2B 8b9c668c2628dc12eab5bc42ca90a5c7e1ed64405b3de54ccca8dca90a974e9e2274b8815bc800d5427c6128c2f369eb5fc1fe17b5f6dbcee242239966dcdb98 SHA512 12f4909783b90ac9eef2ef4141f6f0041c2faed7ccb3d08f64fc8cd4e36e5ad8a3a5068267f6dc02c8d2fca5213d26f28ce468ce4487a0b2d44cdb558d4882c8
--- a/dev-python/cbor2/cbor2-5.4.2.ebuild
+++ b/dev-python/cbor2/cbor2-5.4.2.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8
@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

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

 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@ -2,14 +2,12 @@ DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45c
 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
 DIST llvmorg-13.0.0.tar.gz 147270176 BLAKE2B 628f316b580e1edf3a58d4825b724df759e6ed2a4116802470c04562caefc392fa325c91f388036365a2e45a9595cca6d3557fab12984fc8bcfef29c9116d822 SHA512 8004c05d32b9720fb3391783621690c1df9bd1e97e72cbff9192ed88a84b0acd303b61432145fa917b5b5e548c8cee29b24ef8547dcc8677adf4816e7a8a0eb2
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
-DIST llvmorg-14.0.0-rc2.tar.gz 158069989 BLAKE2B 06dcf5d82cd100bd792eadb3816cb297a11dc64dc8b699ccb2eac8ef0da4f10a24ba1984376427b638def6c8c8ae5bc9562e1cc30281fc55f044aa2a9657fc81 SHA512 c77d8c6db2ee6536f7e980465d5a3eb34403c6529e2012a4778ce76a559a6d639cf4c5ec84f965287d4b0739a73dc3e65d7deb27815d74c35e823839e579d2a3
 DIST llvmorg-14.0.0-rc4.tar.gz 158082013 BLAKE2B 0e717898d8f1ed160e525a68aba56a84b7d31856ea72fdb8fa02e863c5a2074245a38d4a4aa7d178beab1ea64aa92d0ba9dcad4373ebb03868070bf718112107 SHA512 a942848aa5042b97bab6d0d5bcee11ea2f85f1244d7eaadb8f7000bf104b2160e6034c04e3755501dd178bc99c26669cf4aca40edb4bba598fdde6bcf3f40ddc
 EBUILD clang-python-11.1.0.ebuild 925 BLAKE2B db1ed6c8b6f6f156350e4b29ac9292b3a941abaec52a4a41b41f7e3a641cfa2ae9085f356000bfa361fab697299509193b3d20c1300f0514ee72b368daacb382 SHA512 ca8e1aff2ba826ee9c1e7d5cd9d851bf3fa935e429b078a379083be4ef21de0aac62d2efcee9487a4283dd8a81bcfed05ca55116c2b89e8febe45a4af9a30425
 EBUILD clang-python-12.0.1.ebuild 925 BLAKE2B db1ed6c8b6f6f156350e4b29ac9292b3a941abaec52a4a41b41f7e3a641cfa2ae9085f356000bfa361fab697299509193b3d20c1300f0514ee72b368daacb382 SHA512 ca8e1aff2ba826ee9c1e7d5cd9d851bf3fa935e429b078a379083be4ef21de0aac62d2efcee9487a4283dd8a81bcfed05ca55116c2b89e8febe45a4af9a30425
 EBUILD clang-python-13.0.0.ebuild 925 BLAKE2B db1ed6c8b6f6f156350e4b29ac9292b3a941abaec52a4a41b41f7e3a641cfa2ae9085f356000bfa361fab697299509193b3d20c1300f0514ee72b368daacb382 SHA512 ca8e1aff2ba826ee9c1e7d5cd9d851bf3fa935e429b078a379083be4ef21de0aac62d2efcee9487a4283dd8a81bcfed05ca55116c2b89e8febe45a4af9a30425
 EBUILD clang-python-13.0.1.ebuild 925 BLAKE2B 1dab0cbb672643072e7d824a262c81505d19e555f24f97f82156473affc2f5ba6fc34ec493ffeedbc82feb1245fc6a39126e1b81fcdc8f8b4ddd0b7fe108e4bb SHA512 11eaf5c7a484d756f01986eacce19c912666518892f3213ff42367c126c2d8474abf6608cca24e6250c64e7423464e7cb3e58c2b069c7febf4893b249f2ee304
 EBUILD clang-python-14.0.0.9999.ebuild 904 BLAKE2B 86cb5bfea2ad40a1516dbd34c03acfef5bc6691caebe9811a98c699eadc4b704a20fa09edb02a5fde12a7e1a380bb6e79067145b6455c9a12c1182717a64e101 SHA512 7c2ded62a5529079e7ba80153b92c082e42d63aec74e33cdb606bc305fd60e59871fe3dc6dff81db04492a4aa5d5397e8336316926568b166613586d692cf71c
-EBUILD clang-python-14.0.0_rc2.ebuild 904 BLAKE2B 86cb5bfea2ad40a1516dbd34c03acfef5bc6691caebe9811a98c699eadc4b704a20fa09edb02a5fde12a7e1a380bb6e79067145b6455c9a12c1182717a64e101 SHA512 7c2ded62a5529079e7ba80153b92c082e42d63aec74e33cdb606bc305fd60e59871fe3dc6dff81db04492a4aa5d5397e8336316926568b166613586d692cf71c
 EBUILD clang-python-14.0.0_rc4.ebuild 904 BLAKE2B 86cb5bfea2ad40a1516dbd34c03acfef5bc6691caebe9811a98c699eadc4b704a20fa09edb02a5fde12a7e1a380bb6e79067145b6455c9a12c1182717a64e101 SHA512 7c2ded62a5529079e7ba80153b92c082e42d63aec74e33cdb606bc305fd60e59871fe3dc6dff81db04492a4aa5d5397e8336316926568b166613586d692cf71c
 EBUILD clang-python-15.0.0.9999.ebuild 904 BLAKE2B 86cb5bfea2ad40a1516dbd34c03acfef5bc6691caebe9811a98c699eadc4b704a20fa09edb02a5fde12a7e1a380bb6e79067145b6455c9a12c1182717a64e101 SHA512 7c2ded62a5529079e7ba80153b92c082e42d63aec74e33cdb606bc305fd60e59871fe3dc6dff81db04492a4aa5d5397e8336316926568b166613586d692cf71c
 MISC metadata.xml 217 BLAKE2B 23799663344acc2d532fc6fa7dd798813aef7293fcab616d6300b15a6e603b6d17ca63d5153eb8da1b976215d8e3775e8d3a67026bacc9693993d48ec1cb69a9 SHA512 e13d0436d3a3a449723277a37ae4c5a673139b6da818adf7ad7654d94d3948ed8607b1c27e83e963bf450bd2d5a650c985e27ff5a531db9813cb4ab10b985dd6
--- a/dev-python/clang-python/clang-python-14.0.0_rc2.ebuild
+++ b/dev-python/clang-python/clang-python-14.0.0_rc2.ebuild
@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit llvm.org python-r1
-
-DESCRIPTION="Python bindings for sys-devel/clang"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS=""
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-# The module is opening libclang.so directly, and doing some blasphemy
-# on top of it.
-RDEPEND="
-	>=sys-devel/clang-${PV}:*
-	!sys-devel/llvm:0[clang(-),python(-)]
-	!sys-devel/clang:0[python(-)]
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-
-LLVM_COMPONENTS=( clang/bindings/python )
-llvm.org_set_globals
-
-python_test() {
-	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
-}
-
-src_test() {
-	python_foreach_impl python_test
-}
-
-src_install() {
-	python_foreach_impl python_domodule clang
-}
--- a/dev-python/click-log/Manifest
+++ b/dev-python/click-log/Manifest
@ -1,3 +1,5 @@
 DIST click-log-0.3.2.tar.gz 9523 BLAKE2B 212ac421b402fc0f32a9aec11a9e20c87a8148c461af87af78f8068ca95d60cab0c47bf24162aefd1c299ba783fb7a70e7e9dde01f0fc1f7c44a69fa8cb07121 SHA512 8ae5c43d739127367bbcdcf32bfd4b34b2ea1c377948df3b8588e4bfe2b0f5e7a61d1ccc6cb32c77045b15251222866daffa5a7bfb7a907487548784ba345351
+DIST click-log-0.4.0.tar.gz 9985 BLAKE2B 8a7ce0c2a7617253f08d011958bce158e987faa0008065c9dac382d46b905cc88cd5cb19d0d0859bf522da6448f7c9a20c0a8efe53b3feb5efc9ca3f64cfbc27 SHA512 95d3cb2fa9821e4f58b25072f39d34f21fe4a7600923f59f4b57b92dbcd9fa2584d710de1d4a1aa2a757c048398342aabbb1b5ab32cf4128ccecee10f9f15a5a
 EBUILD click-log-0.3.2.ebuild 539 BLAKE2B b16dbc750507bb0329ae146a81c104bb2e3f0a550a88d6850f4e2dbffde2c3bf2c7965a10822a57bf86b07e85d253d99a663943e8273345badb78b541158c0b8 SHA512 4f69ffedd2040330179185fd5e2dca4c3b837ae141f15b378dda770744e3c275d2184e7bd55ea25971561c7ebd4a0f0fba9732da9c1eec022843c2ae3fefb1b6
+EBUILD click-log-0.4.0.ebuild 578 BLAKE2B 00c0863fffdf6b569cbbdf3f0844dec88c277b4e979e6eb7e0a5286ec442c598829b8f7a540320d0b93db8b48a5a4a1281b15d7789f1e743d8656042af25b57c SHA512 57213a0938a353d211463de66b841237dea7ba7149dccf8b774b4c8e0ce4fd629b9e18e38ecd3a2a8925c252e72dbd04ea40ee47891aee2a256f05e7125fc9e0
 MISC metadata.xml 353 BLAKE2B ef355676f10011a5e227706dcf98782043db22d0aceb302ad050debe312e77b4a160ad0e4ffb43115d89e543e4d135f7939c10db384fdc7c623b5575d6c3da8c SHA512 2fc29e85273c3a01947ddbb54da4e49dfe403416ba7911b6b2cde06d642c895089de257ec132e7acda5a17e4d6bccea812c6d54792032852048a4574006479f4
--- a/dev-python/click-log/click-log-0.4.0.ebuild
+++ b/dev-python/click-log/click-log-0.4.0.ebuild
@ -0,0 +1,27 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Logging integration for Click"
+HOMEPAGE="
+	https://github.com/click-contrib/click-log/
+	https://pypi.org/project/click-log/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="dev-python/click[${PYTHON_USEDEP}]"
+BDEPEND="${RDEPEND}"
+
+DOCS=( README.rst )
+
+distutils_enable_tests pytest
--- a/dev-python/cssselect2/Manifest
+++ b/dev-python/cssselect2/Manifest
@ -1,5 +1,5 @@
 DIST cssselect2-0.4.1.tar.gz 32756 BLAKE2B 86915c39aa5b72ebcdba25b3ac23f59a0fb6c6109019d68e8ce8846572d9412a3cc76cdf9e8b2163605cb942183019eb9170df9a4e61476d703eaf612381a903 SHA512 feafeec3dbe3157ee452d94cd391a09cfcb48ca8bd1563c117c77c9ceb01102c4989611ede39e433ec25d3ddda98a94c4589ccb290b79c729683e673763b42ac
 DIST cssselect2-0.5.0.tar.gz 34918 BLAKE2B 12ec30d42caa916e487674ccb910def00acca3f47b3d9e69f376614b997e68f4dae1632a852efd0b9d47c321534935d029fd96028dce9b11e391402b203fbdbd SHA512 869dbce3915db87727b09016c094b908b0055693db238a24c89b0482fed64d7e1811ad2db407faee32638566fd4e47402f05155dc2d8887e98f2107f9b8633c2
 EBUILD cssselect2-0.4.1-r1.ebuild 774 BLAKE2B 945698c1d6b0e9321dc135c91a40faf6d37dc4505404f4538b26a0eca353335ef3d7e461b18aa612f87c60c59a7e5af456b0c0eeaed0d7181bf15bbf7392916e SHA512 7adaaf0556388f5e68b9a7d5ad07cf8dbe84b8d7b3df3dd72530e8cdb2b428454b070a87092d63e0ae051d293ec43c261626d02e1e7d9473f8d9c29c36bfecfd
-EBUILD cssselect2-0.5.0.ebuild 728 BLAKE2B e6def1e8770c14fefd4c83d173fe794013e9568a5f653dd337e42c637c9e3b095989be1e6b16fc3de84d834fd52e55e9d0d7fe206aaa7119470092fa55766973 SHA512 d5ffeddd18682829af75e249b26e0180d83d8c7f63d330188de19649917e61eeaec8f19fc24ea9fbb13525b80e6b9c929d7f23efdadd1b3f5dcd4cf4a2e69b3f
+EBUILD cssselect2-0.5.0.ebuild 735 BLAKE2B 4abda14df4acde259bb87f9f8134817637bcb5d4dfd4c84918455a0192f78058ffa139c619dc67c0af16f98844653b374374a7d2c94c74d8f8424a1526974e0f SHA512 fab9eab9b5869914a80d6fee82547effca220c3c15d6dd9ad907b35e9b1b452d1a26fad07b956f87e7d06931efe8062c3d0f654eea4dd87ba5ca3ca287067b88
 MISC metadata.xml 394 BLAKE2B 23a6ce3791a44c2a50b0a1853f1860ec76c15ca2a437e8406ef8459941921f8f92905933b59841ab9e3ef429a40435e2e480de38311f9bb078af747105d6eb41 SHA512 1c7692aebe1ec93fddf5e536af98a4be44c6610f8bfaff1f58ace0562916c24c5bc67db8455c1cc75eba3296b34a4fce3e72dd770abe4f51c1e83798ee9887eb
--- a/dev-python/cssselect2/cssselect2-0.5.0.ebuild
+++ b/dev-python/cssselect2/cssselect2-0.5.0.ebuild
@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"

 RDEPEND="
 	dev-python/tinycss2[${PYTHON_USEDEP}]
--- a/dev-python/debtcollector/Manifest
+++ b/dev-python/debtcollector/Manifest
@ -1,3 +1,5 @@
 DIST debtcollector-2.4.0.tar.gz 31376 BLAKE2B ccd34005133a888b164538c01ed482da26e91e2dd5d9f11bb0efacc0941c9eb1c0357ce8d0c237734ad450226512263ba8aa52f3b8e712a33a40fac384db2791 SHA512 31287e223524d5997e9dc776766c5ab2ec77c771fca6e9b27e058fdd94a20b67a73147c538f9a7a3155c4ce6eb85a20e8276bedd1a53a81bebcb5daaceb1b463
+DIST debtcollector-2.5.0.tar.gz 31334 BLAKE2B 1f06725ead19e36e6feda1c8666403e536d5f39f775d9a9929a06ea053be41e64575a4e4d28b3a0032610cdd7f68f35bf54ff2445543c4b8ec667732e1a8d5ea SHA512 3f1378c52994a0320b8abd997a1b240496f6f12d29e8b08612bb97c7c8d2993b23224be62cbe4eaa556dcd5a3c7a4a8f8ea4873688e1aad2f26bb5ba522c1d6a
 EBUILD debtcollector-2.4.0.ebuild 755 BLAKE2B 41cd211fe8333ec310e2b49d0939c2eab7f48bf62c401e088c0baf06752c1d381eeb823a80cf66d5b5d901d72ae8e3c0c60bf8585ba781c3c937793aa7b26551 SHA512 aef155ecb7874f83e75cf8c7bea1dec6acac28961fb2a3a6b0067289acf413e8605a905dc1b123e746314f270b9dd171e9703f5bf73aec4ee0e95f439a7bcc86
+EBUILD debtcollector-2.5.0.ebuild 718 BLAKE2B a7d170170a09c50731b0dcab14aa5d6f468057a93a5477c98be194840f34d275db3ecde891ab88fee4d05f9cf2cc4d45a97c500ce80e17426dd911df8c26c972 SHA512 85d738be039be678c64b9a867dc7e8aecd2abe41bafbd0e619343d9c1708fb27631f3b8571ce4488ce60c41488db7426bcaf90d1d3db18f2e2f674729f5aefcb
 MISC metadata.xml 418 BLAKE2B 1f3466117ea254c0f63a9281e3051dd933446a82203153ab31427575948501914f9aa6a14e87331d21f1994079935d6ecf3238099e9cab7368bc0c2d44fe3350 SHA512 6bc03c4667e05f99c140707098339dd590da95fc36f2c0634cf4374b714bde1508558f9e0f5b6a98f05d2950ddc2df78d0732f84f2be47bc317a086ed29581b2
--- a/dev-python/debtcollector/debtcollector-2.5.0.ebuild
+++ b/dev-python/debtcollector/debtcollector-2.5.0.ebuild
@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python deprecation patterns and strategies that collect technical debt"
+HOMEPAGE="https://www.openstack.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/wrapt-1.7.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+	test? (
+		dev-python/subunit[${PYTHON_USEDEP}]
+		dev-python/testtools[${PYTHON_USEDEP}]
+		dev-python/fixtures[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
--- a/dev-python/flatbuffers/Manifest
+++ b/dev-python/flatbuffers/Manifest
@ -1,3 +1,3 @@
 DIST flatbuffers-2.0.tar.gz 22462 BLAKE2B a07f1d27afd71aaa23ba26a061267f95bbb7e0ced8b2c110b3d60fdb9d922fd4b339d7abc63068a030e08e6d824871c61110a665edd6781ac54dd5ef8613975a SHA512 76636449c107f1b2d1a1f395dfbb04c89c25946d8a731a257475ff2517f9667095f3527280b87fdd4081fd5a9f7aa0a112d5daae742c1575d29abb69da595b6d
-EBUILD flatbuffers-2.0.ebuild 431 BLAKE2B e7420c8f66ba20ed210a4d6ec6f30c5e92050eb2e6c1632369a0fe4432e21c9c862ed0ababea673f0bf9738a74a6349f27c0314da80e5126323860dcd36e79fe SHA512 4b44d1cc187688cf749404717b1022c3dbfe9c51e473d28cf22f1e1a1c06e9546b407c8b7728e90884be974388c4d878b4cafa34aa22735526d050c42a2a4e55
+EBUILD flatbuffers-2.0.ebuild 438 BLAKE2B 823902d864563527a1ae616ceabd17acb8aceb50c2306a510d2a6f0ad249b9dc0a9133d2ae95cf54331d46cc347a234f42b46844f163d6d1a945f299bab05f29 SHA512 c47f50c0804612b8e8486df0ec1cdf0f06cc3a0cacca924fc94ea70a498cd0c7f0fd9b3b13b33571d6c3c79933e8acaa51b73535318c0488d1e086381dafcfc6
 MISC metadata.xml 402 BLAKE2B bf3db07152b0a0ffc120390c8c0267887430428621aab106730b9ede41e211594d7950bdd52f5eee15080be5f60d4d781269f5ee192b131256e6857ffe45a2b5 SHA512 dd3f03a16f95ece3be6ed0967ac0f948c33552e2af05d52780a376556189839df020b642fa7151e78031cac6a6f7b2811b616c2a6da4f2d7dd95d12789e33764
--- a/dev-python/flatbuffers/flatbuffers-2.0.ebuild
+++ b/dev-python/flatbuffers/flatbuffers-2.0.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@ -12,4 +12,4 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 x86"
+KEYWORDS="amd64 arm arm64 ~riscv x86"
--- a/dev-python/importlib_metadata/Manifest
+++ b/dev-python/importlib_metadata/Manifest
@ -2,9 +2,11 @@ DIST importlib_metadata-4.10.1.tar.gz 42013 BLAKE2B 056a8e16cacc961bef5168c903f5
 DIST importlib_metadata-4.11.0.tar.gz 42170 BLAKE2B b1f0a887c3b62981b3312a06b0ebb0bc8e03313f6b1cfb58f59ef934f15aeb5247cf58befba7551f3485bd7162ed8a3c90633a88445a03257aeb9c15a101c08a SHA512 d959fdbf947c034fcac921677041a9f765a09b9b63566f83680f4fe68260d09278f5a3fe443ce0c63a8e561f9cc6e0b48721e75c065af3c89a91cdffe6d2d451
 DIST importlib_metadata-4.11.1.tar.gz 42224 BLAKE2B 7d376d0bfaf3304ea8412559bcbafd2a92ee88a045432a1245b5127ac1766c2842374f4e05e140e95f0e7e73072cdfe6fba6b140c656470f1c24aae8500b662f SHA512 1f7a5469b378b9f3080ae893637eb5aa778267250c50c8a56786d912ef8cd2f737cc580686f7ce37351505728493ac5feb243823ec37b7afc978746e7dc70cef
 DIST importlib_metadata-4.11.2.tar.gz 43293 BLAKE2B ea515da66eed404d7d6bdf09fc3ade31c34a48656a6e37219c2d86eed3004ef2c82dc80f916de54b45e4b462a3b142d40b8e2ee959614e9be011844ba12eb3fc SHA512 114a8078b15905a898d63934f208d6409ec043cd5ac35f9455f532956fb7e5262df26aadcd8618ca8b2baf69333147a15d456fdb0d8e50163aecedfccb6003d9
+DIST importlib_metadata-4.11.3.tar.gz 43607 BLAKE2B 661f8ce68869540995dbee39c6be07d7b88e8339267d4d49744691f2347ab2bcc9ac33c4cafd6caed5fa9ce3d4a3640a816e4659eee9a59b5ccc1df2edd2f6aa SHA512 d33efa2abba5f6f770615f133c940a61948ce5091d59526ee2c7e3866aebd74d79ac464f72602404c2b56fe284a93a9cd1b0cac251ceea53666019485bdddf23
 EBUILD importlib_metadata-4.10.1-r1.ebuild 1427 BLAKE2B 9ba0578c567c954ba5b32f49bacdb65de1f85c01abddbf2884354db6b51f76df078c984c2c8bce75c945ef5a4de14b366668ce92c02d8498ca8a891b439757c5 SHA512 7d0d8673207828a64a270bcefc107d529bc3e12344d984056387e803425eb9247144f24297b7d7e0afdaaed43f85051bfb9975048799aabc6e4ef6e78b80379d
 EBUILD importlib_metadata-4.10.1.ebuild 994 BLAKE2B aa13445b7cf7d7f0ae20a3710a24440798a253c647bb7b00dbe21ac20db1005988ea8cbf25b3b55a804e77338ae732ca8ef76cd693ecc3c268ea4a86b66ba229 SHA512 cbb721aaf32761dbe3f8c0142874479e1012504806e6ea7ba3a6f07d65f68ef4ef1ca3815081cf778e3fc9495a5b7e396c1f14347ae74b5bb950e751b29e4d96
 EBUILD importlib_metadata-4.11.0.ebuild 1415 BLAKE2B 82f1c31b7535af14588e9857fc532c3569d3b4f6f43b24d076c40c7a6b123e968fb0a9999f59e5c83889d3a1b8cfa94a2537b92be07c558db690f979a43d4fce SHA512 8460f9dd31287dce73fb35676391bb6eba76743310b6c09a074d87fa7c2b35e9a96003679384f48d43d3cf38bfdc014c01f0b66bedd4766ba3a0b983d416cb97
 EBUILD importlib_metadata-4.11.1.ebuild 1415 BLAKE2B 82f1c31b7535af14588e9857fc532c3569d3b4f6f43b24d076c40c7a6b123e968fb0a9999f59e5c83889d3a1b8cfa94a2537b92be07c558db690f979a43d4fce SHA512 8460f9dd31287dce73fb35676391bb6eba76743310b6c09a074d87fa7c2b35e9a96003679384f48d43d3cf38bfdc014c01f0b66bedd4766ba3a0b983d416cb97
 EBUILD importlib_metadata-4.11.2.ebuild 1475 BLAKE2B f6ef6dd43a4314a8025de3369eb24ad5570aceeb3cfd6a86a0a20e24f47b7d5d23955037e2c3903d04a444584e1bc4fd93161fb39705eab879486c9336b2df6a SHA512 227ed3d264ca9372d522535fba49b7b942a94ba2eca1735d64de22d28e196e4dc1a04c02b313364103de1380b9603529bd18b1b1df2ffa1879ef93937b62d80c
+EBUILD importlib_metadata-4.11.3.ebuild 1475 BLAKE2B f6ef6dd43a4314a8025de3369eb24ad5570aceeb3cfd6a86a0a20e24f47b7d5d23955037e2c3903d04a444584e1bc4fd93161fb39705eab879486c9336b2df6a SHA512 227ed3d264ca9372d522535fba49b7b942a94ba2eca1735d64de22d28e196e4dc1a04c02b313364103de1380b9603529bd18b1b1df2ffa1879ef93937b62d80c
 MISC metadata.xml 646 BLAKE2B c3f9ff98b5090d22a37a5a5b36b6c8523b4d1ee804c05c880bffe6a45ee482023d4c037b49332bfa93cb60cc5892d1178b486cf1d2e0d4c44d7da8d292e406d5 SHA512 e558c5ae62e98685a43bfafbff6fc5d5339965a9bf8c6bf0bd8cd5b542c94ae6ecaf0a04e5210b211a32abb65b37c5db6af64dc7d74ae79ec31075fcc659c9f4
--- a/dev-python/importlib_metadata/importlib_metadata-4.11.3.ebuild
+++ b/dev-python/importlib_metadata/importlib_metadata-4.11.3.ebuild
@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
+EAPI=7
+
+DISTUTILS_USE_PEP517=flit
+# NB: this package extends beyond built-in importlib stuff in py3.8+
+# new entry_point API not yet included in cpython release
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Read metadata from Python packages"
+HOMEPAGE="https://github.com/python/importlib_metadata"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	dev-python/zipp[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/packaging[${PYTHON_USEDEP}]
+		dev-python/pyfakefs[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/importlib_resources[${PYTHON_USEDEP}]
+		' 3.8)
+	)
+"
+
+distutils_enable_sphinx docs dev-python/jaraco-packaging dev-python/rst-linker
+distutils_enable_tests unittest
+
+src_configure() {
+	grep -q 'build-backend = "setuptools' pyproject.toml ||
+		die "Upstream changed build-backend, recheck"
+	# write a custom pyproject.toml to ease setuptools bootstrap
+	cat > pyproject.toml <<-EOF || die
+		[build-system]
+		requires = ["flit_core >=3.2,<4"]
+		build-backend = "flit_core.buildapi"
+
+		[project]
+		name = "importlib_metadata"
+		version = "${PV}"
+		description = "Read metadata from Python packages"
+	EOF
+}
--- a/dev-python/ipykernel/Manifest
+++ b/dev-python/ipykernel/Manifest
@ -1,6 +1,8 @@
 AUX ipykernel-6.5.0-drop-pytest-cov.patch 420 BLAKE2B 89c6eafcf86a9033122a59a94414debec73ae849ceab34f69fe3dfe6ae225c31503f33f09d3c0460b5ed98677a2eba71285948e9b8f75b1704d7328b9a4eb0d9 SHA512 df15b568d93709ffa2a8ad2e28c8f3c6ad7aac8108c0306a1922041ccda82c5871149aa5eb4e507bfad0cf948bccdfac7e49d63f4cb6b9302c71673d6c0fa038
 DIST ipykernel-6.6.1.tar.gz 123915 BLAKE2B 136a3acdea6790d4666c3f5b0d040a91be405ff35e510456d920d0d2d2fb4f4076eb8e74089d08c42f0eba50caa48da929c1a684ad414919a67748f13d6fdf78 SHA512 bfe37f3d69c9b05f9bbbdec7f2103c353433b402474507a9d17c02f224e3a80eaea010b5a8bcebfd4410fbba661feae74107a4904c0af7835c6c1aa6bd0c1159
 DIST ipykernel-6.9.1.tar.gz 127244 BLAKE2B 13f3860f4d565bb4b362841bdcdd81ed5e3284ca6b4750c491cf5895d09fa1a1671acc8529066355cf2f549f89099dfaf8024281ab445b5db0e5ae52062c36d4 SHA512 5c977b01068153762817a372a20e8f3c7055f1cca16d4a4a03f73f4d9c5ce78597a106a4d153fd04dc601129fd8e1993d686e8ff6e299c2169a9d6f1272de58a
+DIST ipykernel-6.9.2.tar.gz 128759 BLAKE2B 74740bdbe420d14cbb75e5a1dee9bfb0894c3e10ebf029bd7ceb29eb5112489ef83bc9a2075f6dd1cf16745f893d3782ee22144edfec66d650246eaa0d97215c SHA512 a452d7a44c4e33cb2d79262916045fe3044803f20db7d525bca3277dd49e9d216d07a832312b29a5a61293ecf7863641a45e0f188136059799287c5983beb0d4
 EBUILD ipykernel-6.6.1.ebuild 2101 BLAKE2B 02eb02ab1ede7442c1342ea76fcf7b38304f3f022c543b858279048b9d652401623b1fa01b05311466bdcc14a92f641e7a233144bb13e185f6d4015109ed842d SHA512 086142ba984c98fa9db935bc47782e7c928539f22b13635945a2c8c1cc919f6547ee6b264e4481e696c06d4d2ca4d6f508018acbbb6feeb72006feedb3674663
 EBUILD ipykernel-6.9.1.ebuild 2162 BLAKE2B 2394d09ca12b0c2cc3dcf0ef4b66019df0fa930358b5d7619b8ae3d806ac2fece5b73ef6668358c89838cac1710921d73d8fb47236a4b1334406dc7bd1b95d67 SHA512 3e88c7926c1893224a33a479d9f564d975329081f995c49b6a88ac1b5211d7afadf551d2c2194ea3e5f8537ac6f7dc6b4ecf6f5ac1c9055c61e622856c76e891
+EBUILD ipykernel-6.9.2.ebuild 2200 BLAKE2B 7b8865b5814bc08aae20ce307db4e71f1a6440abbb769e90536e14974566d7b44d84bfb9286732db640b69ea1440809f835e94dd228ec59451a8a235457ea5ee SHA512 c3b864965a71e4e94056f49ab9419c4e4104d32d8d68ac3ce1fcc584c30dcb8515b1d6b43ef89b500ccb8fc75031f90528d2c104bb985e27184a18ed3620e947
 MISC metadata.xml 527 BLAKE2B 4a24cb9d5b801bf94c71c47d0c90b04bc249fb41a794c7b688a5762f08545d1fcfe9e4976aa4f583ecb456458b5f6dfc394349633959444584c0abad0da4be42 SHA512 ed9f0ef12ec5de67a646783243555f1737604a84c78c57b9f7c65137cec8cbc396991411501927f92bd393daad2238c27363ecc9c115031450231c2a4fb2cbb9
--- a/dev-python/ipykernel/ipykernel-6.9.2.ebuild
+++ b/dev-python/ipykernel/ipykernel-6.9.2.ebuild
@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="IPython Kernel for Jupyter"
+HOMEPAGE="https://github.com/ipython/ipykernel"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/debugpy-1.0.0[${PYTHON_USEDEP}]
+	<dev-python/debugpy-2.0[${PYTHON_USEDEP}]
+	>=dev-python/ipython-7.23.1[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-5.1.0[${PYTHON_USEDEP}]
+	<dev-python/traitlets-6.0[${PYTHON_USEDEP}]
+	<dev-python/jupyter_client-8.0[${PYTHON_USEDEP}]
+	>=www-servers/tornado-4.2[${PYTHON_USEDEP}]
+	<www-servers/tornado-7.0[${PYTHON_USEDEP}]
+	>=dev-python/matplotlib-inline-0.1.0[${PYTHON_USEDEP}]
+	<dev-python/matplotlib-inline-0.2.0[${PYTHON_USEDEP}]
+	dev-python/nest_asyncio[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+"
+# RDEPEND seems specifically needed in BDEPEND, at least jupyter
+# bug #816486
+BDEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/nose_warnings_filters[${PYTHON_USEDEP}]
+		dev-python/ipyparallel[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.5.0-drop-pytest-cov.patch
+)
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# TODO
+	ipykernel/tests/test_debugger.py::test_attach_debug
+	ipykernel/tests/test_debugger.py::test_set_breakpoints
+	ipykernel/tests/test_debugger.py::test_stop_on_breakpoint
+	ipykernel/tests/test_debugger.py::test_breakpoint_in_cell_with_leading_empty_lines
+	ipykernel/tests/test_debugger.py::test_rich_inspect_not_at_breakpoint
+	ipykernel/tests/test_debugger.py::test_rich_inspect_at_breakpoint
+)
+
+src_prepare() {
+	sed -i -e 's:^TIMEOUT = .*:TIMEOUT = 120:' ipykernel/tests/*.py || die
+	distutils-r1_src_prepare
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	# Use python3 in kernel.json configuration, bug #784764
+	sed -i -e '/python3.[0-9]\+/s//python3/' \
+		"${BUILD_DIR}/install${EPREFIX}/usr/share/jupyter/kernels/python3/kernel.json" || die
+}
--- a/dev-python/klein/Manifest
+++ b/dev-python/klein/Manifest
@ -1,3 +1,3 @@
 DIST klein-21.8.0.tar.gz 100578 BLAKE2B ea2535e93affebe822ff086eb5749481edf7811340a35b11319b7c23b23d3877f6208ac1ef6cc7a4bb9eedd33d087820304f2ee71695413d72308e83c47aa2ee SHA512 cce28865e172effb6044f73c1841875fa5eb55daf20dcea482d0764604ab826ca5063a4679165bb253953d54428a42c2082022fd273e2a1083aefa595a563ccd
-EBUILD klein-21.8.0.ebuild 1126 BLAKE2B dc26a8837dc40d162e1bbbfc28820d7822fddc20ed99c1103fcde4d709539d052cbd2f7f28fd32ab22f5b2d56d3e966de7eddc5bbf8bfc76cf357a0d8f9f4905 SHA512 3807b89de102defd80c3e244f26d62ca71c7a03c92ec61efedbdfd26b0a51b7c6a35b0d6eb5fcbbd85be6d5cef5e101cf54817a10d5d0c582b26defa396ae9b0
+EBUILD klein-21.8.0.ebuild 1133 BLAKE2B c4fbb1fdb49b926560d96026ed8fc700acfc9e32de6147738cf4840f78cf5b447d81fd53cd5535f61911b2d387c4e834a8260a76ed7dd4a4ef2c029285ed6210 SHA512 8b99ef4deeb0cad871bdab7678b5983b7cad86108099fb89b55ec8821e5262e978b7785bf9ad3012cdf60d311c7f519eb54089758072cf95bffba6833d60027f
 MISC metadata.xml 973 BLAKE2B 870f3a89f25a7b230a3b837287ed3c0f96bb2ada0eeaf464b0bbf70c4982be57a783c73671309044053d24c57f9c77d79e72ec65d031d8ddd4e7e406822823fc SHA512 9e81588cbd096d31af040b48e467af6d124d4f4249abf808b4ee4a8f1171b5c02a8e5d87bcb869d8f4d86c3224c9e555a1e5f3d4aba8a1b2a179f3c5aa609726
--- a/dev-python/klein/klein-21.8.0.ebuild
+++ b/dev-python/klein/klein-21.8.0.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8
@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

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

 RDEPEND="
 	dev-python/attrs[${PYTHON_USEDEP}]
--- a/dev-python/ldap3/Manifest
+++ b/dev-python/ldap3/Manifest
@ -1,5 +1,5 @@
 DIST ldap3-2.8.1.tar.gz 961648 BLAKE2B d6cbc52512efbe4f6fe5e7d19ee2ce1af3e03a8d6d08d2235eeff0f00c61fd12583c4b9fb452206ba161961c3438d109fa106a50a0edc858c24f5cd6261b2561 SHA512 f37e76e1008c990290285a757def6fe70e227393fbbdf84eb1130d5fdfd17db724c544848cc424ca7831f8cc9e8d25407fc139981ebd10818064f588adbafebf
 DIST ldap3-2.9.1.tar.gz 974013 BLAKE2B a75219403e68705b10c06e692f4f188575a4ae38c86f15ceb6d2c674e74ac44ce0f53e3ec6bf66e8413007589293e2db95497de7b0317066b36105940beb11bf SHA512 bf07ebca9a53a8c225bc3106d3bd45eb26557c6e5a3d6d45a7f8c149d938ad43825eed0d406a57b93e2e675ed7aa262828f022ab82eb683f0e3029e3ad823106
 EBUILD ldap3-2.8.1.ebuild 622 BLAKE2B b72e9d3c22c6cbc0fc85564551653d76611267b57573895d0491154dac2e43d593383aa4bbb5ee017a8334451d02f7a6bc0bce3f850a17b74fef9ac7eca3cb88 SHA512 4ae45ffd683b0964251efe70c585e09f410990fbad5849cd6a3c37d75a4b2b3fd1cfd759579e9565ae0f0fdc3ec10890d1ddf534b04939c188d0dc56a807c673
-EBUILD ldap3-2.9.1.ebuild 624 BLAKE2B 94ed07592a084e4526a823efba63a08106d2a41a3b1e99c0d1034127600c1504ed6a7e04cb1ec646754a00014e1ad4a326b0862052c2c881b385ff2fb868831c SHA512 27f889af34e72a8b6f21e4bea12dfac2d9a0e37d45fd898c01982fabdc0a8e5fb1f4a3dbdc08093a4cb41dbc81147e9fbf42f96234f1d8772b4b5fe098bec78b
+EBUILD ldap3-2.9.1.ebuild 631 BLAKE2B 46d0ee2ebf1eaa0ce70840fbc69cc8dfa1681e7efb2fce2f2f5d752742b83704b8cd7d5165fa0b5d5b3f267279eeb610a6122a6dbfab5946d88a8083c972c726 SHA512 3d00ce3969cf4c96db6dd76304f80b74761290324b399dd322dc60427662ef064809194582e126307f16f9e3c20085665e1c65c1c85af88764c2165f018f060c
 MISC metadata.xml 692 BLAKE2B b1beff8f304b984eb476e45ca34066766a31d512baefdf6ff1bd6f1bd50134664eac751a383a8a6812b48908ec5bb52ef3ba6796d1d7b1ee78a7b5c62cbcfc4d SHA512 58d0c6b1aa0afdb372ddb2abad94ecc5b6b3fce3f62ab50b80634ca7ba49b4ffc75ffec91515c22d2136f52123cb8c9feb58179670d2c4f16acd1f413585505b
--- a/dev-python/ldap3/ldap3-2.9.1.ebuild
+++ b/dev-python/ldap3/ldap3-2.9.1.ebuild
@ -15,7 +15,7 @@ SRC_URI="https://github.com/cannatag/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"

 # tests require a ldap server and extra configuration
 RESTRICT="test"
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@ -2,14 +2,12 @@ DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45c
 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
 DIST llvmorg-13.0.0.tar.gz 147270176 BLAKE2B 628f316b580e1edf3a58d4825b724df759e6ed2a4116802470c04562caefc392fa325c91f388036365a2e45a9595cca6d3557fab12984fc8bcfef29c9116d822 SHA512 8004c05d32b9720fb3391783621690c1df9bd1e97e72cbff9192ed88a84b0acd303b61432145fa917b5b5e548c8cee29b24ef8547dcc8677adf4816e7a8a0eb2
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
-DIST llvmorg-14.0.0-rc2.tar.gz 158069989 BLAKE2B 06dcf5d82cd100bd792eadb3816cb297a11dc64dc8b699ccb2eac8ef0da4f10a24ba1984376427b638def6c8c8ae5bc9562e1cc30281fc55f044aa2a9657fc81 SHA512 c77d8c6db2ee6536f7e980465d5a3eb34403c6529e2012a4778ce76a559a6d639cf4c5ec84f965287d4b0739a73dc3e65d7deb27815d74c35e823839e579d2a3
 DIST llvmorg-14.0.0-rc4.tar.gz 158082013 BLAKE2B 0e717898d8f1ed160e525a68aba56a84b7d31856ea72fdb8fa02e863c5a2074245a38d4a4aa7d178beab1ea64aa92d0ba9dcad4373ebb03868070bf718112107 SHA512 a942848aa5042b97bab6d0d5bcee11ea2f85f1244d7eaadb8f7000bf104b2160e6034c04e3755501dd178bc99c26669cf4aca40edb4bba598fdde6bcf3f40ddc
 EBUILD lit-11.1.0.ebuild 901 BLAKE2B 03656b1026178d703dc2274b8c8e64504d9f84f9946a34efc1e6a03d3b3038f2a6c23e3c16efc6666314f695315a1995d3cbb5a385a17811fb44a372d6caa6bc SHA512 7a09406d817d5110a489686aefb87d85bb0b8b0a958cb2c4a2065b02e2eb6152023a1f06391be934629c27032b73dbca971404bd848a93a9ab602baf7591b838
 EBUILD lit-12.0.1.ebuild 874 BLAKE2B b81a41897a2bf7e2c266cc70bc77c694f6d49423b6d7e8eec56d2702377abf4df9dad93126232808dd913ecbdf489fc2a21f4a4281b266e74498f241815a858e SHA512 584c8ef14481ac16ebe461ce0fd7680eef44f743caf51a30fc78e4b4b840a335cd37e2a767140fb65daad543633b8922174892d47bdc1dee8055b6a97237167e
 EBUILD lit-13.0.0.ebuild 874 BLAKE2B b81a41897a2bf7e2c266cc70bc77c694f6d49423b6d7e8eec56d2702377abf4df9dad93126232808dd913ecbdf489fc2a21f4a4281b266e74498f241815a858e SHA512 584c8ef14481ac16ebe461ce0fd7680eef44f743caf51a30fc78e4b4b840a335cd37e2a767140fb65daad543633b8922174892d47bdc1dee8055b6a97237167e
 EBUILD lit-13.0.1.ebuild 909 BLAKE2B 75a0e073d22d2a8afc5a3074c27746431d4fbd41d115f91502994564da1428924dc5ecf92a0311879ab2579b0c6ab272a14bea5c143b087bac0966c3ce3704cc SHA512 f1c3c88c1483b3e9813b897b4386ce850f143b418d30291319214b57b4557caae8d1f577398bccba38cc7884b61d02b06bab29faa4550204a488f2b32957ab72
 EBUILD lit-14.0.0.9999.ebuild 870 BLAKE2B f2ead6cc71c782a468f5e8b4e8c55c32e477173594bd62544d6a1cb73186f4abc77629c03ff8314c04f2ff74152f6c26d117e4491047bc8f79056e751cd6b9be SHA512 5be9a463e0e43a52a7f997fe281f792ab6c32cf18acd578fc2df291318d53bd6a1f38475133304a9c0f7fb28a33822c779890809ddcae7232d83682a24a164ba
-EBUILD lit-14.0.0_rc2.ebuild 870 BLAKE2B f2ead6cc71c782a468f5e8b4e8c55c32e477173594bd62544d6a1cb73186f4abc77629c03ff8314c04f2ff74152f6c26d117e4491047bc8f79056e751cd6b9be SHA512 5be9a463e0e43a52a7f997fe281f792ab6c32cf18acd578fc2df291318d53bd6a1f38475133304a9c0f7fb28a33822c779890809ddcae7232d83682a24a164ba
 EBUILD lit-14.0.0_rc4.ebuild 870 BLAKE2B f2ead6cc71c782a468f5e8b4e8c55c32e477173594bd62544d6a1cb73186f4abc77629c03ff8314c04f2ff74152f6c26d117e4491047bc8f79056e751cd6b9be SHA512 5be9a463e0e43a52a7f997fe281f792ab6c32cf18acd578fc2df291318d53bd6a1f38475133304a9c0f7fb28a33822c779890809ddcae7232d83682a24a164ba
 EBUILD lit-15.0.0.9999.ebuild 870 BLAKE2B f2ead6cc71c782a468f5e8b4e8c55c32e477173594bd62544d6a1cb73186f4abc77629c03ff8314c04f2ff74152f6c26d117e4491047bc8f79056e751cd6b9be SHA512 5be9a463e0e43a52a7f997fe281f792ab6c32cf18acd578fc2df291318d53bd6a1f38475133304a9c0f7fb28a33822c779890809ddcae7232d83682a24a164ba
 MISC metadata.xml 283 BLAKE2B 7636ccca14947f04df1e43d5ab56b0486ea2a3c500077c6dacadce13f2eb46d7729bd2766ed9e4bcc1748dc72d9c21b61b8c04c83fb78d4341f286e04b5d33ea SHA512 8816317f9fe5bc2df7b2e5bb9a9582f042e5fdd634b897e1fcc6a256d41e45d1215399b0a4bea8b1d47bf10ee122796eb723f3e4c654d4cc6d7772927aae790b
--- a/dev-python/lit/lit-14.0.0_rc2.ebuild
+++ b/dev-python/lit/lit-14.0.0_rc2.ebuild
@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 llvm.org
-
-DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS=""
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# Tests require 'FileCheck' and 'not' utilities (from llvm)
-BDEPEND="
-	test? (
-		dev-python/psutil[${PYTHON_USEDEP}]
-		sys-devel/llvm
-	)"
-
-LLVM_COMPONENTS=( llvm/utils/lit )
-llvm.org_set_globals
-
-# TODO: move the manpage generation here (from sys-devel/llvm)
-
-src_prepare() {
-	cd "${WORKDIR}" || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x LIT_PRESERVES_TMP=1
-	local litflags=$(get_lit_flags)
-	./lit.py ${litflags//;/ } tests || die
-}
--- a/dev-python/lunr/Manifest
+++ b/dev-python/lunr/Manifest
@ -1,3 +1,5 @@
 DIST lunr-0.6.1.tar.gz 853421 BLAKE2B 7cc1624c91d07fa4e30ae789cbdffa1d98c011bd17a314bdb498ecfb7941fca7f0b6f36738377d10c17a7e400f8555be52fee8a1e03d3dfd8d931db88c4e25c9 SHA512 991569b6657c4cba653c999aa7610768303d1b184142c7f82a6c8ab44459b01cf7ae7db9f3bc45512161452b73e3b4cfbac3e8f7a0738e1f4b1429a8d8fe73e1
+DIST lunr-0.6.2.tar.gz 45968 BLAKE2B dd9328182f58ff623bf81c5cfdf31e7a8b004f5aa9e64934f09ffda3626143f5dc5ab92339208b886a91e00100cff65295b65d416faa3f38bbe4fe6c39299826 SHA512 6b7c29d30a8a64b71246ff884e473cceeef5e00e382ad54474e7855dcafcf3817dcc14c29c1bb2eb3371f1cb5ab1485a7840dbe41d345a4503294052aa9cd644
 EBUILD lunr-0.6.1.ebuild 643 BLAKE2B d0401b7984fc1f170892157d8b6bdd62d632058ad1a33c4208d9a8b27a6eb514f86d4e359f0737f2091b8d9ae5b9d2d004820408a343dba9a976de22055c3e25 SHA512 d38ebcce81f1da08374221aec3f74a76173aa2e78d24da5423a7f2ccbe87ffdaa01b03ddf718db1ae6ece95993f594d217a331f642941b0f9859adee880a670a
-MISC metadata.xml 494 BLAKE2B 624c11f3ebd0b13224b99de1573d375584b7a389861c021d252f7faf6ee4a307fb33c2e2daa778828b26f06aebf739b08d1c7534fc8fb2c3a4ca198c0ad64ee5 SHA512 06da66d283dc7f9c6bb970932625f257439c04f6eed3ae5f151b7801e118ecf7dcf75177413967b1367f4601103ab2181e71863475fb29c90f860692cfebbb47
+EBUILD lunr-0.6.2.ebuild 604 BLAKE2B e8658fdf01b262d5546775619887295c1051f1e7e536f44283fa49440aee16119d8ef46b21d0769ece8cd5193aa00409920911d8c79cf12b94b4ca1864dbd2f9 SHA512 fe629a03a044bd082d0e68b2df87cde8a1e3cc0c46e10b2b58264207916315b82de28331877c27ea56bc47ea4df6fa97618a13911b4355067d1cb0365e0d82f0
+MISC metadata.xml 375 BLAKE2B c0ed394b833501fb7302f5a9b5d93d1b5f97a6e19c4e51cc8a58c5bac66dd51cd974609caf1887f3f902a6f415a07fd23b1134c3f95ad1ec5a1e4f23f8884e56 SHA512 d4ea5ea7423680d59c9a0f35939d106fb1295dbb89216ff488250fe46f37fc3d0c35aaede7a1af03a70819b1014dd5f9a88cbbe7f4b7f8849334243e3cb94aec
--- a/dev-python/lunr/lunr-0.6.2.ebuild
+++ b/dev-python/lunr/lunr-0.6.2.ebuild
@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1
+
+DESCRIPTION="A Python implementation of Lunr.js"
+HOMEPAGE="https://github.com/yeraydiazdiaz/lunr.py"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/nltk[${PYTHON_USEDEP}]"
+
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	tests/acceptance_tests
+	tests/test_stemmer
+)
--- a/dev-python/lunr/metadata.xml
+++ b/dev-python/lunr/metadata.xml
@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>andrewammerlaan@gentoo.org</email>
-		<name>Andrew Ammerlaan</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
--- a/dev-python/lz4/Manifest
+++ b/dev-python/lz4/Manifest
@ -1,5 +1,5 @@
 DIST lz4-3.1.10.tar.gz 162886 BLAKE2B d87a84e619b62b0fb13c942c5bee1ba78c1457e1f8bef093d5be732ea6b1481ad1de38a3e3e9e3479fb407477d43183b376fd1ce2a2b5d6289d293a6c79dc414 SHA512 61983e77fa445f59503ccf8ed5fe0605d79754cdeb166e16a7093a856b23369634db7d105d57b3829e680dad0a3728adec9d18dccd92c994347b74c5af95580e
 DIST lz4-4.0.0.tar.gz 163729 BLAKE2B ce617f2aea3f45cf9fb0bf642599a1d872d9532ab465d32602b63987081a7e78ab4ac4373a41c6a97ec50eb6f2debc078288554966390651325ba166faa79c0d SHA512 885d215dd4caadc84d1e2a9575be9972a33a43af089f0788192c9f4f53382c0937f9d67aac412e2860c9ba393ee3bb15dfe273865acb6a3cf8aecdce8292ecc9
 EBUILD lz4-3.1.10.ebuild 642 BLAKE2B b4229401b368d1e36f70bfce1057d72753ccdca0ecd346dd4ad86e0affda1cfda60a1c588502dfb7bc71609142bbf59bf95183a330ed436e508951efb483c8ef SHA512 cbf13d5f87bf1a00e3359c51b2971a40d13aea551f246f7e3ccb692a0f706e73f59bb52464ffd9ff23e58a3f0db01bc108f2ddda9a4240c7e09afe1366ec7108
-EBUILD lz4-4.0.0.ebuild 835 BLAKE2B d0faca3833827923f036e271e10f091476f1eb89b261589ada1fd7038914638810d6a84a74815ad1b97ec968280942cf857d8a5650c6c6ee2fd40c2081795553 SHA512 e9802e48ed7683c4d0a7d8486e607ac42095c1046b687043732f6d4696d35fc5c115fe94a36d36395119862616b0a94b1acdcdceadf8fe743e3b0e5770583af9
+EBUILD lz4-4.0.0.ebuild 842 BLAKE2B 9d9ee701f7d71d81e1db19a179c5572279a98c12c2fe1302cff648d3e25b5d4f3724ff7361ee0531be54d578d561f6396149e35d46f98168a4f2c30c688447fc SHA512 9e429444266f6e03f9b80bf7ff1cdabd619e4640479fb88befc90fcb51db9408dccc9538620ea0d2096f35ed0a588f373fa0c27d82f982768568a50a6c631781
 MISC metadata.xml 454 BLAKE2B b02d4acc9eb7d4fb35bf36371cb660d099c77f807fc08fc351b7e0e1d2e0199fdab82d83bb6bc31a56bfdb9a5b020b2f57aa9b89b59a7e5c22fcce554b6b0859 SHA512 a1b61eb4d3ce636b10abcff25ee3315bf5ecb3bdee58e1c45ff99f0b40717b13e3a8ec33c9abcb926bd716990a31749b1bf6729d8137b7859857318c386a8ec7
--- a/dev-python/lz4/lz4-4.0.0.ebuild
+++ b/dev-python/lz4/lz4-4.0.0.ebuild
@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"

 RDEPEND="app-arch/lz4:="
 DEPEND=${RDEPEND}
--- a/dev-python/marshmallow/Manifest
+++ b/dev-python/marshmallow/Manifest
@ -1,3 +1,5 @@
 DIST marshmallow-3.14.0.tar.gz 175637 BLAKE2B 003bd5ee17d4c3db63fabcd75838f5455576eb8a741a0f1daba8c629ade145593538ba15d3ecd47d5b3cce65573f4ecd765c9badb0dd077c44b6d04537a1332f SHA512 3eed3cb7ba063c6a3503091b46443c6ad96f82e6c21e7ceb047b379dddad4429e59a8e5c828be258433b2743a8231bb338ef96f21767f17ed75fe44138bb0d64
+DIST marshmallow-3.15.0.tar.gz 179483 BLAKE2B 5cd660f4b1bf3ffb775e06659adce2f0da8bf46bd5376eb4407793925de60fce48ac633baced399314d9cef1faaf00f2643e56404cdc2c44e51b5b0c42ab533d SHA512 9d688466b9dfce7cd3307538aadb68c8297d3ee026a7a61953d361a9e52acafd00da81f48ab26771dba74bf8024117d53292763ab98cb78e2bbd7b5604bee4f1
 EBUILD marshmallow-3.14.0.ebuild 606 BLAKE2B fd3580272c99e15dbeb8d9531bfb7d49cab2435b77144b5374eac157f03f0ebd6e12012af809239b7fdaac47cd051735d5be42ba65c9cdf0d32833871a7f2aa5 SHA512 85b4867b9bd6900e0515d89700897a7e265c4ed7d9430dc5b36ab0b9f09e05510df8a265302dd4a425bced95392930dcbb542e829148b294dc9b9413c55bd0ed
+EBUILD marshmallow-3.15.0.ebuild 680 BLAKE2B 91ca8eda12e9cd00c5624a134139922f09b1533aae29e7d7c9a5863d8e113aa689e4b4fc802ae53dc10aee72644cc6ab8a9525c59c2a6416a6e376bffb060764 SHA512 6a81faca248de16f1723c11df27e3cc6d66fa39dc960341cfe6d1e384b00c40e657f5e6a44f3295b38dff20d82bf35e5d6641b332e0efda841162840a019bb93
 MISC metadata.xml 462 BLAKE2B 8092c0a0e4a28fdedd16131788e41c7133a7d114b6603c859a7b75a3e2c1519e51450c6ecd8b8bb42b16feee2b187d61a3241c4af6a4decebe85cd011944271d SHA512 bc243259fe7e0cf4892a8e9d5bc9792cdf9166400e6c5a2bb00dda58a1a4eae672c9b5c9723ba662f583bf47b994134943d6879141472e9ca4395d8700649997
--- a/dev-python/marshmallow/marshmallow-3.15.0.ebuild
+++ b/dev-python/marshmallow/marshmallow-3.15.0.ebuild
@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A library for converting to and from native Python datatypes"
+HOMEPAGE="https://github.com/marshmallow-code/marshmallow/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/simplejson[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
--- a/dev-python/mypy/Manifest
+++ b/dev-python/mypy/Manifest
@ -3,8 +3,10 @@ DIST mypy-0.910.tar.gz 2551057 BLAKE2B a3c6939c8f0e2ea19a3a3f91031330df2fb25a93c
 DIST mypy-0.921.tar.gz 2730985 BLAKE2B cfb7b54165b961758891fcf225f1a7d6bd9c6a7b14e6bb6d8adb990ed047bc4983b5e82de6709d3b8db85a3914e1bae2be4fd36e878d37db7387ebe6e81daac1 SHA512 f592d440b45a1bbcab973aeb717ffc805164168f1369793067a46bd2884fedcb9f981bfadd3447c6801120042553a7a7110d8cfc4e1649241d3b8685dffef653
 DIST mypy-0.930.tar.gz 2777310 BLAKE2B 4681991993b04679d21c8f6bf8327a02eb628addc289ed22fbf06e4865ee9e60b90ab41a0d0b069d0a50924bf210816bdb87cff902d4424741f4e141f0957684 SHA512 f7f7ed762eb0f56b46a174c51c34423633d72b5046129617e456c41647705380b014c0c27bd0a104319e4872f2a7d7900a260bf6151d4419c95c93e4c01c6e9d
 DIST mypy-0.931.tar.gz 2779826 BLAKE2B 11986102c6bc498a23bae52002e6ac515fa03724eed867b5356e3fb9aaa9a6eb7e699b612ab81b99dac215119402beecc702421fa82d655913976889dd4cb833 SHA512 8a336ae2f784c8ff912fc6b7dd53ed106cf14f435cee65604de74b8d4d7ab39ad65af0646060ef78e958d5a51a1de090fad628461412f2eef9593a8c032aa87a
+DIST mypy-0.940.tar.gz 2700469 BLAKE2B 4ac13002c3752566ade30a720c4de56d600552221c42f930af54a68573e6b5eb10de90ce66e2cd42f9eb419d5d09e354e4bf2d09cbcf0d6b841ab0e6710d7058 SHA512 5131ea3fe8d96f12442c68dddf04261582a063dcdd031804276263949af9f9af967be3dd775868d289709987773e1911f33e1f43951389f93cabf91c771e271f
 EBUILD mypy-0.910-r1.ebuild 2064 BLAKE2B 1414bf4e87e49d283ad99c621792f1a8c9d47adff14f426949b3825fa8136db03bb6289fecf9cabb311eadbb7b11e4d808e5d5698224c4b028dd9aff2fcfd98f SHA512 48ac5b30de896c4e4191edc20f6c435aa7fd6d0388a99e00ed51e8d27d7a40298e7ae070c6dc786d6e55d62c0963b809a427f066ef96fc3a2e2d17a33164147c
 EBUILD mypy-0.921.ebuild 1879 BLAKE2B 0939ecbed7865716f208ea6683ffd6c076e769e4e0931d036b57640981e2a7b105dbbf49ade6a35e0eeea376439a58cc781e5ee69c1499dafcb053f9f18488d9 SHA512 5aace31c9a2df86b445ae25c44a2d3e0fd64912add86510de7baea42a3ad77a0fd4e3f86776eea493cb7975955a59f7243e281f1b62e1d84db44dc605a07d9a6
 EBUILD mypy-0.930.ebuild 2035 BLAKE2B 0674851d3f13ea99dbc5ff3e0f220fb83102115ccd6a018a6d4e260264346a9a2994cd3f87b4949f796955c00f84c4e618be969ad944c25060fb8be8ab362032 SHA512 7c27537237030313f6c6a7a5e34de80b6c384181f789e0a90984d96b10249b9c3905e18cb58c981cb645fba85843faec804072b7822cd27150c3175b5eaa9730
 EBUILD mypy-0.931.ebuild 2035 BLAKE2B 58a0dc91ae249505d41ebd2fd0295bed2b83604c7b33280dcfdbcbcd868905faefc4e5f1dcf170651423e7d559730552c7508b67cf987682f739513f04a689ed SHA512 1df3e91820bf6728405582b6722e270d63dd8ec346499abeaa19ff8d7152e1c6fec9a92306df8c3ddf1a6b4b7a069499865c67fabd3141537f739d739a047c06
+EBUILD mypy-0.940.ebuild 2075 BLAKE2B c89447e07672a9fb8ad7e2cd014b5f170d3fc24c980f538a35c3ec71239b307a6a8f72737dbb7c254e957b279205cc573c24846c3e78e628f5dbcdc10008c290 SHA512 bf9708f8a7c0f2cad02993c92f840ffcfc05060f283567a5331d10a6efa87cfe605a175308f7cf78514be0283845c2c050c1797a36e7a255e5609864102d83cc
 MISC metadata.xml 515 BLAKE2B 75827bbbeb70fd4b9295ab4689068d2d4b686b32d4059acde94fb0d08048e9e56ecaf3eec39dc5567b2753e2552353e273cdf2f4e27d077cc9b03320ee09c64b SHA512 c1c3c7a3651e61e0b63ab4462f0370cce9cbdce33e64c5e7a1fbefe8116d5d3d3b35bc4095d8a5ce28caf69b0644af3f13c9a27b683f2f981e52f8bfe4ac8615
--- a/dev-python/mypy/mypy-0.940.ebuild
+++ b/dev-python/mypy/mypy-0.940.ebuild
@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Optional static typing for Python"
+HOMEPAGE="http://www.mypy-lang.org/"
+SRC_URI="https://github.com/python/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+# stubgen collides with this package: https://bugs.gentoo.org/585594
+RDEPEND="
+	!dev-util/stubgen
+	>=dev-python/psutil-4[${PYTHON_USEDEP}]
+	>=dev-python/typed-ast-1.4.0[${PYTHON_USEDEP}]
+	<dev-python/typed-ast-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-3.7.4[${PYTHON_USEDEP}]
+	>=dev-python/mypy_extensions-0.4.3[${PYTHON_USEDEP}]
+	<dev-python/mypy_extensions-0.5.0[${PYTHON_USEDEP}]
+	dev-python/tomli[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/attrs-18.0[${PYTHON_USEDEP}]
+		>=dev-python/lxml-4.4.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-6.1.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-xdist-1.18[${PYTHON_USEDEP}]
+		>=dev-python/py-1.5.2[${PYTHON_USEDEP}]
+		>=dev-python/typed-ast-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/virtualenv-16.0.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
+
+# this requires packaging a lot of type stubs
+export MYPY_USE_MYPYC=0
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# Fails with pytest-xdist 2.3.0
+		# https://github.com/python/mypy/issues/11019
+		mypy/test/teststubtest.py
+		# fails due to setuptools deprecation warnings
+		mypyc/test/test_run.py::TestRun::run-imports.test::testImports
+	)
+
+	[[ "${EPYTHON}" == "python3.10" ]] && EPYTEST_DESELECT+=(
+		# https://github.com/python/mypy/issues/11018
+		mypyc/test/test_commandline.py::TestCommandLine::testErrorOutput
+	)
+
+	# Some mypy/test/testcmdline.py::PythonCmdlineSuite tests
+	# fail with high COLUMNS values
+	local -x COLUMNS=80
+	epytest -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
--- a/dev-python/nbconvert/Manifest
+++ b/dev-python/nbconvert/Manifest
@ -1,3 +1,5 @@
 DIST nbconvert-6.4.2.tar.gz 902691 BLAKE2B ee61836ac423db0803d90b92f5cfce7e53e311637dfff7e31e5506fc1588a41515e984860bc56f617b0e0add033c41e6d2099f2abfdda7f31015f6e751110639 SHA512 325637844044ff4a118ca7803e9803fd6909667e017dae04859f58a02e1aadc8b8c699f9b9612bd47991a4c06a23acd526abdcbf1a219e29d985001ae01237bb
+DIST nbconvert-6.4.4.tar.gz 906988 BLAKE2B 84ea6726804ccb738995df1e2e961a9816d3bf9c77034d464afbfa2ba0cf3ce19c1f6af1775fa027795ba3faeaacac765decce2d309f8a60a27e76934cdb356a SHA512 2b319fcc13c6b2addc7e1ca319f36e8a37e8390eb0d8d8df9f9456e7ae816b93ec30ab00a1003894c92091030658920729f0e31fdb5031dccb3f36b38b5d8f99
 EBUILD nbconvert-6.4.2.ebuild 1952 BLAKE2B 84f83fe1991db3efd84c7ce73a2775c54348c9f36dc54dac8e4644969b8cabfaba8dedce5247e887783ec1ea396d7dfb0f0f041d9d9e148799215cef1a4ec39c SHA512 7b9b6793b48c9b614025a5c62c91362bc41ffbe423dd83fde2d4ebd4f8d5da491e557d989c3a4c5208d6854580365fc89cbd6882fc6abe7625e0e752c7f32241
+EBUILD nbconvert-6.4.4.ebuild 2001 BLAKE2B 52386a9cbcadce8335a3c690b78911381d3146945897583b320c727ca5a0e49a552ccda1585c4d1ffde6ef233148267701244faf032870c0876f74fdf997d5d8 SHA512 64a2adb2595bc9a99473df2f8111fafb95e1d7b9d8a313930c582453e2bc6f35de280daa2196708ad81d2394ac489b290b176c368e74cd3651105e1480185032
 MISC metadata.xml 527 BLAKE2B a915103b3eaf57236f4257c98354a1e3733771369ac825fa8bbc4f79f0d1a23272dc86e744513620fbee37792e813a15dbb955e633a7c57597c3c38657ed05d3 SHA512 b60a311ce52915dbc12addd4a882670ac96ff8b3be2aa651eaac3d0963d6e73a72eaafd53f90fb685599504857e6bcd0568071962d7696c2605462b77260ad6a
--- a/dev-python/nbconvert/nbconvert-6.4.4.ebuild
+++ b/dev-python/nbconvert/nbconvert-6.4.4.ebuild
@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Converting Jupyter Notebooks"
+HOMEPAGE="https://nbconvert.readthedocs.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+	dev-python/bleach[${PYTHON_USEDEP}]
+	dev-python/defusedxml[${PYTHON_USEDEP}]
+	>=dev-python/entrypoints-0.2.2[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/jupyter_core[${PYTHON_USEDEP}]
+	dev-python/jupyterlab_pygments[${PYTHON_USEDEP}]
+	>=dev-python/mistune-0.8.1[${PYTHON_USEDEP}]
+	<dev-python/mistune-2[${PYTHON_USEDEP}]
+	dev-python/nbclient[${PYTHON_USEDEP}]
+	dev-python/nbformat[${PYTHON_USEDEP}]
+	>=dev-python/pandocfilters-1.4.1[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-5.1.1[${PYTHON_USEDEP}]
+	dev-python/testpath[${PYTHON_USEDEP}]
+	www-servers/tornado[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pebble[${PYTHON_USEDEP}]
+		dev-python/ipykernel[${PYTHON_USEDEP}]
+		dev-python/ipywidgets[${PYTHON_USEDEP}]
+		>=dev-python/jupyter_client-4.2[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_test() {
+	mkdir -p "${HOME}/.local" || die
+	cp -r share "${HOME}/.local/" || die
+	distutils-r1_src_test
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# Missing pyppeteer for now
+		# TODO: Doesn't skip?
+		nbconvert/exporters/tests/test_webpdf.py
+		# Needs pyppeteer too
+		'nbconvert/tests/test_nbconvertapp.py::TestNbConvertApp::test_webpdf_with_chromium'
+	)
+
+	epytest --pyargs nbconvert
+}
+
+pkg_postinst() {
+	if ! has_version app-text/pandoc ; then
+		einfo "Pandoc is required for converting to formats other than Python,"
+		einfo "HTML, and Markdown. If you need this functionality, install"
+		einfo "app-text/pandoc."
+	fi
+}
--- a/Show more
+++ b/Show more