Adding metadata

38 files changed, 473 insertions, 336 deletions

diff --git a/dev-python/absl-py/Manifest b/dev-python/absl-py/Manifest
index 4bcf60d821d5..e595e70d41b3 100644
--- a/dev-python/absl-py/Manifest
+++ b/dev-python/absl-py/Manifest
@@ -1,2 +1 @@
-DIST abseil-py-1.1.0.gh.tar.gz 219274 BLAKE2B 96848e3a738c295b3396b2eb45a6a2428f02ca7d325f24629d7ef8b87bdb19c8c2a33c95dcd716e286034f24d669bea27dc5470b92fcb3df437266e98a08ae6c SHA512 75e017399d28e38a5229b95b6372ad05b9d6067c3fef1cf7a64b5123399377025654dafaf6a1debc5664440efa8d26b76610629ad440e472faefd4f99b3bc685
 DIST abseil-py-1.2.0.gh.tar.gz 219456 BLAKE2B ec7d878692dcf0cbe879cd7df51bc1b8ceeae945b053419b4a024a637e726064128af69fe077a26413f8562dd4a35830b340d000a6c9d520c7674b81a7e417ae SHA512 f363814ed65a68ae4bfd833dc095491349349e70327c0a87ad68ddc3b8429dacc78aaa16d2ff0d733487a12a2ab09094d4ccd1c1133981f65c12d3715cee410d
diff --git a/dev-python/absl-py/absl-py-1.1.0.ebuild b/dev-python/absl-py/absl-py-1.1.0.ebuild
deleted file mode 100644
index 306ac9908573..000000000000
--- a/dev-python/absl-py/absl-py-1.1.0.ebuild
+++ /dev/null
@@ -1,79 +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_{7,8,9,10} )
-
-inherit distutils-r1
-
-MY_P=abseil-py-${PV}
-DESCRIPTION="Abseil Python Common Libraries"
-HOMEPAGE="
-	https://github.com/abseil/abseil-py/
-	https://pypi.org/project/absl-py/
-"
-SRC_URI="
-	https://github.com/abseil/abseil-py/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-src_prepare() {
-	# what a nightmare... well, we could have called bazel but that would
-	# even worse
-	local helpers=(
-		absl/flags/tests/argparse_flags_test_helper.py:absl/flags/tests/argparse_flags_test_helper
-		absl/logging/tests/logging_functional_test_helper.py:absl/logging/tests/logging_functional_test_helper
-		absl/testing/tests/absltest_fail_fast_test_helper.py:absl/testing/tests/absltest_fail_fast_test_helper
-		absl/testing/tests/absltest_filtering_test_helper.py:absl/testing/tests/absltest_filtering_test_helper
-		absl/testing/tests/absltest_randomization_testcase.py:absl/testing/tests/absltest_randomization_testcase
-		absl/testing/tests/absltest_sharding_test_helper.py:absl/testing/tests/absltest_sharding_test_helper
-		absl/testing/tests/absltest_test_helper.py:absl/testing/tests/absltest_test_helper
-		absl/testing/tests/xml_reporter_helper_test.py:absl/testing/tests/xml_reporter_helper_test
-		absl/tests/app_test_helper.py:absl/tests/app_test_helper_pure_python
-	)
-
-	local x
-	for x in "${helpers[@]}"; do
-		local script=${x%:*}
-		local sym=${x#*:}
-		sed -i -e "1i#!/usr/bin/env python" "${script}" || die
-		chmod +x "${script}" || die
-		ln -s "${script##*/}" "${sym}" || die
-	done
-
-	# i don't wanna know how these pass for upstream with wrong helper names
-	sed -i -e 's:\(app_test_helper\)\.py:\1_pure_python:' \
-		absl/tests/app_test.py || die
-	sed -i -e 's:\(logging_functional_test_helper\)\.py:\1:' \
-		absl/logging/tests/logging_functional_test.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x PYTHONPATH=.
-	local fails=0
-	while read -r -d '' x; do
-		ebegin "${x}"
-		"${EPYTHON}" "${x}"
-		eend ${?} || : "$(( fails += 1 ))"
-	done < <(find -name '*_test.py' -print0)
-
-	[[ ${fails} -ne 0 ]] && die "${fails} tests failed on ${EPYTHON}"
-
-	# we actually need to clean this up manually before running the test
-	# suite again...
-	chmod -R u+rwX "${T}"/absl_testing || die
-	rm -rf "${T}"/absl_testing || die
-}
diff --git a/dev-python/absl-py/absl-py-1.2.0.ebuild b/dev-python/absl-py/absl-py-1.2.0.ebuild
index 1a00613d30b0..306ac9908573 100644
--- a/dev-python/absl-py/absl-py-1.2.0.ebuild
+++ b/dev-python/absl-py/absl-py-1.2.0.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 616059cae3b8..d72bed89ec99 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -8,3 +8,4 @@ DIST boto3-1.24.51.gh.tar.gz 526840 BLAKE2B e796ee5c68260b1b125e658b80b74e2f76e6
 DIST boto3-1.24.52.gh.tar.gz 527776 BLAKE2B 301c8c8fe2a5b75af1aa34d72df8e16ecf9f547428f42dfda9c25d19f29fb6f955ea457cf5b61cced45f36e008073bab02a93e955dea2749a2dcaa881e1f2b79 SHA512 1a7fb5aa77f7bccc1a9f58c3d4149ff653b0e4cb22dd2a47bf255d09ba09ccba2dabba32d444c85b78762d1b140b538da5b274546e2883a00f849d6fca0a1a91
 DIST boto3-1.24.53.gh.tar.gz 527969 BLAKE2B f0075c531876176c11a874398f2935a7ced0e42b233941825e1d926d8ad0ab76f594edc14eaafc80a47c9f6b030df5ea04a555d57de101b28096d67eda693409 SHA512 b1186ef0f1d9c3f1f7b0bd651882c0f771c2de280a66ba2b2d03f4ef0cb8e9c2d0c7544fad2cb72706d0576a3871bc26b42ea4a711647fac3837a6f1e1fc3d9f
 DIST boto3-1.24.54.gh.tar.gz 528596 BLAKE2B a34f5bdd4a72aecaa40b9235696b502702c39a14fc4dc23fc03d4abfc2fe763c278e00b20f04b1167a5acedb77c6c149cdd053eb7ed2dd4ed4333790b4fc0ab7 SHA512 82f77416f0ae1bfadfe59764ec2e956e1533359c4cd28ea82d955c1b909d8057e5cfb2588ad14d8edf54ad44b623ce17fe7bdbd976e1928bcd8f8cdf6d7a9489
+DIST boto3-1.24.55.gh.tar.gz 529245 BLAKE2B 02a5bdbabcabc7019728da0be14d02c3e64a28e996f656664b329499668a064a13eeb4d9504a609b0ede0ade188bbd96f2b1c758e05da4e0ab67d5b70e5408a1 SHA512 539375585f93b699032755eda36bbba99364ff68f49898656cebcddd99ebead4546a01f28b1f81473d7a7eea01196832345a0b3a99a460f20ba4d4c081768bbf
diff --git a/dev-python/boto3/boto3-1.24.55.ebuild b/dev-python/boto3/boto3-1.24.55.ebuild
new file mode 100644
index 000000000000..e4a98e2e28f5
--- /dev/null
+++ b/dev-python/boto3/boto3-1.24.55.ebuild
@@ -0,0 +1,68 @@
+# 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_{7,8,9,10} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="
+	https://github.com/boto/boto3/
+	https://pypi.org/project/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/boto3/archive/${PV}.tar.gz
+			-> ${P}.gh.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.6.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)"
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 12205598ea5d..86c78175781a 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -8,3 +8,4 @@ DIST botocore-1.27.51.gh.tar.gz 9525092 BLAKE2B c38085ca15f4dfef1853ef40cc7fe09a
 DIST botocore-1.27.52.gh.tar.gz 9525783 BLAKE2B 272b7b36f51b4048bbf75b426826ce5c60fb7fd2b9fbd714b1aaf02fdb99da6b522ae5cecea0468755a9edb2cd4d82a8fc6794b9f4a6e64d3c129a436f6a8397 SHA512 cb231a0dff10c55212ce013daa686b96da59b226ef545911a6dc535ce29565aca317e300d6a8dbcf2de1e3c97f761a6ad46f66d17aad2980be7e7f45166e3365
 DIST botocore-1.27.53.gh.tar.gz 9527747 BLAKE2B 9b5d2c01af6692bac0e105fbb2283741aba21894a28270d6f3d57fd59b9f72cb6552361ed2a07392980a3921cdccd151aa62f378099028e8ae25c3a4cbd32e0d SHA512 78602aea42ce262f5e8552708a4e93a5a49dc2de61e83e6d2ad63627cc6aa0dd236992adaa22613098346f0d042ee572ee40de01794518cb7db443a92b5c3d58
 DIST botocore-1.27.54.gh.tar.gz 9535763 BLAKE2B e1797243102043564a369c519397a609a4b8b6dcc9b8362f2b05961279b4b858e4f1d81ba6f4898039812a87729e0c9e9b880abe6cb509ba0fce442933aaf563 SHA512 714d70cd2d86add4c34a8ffbba3e89305928a614013bc56214dad25eeb1a7766805e737d9fb54ee96e8df81892d2faebeaa6639adea6d1f4cd50c5ac9b589c6b
+DIST botocore-1.27.55.gh.tar.gz 9543620 BLAKE2B cf9d20e5725276318578362e596bc73ed0b37c0fc0ecbba20c8de1740135fee87c93d7b849384ca34fa521f16de497fb4f2050f52bd04beddfe66b1c8ff4390e SHA512 1eea888ff68344943f0604d030c0c9f6d087211ef3338023693eb51e6dc92fcf6d32ebd14e9073e0ce7e1d44338c7a535a88a55286dcbaf7684a6617effdf14f
diff --git a/dev-python/botocore/botocore-1.27.55.ebuild b/dev-python/botocore/botocore-1.27.55.ebuild
new file mode 100644
index 000000000000..6a8e7e93c947
--- /dev/null
+++ b/dev-python/botocore/botocore-1.27.55.ebuild
@@ -0,0 +1,69 @@
+# 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_{7,8,9,10} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="
+	https://github.com/boto/botocore/
+	https://pypi.org/project/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="
+		https://github.com/boto/botocore/archive/${PV}.tar.gz
+			-> ${P}.gh.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-2[${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}]
+	)
+"
+
+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)"
+}
diff --git a/dev-python/cfn-lint/Manifest b/dev-python/cfn-lint/Manifest
index f67e9e025043..ddc583ae6240 100644
--- a/dev-python/cfn-lint/Manifest
+++ b/dev-python/cfn-lint/Manifest
@@ -1,3 +1,4 @@
 DIST cfn-lint-0.61.3.gh.tar.gz 9528542 BLAKE2B 27f5c82c09a7c1dde520189647480032faf808089083ca45a9a2a24e4c158cb8e62ee6ae2f906d6c68021cc34b654ff46c9402876e09dd3330115dead5db44a8 SHA512 db5369a12d88754f6241b4ef529b53d142a80bfcb0c58ac7ec03217e7e4cb7e53f3fde1dde45dfdac82ab3fde4b885bb40dae3076b85edf34ca68cc73dc5aeb1
 DIST cfn-lint-0.61.4.gh.tar.gz 9556069 BLAKE2B 71572546d7e523c11214e32130a7d52461580e487b514846137e6592cb7a1786414556e4bea191aa2e4dddaf338c24e8ea9001e617221ea74b03bd0ea900a5a9 SHA512 fd85af770b5b519c9de4df0acbbaa66a8a7f61efd210a793c2e28ad9e6d6ed2d8b3042ca41d7743b2bc4dc0446b42ea2929cba454fdbf097a482a7c268e04000
 DIST cfn-lint-0.61.5.gh.tar.gz 9580886 BLAKE2B 0e83a604bc8761cd6007039cc28d90e471ef3cd3c542e7ce977d290638bcbff2b196c5d3c5f23b8d6db064b867ab594360dedb86494aba955c065c7cbad8b519 SHA512 14a1c282f1d87ce5ddd231f92e01a4edd85a62802f2335ba95470acaa0d8deb0306433124f3d1bea6c965ebfe5b30145431087a71cb1e8b953bf94b5d691bcbf
+DIST cfn-lint-0.62.0.gh.tar.gz 9610430 BLAKE2B fdeed685abab1bb701698b02ba961d0460c2fbf631ee6c8c51d17e8087bdbd2a26d366afd6916ff118e047bc1e45e0ac4124cf5140b7dede5cb116e5e49bec3e SHA512 830f3929330cbb6d3ae74c9d172c4540272def94bae4f5a0d181fd41688479bf9e9a82ccb9ccea20b823b8580743722a8cb551d790cab92322c7e472e679d28a
diff --git a/dev-python/cfn-lint/cfn-lint-0.62.0.ebuild b/dev-python/cfn-lint/cfn-lint-0.62.0.ebuild
new file mode 100644
index 000000000000..a98bb23dc7cd
--- /dev/null
+++ b/dev-python/cfn-lint/cfn-lint-0.62.0.ebuild
@@ -0,0 +1,54 @@
+# 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_{7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="CloudFormation Linter"
+HOMEPAGE="
+	https://github.com/aws-cloudformation/cfn-lint/
+	https://pypi.org/project/cfn-lint/
+"
+SRC_URI="
+	https://github.com/aws-cloudformation/cfn-lint/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/aws-sam-translator-1.47.0[${PYTHON_USEDEP}]
+	dev-python/jsonpatch[${PYTHON_USEDEP}]
+	>=dev-python/jschema_to_python-1.2.3[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
+	dev-python/junit-xml[${PYTHON_USEDEP}]
+	dev-python/networkx[${PYTHON_USEDEP}]
+	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
+	>=dev-python/sarif_om-1.0.4[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# TODO
+	test/unit/module/test_template.py::TestTemplate::test_build_graph
+	# requires git repo
+	test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
+	# Internet
+	test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
+	test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_2
+	test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
+)
+
+src_prepare() {
+	# unpin the deps
+	sed -e 's:~=[0-9.]*::' -i setup.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/fonttools/fonttools-4.34.4.ebuild b/dev-python/fonttools/fonttools-4.34.4.ebuild
index 1576d5c96eb3..4a26b159e3fc 100644
--- a/dev-python/fonttools/fonttools-4.34.4.ebuild
+++ b/dev-python/fonttools/fonttools-4.34.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.gh.
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND=">=dev-python/fs-2.4.9[${PYTHON_USEDEP}]"
 BDEPEND="${RDEPEND}
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index 07a415b07ce7..6af4e7bf1a4d 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -1,5 +1,3 @@
-DIST google-api-python-client-2.53.0.gh.tar.gz 32251370 BLAKE2B 880024a220bb793b53042c8b2192dee666b7f5ad6dd8b0b68d51ff7b18ebd2ba220974f86656ac13b4c421c191ec66b269007a3f68a1992b0672623db046ef6b SHA512 1cb251d8abbec0b33b62b661ea8235224e94f807571b47e8422b6908b6636f844c639328cf0c07b4820a083b265e71f54dc3f6c48447f0cfd20bca738d7ab86a
-DIST google-api-python-client-2.54.0.gh.tar.gz 32389268 BLAKE2B 568ff657ea5093ff927208cd38d0125bf4aea8b725c5ded0a232c4de77f59c97f639b7f2b0ab8cf0e121bafd4512c23f9ac4c3c6cce6b6ab407c6ad2bb5a4983 SHA512 f33525bee9b6cede8955af4e208b64d1c82185cff08173d9ae30a704c3239b9a2ee9972e083fd4a823091b76669a7df02bf60cd950a3e20ddf21c6fd2e5ee18b
 DIST google-api-python-client-2.55.0.gh.tar.gz 32614590 BLAKE2B f7344903e4782940cb277b0b4ebc48b36c5b3403ea7f309205c4b27bee3488ecc5cd83b0487989da56b840dda7b0661f598c21307ba9afc9b52137f3b155737d SHA512 c674c038e911140e3ad64426be629d1498db382d96d18a5a51a4c2d5cb4375ad84e21e5dd68aedfa29b4bdc017d7996351f42ff34bff293a4d2c8cfb26820f0d
 DIST google-api-python-client-2.56.0.gh.tar.gz 33165501 BLAKE2B 5b4d72404f15c211cb01ca5291a74c83e9551b28c2e9e268462d481a3b05f557998fba8ed14c1233a023f60813be5b702f88371d47499a18cef152a52577f2ce SHA512 3ea968d11eda34d7807469c1651e8685ae695faed2772acbb23964468fa0cf9036fe468f427cd3f5bccd7c69746729858838446cbd320f0db7edff4add554d81
 DIST google-api-python-client-2.57.0.gh.tar.gz 33298709 BLAKE2B 6c50bdcfc38180ece5f8202b0f3adcfc446cc0b057122aee7f706401248b7d860d9227c444b26faea49de5e4147010765edc5e54271907f6490e6f0d9fe0ac1e SHA512 f96c40b21f4191e5a06a4068b65c952d9d2bef3849a6aa821232c60dfc8b6c6598606b596c750cc87928871367cbbcb24af46b5626d602915ccf7a7f316988ba
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.53.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.53.0.ebuild
deleted file mode 100644
index 07bbe9ded836..000000000000
--- a/dev-python/google-api-python-client/google-api-python-client-2.53.0.ebuild
+++ /dev/null
@@ -1,53 +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_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Google API Client for Python"
-HOMEPAGE="
-	https://github.com/googleapis/google-api-python-client/
-	https://pypi.org/project/google-api-python-client/
-"
-SRC_URI="
-	https://github.com/googleapis/google-api-python-client/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
-	<dev-python/httplib2-1[${PYTHON_USEDEP}]
-	>=dev-python/google-api-core-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-1.35.0[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-httplib2-0.1.0[${PYTHON_USEDEP}]
-	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
-	<dev-python/uritemplate-5[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/oauth2client[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# require Internet access (and credentials)
-		tests/test_discovery.py::DiscoveryErrors::test_credentials_and_credentials_file_mutually_exclusive
-		tests/test_discovery.py::DiscoveryFromDocument::test_api_endpoint_override_from_client_options_mapping_object
-	)
-
-	epytest tests
-}
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.54.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.54.0.ebuild
deleted file mode 100644
index 95188afdf1fa..000000000000
--- a/dev-python/google-api-python-client/google-api-python-client-2.54.0.ebuild
+++ /dev/null
@@ -1,53 +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_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Google API Client for Python"
-HOMEPAGE="
-	https://github.com/googleapis/google-api-python-client/
-	https://pypi.org/project/google-api-python-client/
-"
-SRC_URI="
-	https://github.com/googleapis/google-api-python-client/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
-	<dev-python/httplib2-1[${PYTHON_USEDEP}]
-	>=dev-python/google-api-core-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-1.35.0[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-httplib2-0.1.0[${PYTHON_USEDEP}]
-	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
-	<dev-python/uritemplate-5[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/oauth2client[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# require Internet access (and credentials)
-		tests/test_discovery.py::DiscoveryErrors::test_credentials_and_credentials_file_mutually_exclusive
-		tests/test_discovery.py::DiscoveryFromDocument::test_api_endpoint_override_from_client_options_mapping_object
-	)
-
-	epytest tests
-}
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.55.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.55.0.ebuild
index 95188afdf1fa..07bbe9ded836 100644
--- a/dev-python/google-api-python-client/google-api-python-client-2.55.0.ebuild
+++ b/dev-python/google-api-python-client/google-api-python-client-2.55.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
diff --git a/dev-python/gsd/Manifest b/dev-python/gsd/Manifest
index 58f2073ace29..f5b8da240349 100644
--- a/dev-python/gsd/Manifest
+++ b/dev-python/gsd/Manifest
@@ -1,2 +1,2 @@
-DIST gsd-v2.5.2.tar.gz 105448 BLAKE2B 408e66a91ea056e8c863e23dae439009e5f802f38d5e2a3b89bbb07c574ad61827fa9c2767729c37dcc8fa7ecb1fc3be922755da0ac0dc922ead2a365ce66a10 SHA512 2a2afb56b9f836608523b2946a0d2ca94511457506d02038d496b374ccb96dc0daad6435f9ee63b0937837b725d6288325c066d75d2ac0b0c6d9da4beb9eb082
 DIST gsd-v2.5.3.tar.gz 106104 BLAKE2B 39cadcca6a6660c736be8ce576b45d86a82a499bd21b6c818dcc6d307750940a8be85fdd63883d7aac9a416f5eddc55793ca2ab0da0b2373901c394d63ebe3f7 SHA512 3e3d5f8dece5553a4bc68b23aff8320b99169da5b995d1655da85c37e84a9e69d30f73ed3925e2e49b1c97dc875c594258dd15f3669337ca4c91914cab90d49c
+DIST gsd-v2.6.0.tar.gz 105895 BLAKE2B d320829fb3a1d44feb637bf1c567908f74f0a0c82502b6af147921b547aca8fb0082cc185872398c5fbaefb6b797c0595ead9d1c8ce73ad3a72b961cb18f2a7f SHA512 968bdd0d2c3aeb993d0a91c3e69c17bcf8d8f0e6ff70cf3ff18655a87320cf522174e98996f5688ee205ac2ce2036b7cf7c1b4b21286a481ac21aa4a94ec38f6
diff --git a/dev-python/gsd/gsd-2.5.2.ebuild b/dev-python/gsd/gsd-2.6.0.ebuild
index dbb837a4a7cb..82c7f5cb221b 100644
--- a/dev-python/gsd/gsd-2.5.2.ebuild
+++ b/dev-python/gsd/gsd-2.6.0.ebuild
@@ -5,21 +5,31 @@ EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{7,8,9,10} )
+
 inherit distutils-r1
 
 MY_P=${P/-/-v}
 DESCRIPTION="GSD - file format specification and a library to read and write it"
-HOMEPAGE="https://github.com/glotzerlab/gsd"
-SRC_URI="https://github.com/glotzerlab/gsd/releases/download/v${PV}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
+HOMEPAGE="
+	https://github.com/glotzerlab/gsd/
+	https://pypi.org/project/gsd/
+"
+SRC_URI="
+	https://github.com/glotzerlab/gsd/releases/download/v${PV}/${MY_P}.tar.gz
+"
+S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-DEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
-RDEPEND=${DEPEND}
-BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/identify/Manifest b/dev-python/identify/Manifest
index d0bc39d953ae..72be75db756a 100644
--- a/dev-python/identify/Manifest
+++ b/dev-python/identify/Manifest
@@ -1,3 +1,2 @@
-DIST identify-2.5.1.gh.tar.gz 101393 BLAKE2B 8586721838c427b00a7c70e842d2ab1a2f0437909d84d5cba6614aff3f8265f17b5137628bdd78e5f324fbf6a0fef8b5ca0246e6861af023c2d9a1a323cc43f6 SHA512 8b61dd03bcdb8908a1a7f3b13d66121bb4f4bb3aab57672bff55a84232dcff310214ed0a90cfcf79846da9abc111bff08761ec9dd40c8b9b183bfbbf365efac4
 DIST identify-2.5.2.gh.tar.gz 101399 BLAKE2B f0ef048c6543b32016ad47a84e4b4b049a88424e496b159ce6ec1a1358172a87849e132b045a7345e818b02aee359e6d9458c458430a4d5d2b9f918cba685ed7 SHA512 72aaf406e5aa7acc83189820c389e82e90cf775541013e4ad91e5d25abdecd8526d1c47d203baa8ab8e5e028836da755a7045e74fded7e8e3167397557d4b1f0
 DIST identify-2.5.3.gh.tar.gz 101397 BLAKE2B 8782a4dfcea2d84facec9fefac8c7241c978ca1f494aa3e0602171dc017b41d24545ec7a3537b07a5e9962edcc4813fa4f45f76d807ba8ba69243041bc777d1b SHA512 d6cc5737b119498af5fb3cc9478881960b4d9532eec552622e942292ec3f1c75182f50ccc94fe7e1bb8993525c5e50fcdfd58881a9226da52fbe5feb3b83a8c3
diff --git a/dev-python/identify/identify-2.5.1.ebuild b/dev-python/identify/identify-2.5.1.ebuild
deleted file mode 100644
index 6b1e5d8f2709..000000000000
--- a/dev-python/identify/identify-2.5.1.ebuild
+++ /dev/null
@@ -1,29 +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_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="File identification library for Python"
-HOMEPAGE="
-	https://github.com/pre-commit/identify/
-	https://pypi.org/project/identify/
-"
-SRC_URI="
-	https://github.com/pre-commit/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~riscv x86"
-
-RDEPEND="
-	dev-python/ukkonen[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/identify/identify-2.5.2.ebuild b/dev-python/identify/identify-2.5.2.ebuild
index 77bcb9aabee1..6b1e5d8f2709 100644
--- a/dev-python/identify/identify-2.5.2.ebuild
+++ b/dev-python/identify/identify-2.5.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~riscv x86"
 
 RDEPEND="
 	dev-python/ukkonen[${PYTHON_USEDEP}]
diff --git a/dev-python/jsonschema/Manifest b/dev-python/jsonschema/Manifest
index 137925b5450e..2708c1d3a37c 100644
--- a/dev-python/jsonschema/Manifest
+++ b/dev-python/jsonschema/Manifest
@@ -1,6 +1,7 @@
 DIST jsonschema-4.10.0.tar.gz 286110 BLAKE2B b59e425df6a8d747424ff938de6cbd0eceaa16a1b16b795847f86662a5cbc7953f052f7aaac10109a4c75e69e227d29f3dbfdcd50197be0436f6e36ea02df29a SHA512 765ed96fe086feda9604d3079e78f62e35ab883e8826be57112bd8f7c4fedc385c4e2436b5224a171b3a7c0d18b22162ff0973448b339a8f13043532e52eb06d
 DIST jsonschema-4.10.2.tar.gz 285395 BLAKE2B 2e40fc5e8b93922c12110f1983f933a07455d9f5d1388fc2c1ee8f07e042f3840573553f709ab7f373c8f5be0651996ffd203696bd0ec1356e90163dad8f4eb4 SHA512 1328af7b4bc70ce43aec6e27b75c9ebe1c2745eceb3b794aeb41eb430362123f9b40dda26e90e62f23d5733ff4fd21407b05569603ee1e2a4941c2009e1855e7
 DIST jsonschema-4.12.1.tar.gz 287475 BLAKE2B 78f4e6fa120eef9ac3fead84fa28b16a8f4c212c570785f0f6f08fcec1a58c51f7cc756ba9a7272e71e3877e80e5e17e2e4d8fbcf503a20c27232dcb4b918085 SHA512 ae95bf3dccb7365af1814255a5aecc11044c3ee579921e935e7c3f955596fdf8d32bbdd0fa2693ea701792a8a29053cf25ef3ab9b08ffb66a6859059a877888f
+DIST jsonschema-4.13.0.tar.gz 288024 BLAKE2B 1d3a08626c2c24b5a35f69500fdafcb7acdda1f6c4830b0e601776118c760774626c85516e0e4b99e31cfedab6b6e2ac7dde9b1ff57f726b236aa45daff34701 SHA512 11de8bbdd0723f7ebf8dacabcdb9ad59e909ebf096c3864259cbd151281f3306cb1cd2b76a74c84e84cdb8cb5263e62d7e63e2b0f4d55065dc50e7e2c7de29ad
 DIST jsonschema-4.7.2.tar.gz 278495 BLAKE2B 55c25847e210e0bdd3bec672b4b6a4eb1a2e2ec5167c115c34a2d0b2de079a00eaff8d901386b475fc26660887090896e78e3a38c1805f5b767fa1eece740e3b SHA512 c624d7bf317ca20fd8cdd248ec7d7679fde907ab304f1a092fc7a172464f43e41904d3f88df57e1351043b978448f51166a09af3625f00a9ad4d7353033b80af
 DIST jsonschema-4.8.0.tar.gz 279424 BLAKE2B 9e8936bde13841f9edf42ffe214ce8d1aaae8b9be4c3040871f228399a31b4292e8cfbf4bf4261822ca1b88622cb69cdf0d55bd2cc51bf191f6e364e9bfb94f8 SHA512 75a7593eb8b0163ba428f507ed4fd9fa6d51567f284776af96f4d79cb507a69666cc048034bfa3a401f960295779e935562dde4e97cf3f7b3b4571bc28b9dde7
 DIST jsonschema-4.9.0.tar.gz 281100 BLAKE2B 5a1c387fc33735ffd39342f3e62600aea721a51be0995d10aa1726e8e4c3bf93694a7844410c0b245c699880d6642a6903525b3637883f5e662086b53deb0948 SHA512 73fc9958f37802c4558ea6893386810784d2b577c04423b7090fce4cd052e3af078f0b0c46b2b16f96bb49820047f1ec5d96cf6c6cb822fca1d988cf1d70209f
diff --git a/dev-python/jsonschema/jsonschema-4.13.0.ebuild b/dev-python/jsonschema/jsonschema-4.13.0.ebuild
new file mode 100644
index 000000000000..1c3276e9da9e
--- /dev/null
+++ b/dev-python/jsonschema/jsonschema-4.13.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="An implementation of JSON-Schema validation for Python"
+HOMEPAGE="
+	https://pypi.org/project/jsonschema/
+	https://github.com/python-jsonschema/jsonschema/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390"
+
+RDEPEND="
+	>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]
+	>=dev-python/pyrsistent-0.18.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_resources-1.4.0[${PYTHON_USEDEP}]
+		dev-python/pkgutil_resolve_name[${PYTHON_USEDEP}]
+	' 3.8)
+"
+BDEPEND="
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	dev-python/hatch-fancy-pypi-readme[${PYTHON_USEDEP}]
+"
+
+# formatter deps
+RDEPEND+="
+	dev-python/fqdn[${PYTHON_USEDEP}]
+	dev-python/idna[${PYTHON_USEDEP}]
+	dev-python/isoduration[${PYTHON_USEDEP}]
+	>=dev-python/jsonpointer-1.13[${PYTHON_USEDEP}]
+	dev-python/rfc3339-validator[${PYTHON_USEDEP}]
+	dev-python/rfc3986-validator[${PYTHON_USEDEP}]
+	dev-python/rfc3987[${PYTHON_USEDEP}]
+	dev-python/uri_template[${PYTHON_USEDEP}]
+	>=dev-python/webcolors-1.11[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# requires pip, does not make much sense for the users
+	jsonschema/tests/test_cli.py::TestCLIIntegration::test_license
+	# wtf?
+	jsonschema/tests/test_deprecations.py::TestDeprecations::test_version
+	jsonschema/tests/test_jsonschema_test_suite.py::test_suite_bug
+)
diff --git a/dev-python/jupyter_kernel_test/Manifest b/dev-python/jupyter_kernel_test/Manifest
index 8ea02e9e200b..56a70d29cf92 100644
--- a/dev-python/jupyter_kernel_test/Manifest
+++ b/dev-python/jupyter_kernel_test/Manifest
@@ -1 +1,2 @@
 DIST jupyter_kernel_test-0.4.3.tar.gz 13609 BLAKE2B a5ba16da6bb5d7e0a0e2f2796472cb272826286c63ec548cca1a6957f947598fe6686eb7917404433cc818e1a073872b2320433674077905232d03dd848c261d SHA512 68dd7f6a033ff5f1cb73ec63581fad415d0e1ecaa850abc7b97325964849751f7ffc9559ac6c6313727951008d35e741dc6055e2e0fcf3b75978849ec1fe72f6
+DIST jupyter_kernel_test-0.4.4.tar.gz 9212 BLAKE2B fb08d061ce63f2d74eb7753f02bfdb70d17739798873fd8adfc4c1fdbdcb832e360e1ced8850efad8dfad14e60fccc465faca60c81e9045436937aa4387f33f9 SHA512 33eafe1b9e92f8dfa625a3116b55349413f671353eee72a88b0124dd44b73704d1bc82bdbeabcb8d00fdaa082cfaf0551aa22fea0340a5cf3babd93aae634830
diff --git a/dev-python/jupyter_kernel_test/jupyter_kernel_test-0.4.4.ebuild b/dev-python/jupyter_kernel_test/jupyter_kernel_test-0.4.4.ebuild
new file mode 100644
index 000000000000..e1672203fe30
--- /dev/null
+++ b/dev-python/jupyter_kernel_test/jupyter_kernel_test-0.4.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="Jupyter kernel for octave"
+HOMEPAGE="https://github.com/jupyter/jupyter_kernel_test"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/jupyter_client-6.1.13[${PYTHON_USEDEP}]
+	dev-python/jsonschema[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	test? (
+		dev-python/ipykernel[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/mdx_gh_links/Manifest b/dev-python/mdx_gh_links/Manifest
index 145d45c87c2c..b6cd9505d8f5 100644
--- a/dev-python/mdx_gh_links/Manifest
+++ b/dev-python/mdx_gh_links/Manifest
@@ -1,2 +1 @@
 DIST github-links-0.3.gh.tar.gz 6756 BLAKE2B 6b9f7e86d2ec96a6b1b9fd21f20f1964e5fbf4b3ebb33bcd6dccd2e8b811acff7e39606acbf8f48a602afb21733dbd6375e2d1ef30a2a551547fbf9582b525c6 SHA512 8f738298d8a1512e2757a3a7fed091e3a90d59b20b3d03f1a75e087b30b9f9d4876d46ced04994f98a4454a9bf4ebabc305ebf28b4441eb93e5df87822c35459
-DIST mdx_gh_links-0.2.tar.gz 4961 BLAKE2B 02a391d3a0dde532cecbd4f025a7624a90aea698815ddb797cc4f74e2be80f5b55013b9cb3d358f92dcdb43fa9a160880c881ed3ac2a4f2c306f16dad06e1f3b SHA512 0a6be387e4b3d5f31601a365679733647f9669d61537ef3b630321d61f1d645f633098b92cf2fbd61faeb8469094bd89a5df8a561d15b8908645314ded4dd42a
diff --git a/dev-python/mdx_gh_links/mdx_gh_links-0.2-r1.ebuild b/dev-python/mdx_gh_links/mdx_gh_links-0.2-r1.ebuild
deleted file mode 100644
index f7fcf7c4f658..000000000000
--- a/dev-python/mdx_gh_links/mdx_gh_links-0.2-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
-
-DESCRIPTION="An extension which adds links to GitHub users, repositories, issues and commits"
-HOMEPAGE="https://github.com/Python-Markdown/github-links"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-RDEPEND="
-	dev-python/markdown[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/mdx_gh_links/mdx_gh_links-0.3.ebuild b/dev-python/mdx_gh_links/mdx_gh_links-0.3.ebuild
index 8ad992262410..17b314f7f4c2 100644
--- a/dev-python/mdx_gh_links/mdx_gh_links-0.3.ebuild
+++ b/dev-python/mdx_gh_links/mdx_gh_links-0.3.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/markdown-3.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/mkdocs/Manifest b/dev-python/mkdocs/Manifest
index 51b01bb3aea6..d195835dc895 100644
--- a/dev-python/mkdocs/Manifest
+++ b/dev-python/mkdocs/Manifest
@@ -1,2 +1 @@
-DIST mkdocs-1.3.0.tar.gz 4085674 BLAKE2B e34605c2d1122ff86ed5cfb6134cdda67450e8f32d7628626ff4ac8c36c45b127312ad693efe35237b714adb9efd244f12f90cf8ecacf6009b75786db30ebb1b SHA512 d33d728eaff4e39106c1187cf04f579706ce28af364852c67706ab85f6b9ccdcd26ae84cd4d5ea7572e52fde1d1137eb3e424679dd4c8ef043c9637aac062270
 DIST mkdocs-1.3.1.gh.tar.gz 4088396 BLAKE2B b54d0090318fef205d84c4e914f916f91309bdfe6857cd2592fea24e6fb68baaa2eede6dc768681c85ae37adf794546a6ac82dd34d300f421969991f9a796cae SHA512 6eb041f9d0a628eb3a2e6585fde0959f5ef35501edf2c69db640059d98523e2cfa723bc49aedfac1dea4804dcf3c51791e4a052b77ef97bd85a0f4ace2a4d9ad
diff --git a/dev-python/mkdocs/mkdocs-1.3.0-r1.ebuild b/dev-python/mkdocs/mkdocs-1.3.0-r1.ebuild
deleted file mode 100644
index 50d54fc9adce..000000000000
--- a/dev-python/mkdocs/mkdocs-1.3.0-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
-
-DESCRIPTION="Project documentation with Markdown"
-HOMEPAGE="https://www.mkdocs.org https://github.com/mkdocs/mkdocs"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-IUSE="doc"
-
-BDEPEND="
-	doc? (
-		$(python_gen_any_dep '
-			dev-python/mdx_gh_links[${PYTHON_USEDEP}]
-			dev-python/mkdocs-redirects[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-RDEPEND="
-	>=dev-python/Babel-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/click-3.3[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10.2[${PYTHON_USEDEP}]
-	>=dev-python/markdown-3.2.1[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-	>=dev-python/watchdog-2.0[${PYTHON_USEDEP}]
-	>=dev-python/ghp-import-1.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml_env_tag-0.1[${PYTHON_USEDEP}]
-	>=dev-python/importlib_metadata-3.10[${PYTHON_USEDEP}]
-	>=dev-python/packaging-20.5[${PYTHON_USEDEP}]
-	>=dev-python/mergedeep-1.3.4[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Tests fails if additional themes are installed
-	sed -i -e 's:test_get_themes:_&:' \
-		mkdocs/tests/utils/utils_tests.py || die
-
-	# Skip this network test, "does not appear to be an IPv4 or IPv6 address"
-	sed -i -e 's/test_IP_normalization/_&/' \
-		mkdocs/tests/config/config_options_tests.py || die
-
-	# livereload has been dropped in this release, this test is a remnant
-	rm mkdocs/tests/livereload_tests.py || die
-
-	# fix apparent typo in test (importing wrong thing)
-	sed -i -e 's/from localization import/from mkdocs.localization import/g' \
-		mkdocs/tests/theme_tests.py || die
-
-	# Does not work in emerge env
-	sed -i -e 's/test_paths_localized_to_config/_&/' \
-		mkdocs/tests/config/config_options_tests.py
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	default
-	if use doc; then
-		# cannot just do mkdocs build, because that fails if
-		# the package isn't already installed
-		python -m mkdocs build || die "Failed to make docs"
-		# Colliding files found by ecompress:
-		rm site/sitemap.xml.gz || die
-		HTML_DOCS=( "site/." )
-	fi
-}
-
-python_test() {
-	epytest mkdocs/tests/*
-}
diff --git a/dev-python/mkdocs/mkdocs-1.3.1.ebuild b/dev-python/mkdocs/mkdocs-1.3.1.ebuild
index f8f1e01f1639..8585b79b632c 100644
--- a/dev-python/mkdocs/mkdocs-1.3.1.ebuild
+++ b/dev-python/mkdocs/mkdocs-1.3.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 IUSE="doc"
 
diff --git a/dev-python/paste/Manifest b/dev-python/paste/Manifest
index e21b78bba635..784f0c2a192b 100644
--- a/dev-python/paste/Manifest
+++ b/dev-python/paste/Manifest
@@ -1 +1,2 @@
 DIST Paste-3.5.1.tar.gz 637755 BLAKE2B fc5f4afc064ced52322f7c2cb20c84d24538bdd3a5dadf7b47f62dd8b64ed62a2925102b785e366bc9b9257835529ae226a4d291bebd40d70bda16be781613c6 SHA512 7ae39691bb6067309a12bf76e2a110913c7be6ddcda6215eaf0228144ff26a1c7b50500729b65e27652dc7a7edf6fe26bd144d261e8754d7af8bac495d4613f9
+DIST Paste-3.5.2.tar.gz 638207 BLAKE2B 98d9f508923836e41657b653b1cd70d3cea13121dee375c6cfaf28e6f82ebcc36ba74658ade927fd6802f09bf9d9ca566d2b9bbf3eed5122aedd35ed0ac9d5ec SHA512 a1920dbd7ebea137ca33f8f8c33aad563329d1eea193d84e6aa7fc57690f706c1969e3ba76bbf21a73c59a0fe0f732daa4db15705914ac359814b4332a01bc75
diff --git a/dev-python/paste/paste-3.5.2.ebuild b/dev-python/paste/paste-3.5.2.ebuild
new file mode 100644
index 000000000000..77c2ed63bc00
--- /dev/null
+++ b/dev-python/paste/paste-3.5.2.ebuild
@@ -0,0 +1,50 @@
+# 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_{7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+MY_P="Paste-${PV}"
+DESCRIPTION="Tools for using a Web Server Gateway Interface stack"
+HOMEPAGE="
+	https://pythonpaste.readthedocs.io/en/latest/
+	https://github.com/cdent/paste/
+	https://pypi.org/project/Paste/
+"
+SRC_URI="mirror://pypi/${MY_P::1}/${PN^}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris"
+
+RDEPEND="
+	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
+	!dev-python/namespace-paste
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# Internet
+		tests/test_proxy.py
+	)
+
+	[[ ${EPYTHON} == python3.11 ]] && EPYTEST_DESELECT+=(
+		# fails due to cgi deprecation warning
+		tests/test_cgiapp.py::test_form
+	)
+
+	epytest
+}
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index 8e72a74acefb..daf35a4de584 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -1,2 +1,3 @@
 DIST python-phonenumbers-8.12.52.gh.tar.gz 4904385 BLAKE2B c063fee535e3d1dd30844ea7a974601962fb8fd6b56608046e0c488e638624456020100b2b775f979f770ea1690bda38044d4f7457341d1261132f4323a6de86 SHA512 638ec8e09d58adc5131e855a9436b45f1f0252c084638a13130df793d5357fc249e695668e2cce4902a534300c4683b64078e08620fdd2636857f6d328a45d82
 DIST python-phonenumbers-8.12.53.gh.tar.gz 4904940 BLAKE2B c8da67f781c71265faa4d24e5cadf7d2c4e707de6f6fc2efae37f0b846cafd6c00814188c2d89d98ec0fb7dbeef9fedc45dc908adf117643bc2b2a0ab56a4496 SHA512 aa699e5df1b612bbcf384e01b80251099872e67fd5632dab35e53861ab6b28157266ac0a1700f4371a0a2975f0484256fb46b6287b87dc8e69aca85323475490
+DIST python-phonenumbers-8.12.54.gh.tar.gz 4905001 BLAKE2B 5fc206b3dd5f5cc96ecfc91b33369fb12d8a11245f846039478bf77f9dbc8e1bfe0e169eb6f1c360ac2a730f79b512178b115f82434790baeb3b2d26d5eaa370 SHA512 0da4f3ffa57f0c2ddaf843eea1440b33844be7ee45122a21d00b5630b720eac059777dca2051e00baf39158737478d5077f97ec6b9293528b11a9844294a621c
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.54.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.54.ebuild
new file mode 100644
index 000000000000..9767e4c2d82d
--- /dev/null
+++ b/dev-python/phonenumbers/phonenumbers-8.12.54.ebuild
@@ -0,0 +1,39 @@
+# 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_{7,8,9,10} )
+
+inherit distutils-r1
+
+MY_P=python-${P}
+DESCRIPTION="Python port of Google's libphonenumber"
+HOMEPAGE="
+	https://github.com/daviddrysdale/python-phonenumbers/
+	https://pypi.org/project/phonenumbers/
+"
+SRC_URI="
+	https://github.com/daviddrysdale/python-phonenumbers/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}/python
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		dev-python/protobuf-python[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( ../README.md )
+
+python_test() {
+	"${EPYTHON}" testwrapper.py -v || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/pyupgrade/pyupgrade-2.37.3.ebuild b/dev-python/pyupgrade/pyupgrade-2.37.3.ebuild
index 3b7a3a6ef0c9..63eff0c38224 100644
--- a/dev-python/pyupgrade/pyupgrade-2.37.3.ebuild
+++ b/dev-python/pyupgrade/pyupgrade-2.37.3.ebuild
@@ -7,7 +7,7 @@ DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{7,8,9,10} )
 inherit distutils-r1
 
-DESCRIPTION="A tool (and pre-commit hook) to automatically upgrade syntax for newer versions of the language."
+DESCRIPTION="Tool + pre-commit hook to automatically upgrade syntax for newer Pythons"
 HOMEPAGE="https://github.com/asottile/pyupgrade"
 SRC_URI="https://github.com/asottile/pyupgrade/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
 
diff --git a/dev-python/sphinx-gallery/Manifest b/dev-python/sphinx-gallery/Manifest
index 92a1d6e5108e..f090dc18436b 100644
--- a/dev-python/sphinx-gallery/Manifest
+++ b/dev-python/sphinx-gallery/Manifest
@@ -1,2 +1,3 @@
 DIST sphinx-gallery-0.10.1.tar.gz 6546135 BLAKE2B 1f4ead74b848f28944820a77717183d845d1fba7459d11fa9bece16c5cd83742e012cce6906f8f5cd357e5c7db01107b6c7c32e2f7d5b7ce46dcd8d6a4b36e9c SHA512 da3b35907782846a58402fddf2a7f507eba76cd708725ff0ba097ec7bda6e9029252c9fb4df6d192aa7f64c6873465d4ff5e634b5c4cc6c4294e0d38c6db2f02
 DIST sphinx-gallery-0.11.0.tar.gz 395136 BLAKE2B 4380484cb37baeb749469f810cbaf24f51a4f83a24a6ff868d1b8872f58db7b189575e8023926b70c576b029b895e18c3de070d69d20a87c70db5d959ebe8915 SHA512 8c97c9bea3bdeb400715bf7ad36e277c01efd5a5d9a85eaeac397eb1f7066112eaf8ef46cc42226275e50e030bfb1010d7516db70e415fbde953f051f4c3cbf4
+DIST sphinx-gallery-0.11.1.tar.gz 393927 BLAKE2B c4c56e7bc7bfc519cd172cd104cfee902524c70de7fe76cc816d8f4612cbdf1a0786e3d5f83ea74ce7c1726eeaea5db45682efa3d873efeac49d94ab1393b9ac SHA512 514139213516851fe09aac4168d8fff72e5ce62eecdb0864f58e45d5fe6eab58b8fda749b72ae98f94b2bf8ac1a917396195d8a4d1750ec1563b30b879b12b8d
diff --git a/dev-python/sphinx-gallery/sphinx-gallery-0.11.1.ebuild b/dev-python/sphinx-gallery/sphinx-gallery-0.11.1.ebuild
new file mode 100644
index 000000000000..15ed284ca00a
--- /dev/null
+++ b/dev-python/sphinx-gallery/sphinx-gallery-0.11.1.ebuild
@@ -0,0 +1,44 @@
+# 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_{7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="Sphinx extension to automatically generate an examples gallery"
+HOMEPAGE="
+	https://sphinx-gallery.github.io/
+	https://github.com/sphinx-gallery/sphinx-gallery"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/joblib[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e 's:--cov-report= --cov=sphinx_gallery::' setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+EPYTEST_DESELECT=(
+	# Internet
+	sphinx_gallery/tests/test_docs_resolv.py::test_embed_code_links_get_data
+	sphinx_gallery/tests/test_full.py::test_run_sphinx
+	sphinx_gallery/tests/test_full.py::test_embed_links_and_styles
+)
diff --git a/dev-python/widgetsnbextension/Manifest b/dev-python/widgetsnbextension/Manifest
index c96464486198..26f1093a1f4e 100644
--- a/dev-python/widgetsnbextension/Manifest
+++ b/dev-python/widgetsnbextension/Manifest
@@ -1 +1,2 @@
 DIST widgetsnbextension-3.6.1.tar.gz 802619 BLAKE2B 8b1d829137d418d35386d64b71050627ab8639ecae76fa0dbda46925ed495405f234f16b29213d3520e20f8021f139064e1e844c2a63004ab2bd0f3830af2a80 SHA512 0c7a723648299b2839d04b85bec0909f780f32a1181940b8b6ee985b0703732cd6ee57f904ebcbb678c069bd4fb2c27f94a554ffca91890176a7147ab7fd8faf
+DIST widgetsnbextension-4.0.2.tar.gz 1021825 BLAKE2B 3fd4ccbb05346723fb039e3eb3d42c6a131f519eca641efc2ea02df9666fd511b380a5b8cc599297ce6d3ffc5eb1fdb3bb1b132d816b9ffd0da1022e5749c0c7 SHA512 5cdcf428ff897ceffd57293810213423e941665e578e770bccf7b4c8703b5adfacece9cdcd2f3cec4f5cea433b289c4015bfa824c7702315566f6c0aca719f04
diff --git a/dev-python/widgetsnbextension/widgetsnbextension-4.0.2.ebuild b/dev-python/widgetsnbextension/widgetsnbextension-4.0.2.ebuild
new file mode 100644
index 000000000000..8fbe4d217e47
--- /dev/null
+++ b/dev-python/widgetsnbextension/widgetsnbextension-4.0.2.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_{7,8,9,10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="IPython HTML widgets for Jupyter"
+HOMEPAGE="
+	https://ipython.org/
+	https://pypi.org/project/widgetsnbextension/
+"
+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 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/notebook[${PYTHON_USEDEP}]
+"
+
+src_install() {
+	distutils-r1_src_install
+
+	mv "${ED}/usr/etc" "${ED}/etc" || die
+}