Adding metadata

24 files changed, 553 insertions, 10 deletions

diff --git a/dev-python/astroid/Manifest b/dev-python/astroid/Manifest
index d5a28800040d..bae584832ed0 100644
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@@ -1,2 +1,3 @@
 DIST astroid-2.11.6.gh.tar.gz 414842 BLAKE2B 3300037aad912be25d99cc20576f472b907c064c2cb434d9a40a9014df44749760cd8921411f3abdf8e08bd08e612cf6aec13d73ca38ec8ac31cd1ed007282bb SHA512 2276385d74d9bbfd0d99c786d2598105161b2c71c96ca73183b6e2672f8b61c31667c337a1d3967956ef5fdbb54392d604a84da5ac456354d04fb4ad37b11f61
 DIST astroid-2.12.2.gh.tar.gz 430857 BLAKE2B 8b34366368718cd4329298bdff3b761cab59b6bf8b856660912ef44bf1766136573145630b5193481454a4bf897ae950c5b6f7bb3611d3d343dc4f3adb2e5906 SHA512 3ba484bbd98b196b4241fb8bb9405b48a1e6aafaf318a67fc9264c8c1679f9d6b6788b8139077b60c751b0a26732b905196b3bb48671da2aa15e1c323bf396d6
+DIST astroid-2.12.3.gh.tar.gz 432731 BLAKE2B 276537b9a97bfbba2177538c6546a8e55fd1a144dde2fc2104460b0867d5439433e10be58bdac4f7da17a22e61c9484045ee979b8de11dcb485b9979a50f1e30 SHA512 5927c54d2ae000a96615a7b81f83b39bd8ce4b15e6652b494d18cf085ed455fb9e59b9c0c35ba8de7e2ea12c036e06ceb741dacdf882158cfd7e9ed3750dad88
diff --git a/dev-python/astroid/astroid-2.12.3.ebuild b/dev-python/astroid/astroid-2.12.3.ebuild
new file mode 100644
index 000000000000..cd9a4873f0ea
--- /dev/null
+++ b/dev-python/astroid/astroid-2.12.3.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Abstract Syntax Tree for logilab packages"
+HOMEPAGE="
+	https://github.com/PyCQA/astroid/
+	https://pypi.org/project/astroid/"
+SRC_URI="
+	https://github.com/PyCQA/astroid/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+# Version specified in pyproject.toml
+RDEPEND="
+	>=dev-python/lazy-object-proxy-1.4.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-3.10[${PYTHON_USEDEP}]
+	<dev-python/wrapt-2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# no clue why it's broken
+		tests/unittest_modutils.py::GetModulePartTest::test_known_values_get_builtin_module_part
+		tests/unittest_brain_dataclasses.py::test_pydantic_field
+		tests/unittest_brain.py::SixBrainTest::test_from_imports
+		tests/unittest_regrtest.py::NonRegressionTests::test_numpy_distutils
+		# some problem with warnings (our options?)
+		tests/unittest_decorators.py::TestDeprecationDecorators::test_deprecated_default_argument_values_one_arg
+		tests/unittest_decorators.py::TestDeprecationDecorators::test_deprecated_default_argument_values_two_args
+		tests/unittest_scoped_nodes.py::test_deprecation_of_doc_attribute
+	)
+
+	# Faker causes sys.path_importer_cache keys to be overwritten
+	# with PosixPaths
+	epytest -p no:faker
+}
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 791fa26766b1..37b3d8e6da4e 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -10,3 +10,4 @@ DIST boto3-1.24.53.gh.tar.gz 527969 BLAKE2B f0075c531876176c11a874398f2935a7ced0
 DIST boto3-1.24.54.gh.tar.gz 528596 BLAKE2B a34f5bdd4a72aecaa40b9235696b502702c39a14fc4dc23fc03d4abfc2fe763c278e00b20f04b1167a5acedb77c6c149cdd053eb7ed2dd4ed4333790b4fc0ab7 SHA512 82f77416f0ae1bfadfe59764ec2e956e1533359c4cd28ea82d955c1b909d8057e5cfb2588ad14d8edf54ad44b623ce17fe7bdbd976e1928bcd8f8cdf6d7a9489
 DIST boto3-1.24.55.gh.tar.gz 529245 BLAKE2B 02a5bdbabcabc7019728da0be14d02c3e64a28e996f656664b329499668a064a13eeb4d9504a609b0ede0ade188bbd96f2b1c758e05da4e0ab67d5b70e5408a1 SHA512 539375585f93b699032755eda36bbba99364ff68f49898656cebcddd99ebead4546a01f28b1f81473d7a7eea01196832345a0b3a99a460f20ba4d4c081768bbf
 DIST boto3-1.24.56.gh.tar.gz 529533 BLAKE2B 7d41281f9cc645e8ca83a71e6eabf1d54373208488cc14bd723b32f56a4e2e1d3b4fa407ab495a9409ae9635f1dc2b7ce2fdebc9bfd1c263e0d9b29d5925daec SHA512 ffc86fbf45fa1264f26474115edcee3f62abc93e0a23fd7ca800c1995924e4cf71e84f852d28217863427061646d1ffd9e24d68d1c531d8b480d126e449f76f0
+DIST boto3-1.24.57.gh.tar.gz 530363 BLAKE2B a2f3f39f0de79fc68a32da9bacbef863c705cace82ec4650e17ab89b14f73a456b3583fa3376dc6a62139986063fe0bfade5511fea21d0490c57f9fb65cae425 SHA512 5dd4f0c53f772f5d8d2519e5b1230c5918537af7a265a64670996ff2384e2f8e226d33e91ad4491ce00932d8f99d61d6819ce0d10b0f493a514cef2183ac839c
diff --git a/dev-python/boto3/boto3-1.24.57.ebuild b/dev-python/boto3/boto3-1.24.57.ebuild
new file mode 100644
index 000000000000..e4a98e2e28f5
--- /dev/null
+++ b/dev-python/boto3/boto3-1.24.57.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="
+	https://github.com/boto/boto3/
+	https://pypi.org/project/boto3/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="
+		https://github.com/boto/boto3/archive/${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index bed6b601e0ed..e356d4927bb2 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -10,3 +10,4 @@ DIST botocore-1.27.53.gh.tar.gz 9527747 BLAKE2B 9b5d2c01af6692bac0e105fbb2283741
 DIST botocore-1.27.54.gh.tar.gz 9535763 BLAKE2B e1797243102043564a369c519397a609a4b8b6dcc9b8362f2b05961279b4b858e4f1d81ba6f4898039812a87729e0c9e9b880abe6cb509ba0fce442933aaf563 SHA512 714d70cd2d86add4c34a8ffbba3e89305928a614013bc56214dad25eeb1a7766805e737d9fb54ee96e8df81892d2faebeaa6639adea6d1f4cd50c5ac9b589c6b
 DIST botocore-1.27.55.gh.tar.gz 9543620 BLAKE2B cf9d20e5725276318578362e596bc73ed0b37c0fc0ecbba20c8de1740135fee87c93d7b849384ca34fa521f16de497fb4f2050f52bd04beddfe66b1c8ff4390e SHA512 1eea888ff68344943f0604d030c0c9f6d087211ef3338023693eb51e6dc92fcf6d32ebd14e9073e0ce7e1d44338c7a535a88a55286dcbaf7684a6617effdf14f
 DIST botocore-1.27.56.gh.tar.gz 9545974 BLAKE2B 514c859f854aed83c3bb13ed3eab9999840d61e6f36e2c860f272f0fafde110d83da93f2843c419c577d0a8c737835c069438d322fc95581bb7c292ed16639a5 SHA512 c0bdeeb9254c5528034058932050874a0e40aee220f2d67a93c163e645e32badeae6517da23f69cf10452d5ed33a23188204bcdac385e43303882601e6e45922
+DIST botocore-1.27.57.gh.tar.gz 9559970 BLAKE2B c48dbe694b501afc2e9b2292e544393da13cf10e895e29dbea36c62511ad3d487525ca568c2ac6e0f4767ec0ddaac07f25415b77a10737f45b8c5b4c823f8e7b SHA512 a2d6433a2f42199e20c899d1b0797eb7d65dbdfdb3be75317fab548f5d9d6b2319032c00ee800e9defa311672dd0f990462dd83d4511728b110ac58290daca14
diff --git a/dev-python/botocore/botocore-1.27.57.ebuild b/dev-python/botocore/botocore-1.27.57.ebuild
new file mode 100644
index 000000000000..6a8e7e93c947
--- /dev/null
+++ b/dev-python/botocore/botocore-1.27.57.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="
+	https://github.com/boto/botocore/
+	https://pypi.org/project/botocore/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="
+		https://github.com/boto/botocore/archive/${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	<dev-python/jmespath-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+	)
+
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/canonicaljson/canonicaljson-1.6.2.ebuild b/dev-python/canonicaljson/canonicaljson-1.6.2.ebuild
index 0e599e799e02..6b078efdd4d8 100644
--- a/dev-python/canonicaljson/canonicaljson-1.6.2.ebuild
+++ b/dev-python/canonicaljson/canonicaljson-1.6.2.ebuild
@@ -10,8 +10,8 @@ inherit distutils-r1
 
 DESCRIPTION="Canonical JSON"
 HOMEPAGE="
-	https://github.com/matrix-org/python-canonicaljson
-	https://pypi.python.org/pypi/canonicaljson
+	https://github.com/matrix-org/python-canonicaljson/
+	https://pypi.org/project/canonicaljson/
 "
 SRC_URI="https://github.com/matrix-org/python-canonicaljson/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
 
diff --git a/dev-python/clint/clint-0.5.1-r3.ebuild b/dev-python/clint/clint-0.5.1-r3.ebuild
index ca0d9aa5b7e3..1e663f3751c2 100644
--- a/dev-python/clint/clint-0.5.1-r3.ebuild
+++ b/dev-python/clint/clint-0.5.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/kennethreitz-archive/${PN}/archive/v${PV}.tar.gz ->
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~x86"
 IUSE="examples"
 
 # https://github.com/kennethreitz-archive/clint/pull/180
diff --git a/dev-python/cloudscraper/cloudscraper-1.2.60.ebuild b/dev-python/cloudscraper/cloudscraper-1.2.60.ebuild
index 22947872814b..ccbc8a67c55a 100644
--- a/dev-python/cloudscraper/cloudscraper-1.2.60.ebuild
+++ b/dev-python/cloudscraper/cloudscraper-1.2.60.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/VeNoMouS/${PN}/archive/${PV}.tar.gz -> ${PF}.tar.gz"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ppc64"
 
 RDEPEND="
 	dev-python/pyparsing[${PYTHON_USEDEP}]
diff --git a/dev-python/ensurepip-setuptools/Manifest b/dev-python/ensurepip-setuptools/Manifest
index deb7cbedb88f..7898cd22cd22 100644
--- a/dev-python/ensurepip-setuptools/Manifest
+++ b/dev-python/ensurepip-setuptools/Manifest
@@ -1,2 +1,3 @@
 DIST setuptools-65.0.2-py3-none-any.whl 1233332 BLAKE2B 0c0d0db73452d15947097f3d453f01bb42ef150b50122b7a1f39212f663064284bc313a04c3dbe99e8da7e614d72a963d6c9f0c8f486f5d84131a06718b288c8 SHA512 11d9975468166bf7db9a9da44d893a67daacc5f309da1b521278a95a33fa2b3574cae10840c9943de54bf5d411e54697f91b62a3bfb5a6a3bc69b804af2a1365
 DIST setuptools-65.1.0-py3-none-any.whl 1232689 BLAKE2B db8f85b99b1d47af55d484d77ecafe5122abe9ab8dcec565659bb91c16aa26513c00d8684ca3b7b57e629d512b42273188a00ee0a0958bba5097ce150869609f SHA512 1072a826964ec3413c5bcd3f930a2f314b87b0b77714ddc948573841fbb871a898843211beaff0bcc5e003fcaab678de5d2b9a3a9fa864beced1bf2af282d048
+DIST setuptools-65.2.0-py3-none-any.whl 1232422 BLAKE2B 049fbccec71e15ed01b5e07f5d60589c662d012e4fe27c6eb8fbe3b62692bb63d891c9cf4253fe74b5a5803db39f3e5194f8481e5a3555493e9f18bd6985b35d SHA512 e0fc48a3ebe2022783c2f56d85d8ad5e17bd0f5f2caefc5e3ac6eb4ddf1464854ad9039c62a55e72ca6b0387e7f874b15b7a0df4acbf6153a51cb8e8146bd93d
diff --git a/dev-python/ensurepip-setuptools/ensurepip-setuptools-65.2.0.ebuild b/dev-python/ensurepip-setuptools/ensurepip-setuptools-65.2.0.ebuild
new file mode 100644
index 000000000000..96c75c915768
--- /dev/null
+++ b/dev-python/ensurepip-setuptools/ensurepip-setuptools-65.2.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=${PN#ensurepip-}
+WHL=${MY_PN}-${PV}-py3-none-any.whl
+
+DESCRIPTION="Shared setuptools wheel for ensurepip Python module"
+HOMEPAGE="https://pypi.org/project/setuptools/"
+SRC_URI="
+	https://files.pythonhosted.org/packages/py3/${MY_PN::1}/${MY_PN}/${WHL}
+"
+S=${DISTDIR}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	!<dev-python/ensurepip-wheels-100
+"
+
+src_install() {
+	insinto /usr/lib/python/ensurepip
+	doins "${WHL}"
+}
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index 6af4e7bf1a4d..4953a9917801 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -1,3 +1,4 @@
 DIST google-api-python-client-2.55.0.gh.tar.gz 32614590 BLAKE2B f7344903e4782940cb277b0b4ebc48b36c5b3403ea7f309205c4b27bee3488ecc5cd83b0487989da56b840dda7b0661f598c21307ba9afc9b52137f3b155737d SHA512 c674c038e911140e3ad64426be629d1498db382d96d18a5a51a4c2d5cb4375ad84e21e5dd68aedfa29b4bdc017d7996351f42ff34bff293a4d2c8cfb26820f0d
 DIST google-api-python-client-2.56.0.gh.tar.gz 33165501 BLAKE2B 5b4d72404f15c211cb01ca5291a74c83e9551b28c2e9e268462d481a3b05f557998fba8ed14c1233a023f60813be5b702f88371d47499a18cef152a52577f2ce SHA512 3ea968d11eda34d7807469c1651e8685ae695faed2772acbb23964468fa0cf9036fe468f427cd3f5bccd7c69746729858838446cbd320f0db7edff4add554d81
 DIST google-api-python-client-2.57.0.gh.tar.gz 33298709 BLAKE2B 6c50bdcfc38180ece5f8202b0f3adcfc446cc0b057122aee7f706401248b7d860d9227c444b26faea49de5e4147010765edc5e54271907f6490e6f0d9fe0ac1e SHA512 f96c40b21f4191e5a06a4068b65c952d9d2bef3849a6aa821232c60dfc8b6c6598606b596c750cc87928871367cbbcb24af46b5626d602915ccf7a7f316988ba
+DIST google-api-python-client-2.58.0.gh.tar.gz 33498127 BLAKE2B c00ecad1e863e5abb92cfbbbf57778b63ceaf73ae4cfb00ddf4fd0ed31656a28e475b91a02c03a6231790c2f3ab3e3243d131a97ed0f51151946568f5b56e18c SHA512 00c1606fadb46a6f4f60939135e9fd2840b267cd962630e4cd2d123588e9bdc8c0ed397d9e038ae91a2f31b732eb7698476fc1cf2322771b5720c11a97321b00
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.58.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.58.0.ebuild
new file mode 100644
index 000000000000..95188afdf1fa
--- /dev/null
+++ b/dev-python/google-api-python-client/google-api-python-client-2.58.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Google API Client for Python"
+HOMEPAGE="
+	https://github.com/googleapis/google-api-python-client/
+	https://pypi.org/project/google-api-python-client/
+"
+SRC_URI="
+	https://github.com/googleapis/google-api-python-client/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
+	<dev-python/httplib2-1[${PYTHON_USEDEP}]
+	>=dev-python/google-api-core-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-1.35.0[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-httplib2-0.1.0[${PYTHON_USEDEP}]
+	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
+	<dev-python/uritemplate-5[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/oauth2client[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# require Internet access (and credentials)
+		tests/test_discovery.py::DiscoveryErrors::test_credentials_and_credentials_file_mutually_exclusive
+		tests/test_discovery.py::DiscoveryFromDocument::test_api_endpoint_override_from_client_options_mapping_object
+	)
+
+	epytest tests
+}
diff --git a/dev-python/marshmallow/Manifest b/dev-python/marshmallow/Manifest
index 978fef22a0d1..859ff8808e31 100644
--- a/dev-python/marshmallow/Manifest
+++ b/dev-python/marshmallow/Manifest
@@ -1,2 +1,3 @@
 DIST marshmallow-3.16.0.tar.gz 180106 BLAKE2B c3d9b9c1645e7df103940b8e637f3de027f23e5da4a6ebd25412fef9d2d61483ec934af5c37f781121928a7b2f98b44793a8671173a5c548936ce0bbd0d2290d SHA512 5d3c7babff9117261afb902090bffcdba4eee2984d13862f4974fc043c6e56420707a6d3aba4a6046d947ef9414386c24895fc9a2538e36e505692e76d70f409
 DIST marshmallow-3.17.0.gh.tar.gz 180037 BLAKE2B 17fa577a969d82555312b362b41e6c61c209566ba418c9aa14ef1195b7317477a9e7c7d669e5643bee0d12454fee79bcf35a9eb625ad499347299e6727afb6bc SHA512 3fceb6dcb3df7339d0c002ac90ed9960bdcc174b29ad0fc3222a435d3980b892ae07c1080483b7a5a71455a475ae1086869432cefab898a1008ad33c7efc1f99
+DIST marshmallow-3.17.1.gh.tar.gz 180094 BLAKE2B 7c4dc60923ef95bdd0d77da4d6c643193944ca02115fd12529fa564860acee3ec495f1b402f5bee6b4a90fe6100e766cc0959918aed57b232e9ff2e5d2500602 SHA512 f72f969fba2136cfe288fea93a6db791b99f163f5b5af3498c6dbef9150abd5ce66b9678b1ba6538c3add530272b13c197a57d2e35cf148a5d21bf12feafcdd4
diff --git a/dev-python/marshmallow/marshmallow-3.17.1.ebuild b/dev-python/marshmallow/marshmallow-3.17.1.ebuild
new file mode 100644
index 000000000000..7df032c3483b
--- /dev/null
+++ b/dev-python/marshmallow/marshmallow-3.17.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A library for converting to and from native Python datatypes"
+HOMEPAGE="
+	https://github.com/marshmallow-code/marshmallow/
+	https://pypi.org/project/marshmallow/
+"
+SRC_URI="
+	https://github.com/marshmallow-code/marshmallow/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/packaging-0.17[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/simplejson[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/matrix-common/matrix-common-1.2.1.ebuild b/dev-python/matrix-common/matrix-common-1.2.1.ebuild
index 38232ba82c5b..79aaf9da2822 100644
--- a/dev-python/matrix-common/matrix-common-1.2.1.ebuild
+++ b/dev-python/matrix-common/matrix-common-1.2.1.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/matrix-python-common-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="amd64 ~ppc64"
 
 RDEPEND="
 	dev-python/attrs[${PYTHON_USEDEP}]
diff --git a/dev-python/python-cstruct/Manifest b/dev-python/python-cstruct/Manifest
index 5a7d48a0dbb3..9e7cc4c9d953 100644
--- a/dev-python/python-cstruct/Manifest
+++ b/dev-python/python-cstruct/Manifest
@@ -1 +1,2 @@
 DIST python-cstruct-2.1.tar.gz 17298 BLAKE2B 9acc10f0d386c4413634945fc94b3e44210617c408ee18cf6533f70e7d64c609d463e9beceeea7c79b125e0bf0ab67a720d9ff98f45b4e7ce1f51d9280b55733 SHA512 c56c87d291c4aa2afcfdbcbbc19c03ec634b6fb0dcde9d516ef2a9079be2fea52a053c47cd20dfc0fe6537ac90939364da659d8eb4763069a9990681207d432c
+DIST python-cstruct-2.2.gh.tar.gz 18764 BLAKE2B 75aaffae27fef59799e52866f8169cc5d7362ef1553a56986f361ef7cfb7ca3e7d8c67fe0f112ec8e03ddacf45885e19fc1ce0d9d27c7581deafbf7e7fe1789b SHA512 5a1d62b596fef08a48020557e82fc81360430d94f18ce0667919815d57b944102067c2fe5723372616f73c995afd3a1f674e4a37e406d0dc7eeaf9fe3ef8f484
diff --git a/dev-python/python-cstruct/python-cstruct-2.2.ebuild b/dev-python/python-cstruct/python-cstruct-2.2.ebuild
new file mode 100644
index 000000000000..870df7088705
--- /dev/null
+++ b/dev-python/python-cstruct/python-cstruct-2.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="C-style structs for Python"
+HOMEPAGE="https://github.com/andreax79/python-cstruct
+	https://pypi.org/project/cstruct/"
+SRC_URI="
+	https://github.com/andreax79/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=( README.md )
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	sed -e "/find_packages(/s@exclude=\[@&'tests', @" -i setup.py || die
+}
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 248e62b6fcf6..cbbb1ee2436d 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -7,3 +7,4 @@ DIST setuptools-64.0.3.tar.gz 2631478 BLAKE2B ff21a4cf81aed36561ac5a0da7d44c1cbe
 DIST setuptools-65.0.2.tar.gz 2619562 BLAKE2B e00e6ff7fd18c77c3924151bdbb40b36243b48eb389b67cee3279a82abd41943e08b4f8b7422edcce67b90e4c989fc170d96b140a18c78918ca7970039af8b29 SHA512 ccaf438b78a0d33ec4ec606f0fe64dcaf306dfe8935076b7534b984d0c0bfdf023d37a2b50e94572d54a5c8150e1458baabe811a4236410aedb75ee2a9215862
 DIST setuptools-65.1.0.tar.gz 2614949 BLAKE2B 89f4556b292afa7b46e558ff059647798a720647287419515cd3717ac37c6511f6ce2976967ceed98d1a34946116ad2fd366ce509b86a8153dc581171ab9c129 SHA512 6b18647b7a8a4c22e3115f233eaf97f7f564badcc31b2e5ee762630bbff3ef7f59397ca05cc4dbce65191f480be43f5e92de79eeaf8de6d32f0a79d88814e7e5
 DIST setuptools-65.1.1.tar.gz 2615020 BLAKE2B 1c45d7106e5845b95e6eec52b72749f80f799f1c5695b39e79ae7b49f52c0eab39fba305a7d2cb54a852679479db3c512e562b52a931e6a325d640479e5d4399 SHA512 29ec01558d6f6432c82797313cf12f1b3125c2000d9582e89fff415f59362c44fbfa00340cfbc4f7f4f9898161b3b585058115d1bc5b4bbcdfc0991812f858a8
+DIST setuptools-65.2.0.tar.gz 2614890 BLAKE2B a2da0870eaa0d36200dcfcab3fc63ea641d7b8451467ada32e834e94a9d33f84428e517a402d5e64ee999b5b8c2a0fff20044781fa5227ce3e2cc2fcb8f0796a SHA512 84e6e23780e6ef2e0010d4574bebf373f25f6c1e833b4e914f510e2fb3eabdbe1155c8b7d2cfeb93fd59c73fd3ad5b47c7b54e00ffaffa9ea84cf33fa5a6ee69
diff --git a/dev-python/setuptools/setuptools-65.2.0.ebuild b/dev-python/setuptools/setuptools-65.2.0.ebuild
new file mode 100644
index 000000000000..7460575c4f20
--- /dev/null
+++ b/dev-python/setuptools/setuptools-65.2.0.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
+EAPI=7
+
+# please bump dev-python/ensurepip-setuptools along with this package!
+
+DISTUTILS_USE_PEP517=standalone
+PYTHON_TESTED=( python3_{7,8,9,10} pypy3 )
+PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="
+	https://github.com/pypa/setuptools/
+	https://pypi.org/project/setuptools/
+"
+SRC_URI="
+	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/appdirs-1.4.4-r2[${PYTHON_USEDEP}]
+	>=dev-python/jaraco-text-3.7.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/more-itertools-8.12.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/nspektr-0.3.0[${PYTHON_USEDEP}]
+	>=dev-python/ordered-set-4.0.2-r1[${PYTHON_USEDEP}]
+	>=dev-python/packaging-21.3-r2[${PYTHON_USEDEP}]
+	>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-4.11.1[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_resources-5.4.0-r3[${PYTHON_USEDEP}]
+	' 3.8)
+"
+BDEPEND="
+	${RDEPEND}
+	>=dev-python/wheel-0.37.1-r1[${PYTHON_USEDEP}]
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/build[${PYTHON_USEDEP}]
+			>=dev-python/ini2toml-0.9[${PYTHON_USEDEP}]
+			>=dev-python/filelock-3.4.0[${PYTHON_USEDEP}]
+			>=dev-python/jaraco-envs-2.2[${PYTHON_USEDEP}]
+			>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/pip[${PYTHON_USEDEP}]
+			dev-python/pip-run[${PYTHON_USEDEP}]
+			dev-python/pytest[${PYTHON_USEDEP}]
+			dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
+			dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
+			dev-python/pytest-xdist[${PYTHON_USEDEP}]
+			>=dev-python/tomli-w-1.0.0[${PYTHON_USEDEP}]
+			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
+			dev-python/wheel[${PYTHON_USEDEP}]
+		' "${PYTHON_TESTED[@]}")
+	)
+"
+PDEPEND="
+	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+
+DOCS=( {CHANGES,README}.rst )
+
+src_prepare() {
+	local PATCHES=(
+		# TODO: remove this when we're 100% PEP517 mode
+		"${FILESDIR}"/setuptools-62.4.0-py-compile.patch
+	)
+
+	# remove bundled dependencies, setuptools will switch to system deps
+	# automatically
+	rm -r */_vendor || die
+
+	# remove the ugly */extern hack that breaks on unvendored deps
+	rm -r */extern || die
+	find -name '*.py' -exec sed \
+		-e 's:from \w*[.]\+extern ::' -e 's:\w*[.]\+extern[.]::' \
+		-i {} + || die
+
+	distutils-r1_src_prepare
+
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
+
+python_test() {
+	local -x SETUPTOOLS_USE_DISTUTILS=stdlib
+
+	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
+		return
+	fi
+
+	local EPYTEST_DESELECT=(
+		# network
+		# TODO: see if PRE_BUILT_SETUPTOOLS_* helps
+		setuptools/tests/config/test_apply_pyprojecttoml.py::test_apply_pyproject_equivalent_to_setupcfg
+		setuptools/tests/integration/test_pip_install_sdist.py::test_install_sdist
+		setuptools/tests/test_build_meta.py::test_legacy_editable_install
+		setuptools/tests/test_distutils_adoption.py
+		setuptools/tests/test_editable_install.py
+		setuptools/tests/test_setuptools.py::test_its_own_wheel_does_not_contain_tests
+		setuptools/tests/test_virtualenv.py::test_clean_env_install
+		setuptools/tests/test_virtualenv.py::test_no_missing_dependencies
+		setuptools/tests/test_virtualenv.py::test_test_command_install_requirements
+		# TODO
+		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_basic
+		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_ignore_errors
+		setuptools/tests/test_extern.py::test_distribution_picklable
+		# expects bundled deps in virtualenv
+		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_in_sdist
+		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_not_in_wheel
+		setuptools/tests/test_editable_install.py::test_editable_with_pyproject
+	)
+
+	epytest -n "$(makeopts_jobs)" setuptools
+}
diff --git a/dev-python/signedjson/signedjson-1.1.4.ebuild b/dev-python/signedjson/signedjson-1.1.4.ebuild
index 36ea8a05deae..a66ae43573c2 100644
--- a/dev-python/signedjson/signedjson-1.1.4.ebuild
+++ b/dev-python/signedjson/signedjson-1.1.4.ebuild
@@ -10,8 +10,8 @@ inherit distutils-r1
 
 DESCRIPTION="Signs JSON objects with ED25519 signatures."
 HOMEPAGE="
-	https://github.com/matrix-org/python-signedjson
-	https://pypi.python.org/pypi/signedjson
+	https://github.com/matrix-org/python-signedjson/
+	https://pypi.org/project/signedjson/
 "
 SRC_URI="https://github.com/matrix-org/python-signedjson/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
 
diff --git a/dev-python/trimesh/Manifest b/dev-python/trimesh/Manifest
index a078037feb26..778727c94027 100644
--- a/dev-python/trimesh/Manifest
+++ b/dev-python/trimesh/Manifest
@@ -3,3 +3,4 @@ DIST trimesh-3.13.0.gh.tar.gz 10803906 BLAKE2B aa99ecec3d108ca7a7c96183ff354f930
 DIST trimesh-3.13.1.gh.tar.gz 10803494 BLAKE2B 73d1f9c7a7610310155e9dd714cdb7dd27b7319b7fa54f092dad7e380484b5c650c4b9aa74235621599ef182043493e56b8ce90f02483a2ba75238fe84bd0c42 SHA512 eca0c6bb2866b2e52c9c92b238f303a0ecbe9e40b7e2109b9a5e714a3d2791bd4fdfb26f06c8e18b8815661d198018e37877f19b2b009efd022080ef87f9b679
 DIST trimesh-3.13.4.gh.tar.gz 10804452 BLAKE2B 26b2f82d64114b610e97e0e937a821bf1ef6809f702ee1de908a756b7a18e7dceee75b1bdb49b831952b1753f63cc5735201deb5ba709709ab58e43ffd8ed175 SHA512 4f56dd63cfafb59941fcd3d9955de7b5ef2dab1f0d961d91aed37295f4aaa37ad3a427a39fa2366a85ea407bc12bc8b8980b1da563f46480b653422632bab911
 DIST trimesh-3.13.5.gh.tar.gz 11961925 BLAKE2B 8a4b069f2df49c9ca6121cd3ea446f959a4d5df16b2eafca039b7bc55f04830e054a1c03e012e25594ccda415fedf26b0ab3ae1dbe5e5d1b019bf9e899703169 SHA512 dd4bd7051d48f382ec3e96e55156a6d4cc554a097133d8deb033b9fbcf6f50cf446539484c2a0858243728bc3a7bb6973876919d900a7deb2ff1a6bd11dc397c
+DIST trimesh-3.14.0.gh.tar.gz 11962245 BLAKE2B 56ae1d987f43b6945191c80be6ac0a47cad51de370b4d4033baeec69b0aafa54ce4282e622d7f29a4906efde5ce7af2b13b8567b98a519eab8edf791de90f355 SHA512 495f90fe37bbeb339b7db4dbd366bac126a43e956ec18ec77c9ee697e7d8155f0c048f8e5280230684cb602b26a4be1be1e74335db94f4272b50816ab937e2ca
diff --git a/dev-python/trimesh/trimesh-3.14.0.ebuild b/dev-python/trimesh/trimesh-3.14.0.ebuild
new file mode 100644
index 000000000000..8a53861b3711
--- /dev/null
+++ b/dev-python/trimesh/trimesh-3.14.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1 multiprocessing optfeature
+
+DESCRIPTION="Python library for loading and using triangular meshes"
+HOMEPAGE="
+	https://trimsh.org/
+	https://github.com/mikedh/trimesh/
+	https://pypi.org/project/trimesh/
+"
+SRC_URI="
+	https://github.com/mikedh/${PN}/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/colorlog[${PYTHON_USEDEP}]
+	dev-python/jsonschema[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/msgpack[${PYTHON_USEDEP}]
+	dev-python/networkx[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pycollada[${PYTHON_USEDEP}]
+	dev-python/pyglet[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/shapely-1.8.2[${PYTHON_USEDEP}]
+	dev-python/svg-path[${PYTHON_USEDEP}]
+	dev-python/sympy[${PYTHON_USEDEP}]
+	dev-python/xxhash[${PYTHON_USEDEP}]
+	sci-libs/rtree[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest -n "$(makeopts_jobs)"
+}
+
+pkg_postinst() {
+	optfeature_header "${PN} functionality can be extended by installing the following packages:"
+	optfeature "making GUI applications with 3D stuff" dev-python/glooey
+	optfeature "2D triangulations of polygons" dev-python/mapbox_earcut
+	optfeature "loading a number of additional mesh formats" dev-python/meshio
+	optfeature "figuring out how much memory we have" dev-python/psutil
+	optfeature "marching cubes and other nice stuff" sci-libs/scikit-image
+}
diff --git a/dev-python/unpaddedbase64/unpaddedbase64-2.1.0.ebuild b/dev-python/unpaddedbase64/unpaddedbase64-2.1.0.ebuild
index cb1401cce5dc..ec4bb98d37e6 100644
--- a/dev-python/unpaddedbase64/unpaddedbase64-2.1.0.ebuild
+++ b/dev-python/unpaddedbase64/unpaddedbase64-2.1.0.ebuild
@@ -10,8 +10,8 @@ inherit distutils-r1
 
 DESCRIPTION="Unpadded Base64"
 HOMEPAGE="
-	https://github.com/matrix-org/python-unpaddedbase64
-	https://pypi.python.org/pypi/unpaddedbase64
+	https://github.com/matrix-org/python-unpaddedbase64/
+	https://pypi.org/project/unpaddedbase64/
 "
 SRC_URI="https://github.com/matrix-org/python-unpaddedbase64/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"