Adding metadata

36 files changed, 106 insertions, 324 deletions

diff --git a/dev-python/argon2-cffi-bindings/argon2-cffi-bindings-21.2.0.ebuild b/dev-python/argon2-cffi-bindings/argon2-cffi-bindings-21.2.0.ebuild
index 679ec90e267a..f6b71b184d9b 100644
--- a/dev-python/argon2-cffi-bindings/argon2-cffi-bindings-21.2.0.ebuild
+++ b/dev-python/argon2-cffi-bindings/argon2-cffi-bindings-21.2.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 hppa ~ia64 ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="cpu_flags_x86_sse2"
 
 DEPEND="app-crypt/argon2:="
diff --git a/dev-python/argon2-cffi/argon2-cffi-21.3.0-r1.ebuild b/dev-python/argon2-cffi/argon2-cffi-21.3.0-r1.ebuild
index b71029d10270..9307cc8a80b0 100644
--- a/dev-python/argon2-cffi/argon2-cffi-21.3.0-r1.ebuild
+++ b/dev-python/argon2-cffi/argon2-cffi-21.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND=">=dev-python/argon2-cffi-bindings-21.2.0[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/flask-assets/flask-assets-0.12.ebuild b/dev-python/flask-assets/flask-assets-0.12.ebuild
index ad2845049de9..29d17392e414 100644
--- a/dev-python/flask-assets/flask-assets-0.12.ebuild
+++ b/dev-python/flask-assets/flask-assets-0.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-python/flit/Manifest b/dev-python/flit/Manifest
index 6c0aa26c52ba..40c6fd835521 100644
--- a/dev-python/flit/Manifest
+++ b/dev-python/flit/Manifest
@@ -1,4 +1,2 @@
-DIST flit-3.4.0.tar.gz 120418 BLAKE2B e99eb67daa9a1d8e738ff9b917117edaf7372bbe267163f8af64967e43c3bed94893849e9752d36d3965e70c798dd3fb3b454131cee2d34697cc389f11aaea69 SHA512 18f1d1cb86508e76b4e37e6c1ca2c414400c86e9163bcc52fd3358220e5b4362da4001da7ce427926c62ad67ee86799ea8d08e858e5e17230941c529b9995ce5
-DIST flit-3.5.0.tar.gz 122519 BLAKE2B 3c3eee652f090afd1c07e8a5cd1b154e7390ed621ab202ded3b4664d59ccfa2fd827928451f6d8928573d012cb9f6b44544c48540e03b2918d32ae3ba9169838 SHA512 e2239c209f735f11aeec8672aa14449fe4b6e1d2ed6523d661edb730f0b9f93b2794c6676bf878c09bd27966a9f8b9c19e6a7f14063c6efed4d8bc043b4cd2db
 DIST flit-3.5.1.tar.gz 122689 BLAKE2B 49be251df549783114c6758fa688d00fe18ed88d215f91783ce78eda722ee3d8578d83781a1a5c9ee61dd001c82df010c879dc742a1829c2ba8bcf5edb930556 SHA512 00e884774c7f59dfb54d6db09f65ac0ed47f1dd23872d6913f3a41de7242fb3829b2edacd03d08e080635c0a515521333aa74e6d26a2faa5fc02e56454b2b37a
 DIST flit-3.6.0.tar.gz 133365 BLAKE2B c4170eeded3c15a93c8e89b9483459247228136bc5ff32c6edb8cd9a4b5c3171fe381d0a1b4e325ed863457c2bce476efe3276455d5b9e4279a702dd35ed4512 SHA512 6506ecc73f9e0373e84b5b90a3d567f1edad6d95561886ff1f08f37addfc39006e75ab199c376a7d18452f6b8e2cbdd9e8f59a1fc96037702c3c682dc0b5a757
diff --git a/dev-python/flit/flit-3.4.0.ebuild b/dev-python/flit/flit-3.4.0.ebuild
deleted file mode 100644
index 25a6bb428cc3..000000000000
--- a/dev-python/flit/flit-3.4.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Simplified packaging of Python modules"
-HOMEPAGE="https://github.com/takluyver/flit https://flit.readthedocs.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/docutils[${PYTHON_USEDEP}]
-	>=dev-python/flit_core-3.2.0[${PYTHON_USEDEP}]
-	dev-python/intreehooks[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/requests_download[${PYTHON_USEDEP}]
-	dev-python/tomli[${PYTHON_USEDEP}]
-	dev-python/tomli-w[${PYTHON_USEDEP}]
-"
-BDEPEND="${RDEPEND}
-	sys-apps/grep
-	test? (
-		dev-python/responses[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/flit-3.2.0-tests.patch"
-)
-
-distutils_enable_tests pytest
-distutils_enable_sphinx doc \
-	dev-python/sphinxcontrib-github-alt \
-	dev-python/pygments-github-lexers \
diff --git a/dev-python/flit/flit-3.5.0.ebuild b/dev-python/flit/flit-3.5.0.ebuild
deleted file mode 100644
index 25a6bb428cc3..000000000000
--- a/dev-python/flit/flit-3.5.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Simplified packaging of Python modules"
-HOMEPAGE="https://github.com/takluyver/flit https://flit.readthedocs.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/docutils[${PYTHON_USEDEP}]
-	>=dev-python/flit_core-3.2.0[${PYTHON_USEDEP}]
-	dev-python/intreehooks[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/requests_download[${PYTHON_USEDEP}]
-	dev-python/tomli[${PYTHON_USEDEP}]
-	dev-python/tomli-w[${PYTHON_USEDEP}]
-"
-BDEPEND="${RDEPEND}
-	sys-apps/grep
-	test? (
-		dev-python/responses[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/flit-3.2.0-tests.patch"
-)
-
-distutils_enable_tests pytest
-distutils_enable_sphinx doc \
-	dev-python/sphinxcontrib-github-alt \
-	dev-python/pygments-github-lexers \
diff --git a/dev-python/flit/flit-3.5.1.ebuild b/dev-python/flit/flit-3.5.1-r1.ebuild
index 97e8ca9d8a25..834a86fe749c 100644
--- a/dev-python/flit/flit-3.5.1.ebuild
+++ b/dev-python/flit/flit-3.5.1-r1.ebuild
@@ -18,7 +18,6 @@ KEYWORDS="~amd64 ~x86"
 RDEPEND="
 	dev-python/docutils[${PYTHON_USEDEP}]
 	>=dev-python/flit_core-3.2.0[${PYTHON_USEDEP}]
-	dev-python/intreehooks[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
 	dev-python/requests_download[${PYTHON_USEDEP}]
 	dev-python/tomli[${PYTHON_USEDEP}]
diff --git a/dev-python/flit/flit-3.6.0.ebuild b/dev-python/flit/flit-3.6.0-r1.ebuild
index a454febab2ca..849cf68c8762 100644
--- a/dev-python/flit/flit-3.6.0.ebuild
+++ b/dev-python/flit/flit-3.6.0-r1.ebuild
@@ -18,7 +18,6 @@ KEYWORDS="~amd64 ~x86"
 RDEPEND="
 	dev-python/docutils[${PYTHON_USEDEP}]
 	>=dev-python/flit_core-3.2.0[${PYTHON_USEDEP}]
-	dev-python/intreehooks[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
 	dev-python/requests_download[${PYTHON_USEDEP}]
 	dev-python/tomli[${PYTHON_USEDEP}]
diff --git a/dev-python/flit_core/flit_core-3.5.1.ebuild b/dev-python/flit_core/flit_core-3.5.1-r1.ebuild
index 5646ec8bd7be..db0f7089333c 100644
--- a/dev-python/flit_core/flit_core-3.5.1.ebuild
+++ b/dev-python/flit_core/flit_core-3.5.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,6 @@ SLOT="0"
 KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
-	dev-python/intreehooks[${PYTHON_USEDEP}]
 	dev-python/tomli[${PYTHON_USEDEP}]
 "
 BDEPEND="
diff --git a/dev-python/flit_core/flit_core-3.6.0.ebuild b/dev-python/flit_core/flit_core-3.6.0-r1.ebuild
index fb966084eae9..9fcab03f7791 100644
--- a/dev-python/flit_core/flit_core-3.6.0.ebuild
+++ b/dev-python/flit_core/flit_core-3.6.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,7 +18,6 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="
-	dev-python/intreehooks[${PYTHON_USEDEP}]
 	dev-python/tomli[${PYTHON_USEDEP}]
 "
 BDEPEND="
diff --git a/dev-python/gmpy/gmpy-2.1.1.ebuild b/dev-python/gmpy/gmpy-2.1.1.ebuild
index 618f4234b64f..29c2f035a9d1 100644
--- a/dev-python/gmpy/gmpy-2.1.1.ebuild
+++ b/dev-python/gmpy/gmpy-2.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="LGPL-3+"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 RDEPEND="
 	>=dev-libs/mpc-1.0.2:=
diff --git a/dev-python/installer/Manifest b/dev-python/installer/Manifest
new file mode 100644
index 000000000000..2d38fa076c4d
--- /dev/null
+++ b/dev-python/installer/Manifest
@@ -0,0 +1,2 @@
+DIST installer-0.4.0-py2.py3-none-any.whl.zip 451433 BLAKE2B 933b7e63b3d0306213789d493d4df112df26b432d63ecd1f8f21449520c34bd2ad542aac25069043fbb535c44f988dca927625eafd0a5a20489fc3ce2bcf84a2 SHA512 cf303bb422e329a36007b361034144a232ba021d4013bb8678dc7c326544e74ec9a3b3fe8b9d3696433dbbe90d2ce4a0ae8967fb054bd5ed49321d470be729a8
+DIST installer-0.4.0.gh.tar.gz 466643 BLAKE2B 635854b3461995cda3b7afa507ca3fe35cae8210e79de0bbd46938c8f103d7840ceca8bb388c2c9533efc78150691f980c478485ee33bafe0bae6c08a6aef8c4 SHA512 13537c479bc8ead8f8b45c8e5c5182e8b1b32c2889df8015be7f517f390a9efbea6fa167e0886dfade6621a8a2d822bfd662ee0238d3d86689619ca4d5483b26
diff --git a/dev-python/installer/installer-0.4.0.ebuild b/dev-python/installer/installer-0.4.0.ebuild
new file mode 100644
index 000000000000..6f2f54760738
--- /dev/null
+++ b/dev-python/installer/installer-0.4.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=manual
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="A library for installing Python wheels"
+HOMEPAGE="
+	https://pypi.org/project/installer/
+	https://github.com/pradyunsg/installer/
+	https://installer.readthedocs.io/en/latest/
+"
+SRC_URI="
+	https://github.com/pradyunsg/installer/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	https://files.pythonhosted.org/packages/py2.py3/${PN::1}/${PN}/${P}-py2.py3-none-any.whl
+		-> ${P}-py2.py3-none-any.whl.zip
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="
+	app-arch/unzip
+"
+
+distutils_enable_tests pytest
+
+# do not use any build system to avoid circular deps
+python_compile() { :; }
+
+python_test() {
+	local -x PYTHONPATH=src
+	epytest
+}
+
+python_install() {
+	python_domodule src/installer "${WORKDIR}"/*.dist-info
+}
diff --git a/dev-python/installer/metadata.xml b/dev-python/installer/metadata.xml
new file mode 100644
index 000000000000..5f45ea914272
--- /dev/null
+++ b/dev-python/installer/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+  <email>python@gentoo.org</email>
+  <name>Python</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="pypi">installer</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
+</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/ipykernel/Manifest b/dev-python/ipykernel/Manifest
index ca83adf81f09..9e941d823b7b 100644
--- a/dev-python/ipykernel/Manifest
+++ b/dev-python/ipykernel/Manifest
@@ -1,4 +1,2 @@
-DIST ipykernel-6.4.2.tar.gz 121253 BLAKE2B 26f8f94df823dd7a4ac41cac574e70ae98eed64f88bbcd8ce600ce6dfe1c43c224d65b5d0f9586ad05829692142e37fbb685a5d577047791831f6138b8309556 SHA512 56f0a15a1f06628e8f74749e4bad4a65dcc78ba7ff45e4fa5802d232e427e4ec152a6b6697302488d2e05d6b0cfa0cbc106ea2a593ab43de9d9defa9c169d5a6
-DIST ipykernel-6.5.0.tar.gz 122962 BLAKE2B fa36ea41d7f2dc8d0d75144f421ea2a72dd50dcda6c6a91f625f18c35ed2ebb950aadfb1715dd57a1fda77bfb49e360bca87f0bd8b9ee8380399d41691db2b9a SHA512 440407818ed6f388f10a727a9be1a2588bf8c9699d66e1b954a1f64575c08b5bddb3978dd13f5ab26220a210ce7177e2be0374d48d3968df681d2d5311ce42d1
 DIST ipykernel-6.6.0.tar.gz 123747 BLAKE2B b1e836ac08e24baf3311e34e1323362bec94f8a59ba4cd824703f03370031226f9af41f864930c6fb59216d185e3c7e8798d6b91e88aa6ca0c214df33c6d7d37 SHA512 bf55e26a4bca0d02f4bbb87ce53a224d22a4765596f0f5d7a6d576bfa100436f676df59fa934e1d6ec66f8d802a1c7f787a9a31b906ecaa1ffd8a77fa3d96127
 DIST ipykernel-6.6.1.tar.gz 123915 BLAKE2B 136a3acdea6790d4666c3f5b0d040a91be405ff35e510456d920d0d2d2fb4f4076eb8e74089d08c42f0eba50caa48da929c1a684ad414919a67748f13d6fdf78 SHA512 bfe37f3d69c9b05f9bbbdec7f2103c353433b402474507a9d17c02f224e3a80eaea010b5a8bcebfd4410fbba661feae74107a4904c0af7835c6c1aa6bd0c1159
diff --git a/dev-python/ipykernel/ipykernel-6.4.2-r1.ebuild b/dev-python/ipykernel/ipykernel-6.4.2-r1.ebuild
deleted file mode 100644
index 0689a520fd8e..000000000000
--- a/dev-python/ipykernel/ipykernel-6.4.2-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-PYTHON_REQ_USE="threads(+)"
-inherit distutils-r1
-
-DESCRIPTION="IPython Kernel for Jupyter"
-HOMEPAGE="https://github.com/ipython/ipykernel"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv sparc x86"
-
-RDEPEND="
-	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	>=dev-python/debugpy-1.0.0[${PYTHON_USEDEP}]
-	<dev-python/debugpy-2.0[${PYTHON_USEDEP}]
-	>=dev-python/ipython-7.23.1[${PYTHON_USEDEP}]
-	<dev-python/ipython-8.0[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.1.0[${PYTHON_USEDEP}]
-	<dev-python/traitlets-6.0[${PYTHON_USEDEP}]
-	<dev-python/jupyter_client-8.0[${PYTHON_USEDEP}]
-	>=www-servers/tornado-4.2[${PYTHON_USEDEP}]
-	<www-servers/tornado-7.0[${PYTHON_USEDEP}]
-	>=dev-python/matplotlib-inline-0.1.0[${PYTHON_USEDEP}]
-	<dev-python/matplotlib-inline-0.2.0[${PYTHON_USEDEP}]
-"
-# RDEPEND seems specifically needed in BDEPEND, at least jupyter
-# bug #816486
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/nose_warnings_filters[${PYTHON_USEDEP}]
-		dev-python/ipyparallel[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e 's:^TIMEOUT = .*:TIMEOUT = 120:' ipykernel/tests/*.py || die
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	distutils-r1_src_install
-	# Use python3 in kernel.json configuration, bug #784764
-	sed -i -e '/python3.[0-9]\+/s//python3/' \
-		"${ED}"/usr/share/jupyter/kernels/python3/kernel.json || die
-}
diff --git a/dev-python/ipykernel/ipykernel-6.5.0-r1.ebuild b/dev-python/ipykernel/ipykernel-6.5.0-r1.ebuild
deleted file mode 100644
index 0e500df647ee..000000000000
--- a/dev-python/ipykernel/ipykernel-6.5.0-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-PYTHON_REQ_USE="threads(+)"
-inherit distutils-r1
-
-DESCRIPTION="IPython Kernel for Jupyter"
-HOMEPAGE="https://github.com/ipython/ipykernel"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		<dev-python/importlib_metadata-5.0.0[${PYTHON_USEDEP}]
-		>=dev-python/argcomplete-1.12.3[${PYTHON_USEDEP}]
-	' python3_8 pypy3)
-	>=dev-python/debugpy-1.0.0[${PYTHON_USEDEP}]
-	<dev-python/debugpy-2.0[${PYTHON_USEDEP}]
-	>=dev-python/ipython-7.23.1[${PYTHON_USEDEP}]
-	<dev-python/ipython-8.0[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5.1.0[${PYTHON_USEDEP}]
-	<dev-python/traitlets-6.0[${PYTHON_USEDEP}]
-	<dev-python/jupyter_client-8.0[${PYTHON_USEDEP}]
-	>=www-servers/tornado-4.2[${PYTHON_USEDEP}]
-	<www-servers/tornado-7.0[${PYTHON_USEDEP}]
-	>=dev-python/matplotlib-inline-0.1.0[${PYTHON_USEDEP}]
-	<dev-python/matplotlib-inline-0.2.0[${PYTHON_USEDEP}]
-"
-# RDEPEND seems specifically needed in BDEPEND, at least jupyter
-# bug #816486
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/nose_warnings_filters[${PYTHON_USEDEP}]
-		dev-python/ipyparallel[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.5.0-drop-pytest-cov.patch
-)
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e 's:^TIMEOUT = .*:TIMEOUT = 120:' ipykernel/tests/*.py || die
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	distutils-r1_src_install
-	# Use python3 in kernel.json configuration, bug #784764
-	sed -i -e '/python3.[0-9]\+/s//python3/' \
-		"${ED}"/usr/share/jupyter/kernels/python3/kernel.json || die
-}
diff --git a/dev-python/ipykernel/ipykernel-6.6.0.ebuild b/dev-python/ipykernel/ipykernel-6.6.0.ebuild
index 22cc2b1e41c6..bedacbccfa93 100644
--- a/dev-python/ipykernel/ipykernel-6.6.0.ebuild
+++ b/dev-python/ipykernel/ipykernel-6.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/isodate/isodate-0.6.1.ebuild b/dev-python/isodate/isodate-0.6.1.ebuild
index 698499f3ce37..1e164e779262 100644
--- a/dev-python/isodate/isodate-0.6.1.ebuild
+++ b/dev-python/isodate/isodate-0.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/lxml/lxml-4.7.1.ebuild b/dev-python/lxml/lxml-4.7.1.ebuild
index 112c1490d439..df381375c62f 100644
--- a/dev-python/lxml/lxml-4.7.1.ebuild
+++ b/dev-python/lxml/lxml-4.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ S=${WORKDIR}/lxml-${P}
 
 LICENSE="BSD ElementTree GPL-2 PSF-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples +threads test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pandas/pandas-1.3.5.ebuild b/dev-python/pandas/pandas-1.3.5.ebuild
index 868f45292bf1..d7062fffe52f 100644
--- a/dev-python/pandas/pandas-1.3.5.ebuild
+++ b/dev-python/pandas/pandas-1.3.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,7 +18,7 @@ S="${WORKDIR}/${P/_/}"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~s390 ~x86"
 IUSE="doc full-support minimal test X"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pika/Manifest b/dev-python/pika/Manifest
index df96926f2864..c8b991ef8ea2 100644
--- a/dev-python/pika/Manifest
+++ b/dev-python/pika/Manifest
@@ -1 +1,2 @@
 DIST pika-1.1.0.tar.gz 139407 BLAKE2B 2a2bb71d7f1222ca06dd6202a26e502f1e1e1977651e4fb405a938d493e4f525904568fb57ad5eea0f5117f02c7fa9f1b1c971d7d911d0d62a24b161b2cb2ef5 SHA512 15eab619cffe5b6d62a65a66730b03ee3de24978268afd82f608a96b96cc29695159e228dbbbc21c06f4c02a9591c73a686d9d283ceaa725f53782c3460140a7
+DIST pika-1.2.0.tar.gz 144945 BLAKE2B c8b163e4efeb4630da7f1901dfc087c2f3e53d5828eba7ee519e6f696d6c86d48d72c8c1ed98df9c3c0a6889265b072f5c709abec98522992ba699691e96acb1 SHA512 3ea4ecc3b2c722e8b1ec7d220e0cad7c7ed315a4800cbff6903d351885dc6a792318da1767f4bf1a4a40510be444ee18f3881f654c4ec84de8c3005aa2a404bf
diff --git a/dev-python/pika/pika-1.1.0.ebuild b/dev-python/pika/pika-1.1.0.ebuild
index c4c20ce8da95..4b45f7edeb9e 100644
--- a/dev-python/pika/pika-1.1.0.ebuild
+++ b/dev-python/pika/pika-1.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-python/pika/pika-1.2.0.ebuild b/dev-python/pika/pika-1.2.0.ebuild
new file mode 100644
index 000000000000..4012cabba8df
--- /dev/null
+++ b/dev-python/pika/pika-1.2.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Pure-Python implementation of the AMQP"
+HOMEPAGE="https://pika.readthedocs.org/ https://github.com/pika/pika"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+DEPEND=""
+RDEPEND=""
diff --git a/dev-python/pmw/pmw-2.0.1-r2.ebuild b/dev-python/pmw/pmw-2.0.1-r2.ebuild
index 6ca1cd0843d0..e1a6c2b2384d 100644
--- a/dev-python/pmw/pmw-2.0.1-r2.ebuild
+++ b/dev-python/pmw/pmw-2.0.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-python/py-amqp/py-amqp-5.0.9.ebuild b/dev-python/py-amqp/py-amqp-5.0.9.ebuild
index 1aa33d19dafd..a852d6bff797 100644
--- a/dev-python/py-amqp/py-amqp-5.0.9.ebuild
+++ b/dev-python/py-amqp/py-amqp-5.0.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="extras"
 
 BDEPEND="
diff --git a/dev-python/pyhamcrest/Manifest b/dev-python/pyhamcrest/Manifest
index a39a9730da15..4ab9c06d2890 100644
--- a/dev-python/pyhamcrest/Manifest
+++ b/dev-python/pyhamcrest/Manifest
@@ -1,2 +1 @@
-DIST PyHamcrest-2.0.2.gh.tar.gz 55491 BLAKE2B 749f227b8cb1180a64e24cdbf97b6f610b9871b21215a761642d19fdd43ad8e175718b12cfb0de2cdb5c6ae8c3c5271e04b7c3b489e01ac689769e24202ece56 SHA512 d6e510ca1e6533b425b424d411e23c4ee2a6bad2d635695e4e68f991fbdc57269c3a433361e431cb5dda7891278951d5de7a05f5c1c167714eecdaf74644d1c8
 DIST PyHamcrest-2.0.3.gh.tar.gz 59353 BLAKE2B b393f250f1a5f3f2d3014ae8a6e20ec659e034d8e681fcbb16f4e9fbe69ba7a94ce342a79584cfc99dff6af57e1d9763efd5ff8b5d891951289d9047cab4270c SHA512 4a28c0ae04db11a86c44dff001e919a5bb6b820af8ffd60b1a1f2846f257d79daac76fbdeac4a0039d149e643043258a0685382a3a4b52c6d4586b8be95e1657
diff --git a/dev-python/pyhamcrest/pyhamcrest-2.0.2.ebuild b/dev-python/pyhamcrest/pyhamcrest-2.0.2.ebuild
deleted file mode 100644
index ec6b6499b272..000000000000
--- a/dev-python/pyhamcrest/pyhamcrest-2.0.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1
-
-MY_PN="PyHamcrest"
-
-DESCRIPTION="Hamcrest framework for matcher objects"
-HOMEPAGE="https://github.com/hamcrest/PyHamcrest"
-SRC_URI="https://github.com/hamcrest/PyHamcrest/archive/V${PV}.tar.gz -> ${MY_PN}-${PV}.gh.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="examples"
-
-distutils_enable_sphinx doc \
-	dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
-
-python_install_all() {
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyhamcrest/pyhamcrest-2.0.3.ebuild b/dev-python/pyhamcrest/pyhamcrest-2.0.3.ebuild
index ce01184ddf29..5286ff87a660 100644
--- a/dev-python/pyhamcrest/pyhamcrest-2.0.3.ebuild
+++ b/dev-python/pyhamcrest/pyhamcrest-2.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="examples"
 
 distutils_enable_sphinx doc \
diff --git a/dev-python/pytest-timeout/Manifest b/dev-python/pytest-timeout/Manifest
index 34e22d134c82..0ef949925e15 100644
--- a/dev-python/pytest-timeout/Manifest
+++ b/dev-python/pytest-timeout/Manifest
@@ -1,2 +1 @@
-DIST pytest-timeout-2.0.0.tar.gz 16210 BLAKE2B 8e3c0436147b6cc680540329daabd7269d301c95663599f7e9c64313bc3a45fde5cc5ea297d5b8c85f43d1a80c2db44b8e150877c3c7b29eef5e38426dfd4efc SHA512 96e9b545b4ac1e4a615863f69d190e0265e85f23dc12df51e9035b8e6bceff23279bb042eed83aa0ddd6d06b0e02a2dcc29ee352fd44cc86f0682fb328264645
 DIST pytest-timeout-2.0.2.tar.gz 16683 BLAKE2B bc6ee17832dfa5c3e5a35efc34bda630f1f1f7e7ece5a71d68110ab12c08566ee89c3b0f68967807967d17e2622ca1d2bce24baf51986ad8921fd55df091b376 SHA512 ee151a55f6323ae23ddd7e54e39e1c014de2aa2a142a0e3ba81c80b5d36435fc6c2809e383df8c49e62df70361a03dbe73e4d96d03798323fe7f1304a197f770
diff --git a/dev-python/pytest-timeout/pytest-timeout-2.0.0.ebuild b/dev-python/pytest-timeout/pytest-timeout-2.0.0.ebuild
deleted file mode 100644
index 6cdca5d547f0..000000000000
--- a/dev-python/pytest-timeout/pytest-timeout-2.0.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="pytest plugin to abort hanging tests"
-HOMEPAGE="https://pypi.org/project/pytest-timeout/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-# do not rdepend on pytest, it won't be used without it anyway
-# pytest-cov used to test compatibility
-BDEPEND="
-	test? (
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		!hppa? (
-			dev-python/pytest-cov[${PYTHON_USEDEP}]
-		)
-	)"
-
-distutils_enable_tests --install pytest
diff --git a/dev-python/pytest-timeout/pytest-timeout-2.0.2.ebuild b/dev-python/pytest-timeout/pytest-timeout-2.0.2.ebuild
index c44e2bbb8a0d..aeee48202887 100644
--- a/dev-python/pytest-timeout/pytest-timeout-2.0.2.ebuild
+++ b/dev-python/pytest-timeout/pytest-timeout-2.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 # do not rdepend on pytest, it won't be used without it anyway
 # pytest-cov used to test compatibility
diff --git a/dev-python/readme_renderer/Manifest b/dev-python/readme_renderer/Manifest
index 574eec4056d7..97ad61aa334f 100644
--- a/dev-python/readme_renderer/Manifest
+++ b/dev-python/readme_renderer/Manifest
@@ -1,2 +1 @@
-DIST readme_renderer-31.0.tar.gz 27617 BLAKE2B 2705157cb0cb04e8891ac5b0c363dbe30559ce3fd5bd5c0014e9746d6334c68b458fc1dad69c8da3088ccf5c70dff31bcc957fb01c26ee37f7370d3ac7dbffc7 SHA512 8399d478f46c58a3abecbbc3242c7cc4801fc84c04dc4ab35b88159e65373fe91ccebb1ab6eba505651b0dcab6f12283f55aad902379a2b0056ddcbce5e76897
 DIST readme_renderer-32.0.tar.gz 27812 BLAKE2B 9e5052bd6d14c9ae6c405934919b2e2555094892f569c3acae2149607c5d94c9522e994110b1b9607429eaf865925a3fbbda5eb78e3ac9ce66024d229c6b223f SHA512 58f3dfe6e19074e8f0c5bb8125c9b414651008cc1246a5100018f24dbb199f5d9d920a0201afe06fc9921d86fca339bd1ebd1b4d8c0606aa59e6e2edd1e8bf56
diff --git a/dev-python/readme_renderer/readme_renderer-31.0.ebuild b/dev-python/readme_renderer/readme_renderer-31.0.ebuild
deleted file mode 100644
index 4302a82f53e7..000000000000
--- a/dev-python/readme_renderer/readme_renderer-31.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="a library for rendering \"readme\" descriptions for Warehouse"
-HOMEPAGE="https://github.com/pypa/readme_renderer https://pypi.org/project/readme-renderer/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/bleach-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/docutils-0.13.1[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.5.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )
-"
-
-DOCS=( README.rst )
-
-distutils_enable_tests pytest
diff --git a/dev-python/readme_renderer/readme_renderer-32.0.ebuild b/dev-python/readme_renderer/readme_renderer-32.0.ebuild
index 1346e9d3d780..4302a82f53e7 100644
--- a/dev-python/readme_renderer/readme_renderer-32.0.ebuild
+++ b/dev-python/readme_renderer/readme_renderer-32.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/bleach-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/tomli/tomli-2.0.0.ebuild b/dev-python/tomli/tomli-2.0.0.ebuild
index 07497610fe70..7fbbc63f4c1b 100644
--- a/dev-python/tomli/tomli-2.0.0.ebuild
+++ b/dev-python/tomli/tomli-2.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-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
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~ppc-macos ~x64-macos"
 
 BDEPEND="
 	app-arch/unzip