Adding metadata

52 files changed, 469 insertions, 872 deletions

diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 1623f2103046..c2e145ebe744 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -3,4 +3,5 @@ DIST boto3-1.24.13.gh.tar.gz 510032 BLAKE2B 4d204f4b4e1dbe970d45e65eb04061193d1b
 DIST boto3-1.24.14.gh.tar.gz 510393 BLAKE2B c5a3f28abdeb3deaf33620ab7278b5d14dce55297e37c8d17e58994348f7459598ea96c3d44cfa7cf4bfa760aee2ab09aea0d905d514cc2365b0beb12424ea49 SHA512 d357cfd4e1098a8aa7e59aad36f27427dbc43fe39bfd3628928879058ee396774ebbc2c270fd5422a125f447a7b64fcb34da5008fcf44a8d74ed344b81f65666
 DIST boto3-1.24.15.gh.tar.gz 510710 BLAKE2B 9640c037d6bc95225b9dbb9fc8b33d65a4253057b9a534c1dc2f33a5040796b25fe069a1842aee61851b0b5a75c15770564c5348b8937cc38cc8b898a5d01106 SHA512 07b8758afa9454d435a8935e90e7bfbe91ba266fecfd8413f81cb000c86101a8ad14cd9dd7e5ba620dd807da9501409896c36b532d243d68f26b4d0aa8574fbb
 DIST boto3-1.24.16.gh.tar.gz 511182 BLAKE2B 00180c2cee9499efb3093c517f776536a85972014c622ec87d327c0e1a628b1440a85ddb239431d7c647a459f8c55422136f61254cd192cd3ca8f68eb03270d9 SHA512 cc2d179ba3975fdfc1127565d352077529159cd97d120831629650af881600d022f8a55f4ccfb3c732be5814b58739178063042ca7a0e26f0163f47ba8dddb36
+DIST boto3-1.24.17.gh.tar.gz 511281 BLAKE2B 577efc0ebfb39957e55bcaf7aa678cdf072eed885ab1055b15fc8ca2295fedd6d56fd2fb919913beedcdd335ff26e452bc5434283c9ca9d8f0135080e2aa1312 SHA512 a843146951eb2a5ad7dd31159d833806ae403014abf3e9a617f6457e3ecec1a0dc4c6ce6a87079c9112513cbd6a2ccd26542e5736eeea6c5723c7e39c660befa
 DIST boto3-1.24.7.gh.tar.gz 508670 BLAKE2B d526f6a4dc4c6126c61ca7c9074b4341c742f84a6e95b38cd8a450fb74df379cee44513e1be6bc7cd0c8f728598d0ecfc06240120a8da71f75f86371498f5233 SHA512 4d57e38c18138b950f93a234132ac1d31c9a29ad00ca5e1298517d6b16ff2849802ce6cfeb8de390c2eb25086043d45e0276a7a563707595649ca1905367be52
diff --git a/dev-python/boto3/boto3-1.24.17.ebuild b/dev-python/boto3/boto3-1.24.17.ebuild
new file mode 100644
index 000000000000..e4a98e2e28f5
--- /dev/null
+++ b/dev-python/boto3/boto3-1.24.17.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="
+	https://github.com/boto/boto3/
+	https://pypi.org/project/boto3/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="
+		https://github.com/boto/boto3/archive/${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 9424a3fec702..8b4b193c6de2 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -3,4 +3,5 @@ DIST botocore-1.27.13.tar.gz 9134638 BLAKE2B 471a46a4c4f14082ceb7030495a121ea90a
 DIST botocore-1.27.14.tar.gz 9134503 BLAKE2B ca29a33c5363457053f8ac042279726a15d3dc5f72546558d11bbacd79e7641d94b1137b76e201ad00203ecff53274fd41abd9178e7abbc1c5a51fe388f7fa5e SHA512 3995918212559eab009f141f94e6e6496fc77f12438e1dd62ce3ee232009b90de3882d342d20e83eb11de5f35b7878f53eea884016874caacb9d2e3d167b4f1a
 DIST botocore-1.27.15.tar.gz 9134585 BLAKE2B 33fcf026334e0be28b7f20b78e072d4eed85e857438319dfe6a1aefb2aeb287aa7a4d6b5f40cd47b9ca5e904263bd7716e58fe2962a75fa64ffea8da383fd527 SHA512 15a65137b131220863fc7fb4c085d83b858a673ee49370bc8d5ce8433f2ee3c99dffd102830da10ed1c4fa4a6f5fdc5f543be4e88646f981409fb855ea100932
 DIST botocore-1.27.16.tar.gz 9138117 BLAKE2B ed636cd031445b14f57282326836616dca626c27ff912b5a2014df83c5574264f773d9ab8aae2f01b55bb810d00233f1a4cceb0f746767247b5954bb8739b7be SHA512 c4b1debe648cd3027fe409f4ec095a4b454050ec427e8a11e04bc1f82d452566d2168dd539d5dc687e46e612f3d47e218d99de9510156e19eac477ea3c0259d2
+DIST botocore-1.27.17.tar.gz 9130505 BLAKE2B 04c6b37f3b42a0f9fb696b5213338b004418a68c754f5027ad447119fb20556dc49bd53f40fd9560ea3f5bdcf2afbe151dba68e901079baec770f9f223b1a894 SHA512 b1a145d3c97adfd4df40639da99e1c34087508be189d5818ee7176f20454f2897a6f518a14b4bfbf41cb169a17188bec467337c10d0ad511e223f0c1ff5b64ee
 DIST botocore-1.27.7.tar.gz 9102259 BLAKE2B 094ec463531f1dfd54ff32d0f44ebc39cdc0a6d4c3e19b49a25e25d9d13acdcd26c782c1d4819ea4f1cb8954a858aa6e997411785678700b7ca03cd8844527b5 SHA512 d4a1327f4314279548af00fbc6da2f9fc5f25f704da3f6ddfa90773878f28ac9f03556b00fa4c0207ec2e952eb716aa98c1c22abffbd51d82dc55d9e4ceeca5c
diff --git a/dev-python/botocore/botocore-1.27.17.ebuild b/dev-python/botocore/botocore-1.27.17.ebuild
new file mode 100644
index 000000000000..1f52e2694e84
--- /dev/null
+++ b/dev-python/botocore/botocore-1.27.17.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="
+	https://github.com/boto/botocore/
+	https://pypi.org/project/botocore/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	<dev-python/jmespath-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+	)
+
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/cjkwrap/cjkwrap-2.2-r1.ebuild b/dev-python/cjkwrap/cjkwrap-2.2-r1.ebuild
deleted file mode 100644
index 2bd514840b46..000000000000
--- a/dev-python/cjkwrap/cjkwrap-2.2-r1.ebuild
+++ /dev/null
@@ -1,15 +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} )
-inherit distutils-r1
-
-DESCRIPTION="A library for wrapping and filling UTF-8 CJK text"
-HOMEPAGE="https://f.gallai.re/cjkwrap https://gitlab.com/fgallaire/cjkwrap"
-SRC_URI="https://github.com/fgallaire/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
diff --git a/dev-python/cjkwrap/cjkwrap-2.2-r2.ebuild b/dev-python/cjkwrap/cjkwrap-2.2-r2.ebuild
index 32ba77dc9dae..41612cd79cea 100644
--- a/dev-python/cjkwrap/cjkwrap-2.2-r2.ebuild
+++ b/dev-python/cjkwrap/cjkwrap-2.2-r2.ebuild
@@ -13,4 +13,4 @@ SRC_URI="https://github.com/fgallaire/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
diff --git a/dev-python/configupdater/Manifest b/dev-python/configupdater/Manifest
new file mode 100644
index 000000000000..be50b3831097
--- /dev/null
+++ b/dev-python/configupdater/Manifest
@@ -0,0 +1 @@
+DIST configupdater-3.1.gh.tar.gz 138671 BLAKE2B 48e349780e11ca26b4b15b44aa298058840cfcea47fc7b2e555f3ca743de1956a15255bfea2c5f96624e02e399bed99ae45f3422ab1660b8ae83087ddf6117e1 SHA512 89685a93f3bec907184d818b5adea4f87967df313fe4e4216aeef2c227fdf0b0f98757ec27da7f43adff6e2ee37020dd57b98569d5811c9dc7c3201852b27432
diff --git a/dev-python/configupdater/configupdater-3.1.ebuild b/dev-python/configupdater/configupdater-3.1.ebuild
new file mode 100644
index 000000000000..614f2b815324
--- /dev/null
+++ b/dev-python/configupdater/configupdater-3.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Parser like ConfigParser but for updating configuration files"
+HOMEPAGE="
+	https://github.com/pyscaffold/configupdater/
+	https://pypi.org/project/ConfigUpdater/
+"
+SRC_URI="
+	https://github.com/pyscaffold/configupdater/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT PSF-2 PYTHON"
+SLOT="0"
+KEYWORDS="~amd64"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+src_prepare() {
+	distutils-r1_src_prepare
+	sed -i -e '/--cov/d' setup.cfg || die
+}
diff --git a/dev-python/sphinxcontrib-openapi/metadata.xml b/dev-python/configupdater/metadata.xml
index ea8988e8af6a..7ad11570cc7d 100644
--- a/dev-python/sphinxcontrib-openapi/metadata.xml
+++ b/dev-python/configupdater/metadata.xml
@@ -3,9 +3,7 @@
 <pkgmetadata>
  <maintainer type="project">
   <email>python@gentoo.org</email>
-  <name>Python</name>
  </maintainer>
  
  <origin>gentoo-staging</origin>
- <stabilize-allarches/>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/csscompressor/csscompressor-0.9.5.ebuild b/dev-python/csscompressor/csscompressor-0.9.5.ebuild
deleted file mode 100644
index f069361a5481..000000000000
--- a/dev-python/csscompressor/csscompressor-0.9.5.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A python port of YUI CSS Compressor"
-HOMEPAGE="
-	https://github.com/sprymix/csscompressor
-	https://pypi.org/project/csscompressor/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/distro/distro-1.7.0.ebuild b/dev-python/distro/distro-1.7.0.ebuild
index 0f5466825376..8d00c335f67e 100644
--- a/dev-python/distro/distro-1.7.0.ebuild
+++ b/dev-python/distro/distro-1.7.0.ebuild
@@ -15,6 +15,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests pytest
diff --git a/dev-python/h5py/h5py-3.7.0.ebuild b/dev-python/h5py/h5py-3.7.0.ebuild
index e0836a90f11a..d657309821dc 100644
--- a/dev-python/h5py/h5py-3.7.0.ebuild
+++ b/dev-python/h5py/h5py-3.7.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 # disable mpi until mpi4py gets python3_8
 #IUSE="examples mpi"
 IUSE="examples"
diff --git a/dev-python/ini2toml/Manifest b/dev-python/ini2toml/Manifest
index 9fa4a3fcb1f6..a307283e1b3b 100644
--- a/dev-python/ini2toml/Manifest
+++ b/dev-python/ini2toml/Manifest
@@ -1 +1,2 @@
 DIST ini2toml-0.10.gh.tar.gz 93535 BLAKE2B 8d8a5b31c53b9194e578b473dfd562b1b569d701b36b267ec4f59ea75ec03abd6e1df5541327b9414a2f1c04b1cb41ec57c6f900007f69a3c51a172143d2eacd SHA512 3d88f97c50a13fe3878e3fa35d70c9051874bec99d278411dcc7098d86898deb0e490be26f293e9a304d4c9a2842274e68126a2d20dac77b526161fde682dd75
+DIST ini2toml-0.11.gh.tar.gz 93696 BLAKE2B 0fb52b346065421049fd377a62de4189a6d261ad12c00679c97568a0e7b7f8fc7bf1aae2196b8fc70489d547c0ce9be1347336d25769c7fb383f9fec4d4aa205 SHA512 7329fd3ba31567638fffce22f2370c2055503bd4abc3d7dab30b1828eb54204d31036753efddfab52e79703ce7583f6070e1207c95345096c0751c2d429fd6ea
diff --git a/dev-python/ini2toml/ini2toml-0.11-r1.ebuild b/dev-python/ini2toml/ini2toml-0.11-r1.ebuild
new file mode 100644
index 000000000000..1e32969a2cb9
--- /dev/null
+++ b/dev-python/ini2toml/ini2toml-0.11-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Automatically conversion of .ini/.cfg files to TOML equivalents"
+HOMEPAGE="
+	https://pypi.org/project/ini2toml/
+	https://github.com/abravalheri/ini2toml/
+"
+SRC_URI="
+	https://github.com/abravalheri/ini2toml/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/packaging-20.7[${PYTHON_USEDEP}]
+	>=dev-python/tomli-w-0.4.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/configupdater[${PYTHON_USEDEP}]
+		dev-python/pyproject-fmt[${PYTHON_USEDEP}]
+		dev-python/tomli[${PYTHON_USEDEP}]
+		dev-python/tomlkit[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+EPYTEST_IGNORE=(
+	# validate_pyproject is not packaged
+	tests/test_examples.py
+)
+
+src_prepare() {
+	sed -i -e 's:--cov ini2toml --cov-report term-missing::' setup.cfg || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/ini2toml/ini2toml-0.11.ebuild b/dev-python/ini2toml/ini2toml-0.11.ebuild
new file mode 100644
index 000000000000..810211c2516e
--- /dev/null
+++ b/dev-python/ini2toml/ini2toml-0.11.ebuild
@@ -0,0 +1,64 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Automatically conversion of .ini/.cfg files to TOML equivalents"
+HOMEPAGE="
+	https://pypi.org/project/ini2toml/
+	https://github.com/abravalheri/ini2toml/
+"
+SRC_URI="
+	https://github.com/abravalheri/ini2toml/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/packaging-20.7[${PYTHON_USEDEP}]
+	>=dev-python/tomli-w-0.4.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/tomli[${PYTHON_USEDEP}]
+		dev-python/tomlkit[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+EPYTEST_DESELECT=(
+	# pyproject_fmt is not packaged
+	tests/test_cli.py::test_auto_formatting
+
+	# fails on whitespace/comments/formatting
+	tests/test_translator.py::test_simple_example
+	tests/test_translator.py::test_parser_opts
+	tests/plugins/test_setuptools_pep621.py::test_move_entry_points_and_apply_value_processing
+	tests/plugins/test_setuptools_pep621.py::test_split_subtables
+	tests/plugins/test_setuptools_pep621.py::test_entrypoints_and_split_subtables
+	tests/plugins/test_setuptools_pep621.py::test_handle_dynamic
+)
+
+EPYTEST_IGNORE=(
+	# configupdater is not packaged
+	tests/test_examples.py
+	tests/test_transformations.py
+	tests/drivers/test_configupdater.py
+)
+
+src_prepare() {
+	sed -i -e 's:--cov ini2toml --cov-report term-missing::' setup.cfg || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/kaptan/kaptan-0.5.12-r2.ebuild b/dev-python/kaptan/kaptan-0.5.12-r2.ebuild
index ac6ef691b6bd..f623557a4825 100644
--- a/dev-python/kaptan/kaptan-0.5.12-r2.ebuild
+++ b/dev-python/kaptan/kaptan-0.5.12-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 RDEPEND=">=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/m2r/Manifest b/dev-python/m2r/Manifest
deleted file mode 100644
index 0552e9342a44..000000000000
--- a/dev-python/m2r/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST m2r-0.2.1.tar.gz 24455 BLAKE2B 42ec5a919301b6dee2b345a5eca9e62a1bd44186fb61dbd8cc9de6cacc34821e912f242355cc7368b755f923a433353cfa567afc480e9b8c63bf209ff9d3c624 SHA512 847f04538ee52f0b0a88cee9474ed889e8114a3a7b1fb221cdaa867ab70ca52f517250f2c8bbf795ae598c7b6614e6d03d9f6f05b7e3d56fb8087d63eb52f1bc
diff --git a/dev-python/m2r/files/m2r-0.2.1-tests-network.patch b/dev-python/m2r/files/m2r-0.2.1-tests-network.patch
deleted file mode 100644
index 74f3a0ca7a6a..000000000000
--- a/dev-python/m2r/files/m2r-0.2.1-tests-network.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/tests/test_cli.py b/tests/test_cli.py
-index e53e209..4dff652 100644
---- a/tests/test_cli.py
-+++ b/tests/test_cli.py
-@@ -5,6 +5,7 @@ from __future__ import print_function, unicode_literals
- 
- import sys
- import os
-+import unittest
- from os import path
- from copy import copy
- from unittest import TestCase
-@@ -127,6 +128,7 @@ class TestConvert(TestCase):
-         self.assertIn('__content__', m.call_args[0][0])
-         self.assertNotIn('**content**', m.call_args[0][0])
- 
-+    @unittest.skip("needs internet access")
-     def test_anonymous_reference_option(self):
-         sys.argv = [
-             sys.argv[0], '--anonymous-references', '--dry-run', test_md]
-@@ -135,6 +137,7 @@ class TestConvert(TestCase):
-         self.assertIn("`A link to GitHub <http://github.com/>`__",
-                       m.call_args[0][0])
- 
-+    @unittest.skip("test seems to be broken")
-     def test_disable_inline_math(self):
-         sys.argv = [
-             sys.argv[0], '--disable-inline-math', '--dry-run', test_md]
diff --git a/dev-python/m2r/files/m2r-0.2.1-tests.patch b/dev-python/m2r/files/m2r-0.2.1-tests.patch
deleted file mode 100644
index 9c70bbc5b49d..000000000000
--- a/dev-python/m2r/files/m2r-0.2.1-tests.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 77968c4574cb121737a2017b936870603664be39 Mon Sep 17 00:00:00 2001
-From: miyakogi <miyako.dev@gmail.com>
-Date: Tue, 4 Jun 2019 19:13:26 +0900
-Subject: [PATCH] Fix test
-
----
- tests/test_renderer.py | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/tests/test_renderer.py b/tests/test_renderer.py
-index 5c6f915..4c7ebba 100644
---- a/tests/test_renderer.py
-+++ b/tests/test_renderer.py
-@@ -43,6 +43,7 @@ def check_rst(self, rst):
- class TestBasic(RendererTestBase):
-     def test_fail_rst(self):
-         with self.assertRaises(AssertionError):
-+            # This check should be failed and report warning
-             self.check_rst('```')
- 
-     def test_simple_paragraph(self):
-@@ -709,7 +710,6 @@ def test_footnote(self):
-             '',
-             '.. [#a] note rst',  # one empty line inserted...
-             '',
--            '',
-             '.. [#fn-1] note 1',
-             '.. [#fn-2] note 2',
-             '.. [#fn-ref] note ref',
-@@ -719,22 +719,22 @@ def test_footnote(self):
-     def test_sphinx_ref(self):
-         src = 'This is a sphinx [ref]_ global ref.\n\n.. [ref] ref text'
-         out = self.conv(src)
--        self.assertEqual(out, '\n' + src + '\n')
-+        self.assertEqual(out, '\n' + src)
- 
- 
- class TestDirective(RendererTestBase):
-     def test_comment_oneline(self):
-         src = '.. a'
-         out = self.conv(src)
--        self.assertEqual(out, '\n.. a\n')
-+        self.assertEqual(out, '\n.. a')
- 
-     def test_comment_indented(self):
-         src = '    .. a'
-         out = self.conv(src)
--        self.assertEqual(out, '\n    .. a\n')
-+        self.assertEqual(out, '\n    .. a')
- 
-     def test_comment_newline(self):
--        src = '..\n\n   comment\nnewline'
-+        src = '..\n\n   comment\n\nnewline'
-         out = self.conv(src)
-         self.assertEqual(out, '\n..\n\n   comment\n\nnewline\n')
- 
-@@ -748,7 +748,7 @@ def test_comment_multiline(self):
-             '\n\n')
-         src = comment + '`eoc`'
-         out = self.conv(src)
--        self.assertEqual(out, '\n' + comment + '\n``eoc``\n')
-+        self.assertEqual(out, '\n' + comment + '``eoc``\n')
- 
- 
- class TestRestCode(RendererTestBase):
diff --git a/dev-python/m2r/files/m2r-0.2.1-upstream-fix.patch b/dev-python/m2r/files/m2r-0.2.1-upstream-fix.patch
deleted file mode 100644
index 7060c33e78dd..000000000000
--- a/dev-python/m2r/files/m2r-0.2.1-upstream-fix.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From c78db2aa91787df6973ad6400208707c7ecf4b12 Mon Sep 17 00:00:00 2001
-From: "Ethan \"Soron\" Kaminski" <ethan.kaminski@gmail.com>
-Date: Thu, 25 Apr 2019 12:56:14 +0800
-Subject: [PATCH] Remove a trailing newline after `.rst` directives (fix issue
- #35)
-
----
- m2r.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/m2r.py b/m2r.py
-index 897338d..74c8c98 100644
---- a/m2r.py
-+++ b/m2r.py
-@@ -507,7 +507,7 @@ def eol_literal_marker(self, marker):
-         return marker
- 
-     def directive(self, text):
--        return '\n' + text + '\n'
-+        return '\n' + text
- 
-     def rest_code_block(self):
-         return '\n\n'
diff --git a/dev-python/m2r/files/m2r.1 b/dev-python/m2r/files/m2r.1
deleted file mode 100644
index 1a6c10b48a90..000000000000
--- a/dev-python/m2r/files/m2r.1
+++ /dev/null
@@ -1,515 +0,0 @@
-.\" Man page generated from reStructuredText.
-.
-.TH "M2R" "1" "Mar 30, 2017" "0.1.5" "M2R"
-.SH NAME
-m2r \- M2R Documentation
-.
-.nr rst2man-indent-level 0
-.
-.de1 rstReportMargin
-\\$1 \\n[an-margin]
-level \\n[rst2man-indent-level]
-level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
--
-\\n[rst2man-indent0]
-\\n[rst2man-indent1]
-\\n[rst2man-indent2]
-..
-.de1 INDENT
-.\" .rstReportMargin pre:
-. RS \\$1
-. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
-. nr rst2man-indent-level +1
-.\" .rstReportMargin post:
-..
-.de UNINDENT
-. RE
-.\" indent \\n[an-margin]
-.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
-.nr rst2man-indent-level -1
-.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
-.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
-..
-\fI\%PyPI\fP\fI\%PyPI version\fP\fI\%Build Status\fP\fI\%codecov\fP
-.sp
-.ce
-----
-
-.ce 0
-.sp
-.sp
-M2R converts a markdown file including reST markups to a valid reST format.
-.SH WHY ANOTHER CONVERTER?
-.sp
-I wanted to write sphinx document in markdown, since it\(aqs widely used now and
-easy to write code blocks and lists. However, converters using pandoc or
-recommonmark do not support many reST markups and sphinx extensions. For
-example, reST\(aqs reference link like \fBsee \(garef\(ga_\fP (this is very convenient in
-long document in which same link appears multiple times) will be converted to
-a code block in HTML like \fBsee <code>ref</code>_\fP, which is not expected.
-.SH FEATURES
-.INDENT 0.0
-.IP \(bu 2
-Basic markdown and some extensions (see below)
-.INDENT 2.0
-.IP \(bu 2
-inline/block\-level raw html
-.IP \(bu 2
-fenced\-code block
-.IP \(bu 2
-tables
-.IP \(bu 2
-footnotes (\fB[^1]\fP)
-.UNINDENT
-.IP \(bu 2
-Inline\- and Block\-level reST markups
-.INDENT 2.0
-.IP \(bu 2
-single\- and multi\-line directives (\fB\&.. directive::\fP)
-.IP \(bu 2
-inline\-roles (\fB:code:\(gaprint(1)\(ga ...\fP)
-.IP \(bu 2
-ref\-link (\fBsee \(garef\(ga_\fP)
-.IP \(bu 2
-footnotes (\fB[#fn]_\fP)
-.IP \(bu 2
-math extension inspired by \fI\%recommonmark\fP
-.UNINDENT
-.IP \(bu 2
-Sphinx extension
-.INDENT 2.0
-.IP \(bu 2
-add markdown support for sphinx
-.IP \(bu 2
-\fBmdinclude\fP directive to include markdown from md or reST files
-.UNINDENT
-.UNINDENT
-.SH INSTALLATION
-.sp
-Python 2.7 or Python 3.3+ is required.
-.INDENT 0.0
-.INDENT 3.5
-.sp
-.nf
-.ft C
-pip install m2r
-.ft P
-.fi
-.UNINDENT
-.UNINDENT
-.SH USAGE
-.SS Command Line
-.sp
-\fBm2r\fP command converts markdown file to reST format.
-.INDENT 0.0
-.INDENT 3.5
-.sp
-.nf
-.ft C
-m2r your_document.md [your_document2.md ...]
-.ft P
-.fi
-.UNINDENT
-.UNINDENT
-.sp
-Then you will find \fByour_document.rst\fP in the same directory.
-.SS Programmatic Use
-.sp
-Instantiate \fBM2R\fP class and call with markdown text. Then it will return converted text.
-.INDENT 0.0
-.INDENT 3.5
-.sp
-.nf
-.ft C
-from m2r import M2R
-m2r = M2R()
-rest = m2r(\(aq# Title\en\enSentence.\(aq)
-print(rest)
-# Title
-# =====
-#
-# Sentence.
-.ft P
-.fi
-.UNINDENT
-.UNINDENT
-.sp
-Or, use \fBparse_from_file\fP function to load markdown file and obtain converted text.
-.INDENT 0.0
-.INDENT 3.5
-.sp
-.nf
-.ft C
-from m2r import parse_from_file
-output = parse_from_file(\(aqmarkdown_file.md\(aq)
-.ft P
-.fi
-.UNINDENT
-.UNINDENT
-.sp
-This is an example of setup.py to write README in markdown, and publish it to PyPI as reST format.
-.INDENT 0.0
-.INDENT 3.5
-.sp
-.nf
-.ft C
-readme_file = os.path.join(os.path.dirname(os.path.abspath(__file__)), \(aqREADME.md\(aq)
-try:
-    from m2r import parse_from_file
-    readme = parse_from_file(readme_file)
-except ImportError:
-    # m2r may not be installed in user environment
-    with open(readme_file) as f:
-        readme = f.read()
-setup(
-    ...,
-    long_description=readme,
-    ...,
-)
-.ft P
-.fi
-.UNINDENT
-.UNINDENT
-.SS Sphinx Integration
-.sp
-In your conf.py, add the following lines.
-.INDENT 0.0
-.INDENT 3.5
-.sp
-.nf
-.ft C
-extensions = [
-    ...,
-    \(aqm2r\(aq,
-]
-
-# source_suffix = \(aq.rst\(aq
-source_suffix = [\(aq.rst\(aq, \(aq.md\(aq]
-.ft P
-.fi
-.UNINDENT
-.UNINDENT
-.sp
-Write index.md and run \fBmake html\fP\&.
-.sp
-When \fBm2r\fP extension is enabled on sphinx and \fB\&.md\fP file is loaded, m2r
-converts to reST and pass to sphinx, not making new \fB\&.rst\fP file.
-.SS mdinclude directive
-.sp
-Like \fB\&.. include:: file\fP directive, \fB\&.. mdinclude:: file\fP directive inserts
-markdown file at the line.
-.sp
-Note: do not use \fB\&.. include:: file\fP directive to include markdown file even if
-in the markdown file, please use \fB\&.. mdinclude:: file\fP instead.
-.SH RESTRICTIONS
-.INDENT 0.0
-.IP \(bu 2
-In the reST\(aqs directives, markdown is not available. Please write in reST.
-.IP \(bu 2
-Column alignment of tables is not supported. (reST does not support this feature)
-.IP \(bu 2
-Heading with overline\-and\-underline is not supported.
-.INDENT 2.0
-.IP \(bu 2
-Heading with underline is OK
-.UNINDENT
-.UNINDENT
-.sp
-If you find any bug or unexpected behaviour, please report it to
-\fI\%Issues\fP\&.
-.SH EXAMPLE
-.sp
-See \fI\%example document\fP and \fI\%its
-source code\fP\&.
-.sp
-I\(aqm using m2r for writing user guide of \fI\%WDOM\fP\&.
-So you can see it as another example. Its \fI\%HTML is
-here\fP, and \fI\%its
-source code is here\fP\&.
-.SH ACKNOWLEDGEMENT
-.sp
-m2r is written as an extension of
-\fI\%mistune\fP, which is highly extensible
-pure\-python markdown parser.
-Without the mistune, I couldn\(aqt write this. Thank you!
-.SH LICENCE
-.sp
-\fI\%MIT\fP
-.SH CONTENTS
-.SS Example
-.sp
-This page is written in mixed markdown and reST.
-Source code is \fI\%here\fP\&.
-.SS Basic Markups (inline)
-.sp
-A \fBstrong\fP, \fIemphasis\fP, , \fBcode with single\-backtick\fP,
-\fBcode with two\-backticks\fP, ,
-\fBreST\(aqs code role\fP, and delete.
-.SS Link
-.sp
-Auto link to \fI\%http://example.com/\fP\&.
-.sp
-Link to \fI\%example.com\fP in markdown.
-.sp
-Link to \fI\%example.com\fP in reST.
-.sp
-Link to \fI\%example\fP in reST_ref.
-.SS Basic Markups (block)
-.sp
-This is a simple sentence.
-.nf
-sentence with
-newlines
-(reST)
-.fi
-.sp
-.sp
-Sentence with
-hard\-wrap (markdown, trailing two spaces)
-.INDENT 0.0
-.INDENT 3.5
-block quote
-second line
-.INDENT 0.0
-.INDENT 3.5
-nested quote
-.UNINDENT
-.UNINDENT
-.UNINDENT
-.UNINDENT
-
-.sp
-.ce
-----
-
-.ce 0
-.sp
-.INDENT 0.0
-.INDENT 3.5
-Block quote after raw\-html directive
-.UNINDENT
-.UNINDENT
-.SS List
-.SS Unordered list
-.INDENT 0.0
-.IP \(bu 2
-unordered list
-new line
-.IP \(bu 2
-next item
-.INDENT 2.0
-.IP \(bu 2
-nested list
-with new line
-.IP \(bu 2
-nested list item 2
-.UNINDENT
-.IP \(bu 2
-original depth
-.INDENT 2.0
-.IP 1. 3
-ordered list item
-.IP 2. 3
-second
-with new line
-.UNINDENT
-.IP \(bu 2
-original depth again
-.UNINDENT
-.SS Ordered list
-.INDENT 0.0
-.IP 1. 3
-ordered list
-in new line
-.IP 2. 3
-second item
-.INDENT 3.0
-.IP \(bu 2
-nested unordered list
-.IP \(bu 2
-second item
-with new line
-.UNINDENT
-.IP 3. 3
-original depth
-.INDENT 3.0
-.IP 1. 3
-nested ordered list
-with new line
-.IP 2. 3
-again
-.UNINDENT
-.IP 4. 3
-original depth again
-.UNINDENT
-.SS Code Block
-.sp
-Simple, indented code block
-.INDENT 0.0
-.INDENT 3.5
-.sp
-.nf
-.ft C
-pip install sphinx
-.ft P
-.fi
-.UNINDENT
-.UNINDENT
-.sp
-Code block with triple backticks and language.
-.INDENT 0.0
-.INDENT 3.5
-.sp
-.nf
-.ft C
-def a(n: int) \-> None:
-    for i in range(n):
-        print(i)
-.ft P
-.fi
-.UNINDENT
-.UNINDENT
-.sp
-Triple\-tildes (\fB~~~\fP) are also available.
-.INDENT 0.0
-.INDENT 3.5
-.sp
-.nf
-.ft C
-def a(n: int) \-> None:
-    for i in range(n):
-        print(i)
-.ft P
-.fi
-.UNINDENT
-.UNINDENT
-.sp
-Here is reST style code block.
-.INDENT 0.0
-.INDENT 3.5
-.sp
-.nf
-.ft C
-if True:
-    print(\(aq\en\(aq)
-.ft P
-.fi
-.UNINDENT
-.UNINDENT
-.SS Extensions
-.SS Table (Markdown\-Style)
-.sp
-(cell\-alignment is not supported currently)
-.TS
-center;
-|l|l|l|.
-_
-T{
-Table Header 1
-T}	T{
-Table Header 2
-T}	T{
-Table Header 3
-T}
-_
-T{
-normal
-T}	T{
-\fIitalic\fP
-T}	T{
-\fBbold\fP
-T}
-_
-T{
-\fBcode\fP
-T}	T{
-T}	T{
-T}
-_
-.TE
-.SS Math
-.sp
-This is E = mc^2 inline math.
-.sp
-The below is math\-block (markdown\-style).
-.sp
-.ce
-
-.ce 0
-.sp
-The below is reST\-style math\-block.
-.sp
-.ce
-
-.ce 0
-.SS Footnote
-.sp
-Footnote[2] and footnote[3] with markdown.
-.sp
-Footnote with reST[1]\&.
-.sp
-
-.IP [1] 5
-reST footnote
-.IP [2] 5
-footnote 1
-.IP [3] 5
-footnote key
-.SS Change Log
-.SS Version 0.2
-.sp
-(next version)
-.SS Version 0.1.5 (2016\-06\-21)
-.INDENT 0.0
-.IP \(bu 2
-Support multiple backticks in inline code, like: 
-.UNINDENT
-.SS Version 0.1.4 (2016\-06\-08)
-.INDENT 0.0
-.IP \(bu 2
-Support indented directives/reST\-comments
-.IP \(bu 2
-Support role\-name after backticks (\fB\(gatext\(ga:role: style\fP)
-.UNINDENT
-.SS Version 0.1.3 (2016\-06\-02)
-.INDENT 0.0
-.IP \(bu 2
-Remove extra escaped\-spaces (\(aq\(aq)
-.INDENT 2.0
-.IP \(bu 2
-before and after normal spaces
-.IP \(bu 2
-at the beginning of lines
-.IP \(bu 2
-before dots
-.UNINDENT
-.UNINDENT
-.SS Version 0.1.2 (2016\-06\-01)
-.INDENT 0.0
-.IP \(bu 2
-Add reST\(aqs \fB::\fP marker support
-.IP \(bu 2
-Add options to disable emphasis by underscore (\fB_\fP or \fB__\fP)
-.UNINDENT
-.SS Version 0.1.1 (2016\-05\-30)
-.INDENT 0.0
-.IP \(bu 2
-Fix Bug: when code or link is placed at the end of line, spaces to the next word is disappeared
-.UNINDENT
-.SS Version 0.1 (2016\-05\-30)
-.sp
-First public release.
-.INDENT 0.0
-.IP \(bu 2
-genindex
-.IP \(bu 2
-modindex
-.IP \(bu 2
-search
-.UNINDENT
-.SH AUTHOR
-Hiroyuki Takagi
-.SH COPYRIGHT
-2016, Hiroyuki Takagi
-.\" Generated by docutils manpage writer.
-.
diff --git a/dev-python/m2r/files/test.md b/dev-python/m2r/files/test.md
deleted file mode 100644
index e54ac950e527..000000000000
--- a/dev-python/m2r/files/test.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Title
-
-## SubTitle
-
-__content__
diff --git a/dev-python/m2r/files/test.rst b/dev-python/m2r/files/test.rst
deleted file mode 100644
index f45558879567..000000000000
--- a/dev-python/m2r/files/test.rst
+++ /dev/null
@@ -1,8 +0,0 @@
-
-Title
-=====
-
-SubTitle
---------
-
-**content**
diff --git a/dev-python/m2r/m2r-0.2.1.ebuild b/dev-python/m2r/m2r-0.2.1.ebuild
deleted file mode 100644
index 79af442c1931..000000000000
--- a/dev-python/m2r/m2r-0.2.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Markdown to reStructuredText converter"
-HOMEPAGE="https://github.com/miyakogi/m2r https://pypi.org/project/m2r/"
-SRC_URI="https://github.com/miyakogi/m2r/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="test"
-
-RDEPEND="
-	dev-python/docutils[${PYTHON_USEDEP}]
-	<dev-python/mistune-2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pygments[${PYTHON_USEDEP}]
-	)
-	${RDEPEND}
-"
-
-PATCHES=(
-	# pulled from upstream git
-	"${FILESDIR}/m2r-0.2.1-upstream-fix.patch"
-	"${FILESDIR}/m2r-0.2.1-tests.patch"
-	# skip tests that need internet
-	"${FILESDIR}/m2r-0.2.1-tests-network.patch"
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# fix a Q/A violation, trying to install the tests as an independant package
-	sed -e "s/packages=\['tests'\],/packages=[],/" -i setup.py
-	# add missing test files
-	cp "${FILESDIR}/"test.md tests/ || die
-	cp "${FILESDIR}/"test.rst tests/ || die
-	cp "${FILESDIR}/"m2r.1 "${S}" || die
-
-	# in python 3.10, the text changed from "optional arguments" to "options".
-	# the test matches on the concrete string, make it match on the part that is shared
-	# by both versions
-	sed -e 's/optional arguments:/option/' -i tests/test_cli.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	doman m2r.1
-}
diff --git a/dev-python/m2r/metadata.xml b/dev-python/m2r/metadata.xml
deleted file mode 100644
index a46a0025507c..000000000000
--- a/dev-python/m2r/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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>
-  <maintainer>
-   <email>miyako.dev@gmail.com</email>
-   <name>Hiroyuki Takagi</name>
-  </maintainer>
- </upstream>
- <origin>gentoo-staging</origin>
- <stabilize-allarches/>
-</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/mdx_gh_links/mdx_gh_links-0.2-r1.ebuild b/dev-python/mdx_gh_links/mdx_gh_links-0.2-r1.ebuild
index 7aa9ab657b1c..f7fcf7c4f658 100644
--- a/dev-python/mdx_gh_links/mdx_gh_links-0.2-r1.ebuild
+++ b/dev-python/mdx_gh_links/mdx_gh_links-0.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	dev-python/markdown[${PYTHON_USEDEP}]
diff --git a/dev-python/meson-python/meson-python-0.6.0.ebuild b/dev-python/meson-python/meson-python-0.6.0-r1.ebuild
index 983ffbd8ffc5..9cde3cc82ecd 100644
--- a/dev-python/meson-python/meson-python-0.6.0.ebuild
+++ b/dev-python/meson-python/meson-python-0.6.0-r1.ebuild
@@ -26,12 +26,12 @@ RDEPEND="
 	>=dev-python/pyproject-metadata-0.5.0[${PYTHON_USEDEP}]
 	>=dev-python/tomli-1.0.0[${PYTHON_USEDEP}]
 	>=dev-util/meson-0.60.0[${PYTHON_USEDEP}]
+	dev-util/patchelf
 "
 BDEPEND="
 	test? (
 		dev-python/GitPython[${PYTHON_USEDEP}]
 		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-util/patchelf
 	)
 "
 
diff --git a/dev-python/mkdocs-bootstrap/mkdocs-bootstrap-1.1-r2.ebuild b/dev-python/mkdocs-bootstrap/mkdocs-bootstrap-1.1-r2.ebuild
index 8f4c790c6034..f6a306127f0e 100644
--- a/dev-python/mkdocs-bootstrap/mkdocs-bootstrap-1.1-r2.ebuild
+++ b/dev-python/mkdocs-bootstrap/mkdocs-bootstrap-1.1-r2.ebuild
@@ -15,6 +15,6 @@ SRC_URI="https://github.com/mkdocs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="dev-python/mkdocs"
diff --git a/dev-python/mkdocs-bootswatch/mkdocs-bootswatch-1.1-r2.ebuild b/dev-python/mkdocs-bootswatch/mkdocs-bootswatch-1.1-r2.ebuild
index ae7feec1f4f9..dee6903eb8fd 100644
--- a/dev-python/mkdocs-bootswatch/mkdocs-bootswatch-1.1-r2.ebuild
+++ b/dev-python/mkdocs-bootswatch/mkdocs-bootswatch-1.1-r2.ebuild
@@ -15,6 +15,6 @@ SRC_URI="https://github.com/mkdocs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="dev-python/mkdocs"
diff --git a/dev-python/mkdocs-material/mkdocs-material-8.2.16.ebuild b/dev-python/mkdocs-material/mkdocs-material-8.2.16.ebuild
index c6c3069f44ba..84861a8e0589 100644
--- a/dev-python/mkdocs-material/mkdocs-material-8.2.16.ebuild
+++ b/dev-python/mkdocs-material/mkdocs-material-8.2.16.ebuild
@@ -27,7 +27,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/jinja-2.11.1[${PYTHON_USEDEP}]
diff --git a/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.5.0-r2.ebuild b/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.5.0-r2.ebuild
index bf375c6dd026..b25df9363d42 100644
--- a/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.5.0-r2.ebuild
+++ b/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.5.0-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 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/mkdocs/mkdocs-1.3.0-r1.ebuild b/dev-python/mkdocs/mkdocs-1.3.0-r1.ebuild
index 36c30f5ab07e..50d54fc9adce 100644
--- a/dev-python/mkdocs/mkdocs-1.3.0-r1.ebuild
+++ b/dev-python/mkdocs/mkdocs-1.3.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 IUSE="doc"
 
diff --git a/dev-python/moto/moto-3.1.12.ebuild b/dev-python/moto/moto-3.1.12.ebuild
index 60f4306b0f98..d394600931ba 100644
--- a/dev-python/moto/moto-3.1.12.ebuild
+++ b/dev-python/moto/moto-3.1.12.ebuild
@@ -14,7 +14,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/openapi-schema-validator/openapi-schema-validator-0.3.0.ebuild b/dev-python/openapi-schema-validator/openapi-schema-validator-0.3.0.ebuild
index 4dde56fa5b8b..f8f00f379703 100644
--- a/dev-python/openapi-schema-validator/openapi-schema-validator-0.3.0.ebuild
+++ b/dev-python/openapi-schema-validator/openapi-schema-validator-0.3.0.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/openapi-spec-validator-0.4.0.ebuild b/dev-python/openapi-spec-validator/openapi-spec-validator-0.4.0.ebuild
index d4897f1c8804..cda4f5f60657 100644
--- a/dev-python/openapi-spec-validator/openapi-spec-validator-0.4.0.ebuild
+++ b/dev-python/openapi-spec-validator/openapi-spec-validator-0.4.0.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/jsonschema-3.2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pyfeyn/Manifest b/dev-python/pyfeyn/Manifest
deleted file mode 100644
index 4744d3b6dac2..000000000000
--- a/dev-python/pyfeyn/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST pyfeyn-1.0.0.tar.gz 27316 BLAKE2B f1ece2e64be35f6e64dbe539406462c1802bb0149577662a92658769c1b347c2d98786cd83998e8887cc609f8ffa5aac3e3c995c253f54badd5bed43050dbf0f SHA512 edecbb61cbc63adb5d218cd53e45568f42aa018875bd57485afe612080300a16dd93d1dd0a1286b040a27aaf727a9e35e210f2a2edccaf9e6e114301a91c839a
diff --git a/dev-python/pyfeyn/files/pyfeyn-1.0.0.patch b/dev-python/pyfeyn/files/pyfeyn-1.0.0.patch
deleted file mode 100644
index 0b4c29e74033..000000000000
--- a/dev-python/pyfeyn/files/pyfeyn-1.0.0.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -r -U1 pyfeyn-1.0.0.orig/pyfeyn/feynml.py pyfeyn-1.0.0/pyfeyn/feynml.py
---- pyfeyn-1.0.0.orig/pyfeyn/feynml.py	2016-02-09 22:48:29.000000000 +0100
-+++ pyfeyn-1.0.0/pyfeyn/feynml.py	2016-02-14 13:11:16.034537778 +0100
-@@ -257,3 +257,3 @@
-         if self.root.tag != "feynml":
--            raise "FeynML Error: <feynml> must be root element" % self.root.tag
-+            raise Exception("FeynML Error: <feynml> must be root element" % self.root.tag)
-         for element in self.root:
-@@ -266,3 +266,3 @@
-             else:
--                raise "FeynML Error: invalid top-level tag <%s>" % element.tag
-+                raise Exception("FeynML Error: invalid top-level tag <%s>" % element.tag)
- 
-@@ -328,3 +328,3 @@
-             except:
--                raise "FeynML Error: invalid bend amount %s for <propagator> element"%element.attrib["bend"]
-+                raise Exception("FeynML Error: invalid bend amount %s for <propagator> element"%element.attrib["bend"])
-         if "style" in element.attrib:
diff --git a/dev-python/pyfeyn/pyfeyn-1.0.0-r2.ebuild b/dev-python/pyfeyn/pyfeyn-1.0.0-r2.ebuild
deleted file mode 100644
index 2b50a38fb3c9..000000000000
--- a/dev-python/pyfeyn/pyfeyn-1.0.0-r2.ebuild
+++ /dev/null
@@ -1,22 +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} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python package for drawing Feynman diagrams"
-HOMEPAGE="http://pyfeyn.hepforge.org/ https://pypi.org/project/pyfeyn/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="latex"
-
-DEPEND=""
-RDEPEND=">=dev-python/pyx-0.15[${PYTHON_USEDEP}]
-	latex? ( dev-texlive/texlive-mathscience )"
-
-PATCHES=( "${FILESDIR}"/${P}.patch )
diff --git a/dev-python/pygit2/pygit2-1.9.2.ebuild b/dev-python/pygit2/pygit2-1.9.2.ebuild
index 25f5c2ac9b76..af4e3b1d536b 100644
--- a/dev-python/pygit2/pygit2-1.9.2.ebuild
+++ b/dev-python/pygit2/pygit2-1.9.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 DEPEND="
 	=dev-libs/libgit2-1.4*:=
diff --git a/dev-python/pyproject-fmt/Manifest b/dev-python/pyproject-fmt/Manifest
new file mode 100644
index 000000000000..0b4338fc9ea1
--- /dev/null
+++ b/dev-python/pyproject-fmt/Manifest
@@ -0,0 +1 @@
+DIST pyproject-fmt-0.3.3.gh.tar.gz 14399 BLAKE2B 82af6d6c4424f83ed9a5539d64bfd517cf08df4bb14b7f1321a379a4d87d140f1518444b503731344e5fdbb4b94d92ce23605fe2a1cc978d26901eae98a31b8c SHA512 49c4648e140b34a6d2f27cc01be7253693e79687f2ff8dbcae5ca3cc64c14f5945f942ffb42d1d286ff221e5aaed22dc1f9953216f49232ce311c4c18130754e
diff --git a/dev-python/pyfeyn/metadata.xml b/dev-python/pyproject-fmt/metadata.xml
index 0722f3e71a77..7ad11570cc7d 100644
--- a/dev-python/pyfeyn/metadata.xml
+++ b/dev-python/pyproject-fmt/metadata.xml
@@ -1,13 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
- <maintainer type="person">
-  <email>grozin@gentoo.org</email>
-  <name>Andrey Grozin</name>
- </maintainer>
  <maintainer type="project">
   <email>python@gentoo.org</email>
-  <name>Python</name>
  </maintainer>
  
  <origin>gentoo-staging</origin>
diff --git a/dev-python/pyproject-fmt/pyproject-fmt-0.3.3.ebuild b/dev-python/pyproject-fmt/pyproject-fmt-0.3.3.ebuild
new file mode 100644
index 000000000000..a476bfd7a730
--- /dev/null
+++ b/dev-python/pyproject-fmt/pyproject-fmt-0.3.3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 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} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Format your pyproject.toml file"
+HOMEPAGE="
+	https://github.com/tox-dev/pyproject-fmt/
+	https://pypi.org/project/pyproject-fmt/
+"
+SRC_URI="
+	https://github.com/tox-dev/pyproject-fmt/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
+	>=dev-python/tomlkit-0.10[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/pytest-mock-3.7[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/pytest-mock/Manifest b/dev-python/pytest-mock/Manifest
index c1a39aec7112..97f5e4ef533c 100644
--- a/dev-python/pytest-mock/Manifest
+++ b/dev-python/pytest-mock/Manifest
@@ -1 +1,2 @@
 DIST pytest-mock-3.7.0.tar.gz 29311 BLAKE2B 27227b66008c70c4016c8e15d0021a67e84730a8b49c5664dc4f29e16d5f163df293269ab332707e44b7a0b182e15e20ab0ebaf4b9d923eb911083377972dad1 SHA512 6ba69e86bac8a430a9f1f1c615ad21f505b87848ac50fc551bc02f81306bf8769fd015615d96085d87d4c695c24b0686a95116721358687b48b64de5d0ae6901
+DIST pytest-mock-3.8.1.tar.gz 27671 BLAKE2B 6bb4a3d752ae0f4e751cb50fd6018802bb7f3cee53429693161185ef369bad8addd8637d2526750fcf9ddbe9205da3d1d615efa19b1d58ae71603ca3902c67a6 SHA512 db8c0e2cbb7f8741569035a4e6ab9335ec0b03e05f0df07de0de8dad769974f96752c15d85c439da432623b51296b88970e3e29a212930e2bac33ed47d6055f3
diff --git a/dev-python/pytest-mock/pytest-mock-3.8.1.ebuild b/dev-python/pytest-mock/pytest-mock-3.8.1.ebuild
new file mode 100644
index 000000000000..6e9f0a8e51b0
--- /dev/null
+++ b/dev-python/pytest-mock/pytest-mock-3.8.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Thin-wrapper around the mock package for easier use with pytest"
+HOMEPAGE="
+	https://github.com/pytest-dev/pytest-mock/
+	https://pypi.org/project/pytest-mock/
+"
+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 ~x64-macos"
+
+RDEPEND="
+	>=dev-python/pytest-6[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=pytest_mock,pytest_asyncio.plugin
+	local EPYTEST_DESELECT=()
+
+	if has_version dev-python/mock; then
+		EPYTEST_DESELECT+=(
+			tests/test_pytest_mock.py::test_standalone_mock
+		)
+	fi
+
+	epytest --assert=plain
+}
diff --git a/dev-python/pytest-skip-markers/pytest-skip-markers-1.3.0-r1.ebuild b/dev-python/pytest-skip-markers/pytest-skip-markers-1.3.0-r1.ebuild
index e52e64549f4d..a44a5090e8ef 100644
--- a/dev-python/pytest-skip-markers/pytest-skip-markers-1.3.0-r1.ebuild
+++ b/dev-python/pytest-skip-markers/pytest-skip-markers-1.3.0-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/pytest-6.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/scipy/Manifest b/dev-python/scipy/Manifest
index 238fc4ae29ac..3155ebc0d471 100644
--- a/dev-python/scipy/Manifest
+++ b/dev-python/scipy/Manifest
@@ -1,3 +1,4 @@
 DIST scipy-1.8.1.tar.gz 38196215 BLAKE2B 180ae646adba2031a4bf99cd4feefe652b8e340110b3b2872e61aa1083054aadf369c7e3b3e3fd8fb71fcd831c95841d2dadd1c71e35e5f7d95800e5551173f0 SHA512 f6fc71c209991fe82baa4b10d8ade0deb1057f6f5942a91dfb7ae45f3eb78a4535efa2861badf5e2d37239fa99dbd99de760aa7e4854b95991ade0263004e7ea
+DIST scipy-1.9.0rc1.tar.gz 42045828 BLAKE2B 8ecb112f611d52a69564329764b63d6f97bdcf6ba2fedc32134fb9f0da0c7f91d8507136bd81e2193c8a796273019cf2cf1a0f6009f6ac0803924a27ad216c37 SHA512 74d0ec0b94d33da683549b9c56966ec58dc807a5b60101413530501d2b1e789209b1b0e6cbca0a3bd0317dd0911406efc900dee5f90f1ea71c9aefa00f4c2dbe
 DIST scipy-html-1.8.1.zip 37060661 BLAKE2B 2fa617c58eb47463f8a61f9798b32c6da255d26b8e86c1558e427a715093f5a29ced3847ab6ecfe88ce1017664f36ac3e9fa9bbf72ede7e0fd3812b5f41fe933 SHA512 95153dc1f404aa64898a700c94c0deea3ca842c3152167d0987edabcf4a8eba16b6c8e6bc38a6775a849dc621e6a21434baf53d1669b1865fa5049cffa4387ac
 DIST scipy-ref-1.8.1.pdf 35025868 BLAKE2B 9221755d2dc69b8623271f75ff3078a0a4410fe9ff69ee317b40bf145af7da21a7f5f4b6b67820d8bb2878f83b7014f1ea7c2f0e026afb716da0479d394505e2 SHA512 8f27dcb9dd1030e15266389af21a1475ecfec5ea777fb2dbcf8db8d3398ac6e45c7040b8d6dbaffd29be3920925427be7c55efdc8094d670c857edfdab7f7728
diff --git a/dev-python/scipy/scipy-1.9.0_rc1.ebuild b/dev-python/scipy/scipy-1.9.0_rc1.ebuild
new file mode 100644
index 000000000000..8659062ebafb
--- /dev/null
+++ b/dev-python/scipy/scipy-1.9.0_rc1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=meson-python
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit fortran-2 distutils-r1 multiprocessing
+
+DESCRIPTION="Scientific algorithms library for Python"
+HOMEPAGE="
+	https://scipy.org/
+	https://github.com/scipy/scipy/
+	https://pypi.org/project/scipy/
+"
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+
+	# Need submodules, so git for now.
+	EGIT_REPO_URI="https://github.com/scipy/scipy"
+	EGIT_BRANCH="maintenance/$(ver_cut 1-2).x"
+	EGIT_SUBMODULES=( '*' )
+else
+	# Upstream is often behind with doc updates
+	DOC_PV=1.8.1
+	MY_PV=${PV/_rc/rc}
+	MY_P=${PN}-${MY_PV}
+
+	SRC_URI="
+		mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz
+		doc? (
+			https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-html-${DOC_PV}.zip
+			https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-ref-${DOC_PV}.pdf
+		)"
+	S="${WORKDIR}"/${MY_P}
+
+	if [[ ${PV} != *rc* ]] ; then
+		KEYWORDS="~amd64 ~arm ~arm64 -hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	fi
+fi
+
+LICENSE="BSD LGPL-2"
+SLOT="0"
+IUSE="doc +sparse"
+
+DEPEND="
+	>=dev-python/numpy-1.17.3[lapack,${PYTHON_USEDEP}]
+	sci-libs/arpack:0=
+	virtual/cblas
+	virtual/lapack
+	sparse? ( sci-libs/umfpack:0= )"
+RDEPEND="${DEPEND}
+	dev-python/pillow[${PYTHON_USEDEP}]"
+# TODO: restore pythran optionality?
+BDEPEND="
+	dev-lang/swig
+	>=dev-python/cython-0.29.18[${PYTHON_USEDEP}]
+	dev-python/pybind11[${PYTHON_USEDEP}]
+	dev-python/pythran[${PYTHON_USEDEP}]
+	dev-util/patchelf
+	virtual/pkgconfig
+	doc? ( app-arch/unzip )
+	test? ( dev-python/pytest-xdist[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.9.9999-meson-options-lapack.patch
+)
+
+distutils_enable_tests pytest
+
+python_test() {
+	cd "${T}" || die
+
+	epytest -n "$(makeopts_jobs)" --pyargs scipy
+}
diff --git a/dev-python/setuptools-declarative-requirements/setuptools-declarative-requirements-1.2.0-r2.ebuild b/dev-python/setuptools-declarative-requirements/setuptools-declarative-requirements-1.2.0-r2.ebuild
index 4545f8c46a48..e81013d54b6a 100644
--- a/dev-python/setuptools-declarative-requirements/setuptools-declarative-requirements-1.2.0-r2.ebuild
+++ b/dev-python/setuptools-declarative-requirements/setuptools-declarative-requirements-1.2.0-r2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 RDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-openapi/Manifest b/dev-python/sphinxcontrib-openapi/Manifest
deleted file mode 100644
index ff4f63cc2f1f..000000000000
--- a/dev-python/sphinxcontrib-openapi/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST sphinxcontrib-openapi-0.7.0.tar.gz 193897 BLAKE2B c0f1c46c6e8c67ddf95d163a68f5e22e6f2dff6622a3c21651b301dc1266b53b088d1b882e5e3347fad6347b86392bc9428b56f537c1d2320e7d9cd113c478f7 SHA512 36a7b6473b43af8d6fe2cf1bf22fb90848343911f69414cd742b942ff2ea33ac5ffba79c516dbb076b87c2a6e7e44d6958796daf06c9245a7184bfb6fdb53569
diff --git a/dev-python/sphinxcontrib-openapi/sphinxcontrib-openapi-0.7.0-r1.ebuild b/dev-python/sphinxcontrib-openapi/sphinxcontrib-openapi-0.7.0-r1.ebuild
deleted file mode 100644
index ca87d5ee183c..000000000000
--- a/dev-python/sphinxcontrib-openapi/sphinxcontrib-openapi-0.7.0-r1.ebuild
+++ /dev/null
@@ -1,49 +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_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenAPI (fka Swagger) spec renderer for Sphinx"
-HOMEPAGE="
-	https://pypi.org/project/sphinxcontrib-openapi/
-	https://github.com/sphinx-contrib/openapi/
-"
-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="
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-httpdomain[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/jsonschema[${PYTHON_USEDEP}]
-	dev-python/m2r[${PYTHON_USEDEP}]
-	dev-python/picobox[${PYTHON_USEDEP}]
-	dev-python/deepmerge[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/responses[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_compile() {
-	distutils-r1_python_compile
-	find "${BUILD_DIR}" -name '*.pth' -delete || die
-}
-
-python_test() {
-	distutils_write_namespace sphinxcontrib
-	cd "${T}" || die
-	epytest "${S}"/tests
-}
diff --git a/dev-python/xcffib/xcffib-0.11.1-r1.ebuild b/dev-python/xcffib/xcffib-0.11.1-r1.ebuild
index 97de4293a4e2..9cd58748840d 100644
--- a/dev-python/xcffib/xcffib-0.11.1-r1.ebuild
+++ b/dev-python/xcffib/xcffib-0.11.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 DEPEND="x11-libs/libxcb"
 RDEPEND="
diff --git a/dev-python/xunitparser/xunitparser-1.3.4.ebuild b/dev-python/xunitparser/xunitparser-1.3.4.ebuild
index 9668d1b2162d..48d689a191c4 100644
--- a/dev-python/xunitparser/xunitparser-1.3.4.ebuild
+++ b/dev-python/xunitparser/xunitparser-1.3.4.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{7,8,9,10} )
 inherit distutils-r1
 
 DESCRIPTION="Read JUnit/XUnit XML files and map them to Python objects"
-HOMEPAGE="http://gitlab.com/woob/xunitparser/"
+HOMEPAGE="https://gitlab.com/woob/xunitparser/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"