Adding metadata

24 files changed, 347 insertions, 235 deletions

diff --git a/dev-python/autopage/Manifest b/dev-python/autopage/Manifest
index 8163c311fb1e..2a824204357c 100644
--- a/dev-python/autopage/Manifest
+++ b/dev-python/autopage/Manifest
@@ -1 +1,2 @@
 DIST autopage-0.4.0.gh.tar.gz 14809 BLAKE2B 8b91d76c04f3b6519fe2660cbebb50c9b767346b6313303b757b04bea8e7eb8a48aaeaabe364b1b18cadbd5125c95f77b187f779ef83c913e8db13ca88284311 SHA512 a7573dc5d62559f06b54b4b40ffa916209ab7c3348ac7b0cb20ae840fe841e8f8efab1c1853196b4cad0ce5fbc52b679e651f76f7023af960dd8cc876a6d1f14
+DIST autopage-0.5.0.gh.tar.gz 21403 BLAKE2B 1c20123bd7ac9dcfc53d5531ea5cec5dcb2d4b8f4c433ab958b96b769540084989ee841f963d24d1b01c3c4deed9933ab213e3838a898a8fc3261096a272d83d SHA512 b40bf0c432a8ecf82f56cf9679191bf13e5fbf478f1236d197df05e29ac27a1d33bffbf3f66fedbf93548e7314ee1a8f1687fa7c696b35f944f8f5dfd2b2dd19
diff --git a/dev-python/autopage/autopage-0.5.0.ebuild b/dev-python/autopage/autopage-0.5.0.ebuild
new file mode 100644
index 000000000000..455b59fdbbf6
--- /dev/null
+++ b/dev-python/autopage/autopage-0.5.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="A library to provide automatic paging for console output"
+HOMEPAGE="
+	https://pypi.org/project/autopage/
+	https://github.com/zaneb/autopage/"
+SRC_URI="
+	https://github.com/zaneb/autopage/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~s390 ~sparc ~x86"
+
+BDEPEND="
+	test? ( dev-python/fixtures[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests unittest
+
+python_test() {
+	unset LESS PAGER
+	eunittest
+}
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 6aaa9ec4a538..ec8df2395a9b 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -2,3 +2,4 @@ DIST boto3-1.20.23.tar.gz 456315 BLAKE2B 9f74a1822c631fdcc666db1d2cda5ab464b150c
 DIST boto3-1.20.31.tar.gz 458553 BLAKE2B 396acd8bbc47f76a0ba65da4b83f141f253690370f6cd36fcfad8b4ba1017889bb2c4c63bbcc8e3f817307cca666593072becde30b5739f38386f764a9f2c876 SHA512 0772959c735a6002431f171b6476398a1e1096301c20b5429504ed9a9bd6e3a2b6e95392504b3ea49ef942ab6c5210a0d26a0cdde6be52bb88d642ce776576b9
 DIST boto3-1.20.37.tar.gz 461197 BLAKE2B 4ae94815809401378bbd6c6b7774776c62436c3ae379be44b045105d00ffdebc6cfba1112ed6d4693662c6a00b5de53b4fcd1ea605a93cccb1406f3f983d8c9a SHA512 368abbe51e814b5a8080323f436d8e0b5ea660b31abd77a49299afd6363c3d10e51883a3237f06799be53472c3e24c76f5ba3ece8cc9721b87fe3fb40ad8911f
 DIST boto3-1.20.40.tar.gz 462565 BLAKE2B bd540636392678e83112e85cb6c078d657196a46ddabaa00bdd66d00d7d0aeabe525e8639bf35fa88b039226372bfa5385ea2e1eaea790ebee7f4732d2cdfae4 SHA512 5b28a2de946942c3bb68b1d073a2567bb3cbce9732f3f620ef41c4ffab7c7d6aa4f68ec1e5357f930819f3948d50ed3a58f0176206946a5eaaa42c096fd1e020
+DIST boto3-1.20.41.tar.gz 463009 BLAKE2B c60443611023dd03ddcd1cc5ca951d2efdf02c221c673a01fc056788d9ef7d1704a37c006c1706c012d11219cb6c75203518796155aa3ef144154a8a86d6620a SHA512 7bec4a384c42b238bd3f6b0f58884fab357edae2ab985142b76f6b906323c0f02568046c9bbb229bb040de336ea2cbf25fa5441cd09e7c56c94f9e7de2abc763
diff --git a/dev-python/boto3/boto3-1.20.41.ebuild b/dev-python/boto3/boto3-1.20.41.ebuild
new file mode 100644
index 000000000000..ed44d35fedd6
--- /dev/null
+++ b/dev-python/boto3/boto3-1.20.41.ebuild
@@ -0,0 +1,60 @@
+# 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_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+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}
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index a32226c9e510..11354302914b 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -2,3 +2,4 @@ DIST botocore-1.23.23.tar.gz 8679727 BLAKE2B 89e54120caec616ffb539ef9df93923d951
 DIST botocore-1.23.31.tar.gz 8706949 BLAKE2B 2e31bc09173a93806fe045e5217defcf17b624d6e9ff543add0eb9183c99faac40c14a8b7d71a2ec71b5983df572cadd2d098155c8c9f5abeceef80c17c4c35b SHA512 7440740c05b8f009955b6627b82f8f955d907d529923457b19f1a251b701fc7cba2dd19a77eee1fce220745d93f19f4c42f146772ecd46f3ea0c93f63047086e
 DIST botocore-1.23.37.tar.gz 8728451 BLAKE2B 039352d4c727433cc5aef435cd7527fa3bc6027c3db8b2a27219d4cab8f602f74995b09e5407c1df1c7a51e37830db7e8f351484485f6b822499933c35607472 SHA512 79004d38fbfc744d2fd91364a1cc99d8be1f2d03f25f2ba77df0da4b4d429a156ac5d52ca523ee4992ff99ac83b7a14e7f49e3b12b9b6f91e164fb720c41e10d
 DIST botocore-1.23.40.tar.gz 8730992 BLAKE2B 855742e6661e497c10cee6becbc9fc5eae39b1525b11008ecc27e35126d3c2ab9ce68d5d260a974d8359eeb056dad0d79dd866b6097458989989b6ae9924e49f SHA512 cbed5c316e3976594930ae1c274fdac9e25289c9818bc515e5a27c620431b05c010736f8e94d90fb935e22e5a1c50dbd4708c7674ef6e697c35475f8757df63d
+DIST botocore-1.23.41.tar.gz 8732416 BLAKE2B 2d1a3284521a608db2dbfdbb8c98fb3bd01e048fb3b4a34e3dc497b6476bcbf8cd37ea9273ae3d3b09a9356aca8d1063dafdf15ae9c7ab59bbf3cc841bcc7a24 SHA512 d3d12df8faced36a9c7a75fd01d63986cb12d56a259f31211c32cbf0f1eceb1d6708e90f6a6a43189e37b86e01ceef68fcd5dcbd1867c571ca3630cbcc7e94f5
diff --git a/dev-python/botocore/botocore-1.23.41.ebuild b/dev-python/botocore/botocore-1.23.41.ebuild
new file mode 100644
index 000000000000..c44cf37adbf0
--- /dev/null
+++ b/dev-python/botocore/botocore-1.23.41.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_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+	)
+
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/dulwich/Manifest b/dev-python/dulwich/Manifest
index ddf7caba261a..90d6d04db8a8 100644
--- a/dev-python/dulwich/Manifest
+++ b/dev-python/dulwich/Manifest
@@ -2,3 +2,4 @@ DIST dulwich-0.20.23.tar.gz 414150 BLAKE2B 0f7bfb237acc6bad874465a5bfed21adc29a2
 DIST dulwich-0.20.27.tar.gz 416618 BLAKE2B 73ed04d9fc871a82126e212bdac0eaf235e44aa76f3e54c98bd50f71379fdd3082b2a3af12a22f3276a45909ef17e38a116deb6adfd650cdbfa19afa41803dd1 SHA512 dc82250c5b3cbccc1ccbb55ca2d871f4d17ddb3616cd92146468fc5f0d805d3fe349b2cedfb4e814e027c07f9352e87c72ca7e97ed6218aa621fa9311dc075c5
 DIST dulwich-0.20.28.tar.gz 416723 BLAKE2B ddbb36c65e1372e1c2fbab5d85ef26a77f40e4763eee8dc5d2ba249a6b4e37bd6e38197eaebbcb46f16df577c0ff4730ec69fff39a549adf2e5d147e7a3eabfc SHA512 5eb90dd888909f787ef5e9f0a79d7db9a31c5897e334a862c1d0593c4f115ff30047f108c7b315e0145e267f581ba0f4fd0fafb7b1b2316d3def4f70697f2e20
 DIST dulwich-0.20.30.tar.gz 417219 BLAKE2B 6b5b10a37f2901424b632dad081b9972da5af7475e11389c73f8a64a57ebf421700c6591bfddc5418b9c02d61916894aeeb2371a3ceb514532fd1b9e63dffb2c SHA512 1dd18c047e8bfe9f23a10c0c55b57be7b4d89d93af4a682265dac3bf495d1594057ed755e7caad926100d35e3603006377163dc6ae71bc51a500c744064f8bbc
+DIST dulwich-0.20.31.tar.gz 418063 BLAKE2B 7b914ce6509227b48fc716ed4ecabfead8b95fa17661564b3dc6b9abedb2c444d026d1261de9bb7195a14f5ffea9dfcb3103f32784f07731d2101a7c60f1abda SHA512 1f181aa62493fc8cdb2a18183f0aa2f5bb0963c1739423fc6790080bcec9d10368689934bfe8828b502bbe319ade4846428f3c4262666be01ccbce55a8803efa
diff --git a/dev-python/dulwich/dulwich-0.20.31.ebuild b/dev-python/dulwich/dulwich-0.20.31.ebuild
new file mode 100644
index 000000000000..9e83dc2b9fb6
--- /dev/null
+++ b/dev-python/dulwich/dulwich-0.20.31.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="Pure-Python implementation of the Git file formats and protocols"
+HOMEPAGE="
+	https://github.com/dulwich/dulwich/
+	https://pypi.org/project/dulwich/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+ Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc examples test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/certifi[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		!hppa? ( !ia64? (
+			dev-python/gevent[${PYTHON_USEDEP}]
+			dev-python/geventhttpclient[${PYTHON_USEDEP}]
+		) )
+		app-crypt/gpgme[python,${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/fastimport[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_sphinx docs
+
+python_test() {
+	# remove interference from the tests that do stuff like user.name
+	unset GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE \
+		GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL GIT_COMMITTER_DATE EMAIL
+	# Do not use make check which rebuilds the extension and uses -Werror,
+	# causing unexpected failures.
+	"${EPYTHON}" -m unittest -v dulwich.tests.test_suite \
+		|| die "tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		dodoc -r examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/httpx/httpx-0.21.3.ebuild b/dev-python/httpx/httpx-0.21.3.ebuild
index 718c800a96d1..c317b2fb4603 100644
--- a/dev-python/httpx/httpx-0.21.3.ebuild
+++ b/dev-python/httpx/httpx-0.21.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ppc ~ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
 IUSE="cli"
 
 RDEPEND="
diff --git a/dev-python/jc/Manifest b/dev-python/jc/Manifest
index 7b7f65fad181..23c92708fc5c 100644
--- a/dev-python/jc/Manifest
+++ b/dev-python/jc/Manifest
@@ -1,6 +1,2 @@
-DIST jc-1.16.0.tar.gz 2532019 BLAKE2B 583d52102a2e27a53171d300fb6e9ac094d5b09496193b359590322cab0f63582d14e0d27aacdd4f87e179cff1b0ffe0efc5bfc1982e64a7d053cf6210c2ed2a SHA512 a75c411d3f961061262b577e7a6611759f01df508e7d12e09cb364736dca343a098f9cbe4b2552ab2bd56fed925e7c11ba1f954808a11453380ba0ba0c32130b
-DIST jc-1.17.3.tar.gz 3814789 BLAKE2B 09134b85c881b2701d7db68f0a16eb6f696aeb5e4fa8b6a0b1aff148adbad302fcc9019944acc45b5830966f0ffae90ff4c006895d559ca47595347442e72a5c SHA512 6cc36abcb9d57eb95b36968647a0923f3d6d39aed478df83e9d4437b0ea4aba49a5f08d9f61ba88f3a76ce3b57c2e019e7cec5b89e71ce7be8186e9e18ab4ad7
-DIST jc-1.17.4.tar.gz 3818285 BLAKE2B 0761e923916c61125967451f3b4806e3080184106c84e2c85f5de8b37d03106bde98d1b4d99f4d00308b7d935898e81cd5c7d112ed611dd4707074019becc968 SHA512 b5fc437be425d60c5e859ed9107be8a3190bc5e1eb157b01cd3b4cdcf27ccab51b6d0299f0c462b1e595d741bf905c11b25d49568159f04aa4443f51889027b6
-DIST jc-1.17.5.tar.gz 3851890 BLAKE2B 86b6c1b9786bbe30138cb7ba5171fd14682b420c3ff11716ab5d1bd4e4cc3d95067ca836c6217040799607933037b3cd6dc49e6395831140c10906e8be530685 SHA512 6e7207af158be41cf55ac7f9400c1a676075e85de0fecd63d9ddcffeed5d903a9619ac52b955d10e0db354f97e73fb9766b96e51c5648104907426000ecd1594
-DIST jc-1.17.6.tar.gz 3876556 BLAKE2B 97f84a6d1351102bc016e104c4f6d5aa8a7a47fa5ecbdad66df75253adee323259961d555d728b11090df9a05d74dfae0720655f8ea21864479b7e59f95dffa7 SHA512 a70dd9dc79a99c147aca8e647722820ba69f7668415eeea24be336e2c14728808938fa2d9e19122849ad0c1d89684f08d1ff0dc6361137eb9fbacba6546857ca
 DIST jc-1.17.7.tar.gz 3922848 BLAKE2B e075e5e2c7bd06d7c4310a2cb94b1ddd55014d9d8a920c100fcba01735188a7a9ed221224cc73e62efab02a9feb8d1f208a30964e41111063f1147299f098ce6 SHA512 be565377f3f776b387e4a8ff6bc07ac39c93bcf1a21e71cf96dd3474f459e07f050fd30b0b9281331a39c361155463b63c5a61f4271885126406029b5f9546a0
+DIST jc-1.18.1.tar.gz 3927394 BLAKE2B f87744e2cfdda10e6d2b1ea021f304e533ab1838de37f09b534e8ed1cf522d6267c96ac22d9ab665fdd593d27adcfa6da34f2f2471bae783585745882796ff8d SHA512 00fb9bfd2ebf9419c866ed56113310f3917e5dbbe538b0d48f5e66979773108f430168186fb350ed9494344f1ceb80e0bcef51344994b78e852b5c6305e9c474
diff --git a/dev-python/jc/jc-1.16.0.ebuild b/dev-python/jc/jc-1.16.0.ebuild
deleted file mode 100644
index 091f58eee777..000000000000
--- a/dev-python/jc/jc-1.16.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Converts the output of popular command-line tools and file-types to JSON"
-HOMEPAGE="https://github.com/kellyjonbrazil/jc"
-SRC_URI="
-	https://github.com/kellyjonbrazil/jc/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	dev-python/xmltodict[${PYTHON_USEDEP}]"
-
-distutils_enable_tests unittest
diff --git a/dev-python/jc/jc-1.17.3.ebuild b/dev-python/jc/jc-1.17.3.ebuild
deleted file mode 100644
index 091f58eee777..000000000000
--- a/dev-python/jc/jc-1.17.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Converts the output of popular command-line tools and file-types to JSON"
-HOMEPAGE="https://github.com/kellyjonbrazil/jc"
-SRC_URI="
-	https://github.com/kellyjonbrazil/jc/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	dev-python/xmltodict[${PYTHON_USEDEP}]"
-
-distutils_enable_tests unittest
diff --git a/dev-python/jc/jc-1.17.4.ebuild b/dev-python/jc/jc-1.17.4.ebuild
deleted file mode 100644
index 091f58eee777..000000000000
--- a/dev-python/jc/jc-1.17.4.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Converts the output of popular command-line tools and file-types to JSON"
-HOMEPAGE="https://github.com/kellyjonbrazil/jc"
-SRC_URI="
-	https://github.com/kellyjonbrazil/jc/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	dev-python/xmltodict[${PYTHON_USEDEP}]"
-
-distutils_enable_tests unittest
diff --git a/dev-python/jc/jc-1.17.5.ebuild b/dev-python/jc/jc-1.17.5.ebuild
deleted file mode 100644
index 091f58eee777..000000000000
--- a/dev-python/jc/jc-1.17.5.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Converts the output of popular command-line tools and file-types to JSON"
-HOMEPAGE="https://github.com/kellyjonbrazil/jc"
-SRC_URI="
-	https://github.com/kellyjonbrazil/jc/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	dev-python/xmltodict[${PYTHON_USEDEP}]"
-
-distutils_enable_tests unittest
diff --git a/dev-python/jc/jc-1.17.6.ebuild b/dev-python/jc/jc-1.18.1.ebuild
index 76ac2b8ddd0c..f12bb57be860 100644
--- a/dev-python/jc/jc-1.17.6.ebuild
+++ b/dev-python/jc/jc-1.18.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ppc64"
 
 RDEPEND="dev-python/pygments[${PYTHON_USEDEP}]
 	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
diff --git a/dev-python/jsonschema/Manifest b/dev-python/jsonschema/Manifest
index 2da6195da3f1..922228fe4ff7 100644
--- a/dev-python/jsonschema/Manifest
+++ b/dev-python/jsonschema/Manifest
@@ -1,3 +1,2 @@
-DIST jsonschema-3.2.0.tar.gz 167226 BLAKE2B f89a8198f6b7b4dd56b0320ddecdd834423cbeaf49fbbd1563007da61004322b92e25856ecc17b4d02e2162b2359ec5d7601826fe42cfcb7683ae16cf2baeb39 SHA512 acbb4cec730a8cdab9f070593ed896064fbe082d464ec362adc952e4985e9eaa12ad0f2d55a04018ffdaf675e54037999a7219533dad6b84bf609f5dfe21bbab
 DIST jsonschema-4.3.3.tar.gz 311720 BLAKE2B 685e7712bdf87f0b6cfdc0ca6b094c90efd78acec72a6233661caddbba52e55ab78af83a24b14b9580a9eed6179302208b35ca836dce36459db65f0017805142 SHA512 f2a9e4d89a12d5d1c53666a9c95bc29adf2559438f0ab11f34abaf3f2525f525cd742ae54f2d3a732d98db92c4f45fc7611ffbc61f2ac1121377066a86db3bf9
 DIST jsonschema-4.4.0.tar.gz 313519 BLAKE2B 6339c4ac9e99b55e41c133861baacb6644e04d15e915d3199955512530c946973ca6d5348746688660ea7392d53102754dba3f3380fc8aa3a4ab284a9dcde684 SHA512 8e5c138f4debf7540e2cd131f3f208d1778927ac9036f5fa67bcf5db8c62fe1bb454c7818ee61acef64e856ea4b498ef6ab08be314a3c6b1e461e0bb44db41c7
diff --git a/dev-python/jsonschema/files/jsonschema-3.2.0-add-webcolors-1.11-compat.patch b/dev-python/jsonschema/files/jsonschema-3.2.0-add-webcolors-1.11-compat.patch
deleted file mode 100644
index bfb4fa8d139b..000000000000
--- a/dev-python/jsonschema/files/jsonschema-3.2.0-add-webcolors-1.11-compat.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 09595a50f507399bf3fa8c68ed6371c42b9c4874 Mon Sep 17 00:00:00 2001
-From: Julian Berman <Julian@GrayVines.com>
-Date: Fri, 21 Feb 2020 09:30:05 -0500
-Subject: [PATCH 1/2] Newer webcolors has a new API apparently.
-
----
- jsonschema/_format.py | 2 +-
- setup.cfg             | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/jsonschema/_format.py b/jsonschema/_format.py
-index 281a7cf..f3c758c 100644
---- a/jsonschema/_format.py
-+++ b/jsonschema/_format.py
-@@ -354,7 +354,7 @@ else:
-     def is_css21_color(instance):
-         if (
-             not isinstance(instance, str_types) or
--            instance.lower() in webcolors.css21_names_to_hex
-+            instance.lower() in webcolors.CSS21_NAMES_TO_HEX
-         ):
-             return True
-         return is_css_color_code(instance)
--- 
-2.24.1
-
-From 0d192e192526252c30c16b3651c293bb5f21a99f Mon Sep 17 00:00:00 2001
-From: Julian Berman <Julian@GrayVines.com>
-Date: Fri, 21 Feb 2020 09:56:13 -0500
-Subject: [PATCH 2/2] Sigh... but also drops Py2 compat.
-
----
- jsonschema/_format.py | 11 ++++++++---
- setup.cfg             |  4 ++--
- 2 files changed, 10 insertions(+), 5 deletions(-)
-
-diff --git a/jsonschema/_format.py b/jsonschema/_format.py
-index f3c758c..b96efb6 100644
---- a/jsonschema/_format.py
-+++ b/jsonschema/_format.py
-@@ -342,10 +342,15 @@ def is_draft3_time(instance):
-     return datetime.datetime.strptime(instance, "%H:%M:%S")
- 
- 
--try:
-+try:  # webcolors>=1.11
-+    from webcolors import CSS21_NAMES_TO_HEX
-     import webcolors
- except ImportError:
--    pass
-+    try:  # webcolors<1.11
-+        from webcolors import css21_names_to_hex as CSS21_NAMES_TO_HEX
-+        import webcolors
-+    except ImportError:
-+        pass
- else:
-     def is_css_color_code(instance):
-         return webcolors.normalize_hex(instance)
-@@ -354,7 +359,7 @@ else:
-     def is_css21_color(instance):
-         if (
-             not isinstance(instance, str_types) or
--            instance.lower() in webcolors.CSS21_NAMES_TO_HEX
-+            instance.lower() in CSS21_NAMES_TO_HEX
-         ):
-             return True
-         return is_css_color_code(instance)
--- 
-2.24.1
-
diff --git a/dev-python/jsonschema/jsonschema-3.2.0-r1.ebuild b/dev-python/jsonschema/jsonschema-3.2.0-r1.ebuild
deleted file mode 100644
index 1d722807c4d1..000000000000
--- a/dev-python/jsonschema/jsonschema-3.2.0-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="An implementation of JSON-Schema validation for Python"
-HOMEPAGE="https://pypi.org/project/jsonschema/ https://github.com/Julian/jsonschema"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
-	dev-python/attrs[${PYTHON_USEDEP}]
-	dev-python/pyrsistent[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	test? ( dev-python/twisted[${PYTHON_USEDEP}] )
-"
-
-RDEPEND="${BDEPEND}
-	dev-python/idna[${PYTHON_USEDEP}]
-	>=dev-python/jsonpointer-1.13[${PYTHON_USEDEP}]
-	dev-python/rfc3987[${PYTHON_USEDEP}]
-	dev-python/strict-rfc3339[${PYTHON_USEDEP}]
-	dev-python/webcolors[${PYTHON_USEDEP}]
-	dev-python/rfc3986-validator[${PYTHON_USEDEP}]
-	dev-python/rfc3339-validator[${PYTHON_USEDEP}]
-"
-
-BDEPEND+="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-add-webcolors-1.11-compat.patch
-)
-
-distutils_enable_tests unittest
diff --git a/dev-python/moto/Manifest b/dev-python/moto/Manifest
index 41bf0f47ca8f..eb8231897044 100644
--- a/dev-python/moto/Manifest
+++ b/dev-python/moto/Manifest
@@ -9,3 +9,4 @@ DIST moto-2.2.19.tar.gz 2083677 BLAKE2B e8471c4acccd213a80b4636a1da2a404f1ea2c10
 DIST moto-2.2.20.tar.gz 2077649 BLAKE2B 595d9536b21ba442fcf0b9b40e61cc9d3105e220661f67d842cd5e9660ed4ff561e0ea742083e167ef11312b762b204e82381550845a06d6b5a694793adc0c67 SHA512 ac853989ec4822a72139ed62f7bc8b01a91ef2a424b4e622fd0cc6828b3dd21d3a433ba8d50cda5e5b4c03859653d71f9431b7ce2416255be3cf129b1a02e200
 DIST moto-2.3.1.tar.gz 2088810 BLAKE2B 9e1b50bec4e0a7a0bb7496fe90e8caf0b80900e35120aae931e99e0e251bd4905c7bfed670a78d230abd987d3400f93fbbaf0bcdece9d6b5e35c4b63916e72c3 SHA512 122311e549b034b0a45a1cbfbc4fd96e0c846272d460c72279a7991b967720e1732662e623acf6a5f1cbaf874f5755bcfa9dfbf8a0ac31da780de44d42e6f1be
 DIST moto-2.3.2.tar.gz 2095242 BLAKE2B 17b98e09c410e48cac60ca494d6d0a6264657e8df994c0395be15b072dbc998a59b25d017b2897cd2e05429959baa427358b4f11cc3b7a517f4f4ddb88d2f2c5 SHA512 f58b9cf3f0a88964776fc92e4982408f0826a2d0149cc84cc21752030d8c9d3de3ea1a07cb529ea4d77b0d2a5ac5222a6ec24f6b88e9d7d70cc82257b883bd10
+DIST moto-3.0.0.tar.gz 2012729 BLAKE2B a1f53301c08d4ca0df55e1b4233a63a2bfe011b47ac6be992714e3f57f7e4cc50aca72917ff4132001c10870bbe08c0ca32e2b48e5d676f670345478ca846aed SHA512 e5238fb5e720f91999d4f0473d9833a3e1de3632401ee647858afc4e33a46981e866a51b353d1c21b92926da7267a5ba74ef667364ae99b09efd4f12d334e03e
diff --git a/dev-python/moto/moto-3.0.0.ebuild b/dev-python/moto/moto-3.0.0.ebuild
new file mode 100644
index 000000000000..d598806fc275
--- /dev/null
+++ b/dev-python/moto/moto-3.0.0.ebuild
@@ -0,0 +1,84 @@
+# 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_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="Mock library for boto"
+HOMEPAGE="https://github.com/spulec/moto"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/backports-tempfile[${PYTHON_USEDEP}]' python3_{6,7})
+	dev-python/boto[${PYTHON_USEDEP}]
+	dev-python/cfn-lint[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
+	dev-python/cookies[${PYTHON_USEDEP}]
+	>=dev-python/docker-py-2.5.1[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
+	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
+	dev-python/boto3[${PYTHON_USEDEP}]
+	dev-python/botocore[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/flask-cors[${PYTHON_USEDEP}]
+	dev-python/more-itertools[${PYTHON_USEDEP}]
+	dev-python/pretty-yaml[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/python-jose[${PYTHON_USEDEP}]
+	dev-python/python-sshpubkeys[${PYTHON_USEDEP}]
+	>=dev-python/responses-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.5[${PYTHON_USEDEP}]
+	dev-python/xmltodict[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+	dev-python/zipp[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		>=dev-python/sure-1.4.11[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO
+		tests/test_firehose/test_firehose_put.py::test_put_record_http_destination
+		tests/test_firehose/test_firehose_put.py::test_put_record_batch_http_destination
+		tests/test_sqs/test_sqs_cloudformation.py::test_describe_stack_subresources
+		tests/test_swf/responses/test_decision_tasks.py::test_respond_decision_task_completed_with_schedule_activity_task_boto3
+		tests/test_swf/responses/test_timeouts.py::test_activity_task_heartbeat_timeout_boto3
+		tests/test_swf/responses/test_timeouts.py::test_decision_task_start_to_close_timeout_boto3
+		tests/test_swf/responses/test_timeouts.py::test_workflow_execution_start_to_close_timeout_boto3
+		# broken code (local variable used referenced before definition)
+		tests/test_appsync/test_appsync_schema.py
+		# Needs network (or docker?) but not marked as such, bug #807031
+		# TODO: report upstream
+		tests/test_batch/test_batch_jobs.py::test_terminate_job
+		tests/test_batch/test_batch_jobs.py::test_cancel_running_job
+		tests/test_batch/test_batch_jobs.py::test_dependencies
+		tests/test_batch/test_batch_jobs.py::test_container_overrides
+		tests/test_cloudformation/test_cloudformation_custom_resources.py::test_create_custom_lambda_resource__verify_cfnresponse_failed
+		tests/test_cloudformation/test_cloudformation_stack_integration.py::test_lambda_function
+		tests/test_sqs/test_integration.py::test_invoke_function_from_sqs_exception
+		tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_exception
+	)
+
+	# pytest-django causes freezegun try to mangle stuff inside django
+	# which fails when django is not really used
+	epytest -p no:django -m 'not network'
+}
diff --git a/dev-python/rich/rich-10.16.2.ebuild b/dev-python/rich/rich-10.16.2.ebuild
index c38c3c064f06..17efd326fe8c 100644
--- a/dev-python/rich/rich-10.16.2.ebuild
+++ b/dev-python/rich/rich-10.16.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/willmcgugan/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ppc ~ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	dev-python/colorama[${PYTHON_USEDEP}]
diff --git a/dev-python/vpython/vpython-7.6.3.ebuild b/dev-python/vpython/vpython-7.6.3.ebuild
index 901ac8b625dc..ae65bdf9fab7 100644
--- a/dev-python/vpython/vpython-7.6.3.ebuild
+++ b/dev-python/vpython/vpython-7.6.3.ebuild
@@ -12,6 +12,10 @@ HOMEPAGE="https://www.vpython.org/ https://pypi.org/project/vpython/"
 SRC_URI="https://github.com/${PN}/${PN}-jupyter/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/${PN}-jupyter-${PV}"
 
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
 RDEPEND="
 	>=dev-python/autobahn-18.8.2[${PYTHON_USEDEP}]
 	dev-python/ipykernel[${PYTHON_USEDEP}]
@@ -23,16 +27,7 @@ BDEPEND="
 	dev-python/cython[${PYTHON_USEDEP}]
 	dev-python/versioneer[${PYTHON_USEDEP}]
 "
-DEPEND="
-	${RDEPEND}
-	${BDEPEND}
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64"
 
 RESTRICT="test"
-PATCHES="${FILESDIR}/${P}-fix-python310-detection.patch"
 
 distutils_enable_tests pytest
diff --git a/dev-python/warlock/warlock-1.3.3.ebuild b/dev-python/warlock/warlock-1.3.3-r1.ebuild
index 4793110be1fc..7d73dd9df98a 100644
--- a/dev-python/warlock/warlock-1.3.3.ebuild
+++ b/dev-python/warlock/warlock-1.3.3-r1.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
@@ -19,6 +19,12 @@ RDEPEND="
 	>=dev-python/jsonpatch-0.10[${PYTHON_USEDEP}]
 	<dev-python/jsonpatch-2[${PYTHON_USEDEP}]
 	>=dev-python/jsonschema-0.7[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-4[${PYTHON_USEDEP}]"
+	<dev-python/jsonschema-5[${PYTHON_USEDEP}]"
 
-distutils_enable_tests unittest
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# broken by jsonschema-4 but this package is dead and glanceclient
+	# (its only dep) does not seem to be affected
+	tests/test_core.py::TestCore::test_recursive_models
+)
diff --git a/dev-python/warlock/warlock-1.3.3-r2.ebuild b/dev-python/warlock/warlock-1.3.3-r2.ebuild
new file mode 100644
index 000000000000..10f188a91680
--- /dev/null
+++ b/dev-python/warlock/warlock-1.3.3-r2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="Python object model built on JSON schema and JSON patch"
+HOMEPAGE="https://github.com/bcwaldon/warlock"
+SRC_URI="https://github.com/bcwaldon/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	>=dev-python/jsonpatch-0.10[${PYTHON_USEDEP}]
+	<dev-python/jsonpatch-2[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-0.7[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-5[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# broken by jsonschema-4 but this package is dead and glanceclient
+	# (its only dep) does not seem to be affected
+	tests/test_core.py::TestCore::test_recursive_models
+)