Adding metadata

author: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2022-04-10 01:38:06 +0000
committer: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2022-04-10 01:38:06 +0000
commit: b1a709e20d65de4534cfec94250998850c052218 (patch)
tree: 6713ce4446e1e38e53695c5ffda5aded2b068377 /dev-python
parent: 90960fa67aeeb922c0726a5c5f25b31d4269d3ed (diff)
download: baldeagleos-repo-b1a709e20d65de4534cfec94250998850c052218.tar.gz
baldeagleos-repo-b1a709e20d65de4534cfec94250998850c052218.tar.xz
baldeagleos-repo-b1a709e20d65de4534cfec94250998850c052218.zip
102 files changed, 591 insertions, 1449 deletions
diff --git a/dev-python/asn1crypto/asn1crypto-1.5.1.ebuild b/dev-python/asn1crypto/asn1crypto-1.5.1.ebuild
index 93bf3d712c64..6274895d7320 100644
--- a/dev-python/asn1crypto/asn1crypto-1.5.1.ebuild
+++ b/dev-python/asn1crypto/asn1crypto-1.5.1.ebuild
@@ -16,6 +16,6 @@ SRC_URI="https://github.com/wbond/asn1crypto/archive/${PV}.tar.gz -> ${P}.gh.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 distutils_enable_tests unittest
diff --git a/dev-python/cheetah3/cheetah3-3.2.6.ebuild b/dev-python/cheetah3/cheetah3-3.2.6.ebuild
index 980a439d04fb..d27719bfe940 100644
--- a/dev-python/cheetah3/cheetah3-3.2.6.ebuild
+++ b/dev-python/cheetah3/cheetah3-3.2.6.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
@@ -11,7 +11,7 @@ HOMEPAGE="https://cheetahtemplate.org/ https://pypi.org/project/Cheetah3/"
 SRC_URI="https://github.com/CheetahTemplate3/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~riscv x86"
 SLOT="0"
 
 RDEPEND="
diff --git a/dev-python/coverage/coverage-6.3.2-r1.ebuild b/dev-python/coverage/coverage-6.3.2-r1.ebuild
index 88d2bdd98aac..210946fd8e06 100644
--- a/dev-python/coverage/coverage-6.3.2-r1.ebuild
+++ b/dev-python/coverage/coverage-6.3.2-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/cppy/cppy-1.2.1-r1.ebuild b/dev-python/cppy/cppy-1.2.1-r1.ebuild
index b91249317a4f..74a37c265be1 100644
--- a/dev-python/cppy/cppy-1.2.1-r1.ebuild
+++ b/dev-python/cppy/cppy-1.2.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ia64 ~s390 ~x86"
 
 # bug #836765 for setuptools >= dep
 BDEPEND=">=dev-python/setuptools-61.2[${PYTHON_USEDEP}]"
diff --git a/dev-python/dill/dill-0.3.4-r1.ebuild b/dev-python/dill/dill-0.3.4-r1.ebuild
index 4cee6ec1a60c..f3ad8580f3b8 100644
--- a/dev-python/dill/dill-0.3.4-r1.ebuild
+++ b/dev-python/dill/dill-0.3.4-r1.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${PN}-${P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 python_test() {
 	local fail= t
diff --git a/dev-python/editables/editables-0.2.ebuild b/dev-python/editables/editables-0.2.ebuild
index e995ca24d48b..3a3f0d751339 100644
--- a/dev-python/editables/editables-0.2.ebuild
+++ b/dev-python/editables/editables-0.2.ebuild
@@ -20,6 +20,6 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~riscv ~s390 ~sparc"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~ppc ~riscv ~s390 ~sparc"
 
 distutils_enable_tests pytest
diff --git a/dev-python/elementpath/Manifest b/dev-python/elementpath/Manifest
index 5975eee0de22..e99735f26d80 100644
--- a/dev-python/elementpath/Manifest
+++ b/dev-python/elementpath/Manifest
@@ -1,2 +1 @@
-DIST elementpath-2.4.0.gh.tar.gz 243871 BLAKE2B 1a16fa97a93a8a981c71d83a406353b5b002ea4fd814f177b7abff86ed0875770788737dc69843920cee1cc457b9a16859e6b1f4fd29889e3bf4d11b5b766621 SHA512 887a108b5de24a9be3dd1c577c623cf96939752f7c293d941e3b0bed4281d38a8edccf82fef9be8ee94bda7674f68ed17d3a060f803dcafce96e45961852ca24
 DIST elementpath-2.5.0.gh.tar.gz 263680 BLAKE2B 50ecea0766ddad4239b9283b223e945ae12fabf51bc246bb672517d04912b07cc2d46c1f04ff74f7f6da44d7dc422cde0c38a1f25a1f61068390dbfcc5ad58c4 SHA512 bbc6ce6a6a3eb3312d53be6040b8f4676f460e76de9b476410a3170734410b7a3d61c53081633d39089def05c74446d26abe093f02b9686a595cdb6e10440047
diff --git a/dev-python/elementpath/elementpath-2.4.0.ebuild b/dev-python/elementpath/elementpath-2.4.0.ebuild
deleted file mode 100644
index d8ef9756b489..000000000000
--- a/dev-python/elementpath/elementpath-2.4.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="XPath 1.0/2.0 parsers and selectors for ElementTree and lxml"
-HOMEPAGE="https://github.com/sissaschool/elementpath/
-	https://pypi.org/project/elementpath/"
-SRC_URI="
-	https://github.com/sissaschool/elementpath/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-BDEPEND="
-	test? (
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/xmlschema[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests unittest
diff --git a/dev-python/elementpath/elementpath-2.5.0.ebuild b/dev-python/elementpath/elementpath-2.5.0.ebuild
index 322914ad648b..007ce0f78c45 100644
--- a/dev-python/elementpath/elementpath-2.5.0.ebuild
+++ b/dev-python/elementpath/elementpath-2.5.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/ephemeral-port-reserve/ephemeral-port-reserve-1.1.4.ebuild b/dev-python/ephemeral-port-reserve/ephemeral-port-reserve-1.1.4.ebuild
index e148a2ea10df..e9e4b4cb4e57 100644
--- a/dev-python/ephemeral-port-reserve/ephemeral-port-reserve-1.1.4.ebuild
+++ b/dev-python/ephemeral-port-reserve/ephemeral-port-reserve-1.1.4.ebuild
@@ -20,6 +20,6 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/fakeredis/Manifest b/dev-python/fakeredis/Manifest
index 814702242121..8d025a58b420 100644
--- a/dev-python/fakeredis/Manifest
+++ b/dev-python/fakeredis/Manifest
@@ -1,2 +1 @@
-DIST fakeredis-1.7.0.gh.tar.gz 71108 BLAKE2B 64b4c8aa2891ac6afd7789e5a8dce4d1a0ccd6a5083b410fd051d871d4ea9748e9d687eb27bbaeea646747f4bf170089d3ef711d6db0d6a88d8b7e755d165b6d SHA512 a8c67929e63196fea45b85097aaf6bf7402679510e471a8d13bdc0f7320e983107416d3e515fa85b1d6a6217fb82dbda7b4425c3c80ac54a1ac50eee875b0fbd
 DIST fakeredis-1.7.1.gh.tar.gz 71151 BLAKE2B 87877c94a4c03ad6ff4b55f307526f712daa860257374a97a8f7bd29440d171467e18e4041ca56bb6af30df30481a3d5b13c7d0657ba3eb7673a653664ffbe8a SHA512 f41d9393ae50bae9de064678948f4364fc47db06f489782e5b428f449828ad5813b08b2fb053bef878b2a1b500edbb0ea1881449dbd12c2b6e385f6a2fba4c59
diff --git a/dev-python/fakeredis/fakeredis-1.7.0.ebuild b/dev-python/fakeredis/fakeredis-1.7.0.ebuild
deleted file mode 100644
index 8d8df7a26667..000000000000
--- a/dev-python/fakeredis/fakeredis-1.7.0.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Fake implementation of redis API for testing purposes"
-HOMEPAGE="
-	https://github.com/jamesls/fakeredis/
-	https://pypi.org/project/fakeredis/"
-SRC_URI="
-	https://github.com/jamesls/fakeredis/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc x86"
-
-RDEPEND="
-	dev-python/redis-py[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/sortedcontainers[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-db/redis
-		dev-python/aioredis[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	test/test_aioredis2.py::test_blocking_unblock
-	test/test_aioredis2.py::test_pubsub
-	"test/test_aioredis2.py::test_repr[fake]"
-	test/test_hypothesis.py::TestJoint::test
-	test/test_hypothesis.py::TestFuzz::test
-)
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# also lupa
-		"test/test_aioredis2.py::test_failed_script_error[fake]"
-	)
-	local args=(
-		# tests requiring lupa (lua support)
-		-k 'not test_eval and not test_lua and not test_script'
-	)
-	epytest "${args[@]}"
-}
-
-src_test() {
-	local redis_pid="${T}"/redis.pid
-	local redis_port=6379
-	local redis_test_config="
-		daemonize yes
-		pidfile ${redis_pid}
-		port ${redis_port}
-		bind 127.0.0.1
-	"
-
-	einfo "Spawning Redis"
-	einfo "NOTE: Port ${redis_port} must be free"
-	"${EPREFIX}"/usr/sbin/redis-server - <<< "${redis_test_config}" || die
-
-	# Run the tests
-	distutils-r1_src_test
-
-	# Clean up afterwards
-	kill "$(<"${redis_pid}")" || die
-}
-
-pkg_postinst() {
-	optfeature "Mock aioredis" dev-python/aioredis
-}
diff --git a/dev-python/fakeredis/fakeredis-1.7.1.ebuild b/dev-python/fakeredis/fakeredis-1.7.1.ebuild
index 1d0f23e91289..3f15dc1ce7bf 100644
--- a/dev-python/fakeredis/fakeredis-1.7.1.ebuild
+++ b/dev-python/fakeredis/fakeredis-1.7.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	<dev-python/redis-py-4.2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/freezegun/Manifest b/dev-python/freezegun/Manifest
index 3a6a1795e44e..810c5172761f 100644
--- a/dev-python/freezegun/Manifest
+++ b/dev-python/freezegun/Manifest
@@ -1,3 +1 @@
-DIST freezegun-1.1.0.tar.gz 29923 BLAKE2B 8a49bcb2e2e89e09ab14b6b48f90c145ddba2a7e0d005e33a002316c01b29899766b0b011e47f510be737011752044a7cc5967fdff3e0e14dc77da92f5bb5b27 SHA512 41d2bd18c5115416679602c53aff10891dd8e97402f641eeb3819a3b84d34351c238dece8e68fe267d572693ea08b421510726b6d7c9fdb1d6d70ddc96954d54
-DIST freezegun-1.2.0.tar.gz 29039 BLAKE2B ad4f6f794dad4006a05e7b791e8d2b4d7992034e7d2aaae416c125a7109b2ef6771169462c166653699bc6658e754c5cce2e4ca1918d46bfb8e5d5287a9dcf2e SHA512 d39f2b58694ed2612859eeb4a10e23268a63aa9e62595b2227c9851c53d42f4810b9194c8f26242bb1bcac105e5ddd66eb3de7aecf35e6a3025f2359ee444765
 DIST freezegun-1.2.1.tar.gz 29740 BLAKE2B 780b0573602df157b9b195c3fbd76c81c893a4558355bdf26661f8ec1fb4b6a265c0b684f1c812a6a52ca7beed4dd36b1cc0fb675acf3c7e10a8e264ad0a3b6d SHA512 5f8334a66dc33cbffa8f22d41e101d66c99a1ac4b7a0c24ee6da62b58dab2b0b340ade48b8dd0020d4fb4cb6e082071869a2757bbd05eff703f66f167050d4e1
diff --git a/dev-python/freezegun/freezegun-1.1.0-r1.ebuild b/dev-python/freezegun/freezegun-1.1.0-r1.ebuild
deleted file mode 100644
index fb4dcd31e437..000000000000
--- a/dev-python/freezegun/freezegun-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Let your Python tests travel through time"
-HOMEPAGE="https://github.com/spulec/freezegun"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-RDEPEND="
-	>dev-python/python-dateutil-2.7[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/${P}-py310.patch
-)
diff --git a/dev-python/freezegun/freezegun-1.2.0.ebuild b/dev-python/freezegun/freezegun-1.2.0.ebuild
deleted file mode 100644
index 19b05ff95e2a..000000000000
--- a/dev-python/freezegun/freezegun-1.2.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Let your Python tests travel through time"
-HOMEPAGE="https://github.com/spulec/freezegun"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-RDEPEND="
-	>dev-python/python-dateutil-2.7[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.0-py310.patch
-)
diff --git a/dev-python/freezegun/freezegun-1.2.1.ebuild b/dev-python/freezegun/freezegun-1.2.1.ebuild
index 46a0be13d6e0..9c9bf894093e 100644
--- a/dev-python/freezegun/freezegun-1.2.1.ebuild
+++ b/dev-python/freezegun/freezegun-1.2.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 RDEPEND="
 	>dev-python/python-dateutil-2.7[${PYTHON_USEDEP}]
diff --git a/dev-python/hatchling/hatchling-0.22.0.ebuild b/dev-python/hatchling/hatchling-0.22.0.ebuild
index 33061cc60b9c..983f0354a500 100644
--- a/dev-python/hatchling/hatchling-0.22.0.ebuild
+++ b/dev-python/hatchling/hatchling-0.22.0.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}/backend
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~riscv ~s390 ~sparc"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~ppc ~riscv ~s390 ~sparc"
 
 RDEPEND="
 	>=dev-python/editables-0.2[${PYTHON_USEDEP}]
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 4b5137560a0c..6e22047efb94 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -1,9 +1,2 @@
-DIST hypothesis-python-6.38.0.tar.gz 9180960 BLAKE2B a62cb0cb31cfe4ece8ee829207befb729aebf2be802c57b398547c87ecbd4769955c5c2919a0eb653d41cc3f4998c5326fdb184b6409d5fcb632c037df6a542f SHA512 2d57b783a71a905470ca088ebd91c0ea96be1bd76648d30d52b0b43914844712bbf3eaad54d66607b149a1238bb9a0258f920a6e262e54bed5cef36e3ca227e1
-DIST hypothesis-python-6.39.3.tar.gz 9182758 BLAKE2B 3641e5a9fd7e3e3e9f6432fa5bd5b8f6e4508fd840c781a65f11e8e99cee40dbd343bb17c37c60a4aabff00d5faca98a3a49b756eb754763ffc26a63a8450b38 SHA512 6dcbecdbd564aced4b0e14608a226d71adccaccfd54a3b9029f85a3e616372b7422f97029b5254bf1b08e44f74c714d65c1cb5fc21b6a0e0bdcedff2cc539ed2
-DIST hypothesis-python-6.39.4.tar.gz 9182794 BLAKE2B 16c1867e2ea4dc08d6bb31aee14ec4c8fc7c7e21e57723d69184b227c1b2081e7f03a7d1f3a4975c485cbfc6011cb832de761874bddcfef716775a5bdd933927 SHA512 100e0b591980280b8a674e0c596fee65eee0428e0f116045b65f22a3bf2c114ff7068eac0b59764bbf5dc02b67711ca105fb655b705cbba7c1932cbbfc7da670
-DIST hypothesis-python-6.39.5.tar.gz 9182972 BLAKE2B ecd92b759f574d2abed5310815c603adb2585e9a724532feea2fe1818c1693eabd3523ecda57c42b5e714684c53e80bce437156b49a7a23e5d0a87ef103d367f SHA512 da6ebb225a58b177870f9848ad44eb71af6c9a502ffa104ba023a24139b427b647c33b622063bd1c6050b5922c5a17ef0cbcff64dc85e5a9379b9503738dabd8
 DIST hypothesis-python-6.39.6.tar.gz 9183382 BLAKE2B c1112dc11d9129c7685eccac563232c978fcb470b0537e468b802ecf1f758af8dfce323514f923605662e720d0d54f525e5aac3e871407255f5f0732856748fe SHA512 985645265e9644bd2731a08ab942984fae5cb35e04e27e60450bfcf237c375dae1f2d3bf3694031a452866669ae2e19a05085ce9e35630965938c066b265595a
-DIST hypothesis-python-6.40.0.tar.gz 9184563 BLAKE2B 7087baa8eed9849e639bc1d67e77a3426702e64e31252e893a19efb1457dd3c9994ed7459084b9c88f3574b89268369ee63bc1ed8dd6f0c257c0af50dc5a3eb1 SHA512 51b062b934c90137cb55fea58c639ebdbfdae21d0af8bf951add83b36c1286f959de47442219174fe80d0a98ffbe0c53cb9cd1b3908b63742c5d7662c84518e0
-DIST hypothesis-python-6.40.1.tar.gz 9184638 BLAKE2B bc1900b5328514f1f1f5753d9370229a30108e626400fa93aebcb43d33caa6301108b277ccd8356ef944f2d54387444f67efa4e041f553e40f889b233be03ed8 SHA512 9ae09a8a337fb2d4a94b83ecc02dc5c62759ca9c9043bdd2326084413ff3106c52a654c2c7a99b22fcef28909387ef0450207d0883cf15303c84f3a7f42987d9
-DIST hypothesis-python-6.41.0.tar.gz 9186412 BLAKE2B 406cc13a7f341fa9844fe7ae7e65509e161244dec2e52d62f3177b84746562ffd09eb5aaba21f6c3fb8137bf26c7b4ea2d7064e8ef12bf59c0bbe7b99154ce13 SHA512 71884130be8a0474918172b8fd754e944831de2a6f34cf5a4f32c318820026ece8e0ab2f04ac1c9cae47329eec84c5006337556420eb523f4df57dd43dadb916
 DIST hypothesis-python-6.42.0.tar.gz 9186585 BLAKE2B dd08082ef466c91999a6bfa6dfc8386f773182f3e74cc471f6f09bf3c595871aea6508ea2ede4a1375b7ec1e0ba4169a7577c41c6ea97b578233ed64a36b4975 SHA512 fdd6c095aba72660b7cbf4e5200a3500019fef69f45c6a8f40a93815b6bce23c40404af16dba4309400917307485c378b3a12f3eea58d99ce8da68b397a69390
diff --git a/dev-python/hypothesis/hypothesis-6.38.0.ebuild b/dev-python/hypothesis/hypothesis-6.38.0.ebuild
deleted file mode 100644
index 6ecc0d0c52bc..000000000000
--- a/dev-python/hypothesis/hypothesis-6.38.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 multiprocessing optfeature
-
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
-SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
-S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' python3_{8..10})
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!<dev-python/typing-3.7.4.1
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare() {
-	if ! use cli || ! has "${EPYTHON}" python3.{8..10}; then
-		sed -i -e '/console_scripts/d' setup.py || die
-	fi
-}
-
-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
-
-	epytest tests/cover tests/pytest tests/quality \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-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/hypothesis/hypothesis-6.39.3.ebuild b/dev-python/hypothesis/hypothesis-6.39.3.ebuild
deleted file mode 100644
index 5eb94ce96458..000000000000
--- a/dev-python/hypothesis/hypothesis-6.39.3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 multiprocessing optfeature
-
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
-SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
-S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' python3_{8..10})
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!<dev-python/typing-3.7.4.1
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare() {
-	if ! use cli || ! has "${EPYTHON}" python3.{8..10}; then
-		sed -i -e '/console_scripts/d' setup.py || die
-	fi
-}
-
-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
-
-	epytest tests/cover tests/pytest tests/quality \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-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/hypothesis/hypothesis-6.39.4.ebuild b/dev-python/hypothesis/hypothesis-6.39.4.ebuild
deleted file mode 100644
index f202efbaaf69..000000000000
--- a/dev-python/hypothesis/hypothesis-6.39.4.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 multiprocessing optfeature
-
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
-SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
-S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' python3_{8..10})
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!<dev-python/typing-3.7.4.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
-
-	epytest tests/cover tests/pytest tests/quality \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-python_install() {
-	distutils-r1_python_install
-	if ! use cli || ! has "${EPYTHON}" python3.{8..10}; 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/hypothesis/hypothesis-6.39.5.ebuild b/dev-python/hypothesis/hypothesis-6.39.5.ebuild
deleted file mode 100644
index f202efbaaf69..000000000000
--- a/dev-python/hypothesis/hypothesis-6.39.5.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 multiprocessing optfeature
-
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
-SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
-S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' python3_{8..10})
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!<dev-python/typing-3.7.4.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
-
-	epytest tests/cover tests/pytest tests/quality \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-python_install() {
-	distutils-r1_python_install
-	if ! use cli || ! has "${EPYTHON}" python3.{8..10}; 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/hypothesis/hypothesis-6.39.6.ebuild b/dev-python/hypothesis/hypothesis-6.39.6.ebuild
index f202efbaaf69..ee5333dbb16c 100644
--- a/dev-python/hypothesis/hypothesis-6.39.6.ebuild
+++ b/dev-python/hypothesis/hypothesis-6.39.6.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="cli"
 
 RDEPEND="
diff --git a/dev-python/hypothesis/hypothesis-6.40.0.ebuild b/dev-python/hypothesis/hypothesis-6.40.0.ebuild
deleted file mode 100644
index f202efbaaf69..000000000000
--- a/dev-python/hypothesis/hypothesis-6.40.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 multiprocessing optfeature
-
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
-SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
-S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' python3_{8..10})
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!<dev-python/typing-3.7.4.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
-
-	epytest tests/cover tests/pytest tests/quality \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-python_install() {
-	distutils-r1_python_install
-	if ! use cli || ! has "${EPYTHON}" python3.{8..10}; 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/hypothesis/hypothesis-6.40.1.ebuild b/dev-python/hypothesis/hypothesis-6.40.1.ebuild
deleted file mode 100644
index f202efbaaf69..000000000000
--- a/dev-python/hypothesis/hypothesis-6.40.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 multiprocessing optfeature
-
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
-SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
-S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' python3_{8..10})
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!<dev-python/typing-3.7.4.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
-
-	epytest tests/cover tests/pytest tests/quality \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-python_install() {
-	distutils-r1_python_install
-	if ! use cli || ! has "${EPYTHON}" python3.{8..10}; 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/hypothesis/hypothesis-6.41.0.ebuild b/dev-python/hypothesis/hypothesis-6.41.0.ebuild
deleted file mode 100644
index f202efbaaf69..000000000000
--- a/dev-python/hypothesis/hypothesis-6.41.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 multiprocessing optfeature
-
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
-SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
-S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' python3_{8..10})
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!<dev-python/typing-3.7.4.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
-
-	epytest tests/cover tests/pytest tests/quality \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-python_install() {
-	distutils-r1_python_install
-	if ! use cli || ! has "${EPYTHON}" python3.{8..10}; 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/ini2toml/ini2toml-0.10.ebuild b/dev-python/ini2toml/ini2toml-0.10.ebuild
index 308b12449e6e..c51d39c6f4f6 100644
--- a/dev-python/ini2toml/ini2toml-0.10.ebuild
+++ b/dev-python/ini2toml/ini2toml-0.10.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~m68k ~riscv ~x86"
+KEYWORDS="~amd64 ~hppa ~ia64 ~m68k ~riscv ~s390 ~x86"
 
 RDEPEND="
 	>=dev-python/packaging-20.7[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-logging/jaraco-logging-3.1.0-r1.ebuild b/dev-python/jaraco-logging/jaraco-logging-3.1.0-r1.ebuild
new file mode 100644
index 000000000000..10d1ab562939
--- /dev/null
+++ b/dev-python/jaraco-logging/jaraco-logging-3.1.0-r1.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} pypy3 )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Additional facilities to supplement Python's stdlib logging module"
+HOMEPAGE="https://github.com/jaraco/jaraco.logging"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/tempora[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx docs \
+	'>=dev-python/jaraco-packaging-3.2' \
+	'>=dev-python/rst-linker-1.9'
+distutils_enable_tests pytest
+
+python_compile() {
+	distutils-r1_python_compile
+	rm "${BUILD_DIR}/install$(python_get_sitedir)"/jaraco/__init__.py || die
+}
diff --git a/dev-python/jsonschema/jsonschema-4.4.0-r2.ebuild b/dev-python/jsonschema/jsonschema-4.4.0-r2.ebuild
index 01fefe542773..ae82a6a48e7a 100644
--- a/dev-python/jsonschema/jsonschema-4.4.0-r2.ebuild
+++ b/dev-python/jsonschema/jsonschema-4.4.0-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	dev-python/attrs[${PYTHON_USEDEP}]
diff --git a/dev-python/mando/mando-0.7.1.ebuild b/dev-python/mando/mando-0.7.1.ebuild
index 9a8f59683621..433462382c96 100644
--- a/dev-python/mando/mando-0.7.1.ebuild
+++ b/dev-python/mando/mando-0.7.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/rubik/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="examples"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-python/manuel/manuel-1.10.1.ebuild b/dev-python/manuel/manuel-1.10.1.ebuild
index dca38f115904..0d89b7dbc62b 100644
--- a/dev-python/manuel/manuel-1.10.1.ebuild
+++ b/dev-python/manuel/manuel-1.10.1.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
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 BDEPEND="test? ( dev-python/zope-testing[${PYTHON_USEDEP}] )"
diff --git a/dev-python/mkdocs-material/mkdocs-material-8.2.8.ebuild b/dev-python/mkdocs-material/mkdocs-material-8.2.8.ebuild
index aadee51a24a1..d85a162c0f73 100644
--- a/dev-python/mkdocs-material/mkdocs-material-8.2.8.ebuild
+++ b/dev-python/mkdocs-material/mkdocs-material-8.2.8.ebuild
@@ -27,7 +27,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/jinja-2.11.1[${PYTHON_USEDEP}]
diff --git a/dev-python/mkdocs/Manifest b/dev-python/mkdocs/Manifest
index 6b5df73196ca..63b4b1754e16 100644
--- a/dev-python/mkdocs/Manifest
+++ b/dev-python/mkdocs/Manifest
@@ -1,2 +1 @@
-DIST mkdocs-1.2.3.tar.gz 6919177 BLAKE2B 43ff118149a497dd366f7132487564be51ffeaff644a519c7bf9e52a3e3239e9696c21616e5d7494f7c4af8ee60ec77f27fd15e80f5c5c6c1b2db4cf1f672e44 SHA512 03385bc940df8a6b3668300f3752afe973b95f149bee58217ace82063aacb661dbd000a2a7a383c4804434473c3945cec3cb41d6608388350da3098c32709541
 DIST mkdocs-1.3.0.tar.gz 4085674 BLAKE2B e34605c2d1122ff86ed5cfb6134cdda67450e8f32d7628626ff4ac8c36c45b127312ad693efe35237b714adb9efd244f12f90cf8ecacf6009b75786db30ebb1b SHA512 d33d728eaff4e39106c1187cf04f579706ce28af364852c67706ab85f6b9ccdcd26ae84cd4d5ea7572e52fde1d1137eb3e424679dd4c8ef043c9637aac062270
diff --git a/dev-python/mkdocs/mkdocs-1.2.3.ebuild b/dev-python/mkdocs/mkdocs-1.2.3.ebuild
deleted file mode 100644
index 5c205cd35aea..000000000000
--- a/dev-python/mkdocs/mkdocs-1.2.3.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Project documentation with Markdown"
-HOMEPAGE="https://www.mkdocs.org https://github.com/mkdocs/mkdocs"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-IUSE="doc"
-
-BDEPEND="
-	doc? (
-		$(python_gen_any_dep '
-			dev-python/mdx_gh_links[${PYTHON_USEDEP}]
-			dev-python/mkdocs-redirects[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-RDEPEND="
-	>=dev-python/Babel-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/click-3.3[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
-	>=dev-python/markdown-3.2.1[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-	>=dev-python/watchdog-2.0[${PYTHON_USEDEP}]
-	>=dev-python/ghp-import-1.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml_env_tag-0.1[${PYTHON_USEDEP}]
-	>=dev-python/importlib_metadata-3.10[${PYTHON_USEDEP}]
-	>=dev-python/packaging-20.5[${PYTHON_USEDEP}]
-	>=dev-python/mergedeep-1.3.4[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests --install nose
-
-python_prepare_all() {
-	# Tests fails if additional themes are installed
-	sed -i -e 's:test_get_themes:_&:' \
-		mkdocs/tests/utils/utils_tests.py || die
-
-	# Skip this network test, "does not appear to be an IPv4 or IPv6 address"
-	sed -i -e 's/test_IP_normalization/_&/' \
-		mkdocs/tests/config/config_options_tests.py || die
-
-	# livereload has been dropped in this release, this test is a remnant
-	rm mkdocs/tests/livereload_tests.py || die
-
-	# fix apparent typo in test (importing wrong thing)
-	sed -i -e 's/from localization import/from mkdocs.localization import/g' \
-		mkdocs/tests/theme_tests.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	default
-	if use doc; then
-		# cannot just do mkdocs build, because that fails if
-		# the package isn't already installed
-		python -m mkdocs build || die "Failed to make docs"
-		# Colliding files found by ecompress:
-		rm site/sitemap.xml.gz || die
-		HTML_DOCS=( "site/." )
-	fi
-}
diff --git a/dev-python/mkdocs/mkdocs-1.3.0.ebuild b/dev-python/mkdocs/mkdocs-1.3.0.ebuild
index 238268e3918d..26212889b1a6 100644
--- a/dev-python/mkdocs/mkdocs-1.3.0.ebuild
+++ b/dev-python/mkdocs/mkdocs-1.3.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 IUSE="doc"
 
diff --git a/dev-python/poetry-core/Manifest b/dev-python/poetry-core/Manifest
index d3833f2d4693..64fbfa17da5b 100644
--- a/dev-python/poetry-core/Manifest
+++ b/dev-python/poetry-core/Manifest
@@ -1,2 +1 @@
-DIST poetry-core-1.0.7.gh.tar.gz 414539 BLAKE2B 570f13e3c7298fd822a38b75c49c623bde4fa780b3787c3c9cfa3939bb68fee3eeaf6190013117a6e751cb6f87a15b343ba183529fcc07d30e37988097954d4a SHA512 40a8b17ae7c51135eb5f96ec76426f075075de7dafff8ab828fe3b47d13759856a7fd2e7504c1216c4f942befde2c6d42c3976978202ce7aa224e966162bd8e5
 DIST poetry-core-1.0.8.gh.tar.gz 414941 BLAKE2B 1f663d927aee1f18a9ff38cbf95809538bf9c9e8079d040c240fbc1ffa9e492c6fd20c69f89ddf7e68ddea05beee3b909fdee02e93f47437fffa687dc492ec9a SHA512 6dfed1e1124c37a5f0ec535ede8848e25466da3df6fa6629f6330ce32f05a4d82725d64407e5bcf294d6e467b52966642505ee29f563d3794c4e7aca78045285
diff --git a/dev-python/poetry-core/poetry-core-1.0.7.ebuild b/dev-python/poetry-core/poetry-core-1.0.7.ebuild
deleted file mode 100644
index e477645804f6..000000000000
--- a/dev-python/poetry-core/poetry-core-1.0.7.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Poetry PEP 517 Build Backend"
-HOMEPAGE="https://pypi.org/project/poetry-core/ https://github.com/python-poetry/poetry-core"
-SRC_URI="
-	https://github.com/python-poetry/poetry-core/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-# check inside src/poetry/core/_vendor/vendor.txt
-RDEPEND="
-	dev-python/attrs[${PYTHON_USEDEP}]
-	dev-python/jsonschema[${PYTHON_USEDEP}]
-	dev-python/lark-parser[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-	dev-python/pyrsistent[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/tomlkit[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pep517[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# Those "fail" bacause of glob file path resulting from newer versions
-	# in our tree than vendored. But those don't affect anything.
-	tests/masonry/builders/test_sdist.py::test_default_with_excluded_data
-	tests/masonry/builders/test_wheel.py::test_default_src_with_excluded_data
-)
-
-src_prepare() {
-	# remove vendoring of dependencies
-	rm -r poetry/core/_vendor || die
-	sed -e '/__vendor_site__/d' -i poetry/core/__init__.py || die
-
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/poetry-core/poetry-core-1.0.8.ebuild b/dev-python/poetry-core/poetry-core-1.0.8.ebuild
index a4386ee7a217..e477645804f6 100644
--- a/dev-python/poetry-core/poetry-core-1.0.8.ebuild
+++ b/dev-python/poetry-core/poetry-core-1.0.8.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 # check inside src/poetry/core/_vendor/vendor.txt
 RDEPEND="
diff --git a/dev-python/prettytable/Manifest b/dev-python/prettytable/Manifest
index 340c19f77f25..254f7d231533 100644
--- a/dev-python/prettytable/Manifest
+++ b/dev-python/prettytable/Manifest
@@ -1,2 +1 @@
-DIST prettytable-3.1.1.tar.gz 52705 BLAKE2B 4a52892763777045abbf1d74cbb3dc8b1fdf9dfed006723b3f47a6af44dd8c5a09204e3ead1e586b0bc78255dec93691805f634027f9502a5d97f649ada88449 SHA512 2abfe1039161fc7c1d25b0d053776e842c1413e70ce209324fd9b2f1885949513238ca362f93b1adf405461c978760bc7d635e3321b94352ac2aa9fea94450d5
 DIST prettytable-3.2.0.tar.gz 52976 BLAKE2B ec41ffe9c752f530128d641a3341cc5c2dc4fd26ae8cf795fd526144ae8c82d359d022a9d52aebcea3217251c7d9513ef2df0f50c3a4f31ec0c2ef6b9c7e6189 SHA512 8f2a0945159727741a52ffdaa5602b862841cb8e0c33d3f755699f4376d2c0bfa539a270e56242503f94cb4fc469cbfd27348abfd740ec8f1cd3f1970053e5db
diff --git a/dev-python/prettytable/prettytable-3.1.1.ebuild b/dev-python/prettytable/prettytable-3.1.1.ebuild
deleted file mode 100644
index 18e38842e817..000000000000
--- a/dev-python/prettytable/prettytable-3.1.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Easily displaying tabular data in a visually appealing ASCII table format"
-HOMEPAGE="
-	https://github.com/jazzband/prettytable/
-	https://pypi.org/project/prettytable/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc64 ~riscv sparc x86"
-
-RDEPEND="
-	dev-python/wcwidth[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_impl_dep sqlite)
-		dev-python/pytest-lazy-fixture[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/prettytable/prettytable-3.2.0.ebuild b/dev-python/prettytable/prettytable-3.2.0.ebuild
index f096c1bda489..18e38842e817 100644
--- a/dev-python/prettytable/prettytable-3.2.0.ebuild
+++ b/dev-python/prettytable/prettytable-3.2.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	dev-python/wcwidth[${PYTHON_USEDEP}]
diff --git a/dev-python/psutil/psutil-5.9.0.ebuild b/dev-python/psutil/psutil-5.9.0.ebuild
index 6dba843b1f97..30e0081a92c3 100644
--- a/dev-python/psutil/psutil-5.9.0.ebuild
+++ b/dev-python/psutil/psutil-5.9.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pybind11/pybind11-2.9.2.ebuild b/dev-python/pybind11/pybind11-2.9.2.ebuild
index 981dc47afbc7..44c53a6c95c1 100644
--- a/dev-python/pybind11/pybind11-2.9.2.ebuild
+++ b/dev-python/pybind11/pybind11-2.9.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/pybind/pybind11/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~x86"
 
 RDEPEND="
 	dev-cpp/eigen:3
diff --git a/dev-python/pycountry/Manifest b/dev-python/pycountry/Manifest
index 4ef03cb28200..67cf2540522f 100644
--- a/dev-python/pycountry/Manifest
+++ b/dev-python/pycountry/Manifest
@@ -1,2 +1 @@
-DIST pycountry-22.1.10.tar.gz 10060795 BLAKE2B 51672b2e08e48528797e57e6a546261d4ceee0af364d5c943f243a5956008ffc417b02e553f376c252bfbfbf76af40585c9f910815a9c2943ff88be6fb9d4180 SHA512 93e5737df29affe5bbf8a2aa2caef59727adcc198eab301a5ddbc4275e32955cec0de9ab2820470a8cf87b0c0a9d48bfddd18411d93a700212aba8372e5a52b4
 DIST pycountry-22.3.5.tar.gz 10141551 BLAKE2B d645eade8ce9be3b99f4f2b189cc50c3395ecb3899ab9fa668066993abbfa576191cfcc05b7bb2764d088a86df492770bcc0a8834f04e6fde58a01defe8a1b14 SHA512 07dc507ee94f1880727761df197f81704386d9246163c9a5872f47083d37c7d1205dfbd28c6663ef0731a0b05277ade03a1a1929ab84087e0e85c05028c68b89
diff --git a/dev-python/pycountry/files/pycountry-20.7.3-fix-tests-for-pypy3.patch b/dev-python/pycountry/files/pycountry-20.7.3-fix-tests-for-pypy3.patch
deleted file mode 100644
index 453c57f362cd..000000000000
--- a/dev-python/pycountry/files/pycountry-20.7.3-fix-tests-for-pypy3.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-commit 57a64b69704640bd85270d886c369ef5a31eee80
-Author: Louis Sautier <sautier.louis@gmail.com>
-Date:   Thu Sep 17 13:01:07 2020 +0200
-
-    Do not rely on CPython-specific __builtins__ for tests
-    
-    This makes test_locales pass with PyPy3.
-
-diff --git a/src/pycountry/tests/test_general.py b/src/pycountry/tests/test_general.py
-index ea697ae..ad1090f 100644
---- a/src/pycountry/tests/test_general.py
-+++ b/src/pycountry/tests/test_general.py
-@@ -149,7 +149,7 @@ def test_locales():
-     german = gettext.translation(
-         'iso3166', pycountry.LOCALES_DIR, languages=['de'])
-     german.install()
--    assert __builtins__['_']('Germany') == 'Deutschland'
-+    assert _('Germany') == 'Deutschland'
- 
- 
- def test_removed_countries():
diff --git a/dev-python/pycountry/pycountry-22.1.10.ebuild b/dev-python/pycountry/pycountry-22.1.10.ebuild
deleted file mode 100644
index 9c8ad928589a..000000000000
--- a/dev-python/pycountry/pycountry-22.1.10.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-# The package uses pkg_resources to determine its version
-DISTUTILS_USE_SETUPTOOLS=manual
-
-inherit distutils-r1
-
-DESCRIPTION="Database of countries, subdivisions, languages, currencies and script"
-HOMEPAGE="https://github.com/flyingcircusio/pycountry"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~ia64 ppc ~riscv ~sparc x86"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}"
-
-distutils_enable_tests --install pytest
-
-# https://github.com/flyingcircusio/pycountry/pull/51
-PATCHES=( "${FILESDIR}/pycountry-20.7.3-fix-tests-for-pypy3.patch" )
diff --git a/dev-python/pycountry/pycountry-22.3.5.ebuild b/dev-python/pycountry/pycountry-22.3.5.ebuild
index cd2024ab364f..7aefe1900c7b 100644
--- a/dev-python/pycountry/pycountry-22.3.5.ebuild
+++ b/dev-python/pycountry/pycountry-22.3.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm64 ~ia64 ppc ~riscv ~sparc x86"
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 BDEPEND="${RDEPEND}"
diff --git a/dev-python/pydantic/pydantic-1.9.0-r1.ebuild b/dev-python/pydantic/pydantic-1.9.0-r1.ebuild
new file mode 100644
index 000000000000..94596a5b1ba1
--- /dev/null
+++ b/dev-python/pydantic/pydantic-1.9.0-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Data parsing and validation using Python type hints"
+HOMEPAGE="https://github.com/samuelcolvin/pydantic"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/typing-extensions[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/python-dotenv[${PYTHON_USEDEP}]
+		dev-python/python-email-validator[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/CFLAGS/d' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	# "setup.py clean" is broken
+	# TODO: remove this if distutils-r1.eclass is updated to do rm
+	rm -rf build || die
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=pytest_mock
+
+	local EPYTEST_DESELECT=(
+		# flaky test, known upstream
+		tests/test_hypothesis_plugin.py::test_can_construct_models_with_all_fields
+	)
+	case ${EPYTHON} in
+		python3.8)
+			EPYTEST_DESELECT+=(
+				# Those fail on python 3.8 as None changed typing semantic on >=3.9
+				"tests/test_types.py::test_none[value_type3]"
+				tests/test_typing.py::test_is_none_type
+			)
+			;;
+		pypy3)
+			EPYTEST_DESELECT+=(
+				tests/test_private_attributes.py::test_private_attribute
+				tests/test_private_attributes.py::test_private_attribute_annotation
+				tests/test_private_attributes.py::test_private_attribute_factory
+				tests/test_private_attributes.py::test_private_attribute_multiple_inheritance
+				tests/test_private_attributes.py::test_underscore_attrs_are_private
+			)
+			;;
+	esac
+	epytest
+}
diff --git a/dev-python/pydevd/pydevd-2.8.0.ebuild b/dev-python/pydevd/pydevd-2.8.0.ebuild
index 25eb3f2afb83..8f5ecc8f0211 100644
--- a/dev-python/pydevd/pydevd-2.8.0.ebuild
+++ b/dev-python/pydevd/pydevd-2.8.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/PyDev.Debugger-${MY_P}"
 
 LICENSE="EPL-1.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 # After removing and recompiling the prebuilt lib the tests fail?
 # For some reason the test suite is executing a slightly different gdb command
diff --git a/dev-python/pyglet/pyglet-1.5.23.ebuild b/dev-python/pyglet/pyglet-1.5.23.ebuild
index 287d8fbbeb63..71606c8ce387 100644
--- a/dev-python/pyglet/pyglet-1.5.23.ebuild
+++ b/dev-python/pyglet/pyglet-1.5.23.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pyglet/pyglet/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux"
 IUSE="examples image +sound"
 
 BDEPEND="
diff --git a/dev-python/pylast/pylast-5.0.0.ebuild b/dev-python/pylast/pylast-5.0.0.ebuild
index 3635d2b1f7b2..599fbecf5b00 100644
--- a/dev-python/pylast/pylast-5.0.0.ebuild
+++ b/dev-python/pylast/pylast-5.0.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="
 	dev-python/httpx[${PYTHON_USEDEP}]
diff --git a/dev-python/pylint/pylint-2.13.5.ebuild b/dev-python/pylint/pylint-2.13.5.ebuild
index 2417e9131774..7427d538aed1 100644
--- a/dev-python/pylint/pylint-2.13.5.ebuild
+++ b/dev-python/pylint/pylint-2.13.5.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~ppc ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="examples"
 
 # Make sure to check https://github.com/PyCQA/pylint/blob/main/setup.cfg#L43 on bumps
diff --git a/dev-python/pyparted/pyparted-3.12.0.ebuild b/dev-python/pyparted/pyparted-3.12.0.ebuild
index 6df73641b90a..777086bfc4a0 100644
--- a/dev-python/pyparted/pyparted-3.12.0.ebuild
+++ b/dev-python/pyparted/pyparted-3.12.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/dcantrell/pyparted/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
 
 DEPEND="
 	>=sys-block/parted-3.4
diff --git a/dev-python/pytest-asyncio/Manifest b/dev-python/pytest-asyncio/Manifest
index 139520e90b0c..1a0d0491daaf 100644
--- a/dev-python/pytest-asyncio/Manifest
+++ b/dev-python/pytest-asyncio/Manifest
@@ -1,3 +1 @@
-DIST pytest-asyncio-0.17.2.tar.gz 23805 BLAKE2B 0501a193518cefb0596b1595a58e8f18915b61ba2b502726b457e78c10b5849e5fc1980192d4b5aceb7499af15556c185efc42b76153e2b8f72ab4e36249ad23 SHA512 f1f6a586a7a3a1672ed76e8758a76e8bd427b0da055461597ab3b6296e3ae50002a9a259aba57f0b6191d606db6fa61377dbf03099d3437272a4a1f4144aa58e
-DIST pytest-asyncio-0.18.2.tar.gz 24515 BLAKE2B d583abe16c215f12a3cc93588d40b9b75188b3a19eb3b4a018551f7fe616e92c73e12c0be6e6a3eadd7357b2396f397013829e1827bf0fc0cb4b96cdd1e64ff4 SHA512 377d219e731ac97a69e143c2de2e327f7293baf4af4bf370cb84dde4f94f705e315bf6deaea4b7d8c1d6cbc54ed753e15ccc0b21a0cef6c3397a560aae684f9e
 DIST pytest-asyncio-0.18.3.tar.gz 25049 BLAKE2B 5439675fd03b7fdd4cd3dbf1f37daa83d6b18b199ccc7b54acc648187dffcf59154f8f0ec5d4144ed40554290343a0890952e67d4184b17b0a3817196592023e SHA512 04d2046c039131598cb593afc1908be0dff2b24a91c89f36fca75d2d65916571e48fe149c1ba90244f299586277320cf6f130a02824fde9ee0a4d2429bf58a54
diff --git a/dev-python/pytest-asyncio/pytest-asyncio-0.17.2.ebuild b/dev-python/pytest-asyncio/pytest-asyncio-0.17.2.ebuild
deleted file mode 100644
index b3d8880c15cc..000000000000
--- a/dev-python/pytest-asyncio/pytest-asyncio-0.17.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Library for testing asyncio code with pytest"
-HOMEPAGE="https://github.com/pytest-dev/pytest-asyncio
-	https://pypi.org/project/pytest-asyncio/"
-SRC_URI="https://github.com/pytest-dev/pytest-asyncio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/pytest-5.4.0[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-3.64[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-EPYTEST_DESELECT=(
-	# rely on precise warning counts
-	tests/modes/test_legacy_mode.py
-)
diff --git a/dev-python/pytest-asyncio/pytest-asyncio-0.18.2.ebuild b/dev-python/pytest-asyncio/pytest-asyncio-0.18.2.ebuild
deleted file mode 100644
index 4bafcf86eb24..000000000000
--- a/dev-python/pytest-asyncio/pytest-asyncio-0.18.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Library for testing asyncio code with pytest"
-HOMEPAGE="https://github.com/pytest-dev/pytest-asyncio
-	https://pypi.org/project/pytest-asyncio/"
-SRC_URI="https://github.com/pytest-dev/pytest-asyncio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/pytest-5.4.0[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-3.64[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-EPYTEST_DESELECT=(
-	# rely on precise warning counts
-	tests/modes/test_legacy_mode.py
-)
diff --git a/dev-python/pytest-asyncio/pytest-asyncio-0.18.3.ebuild b/dev-python/pytest-asyncio/pytest-asyncio-0.18.3.ebuild
index 85e4d1ebf9e5..f938dbb065c2 100644
--- a/dev-python/pytest-asyncio/pytest-asyncio-0.18.3.ebuild
+++ b/dev-python/pytest-asyncio/pytest-asyncio-0.18.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/pytest-dev/pytest-asyncio/archive/v${PV}.tar.gz -> $
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/pytest-5.4.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/pytest-flake8/pytest-flake8-1.1.1.ebuild b/dev-python/pytest-flake8/pytest-flake8-1.1.1.ebuild
index edc96e38ad2e..1d8538932278 100644
--- a/dev-python/pytest-flake8/pytest-flake8-1.1.1.ebuild
+++ b/dev-python/pytest-flake8/pytest-flake8-1.1.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 x86"
 
 RDEPEND="
 	>=dev-python/flake8-4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/readme_renderer/Manifest b/dev-python/readme_renderer/Manifest
index 5be02713c21c..86f48242c847 100644
--- a/dev-python/readme_renderer/Manifest
+++ b/dev-python/readme_renderer/Manifest
@@ -1,3 +1 @@
-DIST readme_renderer-32.0.tar.gz 27812 BLAKE2B 9e5052bd6d14c9ae6c405934919b2e2555094892f569c3acae2149607c5d94c9522e994110b1b9607429eaf865925a3fbbda5eb78e3ac9ce66024d229c6b223f SHA512 58f3dfe6e19074e8f0c5bb8125c9b414651008cc1246a5100018f24dbb199f5d9d920a0201afe06fc9921d86fca339bd1ebd1b4d8c0606aa59e6e2edd1e8bf56
-DIST readme_renderer-33.0.tar.gz 29091 BLAKE2B 432679073927f12de28dd20396a47bdc59be3a20a02ddc9c79f900d291a70ff92744450a86422aae414fa3fa9a70c0ba13f97a04f30ce7e35117411d2a8c7768 SHA512 5ae21702f6fada1c86962677944e23e6602e0b49c559e64b45cf2e161c22ec627adc9d1f68375446808f479fec43b9020f0b0870eec22fe2725e14661036c84c
 DIST readme_renderer-34.0.tar.gz 28835 BLAKE2B 556088064a27ca0ab556102a9bc7026f5089e8a326631c0b7d3d5d0906b63191fac1f4f473c5c3229c0357b090bb63c8bbf0cab66e793c5de0d8eb8da696d2db SHA512 835beadb6dd98793cfce1a1691c66121ad2df9d205d9e1415bf8555495460af7003c9153a58fe5ea0909541b305d2fc4a39120f395805514e11fe391783447a3
diff --git a/dev-python/readme_renderer/readme_renderer-32.0.ebuild b/dev-python/readme_renderer/readme_renderer-32.0.ebuild
deleted file mode 100644
index f544490e1978..000000000000
--- a/dev-python/readme_renderer/readme_renderer-32.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="a library for rendering \"readme\" descriptions for Warehouse"
-HOMEPAGE="https://github.com/pypa/readme_renderer https://pypi.org/project/readme-renderer/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/bleach-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/docutils-0.13.1[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.5.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )
-"
-
-DOCS=( README.rst )
-
-distutils_enable_tests pytest
diff --git a/dev-python/readme_renderer/readme_renderer-33.0.ebuild b/dev-python/readme_renderer/readme_renderer-33.0.ebuild
deleted file mode 100644
index b6a8fc836a43..000000000000
--- a/dev-python/readme_renderer/readme_renderer-33.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="a library for rendering \"readme\" descriptions for Warehouse"
-HOMEPAGE="https://github.com/pypa/readme_renderer https://pypi.org/project/readme-renderer/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/bleach-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/docutils-0.13.1[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.5.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )
-"
-
-DOCS=( README.rst )
-
-distutils_enable_tests pytest
diff --git a/dev-python/readme_renderer/readme_renderer-34.0.ebuild b/dev-python/readme_renderer/readme_renderer-34.0.ebuild
index 9e3c364b9ac4..8f9babc5cfd8 100644
--- a/dev-python/readme_renderer/readme_renderer-34.0.ebuild
+++ b/dev-python/readme_renderer/readme_renderer-34.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/bleach-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/regex/regex-2022.3.15.ebuild b/dev-python/regex/regex-2022.3.15.ebuild
index 3feb42793209..d351dbbe6c29 100644
--- a/dev-python/regex/regex-2022.3.15.ebuild
+++ b/dev-python/regex/regex-2022.3.15.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="doc"
 
 PATCHES=(
diff --git a/dev-python/responses/Manifest b/dev-python/responses/Manifest
index c3ebbdab0779..9440a5a42b22 100644
--- a/dev-python/responses/Manifest
+++ b/dev-python/responses/Manifest
@@ -1,3 +1 @@
-DIST responses-0.18.0.tar.gz 45885 BLAKE2B 1503f38adc6aada9130a08720781565200d6b1b36c6c482f0f74280d80527b0faba451bd03ccdbfaa816f2dbadae337e47cffc271f0cca416804b13eabe80d9a SHA512 c443c01c0bf5d8aba4159817bf5ec6b3e83fc02db0349f6aa138afe74c9cba72347561c02511994b1aa3dc54d77ba4c1c89ccb73197ecaeec9244d919cabd3ae
-DIST responses-0.19.0.tar.gz 50031 BLAKE2B 10e27139ee4b05f409197464a8d18b3232ad909f5df60bfc623f47801d6c387b571330fcdc2ea41c17481b5ba04cc06fb2ee1f064fa58c8e566cd7a11c802462 SHA512 8d133439131c64e7d153eabd9639a6ea2b3766b8f792b8f71900e20db1ab9791922ec885d780a44171582db843fc610fd9d3865a9d87cd73d8cd3018d2bfcb5f
 DIST responses-0.20.0.gh.tar.gz 45072 BLAKE2B 51864ae6de7328507e74f540f9546f16c5da950ebdb29a13760cc1ff4e1d3736f8e61efdd0ce5a427ea7814a9ffdb936496f9787af74ea2f6565d48f6ecbdfb4 SHA512 cce8d6eca05c23ab12ef7e66297dbe1f613c0ac7d46c20b5ea77639cf5be1807ef55e7c71eb5e915ceaa1bc51293a339f9e22a864da0c30c3a676c6c5bea03cd
diff --git a/dev-python/responses/responses-0.18.0.ebuild b/dev-python/responses/responses-0.18.0.ebuild
deleted file mode 100644
index ca22d0e41fc2..000000000000
--- a/dev-python/responses/responses-0.18.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Utility for mocking out the Python Requests library"
-HOMEPAGE="https://github.com/getsentry/responses"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	<dev-python/requests-3[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.10[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/responses/responses-0.19.0.ebuild b/dev-python/responses/responses-0.19.0.ebuild
deleted file mode 100644
index 17e7684fc671..000000000000
--- a/dev-python/responses/responses-0.19.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Utility for mocking out the Python Requests library"
-HOMEPAGE="https://github.com/getsentry/responses"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	<dev-python/requests-3[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.10[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/responses/responses-0.20.0.ebuild b/dev-python/responses/responses-0.20.0.ebuild
index 92ddca65b0d9..fb50bce886b8 100644
--- a/dev-python/responses/responses-0.20.0.ebuild
+++ b/dev-python/responses/responses-0.20.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	<dev-python/requests-3[${PYTHON_USEDEP}]
diff --git a/dev-python/sentry-sdk/Manifest b/dev-python/sentry-sdk/Manifest
index 0fafe022d84d..c41fd11fe043 100644
--- a/dev-python/sentry-sdk/Manifest
+++ b/dev-python/sentry-sdk/Manifest
@@ -1,3 +1,2 @@
-DIST sentry-sdk-1.5.6.gh.tar.gz 244568 BLAKE2B 5b9270787abaeadf2b5a15686aa07f60766cbe56c8c657801a88d6074ecab83fd38c3e0d1f0586cd8c8d5e36c5ffc97eec47998bf27bd9461ace9b8a83a2201d SHA512 628b8281e5c267a988730c0ddcb9348a43ce2cffe9b664619e6b5bc6ec4c0034898082b0b57bc2a8ea3100042a1bfb570ce4dd36a23ba412661ee902dfa41492
 DIST sentry-sdk-1.5.7.gh.tar.gz 244753 BLAKE2B 343c9439525f7609eb3c3962213c8c4b5493d2ace8143d3bb36cd4b13463f4548597f80ac49288d925e0f03a9675b1ed24744eb4cfa3dbe2700a19f2e03585d3 SHA512 8d5e41967387463ed50b4cd582ac0492905bb9cd8740054690f176b8ba07a095836141f4f23791a83909bdb18d4b006aeb0ff963c1663f97305bbdd819a2889a
 DIST sentry-sdk-1.5.8.gh.tar.gz 245374 BLAKE2B 0a94db069786813ce38346d50c51173cef5a47099232d56ecc561ebaf7e9ff3ef1063f964370aaf0f184ec02af7652db59153fa1bf3425e6c75c0a4c73c4ede2 SHA512 992cebceb9b3b2a861b6f084a1ae88f93a8cf740b8f0407550c31af9a9332afdeeb6e64d0dd29b2f80ac1cdade942ada90756c6fbc3373f3ee1948b9d037b59b
diff --git a/dev-python/sentry-sdk/sentry-sdk-1.5.6.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.5.6.ebuild
deleted file mode 100644
index a3b98b30d446..000000000000
--- a/dev-python/sentry-sdk/sentry-sdk-1.5.6.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python client for Sentry"
-HOMEPAGE="https://sentry.io/ https://pypi.org/project/sentry-sdk/"
-SRC_URI="
-	https://github.com/getsentry/sentry-python/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/sentry-python-${PV}"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
-
-RDEPEND="
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/asttokens[${PYTHON_USEDEP}]
-		dev-python/django[${PYTHON_USEDEP}]
-		dev-python/executing[${PYTHON_USEDEP}]
-		dev-python/fakeredis[${PYTHON_USEDEP}]
-		dev-python/flask-login[${PYTHON_USEDEP}]
-		dev-python/gevent[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pyrsistent[${PYTHON_USEDEP}]
-		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
-		dev-python/pytest-django[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-		dev-python/werkzeug[${PYTHON_USEDEP}]
-		dev-python/zope-event[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/eventlet[${PYTHON_USEDEP}]
-		' python3_{8..9})
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# tests require Internet access
-	tests/integrations/httpx/test_httpx.py
-	tests/integrations/requests/test_requests.py
-	tests/integrations/stdlib/test_httplib.py
-	# wtf is it supposed to do?!
-	tests/integrations/gcp/test_gcp.py
-	# broken by rq-1.10.1 (optional dep)
-	tests/integrations/rq/test_rq.py
-)
-
-EPYTEST_DESELECT=(
-	# hangs
-	'tests/test_transport.py::test_transport_works'
-	# TODO
-	'tests/test_basics.py::test_auto_enabling_integrations_catches_import_error'
-	tests/test_client.py::test_databag_depth_stripping
-	tests/test_client.py::test_databag_string_stripping
-	tests/test_client.py::test_databag_breadth_stripping
-	tests/integrations/asgi/test_asgi.py::test_websocket
-	# incompatible version?
-	tests/integrations/falcon/test_falcon.py
-	tests/integrations/sqlalchemy/test_sqlalchemy.py::test_too_large_event_truncated
-	# test_circular_references: apparently fragile
-	'tests/integrations/threading/test_threading.py::test_circular_references'
-	# test for new feature, fails with IndexError
-	tests/integrations/wsgi/test_wsgi.py::test_session_mode_defaults_to_request_mode_in_wsgi_handler
-	# TODO
-	tests/integrations/wsgi/test_wsgi.py::test_auto_session_tracking_with_aggregates
-)
diff --git a/dev-python/sentry-sdk/sentry-sdk-1.5.7.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.5.7.ebuild
index ddaca8514239..a3b98b30d446 100644
--- a/dev-python/sentry-sdk/sentry-sdk-1.5.7.ebuild
+++ b/dev-python/sentry-sdk/sentry-sdk-1.5.7.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/sentry-python-${PV}"
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	dev-python/urllib3[${PYTHON_USEDEP}]
diff --git a/dev-python/setuptools/setuptools-62.0.0.ebuild b/dev-python/setuptools/setuptools-62.0.0.ebuild
index 18c498ca52de..50aec049f4bf 100644
--- a/dev-python/setuptools/setuptools-62.0.0.ebuild
+++ b/dev-python/setuptools/setuptools-62.0.0.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~m68k ~x86"
+KEYWORDS="~amd64 ~hppa ~ia64 ~m68k ~s390 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/snappy/snappy-0.6.1.ebuild b/dev-python/snappy/snappy-0.6.1.ebuild
index cc2c7ab3c390..60a8cba8f96b 100644
--- a/dev-python/snappy/snappy-0.6.1.ebuild
+++ b/dev-python/snappy/snappy-0.6.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~riscv x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 
 DEPEND=">=app-arch/snappy-1.0.2:="
diff --git a/dev-python/soupsieve/soupsieve-2.3.2.ebuild b/dev-python/soupsieve/soupsieve-2.3.2.ebuild
index 5fd0b929f012..6772a48ea185 100644
--- a/dev-python/soupsieve/soupsieve-2.3.2.ebuild
+++ b/dev-python/soupsieve/soupsieve-2.3.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~riscv ~s390 ~sparc"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~ppc ~riscv ~s390 ~sparc"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/uri_template/uri_template-1.1.0.ebuild b/dev-python/uri_template/uri_template-1.1.0.ebuild
index 71f3e8d7cf4c..92022bfae4ff 100644
--- a/dev-python/uri_template/uri_template-1.1.0.ebuild
+++ b/dev-python/uri_template/uri_template-1.1.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 python_test() {
 	"${EPYTHON}" "test.py" || die "Tests fail with ${EPYTHON}."
diff --git a/dev-python/versioneer/Manifest b/dev-python/versioneer/Manifest
index 3d6e7daec8db..60fa4208476b 100644
--- a/dev-python/versioneer/Manifest
+++ b/dev-python/versioneer/Manifest
@@ -1,2 +1 @@
-DIST versioneer-0.21.tar.gz 50072 BLAKE2B 83b56dc61b7ba6dd1fb274f08b08e501ab0e209d915785c3a62d733524270a8bd1f60fb09dd3d97c2030fa4e8e154e8351de51beb17774189ae68c12fca1e12a SHA512 a75e68cf1d11ddca220e8e617cd4c2e17b20d8d683c9e6ab94e8470695eee8fa00f7b5a9cb5cfeabd984446dffab70cb7acc749296c235a6a6f1c815f1729583
 DIST versioneer-0.22.tar.gz 50847 BLAKE2B 3508ac89e65df7a936168fefc1a557191d9362ba69fc9b79eea495cb340c9e314ba5fbac28041bc502aee3adff555e56b43e4ff7fb0d682e96fc3e2ad6bddbad SHA512 f02d50a47c1990275ebf9e720bdb7f13e5fbfc344b361197ecb7602e5ff02e438e43983b4e1cbfde5aa6fa4328a1ffdac60009d6925cf027e484b0ce12587484
diff --git a/dev-python/versioneer/versioneer-0.21.ebuild b/dev-python/versioneer/versioneer-0.21.ebuild
deleted file mode 100644
index 68abcfe4e995..000000000000
--- a/dev-python/versioneer/versioneer-0.21.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Easy VCS-based management of project version strings"
-HOMEPAGE="
-	https://pypi.org/project/versioneer/
-	https://github.com/python-versioneer/python-versioneer/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="public-domain"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-
-python_test() {
-	esetup.py make_versioneer
-
-	git config --global user.email "you@example.com" || die
-	git config --global user.name "Your Name" || die
-
-	"${EPYTHON}" test/git/test_git.py -v || die
-}
diff --git a/dev-python/versioneer/versioneer-0.22.ebuild b/dev-python/versioneer/versioneer-0.22.ebuild
index 3b6c38d45f96..26a6b44a883d 100644
--- a/dev-python/versioneer/versioneer-0.22.ebuild
+++ b/dev-python/versioneer/versioneer-0.22.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="public-domain"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/werkzeug/werkzeug-2.1.1.ebuild b/dev-python/werkzeug/werkzeug-2.1.1.ebuild
index 2ac1283d7a21..f3873c2cd282 100644
--- a/dev-python/werkzeug/werkzeug-2.1.1.ebuild
+++ b/dev-python/werkzeug/werkzeug-2.1.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/wsproto/wsproto-1.1.0.ebuild b/dev-python/wsproto/wsproto-1.1.0.ebuild
index b53f8f9a297a..4b222c655578 100644
--- a/dev-python/wsproto/wsproto-1.1.0.ebuild
+++ b/dev-python/wsproto/wsproto-1.1.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/h11-0.9[${PYTHON_USEDEP}]
diff --git a/dev-python/zconfig/zconfig-3.6.0-r1.ebuild b/dev-python/zconfig/zconfig-3.6.0-r1.ebuild
new file mode 100644
index 000000000000..d7e42ba69d4d
--- /dev/null
+++ b/dev-python/zconfig/zconfig-3.6.0-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1
+
+MY_P="ZConfig-${PV}"
+DESCRIPTION="Configuration library supporting a hierarchical schema-driven model"
+HOMEPAGE="https://pypi.org/project/ZConfig/"
+SRC_URI="mirror://pypi/${MY_P:0:1}/ZConfig/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="
+	test? (
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/manuel[${PYTHON_USEDEP}]
+		dev-python/zope-exceptions[${PYTHON_USEDEP}]
+		dev-python/zope-interface[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( CHANGES.rst README.rst )
+
+distutils_enable_tests unittest
+distutils_enable_sphinx doc dev-python/sphinxcontrib-programoutput
diff --git a/dev-python/zconfig/zconfig-3.6.0.ebuild b/dev-python/zconfig/zconfig-3.6.0.ebuild
index 09bfda7f4e2b..d7dda089baee 100644
--- a/dev-python/zconfig/zconfig-3.6.0.ebuild
+++ b/dev-python/zconfig/zconfig-3.6.0.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=8
@@ -23,7 +23,6 @@ BDEPEND="
 		dev-python/manuel[${PYTHON_USEDEP}]
 		dev-python/zope-exceptions[${PYTHON_USEDEP}]
 		dev-python/zope-interface[${PYTHON_USEDEP}]
-		dev-python/zope-testrunner[${PYTHON_USEDEP}]
 	)"
 
 DOCS=( CHANGES.rst README.rst )
diff --git a/dev-python/zope-component/zope-component-4.4.1-r1.ebuild b/dev-python/zope-component/zope-component-4.4.1-r1.ebuild
new file mode 100644
index 000000000000..c2976b085a87
--- /dev/null
+++ b/dev-python/zope-component/zope-component-4.4.1-r1.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
+
+MY_PN=zope.component
+MY_P=${MY_PN}-${PV}
+DESCRIPTION="Zope Component Architecture"
+HOMEPAGE="
+	https://pypi.org/project/zope.component/
+	https://github.com/zopefoundation/zope.component/
+"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/zope-event[${PYTHON_USEDEP}]
+	>=dev-python/zope-interface-4.1.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/zope-configuration[${PYTHON_USEDEP}]
+		dev-python/zope-i18nmessageid[${PYTHON_USEDEP}]
+		dev-python/zope-testing[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# strip rdep specific to namespaces
+	sed -i -e "/'setuptools'/d" setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
+
+python_test() {
+	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
+	# this is needed to keep the tests working while
+	# dev-python/namespace-zope is still installed
+	cat > zope/__init__.py <<-EOF || die
+		__path__ = __import__('pkgutil').extend_path(__path__, __name__)
+	EOF
+	eunittest
+	rm zope/__init__.py || die
+}
diff --git a/dev-python/zope-configuration/Manifest b/dev-python/zope-configuration/Manifest
index fca899e8dd30..755bd93938a9 100644
--- a/dev-python/zope-configuration/Manifest
+++ b/dev-python/zope-configuration/Manifest
@@ -1,2 +1 @@
-DIST zope.configuration-4.4.0.tar.gz 83230 BLAKE2B c33dd8cc8192965e3555f8063dbd55b47376696964248583c7479098d00339ec0a7caec8c11e66b9ce133880ba6c04dc8b790f03e18864dc361d3b5d5ed0ddfe SHA512 6383c8e19ddbde098a545b6f22b21eadc860980e8248d05c2e29832971c2060fcde6f5092425d12198e97851f0b7b5edb0b83cc6725cda433867762778c896f9
 DIST zope.configuration-4.4.1.tar.gz 83825 BLAKE2B 9cf55417710c364611f0548cd1249dfb61d16c4f1a5f8f3918b2f9f38ba9904698317b922dccf736ab83f2b9cdd2bb4f7ca7330cd311d00e8d48afbd29f9cd86 SHA512 61e3e5cc6220c3ef86881d49c09b208d12491a5d7f5d82810ff1713f68ff1657dfb505b511e78e86b39d204c4ff8bc687695ad8b2ed816b457b52f913c70669b
diff --git a/dev-python/zope-configuration/zope-configuration-4.4.0-r1.ebuild b/dev-python/zope-configuration/zope-configuration-4.4.0-r1.ebuild
deleted file mode 100644
index fd4ae5aedea6..000000000000
--- a/dev-python/zope-configuration/zope-configuration-4.4.0-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Zope Configuration Architecture"
-HOMEPAGE="https://github.com/zopefoundation/zope.configuration
-	https://zopeconfiguration.readthedocs.io/en/latest/"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-RDEPEND="dev-python/zope-i18nmessageid[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]
-	>=dev-python/zope-schema-4.9[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/manuel[${PYTHON_USEDEP}]
-		dev-python/zope-testing[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-python_test() {
-	eunittest src
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	# remove .pth files since dev-python/namespace-zope handles the ns
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/zope-configuration/zope-configuration-4.4.1-r1.ebuild b/dev-python/zope-configuration/zope-configuration-4.4.1-r1.ebuild
index 58281bdf0f72..4cc62bb787f1 100644
--- a/dev-python/zope-configuration/zope-configuration-4.4.1-r1.ebuild
+++ b/dev-python/zope-configuration/zope-configuration-4.4.1-r1.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 
 RDEPEND="
 	dev-python/zope-i18nmessageid[${PYTHON_USEDEP}]
@@ -38,16 +38,24 @@ BDEPEND="
 
 distutils_enable_tests unittest
 
+src_prepare() {
+	# strip rdep specific to namespaces
+	sed -i -e "/'setuptools'/d" setup.py || die
+	distutils-r1_src_prepare
+}
+
 python_compile() {
 	distutils-r1_python_compile
 	find "${BUILD_DIR}" -name '*.pth' -delete || die
 }
 
 python_test() {
-	cd "${BUILD_DIR}/install$(python_get_sitedir)/zope" || die
-	cat > __init__.py <<-EOF || die
-		__import__('pkg_resources').declare_namespace(__name__)
+	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
+	# this is needed to keep the tests working while
+	# dev-python/namespace-zope is still installed
+	cat > zope/__init__.py <<-EOF || die
+		__path__ = __import__('pkgutil').extend_path(__path__, __name__)
 	EOF
-	eunittest -s configuration/tests
-	rm __init__.py || die
+	eunittest
+	rm zope/__init__.py || die
 }
diff --git a/dev-python/zope-deprecation/zope-deprecation-4.4.0-r1.ebuild b/dev-python/zope-deprecation/zope-deprecation-4.4.0-r1.ebuild
new file mode 100644
index 000000000000..4388c9eeb50f
--- /dev/null
+++ b/dev-python/zope-deprecation/zope-deprecation-4.4.0-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+MY_PN=${PN/-/.}
+MY_P=${MY_PN}-${PV}
+DESCRIPTION="Zope Deprecation Infrastructure"
+HOMEPAGE="
+	https://pypi.org/project/zope.deprecation/
+	https://github.com/zopefoundation/zope.deprecation/
+"
+SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# strip rdep specific to namespaces
+	sed -i -e "/'setuptools'/d" setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
+
+python_test() {
+	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
+	# this is needed to keep the tests working while
+	# dev-python/namespace-zope is still installed
+	cat > zope/__init__.py <<-EOF || die
+		__path__ = __import__('pkgutil').extend_path(__path__, __name__)
+	EOF
+	eunittest
+	rm zope/__init__.py || die
+}
diff --git a/dev-python/zope-event/zope-event-4.5.0-r2.ebuild b/dev-python/zope-event/zope-event-4.5.0-r2.ebuild
new file mode 100644
index 000000000000..a48e889f3f0f
--- /dev/null
+++ b/dev-python/zope-event/zope-event-4.5.0-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+MY_PN=${PN/-/.}
+MY_P=${MY_PN}-${PV}
+DESCRIPTION="Event publishing / dispatch, used by Zope Component Architecture"
+HOMEPAGE="
+	https://pypi.org/project/zope.event/
+	https://github.com/zopefoundation/zope.event/
+"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# strip rdep specific to namespaces
+	sed -i -e "/'setuptools'/d" setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
+
+python_test() {
+	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
+	# this is needed to keep the tests working while
+	# dev-python/namespace-zope is still installed
+	cat > zope/__init__.py <<-EOF || die
+		__path__ = __import__('pkgutil').extend_path(__path__, __name__)
+	EOF
+	eunittest
+	rm zope/__init__.py || die
+}
diff --git a/dev-python/zope-exceptions/Manifest b/dev-python/zope-exceptions/Manifest
index 67261529a5bd..d3cc351c6b45 100644
--- a/dev-python/zope-exceptions/Manifest
+++ b/dev-python/zope-exceptions/Manifest
@@ -1,2 +1 @@
-DIST zope.exceptions-4.4.tar.gz 28243 BLAKE2B 9af0b99826d574218c149c5a378886d3b3ec16935c0b6b883c0e048b22ba5ffee8408597f612a668eb18fc855a236e3810d6320c984faca4b7c5dfb4c76b303b SHA512 6ef175271ad1d62b450533e4c7d8f7380ffac519be5c48be084be297ad21d21fd8be380d9b5e221a8dac6a4c792bab14abc707331415c2df88208cac9c34013e
 DIST zope.exceptions-4.5.tar.gz 29609 BLAKE2B 63c853105d3a588418f79e877aeedf0b001bbe52eb3e6c82687127a8cc0b8e424143e75c7a77b224ede31c5db0efb1bbc126e851dbc8bef5b856615b0717f6ea SHA512 f3f75b2f9ecfe74d3bb081904750769bf331fb594d266907782b7ce7f9d062c261b2f95a50ce21cf8917c56a25899274dae466a5b59afa5ec66480182df55bd2
diff --git a/dev-python/zope-exceptions/files/zope-exceptions-4.4-fix-test-py3.10.patch b/dev-python/zope-exceptions/files/zope-exceptions-4.4-fix-test-py3.10.patch
deleted file mode 100644
index a218797b25a2..000000000000
--- a/dev-python/zope-exceptions/files/zope-exceptions-4.4-fix-test-py3.10.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 71be9d0724f087c99857edeef514d0b99e429cc9 Mon Sep 17 00:00:00 2001
-From: Zamarin Arthur <arthurzam@gmail.com>
-Date: Mon, 31 May 2021 12:14:30 +0300
-Subject: [PATCH] Adapt to python 3.10 SyntaxError messages
-
-Signed-off-by: Zamarin Arthur <arthurzam@gmail.com>
----
- src/zope/exceptions/tests/test_exceptionformatter.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/zope/exceptions/tests/test_exceptionformatter.py b/src/zope/exceptions/tests/test_exceptionformatter.py
-index 64729b1..0f5ee8c 100644
---- a/src/zope/exceptions/tests/test_exceptionformatter.py
-+++ b/src/zope/exceptions/tests/test_exceptionformatter.py
-@@ -668,7 +668,7 @@ def test_multiline_exception(self):
-         self.assertEqual(lines[0], '    syntax error')
-         # PyPy has a shorter prefix
-         self.assertTrue(lines[1].endswith('    ^'))
--        self.assertEqual(lines[2], 'SyntaxError: invalid syntax')
-+        self.assertRegex(lines[2], '^SyntaxError: invalid syntax')
- 
-     def test_traceback_info_non_ascii(self):
-         __traceback_info__ = u"Have a Snowman: \u2603"
diff --git a/dev-python/zope-exceptions/zope-exceptions-4.4.ebuild b/dev-python/zope-exceptions/zope-exceptions-4.4.ebuild
deleted file mode 100644
index cb0eb471fe6a..000000000000
--- a/dev-python/zope-exceptions/zope-exceptions-4.4.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="General purpose exceptions for Zope packages"
-HOMEPAGE="https://pypi.org/project/zope.exceptions/ https://github.com/zopefoundation/zope.exceptions"
-SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-BDEPEND="test? ( dev-python/zope-testrunner[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-test-py3.10.patch"
-)
-
-distutils_enable_tests setup.py
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	# remove .pth files since dev-python/namespace-zope handles the ns
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/zope-exceptions/zope-exceptions-4.5.ebuild b/dev-python/zope-exceptions/zope-exceptions-4.5.ebuild
index 5e58ccfcaf21..26ffee12c0a9 100644
--- a/dev-python/zope-exceptions/zope-exceptions-4.5.ebuild
+++ b/dev-python/zope-exceptions/zope-exceptions-4.5.ebuild
@@ -12,7 +12,8 @@ MY_P=${P/-/.}
 DESCRIPTION="General purpose exceptions for Zope packages"
 HOMEPAGE="
 	https://pypi.org/project/zope.exceptions/
-	https://github.com/zopefoundation/zope.exceptions/"
+	https://github.com/zopefoundation/zope.exceptions/
+"
 SRC_URI="mirror://pypi/${PN::1}/${PN/-/.}/${MY_P}.tar.gz"
 S="${WORKDIR}/${MY_P}"
 
@@ -21,16 +22,29 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 RDEPEND="
-	dev-python/namespace-zope[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? ( dev-python/zope-testrunner[${PYTHON_USEDEP}] )"
+	dev-python/zope-interface[${PYTHON_USEDEP}]
+"
 
-distutils_enable_tests setup.py
+distutils_enable_tests unittest
 
-python_install_all() {
-	distutils-r1_python_install_all
+src_prepare() {
+	# strip rdep specific to namespaces
+	sed -i -e "/'setuptools'/d" setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
 
-	# remove .pth files since dev-python/namespace-zope handles the ns
-	find "${D}" -name '*.pth' -delete || die
+python_test() {
+	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
+	# this is needed to keep the tests working while
+	# dev-python/namespace-zope is still installed
+	cat > zope/__init__.py <<-EOF || die
+		__path__ = __import__('pkgutil').extend_path(__path__, __name__)
+	EOF
+	eunittest
+	rm zope/__init__.py || die
 }
diff --git a/dev-python/zope-i18nmessageid/zope-i18nmessageid-5.0.1-r1.ebuild b/dev-python/zope-i18nmessageid/zope-i18nmessageid-5.0.1-r1.ebuild
new file mode 100644
index 000000000000..5a71bfded8d7
--- /dev/null
+++ b/dev-python/zope-i18nmessageid/zope-i18nmessageid-5.0.1-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+MY_PN=${PN/-/.}
+MY_P=${MY_PN}-${PV}
+DESCRIPTION="Zope support for i18nmessageid (tagging source of i18n strings)"
+HOMEPAGE="
+	https://pypi.org/project/zope.i18nmessageid/
+	https://github.com/zopefoundation/zope.i18nmessageid/
+"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# strip rdep specific to namespaces
+	sed -i -e "s:'setuptools',::" setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
+
+python_test() {
+	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
+	# this is needed to keep the tests working while
+	# dev-python/namespace-zope is still installed
+	cat > zope/__init__.py <<-EOF || die
+		__path__ = __import__('pkgutil').extend_path(__path__, __name__)
+	EOF
+	eunittest
+	rm zope/__init__.py || die
+}
diff --git a/dev-python/zope-interface/zope-interface-5.4.0-r1.ebuild b/dev-python/zope-interface/zope-interface-5.4.0-r1.ebuild
new file mode 100644
index 000000000000..f8f341f52ca8
--- /dev/null
+++ b/dev-python/zope-interface/zope-interface-5.4.0-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+MY_PN=${PN/-/.}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Interfaces for Python"
+HOMEPAGE="https://pypi.org/project/zope.interface/ https://github.com/zopefoundation/zope.interface"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+BDEPEND="
+	test? (
+		dev-python/zope-event[${PYTHON_USEDEP}]
+		dev-python/zope-testing[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/5.1.0-drop-coverage.patch
+)
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# strip rdep specific to namespaces
+	sed -i -e "/'setuptools'/d" setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
+
+python_test() {
+	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
+	# this is needed to keep the tests working while
+	# dev-python/namespace-zope is still installed
+	cat > zope/__init__.py <<-EOF || die
+		__path__ = __import__('pkgutil').extend_path(__path__, __name__)
+	EOF
+	eunittest
+	rm zope/__init__.py || die
+}
diff --git a/dev-python/zope-schema/Manifest b/dev-python/zope-schema/Manifest
index 4d2882d2d3dc..77b5b037d689 100644
--- a/dev-python/zope-schema/Manifest
+++ b/dev-python/zope-schema/Manifest
@@ -1,2 +1 @@
-DIST zope.schema-6.1.1.tar.gz 108603 BLAKE2B 9e2d4c48431408fd66c236fad44627f15443e29ff0c4af0a0734c3a1a9dfaee6c772463a7a121112b151699c184d39e307485a981ddb3e13f2f81c7c71543500 SHA512 af51f02818509eacdd558ee04c15bcf4e80321069b8c4a33636d520a8af7509e8d01b391fc1d327fc980ac27388f4e303a870afc5c4f9b5ff0770311a4f26978
 DIST zope.schema-6.2.0.tar.gz 104068 BLAKE2B 10d300b925f57a028b40bbcdfd7b0eb330815b63c86d6ded60fb594d549b1459cb67a99bd19e6d1782104a8bab204d8033ce422b5f9ebddb00e2fdfc1ab7d529 SHA512 f3083e4fc1dc54160c38cf7033519f9f37fef3e39f2f15b53fc4475d0989932448a018d77f8562870f4df85c5bf35bc756aec97868cd35ca07b733cf5796f00f
diff --git a/dev-python/zope-schema/zope-schema-6.1.1.ebuild b/dev-python/zope-schema/zope-schema-6.1.1.ebuild
deleted file mode 100644
index 694de422afae..000000000000
--- a/dev-python/zope-schema/zope-schema-6.1.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Zope schema Architecture"
-HOMEPAGE="https://github.com/zopefoundation/zope.schema"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
-	dev-python/zope-event[${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-5.0.0[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/zope-i18nmessageid[${PYTHON_USEDEP}]
-		dev-python/zope-testing[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests unittest
-
-python_test() {
-	eunittest src
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	# remove .pth files since dev-python/namespace-zope handles the ns
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/zope-schema/zope-schema-6.2.0-r1.ebuild b/dev-python/zope-schema/zope-schema-6.2.0-r1.ebuild
new file mode 100644
index 000000000000..aebe64da5975
--- /dev/null
+++ b/dev-python/zope-schema/zope-schema-6.2.0-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+MY_PN=${PN/-/.}
+MY_P=${MY_PN}-${PV}
+DESCRIPTION="Zope schema Architecture"
+HOMEPAGE="
+	https://pypi.org/project/zope.schema/
+	https://github.com/zopefoundation/zope.schema/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/zope-event[${PYTHON_USEDEP}]
+	>=dev-python/zope-interface-5.0.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/zope-i18nmessageid[${PYTHON_USEDEP}]
+		dev-python/zope-testing[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# strip rdep specific to namespaces
+	sed -i -e "/'setuptools'/d" setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
+
+python_test() {
+	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
+	# this is needed to keep the tests working while
+	# dev-python/namespace-zope is still installed
+	cat > zope/__init__.py <<-EOF || die
+		__path__ = __import__('pkgutil').extend_path(__path__, __name__)
+	EOF
+	eunittest
+	rm zope/__init__.py || die
+}
diff --git a/dev-python/zope-schema/zope-schema-6.2.0.ebuild b/dev-python/zope-schema/zope-schema-6.2.0.ebuild
deleted file mode 100644
index 694de422afae..000000000000
--- a/dev-python/zope-schema/zope-schema-6.2.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Zope schema Architecture"
-HOMEPAGE="https://github.com/zopefoundation/zope.schema"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
-	dev-python/zope-event[${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-5.0.0[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/zope-i18nmessageid[${PYTHON_USEDEP}]
-		dev-python/zope-testing[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests unittest
-
-python_test() {
-	eunittest src
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	# remove .pth files since dev-python/namespace-zope handles the ns
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/zope-testing/Manifest b/dev-python/zope-testing/Manifest
index 8c42f0d8f341..11375d98ff56 100644
--- a/dev-python/zope-testing/Manifest
+++ b/dev-python/zope-testing/Manifest
@@ -1,2 +1 @@
 DIST zope.testing-4.10.tar.gz 45359 BLAKE2B 477d28a7d1a76c0a5111f16859d9e3b9b9ac9cc953b0e2c7dd9ba0a39b498d71442d1b5aaf485455c919ad618efb1f9f9b8e1587fd4905c4a823b04ef09ef8b2 SHA512 35fd5114b6de3cb47336185feb8bf8f444b53ef2c32f165e57756a017ec9caba9a29f2ec01844ebcf156fff1c2b7424b3ac126b3e8d4daefe73e1a640d21589a
-DIST zope.testing-4.9.tar.gz 62294 BLAKE2B 34b2fc10e7220d88451b655d0e43f513d004779c496c824fa3e58b17c883a401f4707d5dbe7a547f1f97fe7db73b25cdf16997f2733b832ceabc37f1d5265397 SHA512 04b660aa93e120ae7e57bf637d99302d26912800ea3995a24c6d252ee4bd8e06fd8d4a24d980f591846d9bca93523373a92528ef492ff4d6990887ab6cf527d0
diff --git a/dev-python/zope-testing/zope-testing-4.10-r1.ebuild b/dev-python/zope-testing/zope-testing-4.10-r1.ebuild
new file mode 100644
index 000000000000..ac80fe188f3a
--- /dev/null
+++ b/dev-python/zope-testing/zope-testing-4.10-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+MY_PN=${PN/-/.}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Zope testing helpers"
+HOMEPAGE="
+	https://pypi.org/project/zope.testing/
+	https://github.com/zopefoundation/zope.testing/
+"
+SRC_URI="mirror://pypi/${P::1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# strip rdep specific to namespaces
+	sed -i -e "/'setuptools'/d" setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
+
+python_test() {
+	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
+	# this is needed to keep the tests working while
+	# dev-python/namespace-zope is still installed
+	cat > zope/__init__.py <<-EOF || die
+		__path__ = __import__('pkgutil').extend_path(__path__, __name__)
+	EOF
+	eunittest
+	rm zope/__init__.py || die
+}
diff --git a/dev-python/zope-testing/zope-testing-4.10.ebuild b/dev-python/zope-testing/zope-testing-4.10.ebuild
index cc6897d77ff3..e8817d05fda2 100644
--- a/dev-python/zope-testing/zope-testing-4.10.ebuild
+++ b/dev-python/zope-testing/zope-testing-4.10.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/zope-testing/zope-testing-4.9.ebuild b/dev-python/zope-testing/zope-testing-4.9.ebuild
deleted file mode 100644
index 6df1b904c9c8..000000000000
--- a/dev-python/zope-testing/zope-testing-4.9.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Zope testing helpers"
-HOMEPAGE="https://pypi.org/project/zope.testing/ https://github.com/zopefoundation/zope.testing"
-SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]"
-
-distutils_enable_tests setup.py
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	# remove .pth files since dev-python/namespace-zope handles the ns
-	find "${D}" -name '*.pth' -delete || die
-}
author	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2022-04-10 01:38:06 +0000
committer	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2022-04-10 01:38:06 +0000
commit	b1a709e20d65de4534cfec94250998850c052218 (patch)
tree	6713ce4446e1e38e53695c5ffda5aded2b068377 /dev-python
parent	90960fa67aeeb922c0726a5c5f25b31d4269d3ed (diff)
download	baldeagleos-repo-b1a709e20d65de4534cfec94250998850c052218.tar.gz baldeagleos-repo-b1a709e20d65de4534cfec94250998850c052218.tar.xz baldeagleos-repo-b1a709e20d65de4534cfec94250998850c052218.zip