Adding metadata

35 files changed, 712 insertions, 542 deletions

diff --git a/dev-python/astroid/Manifest b/dev-python/astroid/Manifest
index 4430524866e0..0d59c7608e49 100644
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@@ -2,3 +2,4 @@ DIST astroid-2.15.6.gh.tar.gz 462156 BLAKE2B f5df204a0b635d29165da1566afd9259ff2
 DIST astroid-2.15.7.gh.tar.gz 462906 BLAKE2B 7a984f9f7c67c2956958b23ee2ca94c1f86284d8a50aaedbe10b9dca887802189cba21f19ee66b394f347f415d61946aaff52e4d0448271edba77b6bd958fa0e SHA512 716665744915d8a635ac124f03ffe6f7aee6bde6d98c238551ea1c6468595d6c327bb2d5605f66e7ba6294ec1b79c85b861034acba8a4584095ba38e24f82ae9
 DIST astroid-2.15.8.gh.tar.gz 462922 BLAKE2B 6a4bf0a50333701aab9282ab126fc53d30621d4e7a54796ac93d1db30bc37098d5409f3ffe91ed279bce5866e2e381eafc7f54f18c86aa3a7fc835f0bf844d9a SHA512 d5d008df3e99c036fb38094c416c080745dad640d46e837b07336a23d5a929823b8b884564486600335791a1be0568cbe519b76e6bd3334e72725966af8cc5f5
 DIST astroid-3.0.0.gh.tar.gz 461185 BLAKE2B f6b5923f95f23fdc4731b75f5335d7e7ead6aa85b07c5d2a57bf2ce560774a5d85ad0dfba076e4f24bbc7a17050945956291f5a016867bee049913358f8fc3dd SHA512 c1dbc42a35f7eea9bd87bd1c5701086271f8d4974b6b0e45b301f0b1841f4936bff32cd26647d9e9d9a7636017b5930a290ece0a4001b04dcc50e01344b43acb
+DIST astroid-3.0.1.gh.tar.gz 461593 BLAKE2B de3458bcd9ba111020132e89b6e2fdf18b81b82cba68c986e84af91c910e6c70e7d13ff024b7947f3fa08e2491ba211a77a35421b3d5cd184b94e6a833c0da42 SHA512 2c8a4cf22959aef1eb9510430bcc55d00fcda76d022575786c9a59c093fe4196b67c0b9401f9226595a4cbf1fb9444bdfbb9ac2d83c115ec1d7d46cb7dd75dbd
diff --git a/dev-python/astroid/astroid-3.0.1.ebuild b/dev-python/astroid/astroid-3.0.1.ebuild
new file mode 100644
index 000000000000..87f69d12d690
--- /dev/null
+++ b/dev-python/astroid/astroid-3.0.1.ebuild
@@ -0,0 +1,67 @@
+# 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_{8,9,10,11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Abstract Syntax Tree for logilab packages"
+HOMEPAGE="
+	https://github.com/pylint-dev/astroid/
+	https://pypi.org/project/astroid/
+"
+SRC_URI="
+	https://github.com/pylint-dev/astroid/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+# Version specified in pyproject.toml
+RDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/typing-extensions-4.0.0[${PYTHON_USEDEP}]
+	' 3.10)
+"
+BDEPEND="
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/attrs[${PYTHON_USEDEP}]
+		>=dev-python/numpy-1.17.0[${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+		dev-python/regex[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# no clue why they're broken
+		tests/test_modutils.py::GetModulePartTest::test_known_values_get_builtin_module_part
+		tests/test_regrtest.py::NonRegressionTests::test_numpy_distutils
+#		tests/brain/test_regex.py::TestRegexBrain::test_regex_pattern_and_match_subscriptable
+#		# some problem with warnings (our options?)
+#		tests/test_decorators.py::TestDeprecationDecorators::test_deprecated_default_argument_values_one_arg
+#		tests/test_decorators.py::TestDeprecationDecorators::test_deprecated_default_argument_values_two_args
+#		tests/test_scoped_nodes.py::test_deprecation_of_doc_attribute
+#		# requires six bundled in urllib3, sigh
+#		tests/test_modutils.py::test_file_info_from_modpath__SixMetaPathImporter
+#		# requires pip, and looks suspicious anyway
+#		tests/test_manager.py::IsolatedAstroidManagerTest::test_no_user_warning
+		# pydantic-2?
+		tests/brain/test_dataclasses.py::test_pydantic_field
+#		# TODO
+#		tests/test_manager.py::ClearCacheTest::test_clear_cache_clears_other_lru_caches
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/dev-python/crispy-bootstrap3/crispy-bootstrap3-2022.1.ebuild b/dev-python/crispy-bootstrap3/crispy-bootstrap3-2022.1.ebuild
index d00900fa453c..594bbc29f287 100644
--- a/dev-python/crispy-bootstrap3/crispy-bootstrap3-2022.1.ebuild
+++ b/dev-python/crispy-bootstrap3/crispy-bootstrap3-2022.1.ebuild
@@ -5,23 +5,30 @@ EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8,9,10,11} )
+
 inherit distutils-r1
 
 DESCRIPTION="Bootstrap3 template pack for django-crispy-forms"
 HOMEPAGE="
+	https://github.com/django-crispy-forms/crispy-bootstrap3/
 	https://pypi.org/project/crispy-bootstrap3/
 "
-SRC_URI="https://github.com/django-crispy-forms/${PN}/archive/refs/tags/${PV}.tar.gz
-	-> ${P}.gh.tar.gz"
+SRC_URI="
+	https://github.com/django-crispy-forms/crispy-bootstrap3/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="test"
 
-RDEPEND="dev-python/django-crispy-forms[${PYTHON_USEDEP}]"
-BDEPEND="test? (
-	dev-python/pytest-django[${PYTHON_USEDEP}]
-)"
+RDEPEND="
+	dev-python/django-crispy-forms[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-django[${PYTHON_USEDEP}]
+	)
+"
 
 distutils_enable_tests pytest
diff --git a/dev-python/crispy-bootstrap4/crispy-bootstrap4-2022.1.ebuild b/dev-python/crispy-bootstrap4/crispy-bootstrap4-2022.1.ebuild
index a02389476aff..1bce0fa460f1 100644
--- a/dev-python/crispy-bootstrap4/crispy-bootstrap4-2022.1.ebuild
+++ b/dev-python/crispy-bootstrap4/crispy-bootstrap4-2022.1.ebuild
@@ -5,25 +5,34 @@ EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8,9,10,11} )
+
 inherit distutils-r1
 
 DESCRIPTION="Bootstrap4 template pack for django-crispy-forms"
 HOMEPAGE="
+	https://github.com/django-crispy-forms/crispy-bootstrap4/
 	https://pypi.org/project/crispy-bootstrap4/
 "
-SRC_URI="https://github.com/django-crispy-forms/${PN}/archive/refs/tags/${PV}.tar.gz
-	-> ${P}.gh.tar.gz"
+SRC_URI="
+	https://github.com/django-crispy-forms/crispy-bootstrap4/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="test"
 
-RDEPEND="dev-python/django-crispy-forms[${PYTHON_USEDEP}]"
-BDEPEND="test? (
-	dev-python/pytest-django[${PYTHON_USEDEP}]
-)"
+RDEPEND="
+	dev-python/django-crispy-forms[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-django[${PYTHON_USEDEP}]
+	)
+"
 
 distutils_enable_tests pytest
 
-PATCHES=( "${FILESDIR}"/${P}-test.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-test.patch
+)
diff --git a/dev-python/crispy-bootstrap5/crispy-bootstrap5-0.7.ebuild b/dev-python/crispy-bootstrap5/crispy-bootstrap5-0.7.ebuild
index 5f3df23bb9b6..26bce17c3b28 100644
--- a/dev-python/crispy-bootstrap5/crispy-bootstrap5-0.7.ebuild
+++ b/dev-python/crispy-bootstrap5/crispy-bootstrap5-0.7.ebuild
@@ -5,25 +5,34 @@ EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8,9,10,11} )
+
 inherit distutils-r1
 
 DESCRIPTION="Bootstrap5 template pack for django-crispy-forms"
 HOMEPAGE="
+	https://github.com/django-crispy-forms/crispy-bootstrap5/
 	https://pypi.org/project/crispy-bootstrap5/
 "
-SRC_URI="https://github.com/django-crispy-forms/${PN}/archive/refs/tags/${PV}.tar.gz
-	-> ${P}.gh.tar.gz"
+SRC_URI="
+	https://github.com/django-crispy-forms/crispy-bootstrap5/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="test"
 
-RDEPEND="dev-python/django-crispy-forms[${PYTHON_USEDEP}]"
-BDEPEND="test? (
-	dev-python/pytest-django[${PYTHON_USEDEP}]
-)"
+RDEPEND="
+	dev-python/django-crispy-forms[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-django[${PYTHON_USEDEP}]
+	)
+"
 
 distutils_enable_tests pytest
 
-PATCHES=( "${FILESDIR}"/${P}-test.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-test.patch
+)
diff --git a/dev-python/django-crispy-forms/Manifest b/dev-python/django-crispy-forms/Manifest
index 50f56cfb5aa8..811c44aa2529 100644
--- a/dev-python/django-crispy-forms/Manifest
+++ b/dev-python/django-crispy-forms/Manifest
@@ -1 +1,2 @@
 DIST django-crispy-forms-2.0.gh.tar.gz 273743 BLAKE2B 4169c4f77ddd0dd9f8786abd71ad762f645283555f250861f32b874fb9e189d4ca174285ee39b51bc5f0c0e8c2e83c2e00c34398c51ede65438a1c6b8a17c3ee SHA512 8b6f5b35cb90837b7cd6a64ed74afe6a19a80f287f66d0a139811990524e1a48d4d7c01e61fb7d303958522c47458d0aa0008a3d6c147f7d03dc790e53a80592
+DIST django-crispy-forms-2.1.gh.tar.gz 274397 BLAKE2B 3f38830f370efde04494add3ddd2ce7f4a04b032b9aad770ba30885ed2b3a14cff3c748fa299041c9c1d7007b30eb55c96a46fe496c0432b187ae72879d4240e SHA512 703f353adc272905b4d5ebe21ea54e3016a3889703bf406dfdf92638dac2e6f536cf1bc16022be6a442f7dfa962ff17746edea591cf80c2be9440d9bb50a9dcc
diff --git a/dev-python/django-crispy-forms/django-crispy-forms-2.1.ebuild b/dev-python/django-crispy-forms/django-crispy-forms-2.1.ebuild
new file mode 100644
index 000000000000..347d620bc9bc
--- /dev/null
+++ b/dev-python/django-crispy-forms/django-crispy-forms-2.1.ebuild
@@ -0,0 +1,36 @@
+# 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_{8,9,10,11} )
+
+inherit distutils-r1
+
+DESCRIPTION="DRY Django forms"
+HOMEPAGE="
+	https://github.com/django-crispy-forms/django-crispy-forms/
+	https://pypi.org/project/django-crispy-forms/
+"
+SRC_URI="
+	https://github.com/django-crispy-forms/django-crispy-forms/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/django-4.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-django[${PYTHON_USEDEP}]
+		dev-python/crispy-bootstrap3[${PYTHON_USEDEP}]
+		dev-python/crispy-bootstrap4[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/ensurepip-pip/Manifest b/dev-python/ensurepip-pip/Manifest
index e93f5dedc3aa..d5c063e82923 100644
--- a/dev-python/ensurepip-pip/Manifest
+++ b/dev-python/ensurepip-pip/Manifest
@@ -1 +1,2 @@
 DIST pip-23.2.1-py3-none-any.whl 2086091 BLAKE2B 0a35bf4ba589f07e3c800d8f835e4bcdcd433976db83f91c86e12a2316b0b1c7de7120b248d70fe8b5587c28bb3c6e7bc633c64cdfb65a1f18f87a9e7a423181 SHA512 016a8cbd09384f1a9a44cb0e8274df75a8bcb2f3966bb5d708c62145289efaa5db98f75256c97e4f8046735ce2e529fbb076f284a46cdb716e89a75660200ad9
+DIST pip-23.3-py3-none-any.whl 2106643 BLAKE2B bc5d93e71dadba670ef19f8331dd8d9e7fd5f0f70f90de39a3437b25521bb61c97690793d67d4306a98c728fd9eb5fb5848f1abec853d7878b4bab792a51f6a7 SHA512 2ac3e66eb86b90e8bafd1825e84288af81d09ddb60f68b631838d14479b953ad0c6bdc933d754b5f02520401908828a0a8c518f04b0060c82b666e0d01e87ea6
diff --git a/dev-python/ensurepip-pip/ensurepip-pip-23.3.ebuild b/dev-python/ensurepip-pip/ensurepip-pip-23.3.ebuild
new file mode 100644
index 000000000000..474a502c1273
--- /dev/null
+++ b/dev-python/ensurepip-pip/ensurepip-pip-23.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit pypi
+
+DESCRIPTION="Shared pip wheel for ensurepip Python module"
+HOMEPAGE="https://pypi.org/project/pip/"
+SRC_URI="$(pypi_wheel_url "${PN#ensurepip-}")"
+S=${DISTDIR}
+
+LICENSE="Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MIT MPL-2.0 PSF-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+
+RDEPEND="
+	!<dev-python/ensurepip-wheels-100
+"
+
+src_install() {
+	insinto /usr/lib/python/ensurepip
+	doins "${A}"
+}
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 1db5c8d6425a..c9f746c22bbc 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -3,3 +3,4 @@ DIST hypothesis-6.87.1.gh.tar.gz 9388383 BLAKE2B 0b0b9156566a84f4e5972960dbf5ec6
 DIST hypothesis-6.87.2.gh.tar.gz 9388126 BLAKE2B c73c52b6f75b212bd9683e936edb4605aeebff7f7aad8bafdf4097a7793967b4d9fac78385e8fdec3f6fcea94c74cb624a8376ee2ec338a426075a80d70b2eb1 SHA512 2276d4ac43e29245b1c1d7cd810bc0bf97f4088c0900fcc5387465e8cd1d13648c0ae66a4c4632bf4affe9b03f5063092f805fea27ac533f33e14b14106dddfb
 DIST hypothesis-6.87.3.gh.tar.gz 9388318 BLAKE2B 61dea9f0898cadef747871e2ef137ed8c68b1cfa43cc0b7a3effd6669b8dc7d8809f39af4f0a915831e3e2950280d132650d8d2193664a08c6f026f98db82330 SHA512 c7c0388c06e8d9397e8a9e6103525c5ea0f94017dad71f4547ff6b385f76f88e511b5f8a5b64f76c728379fbca8ad3b77e06b0d474d76f7f68c79fe1e087da91
 DIST hypothesis-6.87.4.gh.tar.gz 9388435 BLAKE2B a678bf1d76a1947f6880de95e3b418de364d5083a6c9c5ce8ff36fc51290ab7ed1560627e6aaf493c9b11184126ed5c2a6f8bcbd56633555cdb9be11dc384d1b SHA512 b4dcff9d07a665d7b134dfeaa6a7f199cc87883b9cd078d573a175b24069e968ce833bcdcf89f7665cf021a1eaf6df08eddc5dd071c4189ffe681ce3a178e432
+DIST hypothesis-6.88.0.gh.tar.gz 9390871 BLAKE2B 9dc93da4dde2f14fc24e489b19566a2300d1e89622a4c574305ed511481bee871ffe812e13e05262ccbd68f40b61db92b974f62eefc2efc0d7f2200038539ff9 SHA512 d266acb7b5404d9d7b47f25210b6f751e4feea2c8c1416a4af7b12a42b321d4429364c1ca5842151f2fe196994cd9244c92369279a07534ef63786bbd291dd6e
diff --git a/dev-python/hypothesis/hypothesis-6.88.0.ebuild b/dev-python/hypothesis/hypothesis-6.88.0.ebuild
new file mode 100644
index 000000000000..4c56e9453286
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.88.0.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+CLI_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{8,9,10,11} pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 multiprocessing optfeature
+
+TAG=hypothesis-python-${PV}
+MY_P=hypothesis-${TAG}
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="
+	https://github.com/HypothesisWorks/hypothesis/
+	https://pypi.org/project/hypothesis/
+"
+SRC_URI="
+	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}/hypothesis-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="cli"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
+	' 3.9 3.10)
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' "${CLI_COMPAT[@]}")
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		!!<dev-python/requests-toolbelt-0.10.1
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	# subtests are broken by warnings from random plugins
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=xdist.plugin,pytest_forked,_hypothesis_pytestplugin
+	local -x HYPOTHESIS_NO_PLUGINS=1
+
+	# NB: paths need to be relative to pytest.ini,
+	# i.e. start with hypothesis-python/
+	local EPYTEST_DESELECT=()
+	case ${EPYTHON} in
+		pypy3)
+			EPYTEST_DESELECT+=(
+				# failing due to warnings from numpy/cython
+				hypothesis-python/tests/pytest/test_fixtures.py::test_given_plus_overridden_fixture
+			)
+			;;
+	esac
+
+	epytest -o filterwarnings= -n "$(makeopts_jobs)" --dist=worksteal \
+		tests/cover tests/pytest tests/quality
+}
+
+python_install() {
+	distutils-r1_python_install
+	if ! use cli || ! has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
+		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
+	fi
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/jupyterlab-server/Manifest b/dev-python/jupyterlab-server/Manifest
index da15a1aec471..a53e50918faf 100644
--- a/dev-python/jupyterlab-server/Manifest
+++ b/dev-python/jupyterlab-server/Manifest
@@ -1,2 +1 @@
-DIST jupyterlab_server-2.23.0.tar.gz 71812 BLAKE2B 4d1cd379e9864f16a463f630b2b30aa18b88c9e71ea591d396b15834b08d567b3dbd0e6de637f975d230e17987f49eac3917ce2cf951dfd493ee75e612b3b46e SHA512 cb5ae1125487c79fa9d54201e0512fac9ff3f95022eafacd0bf46cb853bbeafe74eff767137ecb5559713cd8baf721f7fbc41869dde9ef28c480197a4158967a
 DIST jupyterlab_server-2.25.0.tar.gz 72251 BLAKE2B aac9191493833aea1dbd2b2b85365bab2bfbf06576c853668cc94d62b03b8cabaabc2df8c76ae57c8d76d55ddf646bdf51de00f682cc5b4b27252d5bd409bc61 SHA512 b97a1e5da8f30e83971be152a39c5a6553e6a589000f4848feb7777561b018b310f445853825215cfdb823666d73d4b117ed8914138c8a319035dac893f85951
diff --git a/dev-python/jupyterlab-server/jupyterlab-server-2.23.0.ebuild b/dev-python/jupyterlab-server/jupyterlab-server-2.23.0.ebuild
deleted file mode 100644
index 3f02896e7c0f..000000000000
--- a/dev-python/jupyterlab-server/jupyterlab-server-2.23.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8,9,10,11} )
-DISTUTILS_USE_PEP517=hatchling
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Server components for JupyterLab and JupyterLab like applications"
-HOMEPAGE="
-	https://jupyter.org/
-	https://github.com/jupyterlab/jupyterlab_server/
-	https://pypi.org/project/jupyterlab-server/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/Babel-2.10[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.0.3[${PYTHON_USEDEP}]
-	>=dev-python/json5-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0.1[${PYTHON_USEDEP}]
-	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.28[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-server-1.21[${PYTHON_USEDEP}]
-	<dev-python/jupyter-server-3[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/jupyter-server[${PYTHON_USEDEP}]
-		<dev-python/openapi-core-0.17[${PYTHON_USEDEP}]
-		>=dev-python/openapi-core-0.16.1[${PYTHON_USEDEP}]
-		<dev-python/openapi-spec-validator-0.6[${PYTHON_USEDEP}]
-		>=dev-python/openapi-spec-validator-0.5.1[${PYTHON_USEDEP}]
-		dev-python/pytest-jupyter[${PYTHON_USEDEP}]
-		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-		dev-python/strict-rfc3339[${PYTHON_USEDEP}]
-		dev-python/requests-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-# TODO: package autodoc_traits
-#distutils_enable_sphinx docs/source dev-python/pydata-sphinx-theme dev-python/myst-parser
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		tests/test_translation_api.py
-	)
-
-	EPYTEST_DESELECT=(
-		# Fails if terminal not available
-		tests/test_labapp.py::test_page_config
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p pytest_tornasync.plugin
-}
diff --git a/dev-python/moto/Manifest b/dev-python/moto/Manifest
index 6682e8ff8dc9..24fccae8a1e0 100644
--- a/dev-python/moto/Manifest
+++ b/dev-python/moto/Manifest
@@ -1,2 +1,3 @@
 DIST moto-4.1.15.tar.gz 3627847 BLAKE2B 65349e72dc6cc90f0ed148a1a68efae0b3c171adbc79d41dee8d058c62f2944a3e55c86c2e8e302ff865208393be551a4b6bf387a33136dfa808443ccfe3869a SHA512 b49541ac8ddd8d669af06253451ddd2e0d70eea63fd2b2fd28eb783b2fb9dccb1e13e650bfca3a5b0f94932b22b112d15317599bc70307828fb2c47191f94da7
 DIST moto-4.2.5.tar.gz 4721089 BLAKE2B 475a26ac75ed1e7e7fc00302b824ed473950c2916281456c1270f1489ab7c225468f2cd193b99f9589e8bf996590520abccdda8bc33278951696e8322ee6a1a8 SHA512 15211c367011acc049840555e2706d16a520226a1b9de0860977c90167b66702b06e7187af537da8c6312b0d8dcf50130e2a293120230d836b1e77691179827e
+DIST moto-4.2.6.tar.gz 4745145 BLAKE2B 76610aafe3ea4106454aadbc8cf853ff5d4617202a62ae92e6cbe46c75a17d1dd8e63e8188c0c17a88af080bfe6c3466ed420378cee27d0287fe617d3412807e SHA512 0bef11a2600d48349735e7d118f6f28b02fb85e2b5e7310aaa0651444740ad4657470a59c59dab75084cb4250c6b5b725eda5e996b9acbc927529850cabc4c1c
diff --git a/dev-python/moto/moto-4.2.6.ebuild b/dev-python/moto/moto-4.2.6.ebuild
new file mode 100644
index 000000000000..503a16b194c2
--- /dev/null
+++ b/dev-python/moto/moto-4.2.6.ebuild
@@ -0,0 +1,123 @@
+# 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_{8,9,10,11} )
+
+inherit distutils-r1 multiprocessing pypi
+
+DESCRIPTION="Mock library for boto"
+HOMEPAGE="
+	https://github.com/getmoto/moto/
+	https://pypi.org/project/moto/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/aws-xray-sdk-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-3.0.0[${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/pyaml[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.1[${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/pytest-xdist[${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
+		# broken code (local variable used referenced before definition)
+		tests/test_appsync/test_appsync_schema.py
+		# Needs network (or docker?) but not marked as such, bug #807031
+		# TODO: report upstream
+		tests/test_awslambda/test_lambda_layers_invoked.py::test_invoke_local_lambda_layers
+		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_container_overrides
+		tests/test_batch/test_batch_jobs.py::test_dependencies
+		tests/test_batch/test_batch_jobs.py::test_failed_dependencies
+		tests/test_batch/test_batch_jobs.py::test_failed_job
+		tests/test_batch/test_batch_jobs.py::test_submit_job_array_size
+		tests/test_batch/test_batch_jobs.py::test_terminate_job
+		tests/test_batch/test_batch_jobs.py::test_terminate_nonexisting_job
+		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_core/test_docker.py::test_docker_is_running_and_available
+		tests/test_events/test_events_lambdatriggers_integration.py::test_creating_bucket__invokes_lambda
+		"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]"
+		# TODO
+		tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_queue
+		tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_fifo_queue
+		# require py_partiql_parser
+		tests/test_s3/test_s3_select.py
+		tests/test_dynamodb/test_dynamodb_statements.py
+		# broken by new urllib3
+		tests/test_moto_api/recorder/test_recorder.py::TestRecorder::test_s3_upload_data
+		tests/test_moto_api/recorder/test_recorder.py::TestRecorder::test_s3_upload_file_using_requests
+		tests/test_s3/test_s3.py::test_upload_from_file_to_presigned_url
+		tests/test_s3/test_s3.py::test_put_chunked_with_v4_signature_in_body
+		tests/test_s3/test_s3.py::test_presigned_put_url_with_approved_headers
+		tests/test_s3/test_s3.py::test_presigned_put_url_with_custom_headers
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x TZ=UTC
+
+	local serial_tests=(
+		# these tests set up credentials that are needed by the tests below
+		tests/test_core/test_importorder.py
+		# these tests apparently rely on some other test setting credentials
+		# up for them, so they need to be run separately, after the above
+		tests/test_lakeformation/test_resource_tags_integration.py
+		tests/test_redshiftdata
+		tests/test_resourcegroupstaggingapi/test_server.py::test_resourcegroupstaggingapi_list
+		tests/test_s3/test_s3.py::test_delete_bucket_cors
+		tests/test_s3/test_s3.py::test_delete_versioned_bucket_returns_metadata
+		tests/test_s3/test_s3_file_handles.py::TestS3FileHandleClosuresUsingMocks
+		tests/test_utilities/test_threaded_server.py::TestThreadedMotoServer::test_server_can_handle_multiple_services
+	)
+
+	epytest "${serial_tests[@]}"
+
+	EPYTEST_DESELECT+=( "${serial_tests[@]}" )
+	epytest -m 'not network' -p xdist -n "$(makeopts_jobs)" --dist=worksteal
+}
diff --git a/dev-python/openapi-core/Manifest b/dev-python/openapi-core/Manifest
index 6ace1dbdc4c8..3e298f1b2da5 100644
--- a/dev-python/openapi-core/Manifest
+++ b/dev-python/openapi-core/Manifest
@@ -1,4 +1 @@
-DIST openapi-core-0.16.6.gh.tar.gz 104008 BLAKE2B bb1bdac98dfc5aef0961624488074363568f53a6c44cb0730be0d103d891d24bed86659f640e0d07da4072edc233c904c0ddcfd9e8b3960ace1af078c0d745e5 SHA512 556636a4698dcd7db6c656333849077abacdac1a440fe58210ad8f02c1f0220e46dea29962346dfb3f89d164ebc986ec750c184840be9a34a5e1dd98fbf8ef98
-DIST openapi_core-0.17.2.tar.gz 88262 BLAKE2B 4d9a1be1eff4118bc1c687e57af0ff3738f984ceb6e564c643d26cb795bbcd3e703dd22c3b45d574f498d290f8da225819c9df618da5a1b8e40758304f2ebd07 SHA512 73cd2b62149549bd56781adb44922bca4a0519fbae8b6539d0225799ba1cfa1ab584428fd572ee42af4731b5437f08b8c4ad8f8895444aef315e4c6909fd4e5a
-DIST openapi_core-0.18.0.tar.gz 83474 BLAKE2B 785e95969e03d9ccf17e40c7ce563cef6ab45c417e397b0f03e982622fb1c65d4b3e719e94e1072c7a41b837097efea7b83e29e8ceec64579f1c58040c9fb291 SHA512 d9e516e00a53937f79c7419823a1533a507731e20da36e1186a1800f713154135524db968483ce850bd9a90a4c322ca1c957d6a7f99e9d8eefdc244ed9ce8bc0
 DIST openapi_core-0.18.1.tar.gz 84070 BLAKE2B 523b620106493aac11135025791440cbc4e7dc415a10344a74e2de3500834bda6158aa286f167e629ae90e1eefd568527832fb86557c16eace162d2bac98e30b SHA512 ae59c0ca948ebfcf01b63db8a463869bbb748336f32c917b2ed22bd94934c91b6fe280bf94bf82a24df9fb29979e6a1b5ce665d12b6bb6480405e9586a9fc8d5
diff --git a/dev-python/openapi-core/openapi-core-0.16.6-r1.ebuild b/dev-python/openapi-core/openapi-core-0.16.6-r1.ebuild
deleted file mode 100644
index 7546bd0a4808..000000000000
--- a/dev-python/openapi-core/openapi-core-0.16.6-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{8,9,10,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Client-side and server-side support for the OpenAPI Specification v3"
-HOMEPAGE="
-	https://github.com/python-openapi/openapi-core/
-	https://pypi.org/project/openapi-core/
-"
-SRC_URI="
-	https://github.com/python-openapi/openapi-core/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/pathable-0.4.0[${PYTHON_USEDEP}]
-	dev-python/isodate[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-spec-0.2[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-spec-0.1.1[${PYTHON_USEDEP}]
-	dev-python/more-itertools[${PYTHON_USEDEP}]
-	dev-python/parse[${PYTHON_USEDEP}]
-	<dev-python/openapi-schema-validator-0.5[${PYTHON_USEDEP}]
-	>=dev-python/openapi-schema-validator-0.3[${PYTHON_USEDEP}]
-	<dev-python/openapi-spec-validator-0.6[${PYTHON_USEDEP}]
-	>=dev-python/openapi-spec-validator-0.5[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		dev-python/asgiref[${PYTHON_USEDEP}]
-		dev-python/flask[${PYTHON_USEDEP}]
-		>=dev-python/httpx-0.23.0[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		>=dev-python/starlette-0.21.0[${PYTHON_USEDEP}]
-		dev-python/strict-rfc3339[${PYTHON_USEDEP}]
-		dev-python/webob[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# falcon is not packaged
-	tests/integration/contrib/falcon
-
-	# TODO: these tests fail to collect
-	tests/integration/validation/test_security_override.py
-	tests/integration/validation/test_read_only_write_only.py
-
-	# unhappy about modern django
-	tests/integration/contrib/django/test_django_project.py
-	tests/unit/contrib/django/test_django.py
-)
-
-src_prepare() {
-	sed -i -e '/--cov/d' pyproject.toml || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/openapi-core/openapi-core-0.17.2.ebuild b/dev-python/openapi-core/openapi-core-0.17.2.ebuild
deleted file mode 100644
index 7f8d0397f08e..000000000000
--- a/dev-python/openapi-core/openapi-core-0.17.2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{8,9,10,11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Client-side and server-side support for the OpenAPI Specification v3"
-HOMEPAGE="
-	https://github.com/python-openapi/openapi-core/
-	https://pypi.org/project/openapi-core/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	<dev-python/asgiref-4[${PYTHON_USEDEP}]
-	>=dev-python/asgiref-3.6.0[${PYTHON_USEDEP}]
-	dev-python/isodate[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-5[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-4.17.3[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-spec-0.2[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-spec-0.1.6[${PYTHON_USEDEP}]
-	<dev-python/lazy-object-proxy-2[${PYTHON_USEDEP}]
-	>=dev-python/lazy-object-proxy-1.7.1[${PYTHON_USEDEP}]
-	dev-python/more-itertools[${PYTHON_USEDEP}]
-	dev-python/parse[${PYTHON_USEDEP}]
-	<dev-python/openapi-schema-validator-0.5[${PYTHON_USEDEP}]
-	>=dev-python/openapi-schema-validator-0.4.2[${PYTHON_USEDEP}]
-	<dev-python/openapi-spec-validator-0.6[${PYTHON_USEDEP}]
-	>=dev-python/openapi-spec-validator-0.5[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		>=dev-python/aiohttp-3.8.4[${PYTHON_USEDEP}]
-		dev-python/flask[${PYTHON_USEDEP}]
-		>=dev-python/httpx-0.24.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-aiohttp-1.0.4[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		>=dev-python/starlette-0.26.1[${PYTHON_USEDEP}]
-		dev-python/strict-rfc3339[${PYTHON_USEDEP}]
-		dev-python/webob[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# falcon is not packaged
-	tests/integration/contrib/falcon
-
-	# TODO: these tests fail to collect
-	tests/integration/validation/test_security_override.py
-	tests/integration/validation/test_read_only_write_only.py
-
-	# unhappy about modern django
-	tests/integration/contrib/django/test_django_project.py
-	tests/unit/contrib/django/test_django.py
-)
-
-src_prepare() {
-	sed -i -e '/--cov/d' pyproject.toml || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/openapi-core/openapi-core-0.18.0.ebuild b/dev-python/openapi-core/openapi-core-0.18.0.ebuild
deleted file mode 100644
index 65a27f042f28..000000000000
--- a/dev-python/openapi-core/openapi-core-0.18.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{8,9,10,11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Client-side and server-side support for the OpenAPI Specification v3"
-HOMEPAGE="
-	https://github.com/python-openapi/openapi-core/
-	https://pypi.org/project/openapi-core/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	<dev-python/asgiref-4[${PYTHON_USEDEP}]
-	>=dev-python/asgiref-3.6.0[${PYTHON_USEDEP}]
-	dev-python/isodate[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-5[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-4.17.3[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-spec-0.3[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-spec-0.2.3[${PYTHON_USEDEP}]
-	dev-python/more-itertools[${PYTHON_USEDEP}]
-	dev-python/parse[${PYTHON_USEDEP}]
-	<dev-python/openapi-schema-validator-0.7[${PYTHON_USEDEP}]
-	>=dev-python/openapi-schema-validator-0.6.0[${PYTHON_USEDEP}]
-	<dev-python/openapi-spec-validator-0.7[${PYTHON_USEDEP}]
-	>=dev-python/openapi-spec-validator-0.6.0[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		>=dev-python/aiohttp-3.8.4[${PYTHON_USEDEP}]
-		dev-python/flask[${PYTHON_USEDEP}]
-		>=dev-python/httpx-0.24.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-aiohttp-1.0.4[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		>=dev-python/starlette-0.26.1[${PYTHON_USEDEP}]
-		dev-python/strict-rfc3339[${PYTHON_USEDEP}]
-		dev-python/webob[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# falcon is not packaged
-	tests/integration/contrib/falcon
-
-	# TODO: these tests fail to collect
-	tests/integration/validation/test_security_override.py
-	tests/integration/validation/test_read_only_write_only.py
-
-	# unhappy about modern django
-	tests/integration/contrib/django/test_django_project.py
-	tests/unit/contrib/django/test_django.py
-)
-
-src_prepare() {
-	sed -i -e '/--cov/d' pyproject.toml || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/openapi-schema-validator/Manifest b/dev-python/openapi-schema-validator/Manifest
index 2dc6a59489d7..371a9906cd90 100644
--- a/dev-python/openapi-schema-validator/Manifest
+++ b/dev-python/openapi-schema-validator/Manifest
@@ -1,5 +1 @@
-DIST openapi_schema_validator-0.4.4.tar.gz 11626 BLAKE2B e4247f07476d472761f46c98d9259383e960641b910334d967e61f55c63b855c752176e7217f8870016ec3767b0c1c45e8863ca600e354eb5aaa62bcacbe8d51 SHA512 273e3d7080c794ff277170e55e67e32d65211469642652437e59f985a002b20bd2cc8643d2b0214dc232980dd69c2f87ea748537552c66999a110b2e4be2125c
-DIST openapi_schema_validator-0.5.0.tar.gz 11996 BLAKE2B 91f4c51c1d44e363b5f4ca8c69c7836a6df3927d2db5f255b1cc81b97b2056b409becc6f5fb44c0fb82a11fb6a6de398ae49930fdcf77cdb1d88c998b75bf00f SHA512 4db13d63641f375d809501ca7f6efecbbdcc46e74fff1d06657e0c509e6e182c9b97a83031b7a9251e9897f5dd5620a29ddf932f7b8e191c3f78fd2adba5bc68
-DIST openapi_schema_validator-0.6.0.tar.gz 11849 BLAKE2B 34f3b0d0e301ff961d777c3a995906df396436da1b7c256c7bf4128ab2d48a05b38aaa362fa2b93b46e03fd176f43b6c585e1c4a3aab3e4baa81dc43cb6e8429 SHA512 ac90d424fcd8a416d395f8e74b3dfb51d2974ce74189e2d16ad4210ff0e7290b789c9e7268504c61aaad81f96c524e4fc3e595a856e26f7aee7df03f27e2fb2e
-DIST openapi_schema_validator-0.6.1.tar.gz 11855 BLAKE2B c5c9a4a0c97c7804f670064b424f7e691e2aea188eb0c6879e1213b7c5746293a90f45552ca9f911d207562c98d83c1b5b2b7b42c2394d787f722790af2b3ce2 SHA512 e7bf1f9448aa034018cf47b9ae4fc95e29d439f90dcb9fda7f305ada732aed7567efd0965d823916da7778f8991b49ce30e2dc6aadd3608ce6927a4d6d652c4b
 DIST openapi_schema_validator-0.6.2.tar.gz 11860 BLAKE2B c9f540998e3e69f987900caa8b12e5bab258c9046babd0705e168d57817666302e000b7b69a71ea74f37cc5bd363a90a45ac29a31e32b91dcc6f48adccb21489 SHA512 709f7a7c00bf050fa2c48a05bcd4e83ad309029f62df10ba61424cb46413cb9218bf2930f24a4db09f7648e51135f346855a4d58ce836b315a82a9986b655932
diff --git a/dev-python/openapi-schema-validator/openapi-schema-validator-0.4.4.ebuild b/dev-python/openapi-schema-validator/openapi-schema-validator-0.4.4.ebuild
deleted file mode 100644
index e91d5945d5d6..000000000000
--- a/dev-python/openapi-schema-validator/openapi-schema-validator-0.4.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{8,9,10,11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="OpenAPI schema validation for Python"
-HOMEPAGE="
-	https://github.com/python-openapi/openapi-schema-validator/
-	https://pypi.org/project/openapi-schema-validator/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
-
-RDEPEND="
-	<dev-python/jsonschema-4.18[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-4.0.0[${PYTHON_USEDEP}]
-	dev-python/rfc3339-validator[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -e '/--cov/d' -i pyproject.toml || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/openapi-schema-validator/openapi-schema-validator-0.5.0.ebuild b/dev-python/openapi-schema-validator/openapi-schema-validator-0.5.0.ebuild
deleted file mode 100644
index 4f4a9f2b5ba1..000000000000
--- a/dev-python/openapi-schema-validator/openapi-schema-validator-0.5.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{8,9,10,11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="OpenAPI schema validation for Python"
-HOMEPAGE="
-	https://github.com/python-openapi/openapi-schema-validator/
-	https://pypi.org/project/openapi-schema-validator/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-
-RDEPEND="
-	<dev-python/jsonschema-4.18[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-4.0.0[${PYTHON_USEDEP}]
-	dev-python/rfc3339-validator[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -e '/--cov/d' -i pyproject.toml || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/openapi-schema-validator/openapi-schema-validator-0.6.0.ebuild b/dev-python/openapi-schema-validator/openapi-schema-validator-0.6.0.ebuild
deleted file mode 100644
index 37b85e72e0cd..000000000000
--- a/dev-python/openapi-schema-validator/openapi-schema-validator-0.6.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{8,9,10,11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="OpenAPI schema validation for Python"
-HOMEPAGE="
-	https://github.com/python-openapi/openapi-schema-validator/
-	https://pypi.org/project/openapi-schema-validator/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	<dev-python/jsonschema-5[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-4.18.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-specifications-2023.5.2[${PYTHON_USEDEP}]
-	dev-python/rfc3339-validator[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -e '/--cov/d' -i pyproject.toml || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/openapi-schema-validator/openapi-schema-validator-0.6.1.ebuild b/dev-python/openapi-schema-validator/openapi-schema-validator-0.6.1.ebuild
deleted file mode 100644
index e2b57d28b330..000000000000
--- a/dev-python/openapi-schema-validator/openapi-schema-validator-0.6.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{8,9,10,11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="OpenAPI schema validation for Python"
-HOMEPAGE="
-	https://github.com/python-openapi/openapi-schema-validator/
-	https://pypi.org/project/openapi-schema-validator/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	<dev-python/jsonschema-5[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-4.19.1[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-specifications-2023.5.2[${PYTHON_USEDEP}]
-	dev-python/rfc3339-validator[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -e '/--cov/d' -i pyproject.toml || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/openapi-spec-validator/Manifest b/dev-python/openapi-spec-validator/Manifest
index 5ee6cdc00735..9a2409e5989d 100644
--- a/dev-python/openapi-spec-validator/Manifest
+++ b/dev-python/openapi-spec-validator/Manifest
@@ -1,4 +1,2 @@
-DIST openapi_spec_validator-0.5.7.tar.gz 33722 BLAKE2B 71096a996d335b60d6646d96390e580952a1e27829aa807c4b333ee11a7925bc1bc10f4440c79fc6d4a8321dfd3bab9ec86bf79bef6c7139835b7f8035cbc061 SHA512 63dafc0bc459d8ad097d0a98a3d23e67ae37c0004ce6d53ad999b037f2a6743c95e13ae22920403368c37f8877665c104ac20e1f58532cffd8df54c800a6cf7d
 DIST openapi_spec_validator-0.6.0.tar.gz 33646 BLAKE2B cf8d397602b147872e86c0f236731ec477e20775aa63a61162e66deb7d4b81ef91bd86b67d2dfddf5d6b160c37b7eab4ddb1d10975ada8dc13aebdc088e4483a SHA512 71434f131f34902210237940d75f07f250b296c3e1814e03f0eaae436321ca11ac63d0014c85ad571852e66b2e11545c9d0cf21d771c0c67210a60c1f9094cc2
-DIST openapi_spec_validator-0.7.0.tar.gz 36700 BLAKE2B aadaa34259900af7e2eb120ac7ccd6ea50d29ddd2c49edbd11c1c95f611dfc68edd580f4c5044a1c91ede2c421f2ef0b8e35dca89c5b997b6fc6211c68126b09 SHA512 a9e2b254d6855cfb4127eac44a0589e674748b2be6c68dd30e24144271096e82b336913b06e00407a88e6f3d3fdd0079a0c9489755dc68110d92d2b686f695ac
 DIST openapi_spec_validator-0.7.1.tar.gz 37985 BLAKE2B e4e6995bba18ea9fb65be28b2156c73afd3c5074a3fbd5b83e03534a1bb5fdde2e5a586aa161e0f9fc64985d83ae995f46ff2704a4010a708f9e0cf18f97a8a8 SHA512 c2a4be4a945058a4e77857bf0d6dabf2bef27c25fbe72947db3ac011c5a60d2d0159ef0d1d44571152c5ffdc650f7d3d6c54f82834e499e9506fb474b7c9b270
diff --git a/dev-python/openapi-spec-validator/openapi-spec-validator-0.5.7.ebuild b/dev-python/openapi-spec-validator/openapi-spec-validator-0.5.7.ebuild
deleted file mode 100644
index 11e1c2552acd..000000000000
--- a/dev-python/openapi-spec-validator/openapi-spec-validator-0.5.7.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{8,9,10,11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="OpenAPI 2.0 (aka Swagger) and OpenAPI 3.0 spec validator"
-HOMEPAGE="
-	https://github.com/python-openapi/openapi-spec-validator/
-	https://pypi.org/project/openapi-spec-validator/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
-
-RDEPEND="
-	<dev-python/jsonschema-4.18[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-spec-0.1.1[${PYTHON_USEDEP}]
-	>=dev-python/lazy-object-proxy-1.7.1[${PYTHON_USEDEP}]
-	<dev-python/openapi-schema-validator-0.5[${PYTHON_USEDEP}]
-	>=dev-python/openapi-schema-validator-0.3.2[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# Internet
-	tests/integration/test_shortcuts.py::TestPetstoreV2Example
-	tests/integration/test_shortcuts.py::TestApiV2WithExampe
-	tests/integration/test_shortcuts.py::TestPetstoreV2ExpandedExample
-	tests/integration/test_shortcuts.py::TestPetstoreExample
-	tests/integration/test_shortcuts.py::TestRemoteValidatev2SpecUrl
-	tests/integration/test_shortcuts.py::TestRemoteValidatev30SpecUrl
-	tests/integration/test_shortcuts.py::TestApiWithExample
-	tests/integration/test_shortcuts.py::TestPetstoreExpandedExample
-	tests/integration/test_validate.py::TestPetstoreExample
-	tests/integration/test_validate.py::TestApiWithExample
-	tests/integration/test_validate.py::TestPetstoreExpandedExample
-	tests/integration/validation/test_validators.py
-)
-
-src_prepare() {
-	sed -i -e '/--cov/d' pyproject.toml || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/openapi-spec-validator/openapi-spec-validator-0.7.0.ebuild b/dev-python/openapi-spec-validator/openapi-spec-validator-0.7.0.ebuild
deleted file mode 100644
index 7762f60a672b..000000000000
--- a/dev-python/openapi-spec-validator/openapi-spec-validator-0.7.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{8,9,10,11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="OpenAPI 2.0 (aka Swagger) and OpenAPI 3.0 spec validator"
-HOMEPAGE="
-	https://github.com/python-openapi/openapi-spec-validator/
-	https://pypi.org/project/openapi-spec-validator/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/jsonschema-4.18.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-spec-0.2.3[${PYTHON_USEDEP}]
-	>=dev-python/lazy-object-proxy-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/openapi-schema-validator-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# Internet
-	tests/integration/test_shortcuts.py::TestPetstoreV2Example
-	tests/integration/test_shortcuts.py::TestApiV2WithExampe
-	tests/integration/test_shortcuts.py::TestPetstoreV2ExpandedExample
-	tests/integration/test_shortcuts.py::TestPetstoreExample
-	tests/integration/test_shortcuts.py::TestRemoteValidatev2SpecUrl
-	tests/integration/test_shortcuts.py::TestRemoteValidatev30SpecUrl
-	tests/integration/test_shortcuts.py::TestApiWithExample
-	tests/integration/test_shortcuts.py::TestPetstoreExpandedExample
-	tests/integration/test_validate.py::TestPetstoreExample
-	tests/integration/test_validate.py::TestApiWithExample
-	tests/integration/test_validate.py::TestPetstoreExpandedExample
-	tests/integration/validation/test_validators.py
-)
-
-src_prepare() {
-	sed -i -e '/--cov/d' pyproject.toml || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/paste/Manifest b/dev-python/paste/Manifest
index 3b1926977302..0d415e6b21b4 100644
--- a/dev-python/paste/Manifest
+++ b/dev-python/paste/Manifest
@@ -1,2 +1,3 @@
 DIST Paste-3.5.3.tar.gz 638791 BLAKE2B 12bcd083ba87699c05c46b1d27757ef4de5f528ba4f01407c113cccc1c59975a6143b6831d1d640b0d0fb82995c7aefd5e14601795403512a2997bd8a9e55466 SHA512 3087ea7b6cc45a90b85c473cbff7f018ca961536ff70fbed4610f86dedc82cef0274ccddb767de411ec2955d0c265cb4e797a14a25697870c38667ccd7c4a2d8
 DIST Paste-3.6.0.tar.gz 638953 BLAKE2B 89dc1b04c1b7eacae851900a274e5531ee568e2ef797b954e0c2e0b7bbe914e4bd129a5033919d914335680eb1aa57b115f647c65986ee4ae6e54a5edc9f16c5 SHA512 cacd3150da289f35960363bf77d9749b367ea857bebcfa601bd8410fb317a61ec357be0ef44fbdf9e576c3a3ec2934597d4e1a419f06e64f463705ebb6feb1bb
+DIST Paste-3.6.1.tar.gz 638943 BLAKE2B 20ed0fd350f611e4b170431fbeea7ea34bca6f339f65bfaef15521dcef4d2408f532f787993a55940287bdeb5383f87d0a11909aded1785fa06dafb814b502eb SHA512 3e2b5c943e68f999e9f406cabd81c9a5fed0a3dea02400f8b42ed0dab7f70665fb69136fd4c00be758fa18634f0f546068e59d21d9aa934a5ed87f52a7e370c4
diff --git a/dev-python/paste/paste-3.6.1.ebuild b/dev-python/paste/paste-3.6.1.ebuild
new file mode 100644
index 000000000000..39730b770f03
--- /dev/null
+++ b/dev-python/paste/paste-3.6.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYPI_PN=${PN^}
+PYTHON_COMPAT=( python3_{8,9,10,11} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Tools for using a Web Server Gateway Interface stack"
+HOMEPAGE="
+	https://pythonpaste.readthedocs.io/en/latest/
+	https://github.com/cdent/paste/
+	https://pypi.org/project/Paste/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+RDEPEND="
+	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
+	!dev-python/namespace-paste
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# Internet
+		tests/test_proxy.py
+	)
+
+	[[ ${EPYTHON} == python3.1[12] ]] && EPYTEST_DESELECT+=(
+		# fails due to cgi deprecation warning
+		tests/test_cgiapp.py::test_form
+	)
+
+	epytest
+}
diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index cb31d30f42b9..04d602d090b9 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -1,2 +1,3 @@
 DIST pillow-10.0.0.gh.tar.gz 50537667 BLAKE2B f0ce48e947363c16c0bb08881b42dcf845a142fe7d2162154f5ddce47bf909fc4c829dcb4365ee363680a41c247cea28eef37c879d22959ef69c9dc5adce91f4 SHA512 a963ae8398c609569e1b23d2362f6382cd888698492ba2349f9c931a04c463fbdc27a43e53d1dee8bbb1b5e88c0d5eb655f6f5e9df7d489c206b6acda0adec3a
 DIST pillow-10.0.1.gh.tar.gz 50539264 BLAKE2B 83c3bf4abc9c3eab210576dc28d6f8926ce0998ec344e792433afc05190bb248a926902ce7706e3569cd6cbf8deb640cafda86f102166cf6492ec00b66f9392f SHA512 27e2f0d86563c3b7f5a2e0ba2bbe98fc2cb2fa5871d0b6cbb5a0014e9d9eb03dde9969301419d806d1a22cd4881e624465a355ba9bc42b95746226e1f95712a9
+DIST pillow-10.1.0.gh.tar.gz 50798274 BLAKE2B a69be8187e7206b50350af399b73b5c43b29c249a4a5a6bb23438dae9967bb84f1d487f52b188811cb3d2e550245f8d5a765668d8d5de1375a84fcd96fc531d9 SHA512 01c97b68d4167d10539a2d29fb82676fb417ee5003f0acd9f602ed13d41b200579497cc0ef0949b2c1549b684f76f2d43895a52abdb1367345d2affd544c5b5a
diff --git a/dev-python/pillow/pillow-10.1.0.ebuild b/dev-python/pillow/pillow-10.1.0.ebuild
new file mode 100644
index 000000000000..efec35f57757
--- /dev/null
+++ b/dev-python/pillow/pillow-10.1.0.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+# setuptools wrapper
+DISTUTILS_USE_PEP517=standalone
+PYTHON_COMPAT=( python3_{8,9,10,11} pypy3 )
+PYTHON_REQ_USE='tk?,threads(+)'
+
+inherit distutils-r1 toolchain-funcs virtualx
+
+MY_PN=Pillow
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Python Imaging Library (fork)"
+HOMEPAGE="
+	https://python-pillow.org/
+	https://github.com/python-pillow/
+	https://pypi.org/project/Pillow/
+"
+SRC_URI="
+	https://github.com/python-pillow/Pillow/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="HPND"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+IUSE="examples imagequant +jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib"
+REQUIRED_USE="test? ( jpeg jpeg2k lcms tiff truetype )"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	imagequant? ( media-gfx/libimagequant:= )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	lcms? ( media-libs/lcms:2= )
+	tiff? ( media-libs/tiff:=[jpeg,zlib] )
+	truetype? ( media-libs/freetype:2= )
+	webp? ( media-libs/libwebp:= )
+	xcb? ( x11-libs/libxcb )
+	zlib? ( sys-libs/zlib:= )
+"
+RDEPEND="
+	${DEPEND}
+	dev-python/olefile[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/wheel[${PYTHON_USEDEP}]
+	virtual/pkgconfig
+	test? (
+		${RDEPEND}
+		dev-python/defusedxml[${PYTHON_USEDEP}]
+		dev-python/packaging[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		|| (
+			media-gfx/imagemagick[png]
+			media-gfx/graphicsmagick[png]
+		)
+	)
+"
+
+EPYTEST_DESELECT=(
+	# TODO; incompatible Qt version?
+	Tests/test_qt_image_qapplication.py::test_sanity
+)
+
+usepil() {
+	usex "${1}" enable disable
+}
+
+python_configure_all() {
+	# It's important that these flags are also passed during the install phase
+	# as well. Make sure of that if you change the lines below. See bug 661308.
+	cat >> setup.cfg <<-EOF || die
+		[build_ext]
+		disable_platform_guessing = True
+		$(usepil truetype)_freetype = True
+		$(usepil jpeg)_jpeg = True
+		$(usepil jpeg2k)_jpeg2000 = True
+		$(usepil lcms)_lcms = True
+		$(usepil tiff)_tiff = True
+		$(usepil imagequant)_imagequant = True
+		$(usepil webp)_webp = True
+		$(usepil webp)_webpmux = True
+		$(usepil xcb)_xcb = True
+		$(usepil zlib)_zlib = True
+	EOF
+
+	# setup.py won't let us add the right toolchain paths but it does
+	# accept additional ones from INCLUDE and LIB so set these. You
+	# wouldn't normally need these at all as the toolchain should look
+	# here anyway but it doesn't for this setup.py.
+	export \
+		INCLUDE="${ESYSROOT}"/usr/include \
+		LIB="${ESYSROOT}"/usr/$(get_libdir)
+
+	# We have patched in this env var.
+	tc-export PKG_CONFIG
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO (is clipboard unreliable in Xvfb?)
+		Tests/test_imagegrab.py::TestImageGrab::test_grabclipboard
+	)
+
+	"${EPYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}"
+	# no:relaxed: pytest-relaxed plugin make our tests fail. deactivate if installed
+	epytest -p no:relaxed || die "Tests failed with ${EPYTHON}"
+}
+
+python_install() {
+	python_doheader src/libImaging/*.h
+	distutils-r1_python_install
+}
+
+python_install_all() {
+	if use examples ; then
+		docinto example
+		dodoc docs/example/*
+		docompress -x /usr/share/doc/${PF}/example
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest
index ee4ad92612a7..20169371ad5f 100644
--- a/dev-python/pip/Manifest
+++ b/dev-python/pip/Manifest
@@ -1 +1,2 @@
 DIST pip-23.2.1.gh.tar.gz 9370625 BLAKE2B 9e7855aae371a773a070c24b50f985dac6ff7c2412d51e268368b911b92d0d0b52a839f9d761d5f6aaff33f1e7570d5f930e5063e8af98aa99f50d2f1c1b5ed2 SHA512 a6c629976c332cffe5dff0ec1e201d694c7a42fa8def202ebf1db251a6dbd90091eaac89c36a354a0cf0c60cdb267b4e0ec9ff6a88b0ac61cfaafdf159e34fc8
+DIST pip-23.3.gh.tar.gz 9394878 BLAKE2B 6ef608b204a4cb796585c5ff130ee642bce0e7a464099b7eaf9c9199203fc28ff0a1b260a731f9ba462a9b82e6f68be12fc622ed809ad41a1ab92adaa4993cbd SHA512 1afef5374410387bd1056a9ada21893f1fbb81e7a2d0ab2c9f4b500c99d25b98b55254e0dc36c4e4e408ad84b7be0e24709d25447168b076ce7723d35462d055
diff --git a/dev-python/pip/pip-23.3.ebuild b/dev-python/pip/pip-23.3.ebuild
new file mode 100644
index 000000000000..1838a954b66b
--- /dev/null
+++ b/dev-python/pip/pip-23.3.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# please bump dev-python/ensurepip-pip along with this package!
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_TESTED=( python3_{8,9,10,11} )
+PYTHON_COMPAT=( python3_{8,9,10,11} pypy3 )
+PYTHON_REQ_USE="ssl(+),threads(+)"
+
+inherit bash-completion-r1 distutils-r1 multiprocessing
+
+DESCRIPTION="The PyPA recommended tool for installing Python packages"
+HOMEPAGE="
+	https://pip.pypa.io/en/stable/
+	https://pypi.org/project/pip/
+	https://github.com/pypa/pip/
+"
+SRC_URI="
+	https://github.com/pypa/pip/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+# bundled deps
+LICENSE+=" Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MPL-2.0 PSF-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+SLOT="0"
+IUSE="test-rust"
+
+RDEPEND="
+	>=dev-python/setuptools-39.2.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/ensurepip-setuptools
+			dev-python/ensurepip-wheel
+			dev-python/freezegun[${PYTHON_USEDEP}]
+			dev-python/pretend[${PYTHON_USEDEP}]
+			dev-python/pytest-xdist[${PYTHON_USEDEP}]
+			dev-python/scripttest[${PYTHON_USEDEP}]
+			dev-python/tomli-w[${PYTHON_USEDEP}]
+			dev-python/virtualenv[${PYTHON_USEDEP}]
+			dev-python/werkzeug[${PYTHON_USEDEP}]
+			dev-python/wheel[${PYTHON_USEDEP}]
+			test-rust? (
+				dev-python/cryptography[${PYTHON_USEDEP}]
+			)
+		' "${PYTHON_TESTED[@]}")
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}/pip-23.1-no-coverage.patch"
+	)
+
+	distutils-r1_python_prepare_all
+
+	if use test; then
+		local wheels=(
+			"${BROOT}"/usr/lib/python/ensurepip/{setuptools,wheel}-*.whl
+		)
+		mkdir tests/data/common_wheels/ || die
+		cp "${wheels[@]}" tests/data/common_wheels/ || die
+	fi
+}
+
+python_compile_all() {
+	# 'pip completion' command embeds full $0 into completion script, which confuses
+	# 'complete' and causes QA warning when running as "${PYTHON} -m pip".
+	# This trick sets correct $0 while still calling just installed pip.
+	local pipcmd='import sys; sys.argv[0] = "pip"; __file__ = ""; from pip._internal.cli.main import main; sys.exit(main())'
+	"${EPYTHON}" -c "${pipcmd}" completion --bash > completion.bash || die
+	"${EPYTHON}" -c "${pipcmd}" completion --zsh > completion.zsh || die
+}
+
+python_test() {
+	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
+		einfo "Skipping tests on ${EPYTHON}"
+		return 0
+	fi
+
+	local EPYTEST_DESELECT=(
+		tests/functional/test_inspect.py::test_inspect_basic
+		tests/functional/test_install.py::test_double_install_fail
+		# Internet
+		tests/functional/test_install.py::test_install_dry_run
+		tests/functional/test_install.py::test_editable_install__local_dir_setup_requires_with_pyproject
+		tests/functional/test_install.py::test_install_8559_wheel_package_present
+		tests/functional/test_config_settings.py::test_backend_sees_config_via_sdist
+		tests/functional/test_install.py::test_link_hash_in_dep_fails_require_hashes
+		# TODO
+		tests/unit/test_network_auth.py::test_keyring_cli_get_password
+		tests/unit/test_network_auth.py::test_keyring_cli_set_password
+		# wants to install keyring from Internet, sigh
+		tests/functional/test_install_config.py::test_prompt_for_keyring_if_needed
+		# probably a too strict assert
+		# https://github.com/pypa/pip/issues/12152
+		tests/unit/test_req.py::TestRequirementSet::test_download_info_archive_cache_with_invalid_origin
+	)
+
+	if ! has_version "dev-python/cryptography[${PYTHON_USEDEP}]"; then
+		EPYTEST_DESELECT+=(
+			tests/functional/test_install.py::test_install_sends_client_cert
+			tests/functional/test_install_config.py::test_do_not_prompt_for_authentication
+			tests/functional/test_install_config.py::test_prompt_for_authentication
+			tests/functional/test_install_config.py::test_prompt_for_keyring_if_needed
+		)
+	fi
+
+	local -x SETUPTOOLS_USE_DISTUTILS=stdlib
+	local -x PIP_DISABLE_PIP_VERSION_CHECK=1
+	epytest -m "not network" -n "$(makeopts_jobs)"
+}
+
+python_install_all() {
+	local DOCS=( AUTHORS.txt docs/html/**/*.rst )
+	distutils-r1_python_install_all
+
+	newbashcomp completion.bash pip
+
+	insinto /usr/share/zsh/site-functions
+	newins completion.zsh _pip
+}
diff --git a/dev-python/spdx-tools/spdx-tools-0.7.1.ebuild b/dev-python/spdx-tools/spdx-tools-0.7.1.ebuild
index d26ad868e5ce..7cc58a436c8e 100644
--- a/dev-python/spdx-tools/spdx-tools-0.7.1.ebuild
+++ b/dev-python/spdx-tools/spdx-tools-0.7.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0/0.7"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="amd64 ~riscv"
 
 RDEPEND="
 	dev-python/click[${PYTHON_USEDEP}]
diff --git a/dev-python/uritools/uritools-4.0.2.ebuild b/dev-python/uritools/uritools-4.0.2.ebuild
index 47e5faceb100..8bcc5ef28fbf 100644
--- a/dev-python/uritools/uritools-4.0.2.ebuild
+++ b/dev-python/uritools/uritools-4.0.2.ebuild
@@ -19,6 +19,6 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="amd64 ~riscv"
 
 distutils_enable_tests pytest