gentoo auto-resync : 08:10:2022 - 01:28:43

30 files changed, 115 insertions, 538 deletions

diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 1f6b0e0c1372..616dd0ea7e39 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/click-didyoumean/Manifest b/dev-python/click-didyoumean/Manifest
new file mode 100644
index 000000000000..42c7d2c2675e
--- /dev/null
+++ b/dev-python/click-didyoumean/Manifest
@@ -0,0 +1,3 @@
+DIST click-didyoumean-0.3.0.gh.tar.gz 309301 BLAKE2B 2b667b5e94dd690e5b7a2e96b83197f52e201b002a32fff4a8dbb4bd5497d5b816b40d9da98729821e1d17a795a3776c1553a746aa4c4144cf7fe6540768e1ca SHA512 4927ee392f27950c3f7ef5e0f1d5a5e2421172f3e9d34ec76986c9c7ea698cfa1981678a06fb8682577d6ed04c242c42bdd1d796d7623a1c99dfdbdb61c80fca
+EBUILD click-didyoumean-0.3.0.ebuild 599 BLAKE2B 2f88a8a95a44074d6948b24e196b73e44abddb9f57582819c0ea1b137b74cc2fd7b253594102adc5b935903d67e84ad182316b9be2b55394ca1c4263e12b0a6e SHA512 3ff7cdd10480bc6625678f563aba2a5cdf4840470b60759488b0ce8a289ce5885579cf417be6081f99bfd75a0cce778205c7282d74b80d96dfc4e90f2cbcbb2c
+MISC metadata.xml 414 BLAKE2B 576a2c062532711acb20510ba067e6daf75731007c62afc0bc59cddbe671f9f52bf43efaa737364dc779b6cc6de1ba47b98db4b3a101d9c5e3b6a83503cf31a9 SHA512 a49599c15a4051756421fecab41dd723907e5b988e6438426f8c5633d69abd46644a56d45997f81b564c08dcb6a3dd505a045872fa3ddae0f05e3e2300ddb157
diff --git a/dev-python/click-didyoumean/click-didyoumean-0.3.0.ebuild b/dev-python/click-didyoumean/click-didyoumean-0.3.0.ebuild
new file mode 100644
index 000000000000..7b69e0d713ed
--- /dev/null
+++ b/dev-python/click-didyoumean/click-didyoumean-0.3.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Enable git-like did-you-mean feature in click"
+HOMEPAGE="
+	https://github.com/click-contrib/click-didyoumean/
+	https://pypi.org/project/click-didyoumean/
+"
+SRC_URI="
+	https://github.com/click-contrib/click-didyoumean/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/click-7[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/click-didyoumean/metadata.xml b/dev-python/click-didyoumean/metadata.xml
new file mode 100644
index 000000000000..1a9b0c6e2e93
--- /dev/null
+++ b/dev-python/click-didyoumean/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="github">click-contrib/click-didyoumean</remote-id>
+		<remote-id type="pypi">click-didyoumean</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/ensurepip-pip/Manifest b/dev-python/ensurepip-pip/Manifest
index 9cde4b65f905..de9e5e77ecc8 100644
--- a/dev-python/ensurepip-pip/Manifest
+++ b/dev-python/ensurepip-pip/Manifest
@@ -1,3 +1,3 @@
 DIST pip-22.2.2-py3-none-any.whl 2044706 BLAKE2B 254427e593e44d9f1ce48276fd40f214e8ca9d27b6c31b7a6ed5fa4566df6b1f723215c6a1766a534ce18174f2363c383dbff19368d1b89f1519a53bebd34215 SHA512 142d3144c14b692c645613d98bf35dd91193128d5e21b61a8a702548f1247fac662499d6e39b65c0aa9a0444d2d92983fd8c410439796626485a4e1be99a102f
-EBUILD ensurepip-pip-22.2.2.ebuild 655 BLAKE2B 64434b2c338968a1cd0ad09a1f0b84010b51b5cf14a2d97ee1d97bd560150f583f122d717127700aa30623a250afb0b5634f7e9190a658252fdb0bd03c1d14c2 SHA512 015563286020fda1f8a80b09f31ac511cc21df62102f582f887f46ff339aeaf4b3717e684302631a0d9a3a16818421af6a905af75512bf53eb37e776ebf59a2f
+EBUILD ensurepip-pip-22.2.2.ebuild 654 BLAKE2B f18d5964a7314be76d7445f5187493d135bab4b7d8a26326b044ab4e0fb136373c27f46d3132d08de7cf53b475cfd4d9f3a12f1ba943344a9d39b388633f9dd2 SHA512 0e3db321efe3784abdab74e682a479ee0f5bd5681c6ea36e7a1c8caa20adfcf1a090e8c5bbfb81cd11ea3972321162f425ef62b7e06ec876eb03cde028ef389c
 MISC metadata.xml 309 BLAKE2B 197e5620aab85ff590270ae6838c9188cd699943af4c9c3eeb7de92c2e9390c082eec603e63bc2bba39477586f19e58da2e5fe2d5ffe9b59b87ae5386c939df1 SHA512 c678bc8fb62f6e6850939ebff56962503bb03393572cfff7e5f7d38e8cf5ca71d8e38e402355c5f963fb718eed24bca463d7c63fede5cbb550f6f32a9c06af9e
diff --git a/dev-python/ensurepip-pip/ensurepip-pip-22.2.2.ebuild b/dev-python/ensurepip-pip/ensurepip-pip-22.2.2.ebuild
index 6ca917f08b4b..f502d3d7b09b 100644
--- a/dev-python/ensurepip-pip/ensurepip-pip-22.2.2.ebuild
+++ b/dev-python/ensurepip-pip/ensurepip-pip-22.2.2.ebuild
@@ -15,7 +15,7 @@ S=${DISTDIR}
 
 LICENSE="Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MIT MPL-2.0 PSF-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	!<dev-python/ensurepip-wheels-100
diff --git a/dev-python/ensurepip-setuptools/Manifest b/dev-python/ensurepip-setuptools/Manifest
index ad1f4f570d88..f65ac7bd7239 100644
--- a/dev-python/ensurepip-setuptools/Manifest
+++ b/dev-python/ensurepip-setuptools/Manifest
@@ -1,9 +1,5 @@
-DIST setuptools-65.0.2-py3-none-any.whl 1233332 BLAKE2B 0c0d0db73452d15947097f3d453f01bb42ef150b50122b7a1f39212f663064284bc313a04c3dbe99e8da7e614d72a963d6c9f0c8f486f5d84131a06718b288c8 SHA512 11d9975468166bf7db9a9da44d893a67daacc5f309da1b521278a95a33fa2b3574cae10840c9943de54bf5d411e54697f91b62a3bfb5a6a3bc69b804af2a1365
-DIST setuptools-65.1.0-py3-none-any.whl 1232689 BLAKE2B db8f85b99b1d47af55d484d77ecafe5122abe9ab8dcec565659bb91c16aa26513c00d8684ca3b7b57e629d512b42273188a00ee0a0958bba5097ce150869609f SHA512 1072a826964ec3413c5bcd3f930a2f314b87b0b77714ddc948573841fbb871a898843211beaff0bcc5e003fcaab678de5d2b9a3a9fa864beced1bf2af282d048
 DIST setuptools-65.2.0-py3-none-any.whl 1232422 BLAKE2B 049fbccec71e15ed01b5e07f5d60589c662d012e4fe27c6eb8fbe3b62692bb63d891c9cf4253fe74b5a5803db39f3e5194f8481e5a3555493e9f18bd6985b35d SHA512 e0fc48a3ebe2022783c2f56d85d8ad5e17bd0f5f2caefc5e3ac6eb4ddf1464854ad9039c62a55e72ca6b0387e7f874b15b7a0df4acbf6153a51cb8e8146bd93d
 DIST setuptools-65.4.1-py3-none-any.whl 1232518 BLAKE2B 545caa5f7c551090e3dcb71c388477c4aad8aaee1dbf4a7f7fc08f27a296a81a055310b41c3d4af7cb3cf375c5ab465fec29ef3e29456281f56b7df544dd0eca SHA512 c0bc3f5f3b7c8a8b83df4d12f5f99d41ea910220abc16e8b93e3b533dc8d665802608c447e8c1eb070c19c24b1baa83faf2ac42488f95808ed585c169afadd58
-EBUILD ensurepip-setuptools-65.0.2.ebuild 627 BLAKE2B f9effdc2c370edaacfe107c69a461aea1d737b5134c35647f4cff0919f577099ab7e59423f9eae9d0bf48bb04efa8ffae91a797176b485501ab68ba991a8e126 SHA512 79952939def604a65c67c39b61938c7c24e644c4c841c1d466a2a8d6030d4a942213365c7389612edbd43df5db0df113ea8f6da7b62ff5681819f0de9cb11c0e
-EBUILD ensurepip-setuptools-65.1.0.ebuild 627 BLAKE2B f9effdc2c370edaacfe107c69a461aea1d737b5134c35647f4cff0919f577099ab7e59423f9eae9d0bf48bb04efa8ffae91a797176b485501ab68ba991a8e126 SHA512 79952939def604a65c67c39b61938c7c24e644c4c841c1d466a2a8d6030d4a942213365c7389612edbd43df5db0df113ea8f6da7b62ff5681819f0de9cb11c0e
-EBUILD ensurepip-setuptools-65.2.0.ebuild 620 BLAKE2B cdb59a7448ad7ba64fe903fe3f8cdf7f697c5e36d225557b1f656c1e16f54d12a778ef2ecabb92bfe1015f785ff62ed6a431294cbcf316dd24364f46baa11e2e SHA512 a924f4bccd7ef3d613a0ed51443b9eed6f3b2aa432ccc428c12661d150e3cb937cb9340f956920878b0b27a5f65e0220de7ca252ff008504020c02a4f2438b71
+EBUILD ensurepip-setuptools-65.2.0.ebuild 619 BLAKE2B ee5b00332e47f02390ebd2878b96dac800f2fe11f5357af2dc70ce13d6acc7c878883b444cf023c44a9f6a392d6a057b37f6b617150162d28cefe5951986066d SHA512 6cc9cdd806a12658a32f6d19693251e8a3b859c7a866c3e33f444903ffe060d448ac49105f04303f07db7dd2775324ec051ffac00ef3dd668580fedd5eb844c9
 EBUILD ensurepip-setuptools-65.4.1.ebuild 627 BLAKE2B f9effdc2c370edaacfe107c69a461aea1d737b5134c35647f4cff0919f577099ab7e59423f9eae9d0bf48bb04efa8ffae91a797176b485501ab68ba991a8e126 SHA512 79952939def604a65c67c39b61938c7c24e644c4c841c1d466a2a8d6030d4a942213365c7389612edbd43df5db0df113ea8f6da7b62ff5681819f0de9cb11c0e
 MISC metadata.xml 316 BLAKE2B 17947c657b45cb01758e222aa6051a459bf0bd9a026a73c0df0ae0c3a0c901f6e2315d459ee37036ecd283481a8d97791d64688c108a0706e745a739e3f9e8f8 SHA512 af18f4ae51b253552752e14210789988c815d0dbf0e1d8ff7057e48a09303c4abc1fb240d6f7f15fc0993b33e4c8ee395c2755754b3a2cbfd4c3a3f0dad41cfe
diff --git a/dev-python/ensurepip-setuptools/ensurepip-setuptools-65.0.2.ebuild b/dev-python/ensurepip-setuptools/ensurepip-setuptools-65.0.2.ebuild
deleted file mode 100644
index 96c75c915768..000000000000
--- a/dev-python/ensurepip-setuptools/ensurepip-setuptools-65.0.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN=${PN#ensurepip-}
-WHL=${MY_PN}-${PV}-py3-none-any.whl
-
-DESCRIPTION="Shared setuptools wheel for ensurepip Python module"
-HOMEPAGE="https://pypi.org/project/setuptools/"
-SRC_URI="
-	https://files.pythonhosted.org/packages/py3/${MY_PN::1}/${MY_PN}/${WHL}
-"
-S=${DISTDIR}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	!<dev-python/ensurepip-wheels-100
-"
-
-src_install() {
-	insinto /usr/lib/python/ensurepip
-	doins "${WHL}"
-}
diff --git a/dev-python/ensurepip-setuptools/ensurepip-setuptools-65.1.0.ebuild b/dev-python/ensurepip-setuptools/ensurepip-setuptools-65.1.0.ebuild
deleted file mode 100644
index 96c75c915768..000000000000
--- a/dev-python/ensurepip-setuptools/ensurepip-setuptools-65.1.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN=${PN#ensurepip-}
-WHL=${MY_PN}-${PV}-py3-none-any.whl
-
-DESCRIPTION="Shared setuptools wheel for ensurepip Python module"
-HOMEPAGE="https://pypi.org/project/setuptools/"
-SRC_URI="
-	https://files.pythonhosted.org/packages/py3/${MY_PN::1}/${MY_PN}/${WHL}
-"
-S=${DISTDIR}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	!<dev-python/ensurepip-wheels-100
-"
-
-src_install() {
-	insinto /usr/lib/python/ensurepip
-	doins "${WHL}"
-}
diff --git a/dev-python/ensurepip-setuptools/ensurepip-setuptools-65.2.0.ebuild b/dev-python/ensurepip-setuptools/ensurepip-setuptools-65.2.0.ebuild
index ab1e43cc86ea..4dc09f674370 100644
--- a/dev-python/ensurepip-setuptools/ensurepip-setuptools-65.2.0.ebuild
+++ b/dev-python/ensurepip-setuptools/ensurepip-setuptools-65.2.0.ebuild
@@ -15,7 +15,7 @@ S=${DISTDIR}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	!<dev-python/ensurepip-wheels-100
diff --git a/dev-python/ensurepip-wheels/Manifest b/dev-python/ensurepip-wheels/Manifest
index ea8a41888dd7..e097dc22ca11 100644
--- a/dev-python/ensurepip-wheels/Manifest
+++ b/dev-python/ensurepip-wheels/Manifest
@@ -1,7 +1,2 @@
-DIST pip-22.2.2-py3-none-any.whl 2044706 BLAKE2B 254427e593e44d9f1ce48276fd40f214e8ca9d27b6c31b7a6ed5fa4566df6b1f723215c6a1766a534ce18174f2363c383dbff19368d1b89f1519a53bebd34215 SHA512 142d3144c14b692c645613d98bf35dd91193128d5e21b61a8a702548f1247fac662499d6e39b65c0aa9a0444d2d92983fd8c410439796626485a4e1be99a102f
-DIST setuptools-63.4.3-py3-none-any.whl 1230380 BLAKE2B e8959efcfdd53e163a49605f4abada5b3571a6511b5859aa73546ad317255fac03b5a38bfc7945cf10cc589f692a7a44de0a12b3d8107782ff6fcd80d0f521b6 SHA512 0c1df89ed0d6bfb368eb8ef211663de5d5fdefc89bb43e23bd639e18b5362d34b90c4be3212c64cda7308109e626991410204c761b949a0f04ae8fe1f86056a5
-DIST setuptools-64.0.3-py3-none-any.whl 1247789 BLAKE2B 60d7917c7c3d467ba8112ac596fb8558c259b7c1e39cf956694e4b0238bbcc5f2ad64aa3234f94614f9f05dcd67968428f2660ecec1de86b46be1f70d9df82e3 SHA512 081b9c024e469c976978cd60ce2e6c5019ff275035b6807629755fc1560a19892e37fd0ee81ff11b28190e861d732d69e08ea9d928f1910cd4e0db957ae6fcc8
-EBUILD ensurepip-wheels-100.ebuild 418 BLAKE2B 5b1e8e94eb9c4226c1434f22a545741d64146486c51a445e90f0dea3d59ad8902c11331595afb88114e1418c6e13944fc94b22f1f74dc7a62a990bc6ae8c762a SHA512 ec81ee8669e78b74d57c3e5e7e464a475e68da6643e418afdc4b2bf2025395d1b55dd94cb5e3a990cde4f3ab8bd892402fb8a9a2f965b0018981615f16f96d74
-EBUILD ensurepip-wheels-63.4.3.22.2.2.ebuild 840 BLAKE2B 1243e37a93ffdd939c1aa55cb0926e111e6fd5b6e6011e81b3006734c0f73d35d6f4c1274995a4227cc8868f334eb30b8faab03d69fb2f8b25af0c6f60c80a38 SHA512 564fbb4336c4e46dbd0472801653c53c6af54aa72cf047f72a04ed7379474eefa49975d1e5ee231e3d0832bf22b65ad169acfea125abcc8dbc6ca7e4802a7e30
-EBUILD ensurepip-wheels-64.0.3.22.2.2.ebuild 848 BLAKE2B 2d4062dcde645e944dcc73a9fe8150ded2473bdeb0656832223cc1071b8fbc9b99522eff3eef11778ac9f12e97a85a8c99bdd78a4fd85b7b87b6711439d5e0c4 SHA512 cd12ffe723070c282e9f92ce6c0b125ba0f336e73d063c68f49ad4c91e29dba542ed877dcfe1afd5913c71cfc1f0cc8333d0cb8f7f9ee36050e8f42610a3498d
+EBUILD ensurepip-wheels-100.ebuild 417 BLAKE2B fde456b6497fb25a0741fe04002795f9385a2317c6d7cde6740301dfa5f8d169ece108d5d07adf6eebe7c97531ae2b7c613d70e4f757c951c1289e9a41910fed SHA512 9773f450fbc8eed24169d7753f09a38b661fce0856567c9618ffc2a620babf7d4cc839b435e5b04f97dca9ad392b505c06b92da41ebd1eecbf6dd71bceb6264d
 MISC metadata.xml 357 BLAKE2B 2275bcbbf65269212f67a4524163fd07ae84c50ec48533b758e600c3d9e8e54db416d5e5a6d0b08f05a82b9c6adcf7df5ccb1ad3c760f79a615136c13235f7ed SHA512 0c30429f2ee7956f92537dcea88ed5e3598575a4b9b64935de0f437791e88ae3c9991c5759e670e7a1cba478a87be7675c4864a707d6a51d9b25540074f14963
diff --git a/dev-python/ensurepip-wheels/ensurepip-wheels-100.ebuild b/dev-python/ensurepip-wheels/ensurepip-wheels-100.ebuild
index ac5078255486..5045dcf488ae 100644
--- a/dev-python/ensurepip-wheels/ensurepip-wheels-100.ebuild
+++ b/dev-python/ensurepip-wheels/ensurepip-wheels-100.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/ensurepip-pip
diff --git a/dev-python/ensurepip-wheels/ensurepip-wheels-63.4.3.22.2.2.ebuild b/dev-python/ensurepip-wheels/ensurepip-wheels-63.4.3.22.2.2.ebuild
deleted file mode 100644
index adfa2e2b013d..000000000000
--- a/dev-python/ensurepip-wheels/ensurepip-wheels-63.4.3.22.2.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-SETUPTOOLS_WHL=setuptools-$(ver_cut 1-3)-py3-none-any.whl
-PIP_WHL=pip-$(ver_cut 4-)-py3-none-any.whl
-
-DESCRIPTION="Shared wheels for ensurepip Python module"
-HOMEPAGE="
-	https://pypi.org/project/pip/
-	https://pypi.org/project/setuptools/
-"
-SRC_URI="
-	https://files.pythonhosted.org/packages/py3/p/pip/${PIP_WHL}
-	https://files.pythonhosted.org/packages/py3/s/setuptools/${SETUPTOOLS_WHL}
-"
-S=${DISTDIR}
-
-# combined license of setuptools and pip (with its bundled deps)
-LICENSE="Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MIT MPL-2.0 PSF-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-src_install() {
-	insinto /usr/lib/python/ensurepip
-	doins "${PIP_WHL}" "${SETUPTOOLS_WHL}"
-}
diff --git a/dev-python/ensurepip-wheels/ensurepip-wheels-64.0.3.22.2.2.ebuild b/dev-python/ensurepip-wheels/ensurepip-wheels-64.0.3.22.2.2.ebuild
deleted file mode 100644
index 691136b4b5bb..000000000000
--- a/dev-python/ensurepip-wheels/ensurepip-wheels-64.0.3.22.2.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-SETUPTOOLS_WHL=setuptools-$(ver_cut 1-3)-py3-none-any.whl
-PIP_WHL=pip-$(ver_cut 4-)-py3-none-any.whl
-
-DESCRIPTION="Shared wheels for ensurepip Python module"
-HOMEPAGE="
-	https://pypi.org/project/pip/
-	https://pypi.org/project/setuptools/
-"
-SRC_URI="
-	https://files.pythonhosted.org/packages/py3/p/pip/${PIP_WHL}
-	https://files.pythonhosted.org/packages/py3/s/setuptools/${SETUPTOOLS_WHL}
-"
-S=${DISTDIR}
-
-# combined license of setuptools and pip (with its bundled deps)
-LICENSE="Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MIT MPL-2.0 PSF-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-src_install() {
-	insinto /usr/lib/python/ensurepip
-	doins "${PIP_WHL}" "${SETUPTOOLS_WHL}"
-}
diff --git a/dev-python/openapi-core/Manifest b/dev-python/openapi-core/Manifest
index c929027be8b2..0ff176fb5595 100644
--- a/dev-python/openapi-core/Manifest
+++ b/dev-python/openapi-core/Manifest
@@ -1,9 +1,5 @@
-DIST openapi-core-0.14.2.gh.tar.gz 57519 BLAKE2B 06dfd284612ca11a271f075444db9b859ca5416e31594680d6b32abec1fe917105f213209d1bfcb9664b265ea3d62839579134e8e104754075cd692d1ba7a99a SHA512 19a2508d56053214993abed7d173d17b55a80dac6421681d7c64082f910bf9cb03c99d4006a2cd883d51d54f11a18f90188f141a78b9d69a9a031c284a14f8f1
 DIST openapi-core-0.14.5.gh.tar.gz 57645 BLAKE2B c5c9c308b93a37e32708677cc7c7a2ccb9ec3f018390e56a251224b6b8776943ccd0ddfb560cdc3f1182cb32a9b2817878a0d4dda3906c179db9841853caf7ac SHA512 69d9fb2cc21dfdb939beae45b1c681faf9f8e3366b36e5907b00be65ac669ec40e3ae3fe910fb2c4f6c70d1412e6a67e4e4e47e3cf2c424716da4c813223295e
-DIST openapi-core-0.15.0.gh.tar.gz 73274 BLAKE2B 8bae95a3a70438702d6a49c06954dba610766b945076357cc32382b59efbbf2d839a282b41b3d96f75b25e8864c0b9f9bfec1eecd8056e205bda5d62fbc6abc4 SHA512 3e9327fdf7d8b84d29627bfcb9a7c7e471ddf8cb06c5b2ffd3518fadcb872738cdfc5365558c51b8e0526bfbe5a841b9bc9598d630c6c6ddf141dc9c6681c3d6
 DIST openapi-core-0.16.0.gh.tar.gz 79041 BLAKE2B 93745787d39dc2e77e6b268792548069e7637ea7acbf4975224d837b87f301ea5ae36c07aec5b8f44b6e7a5480aab744e9601663f080d63f27b8a49aeb9cd7f5 SHA512 70ed773926c16df9d085e7ce104a0a99ccc52e8e0ba395ead1cf5e9cba1e43723bb7a744cd2b9c27e3a8a48319f8265dc5745c20cc23e825fa28ed3b2fcd3e25
-EBUILD openapi-core-0.14.2.ebuild 1733 BLAKE2B ba75a26c077c9b9ac1c09f321c941d96cfbc4b37404d77481d9d0a03ddf93e931ad4a5b623a7bc3fcf48c4157b4f31989c0fdaa45e0f132d5a1d54a35173e94c SHA512 cbe22ad4328af6634c37a4348edca2ee841db605f4d09a3a4c4a63548d077acad7bea0742a375229a0c777bfb4dff137ea3c40ebc256486c810e6b17e6b3490d
 EBUILD openapi-core-0.14.5.ebuild 1780 BLAKE2B 69e455d8d5e1d10359239a6c5463659fa5a85b43fa1e17ba19cd5bda9a9b6905808847f9ded7e7f2c028961c136697efde9309df9cc5e2509117a51f4c166ebf SHA512 ac6902c71cb38a390776af35c0fb2d460e2862ee3c2ad9ef09ac68c0a7a402f33be8c5fd0dbc18db2ae3c8c4d97a1448d40c349fa8828700e26bd516c8262ea1
-EBUILD openapi-core-0.15.0.ebuild 1509 BLAKE2B cbebd6c7b73dff0acf65a1ac28b2cba6c9485dcc50b0b802bdb0cc3d5672d148923dc78ad600c5b3e0e9d7b62fc0d5d9101ff5642e6eb3c26ade8d894588eeba SHA512 77689ea82e80566ebb6eeadf5c79aeef9dc0a26129a48876106b27abfa15ec7b67ba1dcee26c7aa0bf851a115c50763ea0c00a95884740639166104b61b40621
 EBUILD openapi-core-0.16.0.ebuild 1818 BLAKE2B 3df6eb891f5e4126faab5207c1ed2bc4e25970b2c4c45aa8f2f1e12fef98d735bdf99ba4c0f4b1e8f7ff553a1369c1bfeb6dec6ce88932091187fe7e5a53e48a SHA512 972d6aba4f1f51389cb061d7c7887eb288dc53d2af4f3042d7632d5f7e51812861e95dd81bae1c57cae63fbf8825fbbd0426e92f66d4546d2f7e3473d050450b
 MISC metadata.xml 376 BLAKE2B bf1f9cf9377b172dfb5f916332dbf9d1e485f3ca1f31f754afac41931598c1780c474989edbfcf39bbfd4ceb8e8030280cf0997514dfb8e02bf3294176fc3dfd SHA512 c7fbdc21a2ea86abe5bcf4a3e8ba97634a447926ce999aff761965ff411fb05b09fab5e5338da5f8a8486a6b024cfeb27cfb9d9fbbfc9bad6f9dabaca1c82799
diff --git a/dev-python/openapi-core/openapi-core-0.14.2.ebuild b/dev-python/openapi-core/openapi-core-0.14.2.ebuild
deleted file mode 100644
index 8f30b58a2c65..000000000000
--- a/dev-python/openapi-core/openapi-core-0.14.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 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="Client-side and server-side support for the OpenAPI Specification v3"
-HOMEPAGE="
-	https://github.com/p1c2u/openapi-core/
-	https://pypi.org/project/openapi-core/
-"
-SRC_URI="
-	https://github.com/p1c2u/openapi-core/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/isodate[${PYTHON_USEDEP}]
-	dev-python/dictpath[${PYTHON_USEDEP}]
-	dev-python/openapi-schema-validator[${PYTHON_USEDEP}]
-	dev-python/openapi-spec-validator[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
-	dev-python/attrs[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-	dev-python/parse[${PYTHON_USEDEP}]
-	dev-python/more-itertools[${PYTHON_USEDEP}]
-"
-
-BDEPEND="test? (
-	dev-python/django[${PYTHON_USEDEP}]
-	dev-python/djangorestframework[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	dev-python/responses[${PYTHON_USEDEP}]
-	dev-python/webob[${PYTHON_USEDEP}]
-)"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# falcon not packaged
-	rm -r tests/integration/contrib/falcon || die
-
-	# Theses tests fail to collect
-	rm tests/integration/validation/test_security_override.py || die
-	rm tests/integration/validation/test_read_only_write_only.py || die
-
-	# There's a problem in the test suite here
-	rm tests/unit/unmarshalling/test_unmarshal.py || die
-	rm tests/integration/contrib/django/test_django_rest_framework_apiview.py || die
-
-	sed -i -e '/--cov/d' setup.cfg || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/openapi-core/openapi-core-0.15.0.ebuild b/dev-python/openapi-core/openapi-core-0.15.0.ebuild
deleted file mode 100644
index af9428866296..000000000000
--- a/dev-python/openapi-core/openapi-core-0.15.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 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} )
-
-inherit distutils-r1
-
-DESCRIPTION="Client-side and server-side support for the OpenAPI Specification v3"
-HOMEPAGE="
-	https://github.com/p1c2u/openapi-core/
-	https://pypi.org/project/openapi-core/
-"
-SRC_URI="
-	https://github.com/p1c2u/openapi-core/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=dev-python/pathable-0.4.0[${PYTHON_USEDEP}]
-	dev-python/isodate[${PYTHON_USEDEP}]
-	dev-python/more-itertools[${PYTHON_USEDEP}]
-	dev-python/parse[${PYTHON_USEDEP}]
-	<dev-python/openapi-schema-validator-0.3[${PYTHON_USEDEP}]
-	<dev-python/openapi-spec-validator-0.5[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		dev-python/flask[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		dev-python/strict-rfc3339[${PYTHON_USEDEP}]
-		dev-python/webob[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# falcon is not packaged
-	tests/integration/contrib/falcon
-
-	# TODO: these tests fail to collect
-	tests/integration/validation/test_security_override.py
-	tests/integration/validation/test_read_only_write_only.py
-
-	# unhappy about modern django
-	tests/integration/contrib/django/test_django_project.py
-	tests/unit/contrib/django/test_django.py
-)
-
-src_prepare() {
-	sed -i -e '/--cov/d' pyproject.toml || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/openapi-schema-validator/Manifest b/dev-python/openapi-schema-validator/Manifest
index 09fb4c504de3..b349ba487adc 100644
--- a/dev-python/openapi-schema-validator/Manifest
+++ b/dev-python/openapi-schema-validator/Manifest
@@ -1,7 +1,5 @@
 DIST openapi-schema-validator-0.2.3.gh.tar.gz 25501 BLAKE2B d961cabca647f59d4d4188f1941ce5b2475e02520bcc10e7cd29817c8ea8ebaaac5af1ffb0e3d5079ed2d1493414cdaf55336744b142385754585e748af8ac98 SHA512 e6dfe3d6cc99fa9723102ced42040203157639be68b0438d7bfae4499e51cdb6257a36dca10425a5d5e692cebb958468ebeee722116b99d800a6fcf972400c66
-DIST openapi-schema-validator-0.3.1.gh.tar.gz 23232 BLAKE2B d02f9004d7baf96e76fb035e212efbdb773f1d7685c8b73107d887ad1cdf2496afd4232bd4fbb263597106b6a7e7d0eb7e6efbe64f422ca11ff228d5f2f51fdb SHA512 72564409e80c8dd8578ba2a363865623aa03b8b2324abd37bea31c503632a367bacf81d8de801579b80347906d2b24c14371c9b37b70176e0bf51ca8c6b9e071
 DIST openapi-schema-validator-0.3.4.gh.tar.gz 16593 BLAKE2B 17882dff25d1bed05efa74792930a357d82cb404bbf746a6f348e9813b4af86842da1523a8e3dfaec1426c82efff6b0bddbfca89c8569ba36a4324ab4e5a418b SHA512 714f93594c875a04194a6980dc5e092866609787e424ef480d42da93c114e3b658a5efef13f78ed3db35f6e7399d7dda8adbc1d3bb8606512aa4f135edeaeb75
 EBUILD openapi-schema-validator-0.2.3.ebuild 857 BLAKE2B eb473e375f925dc889aafd6ffbae05880a663acb1b4a929795f9ef555e6dd92591aedc9f092e593fd3b8f8500b62f36d3e7101a791baf24296639fab7c39dfb3 SHA512 98c81c69daffc9d3f19a686e9b343ac0fd5bd74a966a129259d953895066c5216c6d6398372fe053c08b92b3da2915b204b3a5df5f183d51a5c91fc3b5b6f8ed
-EBUILD openapi-schema-validator-0.3.1.ebuild 900 BLAKE2B 732d75215eafdae0d32086ece6a9f9b50d28151d4657e6d8ae972fb6b0afeab322bb3c5456cdd438dee67860b7e22a5ada50d338da218c328850db34a99322ca SHA512 0279a3ac817c913271ac58edf1a188e67eb1cd5fb09198e5469a0b700d01fa75e059d49a441098b4bce845c94cadd5bfaab712bfa83629d0749f8e922e3f421c
-EBUILD openapi-schema-validator-0.3.4.ebuild 902 BLAKE2B b6686aecd51239bec1f3c81b6acd0d1c116f0cd6b72c010d2a71c19495e0bad80b6eae755739c53e7316f4ac0c67b13aa042f1d29c18bb3823f0bcfb4c30998c SHA512 d004c4106efe6ab0d3a965c761f12931ff641b940eb8cc3cb1a0e17fd4fb2fe2e2b59f8fa90ea5e964b32d1d8a897bfbcfdfd85eec1b664dfdccbb453d5b60f3
+EBUILD openapi-schema-validator-0.3.4.ebuild 900 BLAKE2B 732d75215eafdae0d32086ece6a9f9b50d28151d4657e6d8ae972fb6b0afeab322bb3c5456cdd438dee67860b7e22a5ada50d338da218c328850db34a99322ca SHA512 0279a3ac817c913271ac58edf1a188e67eb1cd5fb09198e5469a0b700d01fa75e059d49a441098b4bce845c94cadd5bfaab712bfa83629d0749f8e922e3f421c
 MISC metadata.xml 400 BLAKE2B 7869b5ce26c516d7e8ac441229cc5e749dfe6ee5fea478a0d5a0574bfbb863434d03f5c16332376337c33f4215877b985251cd5a2e71caf445a16f52283a63fc SHA512 071df32bb4ad2c941aafb9232ff890ec9e1150ee789eb9e335a94024ceb7bf6b7b79cd8f9f0ca16fc08c6e19383616253d391710b4d1e2796d57d12ff00436e0
diff --git a/dev-python/openapi-schema-validator/openapi-schema-validator-0.3.1.ebuild b/dev-python/openapi-schema-validator/openapi-schema-validator-0.3.1.ebuild
deleted file mode 100644
index 24015e17c437..000000000000
--- a/dev-python/openapi-schema-validator/openapi-schema-validator-0.3.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenAPI schema validation for Python"
-HOMEPAGE="
-	https://github.com/p1c2u/openapi-schema-validator/
-	https://pypi.org/project/openapi-schema-validator/
-"
-SRC_URI="
-	https://github.com/p1c2u/openapi-schema-validator/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	dev-python/isodate[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-4.0.0[${PYTHON_USEDEP}]
-	dev-python/rfc3339-validator[${PYTHON_USEDEP}]
-	dev-python/strict-rfc3339[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -e '/--cov/d' -i pyproject.toml || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/openapi-schema-validator/openapi-schema-validator-0.3.4.ebuild b/dev-python/openapi-schema-validator/openapi-schema-validator-0.3.4.ebuild
index 79fa33f1e09d..24015e17c437 100644
--- a/dev-python/openapi-schema-validator/openapi-schema-validator-0.3.4.ebuild
+++ b/dev-python/openapi-schema-validator/openapi-schema-validator-0.3.4.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/openapi-spec-validator/Manifest b/dev-python/openapi-spec-validator/Manifest
index 0ba3356a480c..b7b849cd0ddd 100644
--- a/dev-python/openapi-spec-validator/Manifest
+++ b/dev-python/openapi-spec-validator/Manifest
@@ -1,8 +1,6 @@
 AUX openapi-spec-validator-0.5.0-std-importlib.patch 1451 BLAKE2B ed6a94863f92e5eef2b443826239ccd110b1caacc559465edb0bada4028c38164e9fbfd1a4585211f5384b76866f25dcf55f229ce3582fe377ed2d7f1e711745 SHA512 2d1550cbd8364f26d62e709567fd08e5a134b5ab69ec88fd2f00c928f878c811ef850ce4ed01ac79abe583c84403de912c9845c3ccd264707b403fe1c9ee0544
 DIST openapi-spec-validator-0.4.0.gh.tar.gz 46051 BLAKE2B 43a1458ab1801700261f750e49d45b0cb4d02f1c17a16943b5232836061e0e1466fc973343bbd4bf7a8669b682bd6761cb905fdfb3b80c0b9720253cc2d5a926 SHA512 d2eaf22c75e72eb5061a916eb37b13179a5ba65eb8a00ec42e81c6b4168239bc8613388f2d77ce35113d260385b175280d8863a3deedf18ea5aa93a79f058419
-DIST openapi-spec-validator-0.5.0.gh.tar.gz 39173 BLAKE2B 0c9ac1617423b2f1983e1036b5bfddba3388ace454bb3df743d9d5fe62708fabd54ff4373b77901fc78e7e761d0cc059132a557e73bf5095618fd6f1f074bcfe SHA512 728f600962b493a0e6914d5ac662cda107929630e26b95fb3d5749579d90d278073f5b5d69445cbe90e4c3edbc2ee5de34045f34003a8c75a3d5a33df52cb1fc
 DIST openapi-spec-validator-0.5.1.gh.tar.gz 39539 BLAKE2B 66adbed2c85527f89e510d5cbc11ccf05f23546191e2677a1c34f7545d2e975dda37f1c53e988e37cf526663053ac0176567137273e3be9156b24deda89db6c1 SHA512 b70a2f926d889fec9d4fd26c51e1fbbeb5e75f13449d2d0205b1b7edb12ab2ba49e4cac69426f782ca3a4430c79a6de8f66b4aad2fc552bcfcf7005e866522ff
 EBUILD openapi-spec-validator-0.4.0.ebuild 1503 BLAKE2B 9630f20e77d363c1dbc99ab2a3cc6a5732fb1a9931fb39a7070e8822b24f4d45310b53287ca0c6fe3c09bd6f4a0f7acf01233b60b79c040954fd42fa36efddf2 SHA512 0c8f2cfbc74d2235fc83f579a33f781972b6756a632074ccea4a41f87014286b9edefb23d14fa3e311b81350372387ddd463a758d3f69c5c705ddb8a64db25af
-EBUILD openapi-spec-validator-0.5.0-r1.ebuild 1990 BLAKE2B 30452245598e26e2767ea4a321d12984a27d9535c5f2dfa016add8de0fecc07571a9d609bd6adf908905bce492b716df6c8af121de3c087805b72c6a0ece5321 SHA512 96e4029db60d3184f274292d3f7bcaabfc5210dbd06de267c903150adfc1bdc0313cb4c61d994b557fe925544aa91c7e3c5ab14f5402fdab5ba3d97bdb01c3e6
 EBUILD openapi-spec-validator-0.5.1.ebuild 2009 BLAKE2B cc65b429451bffa38f411ac386598fa6dccaa45126123998b097fc1e70c49593a996b4429e319399f595506a519ddb2ea6eea1f4a3d95b6e43b9aa79290e20d8 SHA512 35d971044e88717f779574471177f46b0b66dbc0fb67286bd3d8a8b5ce9779e1c2224977ae6a6a3e33bd1c9b94fa491c526b0310e5d735d0819009e6850694e1
 MISC metadata.xml 372 BLAKE2B 6b08d5f1a63e2ddf4c0f1ab8479a18109231211c82a2a1178a9e1d0775ad0fd5811580c3b2175137ec135b6c8d8ad0e0d728d79da98c092fd87fc604c7cc8a4f SHA512 4fe628abc1481b9dd5874dd5efaaefa5f1adf24e2e58183d2ca75677680077a443702887bb21c67049df998052dc6afae590ac9197b6edb87cc10c126ae22345
diff --git a/dev-python/openapi-spec-validator/openapi-spec-validator-0.5.0-r1.ebuild b/dev-python/openapi-spec-validator/openapi-spec-validator-0.5.0-r1.ebuild
deleted file mode 100644
index 058e1fc7c0ec..000000000000
--- a/dev-python/openapi-spec-validator/openapi-spec-validator-0.5.0-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenAPI 2.0 (aka Swagger) and OpenAPI 3.0 spec validator"
-HOMEPAGE="
-	https://github.com/p1c2u/openapi-spec-validator/
-	https://pypi.org/project/openapi-spec-validator/
-"
-SRC_URI="
-	https://github.com/p1c2u/openapi-spec-validator/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/jsonschema-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-spec-0.1.1[${PYTHON_USEDEP}]
-	>=dev-python/lazy-object-proxy-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/openapi-schema-validator-0.3.2[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_resources-5.8.0[${PYTHON_USEDEP}]
-	' 3.8)
-"
-
-PATCHES=(
-	# https://github.com/p1c2u/openapi-spec-validator/pull/174
-	"${FILESDIR}/${P}-std-importlib.patch"
-)
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# Internet
-	tests/integration/test_shortcuts.py::TestPetstoreV2Example
-	tests/integration/test_shortcuts.py::TestApiV2WithExampe
-	tests/integration/test_shortcuts.py::TestPetstoreV2ExpandedExample
-	tests/integration/test_shortcuts.py::TestPetstoreExample
-	tests/integration/test_shortcuts.py::TestRemoteValidatev2SpecUrl
-	tests/integration/test_shortcuts.py::TestRemoteValidatev30SpecUrl
-	tests/integration/test_shortcuts.py::TestApiWithExample
-	tests/integration/test_shortcuts.py::TestPetstoreExpandedExample
-	tests/integration/test_validate.py::TestPetstoreExample
-	tests/integration/test_validate.py::TestApiWithExample
-	tests/integration/test_validate.py::TestPetstoreExpandedExample
-	tests/integration/validation/test_validators.py
-)
-
-src_prepare() {
-	sed -i -e '/--cov/d' pyproject.toml || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/pygraphviz/Manifest b/dev-python/pygraphviz/Manifest
index 323f87e67f5f..4ae4842c8db4 100644
--- a/dev-python/pygraphviz/Manifest
+++ b/dev-python/pygraphviz/Manifest
@@ -1,5 +1,3 @@
 DIST pygraphviz-1.10.zip 120582 BLAKE2B 965b84ec6951c364084ddde4f0594ad7c14eb7e884062ad4f24042b6298b9caf10b3aa33eecfe8154c87c4bfd8d3651acc586129b019aef8b809130d69c03f82 SHA512 571c35f7a8013d5f128fcfbbd68372c8660560847afa0648737eae6d305a9283b69dce23a1b1aeb808bd4eac9c9cefa72b1d358fbc47b724a0b70997ea3f6d84
-DIST pygraphviz-1.9.zip 119946 BLAKE2B a399742ae5e8323eec0b6890858cc9158c2942c4f0adb8c74fbfb9745321ae013b93227540e5c328f5dd22d8fba2cf9217a9079f99a14feb983d7188e07084c9 SHA512 0a963b2cfe526c5444379b037797504380898c300256ab3b4800687f46b6230d8bc0adb5f499004a8009544c6cc804221689921c08a4f4b71b86ae01dc39cb7e
-EBUILD pygraphviz-1.10.ebuild 974 BLAKE2B a94104c6e8844b18f7f7fb3663f58156cb1d1d8d7898b8cdf14868df5723f51d02d14890be4de6243bee3d552da36da20dbf4dabe4ce406caed2d2a5db71d3a9 SHA512 80a37d11ada03e067c5afe5d161609269c4f0dd405cfbf610fe651f92b4945dc9bfb11ed41c487a64abaddfb142dabda6f3e1afd593cb1e83a26fce64a9d3186
-EBUILD pygraphviz-1.9.ebuild 973 BLAKE2B 38e56a0ba861bc6d996384770ec122ea8714a1674b004d78929a5f4770d49a2d58cc607a59b387cd35adeb956362ee1cb38573d9a67875ce371065684150ab1d SHA512 a7a349ca26ec994ae984e26657a3ecabb27fe41b6443186a9bebabe94c7b89007d45df3e7fcfd5242aa9fcf6945153a837a66c3f5ea235f89912fef53a370273
+EBUILD pygraphviz-1.10.ebuild 973 BLAKE2B 38e56a0ba861bc6d996384770ec122ea8714a1674b004d78929a5f4770d49a2d58cc607a59b387cd35adeb956362ee1cb38573d9a67875ce371065684150ab1d SHA512 a7a349ca26ec994ae984e26657a3ecabb27fe41b6443186a9bebabe94c7b89007d45df3e7fcfd5242aa9fcf6945153a837a66c3f5ea235f89912fef53a370273
 MISC metadata.xml 680 BLAKE2B 8c27b9bad68a0cbad1f63ad26052eef28e3446b0833bd2f87600737e763c7438cc3ac3f956c0e2a7964a7962d63dc0b7c5cc0cd8e6d61e6eb653e78044f9dd45 SHA512 7ee41b408d35f114dacb3ab9fd4ccd846ea6a4c865266d9bcb58988c464a0282e9dd2e9dc2e6c3f5a264dc93d4ba59a2e0bf27e9003b97e02b37dede273e17da
diff --git a/dev-python/pygraphviz/pygraphviz-1.10.ebuild b/dev-python/pygraphviz/pygraphviz-1.10.ebuild
index fdf4d3fdde7b..ea6e7fdd49d9 100644
--- a/dev-python/pygraphviz/pygraphviz-1.10.ebuild
+++ b/dev-python/pygraphviz/pygraphviz-1.10.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86 ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~riscv x86 ~x86-linux ~ppc-macos ~x64-macos"
 
 # Note: only C API of graphviz is used, PYTHON_USEDEP unnecessary.
 RDEPEND="media-gfx/graphviz"
diff --git a/dev-python/pygraphviz/pygraphviz-1.9.ebuild b/dev-python/pygraphviz/pygraphviz-1.9.ebuild
deleted file mode 100644
index ea6e7fdd49d9..000000000000
--- a/dev-python/pygraphviz/pygraphviz-1.9.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="Python wrapper for the Graphviz Agraph data structure"
-HOMEPAGE="https://pygraphviz.github.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~riscv x86 ~x86-linux ~ppc-macos ~x64-macos"
-
-# Note: only C API of graphviz is used, PYTHON_USEDEP unnecessary.
-RDEPEND="media-gfx/graphviz"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-arch/unzip
-	dev-lang/swig:0
-	test? ( dev-python/doctest-ignore-unicode[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-
-src_configure() {
-	swig -python pygraphviz/graphviz.i || die
-}
-
-python_test() {
-	cd "${BUILD_DIR}"/install || die
-	epytest
-}
-
-python_install_all() {
-	dodoc -r examples
-	docompress -x /usr/share/doc/${PF}/examples
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pytest-mpl/Manifest b/dev-python/pytest-mpl/Manifest
new file mode 100644
index 000000000000..782942fd33ca
--- /dev/null
+++ b/dev-python/pytest-mpl/Manifest
@@ -0,0 +1,3 @@
+DIST pytest-mpl-0.16.1.tar.gz 663585 BLAKE2B aad171260a10417aab15e7e55115c2fe02aa33dcf8336634281e1a1dad4d1c5ff08293fd9a67be025ec6cbb18c42bc9eb7ccb86275c0fcc7f4bf33a035fc0927 SHA512 64c1689f1698f9223082bc5c6817a1d4f9b413cb193894c23b1e0302254a6358cb3e354ac92ec47677acf460a41d05b2b527c834fd0fbbde04c070b0af8f46e1
+EBUILD pytest-mpl-0.16.1.ebuild 1080 BLAKE2B a1dfcc77eff6d5cc944cbd0597815a91a1db4c44dd73bc0328ea82b7df5cad93fdb6d2485255a416510ed895192818825415539e583781322b8a277740c50d20 SHA512 96264f222e57741e45ea99f2da31d1061967cf7fca0757116794e3b3247c7cdc76310ed37b700c5f94403c4c7e08b818811bcfa266f8a56dfa1816b3a9667090
+MISC metadata.xml 399 BLAKE2B b2dd8993ce1e55737997ac3e6c0d26edecad7721c319073b8bc12117b1387dd3b6a1049837b5f97d97f5539d1253bf888f00caca6f0bbb46a73292ee6bd08f0f SHA512 5e3c8b4c47771acf6fe345f3e1d1ae59e66a2bd028ff57969cd3a93aef971b7103a7b0d847f1e53af54075603f9868d5c09895f4ea3a1d93009b07449496d317
diff --git a/dev-python/pytest-mpl/metadata.xml b/dev-python/pytest-mpl/metadata.xml
new file mode 100644
index 000000000000..c9b79fa5f81b
--- /dev/null
+++ b/dev-python/pytest-mpl/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">pytest-mpl</remote-id>
+		<remote-id type="github">matplotlib/pytest-mpl</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pytest-mpl/pytest-mpl-0.16.1.ebuild b/dev-python/pytest-mpl/pytest-mpl-0.16.1.ebuild
new file mode 100644
index 000000000000..9db1c3e57234
--- /dev/null
+++ b/dev-python/pytest-mpl/pytest-mpl-0.16.1.ebuild
@@ -0,0 +1,44 @@
+# 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="Facilitate image comparison for Matplotlib figures"
+HOMEPAGE="
+	https://pypi.org/project/pytest-mpl/
+	https://github.com/matplotlib/pytest-mpl
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pytest[${PYTHON_USEDEP}]
+"
+
+EPYTEST_DESELECT=(
+	tests/subtests/test_subtest.py::test_default
+	tests/subtests/test_subtest.py::test_html_images_only
+)
+
+distutils_enable_tests pytest
+
+python_test() {
+	# disable autoloading plugins in nested pytest calls
+	#local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	# since we disabled autoloading, force loading necessary plugins
+	#local -x PYTEST_PLUGINS=xdist.plugin,xdist.looponfail,pytest_forked
+
+	epytest
+}
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 4286b4227001..f9d8a74025ce 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,8 +1,6 @@
 AUX setuptools-62.4.0-py-compile.patch 3704 BLAKE2B 9a5e70d2556b059be0ef060abd1db71298cd0e9aa1e2795d92cea5cdbaf0c82f4433e1a0c3095f4bc41bc72a457b63142253fe46c712afa1d7855a5d43607bca SHA512 48d7c065e2d8c29ce6e498effe6d79f9caa0f37d7cf6cadd0ed02c48d196a4d8a10a73cfa26744d6f74b48c63cd28a4074b161a6aae18c6169f6d8fffb044b1e
 DIST setuptools-65.3.0.tar.gz 2615722 BLAKE2B 1344fe17c1c2a4ec60dbf37b3e1cbad56bb5299bed9f8e30a21015f2457e1e90d6782369dfc2d804973e7348d22a356ec0ef75d1aeabba7d77e20e5ddf36e576 SHA512 3c173b1e1a8dbbed0bf3bf600df1256aeabf1b9dec34d5f5d0b1429b0fe16f2aa61fa6c4f400a5b6da24b9d679954866b76e019130bcf2246b138fe017025de9
-DIST setuptools-65.4.0.tar.gz 2615629 BLAKE2B 778b0acf1a447fbc72043113da757d73ca5dc0df8e6be8dceff7e35d64a920793dca6098d8747bd66bfe1159236570bffb6f2545a0f89a2a7916f94f849b89a7 SHA512 4c8c6348fc5e9e2cc2d7b143b050103e7ed4252dd58ca5aae8d50ee9ec522789ecfbe61dd87513d47bfd1d4afc290a7abc07fd0a6e8d27155c6732111702032d
 DIST setuptools-65.4.1.tar.gz 2615710 BLAKE2B 12e644412c7f910a8bf6fb470e0c7e78bcd11a9403d7d0821eecad156d0a4ed03751de6bd6c51ebc2ce1c0925386120971c0da129ebd7e1b8376feee1f8edc7e SHA512 d13253bb556380b1b45d4b51dc7922b0cffa390ba92d97ccbc43c314aceccdcf51ee8b5c751cf6f36c6c8955836bc248214d55fe7419ff0332719862772f0f95
 EBUILD setuptools-65.3.0.ebuild 4261 BLAKE2B 3ee99d3763734ce401eca631ec21f1dc0497b9d9216569ee1f9decdbdbe59668a17a271a0db8fe7f1c646b3eef26772c3aa0b394839920ae9ce9d80e16fe31c2 SHA512 9c748d867f71d7c7c8eda664cd5a11c75d13cf1e82928ac9ef9a4fc3984208f1d9439941016dded058cc63f446b14099b99b86e3cd9055e2365c5b482ee24a74
-EBUILD setuptools-65.4.0.ebuild 4269 BLAKE2B 5df1501305bd2717a5671d8e0d9ec0b0f9b5da733e09d54858884ea3ef1fe0d1444f476295c8a42133e566e9db836d8ccc3be8709b6a35a9a02ab2c3a7a0e1a5 SHA512 3fbf979376dfe61f354af1b80d452203161411eb0538ccc1138852aa5daeac044af3a5a579a1c0f0beec41df16414af0b0f0c25c06a265a36c6e076ee3614fc6
 EBUILD setuptools-65.4.1.ebuild 4269 BLAKE2B 5df1501305bd2717a5671d8e0d9ec0b0f9b5da733e09d54858884ea3ef1fe0d1444f476295c8a42133e566e9db836d8ccc3be8709b6a35a9a02ab2c3a7a0e1a5 SHA512 3fbf979376dfe61f354af1b80d452203161411eb0538ccc1138852aa5daeac044af3a5a579a1c0f0beec41df16414af0b0f0c25c06a265a36c6e076ee3614fc6
 MISC metadata.xml 469 BLAKE2B 4a26769b09a3785586b22db850b7fc5c4818f31c3ace9cc94476d35df05e50edf6721f3c95ec615c3b2efe071ef284a54ea2d53566316ba653f7830bb48f80bf SHA512 dd682c4ad2e59a97094ebdabe4d1063e2319ed05e1fe9d8c2fafe069badb3b4cf8bb6d9f50e09d2128e2a081c1c69827407ac8aed644ebf70eb4ca1bc9a57319
diff --git a/dev-python/setuptools/setuptools-65.4.0.ebuild b/dev-python/setuptools/setuptools-65.4.0.ebuild
deleted file mode 100644
index c11a0923e907..000000000000
--- a/dev-python/setuptools/setuptools-65.4.0.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
-EAPI=7
-
-# please bump dev-python/ensurepip-setuptools along with this package!
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_TESTED=( python3_{8..11} pypy3 )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="
-	https://github.com/pypa/setuptools/
-	https://pypi.org/project/setuptools/
-"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/appdirs-1.4.4-r2[${PYTHON_USEDEP}]
-	>=dev-python/jaraco-text-3.7.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-8.12.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/nspektr-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/ordered-set-4.0.2-r1[${PYTHON_USEDEP}]
-	>=dev-python/packaging-21.3-r2[${PYTHON_USEDEP}]
-	>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-4.11.1[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_resources-5.4.0-r3[${PYTHON_USEDEP}]
-	' 3.8)
-"
-BDEPEND="
-	${RDEPEND}
-	>=dev-python/wheel-0.37.1-r1[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/build[${PYTHON_USEDEP}]
-			>=dev-python/ini2toml-0.9[${PYTHON_USEDEP}]
-			>=dev-python/filelock-3.4.0[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-envs-2.2[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-			dev-python/pip[${PYTHON_USEDEP}]
-			dev-python/pip-run[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
-			dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-			>=dev-python/tomli-w-1.0.0[${PYTHON_USEDEP}]
-			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
-			dev-python/wheel[${PYTHON_USEDEP}]
-		' "${PYTHON_TESTED[@]}")
-	)
-"
-PDEPEND="
-	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-"
-
-DOCS=( {CHANGES,README}.rst )
-
-src_prepare() {
-	local PATCHES=(
-		# TODO: remove this when we're 100% PEP517 mode
-		"${FILESDIR}"/setuptools-62.4.0-py-compile.patch
-	)
-
-	# remove bundled dependencies, setuptools will switch to system deps
-	# automatically
-	rm -r */_vendor || die
-
-	# remove the ugly */extern hack that breaks on unvendored deps
-	rm -r */extern || die
-	find -name '*.py' -exec sed \
-		-e 's:from \w*[.]\+extern ::' -e 's:\w*[.]\+extern[.]::' \
-		-i {} + || die
-
-	distutils-r1_src_prepare
-
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
-	local -x SETUPTOOLS_USE_DISTUTILS=stdlib
-
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		return
-	fi
-
-	local EPYTEST_DESELECT=(
-		# network
-		# TODO: see if PRE_BUILT_SETUPTOOLS_* helps
-		setuptools/tests/config/test_apply_pyprojecttoml.py::test_apply_pyproject_equivalent_to_setupcfg
-		setuptools/tests/integration/test_pip_install_sdist.py::test_install_sdist
-		setuptools/tests/test_build_meta.py::test_legacy_editable_install
-		setuptools/tests/test_distutils_adoption.py
-		setuptools/tests/test_editable_install.py
-		setuptools/tests/test_setuptools.py::test_its_own_wheel_does_not_contain_tests
-		setuptools/tests/test_virtualenv.py::test_clean_env_install
-		setuptools/tests/test_virtualenv.py::test_no_missing_dependencies
-		setuptools/tests/test_virtualenv.py::test_test_command_install_requirements
-		# TODO
-		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_basic
-		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_ignore_errors
-		setuptools/tests/test_extern.py::test_distribution_picklable
-		# expects bundled deps in virtualenv
-		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_in_sdist
-		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_not_in_wheel
-		setuptools/tests/test_editable_install.py::test_editable_with_pyproject
-	)
-
-	epytest -n "$(makeopts_jobs)" setuptools
-}