Adding metadata

40 files changed, 86 insertions, 616 deletions

diff --git a/dev-python/ansible-compat/Manifest b/dev-python/ansible-compat/Manifest
index 970fe2783a27..abac62b7dc19 100644
--- a/dev-python/ansible-compat/Manifest
+++ b/dev-python/ansible-compat/Manifest
@@ -1,3 +1 @@
-DIST ansible-compat-2.2.5.tar.gz 39794 BLAKE2B 25a5c858eb3e120b7f51b8800b01eff2482a03d0e5f5c049d4ff2bc96ab2c01e856284f3328d5c9e3621b2d769df4450c9427997b48a7ddd337b01aa777e0c28 SHA512 8029d6dbd093414fb5eccba1789c881601a3a1f45bf7779f9e2af886d457e9c57a4e6432eed73a1d387b4d82617e1677a857cf0d2dfdcebcefa0dc790b2ec2d4
-DIST ansible-compat-2.2.6.tar.gz 38890 BLAKE2B 5022676dca1c2cb24e8f3e3387de8ef214979124b6d4a819f6328b2ffa0b19bddc5ef60131eb0133d809a214ecdf39fb5c01b197a44111e05a23740d4955c00c SHA512 b02faeb0202839c01a777277cd077264b44fbadbef679e93cb4ac0be3b81df921bc8f000e27372446326976acd1b42f1f1f42896ff0af9ba0677e7a93d06b195
 DIST ansible-compat-2.2.7.tar.gz 47378 BLAKE2B 58f3b19400fb7646d37c585df07435e65a60f3e57d445c98e8089c6a2ed853cb5dbab682d85cee1a604e1b4de6dd137faa12bf78fe7913752839f95bd651435f SHA512 9a3863be3d755eb5a1a61ba0c526786ea3df14bc6fcabd9196559eb625ab6dfc8de7a17fdb2cdd8ad71d7d61b5e2f0543b8b5908f39d5e7d9ea45e387aa625b1
diff --git a/dev-python/ansible-compat/ansible-compat-2.2.5.ebuild b/dev-python/ansible-compat/ansible-compat-2.2.5.ebuild
deleted file mode 100644
index 5e29f11cc6c4..000000000000
--- a/dev-python/ansible-compat/ansible-compat-2.2.5.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Contains functions that facilitate working with various versions of Ansible"
-HOMEPAGE="
-	https://pypi.org/project/ansible-compat/
-	https://github.com/ansible/ansible-compat/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv"
-
-RDEPEND="
-	>=app-admin/ansible-core-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-4.6.0[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	>=dev-python/subprocess-tee-0.3.5[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools_scm-7.0.0[${PYTHON_USEDEP}]
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-plus[${PYTHON_USEDEP}]
-	)
-"
-
-# All these tests attempt to connect to galaxy.ansible.com
-EPYTEST_DESELECT=(
-	test/test_runtime.py::test_install_collection
-	test/test_runtime.py::test_install_collection_dest
-	test/test_runtime.py::test_prepare_environment_with_collections
-	test/test_runtime.py::test_prerun_reqs_v1
-	test/test_runtime.py::test_prerun_reqs_v2
-	test/test_runtime.py::test_require_collection_no_cache_dir
-	test/test_runtime.py::test_require_collection_wrong_version
-	test/test_runtime.py::test_require_collection
-	test/test_runtime.py::test_upgrade_collection
-	test/test_runtime_example.py::test_runtime
-)
-
-distutils_enable_sphinx docs \
-	dev-python/ansible-pygments \
-	dev-python/myst_parser \
-	dev-python/sphinx_ansible_theme
-distutils_enable_tests pytest
diff --git a/dev-python/ansible-compat/ansible-compat-2.2.6.ebuild b/dev-python/ansible-compat/ansible-compat-2.2.6.ebuild
deleted file mode 100644
index fe3835bdf820..000000000000
--- a/dev-python/ansible-compat/ansible-compat-2.2.6.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Contains functions that facilitate working with various versions of Ansible"
-HOMEPAGE="
-	https://pypi.org/project/ansible-compat/
-	https://github.com/ansible/ansible-compat/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv"
-
-RDEPEND="
-	>=app-admin/ansible-core-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-4.6.0[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	>=dev-python/subprocess-tee-0.3.5[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools_scm-7.0.0[${PYTHON_USEDEP}]
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-plus[${PYTHON_USEDEP}]
-	)
-"
-
-# All these tests attempt to connect to galaxy.ansible.com
-EPYTEST_DESELECT=(
-	test/test_runtime.py::test_install_collection
-	test/test_runtime.py::test_install_collection_dest
-	test/test_runtime.py::test_prepare_environment_with_collections
-	test/test_runtime.py::test_prerun_reqs_v1
-	test/test_runtime.py::test_prerun_reqs_v2
-	test/test_runtime.py::test_require_collection_no_cache_dir
-	test/test_runtime.py::test_require_collection_wrong_version
-	test/test_runtime.py::test_require_collection
-	test/test_runtime.py::test_upgrade_collection
-	test/test_runtime_example.py::test_runtime
-)
-
-distutils_enable_sphinx docs \
-	dev-python/ansible-pygments \
-	dev-python/myst_parser \
-	dev-python/sphinx_ansible_theme
-distutils_enable_tests pytest
diff --git a/dev-python/ansible-compat/ansible-compat-2.2.7.ebuild b/dev-python/ansible-compat/ansible-compat-2.2.7.ebuild
index fe3835bdf820..5e29f11cc6c4 100644
--- a/dev-python/ansible-compat/ansible-compat-2.2.7.ebuild
+++ b/dev-python/ansible-compat/ansible-compat-2.2.7.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="amd64 ~riscv"
 
 RDEPEND="
 	>=app-admin/ansible-core-2.9.0[${PYTHON_USEDEP}]
diff --git a/dev-python/cbor2/Manifest b/dev-python/cbor2/Manifest
index afc0fe10da09..0827dd0e64bf 100644
--- a/dev-python/cbor2/Manifest
+++ b/dev-python/cbor2/Manifest
@@ -1,4 +1 @@
-DIST cbor2-5.4.3.tar.gz 86499 BLAKE2B 0303ed49a1c468a3aa13e12a4bebef17479f106bc3f0a92e35c6029ff1bd86aea6a77f557ac0c8acb5e055ec0b56c82e5c95e9417d00715a1fb244bd94d0f60d SHA512 9527bec5a36464bb7dc9a8c0ece3ad72f1c6182272a7edf0526668b264c957b72bc031d2398dc6af38af09bb298219c316da194084fab410bae5f9100b22328b
-DIST cbor2-5.4.4.tar.gz 86755 BLAKE2B 616a5e3d10f979f7f5923b0226d6ca52392e79bf1c4dcdef6d44143af75b02a91846e1a8f0c571f096f2168908137a5f31995199c13383b4d81cb1f17062b1fd SHA512 f8754423490b8a9643ca3309c99254f6be5e9eeab2163b57631fd2e6fd3f5f5dbd8495e24bbfcf96720f07467797eb3f4e3603822a7d6999f1ee4fa66651f2d7
-DIST cbor2-5.4.5.tar.gz 86800 BLAKE2B 2911cf15d31ec77aab79129719f9fc869392da8383b8a1afbff7e7d9c0d90ad341f66b5b76ae5142eae7036b7446dd54d545a48695de43aaf54e0824e9d8052c SHA512 ee360318c24ab6cdd93162ef78b0ab099990630ebd14c581012b0d86b1a30c9aa1e4b45d285d33da5684f5385db976189e89d32589d68272f79fcd8f7130bf7b
 DIST cbor2-5.4.6.tar.gz 86909 BLAKE2B df24c786f32819f9a93a2db28536b78349db6185108188d0a20e7298ff8c083d1feb59110865b4e21190e0363b113201ccddaa0d36b49bd7bbacf9d5ee7695f4 SHA512 44fb3e2e2249c79b1454487670d53eb672ffae4c22374d2a2bb9e314ac15470e4e7913e4eb1981a8bd4d722e6827328dde7e57c5f0556843e951c4723ae5bd8e
diff --git a/dev-python/cbor2/cbor2-5.4.3.ebuild b/dev-python/cbor2/cbor2-5.4.3.ebuild
deleted file mode 100644
index ea335e93230f..000000000000
--- a/dev-python/cbor2/cbor2-5.4.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Pure Python CBOR (de)serializer with extensive tag support"
-HOMEPAGE="
-	https://github.com/agronholm/cbor2/
-	https://pypi.org/project/cbor2/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~riscv x86"
-
-BDEPEND="
-	>=dev-python/setuptools-61[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-6.4[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# remove pytest-cov dep
-	sed -i -e "s/--cov//" pyproject.toml || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/cbor2/cbor2-5.4.4.ebuild b/dev-python/cbor2/cbor2-5.4.4.ebuild
deleted file mode 100644
index eb0ac3d389f9..000000000000
--- a/dev-python/cbor2/cbor2-5.4.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Pure Python CBOR (de)serializer with extensive tag support"
-HOMEPAGE="
-	https://github.com/agronholm/cbor2/
-	https://pypi.org/project/cbor2/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-
-BDEPEND="
-	>=dev-python/setuptools-61[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-6.4[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# remove pytest-cov dep
-	sed -i -e "s/--cov//" pyproject.toml || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/cbor2/cbor2-5.4.5.ebuild b/dev-python/cbor2/cbor2-5.4.5.ebuild
deleted file mode 100644
index eb0ac3d389f9..000000000000
--- a/dev-python/cbor2/cbor2-5.4.5.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Pure Python CBOR (de)serializer with extensive tag support"
-HOMEPAGE="
-	https://github.com/agronholm/cbor2/
-	https://pypi.org/project/cbor2/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-
-BDEPEND="
-	>=dev-python/setuptools-61[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-6.4[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# remove pytest-cov dep
-	sed -i -e "s/--cov//" pyproject.toml || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/cbor2/cbor2-5.4.6.ebuild b/dev-python/cbor2/cbor2-5.4.6.ebuild
index 82280288dd3a..ea335e93230f 100644
--- a/dev-python/cbor2/cbor2-5.4.6.ebuild
+++ b/dev-python/cbor2/cbor2-5.4.6.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~riscv x86"
 
 BDEPEND="
 	>=dev-python/setuptools-61[${PYTHON_USEDEP}]
diff --git a/dev-python/libarchive-c/libarchive-c-4.0.ebuild b/dev-python/libarchive-c/libarchive-c-4.0.ebuild
index 13d0a5bde05b..bd103550413d 100644
--- a/dev-python/libarchive-c/libarchive-c-4.0.ebuild
+++ b/dev-python/libarchive-c/libarchive-c-4.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}"/python-${P}
 
 LICENSE="CC0-1.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc64 x86"
 
 RDEPEND="app-arch/libarchive"
 BDEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )"
diff --git a/dev-python/mkdocs-material/Manifest b/dev-python/mkdocs-material/Manifest
index 3ef07f3a5b5c..41b5595b1451 100644
--- a/dev-python/mkdocs-material/Manifest
+++ b/dev-python/mkdocs-material/Manifest
@@ -1,2 +1 @@
-DIST mkdocs-material-8.5.10.gh.tar.gz 10384269 BLAKE2B 3f7837b17724e93fa28a906811a8695aacba9c479a13d4568775945aee3943b9f58e017ab71fb81da8c72073a471b736ca75bf721a786309fe822f5898e4d3aa SHA512 ed186b206ffe0b17c96a33270d83ffc3c98262eb608d6889101b6949057e7059642eb83b584f4a309afff64a359ee79625c5a95be62fc37ece069e2404faa0bd
 DIST mkdocs-material-8.5.11.gh.tar.gz 10423819 BLAKE2B 8af9b10fde57a6543d86dc8d6004cb100359e274072486094e7db4f8eeb7d44d83505d00b3f202f02e695a613ae8e2fdf08ac1b39584e7d9aeae430bb560d60a SHA512 7fdc06cf7f64a2831fe2acb05a735bc9519fdf109fbccd5ee1667d07175916fffb295ccfa88a4352a7a0688f0eaf535c26ab49463f672d964d4a87ad8de6ddf1
diff --git a/dev-python/mkdocs-material/mkdocs-material-8.5.10.ebuild b/dev-python/mkdocs-material/mkdocs-material-8.5.10.ebuild
deleted file mode 100644
index 74cd490f5db4..000000000000
--- a/dev-python/mkdocs-material/mkdocs-material-8.5.10.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/mkdocs-material-extensions
-	dev-python/mkdocs-minify-plugin
-	dev-python/mkdocs-redirects
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="A Material Design theme for MkDocs"
-HOMEPAGE="
-	https://github.com/squidfunk/mkdocs-material/
-	https://pypi.org/project/mkdocs-material/
-"
-SRC_URI="
-	https://github.com/squidfunk/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/jinja-3.0.2[${PYTHON_USEDEP}]
-	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.12[${PYTHON_USEDEP}]
-	>=dev-python/pymdown-extensions-9.4[${PYTHON_USEDEP}]
-"
-
-# mkdocs-material-extensions depends on mkdocs-material creating a circular dep
-PDEPEND=">=dev-python/mkdocs-material-extensions-1.0.3[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	# simplify pyproject to remove extra deps for metadata
-	"${FILESDIR}/${PN}-8.5.7-simplify-build.patch"
-)
-
-src_prepare() {
-	echo "__version__ = '${PV}'"> gentoo_version.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/mkdocs-material/mkdocs-material-8.5.11.ebuild b/dev-python/mkdocs-material/mkdocs-material-8.5.11.ebuild
index 88937f70d568..5dd20ccf961a 100644
--- a/dev-python/mkdocs-material/mkdocs-material-8.5.11.ebuild
+++ b/dev-python/mkdocs-material/mkdocs-material-8.5.11.ebuild
@@ -27,7 +27,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/jinja-3.0.2[${PYTHON_USEDEP}]
diff --git a/dev-python/mkdocs-minify-plugin/Manifest b/dev-python/mkdocs-minify-plugin/Manifest
index 9a39b8ba3932..974c5f805c2e 100644
--- a/dev-python/mkdocs-minify-plugin/Manifest
+++ b/dev-python/mkdocs-minify-plugin/Manifest
@@ -1,2 +1 @@
-DIST mkdocs-minify-plugin-0.6.1.gh.tar.gz 8346 BLAKE2B 130495cc2dcc2b71c6dd715c1ed277df0d8fac5aef8fc49094bf05b324d692e41e3db85175df5455eed21f2cf413d57225a1baafe14770a77ffd3c2bb77ff3d8 SHA512 f1611b1a8f946e27450c9825f65e77e798200b22d08b5957417ae060cc2d6cb40c6edd2a6ace08eff2b32b59c9aca3020e26da35917aaddae293047d9cc8f86b
 DIST mkdocs-minify-plugin-0.6.2.gh.tar.gz 8480 BLAKE2B 91091702c0f5953b8cef4e081004cf44abbc2a7b21a0ea1996a337c96764a636fa79054c5d05ffc2814acb4b7fda0e833e61b02c6b97466586875e9da21c937b SHA512 563e150eb380aab105b18492eb0f725ec96fe12768c666b093e40d375e66cccf42f859aeb4d2788ae8c7a5b01e6e103c9f9aa1153802ad104955a98d90036144
diff --git a/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.6.1.ebuild b/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.6.1.ebuild
deleted file mode 100644
index 1e84dd9610b5..000000000000
--- a/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.6.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
-
-DESCRIPTION="An MkDocs plugin to minify HTML and/or JS files prior to being written to disk"
-HOMEPAGE="
-	https://github.com/byrnereese/mkdocs-minify-plugin
-	https://pypi.org/project/mkdocs-minify-plugin/
-"
-SRC_URI="
-	https://github.com/byrnereese/mkdocs-minify-plugin/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/csscompressor-0.9.5[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-1.4.1[${PYTHON_USEDEP}]
-	>=app-text/htmlmin-0.1.12[${PYTHON_USEDEP}]
-	>=dev-python/jsmin-3.0.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		~dev-python/mkdocs-minify-plugin-${PV}[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.6.2.ebuild b/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.6.2.ebuild
index 5e736f0e8ba2..0800e997a9e7 100644
--- a/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.6.2.ebuild
+++ b/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.6.2.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/csscompressor-0.9.5[${PYTHON_USEDEP}]
diff --git a/dev-python/moto/moto-4.0.12.ebuild b/dev-python/moto/moto-4.0.12.ebuild
index 1045d1bcb690..7dfdb8c72a78 100644
--- a/dev-python/moto/moto-4.0.12.ebuild
+++ b/dev-python/moto/moto-4.0.12.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 
 RDEPEND="
 	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
diff --git a/dev-python/piexif/piexif-1.1.3-r1.ebuild b/dev-python/piexif/piexif-1.1.3-r1.ebuild
deleted file mode 100644
index c7460c9832b3..000000000000
--- a/dev-python/piexif/piexif-1.1.3-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit edos2unix distutils-r1
-
-DESCRIPTION="Exif manipulation with pure Python"
-HOMEPAGE="https://github.com/hMatoba/Piexif
-	https://pypi.org/project/piexif/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	app-arch/unzip
-	test? ( dev-python/pillow[jpeg,${PYTHON_USEDEP}] )"
-RDEPEND=""
-
-PATCHES=(
-	# From https://github.com/hMatoba/Piexif/pull/109
-	"${FILESDIR}"/${P}-tests-pillow-7.2.0.patch
-)
-
-src_prepare() {
-	edos2unix tests/s_test.py  # to be able to patch it
-	default
-}
-
-python_test() {
-	"${PYTHON}" setup.py test || die
-}
diff --git a/dev-python/piexif/piexif-1.1.3-r2.ebuild b/dev-python/piexif/piexif-1.1.3-r2.ebuild
index 2a2eecbc3668..d2f5eead3bcb 100644
--- a/dev-python/piexif/piexif-1.1.3-r2.ebuild
+++ b/dev-python/piexif/piexif-1.1.3-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pycdio/pycdio-2.1.1-r1.ebuild b/dev-python/pycdio/pycdio-2.1.1-r1.ebuild
new file mode 100644
index 000000000000..b2c45c76a42d
--- /dev/null
+++ b/dev-python/pycdio/pycdio-2.1.1-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python OO interface to libcdio (CD Input and Control library)"
+HOMEPAGE="
+	https://savannah.gnu.org/projects/libcdio/
+	https://pypi.org/project/pycdio/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+DEPEND="
+	>=dev-libs/libcdio-2.0.0
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	dev-lang/swig
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Remove obsolete sys.path and adjust 'data' paths in examples.
+	sed -i \
+		-e "s:^sys.path.insert.*::" \
+		-e "s:\.\./data:./data:g" \
+		example/*.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest -opython_files='test-*.py'
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use examples; then
+		docinto examples
+		dodoc -r example/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-python/pycryptodome/pycryptodome-3.16.0.ebuild b/dev-python/pycryptodome/pycryptodome-3.16.0.ebuild
index 369b100819a8..1286f41faf38 100644
--- a/dev-python/pycryptodome/pycryptodome-3.16.0.ebuild
+++ b/dev-python/pycryptodome/pycryptodome-3.16.0.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="BSD-2 Unlicense"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="
 	dev-libs/gmp:0=
diff --git a/dev-python/pycxx/Manifest b/dev-python/pycxx/Manifest
index b2a1ef174f08..6703866a80ea 100644
--- a/dev-python/pycxx/Manifest
+++ b/dev-python/pycxx/Manifest
@@ -1,2 +1 @@
-DIST pycxx-7.1.5.tar.gz 156343 BLAKE2B 099de7f88c19ec86aea67b503e6fbdc0df66bbdd3bdc0ff7f8ce77425be9486e6abebed8548f9ac764688a85e62cda77d3832f460e5678b4c07b1c6d2123b257 SHA512 0f980298739886d0c05ddd5ee23ebb234014b8276d811e62dc5b0a738666c6a011ad3f4aeeb7b1b404d8bff87dddfc30f68eec9c6bd13d5f262a2f7c53e273be
 DIST pycxx-7.1.7.tar.gz 156383 BLAKE2B 69a454615c9a7cdc57f4c357b9e3805821711bc48efb82e684da6066069ff0ee6af3b76911a705adb6f984969659441d331a8470061b514180ddf53f6494a33d SHA512 5439b2f72a7f04a628e7e93d093566654f3b4eafe78a7834005f86fb08e614f22f4d1fffb8d626e46cd56880ff7792e494ee3282b313ce668a7497d2bc1fbea9
diff --git a/dev-python/pycxx/pycxx-7.1.5-r1.ebuild b/dev-python/pycxx/pycxx-7.1.5-r1.ebuild
deleted file mode 100644
index 5a25766e4530..000000000000
--- a/dev-python/pycxx/pycxx-7.1.5-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-DISTUTILS_USE_SETUPTOOLS=no
-inherit distutils-r1
-
-DESCRIPTION="Set of facilities to extend Python with C++"
-HOMEPAGE="http://cxx.sourceforge.net"
-SRC_URI="mirror://sourceforge/cxx/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-IUSE="doc examples"
-
-python_prepare_all() {
-	# Without this, pysvn fails.
-	# Src/Python3/cxxextensions.c: No such file or directory
-	sed -e "/^#include/s:Src/::" -i Src/*.{c,cxx} || die "sed failed"
-
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( Doc/. )
-	if use examples ; then
-		docinto examples
-		dodoc -r Demo/Python{2,3}/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pycxx/pycxx-7.1.7.ebuild b/dev-python/pycxx/pycxx-7.1.7.ebuild
index 8f8a46d1b90c..d56824896caf 100644
--- a/dev-python/pycxx/pycxx-7.1.7.ebuild
+++ b/dev-python/pycxx/pycxx-7.1.7.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/cxx/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ppc ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="doc examples"
 
 python_prepare_all() {
diff --git a/dev-python/pymediainfo/Manifest b/dev-python/pymediainfo/Manifest
index f2f81ebb4b0f..d10ac1a454c8 100644
--- a/dev-python/pymediainfo/Manifest
+++ b/dev-python/pymediainfo/Manifest
@@ -1,2 +1 @@
-DIST pymediainfo-5.1.0.tar.gz 445630 BLAKE2B debef8de004232c4e39bd17018c447474a4f71bc386b01710bea8084febb5353cb70512ee77c33ea8b3e6c7b67baded99aecb77b60c52da58be35ef91919f34a SHA512 d3c48e37f6d59b0f5bc1d66d4fad9fea26724863dc2ae75a30c80d972f68f3be650298d25105d330c20b83083f94d2ff5e2690c29573897e09afa44931f3228e
 DIST pymediainfo-6.0.1.tar.gz 446487 BLAKE2B 402c71157e43fd03efe37934932c61e1e22d469c13f5b5e85d7e0f1d52d6e54289860777c1677efeb4710a5c55086a1c7db03da8ad2f88f49d144bd5484f8638 SHA512 7b373b133911eb320248f72627f6aeb6fa04705b55500639d18094ed8227296fd744c2c4b76d765e8b2d98d78f443114e9ca7ef8e2e0eb498d48d2b46956f952
diff --git a/dev-python/pymediainfo/pymediainfo-5.1.0-r1.ebuild b/dev-python/pymediainfo/pymediainfo-5.1.0-r1.ebuild
deleted file mode 100644
index 852cdbc655ed..000000000000
--- a/dev-python/pymediainfo/pymediainfo-5.1.0-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="A wrapper around the mediainfo library"
-HOMEPAGE="https://github.com/sbraz/pymediainfo"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	media-libs/libmediainfo
-"
-BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-
-distutils_enable_sphinx docs dev-python/alabaster
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Disable tests which requires network access
-	sed -i 's/@pytest.mark.internet/@pytest.mark.skip/' \
-		tests/test_pymediainfo.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pymediainfo/pymediainfo-6.0.1.ebuild b/dev-python/pymediainfo/pymediainfo-6.0.1.ebuild
index 2348f6c2eabd..76d089482501 100644
--- a/dev-python/pymediainfo/pymediainfo-6.0.1.ebuild
+++ b/dev-python/pymediainfo/pymediainfo-6.0.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	media-libs/libmediainfo
diff --git a/dev-python/pysvn/Manifest b/dev-python/pysvn/Manifest
index 242b0c338cd9..1f2bdeba3f41 100644
--- a/dev-python/pysvn/Manifest
+++ b/dev-python/pysvn/Manifest
@@ -1,2 +1 @@
-DIST pysvn-1.9.15.tar.gz 667161 BLAKE2B 35e9e0967d5c0b4cebf546e40df17b66c66406d0f8100c32e6e840220f60b0083c0ed3f3af5f54e2264d06905ea90970d6b7cbfad2bab872a14d5d4aea5900df SHA512 0809507134fd31f6bcc90217e7840eb166e2eb2ed56316010a549dd70f6f855599f596942574343cdefd5997947b12c847df2cd145669f50aa93f603e46a5ee0
 DIST pysvn-1.9.18.tar.gz 667827 BLAKE2B cd32b4ec55118becd496a9aab6f4dd2b9d57c82e12d5a08b18d36d0caffbafe7066ff45c9493a36499979e759d38dd6b15a68e7bb5819464362c2691e7599160 SHA512 0ca2924223cdc5f29e961e879db6b0f88e82b5c4c40df50169468dd5a72cbccddea9f0d1680ef4a54d45e89b4b2b2c3c22f5e76c66196783a89cac8b583b6623
diff --git a/dev-python/pysvn/pysvn-1.9.15-r1.ebuild b/dev-python/pysvn/pysvn-1.9.15-r1.ebuild
deleted file mode 100644
index 9db03ede2005..000000000000
--- a/dev-python/pysvn/pysvn-1.9.15-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-DISTUTILS_IN_SOURCE_BUILD=true
-DISTUTILS_USE_SETUPTOOLS=bdepend  # see setup.py
-inherit distutils-r1 toolchain-funcs
-
-DESCRIPTION="Object-oriented python bindings for subversion"
-HOMEPAGE="https://pysvn.sourceforge.io/"
-SRC_URI="mirror://sourceforge/project/pysvn/pysvn/V${PV}/${P}.tar.gz"
-
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="doc examples"
-
-DEPEND="
-	>=dev-python/pycxx-7.0.2[${PYTHON_USEDEP}]
-	>=dev-vcs/subversion-1.9"
-RDEPEND="${DEPEND}"
-
-python_prepare_all() {
-	# Don't use internal copy of dev-python/pycxx.
-	rm -r Import || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure() {
-	cd Source || die
-	CC="$(tc-getCC)" CCC="$(tc-getCXX)" \
-		esetup.py configure
-}
-
-python_compile() {
-	cd Source || die
-	emake
-}
-
-python_test() {
-	cd Tests || die
-	emake
-}
-
-python_install() {
-	cd Source || die
-	python_domodule pysvn
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( Docs/. )
-	if use examples; then
-		docinto examples
-		dodoc -r Examples/Client/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pysvn/pysvn-1.9.18.ebuild b/dev-python/pysvn/pysvn-1.9.18.ebuild
index aef643b124fc..201a68232a0c 100644
--- a/dev-python/pysvn/pysvn-1.9.18.ebuild
+++ b/dev-python/pysvn/pysvn-1.9.18.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/project/pysvn/pysvn/V${PV}/${P}.tar.gz"
 
 LICENSE="Apache-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="doc examples"
 
 DEPEND="
diff --git a/dev-python/python-xlib/Manifest b/dev-python/python-xlib/Manifest
index 39759f903c90..2a42cde9567d 100644
--- a/dev-python/python-xlib/Manifest
+++ b/dev-python/python-xlib/Manifest
@@ -1,3 +1,2 @@
-DIST python-xlib-0.31.tar.bz2 211425 BLAKE2B c0a15b11c264942479c86088d8d5bdc0c759ae71df8939feee200ff58ec30d3b2c0a99a119cc56e5c32279b26517e7925cf9124a367dc7d32fcaf0be4f7cd41e SHA512 f98978cd0058ae18f08f9da71b4ff31cd7811040ec1eb03ce065c187f312259d674dd76aad447752c8f508e585838948c90182eef5d5240e6c06b0a5dd1fbd33
 DIST python-xlib-0.32.tar.bz2 213554 BLAKE2B cf24645529c6ca67a4825419837f312fa4ae0902bd2fb8f2eade7cc1645a3f79201b43c7ddca0cdcf8b21f623583acee1252cbe83d3700ab08979b8f0723b0a4 SHA512 9fecb77fa5d7ffba4c8031c0738147b7581dee9aed1a812254d22d78b6021cfc08743edb76829a3e5ba31f9a42648ea501b50ddcf5652ec3114a367c5e83d465
 DIST python-xlib-0.33.tar.bz2 213763 BLAKE2B 53486ec938bc00306658f3151556f1353fe5881ab942d06493f6f78d33b4cff8aab6e6aa5ad7e9124824d61549545719375c84f7b9376518e2328fa2e65df553 SHA512 3b7b4fea5cd69544d2227806853bdfdd04447089e182ca0f199e18e8bd43375d9bf03c819fd6a055ad4ad274594651e05db82585ab40d0fcf225ce36b553c991
diff --git a/dev-python/python-xlib/python-xlib-0.31-r1.ebuild b/dev-python/python-xlib/python-xlib-0.31-r1.ebuild
deleted file mode 100644
index 1a77790a8a7c..000000000000
--- a/dev-python/python-xlib/python-xlib-0.31-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1 virtualx
-
-DESCRIPTION="A fully functional X client library for Python, written in Python"
-HOMEPAGE="https://github.com/python-xlib/python-xlib"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.bz2"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~riscv x86"
-IUSE="doc"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	doc? ( sys-apps/texinfo )
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests unittest
-
-python_compile_all() {
-	use doc && emake -C doc/info
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_install_all() {
-	use doc && doinfo doc/info/*.info
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-xlib/python-xlib-0.32-r1.ebuild b/dev-python/python-xlib/python-xlib-0.32-r1.ebuild
index 5a32bbc31aa2..e05bcecb90d7 100644
--- a/dev-python/python-xlib/python-xlib-0.32-r1.ebuild
+++ b/dev-python/python-xlib/python-xlib-0.32-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~riscv x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-python/rope/Manifest b/dev-python/rope/Manifest
index f85951b6cd7f..45edde1fdb44 100644
--- a/dev-python/rope/Manifest
+++ b/dev-python/rope/Manifest
@@ -1,3 +1 @@
-DIST rope-1.4.0.tar.gz 287417 BLAKE2B d161e571649be2df7e6012336e7bded844f98f67764740814bfccebc926ff4c5f734cdf26701c9b7cec35bf3178be1f1ebe0d86f3b60259a161d3e87125fc7d5 SHA512 586f6f22fdf4743f71bf7f7505ec49aaced28aff48b5eae4f731eb690edec1ff8c736e3f9f21d7732bf5ea60ced5253e8f0d224a51a6a9bfdf7dd50ab56733ea
-DIST rope-1.5.1.tar.gz 288965 BLAKE2B bc912932dec03317a3ea24d2e15f751037d308d58a941305b6155e2f85d2ee81fc82f9d4183a1a416ebda6e791ab8c5408835e7eb36a7fb5a8b71116d5edb24c SHA512 5b7c76f0bfd481978d0e6c23d37f17f9db49fe6affc0f670868deed9a23a95c53f31a578bc7b8cd1c59318b38789a6e264f8fa9d3c7e13e5ce3db80dbadf177f
 DIST rope-1.6.0.tar.gz 289325 BLAKE2B fc7fc37a93f6d011f7e5eab5d2a28e3eab1767839cba4bce2b665c7972d6485eb3693e5977abfd36025415bc898fb4985affb7ac757c8457840a5de3946df77d SHA512 f610eb71c20533907aeea86c3ec5101401cf8136aba4221b2d64db3b0db16d4d7d1ec081c6d4929d6534ed51d4c01761af8d2ffddb6b69b4a9cc4921d240d745
diff --git a/dev-python/rope/rope-1.4.0.ebuild b/dev-python/rope/rope-1.4.0.ebuild
deleted file mode 100644
index 17c2d83d48ac..000000000000
--- a/dev-python/rope/rope-1.4.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,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 x86"
-IUSE="doc"
-
-RDEPEND="
-	>=dev-python/pytoolconfig-1.2.2[${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/rope/rope-1.5.1.ebuild b/dev-python/rope/rope-1.5.1.ebuild
deleted file mode 100644
index e7718cf5b757..000000000000
--- a/dev-python/rope/rope-1.5.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,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 ~x86"
-IUSE="doc"
-
-RDEPEND="
-	>=dev-python/pytoolconfig-1.2.2[${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/rope/rope-1.6.0.ebuild b/dev-python/rope/rope-1.6.0.ebuild
index e7718cf5b757..17c2d83d48ac 100644
--- a/dev-python/rope/rope-1.6.0.ebuild
+++ b/dev-python/rope/rope-1.6.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-python/scikit-build/scikit-build-0.16.4.ebuild b/dev-python/scikit-build/scikit-build-0.16.4.ebuild
index 84f29b0d8841..3e18ec82a864 100644
--- a/dev-python/scikit-build/scikit-build-0.16.4.ebuild
+++ b/dev-python/scikit-build/scikit-build-0.16.4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	dev-python/distro[${PYTHON_USEDEP}]
diff --git a/dev-python/tlsh/tlsh-4.8.2.ebuild b/dev-python/tlsh/tlsh-4.8.2.ebuild
index ef4f3a2d64b9..f6c32016b45e 100644
--- a/dev-python/tlsh/tlsh-4.8.2.ebuild
+++ b/dev-python/tlsh/tlsh-4.8.2.ebuild
@@ -14,7 +14,7 @@ S=${WORKDIR}/${P}/py_ext
 
 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc64 x86"
 
 DEPEND="dev-libs/tlsh"
 RDEPEND="${DEPEND}"
diff --git a/dev-python/uncertainties/uncertainties-3.1.7.ebuild b/dev-python/uncertainties/uncertainties-3.1.7-r1.ebuild
index 0b40000ca86b..e05774b68879 100644
--- a/dev-python/uncertainties/uncertainties-3.1.7.ebuild
+++ b/dev-python/uncertainties/uncertainties-3.1.7-r1.ebuild
@@ -5,24 +5,36 @@ EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
 inherit distutils-r1 optfeature
 
 DESCRIPTION="Python module for calculations with uncertainties"
-HOMEPAGE="https://pythonhosted.org/uncertainties/"
+HOMEPAGE="
+	https://pythonhosted.org/uncertainties/
+	https://github.com/lebigot/uncertainties/
+	https://pypi.org/project/uncertainties/
+"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
-RDEPEND="dev-python/future[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}
-	test? (	dev-python/numpy[${PYTHON_USEDEP}] )
+BDEPEND="
+	test? (
+		dev-python/numpy[${PYTHON_USEDEP}]
+	)
 "
 
 distutils_enable_tests pytest
 distutils_enable_sphinx doc --no-autodoc
 
+src_prepare() {
+	# not used in py3, see https://github.com/lebigot/uncertainties/pull/168
+	sed -i -e '/future/d' setup.py || die
+	distutils-r1_src_prepare
+}
+
 pkg_postinst() {
 	optfeature "numpy support" dev-python/numpy
 }