gentoo auto-resync : 30:07:2022 - 15:10:23

author: V3n3RiX <venerix@koprulu.sector> 2022-07-30 15:10:23 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-07-30 15:10:23 +0100
commit: 27b0740bf48a0a181090a49d20f368ac8474e90b (patch)
tree: d715e035ea5c7dfe4a21b510e898913c33289cfa /dev-python
parent: ad0412d0cafb8c04ce98024155cf99a4cc27db44 (diff)
46 files changed, 502 insertions, 412 deletions
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 69a46ac27a6b..0fe197d0772f 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/black/Manifest b/dev-python/black/Manifest
index 0795720f1f82..17cf5459b564 100644
--- a/dev-python/black/Manifest
+++ b/dev-python/black/Manifest
@@ -3,5 +3,5 @@ DIST black-22.3.0.tar.gz 1154456 BLAKE2B c89b43722839748dff0ce60debb684cd8eeae5e
 DIST black-22.6.0.gh.tar.gz 1165070 BLAKE2B ce2eef529e230954a13913063dbb9000fa13f4debb2e5ed33605e8efe5c6d62fc1b3c0b7847c26ad931b9becae43fa23b15701a1672c1e056f729810020cc282 SHA512 72e4b4dfc69436e4dbee5a75ea72a1be69a26dc37a5e4d7edfb84d62736f0e0aba8d14420f3069798b568bd8ba916e8850f0c958afc9b6134ee8832e54d3dc4c
 EBUILD black-22.1.0.ebuild 1397 BLAKE2B 89116657e56fb1f9a08ebdfe35de2d5d9761f43c5dff5a2ecfb0c8cf5d68581223dada3d0accb3261bbaabf4c26861dec3e35c482c7afdd8279ee8ab3422418d SHA512 0ec829dc329fab2b7c892405d195e34be8d8e1dd0850940c3727bdec6cd520b4a8d977f6b1a13e97b4622b2d853f9f372a515f457d2161e0412ed6be843f06a3
 EBUILD black-22.3.0.ebuild 1417 BLAKE2B ac11791cabf7d046f6a9a632174ff214c42983a5d152d9be29e8653b192bd8b72ea8f399d2a43bc64ec7c65590ba284082783db81685508e055a9d476f3abc80 SHA512 08f7e446dedbbf21a62b55e10828761c1e3962ce48c2009fe8a7846364386d8b206489eec09c91fb515c83fc54ee2efad5ae13d66427670659b6bad6a3911966
-EBUILD black-22.6.0.ebuild 1421 BLAKE2B c20c133befddbc0041505f068c051ba3f0bf1f2f41bdbd1feb262ded6ff8db8c99bbef6e9fe5e3862b33a0b506e9dd45a449c1be20510666e110f483026e8563 SHA512 311cb67df86040a5504271cb965cc97d3771d1082eb5930ca424ed8fa333cb0d8516406b869ae8010bf3dc736b953870651b06e87383aa6dcb28a927c5ef1360
+EBUILD black-22.6.0.ebuild 1419 BLAKE2B 2028bea11b5d97026d7d0a521eb2cb3d529d0960665077e24147462d33c395c7c3a826fe6025a39996a546eaec16bf819a6adedafe28647e5241f00af44bb73b SHA512 f7d6709795261b578057c8a6457d07e7f57eb39a69ddae7dd696559520ccc30e4abdef4ceef2892d782cd7a8a6b8f0ec70f28bccf8f91a5bd7564bc3fd9b77d3
 MISC metadata.xml 397 BLAKE2B 505ed4127741ef8d2fd77c36e6ad2d6168dca8ae5570cf7606a557fad29393c0dd78fe2eb1fe990d9d69abec19fb65d563481160b0bf0a914997b114e73f7c66 SHA512 357189214d3cc2a026b8c29ee5c695a62d73db229ca1f71372bfc5a1120317a4c4ffac942f5a196f20e84ae8988a4e707d4194ebde12ef7c96eb713b398f587c
diff --git a/dev-python/black/black-22.6.0.ebuild b/dev-python/black/black-22.6.0.ebuild
index b8e64b7fea30..930e1aff074c 100644
--- a/dev-python/black/black-22.6.0.ebuild
+++ b/dev-python/black/black-22.6.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/click-8.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 6787e76c9a10..47e379c6107d 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -3,10 +3,12 @@ DIST boto3-1.24.31.gh.tar.gz 519387 BLAKE2B 8581d1018f0e1f0802779851edb52fdb6860
 DIST boto3-1.24.36.gh.tar.gz 522156 BLAKE2B b76cb50f01ff85c960a0984f950e72f02ac6e85131fd344142b886a3c745cb8b9073f865527911b88c462912413fce6df4066752ab5eec8ad1561d349ad22437 SHA512 fe00e78cc522248c449f83f869bb7d76793db9aa436259e74d0aa25984a02876191a7df41b1ad7658b06e418f248ad616743698c87a5c9696f77a196a53c561e
 DIST boto3-1.24.37.gh.tar.gz 522233 BLAKE2B ab361fd7443ff499c18a8e86c9a80da14e6a1d960fbac26d2e12d8806684daf169010225ce7a402626a814cb29fcc281ea61d293eb5eb197f48dccdb8a7a14ef SHA512 b75ea002f3a3e3b8c498797278adbf5f7d4b220baf7b8fa3be8c972bf2981933d962878b7d96a7c01c9a28be267effea34b48692716e7eabfa077ede380c816e
 DIST boto3-1.24.40.gh.tar.gz 524303 BLAKE2B 750d366914ebbfaab262a88d96afb1df6f16c108e1e07537e0ae2234df95500c7dabaeae27afc5c5cbb8b0370b3a088b97c16a8c48e3d2f5741744841f29fa1b SHA512 240b78619783a30919dc62c6240b07d51c8a4e4ee0fcb6c4daba19c6d5830d8623923de6cb984e7310bf5e745b0d20a2471578a2f8650089aca96e9575d3542a
+DIST boto3-1.24.41.gh.tar.gz 523844 BLAKE2B 0cff30d6aba5e8eddb8f545737e22a146ef9a3c33df2ad5b4f6d0ef8fd67cb46183eb7fa21e8a961d2597df8d965478bcb0038f5dda117611bcfe15f0de26eac SHA512 ad3a6035352c54f7ba0197357a5a4e001c8fe7548121a9a3931acb69f9c098feb8da1d1699ac98d3ff00626f39082753434f1c992351a82cf269ce2c6a4eab06
 EBUILD boto3-1.24.26.ebuild 1579 BLAKE2B 394d8a1bb7a1036ab4821bc789c9eea285f8a6a7c21e751d60c94a53d5fdd37119eab54bfd19bfe0856b7557df04340f50c7cebbe631234e8f582e7d62af13ec SHA512 beee3b634e3b1d66365beb2e97b9d09188fa795e00d9d05f2101de423128741ee1f8ad8ae4b0c35f1e6c6473ce73cc3acf47d9141029b4435d39a9803a5fe1b2
-EBUILD boto3-1.24.31.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
+EBUILD boto3-1.24.31.ebuild 1579 BLAKE2B 394d8a1bb7a1036ab4821bc789c9eea285f8a6a7c21e751d60c94a53d5fdd37119eab54bfd19bfe0856b7557df04340f50c7cebbe631234e8f582e7d62af13ec SHA512 beee3b634e3b1d66365beb2e97b9d09188fa795e00d9d05f2101de423128741ee1f8ad8ae4b0c35f1e6c6473ce73cc3acf47d9141029b4435d39a9803a5fe1b2
 EBUILD boto3-1.24.36.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-1.24.37.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-1.24.40.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
+EBUILD boto3-1.24.41.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-9999.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 MISC metadata.xml 493 BLAKE2B 7d6324fc877ffe1d20c5369c2af0b09a7028f94d28f1841188913d0d8be7ea699c9d3f92c624992c4c96bd69615d3a1211a2483c76c56b7d3082492e43512523 SHA512 44420d8c03d5986f990b76369edfa8dfd7659b4952db3ad946fd05392ec594628a28745ad888d055d4f074d5214f61fcffafe6c04c4ab54109d45ac0371582bd
diff --git a/dev-python/boto3/boto3-1.24.31.ebuild b/dev-python/boto3/boto3-1.24.31.ebuild
index 6edcc751d54b..c93eb5e2d7c0 100644
--- a/dev-python/boto3/boto3-1.24.31.ebuild
+++ b/dev-python/boto3/boto3-1.24.31.ebuild
@@ -25,7 +25,7 @@ else
 		https://github.com/boto/boto3/archive/${PV}.tar.gz
 			-> ${P}.gh.tar.gz
 	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 	# botocore is x.(y+3).z
 	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
diff --git a/dev-python/boto3/boto3-1.24.41.ebuild b/dev-python/boto3/boto3-1.24.41.ebuild
new file mode 100644
index 000000000000..6edcc751d54b
--- /dev/null
+++ b/dev-python/boto3/boto3-1.24.41.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="
+	https://github.com/boto/boto3/
+	https://pypi.org/project/boto3/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="
+		https://github.com/boto/boto3/archive/${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 7ef86b0d546f..bb8305419bdc 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -3,10 +3,12 @@ DIST botocore-1.27.31.tar.gz 9184651 BLAKE2B 01dcd9e94490923f7d0f463d3019007f58c
 DIST botocore-1.27.36.gh.tar.gz 9465835 BLAKE2B c22c341d6e762316f3d8719bd8c1fd52140642739361a7ade326d739005dbd141a6b4e1798287b40bf7ba40cd5e158d36f195893d529f5ba375b06087d2122b9 SHA512 09ef156b3c0457ceef341bf26e3f060d3e91808f1da66d1dbb06ba2826be3c61e047383dc9d8a719bb8e172e91f6475f4613c14d30c57c6a909b51c8ba7334cc
 DIST botocore-1.27.37.gh.tar.gz 9466348 BLAKE2B 56c670e22204dcd12164094d52b1ed4ec820241f1423738e008f24762a5702149f2eb57283ec194a77cc2d57bc1183d91a90ca55ae0cf977aa1abdacb922ed86 SHA512 adb18c54a757077f7cff4b9b6716d015998432faeb3eb7d0a631631e5b0cf7814b40843ba379841cef920d3eca1367623f52491f53fed9f318898b3a6197eac9
 DIST botocore-1.27.40.gh.tar.gz 9491717 BLAKE2B 4c4e96969432426b711642265573b1a3026ea60dbee2328ff34f0c64ad5c911bb773078e8f86882c94abc2b340567e65475ebed146651e92307ddf1629cbe2a0 SHA512 03d174f3c8490470a40ba54568b3ec1fed740acae143964db0618e7d57fd03fd6aae992d7e9dfe3882eae70a082a6974d3356cd7e2c49625eec8270fcb2ef784
+DIST botocore-1.27.41.gh.tar.gz 9493802 BLAKE2B dff510a658e77fe7185a8d118228cd80d06ea066328d39c56eaa8f01459dd11131ca73dcfe464a5e1403f8aceaa96065d5ea335bb268155c81c9b71299488d45 SHA512 29f419c4338e37bcc7fce38836b1f3b0ed1e552ea94cbe77ea09cd18c3c0b80d3405cd4a3468570c7eb6f1301bfed0d26dcc98feb7a1f62b9e8b1b11c61cdac5
 EBUILD botocore-1.27.26.ebuild 1572 BLAKE2B d019098e9bd4f40cfe93307947813ffe3e880e9462b25ff6eaa16caf3ffad2ea5c6db9e482b7b3dc995ca174bde48e90ecd8861a86291c1d454dcf6212bbe7d8 SHA512 db12020b9130b5b940a44ae7fca5a6b0e4c3d84fa2efcff156099d355cab185ea52cb3c4740ebbea25d865d6af8d64ae58ea1e4c6129b1c1026fe8bce6f0580d
-EBUILD botocore-1.27.31.ebuild 1579 BLAKE2B 6223a51641d2a9a33b13fb58d2cb65f1722824f1be352966b98e6da851c83a5c67d26ab3274250cb5e3084dc0b9afe34aa320746d1e09b21f1927dd27875e31c SHA512 f181b6a3f1c9047acad789651b36666cd97ce046b9b0449c8b0162d2fbbda45ed6c30a1ab43228693215ca324079689e622aada7084d2b3516805f96984aa484
+EBUILD botocore-1.27.31.ebuild 1572 BLAKE2B d019098e9bd4f40cfe93307947813ffe3e880e9462b25ff6eaa16caf3ffad2ea5c6db9e482b7b3dc995ca174bde48e90ecd8861a86291c1d454dcf6212bbe7d8 SHA512 db12020b9130b5b940a44ae7fca5a6b0e4c3d84fa2efcff156099d355cab185ea52cb3c4740ebbea25d865d6af8d64ae58ea1e4c6129b1c1026fe8bce6f0580d
 EBUILD botocore-1.27.36.ebuild 1617 BLAKE2B d33413fa74479d5ca72e82609b4b1c57a33f6953d5acb82db1e2f9de7599190c69d8e633ac0da8417121a9959346723f509d5bb8945d1de63689046756ba303a SHA512 20aeccea53aa2e5d294739c9256fb590d21a89c216411383b1bc8c1ee25528ce4ac94fe3a210a1a6ff173b81c1d97b0972d611772963592a9c8be8039c12717a
 EBUILD botocore-1.27.37.ebuild 1617 BLAKE2B d33413fa74479d5ca72e82609b4b1c57a33f6953d5acb82db1e2f9de7599190c69d8e633ac0da8417121a9959346723f509d5bb8945d1de63689046756ba303a SHA512 20aeccea53aa2e5d294739c9256fb590d21a89c216411383b1bc8c1ee25528ce4ac94fe3a210a1a6ff173b81c1d97b0972d611772963592a9c8be8039c12717a
 EBUILD botocore-1.27.40.ebuild 1617 BLAKE2B d33413fa74479d5ca72e82609b4b1c57a33f6953d5acb82db1e2f9de7599190c69d8e633ac0da8417121a9959346723f509d5bb8945d1de63689046756ba303a SHA512 20aeccea53aa2e5d294739c9256fb590d21a89c216411383b1bc8c1ee25528ce4ac94fe3a210a1a6ff173b81c1d97b0972d611772963592a9c8be8039c12717a
+EBUILD botocore-1.27.41.ebuild 1617 BLAKE2B d33413fa74479d5ca72e82609b4b1c57a33f6953d5acb82db1e2f9de7599190c69d8e633ac0da8417121a9959346723f509d5bb8945d1de63689046756ba303a SHA512 20aeccea53aa2e5d294739c9256fb590d21a89c216411383b1bc8c1ee25528ce4ac94fe3a210a1a6ff173b81c1d97b0972d611772963592a9c8be8039c12717a
 EBUILD botocore-9999.ebuild 1617 BLAKE2B d33413fa74479d5ca72e82609b4b1c57a33f6953d5acb82db1e2f9de7599190c69d8e633ac0da8417121a9959346723f509d5bb8945d1de63689046756ba303a SHA512 20aeccea53aa2e5d294739c9256fb590d21a89c216411383b1bc8c1ee25528ce4ac94fe3a210a1a6ff173b81c1d97b0972d611772963592a9c8be8039c12717a
 MISC metadata.xml 499 BLAKE2B e5aaa7da26f200c09adfdf38b68f656bbccbec627cb5d966b280ac2165334e7eec659c89075bcace748f58e2ec3e7d2998e54a688d56ecea2d30653c67dfd35a SHA512 103c554d5dbd967bf9b6e418b3913d9235e7e910d012160909ce0715134ed2e37b06e6a345395f9d16ce08d1cf51f3ce458bce93c6a978fd3dca6610f2acdbd0
diff --git a/dev-python/botocore/botocore-1.27.31.ebuild b/dev-python/botocore/botocore-1.27.31.ebuild
index 830c713f6036..7cd0e672f49a 100644
--- a/dev-python/botocore/botocore-1.27.31.ebuild
+++ b/dev-python/botocore/botocore-1.27.31.ebuild
@@ -21,7 +21,7 @@ if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 RDEPEND="
diff --git a/dev-python/botocore/botocore-1.27.41.ebuild b/dev-python/botocore/botocore-1.27.41.ebuild
new file mode 100644
index 000000000000..6558cbe56a50
--- /dev/null
+++ b/dev-python/botocore/botocore-1.27.41.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="
+	https://github.com/boto/botocore/
+	https://pypi.org/project/botocore/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="
+		https://github.com/boto/botocore/archive/${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	<dev-python/jmespath-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+	)
+
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/cfn-lint/Manifest b/dev-python/cfn-lint/Manifest
index 8b6690465620..d00355aaf663 100644
--- a/dev-python/cfn-lint/Manifest
+++ b/dev-python/cfn-lint/Manifest
@@ -1,7 +1,9 @@
 DIST cfn-lint-0.61.1.gh.tar.gz 9351410 BLAKE2B 442fa5957f8816dc501e91593873c28b1b2e39ec14870b82574d4ca351f321b94a813fd351cc09c7602a177a8451d09cf8459c8aa47b683b9938654c99476e19 SHA512 63071cd1df0115624341fb64bd12a51d7bd38fe4993229a790ca09011b370487cb49397d90916f4df42b5c978cd3832e2de4cec15660ac8668e994adc0e681c3
 DIST cfn-lint-0.61.2.gh.tar.gz 9477584 BLAKE2B 8b65151edcd9323dd44d6a77c39fb3dd90a1934bc1cf3e6cb419e6a33595afeb740591a77a80178cbaa5dadd5183759064807a5a135545c2fb7e8c5a2c8970ba SHA512 ed8e9813f1d12ec0ded203c4c2246592c2aa3466f69ee2a478d9ac579807a610836d862768c259ebec6e421bbe92a5a120c056a5e4b70873e6e044e0c606d021
 DIST cfn-lint-0.61.3.gh.tar.gz 9528542 BLAKE2B 27f5c82c09a7c1dde520189647480032faf808089083ca45a9a2a24e4c158cb8e62ee6ae2f906d6c68021cc34b654ff46c9402876e09dd3330115dead5db44a8 SHA512 db5369a12d88754f6241b4ef529b53d142a80bfcb0c58ac7ec03217e7e4cb7e53f3fde1dde45dfdac82ab3fde4b885bb40dae3076b85edf34ca68cc73dc5aeb1
+DIST cfn-lint-0.61.4.gh.tar.gz 9556069 BLAKE2B 71572546d7e523c11214e32130a7d52461580e487b514846137e6592cb7a1786414556e4bea191aa2e4dddaf338c24e8ea9001e617221ea74b03bd0ea900a5a9 SHA512 fd85af770b5b519c9de4df0acbbaa66a8a7f61efd210a793c2e28ad9e6d6ed2d8b3042ca41d7743b2bc4dc0446b42ea2929cba454fdbf097a482a7c268e04000
 EBUILD cfn-lint-0.61.1.ebuild 1638 BLAKE2B 890ffa9d97980c5fcd532b44c93c9ce851c0ba38214f7ed6ecf3e68a64c1a14adde34594d9a111987a6740fc06dc30d533e9bdfb46f5bbecb6d6563991975b13 SHA512 a298830dc9249612b174d764b201c5e3c65504ae86a40a81453c13ffff12de4d5e79e7110edeb3645a403f94f781fb53e7e850796199d71a386ca99cc2bf0026
 EBUILD cfn-lint-0.61.2.ebuild 1640 BLAKE2B 1c8eb1a6a2321d09f163cffb42d2af24ea43571504519d9fb0c28063d2f5e2d7e8da4b38f814fd348a7cc2a317ddddfab7429376b852febddbfa9ff6c52bff2a SHA512 e13621a54e1eeec34bbf2d9997177d6c0af4a7917c13e13d36d32cc1b07e919012faa58e9599c585e25992fbeb11cc5f7aec85e20d0f54c69d647dc093ce38f2
 EBUILD cfn-lint-0.61.3.ebuild 1640 BLAKE2B ab0b276a17eb6e1736a03f89d00a70a55840063177efdb4ca391f399acb5dea04480b4a31bf9bba12c607f35381d95b44dd6e346141d9e7e084eb4d48fe829e7 SHA512 ebc9ee814224010bf27a5e9675de5e1eed72073441da99ef9b8a3f8c17041eb6855d0951d97aa9e7f6f3d5aab758d594cdb3c93d9d990b4dac990e0fb9434a9a
+EBUILD cfn-lint-0.61.4.ebuild 1640 BLAKE2B ab0b276a17eb6e1736a03f89d00a70a55840063177efdb4ca391f399acb5dea04480b4a31bf9bba12c607f35381d95b44dd6e346141d9e7e084eb4d48fe829e7 SHA512 ebc9ee814224010bf27a5e9675de5e1eed72073441da99ef9b8a3f8c17041eb6855d0951d97aa9e7f6f3d5aab758d594cdb3c93d9d990b4dac990e0fb9434a9a
 MISC metadata.xml 583 BLAKE2B 9f73e2b92e5cfa2ad59f5c8e5d91bdd3aa9eba3fa722b93b388cffea42020db7e7441bab5749432812934a4514d3e9104e6d897e1d115afa5ed237757bd48c03 SHA512 1866a349855ae4e248498b7aabd6ce4c4e10ea58731df4bfa13500f61dc041da6dbd7420e7d6a78fad46d5cf00bd7ef2d0c4c7d6819a21b3a5031b0d49588a19
diff --git a/dev-python/cfn-lint/cfn-lint-0.61.4.ebuild b/dev-python/cfn-lint/cfn-lint-0.61.4.ebuild
new file mode 100644
index 000000000000..57fd1d8c6029
--- /dev/null
+++ b/dev-python/cfn-lint/cfn-lint-0.61.4.ebuild
@@ -0,0 +1,54 @@
+# 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_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="CloudFormation Linter"
+HOMEPAGE="
+	https://github.com/aws-cloudformation/cfn-lint/
+	https://pypi.org/project/cfn-lint/
+"
+SRC_URI="
+	https://github.com/aws-cloudformation/cfn-lint/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/aws-sam-translator-1.47.0[${PYTHON_USEDEP}]
+	dev-python/jsonpatch[${PYTHON_USEDEP}]
+	>=dev-python/jschema_to_python-1.2.3[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
+	dev-python/junit-xml[${PYTHON_USEDEP}]
+	dev-python/networkx[${PYTHON_USEDEP}]
+	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
+	>=dev-python/sarif_om-1.0.4[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# TODO
+	test/unit/module/test_template.py::TestTemplate::test_build_graph
+	# requires git repo
+	test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
+	# Internet
+	test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
+	test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_2
+	test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
+)
+
+src_prepare() {
+	# unpin the deps
+	sed -e 's:~=[0-9.]*::' -i setup.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index 74ffb1e7427a..7b2135281b0a 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -4,6 +4,6 @@ DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69b
 DIST llvmorg-14.0.4.tar.gz 158088617 BLAKE2B 7fb894548dce72593a8639b4d0220d2499577f80d38b97600749c91a498c69dfbbe818cee35e4a76370795e55da7037543ea341ad7567a6f548893c67dce9e64 SHA512 e14e6c3a1915a96e9ddc609f16ca3a398ca6f7fd0a691dadaa24490078a661340e845cb2d18f3679de4f47300bb822c33ae69548af6a0370d55737831a28b959
 EBUILD clang-python-13.0.1.ebuild 925 BLAKE2B 1dab0cbb672643072e7d824a262c81505d19e555f24f97f82156473affc2f5ba6fc34ec493ffeedbc82feb1245fc6a39126e1b81fcdc8f8b4ddd0b7fe108e4bb SHA512 11eaf5c7a484d756f01986eacce19c912666518892f3213ff42367c126c2d8474abf6608cca24e6250c64e7423464e7cb3e58c2b069c7febf4893b249f2ee304
 EBUILD clang-python-14.0.4.ebuild 956 BLAKE2B 491c8335c64484034663fd84ca2397e13afdd8cab6d3b4adfcc9317379e7a3620372ffe5996d4a0029a7d412f11a0d598f741a6893803ebadba85d330e49682a SHA512 4ef0d1ab2cbc3d277d4cced33fa87de7c3d43295a60a3b418ad4a95399e8de8c2e1e5c594681bf7ce1bfc465732d34b2db3a9e8636c0ed124ddf79c8ed7a5750
-EBUILD clang-python-14.0.6.ebuild 958 BLAKE2B 1fd62aa82c0b224e068d043830ad4a0fd44b62161df1e912f53ea0e6ae2a923d4d7f5d2d897d6a74ba1b8fc9a4a8c632072daf9cb50927d73f055a9ffbdd2a00 SHA512 2cf161f95be1521e2e5b6e50c881f90918eefc501059e0d0ab9d376ac56be5dee590d40a79936be021889a8fcb4b98d730316b4dca67e5ee314ff97ef48d1fce
+EBUILD clang-python-14.0.6.ebuild 957 BLAKE2B 90122ccf0d2e1c5b28b2c5e9d2a375a83b9d90667ae126162e82961a6a9ff6d52558e2e13557345a99284fb983f43165a879b235a95f5b58fcf4ad630cef66d0 SHA512 e44eb8e67898caa098cac43038a4fc12b395f4a995ab3621ad82aaba3239a135c4d495149ca2766f84bd981ce8e0149d7bcd1650c8c24629803de531d3c41d76
 EBUILD clang-python-15.0.0.9999.ebuild 935 BLAKE2B 259d469221df0c360735c5c033f89523161f2bf19db811f390973b52229a50b82cb06f96c05230a9862986a77d42466d1b3bc95b5bd30578c96715b28831212a SHA512 a26fbbadeff6657cca7ef915d263bc9a1a4543116bb1f14282b889c5463a662d280ce8d7e7f674753c43b186fb0531062ea86462221adfb4a8b76a50c214aa1d
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/dev-python/clang-python/clang-python-14.0.6.ebuild b/dev-python/clang-python/clang-python-14.0.6.ebuild
index 0b7cef715981..682b499bdda8 100644
--- a/dev-python/clang-python/clang-python-14.0.6.ebuild
+++ b/dev-python/clang-python/clang-python-14.0.6.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/dj-database-url/Manifest b/dev-python/dj-database-url/Manifest
index 62050de3d598..a3bc678537f7 100644
--- a/dev-python/dj-database-url/Manifest
+++ b/dev-python/dj-database-url/Manifest
@@ -1,3 +1,5 @@
 DIST dj-database-url-0.5.0.gh.tar.gz 6309 BLAKE2B 72647f8651d595b4020161b15364836b8483bf8a12ec72e434bc9d0583878ee9f4e4c76110581f285adddac3e7c2d7bc071f720a7fde91c84c3ea53b6c979300 SHA512 541d5177bff0fcc21372d2d9dc699ba11de1b1cabf10d61fb9f1e844a6dd4d46df5c7fdb6ccb4505cf984e41d7a2ae4e3af5e7d05072b0ed6982499eac5aac66
+DIST dj-database-url-1.0.0.gh.tar.gz 11355 BLAKE2B 9ea50eb2646367333556133020a59f332cb69e05fb392f328558f77cb03ffa968cf62241f3823e28600799a1399ac1335b90477a26a4931b0df7b695b502e9be SHA512 35ca0c05910812e10bf63b061afb434ac7c562e3d994b6e452250fe4ec95983fe8353aec0df9c7638a990684e612863ddada5be48485a1db3120e110f6d0fa94
 EBUILD dj-database-url-0.5.0-r1.ebuild 600 BLAKE2B c646cba05e301646b5caeb739ff0303a798aebc74a7138b4169fa486d30ef6cf2cb5931f8cb307330aeb80a83b2e1895cf296a5ee09684006c8a7f1024c605f2 SHA512 81b8af28ca78737c0b190566a9f113b5c7450fa900d5492a879f0755d45d7be7f674590a7c33572ecf1e3a6e28b2f847f85150d1a1e182aa4f778f57b518c7d7
+EBUILD dj-database-url-1.0.0.ebuild 654 BLAKE2B 0da0bb086aa0c39499f59d81e270b903ad6f997621c30f827a2724fc048726dd4184c1ca57939e1552c92cb740d8e60267920e383d83cd0e3a9de7a9fd268131 SHA512 00757c36e3d74cb94fb98a68867550530da8827a27e0dccec9fa10c3a8e692d7da3838181f7989d9928519a56a5e364eb6344469efa09105c4b082c7a9da3540
 MISC metadata.xml 407 BLAKE2B 0a3736cc0034297f64b77b9b795e8cd339ed58c5b213e730f1d3dccabe7cde10570222626b2b520bc0e51a0195cd99baf4ebf7028cc73b7e507603874b1f4143 SHA512 ec842e583cd4e0b632731e395f6e70e519077bfeaeb58bb88b9ad297368443fc06a182c120635eeb1dedb76b166829c6f414925d3061e55d49d7053a72c739eb
diff --git a/dev-python/dj-database-url/dj-database-url-1.0.0.ebuild b/dev-python/dj-database-url/dj-database-url-1.0.0.ebuild
new file mode 100644
index 000000000000..c30f6849ca02
--- /dev/null
+++ b/dev-python/dj-database-url/dj-database-url-1.0.0.ebuild
@@ -0,0 +1,29 @@
+# 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_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Use Database URLs in your Django Application"
+HOMEPAGE="
+	https://github.com/jazzband/dj-database-url/
+	https://pypi.org/project/dj-database-url/
+"
+SRC_URI="
+	https://github.com/jazzband/dj-database-url/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/django[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/exceptiongroup/Manifest b/dev-python/exceptiongroup/Manifest
index eafebefcd3c3..dcbbfeacfc01 100644
--- a/dev-python/exceptiongroup/Manifest
+++ b/dev-python/exceptiongroup/Manifest
@@ -1,3 +1,3 @@
 DIST exceptiongroup-1.0.0rc8.gh.tar.gz 17562 BLAKE2B 617e174e32f4c062f576b12c9dfe96e5495003097dc0da82e383019a65b2a043546d4b73181081defb641d453127e056be52e55e76fdf0ec0247513f5eb211ff SHA512 f7f1700403f345755a1e32c77eb43744b366b1f55446e1898dd960988d23396ad8334bef072ecc7ec5ac7075300f0f3e8e9a0d454d9dd80677ae55b4166fc6e4
-EBUILD exceptiongroup-1.0.0_rc8.ebuild 750 BLAKE2B 6a7d49a320462740a08bc6b874cc4c1cd70673442a778454d1e687d745541d764eee216b84244a3feb4b70a2dc266813e8fcd82ad8d2b1fdef00817fbd56ba27 SHA512 d87ea606b788a22671d20adc94142145da7b4fdc3caa51e31c4f5d589fbd346c2b7d193cd5e60ba9bcca6731f5773ad7381daeee795627b06b5ad55c6be78b0c
+EBUILD exceptiongroup-1.0.0_rc8.ebuild 749 BLAKE2B 6ea7a6f3bd6915e35b171065d59f497870d01255027cbe23d8e00689fb141a532499e9f99c246c38377a9481cad4593c375ac49f7050222ec096bc3df5b969fa SHA512 8d2d25c0be66ead172c0812f77a3e07c6a7a73f60c3ead6050de338327b07753b805cb8fbe0c96452e666b83f3185ba8db589edb79e09888d509788fb0ce26cf
 MISC metadata.xml 360 BLAKE2B accdc2d9dc39a31238555b937189f135482f2094a570396a741ba6202a1243ad46c99003e829e59e4e5fd0db0a01b050cc0e385bf28b44892e3e3c5615351028 SHA512 d740125cf760309a4dc5de1981b5ad704e880c37588e8a0e17816709065d80ad2ffecb3b5e50725b5665a38594a53f9659c17b35eb34bffbb06d11b830d740cd
diff --git a/dev-python/exceptiongroup/exceptiongroup-1.0.0_rc8.ebuild b/dev-python/exceptiongroup/exceptiongroup-1.0.0_rc8.ebuild
index ad20b3089ed9..68fe6276fbe5 100644
--- a/dev-python/exceptiongroup/exceptiongroup-1.0.0_rc8.ebuild
+++ b/dev-python/exceptiongroup/exceptiongroup-1.0.0_rc8.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT PSF-2.4"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/flit_scm/Manifest b/dev-python/flit_scm/Manifest
index a7098f4ce5b5..2055f13f9b0a 100644
--- a/dev-python/flit_scm/Manifest
+++ b/dev-python/flit_scm/Manifest
@@ -1,5 +1,5 @@
 DIST flit_scm-1.6.2.tar.bz2 3230 BLAKE2B 3977f1be820f2f590f4f781f065661adfc4a05427a87882093acad81f87eee2ba20d910ba3662b5b19997735f0356d262a4f150ba940310166b62a019b68ba05 SHA512 32690af4d24eb704338c78fdb0080d9f910a0741066d282e79eb88c473ada8d9a3daeba1a9aecfe830b2a6d0cea8da471bf6ef904b105fd8036994e4a0e12d12
 DIST flit_scm-1.7.0.tar.bz2 3259 BLAKE2B 9b785f9f92b16494f6bf0c21e16ee1abf6a130ebb5c41d4e0e73f4ab1c892ec14544a4b86fe9ba22dbb43a2c28cebbe84328c172566b27c195d41e3686184b9e SHA512 a030cd2ab9d100b971ac20ad5f52f206d951fb6c88cd48db0250269a32cf0dfae70738bf3dc4d36396a3da3e09c7283eec365e12608f6f6d7be3e9076bb931d2
-EBUILD flit_scm-1.6.2.ebuild 897 BLAKE2B 82e34689a8fda0e187bf972f5f91be4ffc59a18e339023050fc6b45babb560f518f30cc34e4efe82a50ae979a3d1c03885732e76eb07a8629e02b49e43066d1b SHA512 f275a298b96c42e65a79f27e8ecb2a239818c8006a233edbc73b6470853a69e2d78765613b23113912fc9514a3cc867539a96b91d30678bac2f379d9a908bf64
+EBUILD flit_scm-1.6.2.ebuild 896 BLAKE2B 1a26aafc4ccb9981069129f196bd1b2f32e5d83d9d17b29c58d1047356b7e6732419a992df1a0a6233902c610390449039014f99ce8426c7e35904d6055ae81b SHA512 db39da0c733fc9ecb41c0943ba76c7dbe1a687f81f0b81ed245e7f8440f67319ba824620c72e55b86a37b78b1cddc18d9e0a9013e1a3b65a3e33ef289eedc58c
 EBUILD flit_scm-1.7.0.ebuild 950 BLAKE2B fae16a16034ba45173bed832afe0f110050a7871572eb6590b9429dbe9ba63503061ae7ed1e46a9d7e3307d70321d0d73c811c5b4ddc07a75179e0d965e4f29c SHA512 f295be2440246fa782c6df3ae951a8b00998dab33fc82f2963f263dd7f24a445f055bafef6250deb6c3ad4e1b36a1c6642d6b03fd9adc189ef3a4c76b774c2c2
 MISC metadata.xml 290 BLAKE2B 555156b5f21d6d87b8077755a5e7ce59b7341380e29c073535e55fe44aa668db2837e42416f88d8802ef879be0dcc1ce85e27545db479add9b4273de348083c3 SHA512 7c3f74c83b9e928eac698099602db5e75cb9878354bd465c063f0e050fdc16ebcfa0e7ead8e26e5c82cd54684e9eea9b2657376c26330bb8c77bfee42116b889
diff --git a/dev-python/flit_scm/flit_scm-1.6.2.ebuild b/dev-python/flit_scm/flit_scm-1.6.2.ebuild
index 3e5494ce093b..20e99ab7b703 100644
--- a/dev-python/flit_scm/flit_scm-1.6.2.ebuild
+++ b/dev-python/flit_scm/flit_scm-1.6.2.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/flit_core-3.5.0[${PYTHON_USEDEP}]
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 20fc121b1383..a771128ea5f7 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -4,9 +4,7 @@ DIST hypothesis-6.52.2.gh.tar.gz 9321530 BLAKE2B d54b97bf15895b503d14629c61cd99d
 DIST hypothesis-6.52.3.gh.tar.gz 9321591 BLAKE2B 50415d463d2513b023b8a6ac87a2bb6dae433b823fd209ec1137a26184bb5550fb9606e006cffecbff09c523fb244b9f8c119e1c9dc765b925f8aa6b0dc43bed SHA512 f8aae5976cc2bd47e157310434d2717caea5e639daf1d794fa6c45332fe44fc5873904451f1fb0b53d56e64147428c4c87e130b4776fd3b14e2c2b961660231d
 DIST hypothesis-6.52.4.gh.tar.gz 9323011 BLAKE2B fece23da48d4849252a0fa48ae741506f49aa1f2b63f81afe3b71d18e0325a4e337bebde1a1707390d38bdf57e2ce1145985231f68557b36c58886d82774a7d9 SHA512 c51f29d52757d08652f83deda48825ca38c86e0bc67743c2cff9c85f52d726671f07d0249dfdc761b2ba8250d40beacdf5e037e8629f24df5baeddd297f38030
 DIST hypothesis-6.53.0.gh.tar.gz 9323355 BLAKE2B 589cd4803351e72cc1896453e5e548bb6fb5f998032bce91708e02f3c8ff5d288ec76d65eeffde5fa31b6b86fbb3ad81dfe3eebaaac841f197de3a07acfa12bd SHA512 ab4de3764ca3ce8e5e50966ea94fcadd85e7c9f170dbbd17383b5516528e091ebfe3b06846513ee77a1f7a2e827236d323c12cc120cac421ec7aa9f3a2ca5e4a
-DIST hypothesis-hypothesis-python-6.46.11.gh.tar.gz 9312248 BLAKE2B 78b5ca5bd38bd62d2fe50ab929df075e253c059aed329d6b52051fb01449f8de84ae340ba42a4af94ef592411139a45d34aad232fe4bb2d8412165730bbeca01 SHA512 6fdd54f28d275eb65a4f6e6919437d503eba6254c25e22298c34ac67e6de03cd99a5178b1a475b1da7f7afeed8406e89c20b4818436143f442222d26f0d94796
-EBUILD hypothesis-6.46.11.ebuild 2005 BLAKE2B fb8a9862f49589a6bf5d8ddf74153a0c4246baaabfec70c1f07c1cb098709be34305ec921b2935b400c4fadbd61a3be4047ebf469cfab2745160aa72a430c558 SHA512 b187453909858b3397ea0d02aa029a89d06f51a539d08d7dbb2253abcff8e1d9226af315f2401e34debcbcc91cbb50344fc7197bbcb1647bb88c325c6940b6fb
-EBUILD hypothesis-6.49.1.ebuild 2079 BLAKE2B 3ca3774b2abf108f255001aea7609dd5d6681779c9ad7f338fbdd6b071d96c393d96acf7c98a2a06fa3f486aa9497b19512e5fbc812388aaf91826bf5714c6e7 SHA512 34e3d21d2c225c4c9cc287b3da3f4cbea4a74055f250037c6e964312387a342360b8f9424e40becfa583d9fba941640fc537e188bc9fe036b37d2825fdd57d8d
+EBUILD hypothesis-6.49.1.ebuild 2078 BLAKE2B 11eee6781b06ca0da65094d20403b7783d83799a1f0e3684fb450784faabd97cc624caa681d1b89974dae552d98ea8c98f8a2de3dfa57c97b4246afe9370f621 SHA512 972d703e77d7403ca70447f2b27617874be3a0eff802c79ee05d7c0991acb931bb2a91967055c27f244568049d86879ec1a77153a7a48aaa4305132b0b537eb4
 EBUILD hypothesis-6.52.1.ebuild 2086 BLAKE2B bcb3fca12e4ca3e6595ad6db87d0efa7b7029471da4ecf98ec59ac4597ded88f4996a97966996544d76af871c08a56d43333b269ba15a34b6198fa7f359df2f6 SHA512 958ec21680ae6029bb5adb1711631b5352631899bb25084fb35d28bbffc44bc0054456fc3711a828f0e224af322c4499df7a5c2bc39bb6158728842a6d76f5a4
 EBUILD hypothesis-6.52.2.ebuild 2086 BLAKE2B bcb3fca12e4ca3e6595ad6db87d0efa7b7029471da4ecf98ec59ac4597ded88f4996a97966996544d76af871c08a56d43333b269ba15a34b6198fa7f359df2f6 SHA512 958ec21680ae6029bb5adb1711631b5352631899bb25084fb35d28bbffc44bc0054456fc3711a828f0e224af322c4499df7a5c2bc39bb6158728842a6d76f5a4
 EBUILD hypothesis-6.52.3.ebuild 2086 BLAKE2B bcb3fca12e4ca3e6595ad6db87d0efa7b7029471da4ecf98ec59ac4597ded88f4996a97966996544d76af871c08a56d43333b269ba15a34b6198fa7f359df2f6 SHA512 958ec21680ae6029bb5adb1711631b5352631899bb25084fb35d28bbffc44bc0054456fc3711a828f0e224af322c4499df7a5c2bc39bb6158728842a6d76f5a4
diff --git a/dev-python/hypothesis/hypothesis-6.46.11.ebuild b/dev-python/hypothesis/hypothesis-6.46.11.ebuild
deleted file mode 100644
index 0dba02dcf600..000000000000
--- a/dev-python/hypothesis/hypothesis-6.46.11.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-CLI_COMPAT=( python3_{8..10} )
-PYTHON_COMPAT=( "${CLI_COMPAT[@]}" python3_11 pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 multiprocessing optfeature
-
-TAG=hypothesis-python-${PV}
-MY_P=hypothesis-${TAG}
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="
-	https://github.com/HypothesisWorks/hypothesis/
-	https://pypi.org/project/hypothesis/
-"
-SRC_URI="
-	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_P}/hypothesis-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~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}]
-		' "${CLI_COMPAT[@]}")
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-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)"
-}
-
-python_install() {
-	distutils-r1_python_install
-	if ! use cli || ! has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
-		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
-	fi
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-6.49.1.ebuild b/dev-python/hypothesis/hypothesis-6.49.1.ebuild
index 7b89b0fb2ae8..4fc4aa3ee205 100644
--- a/dev-python/hypothesis/hypothesis-6.49.1.ebuild
+++ b/dev-python/hypothesis/hypothesis-6.49.1.ebuild
@@ -25,7 +25,7 @@ S="${WORKDIR}/${MY_P}/hypothesis-python"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="cli"
 
 RDEPEND="
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index 6530c437e6cf..15e691bdfa0f 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -4,6 +4,6 @@ DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69b
 DIST llvmorg-14.0.4.tar.gz 158088617 BLAKE2B 7fb894548dce72593a8639b4d0220d2499577f80d38b97600749c91a498c69dfbbe818cee35e4a76370795e55da7037543ea341ad7567a6f548893c67dce9e64 SHA512 e14e6c3a1915a96e9ddc609f16ca3a398ca6f7fd0a691dadaa24490078a661340e845cb2d18f3679de4f47300bb822c33ae69548af6a0370d55737831a28b959
 EBUILD lit-13.0.1.ebuild 907 BLAKE2B 786bc45254014c19e47997b263eba9245fc44459a6f12d46e69803fdf57c1b8f3d07d7e0354ea23ab17471771f57af8e792ca942b9f195462a26629d8d6bfb8b SHA512 ca254f8d0d3af0e01b24e73de8e15b77d687fd0f23a4848dd4e85522426e7dbdcd8ae77e25d8f88e637e390131fe78362ae7ba4ecd192a4c970cc3311b371dfa
 EBUILD lit-14.0.4.ebuild 915 BLAKE2B 1b5f3a2c173e1321cb172352f090e013d90535b1a97af0d37e5db9d7c4699638d627942f8ca0c90e56840039f6fa7b8d1360b069f89c4b0298a541015c4036aa SHA512 f40f818848819f460efdba91dd05215ab878f38cb0900ece6ed9e59bfa3c8b25ab025ea698bc377f92d535c6b6c189fc9b219d6832ad365f6c1bd01c70397b44
-EBUILD lit-14.0.6.ebuild 920 BLAKE2B 97bfc25ead78c898e41321f68e8667b4dd3ccd7927e2a80e8de7eb992ccb6c9b34a54a5e43ccf3962ea19b0a01cbbbe3a8529c5e5c3222eb9303a7ba1ec86102 SHA512 8868c596fa94a532725f2806c4e14b2d9bbf4615f5c13a376e2ee8627ebc8a499d3febff129077b89199567b6ed9313f11a211f891d2aa2d81ba573607f4dbe1
+EBUILD lit-14.0.6.ebuild 918 BLAKE2B 78f412ace759f145c4cd44962afd359b9e9f093acc749518a93f78b0eb13b6232832ef88cc5034bb08ca384f3aa4e37cbd4b257b3d7354fedce92a8122d3286d SHA512 d13c6559d04cd40ae972b328d9cee7bd75fbcb9aee5f2a39c393a92fe550c0e1b242b4b8d1ea1bbf02744c88bae8dbf96c2310a5c0789bc3d069210d9ac81c7b
 EBUILD lit-15.0.0.9999.ebuild 871 BLAKE2B 7637fa92b7d8e5b7c87bd1cc7e8941357b48064795ca297050fcbd83f0e2a9a2a36bc1916d2cff19e95fff353250c5cfc82d2eb052c36b8bb9cb9398df19e3c0 SHA512 d049fceece84c0a07332d664a7f9b98b3c5ef81e69f24394f3e81e733977b64a523eb9b15a149e82bacd54c9a262f988ea777ee7af7c3ad48007be62f529c103
 MISC metadata.xml 340 BLAKE2B c9ca851e49b4ab48c015686e983ec988f60c34ed0af77abd7bc03d046002f79f74b9b463ecb97db89f2230c1593af7acdaf6651fc51fed4aa92a459d07aabf18 SHA512 3fe8262ce6b971364162fbdbac3b02bf02f0a64896c8a2564e2a2998bd6e6bc74463bf9104e3f4ffaa9f5c1a16c877fc864b8a4f056ca0022f741799bc00f217
diff --git a/dev-python/lit/lit-14.0.6.ebuild b/dev-python/lit/lit-14.0.6.ebuild
index 638a94fc8e55..b4c9afbc220b 100644
--- a/dev-python/lit/lit-14.0.6.ebuild
+++ b/dev-python/lit/lit-14.0.6.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~riscv ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/mypy/Manifest b/dev-python/mypy/Manifest
index 30b04b257d4a..d564c96f8406 100644
--- a/dev-python/mypy/Manifest
+++ b/dev-python/mypy/Manifest
@@ -1,11 +1,5 @@
-DIST mypy-0.942.tar.gz 2701940 BLAKE2B 5501466e57b4afb8825e6c804cbdc270c79ff457c39f2e5834f4b68df70263c05b2b9abb08fe58202ee65f5e22d2291f39fcb1fc47168416134538c5f6e12ab3 SHA512 79b83587eefad10d7d20d3bfd8484a9e8b2d363e68c1e5ffaa3a82ca8b8f8d9183036ea46695a634f9156911d6f918af684ac636105b37b3a5d0e958f5d661f4
-DIST mypy-0.950.tar.gz 2746164 BLAKE2B 8466012fd3622f5e730acef774115ac84ff8c6f5488213a450de63d5acc790f937b7c69a1b05b46deef6fe8f81a13ed8e85f83c6c22cce9abdbb73b2ecf4179c SHA512 949d1dade3f225bbef0934fff040f7d5aec47039f554a669ca491d6cb46d56de3fcae0186864cdcaf5dec1347bc3af453218520536a0afa77e89a5c0e4640500
-DIST mypy-0.960.tar.gz 2767017 BLAKE2B 54ca4b9ffeef1f9211569ae8daee3ae201bfc6239eb9530dd5b7bb53983b0f9d343951dc49e4c4cd257660491be3805d7b8a3b5621dd25f1b7726f522a1c74df SHA512 1caa5ea5d87631a00acabd712053193aac4ed2f475760da90e395d64c44092797e45a4793a5fa2dc05458e9d2411b5cde14811c8a5112376c00baf9792df923f
 DIST mypy-0.961.gh.tar.gz 2767264 BLAKE2B 333e860f2416d065fd26f29f818e88c25f223c8f558bd174280ccfbe856c823253095830cc9cc44dd453b3661583d7626e5679ce1e44479b62ed75139051a9a2 SHA512 f7f57d38777256a45c950a45e832b6f1b9465a6663056472a9b32dc8c1d38b4d28ed856f4de12202de5910eeb6197a22073e12924a1e3f58d5631aaa938c0f2a
 DIST mypy-0.971.gh.tar.gz 2808674 BLAKE2B 7f3b183a4c5342ddfc501b8091c078ac55803db86d43042220e18e3e616664ce91ddeb341b45b1d80c7686f8c2f3606af074a5dcb9c9eaacd6307578d3689981 SHA512 5088efbd74385b5a8c155ae6e756deed274bf3e597df13e57970a29c029c34c91453c45fc1d2d03b7d83cd786b8930a387a781e1b9cb72102c1f07263a346c6d
-EBUILD mypy-0.942.ebuild 2067 BLAKE2B ae5ed742a488d69d1ab9600d5e163fc44b99fc38effb0eb54892b5ac1029a50ec10b0699c767ac9a92b7b40a8d8957fc317af52b6081adb1c5a5f984f1a1c157 SHA512 20e6e340c0c03a7d081d419c2ff68433d8d1aa947c538744c45da45126fba2cde9bbcb8137f3a16d20cedc6374fdbd5f07559454db009d457903bd8f3b141ca1
-EBUILD mypy-0.950.ebuild 1686 BLAKE2B d6d47d2756a681d8d401081f022dbc0b2810a3b52bb6e36a71398c0b37e8a64bc7638f7066bd4e94f9cdcf285fd73a53b4086f67f41bb6c41ad9c88b9a1cbd76 SHA512 c9cb3bee73f0f9747a1566206d7a2cc40d5344f79e870ea7505305c7ac13cbce2e3e889a324f6bd6c6f312072bc596465a052b33a780fb15cd1e4234e6c1a535
-EBUILD mypy-0.960.ebuild 1734 BLAKE2B b03fa3303165fbab8a643748715b59fe1d99e94b3175823cee90916a95e62245a2d482087d5e2ffb5abbd9f9d292efd0274aa81de3e00f4cccd7d05fd369b04f SHA512 02d9daf5ba3caa8e4443769bb23f64d0e791ae38df13ca2a4156e33b0d07ed5260dacbd16cbd01995b971ccda0626802636ebaddbe8a369bf5befbb3e6951b72
-EBUILD mypy-0.961.ebuild 1721 BLAKE2B ad784fd01d6d9311ec880674cae378a9a74fe91424beba2e95aba188639eb59c9c503e8016644f43b3658bffcd21654b0cd1b35bbf31668c5c8aec002027c736 SHA512 67da5efbd058ddde8a99b4fc0a3e4aac11c4a637ad550f5519229137ca5244ec275304d77d6d1be3f38e3b6585467062d36afff173aa50a62e23755fa0a3b1b8
+EBUILD mypy-0.961.ebuild 1720 BLAKE2B bb39270cc3b5460d2c03560850826f2d147443d9b5fc38eea9d80dc308b712cccbbb4ff28ee215b5d08110a16210ea3afa89dec88fed926a055c7d1cd68c5817 SHA512 24b009763b9bbaf9e0aa461391a486f74eb1be7d0f5d5844aaa32e3e9c05f7c4c161e33a1e7c7a66e38340f5af597dda920e8145eaf6db7b24255680cc3e0b91
 EBUILD mypy-0.971.ebuild 1776 BLAKE2B c4b1c7abb905623121763a2f44fbb8a422a9d1cb0c6c558e858ddaaa3b1d75aee0b947f74e003d1ada49a7611ae45e22832b4999e89f39ad39cb7957ac7ceab2 SHA512 dc244b629eb8f0aaa59a6e43a8b78850bc1d4e703dd672961a828c4cfbc03d93a5bcf5d6b2a455e8783d8fbb3fb9f626a694c70d1920445f393d90c9da805a27
 MISC metadata.xml 515 BLAKE2B 75827bbbeb70fd4b9295ab4689068d2d4b686b32d4059acde94fb0d08048e9e56ecaf3eec39dc5567b2753e2552353e273cdf2f4e27d077cc9b03320ee09c64b SHA512 c1c3c7a3651e61e0b63ab4462f0370cce9cbdce33e64c5e7a1fbefe8116d5d3d3b35bc4095d8a5ce28caf69b0644af3f13c9a27b683f2f981e52f8bfe4ac8615
diff --git a/dev-python/mypy/mypy-0.942.ebuild b/dev-python/mypy/mypy-0.942.ebuild
deleted file mode 100644
index 885551008048..000000000000
--- a/dev-python/mypy/mypy-0.942.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_{8..10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Optional static typing for Python"
-HOMEPAGE="http://www.mypy-lang.org/"
-SRC_URI="https://github.com/python/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-# stubgen collides with this package: https://bugs.gentoo.org/585594
-RDEPEND="
-	!dev-util/stubgen
-	>=dev-python/psutil-4[${PYTHON_USEDEP}]
-	>=dev-python/typed-ast-1.4.0[${PYTHON_USEDEP}]
-	<dev-python/typed-ast-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-3.7.4[${PYTHON_USEDEP}]
-	>=dev-python/mypy_extensions-0.4.3[${PYTHON_USEDEP}]
-	<dev-python/mypy_extensions-0.5.0[${PYTHON_USEDEP}]
-	dev-python/tomli[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/attrs-18.0[${PYTHON_USEDEP}]
-		>=dev-python/lxml-4.4.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-6.1.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-xdist-1.18[${PYTHON_USEDEP}]
-		>=dev-python/py-1.5.2[${PYTHON_USEDEP}]
-		>=dev-python/typed-ast-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/virtualenv-16.0.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
-
-# this requires packaging a lot of type stubs
-export MYPY_USE_MYPYC=0
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Fails with pytest-xdist 2.3.0
-		# https://github.com/python/mypy/issues/11019
-		mypy/test/teststubtest.py
-		# fails due to setuptools deprecation warnings
-		mypyc/test/test_run.py::TestRun::run-imports.test::testImports
-	)
-
-	[[ "${EPYTHON}" == "python3.10" ]] && EPYTEST_DESELECT+=(
-		# https://github.com/python/mypy/issues/11018
-		mypyc/test/test_commandline.py::TestCommandLine::testErrorOutput
-	)
-
-	# Some mypy/test/testcmdline.py::PythonCmdlineSuite tests
-	# fail with high COLUMNS values
-	local -x COLUMNS=80
-	epytest -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/mypy/mypy-0.950.ebuild b/dev-python/mypy/mypy-0.950.ebuild
deleted file mode 100644
index 06f879d5724c..000000000000
--- a/dev-python/mypy/mypy-0.950.ebuild
+++ /dev/null
@@ -1,55 +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_{8..10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Optional static typing for Python"
-HOMEPAGE="http://www.mypy-lang.org/"
-SRC_URI="https://github.com/python/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-# stubgen collides with this package: https://bugs.gentoo.org/585594
-RDEPEND="
-	!dev-util/stubgen
-	>=dev-python/psutil-4[${PYTHON_USEDEP}]
-	>=dev-python/typed-ast-1.4.0[${PYTHON_USEDEP}]
-	<dev-python/typed-ast-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-3.7.4[${PYTHON_USEDEP}]
-	>=dev-python/mypy_extensions-0.4.3[${PYTHON_USEDEP}]
-	<dev-python/mypy_extensions-0.5.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/tomli[${PYTHON_USEDEP}]
-	' 3.8 3.9 3.10)
-"
-BDEPEND="
-	test? (
-		>=dev-python/attrs-18.0[${PYTHON_USEDEP}]
-		>=dev-python/lxml-4.4.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-6.1.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-xdist-1.18[${PYTHON_USEDEP}]
-		>=dev-python/py-1.5.2[${PYTHON_USEDEP}]
-		>=dev-python/typed-ast-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/virtualenv-16.0.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
-
-# this requires packaging a lot of type stubs
-export MYPY_USE_MYPYC=0
-
-python_test() {
-	# Some mypy/test/testcmdline.py::PythonCmdlineSuite tests
-	# fail with high COLUMNS values
-	local -x COLUMNS=80
-	epytest -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/mypy/mypy-0.960.ebuild b/dev-python/mypy/mypy-0.960.ebuild
deleted file mode 100644
index 53e61a80d3b6..000000000000
--- a/dev-python/mypy/mypy-0.960.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Optional static typing for Python"
-HOMEPAGE="
-	http://www.mypy-lang.org/
-	https://github.com/python/mypy/
-	https://pypi.org/project/mypy/
-"
-SRC_URI="
-	https://github.com/python/mypy/archive/v${PV}.tar.gz -> ${P}.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-# stubgen collides with this package: https://bugs.gentoo.org/585594
-RDEPEND="
-	!dev-util/stubgen
-	>=dev-python/psutil-4[${PYTHON_USEDEP}]
-	>=dev-python/typed-ast-1.4.0[${PYTHON_USEDEP}]
-	<dev-python/typed-ast-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-3.7.4[${PYTHON_USEDEP}]
-	>=dev-python/mypy_extensions-0.4.3[${PYTHON_USEDEP}]
-	<dev-python/mypy_extensions-0.5.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/tomli[${PYTHON_USEDEP}]
-	' 3.8 3.9 3.10)
-"
-BDEPEND="
-	test? (
-		>=dev-python/attrs-18.0[${PYTHON_USEDEP}]
-		>=dev-python/lxml-4.4.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-6.1.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-xdist-1.18[${PYTHON_USEDEP}]
-		>=dev-python/py-1.5.2[${PYTHON_USEDEP}]
-		>=dev-python/typed-ast-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/virtualenv-16.0.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
-
-# this requires packaging a lot of type stubs
-export MYPY_USE_MYPYC=0
-
-python_test() {
-	# Some mypy/test/testcmdline.py::PythonCmdlineSuite tests
-	# fail with high COLUMNS values
-	local -x COLUMNS=80
-	epytest -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/mypy/mypy-0.961.ebuild b/dev-python/mypy/mypy-0.961.ebuild
index 3d3c196aa56f..e51f025cb461 100644
--- a/dev-python/mypy/mypy-0.961.ebuild
+++ b/dev-python/mypy/mypy-0.961.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 # stubgen collides with this package: https://bugs.gentoo.org/585594
 RDEPEND="
diff --git a/dev-python/pep517/Manifest b/dev-python/pep517/Manifest
index 36f1bf01ae00..05d254384333 100644
--- a/dev-python/pep517/Manifest
+++ b/dev-python/pep517/Manifest
@@ -1,3 +1,5 @@
 DIST pep517-0.12.0.gh.tar.gz 24726 BLAKE2B 7d022ab88c68b7254df5d922db2f571e2bab2ee58b8a2ed0ce1adeadf89f22f11f6a609b558133acfed5342a9cf6a398d805949bdfb485a4abf272e2b9322e05 SHA512 6b224759733c1f5e346909788233b0acf49c60a0b6ef2d99d953b2e7bb570b2913fd0b133d5bc6884ec3de98adf2e41fa9506fed344b8fd76cc58dfcd1778e80
+DIST pep517-0.13.0.gh.tar.gz 23816 BLAKE2B d1bab5fe1a629384dcd264c0ea3d42d6b11de3530441de5de49516543630293b9a8023c8a55b291a7a415f8c90d4077f156cd036ed7fd477339d1210bfe47059 SHA512 dc534e73ea8659994041a39c8bfc92ee0a81b164c2d1ee383e3549d830f513fc89227d1bda3f749352532d0610e450de6b2be956aa4387f4b2f272d9f8aec0a0
 EBUILD pep517-0.12.0-r1.ebuild 881 BLAKE2B 80005aae79fef6121b9be5be0cac1b26635fe36950ced7a02b15b846e2ea439cb7abc15af5c7de8fc8ac92bf569cd1fd52f22679326cea2431190af6b3657169 SHA512 ed97b6579ad6951b60d8c8d61e119ff4bab027a99be5919b3ecf976e4d514758e86bbf575fc1b58c58756d5d867ac4bec68b49940479e42a788e76b759d16e9d
+EBUILD pep517-0.13.0.ebuild 889 BLAKE2B fd0b1475568d1ef9ac22995c5caa8e56d35bcb8821e77bd5608133bd86b59dd6746ed65691031fca0702f0259cc7877caeed4f2c5f57247b0552c72ee142de25 SHA512 28f5892e1ede80ff2e87ff2cc9881c9e5b260710bdf10403b326d5d508ab6ffab1891a1f5a2fa47d55a05222e00d04f012a848d49e902ca26663d63673652d42
 MISC metadata.xml 363 BLAKE2B 76892bc62d90df3a74962adaf0d9a33f75a3fd885feffde7ceaa5d1e4964704aea5ae07a88376b32b923ba0462eea4ff7b3f68a2deb97dacc897ac02d12012e8 SHA512 30f31bd6740e4fad66e1f6c3a9ae1a6572575d814f90c76eab3e5d82be3aa99ab2444e131592e9b92ea4774b5864b71f3d9f38bb7424fbaf63cd3dc642ee1fc6
diff --git a/dev-python/pep517/pep517-0.13.0.ebuild b/dev-python/pep517/pep517-0.13.0.ebuild
new file mode 100644
index 000000000000..80a7a6488acf
--- /dev/null
+++ b/dev-python/pep517/pep517-0.13.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Wrappers to build Python packages using PEP 517 hooks"
+HOMEPAGE="
+	https://pypi.org/project/pep517/
+	https://github.com/pypa/pep517/
+	https://pep517.readthedocs.io/
+"
+SRC_URI="
+	https://github.com/pypa/pep517/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/tomli[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/testpath[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# require Internet
+	tests/test_meta.py
+)
+
+src_prepare() {
+	sed -i -e '/--flake8/d' pytest.ini || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/pyalsa/Manifest b/dev-python/pyalsa/Manifest
index de7fbaef0e20..753e01b4942f 100644
--- a/dev-python/pyalsa/Manifest
+++ b/dev-python/pyalsa/Manifest
@@ -1,4 +1,4 @@
 AUX pyalsa-1.1.6-no-build-symlinks.patch 682 BLAKE2B 046f4cffa0b08a32360356d82384148b805544b6f05e44ec329bef2299b67e46c68401b800761e9dff2141b22bc029a55fd5cf01cd5cdb533303aef91a2bbe0f SHA512 fd3937df5a69326908da942a8926e10221bb85693c863cc06ca363ca8fb07761173d2b51113615970887442d8779b2e9ff468b927b078acf52620e944b71b779
 DIST pyalsa-1.2.7.tar.bz2 40132 BLAKE2B c100d16bd8c0d9fc6eddcda360f3582c55ed1b143a58a49caf76a62494882952d311271941ce0ecdf57ac934f3564dc922c80e8a5f5742b593341ff4215b700c SHA512 126501fe7b9c006f28e9290bdd3ad907ea9e053b71e21e2c6f0b0beeecdba07b4b557014041b03452f96be690f59f2e647e075487ee87054f21f66df7f39b34b
 EBUILD pyalsa-1.2.7.ebuild 663 BLAKE2B 50e244254a4016f0146e8618d6869971b0804758146f93ea770733d2274659228b38244e0c8a4be2cb2578bf00e8b10ebafb18bd5473b0762bd929ff5edca38e SHA512 94ca6808022477fe84ee8e20eb3a403ea59c04110bdeea297573ed12fc7aec8eebda387f6aa0a64108a56bb50f4dade6e06025125619af792d1abecb118a8d36
-MISC metadata.xml 427 BLAKE2B bce956560d50c4bf87eb6ef026903b4d860350851d0124dbc6df20c8ad5a62851eddf5736b3e44fe0bf596bd82d3bae465041b2a53c9884bba1469b99fae3875 SHA512 6c6a1a1acffe544b1c4b39ec98fa3892ec53fc7c2137d5d987cbb6f026e69df638e3c3b43bda01434ecf4a202559c81aefe5b2d2113cf26da3e9636b31a4331a
+MISC metadata.xml 491 BLAKE2B b44d13fa5ffd8b1eceaedbfd6b4fa564d93b99be45dec176817a9665153988d6a91f892edab698e50d2ae761edc7ec11371fa07ef3dd6976977c7dd84f9ba9ae SHA512 bbafa414b3416db7abb27921ce74d532f4b16f145a91f46075be9abaf6cf46017e8cd17c61fa019c662fc93ff9286747822b4ec8f6d19f69857cc3221e3f9a25
diff --git a/dev-python/pyalsa/metadata.xml b/dev-python/pyalsa/metadata.xml
index 5a9f975e7673..d1ee6707bb56 100644
--- a/dev-python/pyalsa/metadata.xml
+++ b/dev-python/pyalsa/metadata.xml
@@ -10,6 +10,7 @@
 		<name>Python</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="github">alsa-project/alsa-python</remote-id>
 		<remote-id type="pypi">pyalsa</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pytest-httpserver/Manifest b/dev-python/pytest-httpserver/Manifest
index 5611174bf6cc..b775481987fc 100644
--- a/dev-python/pytest-httpserver/Manifest
+++ b/dev-python/pytest-httpserver/Manifest
@@ -1,3 +1,5 @@
 DIST pytest-httpserver-1.0.4.gh.tar.gz 78911 BLAKE2B 425f72438797b55a84662f580dd9bfc1d6dd8a0513587e72b6e1de7e669eee75c777fdd6c2cfcbc92273737dd47568b48a22f12e8a40952f82a599f30705a604 SHA512 e80754910117736fd172d7bd5e5fc41721fab8adc705b72f0ee4cd866c878ed267ad3819645fd567e3af2c9e53deecb3749f1a873d72ff9e234c4fdd7f7cabea
+DIST pytest-httpserver-1.0.5.gh.tar.gz 80395 BLAKE2B 68c075032c57f25854d390f73bf61b7efbe18f78d7f0b2a2a3be10d586ca9cc3ce4a1b390a2ba0da1e88558513782388069c419dae4908a0581e8d583f452bee SHA512 8275475bb044d54769e906571520fafbb9f6fa32fc003f4a00f72b9ff9930e4b80ee84564df1521569cc2a15f5d371c6315129263bc167d0621141004d509a25
 EBUILD pytest-httpserver-1.0.4-r2.ebuild 776 BLAKE2B 47322761db09937087458097a27ce0c1aa4eba77cd8b013d9e089c3f6ac548063d17f81b975c244b8a7386f89ec9a1339e426541b7c9fdb512372621cdc98d5c SHA512 0b4c28de701285c4084a54aefa43c44c45fc8f51607469f8fa1145e79dc9f338660388b743af251ce6f0e4d3ff4c0e217c9cc784ce4439a16c4fc9b4c4bd970a
+EBUILD pytest-httpserver-1.0.5.ebuild 773 BLAKE2B dc67bc66e43bf96032ba707467ccf5cc1d6b4887635086dc82fdae5590c7977d7670e89d44b592b48e4d732e4ab60782eeb5fac7132a595f265cca61ad0b1267 SHA512 ce78bb8f6e74b6f8e62db9a70176dafd46595e6719de79434700c4add3be6a7b3fc3385fe85553335af9cd362c97698d7aa5278099725e96408988b48bc8b22f
 MISC metadata.xml 411 BLAKE2B f74c6327167acc706faa9d9e60e2f964e476f33cf33b525287850dcd46e1fd35d6a770d495c929b36bc288c6e2a08d32077bd5265c522598477bb61c4abdd367 SHA512 a536367a8872d3d722f7671d6824d05d1912e9ba53a25ade91bab5cfa4dca3cb2e3f669c7a70416c68a200f1272c5709509b37133886f0d64816b096918fb4f0
diff --git a/dev-python/pytest-httpserver/pytest-httpserver-1.0.5.ebuild b/dev-python/pytest-httpserver/pytest-httpserver-1.0.5.ebuild
new file mode 100644
index 000000000000..38988531c5f2
--- /dev/null
+++ b/dev-python/pytest-httpserver/pytest-httpserver-1.0.5.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP server for pytest to test HTTP clients"
+HOMEPAGE="https://github.com/csernazs/pytest-httpserver"
+SRC_URI="
+	https://github.com/csernazs/pytest-httpserver/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/werkzeug[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/requests[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -i -e '/^include = \[/,/\]/d' pyproject.toml || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest -p no:localserver
+}
diff --git a/dev-python/rope/Manifest b/dev-python/rope/Manifest
index 377f044f34a8..3d3108476e6d 100644
--- a/dev-python/rope/Manifest
+++ b/dev-python/rope/Manifest
@@ -1,5 +1,7 @@
 DIST rope-1.1.1.tar.gz 274610 BLAKE2B 52354453305ee58db70f86392f7ec27179e1e4a9ec677fb8875bb9ca24663e6dae26e1bac4a1ad62143fe3a419a7a1e1fd0b7d2f03ef556143d2b060b23300af SHA512 aaf664a63ef00e3c844d6999338fe6a3384ddecfe95ef9b7eb213e5c37c9f78f7d2ea59aa7e612487bac5eaaaf7fc8ba499c0d43c740f99a7b3be64c9d7f6e07
 DIST rope-1.2.0.tar.gz 289239 BLAKE2B 314cf382e76a448dcddff0b9c52ae437cde032b54f1c9edbb05c1d47832ecc7a0b35b8eb14cf48ef5b296011a273cf3e21c5433a70e2627c11f2cdeca885e1a3 SHA512 d34a47a6453a85fcaa253287224b7b5265e08d2cba46377d17502f78642d3468d074b43d4916758c2225f98e676080af2b7896ad6194e0ee0234661343259fd1
+DIST rope-1.3.0.tar.gz 286846 BLAKE2B f8b122a276812638eee76cc235e91e013696f6047c450729edde1b4a5bfdd1d6aa7d1e9ac46048e8205a1f544ee82f740e0f7b20f10769a9a28065a8b9caee6b SHA512 45036cfb3abbe6b00306268f62804d787a633ef8981b23553d57ea18087bfbec33be6346bb59393bb6c3b48020a2da87f759668a57ec8e809ba3666aff0dfd2c
 EBUILD rope-1.1.1.ebuild 571 BLAKE2B 9ff4cef2258e69d043c2b4fb2140959f1c17418c731b5bd294aceb693015f7c8dd063565762019479cad2f8b4b912b9e8e565e86e61841f78d385936193f79b5 SHA512 93d08ddb4b985b5b749ad5fe47756dbfeb3b7c43bc25655d52d96a27c18a85bd5ccd2e979b73f40f9d92c9dabbaf195d7d3edd5970631458627fca780923a66e
 EBUILD rope-1.2.0.ebuild 922 BLAKE2B d530036ac11b8d1cf36e7c1cdd4035cfb5a426b89ee40875006e043a11269d52e331050e1ba54f02abf0a820edaf163431fae9c71f386ba2c11eeaee1815750d SHA512 8e1d1d718ebbaedb56bc46c5113b24ca4773bd1e3f8ad7926658fbe9ef812c8adaea9678ca0ad4e9af612a316a9d6d39421ab2b0cfd2ff339687085d7a8ad1d5
+EBUILD rope-1.3.0.ebuild 923 BLAKE2B f7a62177405535b3b867bf15c9d947a89621b7f46f19153824cdc4faf116c686ac1a27ac74b9a0506f8c1de74769a63d8a9fc50e1bea7a742e8b9439c5926ffd SHA512 b0dec73b8bb520d95026ba92c730ababa70e08b2b84f9ee4e84792620c6d393bd22df39f79082b3249fb636930b62e3d76ed7d72bc546d1a843976f4ec72ddce
 MISC metadata.xml 452 BLAKE2B 6bee424d801bad8728f10ec3a1618e3a48776a7b0af2a04efafd07e6ae5ac8e0b88253ebc35e457c791e820f8c3b1dabde73aabbfd3636cac5e169e8aca75aa7 SHA512 4f88e1157e4838f321b6f208ba6b89fbf2b7a72ea6e038cdd6cf3e9e211c2788dda137e3adf76072c1d52026c554750193d9938054670dd995a91db24ea8da76
diff --git a/dev-python/rope/rope-1.3.0.ebuild b/dev-python/rope/rope-1.3.0.ebuild
new file mode 100644
index 000000000000..67e1183ee5b0
--- /dev/null
+++ b/dev-python/rope/rope-1.3.0.ebuild
@@ -0,0 +1,40 @@
+# 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_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python refactoring library"
+HOMEPAGE="
+	https://pypi.org/project/rope/
+	https://github.com/python-rope/rope/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="doc"
+
+RDEPEND="
+	dev-python/pytoolconfig[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/build[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# our venv style confuses this comparison
+	ropetest/contrib/autoimport/utilstest.py::test_get_package_source_typing
+	ropetest/contrib/autoimport/utilstest.py::test_get_package_tuple_typing
+	ropetest/contrib/autoimport/utilstest.py::test_get_package_tuple_compiled
+)
diff --git a/dev-python/scipy/Manifest b/dev-python/scipy/Manifest
index 3f3b7dbaf94e..e8b1450073e0 100644
--- a/dev-python/scipy/Manifest
+++ b/dev-python/scipy/Manifest
@@ -1,9 +1,11 @@
 AUX scipy-1.9.9999-meson-options-lapack.patch 1013 BLAKE2B 04cb7b3bc281ef06fe4360f31ea6befe91134bc68ce2a981df704f52814487503d35100bf7fd429d854d0716eaac20f5d55aadad02a4d48eeed8ad55955232b6 SHA512 6d8f6e4c6399f5e8a641a87168b1e2abd31b69a23f90582cba5d8d22d46de0c89d7b0719a25f3cf4e6cd9f81c9ebe0c94d1ba8b6c6b0209020491603b1f548aa
 DIST scipy-1.8.1.tar.gz 38196215 BLAKE2B 180ae646adba2031a4bf99cd4feefe652b8e340110b3b2872e61aa1083054aadf369c7e3b3e3fd8fb71fcd831c95841d2dadd1c71e35e5f7d95800e5551173f0 SHA512 f6fc71c209991fe82baa4b10d8ade0deb1057f6f5942a91dfb7ae45f3eb78a4535efa2861badf5e2d37239fa99dbd99de760aa7e4854b95991ade0263004e7ea
+DIST scipy-1.9.0.tar.gz 42016757 BLAKE2B ca25b3ad44091230c5ecdfa832b382a1f5449565aa460b169a886505e7583399d316fe48f420d45b9993e6522d46fbbd6405e08fcfb8dc02ed5febb2e09749e7 SHA512 03d38f3298e2ca2dcc376acb09593f47a007f2b166508b91cd6f3e3cc417fa3579084aaa806365afee8679b473340b0eba86b36def957da45be404c4b6607675
 DIST scipy-1.9.0rc3.tar.gz 42021439 BLAKE2B 148c5a2517ef18015123503837d921a24258996047b4c5df22a279febc98d0633bb8b6bd9c7b886db9458583e8a5c15886b6349e2095a0ed7d60a7c976d24145 SHA512 1e4f0eb3fc5d8cdc24c2e4f7ea8400f5db039d4a2bb7a7d7c4869392fbdca6836d4dfb0a1ead2452b177fe49a60aa7ef86d7d6aee596e001e870df79a5cbce04
 DIST scipy-html-1.8.1.zip 37060661 BLAKE2B 2fa617c58eb47463f8a61f9798b32c6da255d26b8e86c1558e427a715093f5a29ced3847ab6ecfe88ce1017664f36ac3e9fa9bbf72ede7e0fd3812b5f41fe933 SHA512 95153dc1f404aa64898a700c94c0deea3ca842c3152167d0987edabcf4a8eba16b6c8e6bc38a6775a849dc621e6a21434baf53d1669b1865fa5049cffa4387ac
 DIST scipy-ref-1.8.1.pdf 35025868 BLAKE2B 9221755d2dc69b8623271f75ff3078a0a4410fe9ff69ee317b40bf145af7da21a7f5f4b6b67820d8bb2878f83b7014f1ea7c2f0e026afb716da0479d394505e2 SHA512 8f27dcb9dd1030e15266389af21a1475ecfec5ea777fb2dbcf8db8d3398ac6e45c7040b8d6dbaffd29be3920925427be7c55efdc8094d670c857edfdab7f7728
 EBUILD scipy-1.8.1.ebuild 5275 BLAKE2B 0b2f1bb8c37c253aae87941aa9cb15352d82ff5bc34089ae7cf93cad7d264b0ceaecd7f8f0ff02670d24282a61032eaa52bf16de03e1d25d8a18fbfe7d63c981 SHA512 d7ed5f3bc61e27f898937387f88cd934147149ba40ccc01b160571db97074ccba2eb68510899bb4ee70083e47cf3e2c5c6e53435f56933cc5652e9b21a231763
-EBUILD scipy-1.9.0_rc3.ebuild 1851 BLAKE2B ed4481800fed54aa595fa9b57991ae4d333dca1a58b4a7637b27a8e8a3531fa837afefced6e05ad51b8a98f26f3a423e7248e5123323fd53a1336d1912d956aa SHA512 0836886a7db479338ce97d85a1ec343336076370b080b9c2a138e6a15724e10a9c0db4d2c69b5ed433bb2f8c75c8e8f0922759b5b7474e5986352e58dfee59b3
-EBUILD scipy-1.9.9999.ebuild 1826 BLAKE2B 4a37e01a87ed6bc546614bab9509e5a59093c2c54b7cefdff3914c35cadf72caa20259347631b2f6ba3e9effb58ce00e7fef5df291abffbd74297461d1c40393 SHA512 9d23d1da0223a07e4fa51ebd3990ca2b782b3bfebe92e0a54d897cac2847648b5135e2b6f5a4b17dcc065388156d872d231e47694fa25c009fa223e629be740b
-MISC metadata.xml 1127 BLAKE2B 6019c7fe056a0198db927c1b149d5a60bd583a523d749e57c86ad899a880fd83e688e040cb693ec3f34be63cae1e5b785d5f6f7a378b98e992d6cb9368ea1b2c SHA512 f7c45d801c3344b3d8de3fabad26a95814cfdf92b604e8215bfac2cfd1cfb181cc8a9a9fa46c0b95c7fb55a34e44bab51c2d1cd7a5adcf421cd965a755722e73
+EBUILD scipy-1.9.0.ebuild 1924 BLAKE2B 0c837cf2f3a852f62525a84c67314d428db2bd983de168d8a2c300c9e6b71648809031db7e3038bf7c9b0f5c991db49577529cffb61ce2538139f50b654667be SHA512 e98214c1731dd1d97432f50a04ed0f5e73a3ed65a0a358eb163f51ab2b2e9e5904c6ff3367d8bfe6463e708bc59864fa1daca4b3bf97a67d4ea75e1e81e7a7d7
+EBUILD scipy-1.9.0_rc3.ebuild 1796 BLAKE2B 41ec3dc03509ee1f73cd9366eb0b39e24874b145d5463840af6c376159399174ae668f99794fa7f6da467549cfe12a513d03a76f5fb64c95e87815cd87a807fe SHA512 32e4d7b4b3e3e1e1a47ad081b458953f743f5d7dc630795a61f48e18511dcdba77921f682d9bb17a000e323eac164940b92d34f44a99c219a6170b08d6f7d614
+EBUILD scipy-1.9.9999.ebuild 1924 BLAKE2B 0c837cf2f3a852f62525a84c67314d428db2bd983de168d8a2c300c9e6b71648809031db7e3038bf7c9b0f5c991db49577529cffb61ce2538139f50b654667be SHA512 e98214c1731dd1d97432f50a04ed0f5e73a3ed65a0a358eb163f51ab2b2e9e5904c6ff3367d8bfe6463e708bc59864fa1daca4b3bf97a67d4ea75e1e81e7a7d7
+MISC metadata.xml 1148 BLAKE2B bd532eb47b00da1ff18e9bb5be287ef32136412fd7542e92a522c9d3d9d9663d2312b74fd2fc6d4239e4fc581c8e881ac6e682fcfd14b0debb08210237878398 SHA512 a913d7013caece759f2fd36f8814589a512e7650afca19edf444694b1fceeeda02f0bffb4ced81a46a376b2d6d54b292257a236549418aecf20d99e70715babb
diff --git a/dev-python/scipy/metadata.xml b/dev-python/scipy/metadata.xml
index 0192620473a3..727696087804 100644
--- a/dev-python/scipy/metadata.xml
+++ b/dev-python/scipy/metadata.xml
@@ -1,28 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>sci@gentoo.org</email>
-    <name>Gentoo Science Project</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <longdescription lang="en">
-  SciPy is an open source library of scientific tools for Python. SciPy
-  supplements the popular numpy module, gathering a variety of high level
-  science and engineering modules together as a single package.
-  SciPy includes modules for graphics and plotting, optimization,
-  integration, special functions, signal and image processing, genetic
-  algorithms, ODE solvers, and others.
-</longdescription>
-  <use>
-    <flag name="pythran">Use <pkg>dev-python/pythran</pkg> to accelerate runtime</flag>
-    <flag name="sparse">Adds support for sparse solving with <pkg>sci-libs/umfpack</pkg></flag>
-  </use>
-  <upstream>
-    <remote-id type="pypi">scipy</remote-id>
-    <remote-id type="sourceforge">scipy</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription lang="en">
+	SciPy is an open source library of scientific tools for Python. SciPy
+	supplements the popular numpy module, gathering a variety of high level
+	science and engineering modules together as a single package.
+	SciPy includes modules for graphics and plotting, optimization,
+	integration, special functions, signal and image processing, genetic
+	algorithms, ODE solvers, and others.
+	</longdescription>
+	<use>
+		<flag name="pythran">Use <pkg>dev-python/pythran</pkg> to accelerate runtime</flag>
+		<flag name="sparse">Adds support for sparse solving with <pkg>sci-libs/umfpack</pkg></flag>
+	</use>
+	<upstream>
+		<remote-id type="github">scipy/scipy</remote-id>
+		<remote-id type="pypi">scipy</remote-id>
+		<remote-id type="sourceforge">scipy</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/scipy/scipy-1.9.0.ebuild b/dev-python/scipy/scipy-1.9.0.ebuild
new file mode 100644
index 000000000000..ccb8c752ed10
--- /dev/null
+++ b/dev-python/scipy/scipy-1.9.0.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=meson-python
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit fortran-2 distutils-r1 multiprocessing
+
+DESCRIPTION="Scientific algorithms library for Python"
+HOMEPAGE="
+	https://scipy.org/
+	https://github.com/scipy/scipy/
+	https://pypi.org/project/scipy/
+"
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+
+	# Need submodules, so git for now.
+	EGIT_REPO_URI="https://github.com/scipy/scipy"
+	EGIT_BRANCH="maintenance/$(ver_cut 1-2).x"
+	EGIT_SUBMODULES=( '*' )
+else
+	# Upstream is often behind with doc updates
+	DOC_PV=1.8.1
+	MY_PV=${PV/_rc/rc}
+	MY_P=${PN}-${MY_PV}
+
+	SRC_URI="
+		mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz
+		doc? (
+			https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-html-${DOC_PV}.zip
+			https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-ref-${DOC_PV}.pdf
+		)"
+	S="${WORKDIR}"/${MY_P}
+
+	if [[ ${PV} != *rc* ]] ; then
+		KEYWORDS="~amd64 -hppa"
+	fi
+fi
+
+LICENSE="BSD LGPL-2"
+SLOT="0"
+IUSE="doc +sparse"
+
+DEPEND="
+	>=dev-python/numpy-1.18.5[lapack,${PYTHON_USEDEP}]
+	sci-libs/arpack:0=
+	virtual/cblas
+	>=virtual/lapack-3.8
+	sparse? ( sci-libs/umfpack:0= )"
+RDEPEND="${DEPEND}
+	dev-python/pillow[${PYTHON_USEDEP}]"
+# TODO: restore pythran optionality?
+BDEPEND="
+	dev-lang/swig
+	>=dev-python/cython-0.29.18[${PYTHON_USEDEP}]
+	dev-python/pybind11[${PYTHON_USEDEP}]
+	dev-python/pythran[${PYTHON_USEDEP}]
+	>=dev-util/meson-0.62.2
+	dev-util/patchelf
+	virtual/pkgconfig
+	doc? ( app-arch/unzip )
+	test? ( dev-python/pytest-xdist[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.9.9999-meson-options-lapack.patch
+)
+
+EPYTEST_DESELECT=(
+	linalg/tests/test_decomp.py::TestSchur::test_sort
+	linalg/tests/test_solvers.py::test_solve_discrete_are
+)
+
+distutils_enable_tests pytest
+
+python_test() {
+	cd "${T}" || die
+
+	epytest -n "$(makeopts_jobs)" --pyargs scipy
+}
diff --git a/dev-python/scipy/scipy-1.9.0_rc3.ebuild b/dev-python/scipy/scipy-1.9.0_rc3.ebuild
index 66e0ae62dac4..577f837b091c 100644
--- a/dev-python/scipy/scipy-1.9.0_rc3.ebuild
+++ b/dev-python/scipy/scipy-1.9.0_rc3.ebuild
@@ -38,7 +38,7 @@ else
 	S="${WORKDIR}"/${MY_P}
 
 	if [[ ${PV} != *rc* ]] ; then
-		KEYWORDS="~amd64 ~arm ~arm64 -hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+		KEYWORDS="~amd64 -hppa"
 	fi
 fi
 
diff --git a/dev-python/scipy/scipy-1.9.9999.ebuild b/dev-python/scipy/scipy-1.9.9999.ebuild
index 19c83a0756f4..ccb8c752ed10 100644
--- a/dev-python/scipy/scipy-1.9.9999.ebuild
+++ b/dev-python/scipy/scipy-1.9.9999.ebuild
@@ -38,7 +38,7 @@ else
 	S="${WORKDIR}"/${MY_P}
 
 	if [[ ${PV} != *rc* ]] ; then
-		KEYWORDS="~amd64 ~arm ~arm64 -hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+		KEYWORDS="~amd64 -hppa"
 	fi
 fi
 
@@ -60,6 +60,7 @@ BDEPEND="
 	>=dev-python/cython-0.29.18[${PYTHON_USEDEP}]
 	dev-python/pybind11[${PYTHON_USEDEP}]
 	dev-python/pythran[${PYTHON_USEDEP}]
+	>=dev-util/meson-0.62.2
 	dev-util/patchelf
 	virtual/pkgconfig
 	doc? ( app-arch/unzip )
@@ -69,6 +70,11 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.9.9999-meson-options-lapack.patch
 )
 
+EPYTEST_DESELECT=(
+	linalg/tests/test_decomp.py::TestSchur::test_sort
+	linalg/tests/test_solvers.py::test_solve_discrete_are
+)
+
 distutils_enable_tests pytest
 
 python_test() {
diff --git a/dev-python/sphinx-tabs/Manifest b/dev-python/sphinx-tabs/Manifest
index ad18e809b43e..2cbc34655e26 100644
--- a/dev-python/sphinx-tabs/Manifest
+++ b/dev-python/sphinx-tabs/Manifest
@@ -1,7 +1,3 @@
-DIST sphinx-tabs-3.3.1.tar.gz 523932 BLAKE2B 8b941eb549ea8a10fcd329e880b8fa15742ba7903f4f9d6422335cf889c344a1fec8f16798c286b0c0f7561c128ea297153c31d0445b867e5e23f7960698d31a SHA512 d93ba1149a20711b52f8a76f22d212fdbb97349561f3e13b53873cdb4dba8f18f645e2d73ef378c2dde3d1c0c585c1402d73f4102da0e973be0c90a5912e7036
-DIST sphinx-tabs-3.4.0.gh.tar.gz 524212 BLAKE2B 18688d10d37e5794340ccfc5d798a31bf80374ed74e64dcb54ae53dc557d7538de39b4e29002d16735cab5ed4618189af54da2682dce195c503af442f554fef7 SHA512 2833586c7040e454cac65963a3dfb22ac7e09b0a4cd5cba9ea449d798a5d7120ce3d19ac0a9d638a9389d52773bd98ab4bde33d06924170757036ff3218f6d55
 DIST sphinx-tabs-3.4.1.gh.tar.gz 524071 BLAKE2B 5aecb9c22a298c1347bf82cbbc16709f3f6cd38b0f0f6e4948411f1fdd79ba17d3e75178b8c092df7b8abc812dd4b0102879774708552a062aad0fe0b0653717 SHA512 b6079d3ae91479d40aaf35926226eb7dd783de7cec0e721cb13a036fc520bb3afda0dffb0669dc5054fc665125c3620261b1ea7ffe685d5b177bc980e3b4d7e4
-EBUILD sphinx-tabs-3.3.1-r1.ebuild 1060 BLAKE2B 7fafee7e456db576410c3c1b11e0430c49c249869703477a694b0dd5cdbcbf2e7048955a6394248e267f9ea13b21d5951939b2dde5b92124159c8ca43f173e16 SHA512 19f543cd1b8df03b2153af99a72633ce617a784967821fd05a797f54bb3777a7a47626062732422bfc0af62235b8ed0f7547c172b45aafd7ce951c1666b6068c
-EBUILD sphinx-tabs-3.4.0.ebuild 1206 BLAKE2B c558985d64d1d66624a653754983bfc6b30dcfd96df8632746da9b918100ae056edfade7a57db8b23bbc4f1018063673c210af410e866fcb0e74609230f7ec78 SHA512 dbca25c37c953614b5ff253601ca2f6dba9d7eaa7dd5d9bc2adf6cac71e8c6214031d7e26f47b373c55f57a57eb23b1799e58b2de7a93afb0417698276b8a446
-EBUILD sphinx-tabs-3.4.1.ebuild 1335 BLAKE2B c88b49b504b0e6b53f5f899821653a706de617aea8368c73977256afdea88c5cb0d342dbc284abf2bcfee6fde47e9e6b5bf905b490ffb2b20be7c1dbd1ed826c SHA512 b408e352060fa3ff4461dbaaff5414676d188d5c7402bd0a3b38de6d69d485468193c09ebf67e4f0762981fcdb548169adcc28df80627c27dabd95caca2af647
+EBUILD sphinx-tabs-3.4.1.ebuild 1327 BLAKE2B fa58114a081be2e1ebc53521a902e567a4c248a9414679c4a16fece2087c5e9d1a8cfb7c2a7487664fdf48039478cbebfca5dddbd3a5878412eb3a683bb1e407 SHA512 33d682cd9641c8cebfe3214ace56e070e62f93da4e9fc8bd10765e1fad307e967a3b2a72cc605fecde1489a0b2aea7843dc7a5320200b966658c5149ade4da9e
 MISC metadata.xml 384 BLAKE2B 30013053128e39ca868d7643acbb5da9b87ba83f5fb6657a57dcee48d7322d72d7e7dd5e0d9e27a6b352c968a83f8e71b1c9ca56229fa5fe1eae0641d523a4e6 SHA512 0889534d054123371736de66f805503feab4737fc8b5cf7aa65bbd6f68528f4e871f7c540709b8c34b2d011bd89d889bb94c275e0900f9b3f3701e1628d7a9ee
diff --git a/dev-python/sphinx-tabs/sphinx-tabs-3.3.1-r1.ebuild b/dev-python/sphinx-tabs/sphinx-tabs-3.3.1-r1.ebuild
deleted file mode 100644
index c396a7f60c23..000000000000
--- a/dev-python/sphinx-tabs/sphinx-tabs-3.3.1-r1.ebuild
+++ /dev/null
@@ -1,43 +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_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Tabbed views for Sphinx"
-HOMEPAGE="
-	https://github.com/executablebooks/sphinx-tabs/
-	https://pypi.org/project/sphinx-tabs/
-"
-SRC_URI="https://github.com/executablebooks/sphinx-tabs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	=dev-python/docutils-0.17*[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-		dev-python/pytest-regressions[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/sphinx-testing[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
-
-EPYTEST_DESELECT=(
-	# Unpackaged rinohtype
-	tests/test_build.py::test_rinohtype_pdf
-)
diff --git a/dev-python/sphinx-tabs/sphinx-tabs-3.4.0.ebuild b/dev-python/sphinx-tabs/sphinx-tabs-3.4.0.ebuild
deleted file mode 100644
index 96c47dbd8305..000000000000
--- a/dev-python/sphinx-tabs/sphinx-tabs-3.4.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Tabbed views for Sphinx"
-HOMEPAGE="
-	https://github.com/executablebooks/sphinx-tabs/
-	https://pypi.org/project/sphinx-tabs/
-"
-SRC_URI="
-	https://github.com/executablebooks/sphinx-tabs/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"
-
-RDEPEND="
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-		dev-python/pytest-regressions[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/sphinx-testing[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
-
-EPYTEST_DESELECT=(
-	# Unpackaged rinohtype
-	tests/test_build.py::test_rinohtype_pdf
-)
-
-src_prepare() {
-	distutils-r1_src_prepare
-	# annoying, incorrect version limitations
-	sed -i -e '/install_requires/d' setup.py || die
-}
diff --git a/dev-python/sphinx-tabs/sphinx-tabs-3.4.1.ebuild b/dev-python/sphinx-tabs/sphinx-tabs-3.4.1.ebuild
index c69664385e9c..2dac63ad81da 100644
--- a/dev-python/sphinx-tabs/sphinx-tabs-3.4.1.ebuild
+++ b/dev-python/sphinx-tabs/sphinx-tabs-3.4.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 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"
 
 RDEPEND="
 	dev-python/docutils[${PYTHON_USEDEP}]
author	V3n3RiX <venerix@koprulu.sector>	2022-07-30 15:10:23 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-07-30 15:10:23 +0100
commit	27b0740bf48a0a181090a49d20f368ac8474e90b (patch)
tree	d715e035ea5c7dfe4a21b510e898913c33289cfa /dev-python
parent	ad0412d0cafb8c04ce98024155cf99a4cc27db44 (diff)