Adding metadata

author: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2023-01-10 14:05:43 +0000
committer: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2023-01-10 14:05:43 +0000
commit: 859a72e91c361d1a2ca854f3d8761ee5199d916b (patch)
tree: 3570120e4c936aa2c9b405996d8b09387ec1c8f7 /dev-python
parent: 8387f5b8c6c6be379e953193f7012916a46ad578 (diff)
download: baldeagleos-repo-859a72e91c361d1a2ca854f3d8761ee5199d916b.tar.gz
baldeagleos-repo-859a72e91c361d1a2ca854f3d8761ee5199d916b.tar.xz
baldeagleos-repo-859a72e91c361d1a2ca854f3d8761ee5199d916b.zip
82 files changed, 922 insertions, 1206 deletions
diff --git a/dev-python/Faker/Faker-16.1.0.ebuild b/dev-python/Faker/Faker-16.1.0.ebuild
new file mode 100644
index 000000000000..6867dea81f9c
--- /dev/null
+++ b/dev-python/Faker/Faker-16.1.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2022-2023 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,11} )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python package that generates fake data for you"
+HOMEPAGE="
+	https://github.com/joke2k/faker/
+	https://pypi.org/project/Faker/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
+	!dev-ruby/faker
+"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP},tiff]
+		dev-python/validators[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/Faker/Manifest b/dev-python/Faker/Manifest
index 4a8834b53d83..de79d336d8d2 100644
--- a/dev-python/Faker/Manifest
+++ b/dev-python/Faker/Manifest
@@ -1 +1,2 @@
 DIST Faker-15.3.4.tar.gz 1599191 BLAKE2B 8fc26d35cbcde467123c8a5e15813351e65cf81a3640552115bdc55dff48b123e28b180e46595b80029dfdc0d3545b9e75b3f8c2deff380a6168aa2ab603ef2f SHA512 f9c50008c492a2aa8a7d7e62d0f404036cc9161baa3036f5948f607d4e971b34945401f565b3640eca71e7716fa5f2f3d82dd029f84f35dd4925e647638c0c56
+DIST Faker-16.1.0.tar.gz 1599748 BLAKE2B 62c55659b84e556ad2960b0b3c3e49fc96beca86850469af152c833f5b8680e222ef8bde7dbeacb75ac13535ed9ec0774f5c524d58f10d92c78542ec4714ff1f SHA512 7da4ca3824b64fa1b36d5a3f58206e03f61ca984a672e59e68e8ab642da6bb08d7656dc2422a7107ee46ca2d5a0ec5bc7ed4301c296a07f2dfc39c2cfb6ff693
diff --git a/dev-python/asttokens/Manifest b/dev-python/asttokens/Manifest
index 8bfca926323f..30414c748f6a 100644
--- a/dev-python/asttokens/Manifest
+++ b/dev-python/asttokens/Manifest
@@ -1,3 +1 @@
-DIST asttokens-2.1.0.gh.tar.gz 55584 BLAKE2B eb2a73a47fcbfe1b75e0058f7fcc650ebc3cac00e1f816d2b5b7d02b75aaa07445de854c624e3564455036e2d973bc841e9ad3c18232d88b9091cfc3a2f95c71 SHA512 f89fe2ef700c3c07f48a87e39805792d00abc1050e619a987b863f4befc186505749bde956a95eaf152c4d69e087e32f8fa997cfa5527bbeb87e0143da89a662
-DIST asttokens-2.2.0.gh.tar.gz 55963 BLAKE2B 93bdaf42fc19b0735f4f9c70f20a250d8ac6e99e0d663222133be7c2d306b242c807b0a108e9e6dc6a3b014d19c34c4319de5d4c884113dbeacd0219fc780c87 SHA512 1a803bb99852c0dd186a4afc340c3543e8400efea03dc06331d761f8c70e97711915aaa5ae32aea54bd61fb0d77827c5ab3afaa7762913175a5ad75ca2fff5ca
 DIST asttokens-2.2.1.gh.tar.gz 56115 BLAKE2B 89c235391f9cc68fc640c5f9fccd1055cd7649ac92f4f935a872c1b90458f4bf577979fdeb3267f7bd5a5af505b6a33582da47d5fb65b57c411f482622d90feb SHA512 f7fb00918403054bc6a118494f49dcc11946141d2193624455ff2b1ca137d1c75315c779295701e93ae350ce4f5f670d6287e91a116b6b5cbcb06b374a6d00b5
diff --git a/dev-python/asttokens/asttokens-2.1.0.ebuild b/dev-python/asttokens/asttokens-2.1.0.ebuild
deleted file mode 100644
index bef17fee877a..000000000000
--- a/dev-python/asttokens/asttokens-2.1.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 2020-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,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Annotate Python AST trees with source text and token information"
-HOMEPAGE="
-	https://github.com/gristlabs/asttokens/
-	https://pypi.org/project/asttokens/
-"
-SRC_URI="
-	https://github.com/gristlabs/asttokens/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/astroid[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# test suite itself broken with new astroid versions, upstream less care
-	# https://github.com/gristlabs/asttokens/issues/79
-	tests/test_astroid.py
-)
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/asttokens/asttokens-2.2.0.ebuild b/dev-python/asttokens/asttokens-2.2.0.ebuild
deleted file mode 100644
index 39fc49273ff0..000000000000
--- a/dev-python/asttokens/asttokens-2.2.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 2020-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,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Annotate Python AST trees with source text and token information"
-HOMEPAGE="
-	https://github.com/gristlabs/asttokens/
-	https://pypi.org/project/asttokens/
-"
-SRC_URI="
-	https://github.com/gristlabs/asttokens/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/astroid[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# test suite itself broken with new astroid versions, upstream less care
-	# https://github.com/gristlabs/asttokens/issues/79
-	tests/test_astroid.py
-)
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/asttokens/asttokens-2.2.1.ebuild b/dev-python/asttokens/asttokens-2.2.1.ebuild
index f02f6e148abb..afadb798dab2 100644
--- a/dev-python/asttokens/asttokens-2.2.1.ebuild
+++ b/dev-python/asttokens/asttokens-2.2.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 2e17fc7ede1c..47ac0b4ff1b1 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -5,3 +5,4 @@ DIST boto3-1.26.42.gh.tar.gz 586350 BLAKE2B 2dab3f95a6fd17debb1e77fc24f319d1edbd
 DIST boto3-1.26.43.gh.tar.gz 586684 BLAKE2B 43178ff879cb5b3df585fbd1b4a6f71fe116947df2bdcf58c9223ea81e4500853cf3ba78eb47a98c6b9095a03af88b628914192a76cd7c420223e8569e5ef049 SHA512 18ba125c58a70081ce24c60c6315d7165179a7f7bbfcdefbcab5df99375eb7a7a5bf0b9210e2b47fab13166a425625c48ab5a18c6524171838b30cd235830b2e
 DIST boto3-1.26.44.gh.tar.gz 587289 BLAKE2B 33e2c6215a3f9459c3482c349ba68ad39200220a5173a9e3b0001313cbba4a57f42b5e9ea22c5a5a705f018eff89c7514fefbb313de6c829c1c7213543a62ec1 SHA512 7781db03ea01f1fcb21545013a0ef095daf8df70b0927e16fdec10871a2e5ea6a191cb63829fbcdf9dcb6234d213714db94a6cfcaf13e529570f63aac8003e84
 DIST boto3-1.26.45.gh.tar.gz 587548 BLAKE2B fca56cad5fa8bf3bfa34f76aa7014d6ee1129653ec8f0b2c0bb0c2b250814d855e732c4ea4252435a1674138ff00e757cec706ac1a1daa8f6e7969d7f0b65811 SHA512 e872efdc764d20b8d264d7a7e984d9427a0f5bd0a78d895812c2e40a4cf97ba0c483129492b5fe698ac8e123a3a23d6fde4e92cc075632ec7b9d0ed55d0b57b4
+DIST boto3-1.26.46.gh.tar.gz 588430 BLAKE2B 5df965497f598e8f6b29041c060d4b60cb61a5ac6938f9ec395d4c1abe380f3cf4802addd2b9329019933eb1faa46f0253644a43aef18262cdb6f11548ba2b46 SHA512 27513156a4d47c91f6afd063a4f351fe1d959d89064138e2662dda32a8b55b2ae13d62528bfe84616913e05049122831a1fed8727e1fc3a9a195bda861122fe4
diff --git a/dev-python/boto3/boto3-1.26.37.ebuild b/dev-python/boto3/boto3-1.26.37.ebuild
index aa8071e64d5e..d6d605bdb0c6 100644
--- a/dev-python/boto3/boto3-1.26.37.ebuild
+++ b/dev-python/boto3/boto3-1.26.37.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -25,7 +25,7 @@ else
 		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"
+	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-)"
diff --git a/dev-python/boto3/boto3-1.26.46.ebuild b/dev-python/boto3/boto3-1.26.46.ebuild
new file mode 100644
index 000000000000..9523f65d5fb9
--- /dev/null
+++ b/dev-python/boto3/boto3-1.26.46.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+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 953d7f32665d..012aa78288f2 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -5,3 +5,4 @@ DIST botocore-1.29.42.gh.tar.gz 11083372 BLAKE2B 8abca30fbd4bb55d8a0beccc6e81d3d
 DIST botocore-1.29.43.gh.tar.gz 11084999 BLAKE2B 8b6d6010639849fdc944820d82c59a95946694a22806f474a6b2778a1581ed35424d66b6bade5a878efe77d4229a001555b4cacff2ab8041f3b901d74b108d72 SHA512 70e26fd5a51ba5760751b8aec2d4b2565f0c75bd263202e8e409c42b37991de03c3a01fa724d9aa9c000034989eb937240a56ea96132ced7a29ef3fee4dd15de
 DIST botocore-1.29.44.gh.tar.gz 11087027 BLAKE2B e082d732b9cdeee91df4bae5a4f840ccf89b5408a934c5ffc62e7d5ddfb43a710ee55b2a6b4911bbea55ac319478bbcca5e3291e71dc7d98c147064e0b2239d0 SHA512 f928acfeabfd7c0b362d7f0865d8c1e65e5f4fe6b982da7a3e2b5dd1d395eaa9337d5cc4321005e9e759437828cb016173eb4d69357fac4d668f948b5fd0d43a
 DIST botocore-1.29.45.gh.tar.gz 11090136 BLAKE2B 4c5cbd6e80a061793276b40124124c6c8e8c0d9f5bfbe4d5089d755b7af8399635107ed94da6602b2d0788159c1d883b7821db989fe47ad02bcf8bbaa7784b08 SHA512 dfbbc2b30449fa7526794489d3f0c3951e81ddbf53d7915d4492697398febd3b4b918604054a85c950c26a2423e969042de395b8b513688dcf8ad3fe305df4f7
+DIST botocore-1.29.46.gh.tar.gz 11096104 BLAKE2B 540840e08fb7d8a9a8a220108e624600dd28d494937e0439f4d7ad93e9f2c4f09566e69a95cd5806a0576b458256b1293b0764461fa7c27d0e39074a3591b0d3 SHA512 b7ea07081464c3799fadd736371229ca6dfab8b05f8941daa681905ef135e4c0273f30eb2f19b64fbe85b6913886664f83dff0484413b3018ab6f508b0d51f05
diff --git a/dev-python/botocore/botocore-1.29.37.ebuild b/dev-python/botocore/botocore-1.29.37.ebuild
index 36f6e1eb862b..5afa7a9459c5 100644
--- a/dev-python/botocore/botocore-1.29.37.ebuild
+++ b/dev-python/botocore/botocore-1.29.37.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -24,7 +24,7 @@ else
 		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"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 RDEPEND="
diff --git a/dev-python/botocore/botocore-1.29.46.ebuild b/dev-python/botocore/botocore-1.29.46.ebuild
new file mode 100644
index 000000000000..0f4daaa48e81
--- /dev/null
+++ b/dev-python/botocore/botocore-1.29.46.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+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
+		# fails on unrelated warnings
+		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
+		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
+		# TODO
+		tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
+	)
+
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/cfn-lint/Manifest b/dev-python/cfn-lint/Manifest
index 7f3ecd071313..62c3059423d5 100644
--- a/dev-python/cfn-lint/Manifest
+++ b/dev-python/cfn-lint/Manifest
@@ -2,3 +2,4 @@ DIST cfn-lint-0.72.2.gh.tar.gz 3114298 BLAKE2B 5a426a046d1a0ffb773f9b34c544ccf9f
 DIST cfn-lint-0.72.4.gh.tar.gz 3199849 BLAKE2B b0c81be6e2f21ffbc7ee4ebbfc4994d1b413516dc3a47d11f554278b33ead1d3c3c055b541e25a7401fa911c16998cf3c3c85863d2e0f295c1d3df86b78f8847 SHA512 994f418519e72e1814f2ee38e3e5a42f7e2dc1556cda5cb5632b0e57daadbad57425e14d1eff67ba39f0ca1dd22df22f43277f1b1b3d6b66679cc3526fbeedd0
 DIST cfn-lint-0.72.5.gh.tar.gz 3220306 BLAKE2B 381b069e4d35d9af8fa7bab9765f3b249dc6eb114f3965e7b86fecdb2a30abd1fd4bf0c4efdc78490a9c672f6bb30093a05cf162a6f41a872d7ee93d22167aa5 SHA512 f7628894558bb3718edf6ac9f1ea27af913146d060749521900e6bd8122ddda09552dbc1a0a0f4a7c58736b7dd95a0ea8e408b798be7a06e88724e7e7d0cbed2
 DIST cfn-lint-0.72.6.gh.tar.gz 3240330 BLAKE2B f7673efbf6ce88e618e6fb1ff6e21cbb66cef2a1d9922ed90eb3556eff4f38827fce4efa799913168d60dc91929478a82644b7dcee25515172bb86ff74e33f0f SHA512 1db7bd50762c646be2f4bf3e74af8039cd593ccd9c10e68f43d3bc2e435ceb0dbbb70ac5a7cfd8408b7bc0eca2033d78d1fe3f65d0af89917684f7d44c52420b
+DIST cfn-lint-0.72.7.gh.tar.gz 3237460 BLAKE2B 9300703c15dea1cfa804663ad5804cc8d8103cac5c5b19cbda2ed8d2ab721037bd55295bf2e9edbc4d73e19add5de1104fb4c34bd02bf3d6529425666fde6489 SHA512 326bee0c9fa22b76f051109fc1cfa4dee6fa4472a9b598d2f3117c345a07c89c46024d5ada4abd77ff356ac697d034389e1dd131d2ee9e5a270c897b054bb474
diff --git a/dev-python/cfn-lint/cfn-lint-0.72.7.ebuild b/dev-python/cfn-lint/cfn-lint-0.72.7.ebuild
new file mode 100644
index 000000000000..eeb94f75e137
--- /dev/null
+++ b/dev-python/cfn-lint/cfn-lint-0.72.7.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+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.56.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/chart-studio/chart-studio-1.1.0.ebuild b/dev-python/chart-studio/chart-studio-1.1.0.ebuild
deleted file mode 100644
index 3a7bc57347e5..000000000000
--- a/dev-python/chart-studio/chart-studio-1.1.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Browser-based graphing library for Python"
-HOMEPAGE="https://plot.ly/python/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/plotly[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/retrying[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/cloudscraper/Manifest b/dev-python/cloudscraper/Manifest
index da43c4fbd55f..5b568681dc2d 100644
--- a/dev-python/cloudscraper/Manifest
+++ b/dev-python/cloudscraper/Manifest
@@ -1 +1,2 @@
 DIST cloudscraper-1.2.65.gh.tar.gz 111946 BLAKE2B 7b53819ceb3349c9e8bc24cfd3138119b46bd88daa639d1c29b7e7477f0fc2cb323b3e485832236eadf48be76d16a2dde93cadffe594fc7b7d43b24651de45eb SHA512 e885e7e0b7e91318da4b6d65165961fbae27951be9b4f05af96e7eeaf1e28e1146af52c10bf0b769f07fc04016998eed9146ec92504a591d81434a101c6d6850
+DIST cloudscraper-1.2.68.gh.tar.gz 111952 BLAKE2B 69e896ad704ce776594fb89714bb75316ebff1b03387cba8575be6d60b496d18556690cfad109c2fa55c72ce3d91dcd21a21467a2d9820c579fea7482b688800 SHA512 42fa90127c6348c52a8327728683719966ae69c7b945cb9b485907e89e3b29b8053d31cd9cd4326e71ffd4c33e0fce20dd3d0e046fab62d89110eb4510535ad9
diff --git a/dev-python/cloudscraper/cloudscraper-1.2.68.ebuild b/dev-python/cloudscraper/cloudscraper-1.2.68.ebuild
new file mode 100644
index 000000000000..339043c76755
--- /dev/null
+++ b/dev-python/cloudscraper/cloudscraper-1.2.68.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2023 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,11} )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="A Python module to bypass Cloudflare's anti-bot page"
+HOMEPAGE="
+	https://github.com/VeNoMouS/cloudscraper/
+	https://pypi.org/project/cloudscraper/
+"
+SRC_URI="
+	https://github.com/VeNoMouS/cloudscraper/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+
+RDEPEND="
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+	dev-python/requests-toolbelt[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/js2py[${PYTHON_USEDEP}]
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		net-libs/nodejs
+	)
+"
+
+# These tests fail for no understanadble reason
+EPYTEST_DESELECT=(
+	"tests/test_cloudscraper.py::TestCloudScraper::test_bad_interpreter_js_challenge1_16_05_2020"
+	"tests/test_cloudscraper.py::TestCloudScraper::test_bad_solve_js_challenge1_16_05_2020"
+	"tests/test_cloudscraper.py::TestCloudScraper::test_Captcha_challenge_12_12_2019"
+	"tests/test_cloudscraper.py::TestCloudScraper::test_reCaptcha_providers"
+)
+
+distutils_enable_tests pytest
+
+pkg_postinst() {
+	optfeature "brotli decompresssion support" "dev-python/brotlipy"
+
+	optfeature "js2py interpreter support" "dev-python/js2py"
+	optfeature "node.js interpreter support" "net-libs/nodejs"
+}
diff --git a/dev-python/dask/Manifest b/dev-python/dask/Manifest
index 1f923e08e0a7..53f60ef8fd72 100644
--- a/dev-python/dask/Manifest
+++ b/dev-python/dask/Manifest
@@ -1,2 +1 @@
-DIST dask-2022.12.0.gh.tar.gz 8226972 BLAKE2B 56def762c1899df9b355f54484b77cfde125e85287db488388130c92b388f014b7ddf8ccd4614918a5c6a15513c7fab207b4c2231105880a893af32e768ed675 SHA512 bc29f3735fb977a5b523d7ffbf55a99fd7a386388f1ebec3c44196d3b6870393163e023a2c64f1f8e7b8aae5342b9b0041a6628df72d14a0127513acf7f6c529
 DIST dask-2022.12.1.gh.tar.gz 8233697 BLAKE2B 90caeb7a8a9abc03b035c787ae2f26d5dacbd8da9314b65deb7c38e1990a7d3067b4066c8f2bbb6d8179d03af471374df28e511f000097cb7b031e692e72ccd9 SHA512 1945f5737de55c559aff14c67efeee00afef18ff5dbdc07aa79affd89eb45a0808078bbc7ce24c904168e7c7a74a678a8dc90ed129593777dd25598cb45372b6
diff --git a/dev-python/dask/dask-2022.12.0.ebuild b/dev-python/dask/dask-2022.12.0.ebuild
deleted file mode 100644
index d2ee1dd2a607..000000000000
--- a/dev-python/dask/dask-2022.12.0.ebuild
+++ /dev/null
@@ -1,61 +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,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Task scheduling and blocked algorithms for parallel processing"
-HOMEPAGE="
-	https://www.dask.org/
-	https://github.com/dask/dask/
-	https://pypi.org/project/dask/
-"
-SRC_URI="
-	https://github.com/dask/dask/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/cloudpickle-0.2.2[${PYTHON_USEDEP}]
-	>=dev-python/fsspec-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.15.1[${PYTHON_USEDEP}]
-	>=dev-python/pandas-0.25.0[${PYTHON_USEDEP}]
-	>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
-	>=dev-python/partd-0.3.10[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.3.1[${PYTHON_USEDEP}]
-	>=dev-python/toolz-0.8.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/toolz[${PYTHON_USEDEP}]
-	test? (
-		dev-python/moto[${PYTHON_USEDEP}]
-		dev-python/numexpr[${PYTHON_USEDEP}]
-		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-		dev-python/scipy[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# another test relying on -Werror
-	"dask/array/tests/test_overlap.py::test_map_overlap_no_depth[None]"
-	# TODO
-	dask/array/tests/test_reductions.py::test_mean_func_does_not_warn
-	dask/tests/test_config.py::test__get_paths
-	dask/array/tests/test_linalg.py::test_solve_assume_a
-	"dask/dataframe/tests/test_dataframe.py::test_repartition_npartitions[<lambda>0-float-5-1-True]"
-	"dask/dataframe/tests/test_dataframe.py::test_repartition_npartitions[<lambda>1-float-5-1-True]"
-)
-
-python_test() {
-	epytest -p no:flaky -m "not network"
-}
diff --git a/dev-python/dask/dask-2022.12.1-r1.ebuild b/dev-python/dask/dask-2022.12.1-r1.ebuild
index c9b6b990f462..691791ba8d66 100644
--- a/dev-python/dask/dask-2022.12.1-r1.ebuild
+++ b/dev-python/dask/dask-2022.12.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/cloudpickle-0.2.2[${PYTHON_USEDEP}]
diff --git a/dev-python/easy-thumbnails/Manifest b/dev-python/easy-thumbnails/Manifest
index edaabb5444f5..36decbef215d 100644
--- a/dev-python/easy-thumbnails/Manifest
+++ b/dev-python/easy-thumbnails/Manifest
@@ -1,2 +1,3 @@
 DIST easy-thumbnails-2.8.3.tar.gz 76935 BLAKE2B 33cbbd80e322ac9e417a4e06001c9f2429cb51d1812b65eb70c0f96b1906b474c36593290493cff1e4c6b7c1b0c8097cc2f05f4a2c8d61097dbc4e3d2c12a13a SHA512 953f7eea9ec99213439a8f645c1b70618f7655d2ee417596d6dc9e6eeb797fdb4b87fe7380098dc4682934759acbd6f63cd44b19b3fed5ded5b86eea0bdcd0d4
 DIST easy-thumbnails-2.8.4.tar.gz 77392 BLAKE2B cb6a66e868a524ed9ec6ee8832b1d364a8432eac844f94bb45ccb43e8b2ac61bc2d534025a28325b7f3bf395261ee67bc705101574ebea1f0d926feff10b7b3a SHA512 875976a3679f5004feaf8524abf09c8bfd76513680dfda2b7fe94715a88abefa8570a85b7c6936e72890a31c73e31fcbfa0c04e227ec23d707a0b62d945cbce3
+DIST easy-thumbnails-2.8.5.tar.gz 77401 BLAKE2B 625e01a5bf0af7a88dc965908c7e499bd57bc0860aad663e3dc341060d485885572dfb2b971499080659757eecd01bd3a479d3c2bc8b2bfdbf3ef79a4f1a7255 SHA512 0a659eb2a6067e2e2fa825a3c304ea57bf102902c92c662c6b38f6fc7b4a17883144aea10c67a3d6321c3911e6d5dd2633345d4f180f7f7854b3985772ad0273
diff --git a/dev-python/easy-thumbnails/easy-thumbnails-2.8.5.ebuild b/dev-python/easy-thumbnails/easy-thumbnails-2.8.5.ebuild
new file mode 100644
index 000000000000..c699e490433a
--- /dev/null
+++ b/dev-python/easy-thumbnails/easy-thumbnails-2.8.5.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2023 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,11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Easy thumbnails for Django"
+HOMEPAGE="
+	https://github.com/SmileyChris/easy-thumbnails/
+	https://pypi.org/project/easy-thumbnails/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="svg test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/django-2.2[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	svg? (
+		dev-python/reportlab[${PYTHON_USEDEP}]
+		dev-python/svglib[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		${RDEPEND}
+		dev-python/reportlab[${PYTHON_USEDEP}]
+		dev-python/svglib[${PYTHON_USEDEP}]
+		dev-python/testfixtures[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	local -x DJANGO_SETTINGS_MODULE=easy_thumbnails.tests.settings
+	local -x PYTHONPATH="${S}"
+	django-admin test -v 2 || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/gmpy/Manifest b/dev-python/gmpy/Manifest
index ba37c90c9899..460832e9d409 100644
--- a/dev-python/gmpy/Manifest
+++ b/dev-python/gmpy/Manifest
@@ -1,4 +1 @@
-DIST gmpy2-2.1.2.tar.gz 258445 BLAKE2B 5fd89478bb7c48c317a7af74fd872e5a9c1141f8f23c110aba7298d1a325caa13e24f1a2e601d6b3c6f6af30d60505f9161a03def16df59dddabe611fb600ef4 SHA512 abfeb0d8a155235e3aa797ca7b34ab6947f0714273e9d381167a9f6273bad34689e1985c139080b146e072b5bfbb4fa2b937566a14f4b94cc09ed21b3f2082b7
-DIST gmpy2-2.1.3.tar.gz 261520 BLAKE2B 4480522da105638521e99a4477285ace5178e6ebd2da2144eba9168da49b8f9ff627030dd2ddb6cc4431bf306c1e48d3ef2b23e193d48315e7e70575ddcc124c SHA512 6759ab52ee9c7abd5a95633d8f42399eb92430b0b2110a7e2db4850d9136f2b41c553a44e5e8c6eb7d44aa68318fd04d43f57b7a8a8af60b5d70140e8d2e2a6f
-DIST gmpy2-2.1.4.tar.gz 261649 BLAKE2B 7ddb02522d8f401f17dd664586623fa7fc2da448948515aac49b02a4ac46ca4f3ab74ab87594bf2c0ab3862832293c1a6f271e5a6afeeb0845890bc0b9ee27e8 SHA512 a71ddcd70b33a83a81a88c893337844dc1e4cfd058ff2236d53568f81c654079489e17c19f22a63fb08670c7254821d92778d9b9c33415467b6ed4634ff598cb
 DIST gmpy2-2.1.5.tar.gz 261709 BLAKE2B 50958868866fadc49c97534780fa491fadfaaea902f3fd4bd51f4e76a94602a6d030a1ee6685aac742e25b5fbe4865e1419307f7215c8fb553b166761d63607a SHA512 92e16359ee1df63faaeae4a3cbefe8cdbbc576d8eda377f08d59f12b70dfe9337a299686e85d1efee6c2f5b41fc4583643fecc68ea38a500c7f876c56fc169e7
diff --git a/dev-python/gmpy/files/gmpy-2.1.0_beta5-test-input.patch b/dev-python/gmpy/files/gmpy-2.1.0_beta5-test-input.patch
deleted file mode 100644
index 16705d917c93..000000000000
--- a/dev-python/gmpy/files/gmpy-2.1.0_beta5-test-input.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/test/runtests.py b/test/runtests.py
-index 5e5842d..7d64e52 100644
---- a/test/runtests.py
-+++ b/test/runtests.py
-@@ -81,7 +81,6 @@ if sys.version.startswith('3.1.'):
-     print("with Python 3.1. The doctest module in Python 3.2 and later does not")
-     print("have this issue.")
-     print()
--    input("Press ENTER to continue.. ")
-     print()
- 
- mpz_doctests = ["test_mpz_create.txt", "test_mpz.txt", "test_mpz_io.txt",
diff --git a/dev-python/gmpy/gmpy-2.1.2-r1.ebuild b/dev-python/gmpy/gmpy-2.1.2-r1.ebuild
deleted file mode 100644
index 59944c643c0d..000000000000
--- a/dev-python/gmpy/gmpy-2.1.2-r1.ebuild
+++ /dev/null
@@ -1,45 +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,11} )
-
-inherit distutils-r1
-
-MY_PN="${PN}2"
-MY_P="${MY_PN}-${PV/_beta/b}"
-
-DESCRIPTION="Python bindings for GMP, MPC, MPFR and MPIR libraries"
-HOMEPAGE="
-	https://github.com/aleaxit/gmpy/
-	https://pypi.org/project/gmpy2/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="LGPL-3+"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-DEPEND="
-	>=dev-libs/mpc-1.0.2:=
-	>=dev-libs/mpfr-3.1.2:=
-	dev-libs/gmp:0=
-"
-RDEPEND="
-	${DEPEND}
-"
-
-PATCHES=(
-	# The tests program asks for input when running, disable that
-	"${FILESDIR}"/gmpy-2.1.0_beta5-test-input.patch
-)
-
-distutils_enable_sphinx docs
-
-python_test() {
-	cd test || die
-	"${EPYTHON}" runtests.py || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/gmpy/gmpy-2.1.3.ebuild b/dev-python/gmpy/gmpy-2.1.3.ebuild
deleted file mode 100644
index 8b7a02572c0c..000000000000
--- a/dev-python/gmpy/gmpy-2.1.3.ebuild
+++ /dev/null
@@ -1,40 +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,11} )
-
-inherit distutils-r1
-
-MY_PN="${PN}2"
-MY_P="${MY_PN}-${PV/_beta/b}"
-
-DESCRIPTION="Python bindings for GMP, MPC, MPFR and MPIR libraries"
-HOMEPAGE="
-	https://github.com/aleaxit/gmpy/
-	https://pypi.org/project/gmpy2/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="LGPL-3+"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-DEPEND="
-	>=dev-libs/mpc-1.0.2:=
-	>=dev-libs/mpfr-3.1.2:=
-	dev-libs/gmp:0=
-"
-RDEPEND="
-	${DEPEND}
-"
-
-distutils_enable_sphinx docs
-
-python_test() {
-	cd test || die
-	"${EPYTHON}" runtests.py || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/gmpy/gmpy-2.1.4.ebuild b/dev-python/gmpy/gmpy-2.1.4.ebuild
deleted file mode 100644
index 8b7a02572c0c..000000000000
--- a/dev-python/gmpy/gmpy-2.1.4.ebuild
+++ /dev/null
@@ -1,40 +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,11} )
-
-inherit distutils-r1
-
-MY_PN="${PN}2"
-MY_P="${MY_PN}-${PV/_beta/b}"
-
-DESCRIPTION="Python bindings for GMP, MPC, MPFR and MPIR libraries"
-HOMEPAGE="
-	https://github.com/aleaxit/gmpy/
-	https://pypi.org/project/gmpy2/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="LGPL-3+"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-DEPEND="
-	>=dev-libs/mpc-1.0.2:=
-	>=dev-libs/mpfr-3.1.2:=
-	dev-libs/gmp:0=
-"
-RDEPEND="
-	${DEPEND}
-"
-
-distutils_enable_sphinx docs
-
-python_test() {
-	cd test || die
-	"${EPYTHON}" runtests.py || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/gmpy/gmpy-2.1.5.ebuild b/dev-python/gmpy/gmpy-2.1.5.ebuild
index 58aebd3dafbf..45c3b41af346 100644
--- a/dev-python/gmpy/gmpy-2.1.5.ebuild
+++ b/dev-python/gmpy/gmpy-2.1.5.ebuild
@@ -21,7 +21,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="LGPL-3+"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 DEPEND="
 	>=dev-libs/mpc-1.0.2:=
diff --git a/dev-python/google-auth/Manifest b/dev-python/google-auth/Manifest
index 4ffef6a28def..34d225fafe9a 100644
--- a/dev-python/google-auth/Manifest
+++ b/dev-python/google-auth/Manifest
@@ -1 +1,2 @@
 DIST google-auth-2.15.0.tar.gz 221698 BLAKE2B 73decb21ab51889d2f22a2dca9d01f8c7d77a37a5ba186e2fba05bfb7a56f0e5ea0f5c1396c0be527b03e9083e98995e96f0081973e97766fafc6a63946c0015 SHA512 4a564503195e4a96ac2a89bb208c37e434185439533913285ca03a3627f28e641a99224ae285ced84050fdc6073e075b1ba288e9a9c18d3e6adf70509b5ee68b
+DIST google-auth-2.16.0.tar.gz 223336 BLAKE2B 9dbd54bdf072dacdf728f6fc34931f153dd409e3e1b92e37ed652a1db39d5380b7e66bd196cb1192f75234b2317518a443f8f515bc9135f553e6c9f1116fc606 SHA512 dbeff00089a410c6702e2bd704968c7392809dc217b3f511b62429a11649e4b0607a41622d2753bed9e511368b1c32086b23df66ec915e07a1dd4f32471e025d
diff --git a/dev-python/google-auth/google-auth-2.16.0.ebuild b/dev-python/google-auth/google-auth-2.16.0.ebuild
new file mode 100644
index 000000000000..5e31f839ad86
--- /dev/null
+++ b/dev-python/google-auth/google-auth-2.16.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Google Authentication Library"
+HOMEPAGE="
+	https://github.com/googleapis/google-auth-library-python/
+	https://pypi.org/project/google-auth/
+"
+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/cachetools-6.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-modules-0.2.1[${PYTHON_USEDEP}]
+	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	!dev-python/namespace-google
+"
+BDEPEND="
+	test? (
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		dev-python/flask[${PYTHON_USEDEP}]
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/grpcio[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/moto[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+		dev-python/pyu2f[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		dev-python/urllib3[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# these are compatibility tests with oauth2client
+	# disable them to unblock removal of that package
+	tests/test__oauth2client.py
+)
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/googleapis-common-protos/Manifest b/dev-python/googleapis-common-protos/Manifest
index 8fead90d5f66..e386dfbc9c65 100644
--- a/dev-python/googleapis-common-protos/Manifest
+++ b/dev-python/googleapis-common-protos/Manifest
@@ -1,2 +1,3 @@
 DIST googleapis-common-protos-1.57.0.tar.gz 115316 BLAKE2B 3514774e537940a06db788646efcb9fbadbd5c0014844eaabcd4f24810cb13f8fc6983b4d451b5d5d3c8188e07548d60a42de9faebc0b6a8d883d61314405e04 SHA512 254f31631508770754a3bcc72a31705fc80aca87186291db73c20dd85ee209c71d97110dc2c9c742243ccb2121d38d77d3e1dc8a05eb4fc77ce07a2f32f7ef31
 DIST googleapis-common-protos-1.57.1.tar.gz 115396 BLAKE2B 1ad20e61fe639bb8d0e3bb98cba80570805f913314bdb715d7e36cf50480292404c7bca23ab3d8701a14e4c1c30cbd4af711d3f20e0db3112477d2a1124b4e12 SHA512 ec1af9eef6bb359df5c4046a94c5b1c6769dcb1947fff98ece3ae3e27457a2afef71fe8444db391af2fa8f8ed64b4f73c18273e22fc4770d110c2e95a4c53037
+DIST googleapis-common-protos-1.58.0.tar.gz 117015 BLAKE2B 7821d83e40c42196517e27f9340741deb2c04fe15129c6e6f9c90c884ce6c4ffae38d456494d5271ac42f680595f82941df70bb2d94c5c20743d99c237a29354 SHA512 3e057e8dce7898ebf5c63ea1ded4f336ad5235ee6e7595739efd4c005b34f63d88481242f2d5a38b8d531d79d1957c2b79918bf61eb3ebc52227ec20b204cc82
diff --git a/dev-python/googleapis-common-protos/googleapis-common-protos-1.58.0.ebuild b/dev-python/googleapis-common-protos/googleapis-common-protos-1.58.0.ebuild
new file mode 100644
index 000000000000..7b200adf6c49
--- /dev/null
+++ b/dev-python/googleapis-common-protos/googleapis-common-protos-1.58.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2020-2023 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,11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python classes generated from the common protos in the googleapis repository"
+HOMEPAGE="
+	https://github.com/googleapis/python-api-common-protos/
+	https://pypi.org/project/googleapis-common-protos/
+"
+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/protobuf-python-5[${PYTHON_USEDEP}]
+	>=dev-python/protobuf-python-3.15.0[${PYTHON_USEDEP}]
+	!dev-python/namespace-google
+"
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
+
+# no tests as this is all generated code
diff --git a/dev-python/imageio-ffmpeg/Manifest b/dev-python/imageio-ffmpeg/Manifest
index f35240db3079..8afaada236e7 100644
--- a/dev-python/imageio-ffmpeg/Manifest
+++ b/dev-python/imageio-ffmpeg/Manifest
@@ -1 +1,2 @@
 DIST imageio-ffmpeg-0.4.7.gh.tar.gz 26301 BLAKE2B b794c4c69e43304e089cbab61ff70f3d7d305a515163d0cd0ee4fca678fbec029f01dda1559d6e10e287e56937d6c8f9b52c816df99977034867997c1e392c06 SHA512 4e97bd1258aaa43304a3240460f34a0a4b98340c1dc57f673644af36724935f9f2905378b38626b766e7f609fcbda48d2c58402dc3ef9c48c596936a4bd2cc06
+DIST imageio-ffmpeg-0.4.8.gh.tar.gz 27124 BLAKE2B 84ba7cbb46feae7e95b9d6f61e9b3289a753da7d78ad2848b593969c7f2a6f9e36307ca07a4b03f672fe8f61c697dcbf2dc236a2545b9ca9547fa6f174c96220 SHA512 aa6179d8c8cdbb49a60bea5ad570c6343d5e6b5a2678e88bacc484916ff806311c121143342f039ba9d41c8ac46ffbfe0adefe298e5eba0052d72c6e1707c4a6
diff --git a/dev-python/imageio-ffmpeg/imageio-ffmpeg-0.4.8.ebuild b/dev-python/imageio-ffmpeg/imageio-ffmpeg-0.4.8.ebuild
new file mode 100644
index 000000000000..deed3343d9a7
--- /dev/null
+++ b/dev-python/imageio-ffmpeg/imageio-ffmpeg-0.4.8.ebuild
@@ -0,0 +1,38 @@
+# Copyright 2021-2023 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,11} )
+
+inherit distutils-r1
+
+DESCRIPTION="FFMPEG wrapper for Python"
+HOMEPAGE="
+	https://github.com/imageio/imageio-ffmpeg/
+	https://pypi.org/project/imageio-ffmpeg/
+"
+SRC_URI="
+	https://github.com/imageio/imageio-ffmpeg/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+PROPERTIES="test_network"
+RESTRICT="test"
+
+# ffmpeg is used as an executable during runtime
+RDEPEND="
+	media-video/ffmpeg:*
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -e '/setup_requires/d' -i setup.py || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/imageio/Manifest b/dev-python/imageio/Manifest
index 97993cfe366c..ec085a048981 100644
--- a/dev-python/imageio/Manifest
+++ b/dev-python/imageio/Manifest
@@ -1,4 +1,3 @@
-DIST imageio-2.22.4.gh.tar.gz 395090 BLAKE2B 8980516e26c3a8d128937046582b796264616922f10c5a347ec9b718c773666fe431b2426abbf1de2c99a27cfdc1d7747727c23b2dd665ae88e405746966896e SHA512 38339e7da4ae238cf91aae4ec500899edf7547e80029941550ea73c6b0ba926eac21f4a234833ce52078426c660409558935b72775f3131a390f913fefdb0df1
 DIST imageio-2.23.0.gh.tar.gz 395916 BLAKE2B 2ca40f70dfc3f79084933a22ab2f841ecee0c5f0768dd73ea264a366853cc582111e677fb1521f74f3b2ff516f0ab51de013e8e013dafbe5cf0386faf21b75f5 SHA512 dcdea9fb245495b0882630f18bd5503c4e36fa3f3b50dc58712a8a246424855cd0f280e026889eb8a6a4f7d833792f87d373f645e59ff39fb81514ada79f4248
 DIST imageio-2.24.0.gh.tar.gz 401266 BLAKE2B a5b247304edc53288d1589b2ff9e6efcd221f56581624bf0df6c18171841aebf334e1394110470d18c7fc33a4f5b27b52c7e76e51d2129fddefbb73932e02cb5 SHA512 ec86136701945deeb79db64a8e0787234f9d4b62e30be22a8d6f53d4daa2abaa6d2b1a95eaf7f6f97559f99427734cd4b85145feed5fbb53356d902cc391a998
 DIST imageio-chelsea.png 221294 BLAKE2B 58537d7a1678fa5be4cc899e5bacd925bfc180eb4ae691330a53749a49ff544e979609b529ed27e5c1fc9efe4bc050ca1ce49b777f4016fb1d66affd926ef9d3 SHA512 48470cdb843eed4dfa6673811c09c5aac9869ee23dd36be0c6b653d9f108d61d21b148c2a4435aaa6604887ba030e5bbc5e35d378da876366445dfc2d0ba4e27
diff --git a/dev-python/imageio/imageio-2.22.4.ebuild b/dev-python/imageio/imageio-2.22.4.ebuild
deleted file mode 100644
index fd12e67c07bf..000000000000
--- a/dev-python/imageio/imageio-2.22.4.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
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-BIN_COMMIT=224074bca448815e421a59266864c23041531a42
-DESCRIPTION="Python library for reading and writing image data"
-HOMEPAGE="
-	https://imageio.readthedocs.io/en/stable/
-	https://github.com/imageio/imageio/
-	https://pypi.org/project/imageio/
-"
-SRC_URI="
-	https://github.com/imageio/imageio/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-	test? (
-		https://github.com/imageio/imageio-binaries/raw/${BIN_COMMIT}/images/chelsea.png
-			-> ${PN}-chelsea.png
-		https://github.com/imageio/imageio-binaries/raw/${BIN_COMMIT}/images/cockatoo.mp4
-			-> ${PN}-cockatoo.mp4
-	)
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-# over 50% of tests rely on Internet
-PROPERTIES="test_network"
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-python/numpy-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/pillow-8.3.2[${PYTHON_USEDEP}]
-	media-libs/freeimage
-"
-# requests for fsspec[github]
-BDEPEND="
-	test? (
-		dev-python/fsspec[${PYTHON_USEDEP}]
-		dev-python/imageio-ffmpeg[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/tifffile[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	local PATCHES=(
-		# block silently downloading vulnerable libraries from the Internet
-		"${FILESDIR}"/imageio-2.22.0-block-download.patch
-	)
-
-	if use test; then
-		mkdir -p "${HOME}"/.imageio/images || die
-		local i
-		for i in chelsea.png cockatoo.mp4; do
-			cp "${DISTDIR}/${PN}-${i}" "${HOME}/.imageio/images/${i}" || die
-		done
-	fi
-
-	distutils-r1_src_prepare
-}
-
-EPYTEST_DESELECT=(
-	# Fails because of system installed freeimage
-	tests/test_core.py::test_findlib2
-	# Tries to download ffmpeg binary ?!
-	tests/test_ffmpeg.py::test_get_exe_installed
-	# blocked by our patch
-	tests/test_core.py::test_fetching
-	tests/test_core.py::test_request
-	# known broken
-	# https://github.com/imageio/imageio/issues/890
-	tests/test_freeimage.py::test_exr_write
-)
diff --git a/dev-python/imageio/imageio-2.23.0.ebuild b/dev-python/imageio/imageio-2.23.0.ebuild
deleted file mode 100644
index fd12e67c07bf..000000000000
--- a/dev-python/imageio/imageio-2.23.0.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
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-BIN_COMMIT=224074bca448815e421a59266864c23041531a42
-DESCRIPTION="Python library for reading and writing image data"
-HOMEPAGE="
-	https://imageio.readthedocs.io/en/stable/
-	https://github.com/imageio/imageio/
-	https://pypi.org/project/imageio/
-"
-SRC_URI="
-	https://github.com/imageio/imageio/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-	test? (
-		https://github.com/imageio/imageio-binaries/raw/${BIN_COMMIT}/images/chelsea.png
-			-> ${PN}-chelsea.png
-		https://github.com/imageio/imageio-binaries/raw/${BIN_COMMIT}/images/cockatoo.mp4
-			-> ${PN}-cockatoo.mp4
-	)
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-# over 50% of tests rely on Internet
-PROPERTIES="test_network"
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-python/numpy-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/pillow-8.3.2[${PYTHON_USEDEP}]
-	media-libs/freeimage
-"
-# requests for fsspec[github]
-BDEPEND="
-	test? (
-		dev-python/fsspec[${PYTHON_USEDEP}]
-		dev-python/imageio-ffmpeg[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/tifffile[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	local PATCHES=(
-		# block silently downloading vulnerable libraries from the Internet
-		"${FILESDIR}"/imageio-2.22.0-block-download.patch
-	)
-
-	if use test; then
-		mkdir -p "${HOME}"/.imageio/images || die
-		local i
-		for i in chelsea.png cockatoo.mp4; do
-			cp "${DISTDIR}/${PN}-${i}" "${HOME}/.imageio/images/${i}" || die
-		done
-	fi
-
-	distutils-r1_src_prepare
-}
-
-EPYTEST_DESELECT=(
-	# Fails because of system installed freeimage
-	tests/test_core.py::test_findlib2
-	# Tries to download ffmpeg binary ?!
-	tests/test_ffmpeg.py::test_get_exe_installed
-	# blocked by our patch
-	tests/test_core.py::test_fetching
-	tests/test_core.py::test_request
-	# known broken
-	# https://github.com/imageio/imageio/issues/890
-	tests/test_freeimage.py::test_exr_write
-)
diff --git a/dev-python/ipykernel/Manifest b/dev-python/ipykernel/Manifest
index c6c289b52c7c..6fc5ae0a2f07 100644
--- a/dev-python/ipykernel/Manifest
+++ b/dev-python/ipykernel/Manifest
@@ -2,3 +2,4 @@ DIST ipykernel-6.18.3.tar.gz 141999 BLAKE2B da5b0b2a36a58f2c91fdeab95a7e4bb33e09
 DIST ipykernel-6.19.2.tar.gz 143367 BLAKE2B f6f38f5eed3a11951d303f49c58131d9473040b34032c133cf0f788bb648fc7c8529e3879dce315dcd3eda4eb1be45eb4891d10d4a2d006bb7947f2b342a47a7 SHA512 67ccbffb2d9eba27e9b87c7bd9dc471955c0109ea30caf77412f74c803dc25ab526de90d8351c9459b5d7b2009c746f73ac4a08ae8c277d2e2de8344aef71834
 DIST ipykernel-6.19.3.tar.gz 143840 BLAKE2B 9736d1ae2a2ef3c807bcea78aafc4ca2e3813693bddf9eac82425aed78382c36d736d5b4351989d9fdf3343335c503fef92f76ebff5a313e5af222aa78a04a04 SHA512 5c37e60ee353e469c0d7fce20a66d8e71dc57120ace6d518ed98816280c794ffafe8e8226545d978fc822760b5874371eafcb20cb7195328e505073eb70b4f06
 DIST ipykernel-6.19.4.tar.gz 144072 BLAKE2B 25e2031a9198079488ef43b9c65e656be720ec8ac6648cb3eb65705be5c117d32c783776c0d8f5da466e745979ccb64573720146c0b41835ecb646bf25e7d4f8 SHA512 623a8cac7abfce0147a08fe55bf88772bfaf317431a608a99ae3e7058ebb120464d751a8b95633ccde5201b4cc2c1bde32dd823add96e5f2bb1ef20da19652dd
+DIST ipykernel-6.20.1.tar.gz 149147 BLAKE2B 9d05f1f43aa1a77dd63fac60fdd44d56dd03cc8b5025a99b29e04e30ca90ec5e6d541ab86c9fa1490b97b198e829058d14273823ad55321b1f8fe1b028d1bc62 SHA512 7a9b2ac79255e3049ee5847f5b424d2dff0a325e9f294b416d905907753c98751c70ff69ba496831eb98430532f438e5bd7edcb2c12b8b5c56f5b5c79b30c3d1
diff --git a/dev-python/ipykernel/ipykernel-6.20.1.ebuild b/dev-python/ipykernel/ipykernel-6.20.1.ebuild
new file mode 100644
index 000000000000..9aa95659846d
--- /dev/null
+++ b/dev-python/ipykernel/ipykernel-6.20.1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2023 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,11} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="IPython Kernel for Jupyter"
+HOMEPAGE="
+	https://github.com/ipython/ipykernel/
+	https://pypi.org/project/ipykernel/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/comm-0.1.1[${PYTHON_USEDEP}]
+	>=dev-python/debugpy-1.0[${PYTHON_USEDEP}]
+	>=dev-python/ipython-7.23.1[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_client-6.1.12[${PYTHON_USEDEP}]
+	>=dev-python/matplotlib-inline-0.1[${PYTHON_USEDEP}]
+	dev-python/nest_asyncio[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
+	>=dev-python/tornado-6.1[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-5.4.0[${PYTHON_USEDEP}]
+"
+# RDEPEND seems specifically needed in BDEPEND, at least jupyter
+# bug #816486
+BDEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/ipyparallel[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+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
+}
+
+src_test() {
+	local EPYTEST_DESELECT=(
+		# TODO
+		ipykernel/tests/test_debugger.py::test_attach_debug
+		ipykernel/tests/test_debugger.py::test_breakpoint_in_cell_with_leading_empty_lines
+		ipykernel/tests/test_debugger.py::test_rich_inspect_at_breakpoint
+		ipykernel/tests/test_debugger.py::test_rich_inspect_not_at_breakpoint
+		ipykernel/tests/test_debugger.py::test_set_breakpoints
+		ipykernel/tests/test_debugger.py::test_stop_on_breakpoint
+		# hangs?
+		ipykernel/tests/test_eventloop.py::test_tk_loop
+	)
+
+	virtx distutils-r1_src_test
+}
diff --git a/dev-python/jupyter_core/Manifest b/dev-python/jupyter_core/Manifest
index c15609c1556c..de3ecf6d538a 100644
--- a/dev-python/jupyter_core/Manifest
+++ b/dev-python/jupyter_core/Manifest
@@ -1,2 +1,3 @@
 DIST jupyter_core-5.1.1.tar.gz 81576 BLAKE2B 322d1475092e8308bc84eee3fa71b7dcfc6449cc30b5c6716dc97a71031bfc778035b1f508d5fa630ad29c373b4a2d6a2d576ed4736710c823f2a3fe383a073e SHA512 ba3075fe5ecf1130bd559646b59565bcae9649e9ef645bc3718a8c178d5e1fb5c97bdb2f6802a73245b5b3d1ab8df3f25e80e73ac0954db881ad7be8104e5a39
 DIST jupyter_core-5.1.2.tar.gz 82374 BLAKE2B aace9207d31c896017cf132f15da705118e050816123aade1602cbf9532950c8e495315d6562ce077801900d0d57adb30c66554d05bb891329cb8a59e3208375 SHA512 243a86f7f9a76dfe8a6888a287263d8bb0bab76b30d8177a2834d0767c1c3ef344317f94e223f1bb0b2b22d3c7fdece91fe313dfc20a1c90cb35393d55904c34
+DIST jupyter_core-5.1.3.tar.gz 82657 BLAKE2B d57f97bb698bc8caccce5dd5509f9288db418335bc24283e55200505b4cca04d420f00747e04429b4256b40f722ae8b21441455a5ee8509c3e2ea4f96edbb658 SHA512 49afdb2361eee88f19abd59d1e201d2234591041dd07d42f36c3a4eed039ed2d42bb39a1789be4d0ed03f02183b6ff598338cac85fdc17dad1dfc4c75e44f380
diff --git a/dev-python/jupyter_core/jupyter_core-5.1.3.ebuild b/dev-python/jupyter_core/jupyter_core-5.1.3.ebuild
new file mode 100644
index 000000000000..92a376bfa022
--- /dev/null
+++ b/dev-python/jupyter_core/jupyter_core-5.1.3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2023 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,11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Core common functionality of Jupyter projects"
+HOMEPAGE="
+	https://jupyter.org/
+	https://github.com/jupyter/jupyter_core/
+	https://pypi.org/project/jupyter-core/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/platformdirs-2.5[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-5.3[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/ipython-4.0.1[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs \
+	dev-python/myst_parser \
+	dev-python/sphinx-autodoc-typehints \
+	dev-python/sphinxcontrib-github-alt \
+	dev-python/sphinxcontrib-spelling \
+	dev-python/traitlets
+distutils_enable_tests pytest
diff --git a/dev-python/jupyter_events/Manifest b/dev-python/jupyter_events/Manifest
index 2f0669a0a419..484724a9b156 100644
--- a/dev-python/jupyter_events/Manifest
+++ b/dev-python/jupyter_events/Manifest
@@ -1 +1,2 @@
 DIST jupyter_events-0.5.0.tar.gz 55838 BLAKE2B a3ac815a28d2592a10394569726b76de75cb3baab0bab4c1f276da33375ba93d6bfed71fbfaca404a238b7af58ebd7e75dd7fdf6c8717141517c2f790eeb9514 SHA512 49c21f0d5dce18b137f73911b0272919a56c972561deceb228558ea369f2091ce219ac335eec002b22ca1465b2622330fb3d8973d142df4b76e350345cb6249a
+DIST jupyter_events-0.6.0.tar.gz 58712 BLAKE2B 36c72bb978ff20b24d0633da16c5ce52da3766c5ef5e707d680a8c0e3b63eb5e51d02ddff787303d3b558896c3b1276c2c78ac6dd631758e770f530a396ca34f SHA512 b3c2b0ba3183692cf1d958c12ede11f4a01a28a5c85e89f4186361927bf2529354b7f632a7f69848ad69dbdd2d554e2baff3dcef768582e67bd1f59bab48b9a8
diff --git a/dev-python/jupyter_events/jupyter_events-0.6.0.ebuild b/dev-python/jupyter_events/jupyter_events-0.6.0.ebuild
new file mode 100644
index 000000000000..2d635a868e55
--- /dev/null
+++ b/dev-python/jupyter_events/jupyter_events-0.6.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 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,11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Jupyter Event System library"
+HOMEPAGE="
+	https://jupyter.org/
+	https://github.com/jupyter/jupyter_events/
+	https://pypi.org/project/jupyter-events/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/jsonschema-4.3.0[${PYTHON_USEDEP}]
+	>=dev-python/python-json-logger-2.0.4[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-6.0[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-5.3[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/click[${PYTHON_USEDEP}]
+		dev-python/rich[${PYTHON_USEDEP}]
+	)
+"
+
+# TODO: package jupyterlite-sphinx
+# distutils_enable_sphinx docs
+distutils_enable_tests pytest
diff --git a/dev-python/lark/Manifest b/dev-python/lark/Manifest
index 6da9f768efbc..9378952f5e56 100644
--- a/dev-python/lark/Manifest
+++ b/dev-python/lark/Manifest
@@ -1,2 +1 @@
-DIST lark-1.1.4.tar.gz 246520 BLAKE2B 08073f89a3403d5e722b3af4d9226ea4ca890a7ad9978fb69f023f1219bb2d148533a68810188d3af35770cc36d29629a1c57a3fbab4098e9ec3d4e73f68ffe8 SHA512 32498f8c387320dce89ebab66e9eed49dc83b855060a8fb9459e6323d0d783ff7184ac997ff095fead09766c00f28c12ccbcd614effb8344ba49df51f7b5a566
 DIST lark-1.1.5.tar.gz 246737 BLAKE2B 2111bb6c2f6eaa05b803daf11f0f55641c9b3943a97f943fd27b5dd33f8b511e3b0fc4fb335edbb3926ad19da6cb2696b7f87003b7def068cae1d805b3feb8d9 SHA512 8103e050745c83c99b077667aa8b1d4dfad28f5554d2381534b3518d8d3e8adb70f0304fdc7e1c762d3ea26089181d9632dea155b6cd97237078b89330a6711e
diff --git a/dev-python/lark/lark-1.1.4.ebuild b/dev-python/lark/lark-1.1.4.ebuild
deleted file mode 100644
index bf44d598d63a..000000000000
--- a/dev-python/lark/lark-1.1.4.ebuild
+++ /dev/null
@@ -1,45 +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,11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python module to propose a modern general-purpose parsing library for Python"
-HOMEPAGE="
-	https://github.com/lark-parser/lark/
-	https://pypi.org/project/lark/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/lark/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-BDEPEND="
-	test? (
-		dev-python/atomicwrites[${PYTHON_USEDEP}]
-		dev-python/regex[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# require dev-python/js2py which is a really bad quality package
-		tests/test_nearley/test_nearley.py
-	)
-
-	if has "${EPYTHON}" pypy3 python3.{8,9}; then
-		EPYTEST_IGNORE+=(
-			# test using Python 3.10+ syntax
-			tests/test_pattern_matching.py
-		)
-	fi
-
-	epytest
-}
diff --git a/dev-python/lark/lark-1.1.5.ebuild b/dev-python/lark/lark-1.1.5.ebuild
index 1aaa2196126a..769abee8c4f0 100644
--- a/dev-python/lark/lark-1.1.5.ebuild
+++ b/dev-python/lark/lark-1.1.5.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/lark/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/lit/lit-16.0.0_pre20230107.ebuild b/dev-python/lit/lit-16.0.0_pre20230107.ebuild
index 0e39fac626c6..4a3017cf1639 100644
--- a/dev-python/lit/lit-16.0.0_pre20230107.ebuild
+++ b/dev-python/lit/lit-16.0.0_pre20230107.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~loong"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/mock/Manifest b/dev-python/mock/Manifest
index ef079b4586e6..f4218c639377 100644
--- a/dev-python/mock/Manifest
+++ b/dev-python/mock/Manifest
@@ -1,2 +1,3 @@
 DIST mock-4.0.3.gh.tar.gz 80318 BLAKE2B bc0dc8b97129eaa2f0f9c89898157ea5de398f59f4e2ebc07318cf745b74d1f1bcc989774600ec88ce1956f9fe16f9464f101ea5df5cd23b3a58b432d19feb8a SHA512 adfdab253eb3bc1b6cb767c58ffa3a8a5c5f88da0f04ea6680e0d87da59177972d2d99bfe0a770ac2ed4f809ca6a090a9d0f789eea8f4365ef2c54f8e8792e89
 DIST mock-5.0.0.gh.tar.gz 83866 BLAKE2B 7c0718f8d43325b293b070f37c39ccf539a80460ac7e7b724674deb02154157a7dd62a81cd439e19589cee66f256f111f0feec9f8790f16c70948fac3745b43b SHA512 acde3099cb8daf49dffc390faffc45f94c9f1dd24f196ef613b0677cd88d1b55b5cbd04604ff540731e919784242c1cc341065fae99c347c6dfbb3d8115fc2fe
+DIST mock-5.0.1.gh.tar.gz 84539 BLAKE2B ac50d187974a671db096222af0d0f27add771959553387ca8402951c17ed8e2b9669fff7b147fbc7aca25abc4b5006f5f9d3c2b13f6626a9bea140f6738b3f78 SHA512 b387137632237fa9079a0f70d8724e28bc1833c49d6e14f8fbc357064cf495f6177c783db9448343c0bea98936fc5c3667ce625f5dcdaca851a2f9cc7e3e5639
diff --git a/dev-python/mock/mock-5.0.1.ebuild b/dev-python/mock/mock-5.0.1.ebuild
new file mode 100644
index 000000000000..3e9e49f1e8b3
--- /dev/null
+++ b/dev-python/mock/mock-5.0.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 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,11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Rolling backport of unittest.mock for all Pythons"
+HOMEPAGE="
+	https://github.com/testing-cabal/mock/
+	https://pypi.org/project/mock/
+"
+SRC_URI="
+	https://github.com/testing-cabal/mock/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	local DOCS=( CHANGELOG.rst README.rst )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/moto/Manifest b/dev-python/moto/Manifest
index 9b11b6cb189b..90db06d9bc01 100644
--- a/dev-python/moto/Manifest
+++ b/dev-python/moto/Manifest
@@ -1,6 +1,3 @@
-DIST moto-4.0.10.tar.gz 2501634 BLAKE2B 02fcd7e4f77589a8cae459d74832d72c8835e4357533023803733e3dfad30a44f264356c5dbb0f535ef441384692b4dafbfe33ef9a9e7077f1c61b342c61fa99 SHA512 f8d9817d8b10eb1a2f87d41453f8e3facfa1075a330cb44b46a1306105c059fcf6d9bf94e66ad8e893cf7eddfc4fdf0fc483988455db5f9c6f42d239fe57915a
-DIST moto-4.0.11.tar.gz 2540794 BLAKE2B 3b68e3fc6ab75b7ada2548c0807936fc5ad0d296385357ffb8b8c490fd3611f1333a78e99a093d3cd3ee8e65a2115ae66a4d3338bdf23dfe3ce8a0ebde43bad1 SHA512 fa721bc8cf8256a120870256770adf165f9a3f5d75ea5c83d76303d32a6869d417bec73fca4b09c5d08794cf2e8e530fd73ac53939271785e31f024217c97fa1
 DIST moto-4.0.12.tar.gz 2559220 BLAKE2B 475097f498bc648d6a29db36343135372f0881069ee02b21f0361df0215e852c344edfb7661154c150da88c4de86f832765169dfa9bc159213f15599a21ea0cb SHA512 ea404e603450791956cca9701825afad523ee99358597a3c627af2fda8732c2bbcca41f5d0fe67130a06a225f1ced35a9d35fa520130ff311120c8d6d5863a0a
 DIST moto-4.0.13.tar.gz 2563514 BLAKE2B 1d2f01ff0af7c1ab4bc8670015eeefddf70970aa321ca641989ef740bf3f896bacfeaf8b16cdf37b7fedecafa8d81cc3d66473315f867fcbd6143a7d010d9aba SHA512 1c5a6a19a5eccfd70de71ec0aaa7263f8a7ebb16f9576eb78d72b0a3f0dbdaa3e6db1a631ba36d5c1b04f6d8aded6f492cb8792da1e6fd036897a1dfbdca0b56
-DIST moto-4.0.8.tar.gz 2488253 BLAKE2B ae707de8f0917b62904f38f977eded8f3e995271da8a7d6be47f05a24e3cb8bb8121e5e52625deb6c8f836e5f328352a7e6ea0855a4278c32dc9363da0faa8cc SHA512 9d3d3164bb6a77901bb55b8c536bfc8822e5b5292d79fedfe89a4a7fefaeab24b740d9a898e9487152a45c5a3bfd15d8aaca042a485bea389e1a82bb0a90bdd0
-DIST moto-4.0.9.tar.gz 2496530 BLAKE2B 596dc00ce0c931d4405d1ad6fdfcff4acc5c7421b1f1d67f442e090249d3df81f89c570368b5e981ec49f14a35aed32621ff3dbedc7003e3c870f891e4eda20a SHA512 fedf2c97779a93b1ab3492122be5425f3d91219eb207cc21bf2822ffa52c6efe2c3c8ca233acafd02c725c46e77e883f8f941c29638bb3e32ffa774ed8a5ff69
+DIST moto-4.1.0.tar.gz 2561695 BLAKE2B ce95abe8d49bee64d5323988526e251c52cd5ee5df95fc058240336a2eb580bf7eafbef6b594328a4a5ef34d047a293656c8ec9cdbf9c41bf3c7df05fdfb33c5 SHA512 c5b234c7d7057922880ad9ba09bb4e0453ca09d9f2b58ffce1990092e5d5cb070954e9d6cca307730ecb5540509792d0dbb4135289137fc12469354a91f326b8
diff --git a/dev-python/moto/moto-4.0.10.ebuild b/dev-python/moto/moto-4.0.10.ebuild
deleted file mode 100644
index c08d8de6f343..000000000000
--- a/dev-python/moto/moto-4.0.10.ebuild
+++ /dev/null
@@ -1,94 +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,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Mock library for boto"
-HOMEPAGE="
-	https://github.com/spulec/moto/
-	https://pypi.org/project/moto/
-"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
-	>=dev-python/cfn-lint-0.40.0[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
-	dev-python/cookies[${PYTHON_USEDEP}]
-	>=dev-python/docker-py-2.5.1[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
-	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
-	dev-python/boto3[${PYTHON_USEDEP}]
-	dev-python/botocore[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/flask-cors[${PYTHON_USEDEP}]
-	dev-python/more-itertools[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-3.0.7[${PYTHON_USEDEP}]
-	>=dev-python/openapi-spec-validator-0.2.8[${PYTHON_USEDEP}]
-	dev-python/pretty-yaml[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/python-jose[${PYTHON_USEDEP}]
-	dev-python/python-sshpubkeys[${PYTHON_USEDEP}]
-	>=dev-python/responses-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5[${PYTHON_USEDEP}]
-	dev-python/xmltodict[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-	dev-python/zipp[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		>=dev-python/sure-1.4.11[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/test_firehose/test_firehose_put.py::test_put_record_http_destination
-		tests/test_firehose/test_firehose_put.py::test_put_record_batch_http_destination
-		tests/test_swf/responses/test_decision_tasks.py::test_respond_decision_task_completed_with_schedule_activity_task_boto3
-		tests/test_swf/responses/test_timeouts.py::test_activity_task_heartbeat_timeout_boto3
-		tests/test_swf/responses/test_timeouts.py::test_decision_task_start_to_close_timeout_boto3
-		tests/test_swf/responses/test_timeouts.py::test_workflow_execution_start_to_close_timeout_boto3
-		# broken code (local variable used referenced before definition)
-		tests/test_appsync/test_appsync_schema.py
-		tests/test_appsync/test_server.py::test_appsync_list_tags_for_resource
-		# Needs network (or docker?) but not marked as such, bug #807031
-		# TODO: report upstream
-		tests/test_batch/test_batch_jobs.py::test_terminate_job
-		tests/test_batch/test_batch_jobs.py::test_cancel_pending_job
-		tests/test_batch/test_batch_jobs.py::test_cancel_running_job
-		tests/test_batch/test_batch_jobs.py::test_dependencies
-		tests/test_batch/test_batch_jobs.py::test_container_overrides
-		tests/test_cloudformation/test_cloudformation_custom_resources.py::test_create_custom_lambda_resource__verify_cfnresponse_failed
-		tests/test_cloudformation/test_cloudformation_stack_integration.py::test_lambda_function
-		tests/test_events/test_events_lambdatriggers_integration.py::test_creating_bucket__invokes_lambda
-		tests/test_sqs/test_integration.py::test_invoke_function_from_sqs_exception
-		tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_exception
-		tests/test_s3/test_server.py::test_s3_server_post_to_bucket_redirect
-		tests/test_s3/test_multiple_accounts_server.py::TestAccountIdResolution::test_with_custom_request_header
-		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events0-ObjectCreated:Put]"
-		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events1-ObjectCreated:Put]"
-		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events3-ObjectCreated:Put]"
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -m 'not network'
-}
diff --git a/dev-python/moto/moto-4.0.12-r1.ebuild b/dev-python/moto/moto-4.0.12-r1.ebuild
index 605ecb800e01..523024b65e32 100644
--- a/dev-python/moto/moto-4.0.12-r1.ebuild
+++ b/dev-python/moto/moto-4.0.12-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
diff --git a/dev-python/moto/moto-4.0.12.ebuild b/dev-python/moto/moto-4.0.12.ebuild
index 7dfdb8c72a78..4405480b0e77 100644
--- a/dev-python/moto/moto-4.0.12.ebuild
+++ b/dev-python/moto/moto-4.0.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
diff --git a/dev-python/moto/moto-4.0.8.ebuild b/dev-python/moto/moto-4.0.8.ebuild
deleted file mode 100644
index 9981358db594..000000000000
--- a/dev-python/moto/moto-4.0.8.ebuild
+++ /dev/null
@@ -1,92 +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,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Mock library for boto"
-HOMEPAGE="https://github.com/spulec/moto"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
-	dev-python/cfn-lint[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
-	dev-python/cookies[${PYTHON_USEDEP}]
-	>=dev-python/docker-py-2.5.1[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
-	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
-	dev-python/boto3[${PYTHON_USEDEP}]
-	dev-python/botocore[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/flask-cors[${PYTHON_USEDEP}]
-	dev-python/more-itertools[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-3.0.7[${PYTHON_USEDEP}]
-	>=dev-python/openapi-spec-validator-0.2.8[${PYTHON_USEDEP}]
-	dev-python/pretty-yaml[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/python-jose[${PYTHON_USEDEP}]
-	dev-python/python-sshpubkeys[${PYTHON_USEDEP}]
-	>=dev-python/responses-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5[${PYTHON_USEDEP}]
-	dev-python/xmltodict[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-	dev-python/zipp[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		>=dev-python/sure-1.4.11[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/test_firehose/test_firehose_put.py::test_put_record_http_destination
-		tests/test_firehose/test_firehose_put.py::test_put_record_batch_http_destination
-		tests/test_swf/responses/test_decision_tasks.py::test_respond_decision_task_completed_with_schedule_activity_task_boto3
-		tests/test_swf/responses/test_timeouts.py::test_activity_task_heartbeat_timeout_boto3
-		tests/test_swf/responses/test_timeouts.py::test_decision_task_start_to_close_timeout_boto3
-		tests/test_swf/responses/test_timeouts.py::test_workflow_execution_start_to_close_timeout_boto3
-		# broken code (local variable used referenced before definition)
-		tests/test_appsync/test_appsync_schema.py
-		tests/test_appsync/test_server.py::test_appsync_list_tags_for_resource
-		# Needs network (or docker?) but not marked as such, bug #807031
-		# TODO: report upstream
-		tests/test_batch/test_batch_jobs.py::test_terminate_job
-		tests/test_batch/test_batch_jobs.py::test_cancel_pending_job
-		tests/test_batch/test_batch_jobs.py::test_cancel_running_job
-		tests/test_batch/test_batch_jobs.py::test_dependencies
-		tests/test_batch/test_batch_jobs.py::test_container_overrides
-		tests/test_cloudformation/test_cloudformation_custom_resources.py::test_create_custom_lambda_resource__verify_cfnresponse_failed
-		tests/test_cloudformation/test_cloudformation_stack_integration.py::test_lambda_function
-		tests/test_events/test_events_lambdatriggers_integration.py::test_creating_bucket__invokes_lambda
-		tests/test_sqs/test_integration.py::test_invoke_function_from_sqs_exception
-		tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_exception
-		tests/test_s3/test_server.py::test_s3_server_post_to_bucket_redirect
-		tests/test_s3/test_multiple_accounts_server.py::TestAccountIdResolution::test_with_custom_request_header
-		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events0-ObjectCreated:Put]"
-		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events1-ObjectCreated:Put]"
-		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events3-ObjectCreated:Put]"
-	)
-
-	# pytest-django causes freezegun try to mangle stuff inside django
-	# which fails when django is not really used
-	epytest -p no:django -m 'not network'
-}
diff --git a/dev-python/moto/moto-4.0.9.ebuild b/dev-python/moto/moto-4.0.9.ebuild
deleted file mode 100644
index d32c6851c19f..000000000000
--- a/dev-python/moto/moto-4.0.9.ebuild
+++ /dev/null
@@ -1,92 +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,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Mock library for boto"
-HOMEPAGE="https://github.com/spulec/moto"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
-	dev-python/cfn-lint[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
-	dev-python/cookies[${PYTHON_USEDEP}]
-	>=dev-python/docker-py-2.5.1[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
-	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
-	dev-python/boto3[${PYTHON_USEDEP}]
-	dev-python/botocore[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/flask-cors[${PYTHON_USEDEP}]
-	dev-python/more-itertools[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-3.0.7[${PYTHON_USEDEP}]
-	>=dev-python/openapi-spec-validator-0.2.8[${PYTHON_USEDEP}]
-	dev-python/pretty-yaml[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/python-jose[${PYTHON_USEDEP}]
-	dev-python/python-sshpubkeys[${PYTHON_USEDEP}]
-	>=dev-python/responses-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5[${PYTHON_USEDEP}]
-	dev-python/xmltodict[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-	dev-python/zipp[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		>=dev-python/sure-1.4.11[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/test_firehose/test_firehose_put.py::test_put_record_http_destination
-		tests/test_firehose/test_firehose_put.py::test_put_record_batch_http_destination
-		tests/test_swf/responses/test_decision_tasks.py::test_respond_decision_task_completed_with_schedule_activity_task_boto3
-		tests/test_swf/responses/test_timeouts.py::test_activity_task_heartbeat_timeout_boto3
-		tests/test_swf/responses/test_timeouts.py::test_decision_task_start_to_close_timeout_boto3
-		tests/test_swf/responses/test_timeouts.py::test_workflow_execution_start_to_close_timeout_boto3
-		# broken code (local variable used referenced before definition)
-		tests/test_appsync/test_appsync_schema.py
-		tests/test_appsync/test_server.py::test_appsync_list_tags_for_resource
-		# Needs network (or docker?) but not marked as such, bug #807031
-		# TODO: report upstream
-		tests/test_batch/test_batch_jobs.py::test_terminate_job
-		tests/test_batch/test_batch_jobs.py::test_cancel_pending_job
-		tests/test_batch/test_batch_jobs.py::test_cancel_running_job
-		tests/test_batch/test_batch_jobs.py::test_dependencies
-		tests/test_batch/test_batch_jobs.py::test_container_overrides
-		tests/test_cloudformation/test_cloudformation_custom_resources.py::test_create_custom_lambda_resource__verify_cfnresponse_failed
-		tests/test_cloudformation/test_cloudformation_stack_integration.py::test_lambda_function
-		tests/test_events/test_events_lambdatriggers_integration.py::test_creating_bucket__invokes_lambda
-		tests/test_sqs/test_integration.py::test_invoke_function_from_sqs_exception
-		tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_exception
-		tests/test_s3/test_server.py::test_s3_server_post_to_bucket_redirect
-		tests/test_s3/test_multiple_accounts_server.py::TestAccountIdResolution::test_with_custom_request_header
-		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events0-ObjectCreated:Put]"
-		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events1-ObjectCreated:Put]"
-		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events3-ObjectCreated:Put]"
-	)
-
-	# pytest-django causes freezegun try to mangle stuff inside django
-	# which fails when django is not really used
-	epytest -p no:django -m 'not network'
-}
diff --git a/dev-python/moto/moto-4.0.11.ebuild b/dev-python/moto/moto-4.1.0.ebuild
index a4d952121013..d49e38071fed 100644
--- a/dev-python/moto/moto-4.0.11.ebuild
+++ b/dev-python/moto/moto-4.1.0.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 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,11} )
+PYTHON_COMPAT=( python3_{10..11} )
 
 inherit distutils-r1
 
 DESCRIPTION="Mock library for boto"
 HOMEPAGE="
-	https://github.com/spulec/moto/
+	https://github.com/getmoto/moto/
 	https://pypi.org/project/moto/
 "
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
@@ -38,7 +38,6 @@ RDEPEND="
 	dev-python/pretty-yaml[${PYTHON_USEDEP}]
 	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
 	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
 	dev-python/python-jose[${PYTHON_USEDEP}]
 	dev-python/python-sshpubkeys[${PYTHON_USEDEP}]
diff --git a/dev-python/multidict/Manifest b/dev-python/multidict/Manifest
index b0bd7ff5edfb..6d6f69be66b9 100644
--- a/dev-python/multidict/Manifest
+++ b/dev-python/multidict/Manifest
@@ -1,3 +1 @@
-DIST multidict-6.0.2.tar.gz 56840 BLAKE2B 1fa9b0d92a94ed022849a851f925e132b629216ddd0d5d4772304fd3361a129692f8b49fca2765118ab1cbc306879924d0aa7c6b57b648158a093a9f311a8d30 SHA512 508f18c5f731e7438bc7cb84b29aff22422769a8ea4c0ba7c875361d1bb1da78bed2db8b4ca34b833effd03ca3e7f00dabaad64bfce54b3e8d208cdc808083c9
-DIST multidict-6.0.3.gh.tar.gz 58568 BLAKE2B b89373a74c6fb4965bc794e7351d6e9563f810ecdb738000ae5573c8b4717f39c4866fd945c9de2afed4f48060ba675d449d7df512c58d5f34b55bc0d8d44ae9 SHA512 95aef45378c0af6ef6b05549d7419ff4ba272430edae37b2fc041a4742d58890ba9475648b8b5ac57d2bff3718519a0201819b274a65ac0b101cf41c8abad812
 DIST multidict-6.0.4.gh.tar.gz 58931 BLAKE2B 2cf25ac2af57289432dfc6617f35a9f1310469b8d7b6a762e63f4f08b3cb8235c7115c4072fc2ffeec417b49af8a97654c7d69e8e20507fd553fab074e42b1cf SHA512 6f9e6ff16a104d40b0cb59860af9cb1a98e8d3a256626f77600c4895e6ef692b31880273f204e7ecdeb574407dd7c2e4326ad7cd9c08b1095011d6ba3793b86e
diff --git a/dev-python/multidict/multidict-6.0.2.ebuild b/dev-python/multidict/multidict-6.0.2.ebuild
deleted file mode 100644
index 4bede5575b5c..000000000000
--- a/dev-python/multidict/multidict-6.0.2.ebuild
+++ /dev/null
@@ -1,37 +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,11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="multidict implementation"
-HOMEPAGE="
-	https://github.com/aio-libs/multidict/
-	https://pypi.org/project/multidict/
-"
-SRC_URI="
-	https://github.com/aio-libs/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-BDEPEND="
-	>=dev-python/cython-0.28.4[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs --no-autodoc
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't enable coverage or other pytest settings
-	sed -i -e 's:--cov.*::' setup.cfg || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/multidict/multidict-6.0.3.ebuild b/dev-python/multidict/multidict-6.0.3.ebuild
deleted file mode 100644
index c218106ad3fb..000000000000
--- a/dev-python/multidict/multidict-6.0.3.ebuild
+++ /dev/null
@@ -1,37 +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,11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="multidict implementation"
-HOMEPAGE="
-	https://github.com/aio-libs/multidict/
-	https://pypi.org/project/multidict/
-"
-SRC_URI="
-	https://github.com/aio-libs/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-
-BDEPEND="
-	>=dev-python/cython-0.28.4[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs --no-autodoc
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't enable coverage or other pytest settings
-	sed -i -e 's:--cov.*::' setup.cfg || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/multidict/multidict-6.0.4.ebuild b/dev-python/multidict/multidict-6.0.4.ebuild
index 920b744867b9..6dcd81072dc6 100644
--- a/dev-python/multidict/multidict-6.0.4.ebuild
+++ b/dev-python/multidict/multidict-6.0.4.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 BDEPEND="
 	>=dev-python/cython-0.28.4[${PYTHON_USEDEP}]
diff --git a/dev-python/plotly-geo/plotly-geo-1.0.0.ebuild b/dev-python/plotly-geo/plotly-geo-1.0.0.ebuild
deleted file mode 100644
index 090719f2eef8..000000000000
--- a/dev-python/plotly-geo/plotly-geo-1.0.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Browser-based graphing library for Python"
-HOMEPAGE="https://plot.ly/python/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/plotly[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/plotly/plotly-5.10.0.ebuild b/dev-python/plotly/plotly-5.10.0.ebuild
deleted file mode 100644
index 9b1afec26830..000000000000
--- a/dev-python/plotly/plotly-5.10.0.ebuild
+++ /dev/null
@@ -1,63 +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,11} )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
-
-DESCRIPTION="Browser-based graphing library for Python"
-HOMEPAGE="https://plotly.com/python/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# TODO: package plotly-orca and kaleido
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-python/tenacity-6.2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/backports-tempfile[${PYTHON_USEDEP}]
-		' 3.8)
-		dev-python/inflect[${PYTHON_USEDEP}]
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/jupyter[${PYTHON_USEDEP}]
-		dev-python/jupyterlab[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/scipy[${PYTHON_USEDEP}]
-		dev-python/shapely[${PYTHON_USEDEP}]
-		dev-python/statsmodels[${PYTHON_USEDEP}]
-		dev-python/xarray[${PYTHON_USEDEP}]
-		sci-libs/pyshp[${PYTHON_USEDEP}]
-		sci-libs/scikit-image[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.8.0-fix-versioneer-import.patch
-)
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	mkdir -p "${ED}"/etc/ || die
-	mv "${ED}"/usr/etc/jupyter "${ED}"/etc/ || die
-	rmdir "${ED}"/usr/etc || die
-}
diff --git a/dev-python/proto-plus/Manifest b/dev-python/proto-plus/Manifest
index 82c6b8b2b57a..39168847124e 100644
--- a/dev-python/proto-plus/Manifest
+++ b/dev-python/proto-plus/Manifest
@@ -1 +1,2 @@
 DIST proto-plus-1.22.1.gh.tar.gz 69507 BLAKE2B b71c263270dde979da0e050a21db258366ca5ddfaed5f8fb78e53444454a123d171019801873d1662ca73a89f079fa1c4cb7c58d34053cabb528015c0d742183 SHA512 2fb5dcb6124d6e2aab010089f4ad138de5cd819d4e67c2b9a6d7044a3d7677ca6e5e37e9aa0ee9edb262c52724dfd2dc05592c489df66d3cafbdf51f13644c7e
+DIST proto-plus-1.22.2.gh.tar.gz 69899 BLAKE2B ad485b04e4187dd5e33259e314d807ad5541c2ddf4fb8e0a85deb195c7643194d34101428fb4fcb7dd692d60e4dd4c4037f821b8fb0049a6e36e002ce870e48a SHA512 bacb8f285417bf0e4d20898c9bb2563e16204b09fc6fb92aadfcd67ad12df388681658eaaacd9b945f4d0ad7e2ce9b95dfc938f5ccc0c4419805c53ed837b2d7
diff --git a/dev-python/proto-plus/proto-plus-1.22.2.ebuild b/dev-python/proto-plus/proto-plus-1.22.2.ebuild
new file mode 100644
index 000000000000..8ff0c5d7f6c0
--- /dev/null
+++ b/dev-python/proto-plus/proto-plus-1.22.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2021-2023 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,11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Beautiful, Pythonic protocol buffers"
+HOMEPAGE="
+	https://github.com/googleapis/proto-plus-python/
+	https://pypi.org/project/proto-plus/
+"
+SRC_URI="
+	https://github.com/googleapis/proto-plus-python/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/${PN}-python-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	<dev-python/protobuf-python-5[${PYTHON_USEDEP}]
+	>=dev-python/protobuf-python-3.19.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/google-api-core-1.31.5[${PYTHON_USEDEP}]
+		dev-python/grpcio[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme
diff --git a/dev-python/pyFFTW/Manifest b/dev-python/pyFFTW/Manifest
index f4fedb44f500..87638690cd3d 100644
--- a/dev-python/pyFFTW/Manifest
+++ b/dev-python/pyFFTW/Manifest
@@ -1 +1 @@
-DIST pyFFTW-0.13.0.tar.gz 158660 BLAKE2B c54096f0814625d49832094a6d823c6d258801a0831b07846993da97a713238a5df5b59beddc38b7e940685403178b2f3100f5713334fc9861757420bc87303a SHA512 1d4c69cc19dd00f2433037f25ea90335544403b542c0c5ca00cb055e0fde076ec9e00990f02da2385466be171ed8c910a5ce06a7cfa5efbc6544b2383bbce599
+DIST pyFFTW-0.13.1.gh.tar.gz 159322 BLAKE2B f64ad74ac51c9e8c7a8137a212b43fe173a072006e3ec46e962c2bd48a3626d3c856acfc722977dc50a78afe0848ca9b25bd89b9b67168ddb285996cb18dd3ea SHA512 645d01ba94d652f9df4c5f8352f483de049df5fd846989024698365045b7b72293d9c84bd39ca2039e32db07796bbcb97eeafc8442ef4ab1de041539ed41bf9e
diff --git a/dev-python/pyFFTW/pyFFTW-0.13.0.ebuild b/dev-python/pyFFTW/pyFFTW-0.13.0.ebuild
deleted file mode 100644
index 0b37aa3cdd6a..000000000000
--- a/dev-python/pyFFTW/pyFFTW-0.13.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
-
-DESCRIPTION="A pythonic python wrapper around FFTW"
-HOMEPAGE="https://github.com/pyFFTW/pyFFTW"
-
-LICENSE="BSD"
-SLOT="0"
-if [[ "${PV}" = "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/pyFFTW/pyFFTW.git"
-else
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/pyFFTW/pyFFTW/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-DEPEND="
-	>=dev-python/numpy-1.16[${PYTHON_USEDEP}]
-	>=sci-libs/fftw-3.3:3.0=[threads]
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	>=dev-python/cython-0.29.18[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/dask-1.0[${PYTHON_USEDEP}]
-		>=dev-python/scipy-1.2.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-python_test() {
-	cp -r -l -n tests/ "${BUILD_DIR}/lib" || die
-	cd "${BUILD_DIR}/lib" || die
-	eunittest
-	rm -r tests/ || die
-}
diff --git a/dev-python/pyFFTW/pyFFTW-0.13.1.ebuild b/dev-python/pyFFTW/pyFFTW-0.13.1.ebuild
new file mode 100644
index 000000000000..aea45023f2cf
--- /dev/null
+++ b/dev-python/pyFFTW/pyFFTW-0.13.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="A pythonic python wrapper around FFTW"
+HOMEPAGE="
+	https://github.com/pyFFTW/pyFFTW/
+	https://pypi.org/project/pyFFTW/
+"
+SRC_URI="
+	https://github.com/pyFFTW/pyFFTW/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	>=dev-python/numpy-1.20[${PYTHON_USEDEP}]
+	>=sci-libs/fftw-3.3:3.0=[threads]
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	>=dev-python/cython-0.29.18[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/dask-1.0[${PYTHON_USEDEP}]
+		>=dev-python/scipy-1.8.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+src_configure() {
+	# otherwise it'll start with -L/usr/lib, sigh
+	export PYFFTW_INCLUDE_DIR="${EPREFIX}/usr/include"
+	export PYFFTW_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
+}
+
+python_test() {
+	cp -r -l -n tests/ "${BUILD_DIR}/lib" || die
+	cd "${BUILD_DIR}/lib" || die
+	eunittest
+	rm -r tests/ || die
+}
diff --git a/dev-python/pyFFTW/pyFFTW-9999.ebuild b/dev-python/pyFFTW/pyFFTW-9999.ebuild
index 0b37aa3cdd6a..2561ff31ec5b 100644
--- a/dev-python/pyFFTW/pyFFTW-9999.ebuild
+++ b/dev-python/pyFFTW/pyFFTW-9999.ebuild
@@ -1,39 +1,45 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 git-r3
 
 DESCRIPTION="A pythonic python wrapper around FFTW"
-HOMEPAGE="https://github.com/pyFFTW/pyFFTW"
+HOMEPAGE="
+	https://github.com/pyFFTW/pyFFTW/
+	https://pypi.org/project/pyFFTW/
+"
+EGIT_REPO_URI="https://github.com/pyFFTW/pyFFTW.git"
 
 LICENSE="BSD"
 SLOT="0"
-if [[ "${PV}" = "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/pyFFTW/pyFFTW.git"
-else
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/pyFFTW/pyFFTW/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
 
 DEPEND="
-	>=dev-python/numpy-1.16[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.20[${PYTHON_USEDEP}]
 	>=sci-libs/fftw-3.3:3.0=[threads]
 "
-RDEPEND="${DEPEND}"
+RDEPEND="
+	${DEPEND}
+"
 BDEPEND="
 	>=dev-python/cython-0.29.18[${PYTHON_USEDEP}]
 	test? (
 		>=dev-python/dask-1.0[${PYTHON_USEDEP}]
-		>=dev-python/scipy-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/scipy-1.8.0[${PYTHON_USEDEP}]
 	)
 "
 
 distutils_enable_tests unittest
 
+src_configure() {
+	# otherwise it'll start with -L/usr/lib, sigh
+	export PYFFTW_INCLUDE_DIR="${EPREFIX}/usr/include"
+	export PYFFTW_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
+}
+
 python_test() {
 	cp -r -l -n tests/ "${BUILD_DIR}/lib" || die
 	cd "${BUILD_DIR}/lib" || die
diff --git a/dev-python/pylint/Manifest b/dev-python/pylint/Manifest
index f9afc06e6756..9c22a1a898db 100644
--- a/dev-python/pylint/Manifest
+++ b/dev-python/pylint/Manifest
@@ -1,2 +1,3 @@
+DIST pylint-2.15.10.gh.tar.gz 1321574 BLAKE2B 6ba504e0715675e8bf81848132e39e1d9b00078cb5ae2e881212898c6c9cfcbcf554ba3e9c6194173a776689ad311cef8e7420e027261b68c6e3f877c9961f33 SHA512 ce02512705f044be68dc7e2735ad705652307a1deec22ed3c077f29820a79b2d4f2a8ea82ca40a805bab516f7c00f83a22125228461e9e7db4f67f2b4cbf4edc
 DIST pylint-2.15.8.gh.tar.gz 1318035 BLAKE2B 39b6a604af8e1b8d54640d9088f9a527ae2ef74535adb0fd655647f972193a955564a2acd0fadde723cf873b0765d362c9cd7dc2d8cc984b8fa0ec0107ce8968 SHA512 c5b59ca220303d66804dd55990e6d62e2cadc2ab7654e47d7ec5e16749b40ad557f43f7b8919c79e48e4b60dc1f92169df7bc312bede279b8f97aee223d9b0bd
 DIST pylint-2.15.9.gh.tar.gz 1319840 BLAKE2B 6c48b19698e4692085d010eb857dc036cf67f94f6b82df3427b00a793f410e9b6b6ef7a5e868163752aa37355e8712c4ff48edb9b740f7d254af69370058e8ca SHA512 868d39011a545ffe719bd14dc4f99d59fad2487160900391cc91bec419d1c3857012b950a1bff790cdbdcb4b9120f83faf7c6b8adb1fd033db5edc54fe7816a1
diff --git a/dev-python/pylint/pylint-2.15.10.ebuild b/dev-python/pylint/pylint-2.15.10.ebuild
new file mode 100644
index 000000000000..b16c64f29523
--- /dev/null
+++ b/dev-python/pylint/pylint-2.15.10.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2023 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,11} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Python code static checker"
+HOMEPAGE="
+	https://pypi.org/project/pylint/
+	https://github.com/PyCQA/pylint/
+"
+SRC_URI="
+	https://github.com/pycqa/pylint/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="examples"
+
+# Make sure to check https://github.com/PyCQA/pylint/blob/main/pyproject.toml#L34 on bumps
+# Adjust dep bounds!
+RDEPEND="
+	<dev-python/astroid-2.14[${PYTHON_USEDEP}]
+	>=dev-python/astroid-2.12.13[${PYTHON_USEDEP}]
+	>=dev-python/dill-0.3.6[${PYTHON_USEDEP}]
+	>=dev-python/isort-4.2.5[${PYTHON_USEDEP}]
+	<dev-python/isort-6[${PYTHON_USEDEP}]
+	>=dev-python/mccabe-0.6[${PYTHON_USEDEP}]
+	<dev-python/mccabe-0.8[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/tomlkit-0.10.1[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+	$(python_gen_cond_dep '
+		>=dev-python/tomli-1.1.0[${PYTHON_USEDEP}]
+	' 3.8 3.9 3.10)
+"
+BDEPEND="
+	test? (
+		>=dev-python/GitPython-3[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	rm -rf pylint || die
+
+	local EPYTEST_DESELECT=(
+		# No need to run the benchmarks
+		tests/benchmark/test_baseline_benchmarks.py
+
+		# TODO
+		'tests/test_functional.py::test_functional[forgotten_debug_statement_py37]'
+		'tests/test_functional.py::test_functional[dataclass_with_field]'
+		'tests/test_functional.py::test_functional[no_name_in_module]'
+		tests/checkers/unittest_typecheck.py::TestTypeChecker::test_nomember_on_c_extension_error_msg
+		tests/checkers/unittest_typecheck.py::TestTypeChecker::test_nomember_on_c_extension_info_msg
+		tests/config/pylint_config/test_run_pylint_config.py::test_invocation_of_pylint_config
+
+		# apparently fragile, needs unpickleable plugin
+		tests/test_check_parallel.py::TestCheckParallelFramework::test_linter_with_unpickleable_plugins_is_pickleable
+	)
+	epytest
+}
+
+python_install_all() {
+	if use examples ; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		docinto examples
+		dodoc -r examples/.
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/rq/rq-1.11.1.ebuild b/dev-python/rq/rq-1.11.1.ebuild
index 2e0e04763350..877e1b77a012 100644
--- a/dev-python/rq/rq-1.11.1.ebuild
+++ b/dev-python/rq/rq-1.11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-python/spyder-kernels/spyder-kernels-2.4.0.ebuild b/dev-python/spyder-kernels/spyder-kernels-2.4.0.ebuild
index 7d4c8dabc914..03166c32e93c 100644
--- a/dev-python/spyder-kernels/spyder-kernels-2.4.0.ebuild
+++ b/dev-python/spyder-kernels/spyder-kernels-2.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -34,11 +34,9 @@ RDEPEND="
 	>=dev-python/pyzmq-22.1.0[${PYTHON_USEDEP}]
 	>=dev-python/wurlitzer-1.0.3[${PYTHON_USEDEP}]
 "
-
 BDEPEND="
 	test? (
 		dev-python/cython[${PYTHON_USEDEP}]
-		dev-python/dask[${PYTHON_USEDEP}]
 		dev-python/django[${PYTHON_USEDEP}]
 		dev-python/flaky[${PYTHON_USEDEP}]
 		dev-python/matplotlib[${PYTHON_USEDEP}]
@@ -54,7 +52,7 @@ BDEPEND="
 distutils_enable_tests pytest
 
 EPYTEST_DESELECT=(
-	# we no longer package distributed
+	# we no longer package distributed, and also removed dependency on dask
 	spyder_kernels/console/tests/test_console_kernel.py::test_dask_multiprocessing
 	# RuntimeError: There is no current event loop in thread 'MainThread'.
 	# https://bugs.gentoo.org/834893
diff --git a/dev-python/spyder-kernels/spyder-kernels-2.4.1.ebuild b/dev-python/spyder-kernels/spyder-kernels-2.4.1.ebuild
index 925b5969f6cb..e45ecb28417e 100644
--- a/dev-python/spyder-kernels/spyder-kernels-2.4.1.ebuild
+++ b/dev-python/spyder-kernels/spyder-kernels-2.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -39,7 +39,6 @@ RDEPEND="
 BDEPEND="
 	test? (
 		dev-python/cython[${PYTHON_USEDEP}]
-		dev-python/dask[${PYTHON_USEDEP}]
 		dev-python/django[${PYTHON_USEDEP}]
 		dev-python/flaky[${PYTHON_USEDEP}]
 		dev-python/matplotlib[${PYTHON_USEDEP}]
@@ -55,7 +54,7 @@ BDEPEND="
 distutils_enable_tests pytest
 
 EPYTEST_DESELECT=(
-	# we no longer package distributed
+	# we no longer package distributed, and also removed dependency on dask
 	spyder_kernels/console/tests/test_console_kernel.py::test_dask_multiprocessing
 	# RuntimeError: There is no current event loop in thread 'MainThread'.
 	# https://bugs.gentoo.org/834893
diff --git a/dev-python/tifffile/tifffile-2022.10.10.ebuild b/dev-python/tifffile/tifffile-2022.10.10.ebuild
deleted file mode 100644
index 34a0b322c077..000000000000
--- a/dev-python/tifffile/tifffile-2022.10.10.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 2021-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,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Read and write TIFF files"
-HOMEPAGE="
-	https://pypi.org/project/tifffile/
-	https://github.com/cgohlke/tifffile/
-	https://www.cgohlke.com/
-"
-SRC_URI="
-	https://github.com/cgohlke/tifffile/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/numpy-1.19.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/dask[${PYTHON_USEDEP}]
-		>=dev-python/fsspec-2021.5.0[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/xarray[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# Internet
-	tests/test_tifffile.py::test_class_omexml
-	tests/test_tifffile.py::test_class_omexml_fail
-	tests/test_tifffile.py::test_class_omexml_modulo
-	tests/test_tifffile.py::test_class_omexml_attributes
-	tests/test_tifffile.py::test_class_omexml_multiimage
-	tests/test_tifffile.py::test_write_ome
-	tests/test_tifffile.py::test_write_ome_manual
-	# requires tons of free space
-	tests/test_tifffile.py::test_write_3gb
-	tests/test_tifffile.py::test_write_bigtiff
-	'tests/test_tifffile.py::test_write_imagej_raw'
-	# TODO
-	tests/test_tifffile.py::test_issue_imagej_hyperstack_arg
-	tests/test_tifffile.py::test_issue_description_overwrite
-)
diff --git a/dev-python/traitlets/Manifest b/dev-python/traitlets/Manifest
index 4e36acddf6be..e54290562a4c 100644
--- a/dev-python/traitlets/Manifest
+++ b/dev-python/traitlets/Manifest
@@ -1 +1,2 @@
 DIST traitlets-5.8.0.tar.gz 149460 BLAKE2B 4e5d0344e2c6a2236202875708b28e2966cc8c9ee365ece423aa091dcbc9a3215c236ee63c5e88cf72a3ef9873671fadd83953e700e613360da90da4954b065d SHA512 e65efb5c52940bc2b12e64c932d55c3e5f7b7a3d5cbd49b3c7cbae972ac22e3c2b374f5a35f7c685e7f9ecb9c0b697e626ee942dc6f7f281c9b7857b9a4487d8
+DIST traitlets-5.8.1.tar.gz 149641 BLAKE2B 8939bee76d317f7fb0fc8ad2ded1bc056262de5000d625fd6e318289dea6af4982a2aacb0f25c536485defb35dab983bba1402c6ae7ab907ec8ca993b862afa2 SHA512 3840c9b1fba62610d52c979d5159291ae5d774ecefb729ef79765e61b4cba0128469a0b16991cf06649dd9afe5c4afc692e4aaeb3ec5f095617517882de369ef
diff --git a/dev-python/traitlets/traitlets-5.8.1.ebuild b/dev-python/traitlets/traitlets-5.8.1.ebuild
new file mode 100644
index 000000000000..538786bb562f
--- /dev/null
+++ b/dev-python/traitlets/traitlets-5.8.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 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,11} )
+
+inherit distutils-r1
+
+DESCRIPTION="A configuration system for Python applications"
+HOMEPAGE="
+	https://github.com/ipython/traitlets/
+	https://pypi.org/project/traitlets/
+"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+BDEPEND="
+	test? (
+		>=dev-python/argcomplete-2.0[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	dev-python/myst_parser \
+	dev-python/pydata-sphinx-theme
+distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -p pytest_mock
+}
diff --git a/dev-python/watchdog/Manifest b/dev-python/watchdog/Manifest
index 12fb58911f27..ce5f0aafdd14 100644
--- a/dev-python/watchdog/Manifest
+++ b/dev-python/watchdog/Manifest
@@ -1,3 +1,2 @@
-DIST watchdog-2.1.9.gh.tar.gz 102882 BLAKE2B 601c94541846e0d63a39367040ac9b6a24c2920c70638ee3887a51838dd75bf8dfef8afae34c9566047c27502026d944f01c6f6249090f4a233a4892fc1e7c59 SHA512 1005c48b08968db7705acbb8a94a0852c72d8bcf45ac935e7e0b49daa6e422adb081cf431485618b37bcc1b2d3429369af1672b826bf9c1ebfa7aff91a88175a
 DIST watchdog-2.2.0.gh.tar.gz 101317 BLAKE2B e597b780f26794bfe0462bcb67985d6e38324aac955f8655e657d800039d98473444ff13ea98fbfb6e8a5fd5473c0f3eeda2e542ef030539fc1acc3f86412354 SHA512 95c355da3a97f7eb0ddff02c1801eeafb075aead742d5505254fccef60afd8e5f1ea56760533bb87f520fa60f4f41e4f36c7f02247a170029bace728e83e2780
 DIST watchdog-2.2.1.gh.tar.gz 101485 BLAKE2B 4ec0a2c14d0dcb8d39ed4dea48c1318474768298b4eade4f7c08f811282ffdbf5871c7d55d71681863c38d1f0603c46aaadda73bf38a20ef263fa3b4cf76c354 SHA512 bbd6e3e3fdc7ee5df21b78241922c0050aeb0c01e394fa7d025465f04f3307d190af4cf6e822826975a3b095fb479dfd103be0675f12782e8899f556797baed4
diff --git a/dev-python/watchdog/watchdog-2.1.9.ebuild b/dev-python/watchdog/watchdog-2.1.9.ebuild
deleted file mode 100644
index b2f0eedfc6be..000000000000
--- a/dev-python/watchdog/watchdog-2.1.9.ebuild
+++ /dev/null
@@ -1,52 +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,11} pypy3 )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Python API and shell utilities to monitor file system events"
-HOMEPAGE="
-	https://github.com/gorakhargosh/watchdog/
-	https://pypi.org/project/watchdog/
-"
-SRC_URI="
-	https://github.com/gorakhargosh/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/pytest-timeout-0.3[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/--cov/d' setup.cfg || die
-	default
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# requires root powers via sudo (yes, seriously)
-		tests/test_inotify_buffer.py::test_unmount_watched_directory_filesystem
-	)
-
-	epytest -p no:django
-}
-
-pkg_postinst() {
-	optfeature "Bash completion" dev-python/argcomplete
-}
diff --git a/dev-python/watchdog/watchdog-2.2.0.ebuild b/dev-python/watchdog/watchdog-2.2.0.ebuild
index 279349596581..66f16451e2cc 100644
--- a/dev-python/watchdog/watchdog-2.2.0.ebuild
+++ b/dev-python/watchdog/watchdog-2.2.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/pyyaml[${PYTHON_USEDEP}]
diff --git a/dev-python/yarl/Manifest b/dev-python/yarl/Manifest
index cf09d9dae448..48a96b4a6ade 100644
--- a/dev-python/yarl/Manifest
+++ b/dev-python/yarl/Manifest
@@ -1,2 +1 @@
-DIST yarl-1.8.1.gh.tar.gz 109912 BLAKE2B c7390b78abb5074dd29e96848a77fdb31f6224e99d2bcfd5a28a8bd08881f5ff82cf55b2f54c97324d005a0fb3823732a9ed6bd3f1d837e4ac2341b89e2adb30 SHA512 267523216832c2bc83d92a42e621ff519d427e20c1ee84ac657e13f696a2df2259c837486f192d87944f5ebb834beea60ace791eb4c9c632fd7e552eb5dadf1b
 DIST yarl-1.8.2.gh.tar.gz 109938 BLAKE2B 1f2cec38bb681f6a59f10253c75e74912d482cdbe0e639e3ba0a43b9d6ab7b7edc1558c9fffaffd7aad9fa905d884e856ff7f7b69dd103800ef62f7f05de90b5 SHA512 d5dcebcec06d520b48a1d879671a92371bd89eabb7be700c129fcc45e763ecc0370cbb5e88c7b9be05ecb3317370231293a8c076ed68d71a36fe953219dd27ea
diff --git a/dev-python/yarl/yarl-1.8.1.ebuild b/dev-python/yarl/yarl-1.8.1.ebuild
deleted file mode 100644
index 1a65aeb11cae..000000000000
--- a/dev-python/yarl/yarl-1.8.1.ebuild
+++ /dev/null
@@ -1,45 +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,11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Yet another URL library"
-HOMEPAGE="
-	https://github.com/aio-libs/yarl/
-	https://pypi.org/project/yarl/
-"
-SRC_URI="
-	https://github.com/aio-libs/yarl/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/multidict-4.0[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	dev-python/alabaster
-
-python_configure() {
-	> .install-cython || die
-	emake cythonize
-}
-
-python_test() {
-	cd tests || die
-	epytest --override-ini=addopts=
-}
diff --git a/dev-python/yarl/yarl-1.8.2.ebuild b/dev-python/yarl/yarl-1.8.2.ebuild
index 8face9dfca67..c5af8c45fd5b 100644
--- a/dev-python/yarl/yarl-1.8.2.ebuild
+++ b/dev-python/yarl/yarl-1.8.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/multidict-4.0[${PYTHON_USEDEP}]
author	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2023-01-10 14:05:43 +0000
committer	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2023-01-10 14:05:43 +0000
commit	859a72e91c361d1a2ca854f3d8761ee5199d916b (patch)
tree	3570120e4c936aa2c9b405996d8b09387ec1c8f7 /dev-python
parent	8387f5b8c6c6be379e953193f7012916a46ad578 (diff)
download	baldeagleos-repo-859a72e91c361d1a2ca854f3d8761ee5199d916b.tar.gz baldeagleos-repo-859a72e91c361d1a2ca854f3d8761ee5199d916b.tar.xz baldeagleos-repo-859a72e91c361d1a2ca854f3d8761ee5199d916b.zip