gentoo auto-resync : 25:10:2022 - 09:53:29

22 files changed, 29 insertions, 310 deletions

diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index f9a6e0234f78..bb48e30bbcb4 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/aiohttp/Manifest b/dev-python/aiohttp/Manifest
index 9dbff6b41289..414f80714b36 100644
--- a/dev-python/aiohttp/Manifest
+++ b/dev-python/aiohttp/Manifest
@@ -1,5 +1,5 @@
 DIST aiohttp-3.8.1.tar.gz 7324180 BLAKE2B 99f85b8510782a31de2d2f6c8efa65ef5c5cde600a5c5f49d6362d5833a0443b9adcaed9beb27c5d8502aca37af154b06017f48836b73d4c61d78204b62b7f05 SHA512 3611549393e50c8d30426aee9ddd23794a71ddefe4384eb549049b93e452fafb38de7ad900737213b61fbe717bd85035a780c1622593eae250328f17d484a0a7
 DIST aiohttp-3.8.3.tar.gz 7337480 BLAKE2B 28d2b5bf6dd6f19506127747511e006c22fcb59959ab090bdc53ca5ee0f7f186aedb0c8b4103c2ea52399dc998fa2e6d3f872239223cf72629a1168e3950f1f8 SHA512 248c232604c91442b2fc9fa55fbf7df8e3af56dcf4cd9c516414a3a738c5c60a8a06395cd9c6e2c8ea9884728aea757423735c7b9be889e6f17e3ee6395a2f64
 EBUILD aiohttp-3.8.1-r1.ebuild 3657 BLAKE2B 2da81b97e0b3f1d167557b6d675acd9a857e45b45166e924493900eaf395e77cee71d45b2f0c7e428ce7a0f22bd47cbfabc49fbb9e462216029a271a57dc5f7c SHA512 d9b644e44be853ab68704d175ac8a99bb292fd09fc8097c356ee0f8b06335420c3cec66bee3d20a554c0413d278e35c25cda08251fc5e00fcca20f2f68cb0e69
-EBUILD aiohttp-3.8.3.ebuild 2927 BLAKE2B cb43525209573c9c40e756c1b827739d2bcc5c4e3c9ebe71da6208ae55bdd1d9f00a2ca9ceb5cabafe11c36a956b78dd884709fc215c510b1fcf4d6a0e7d2808 SHA512 5bd0115445b19e4099b3b613eddc00d3690456149e09b47ab214c39f53fbab62c8197602ea83d5b853daa70db2f31ea5f1b4723eb99f10538c72c549f274fd03
+EBUILD aiohttp-3.8.3.ebuild 2924 BLAKE2B 34540155f07da927653d82daa23124374ef67c64fa6c9fb416b548db1ed0d8d567e65e36d2255157e997b2a1d7fd40d08bea4b7bb992024cef573e89fa604626 SHA512 05011da423a5587fa9b402605260a30683b589210d2f6a3e57ae478c27767d76bb570670f4abebde7e7e246f340ba94d4d4801d5014d348f5c8acbf6dffc32a1
 MISC metadata.xml 490 BLAKE2B 5233af0b5e2668b1eb62278b05b62f24f1ab90f6d05b20dd9f1c5b54b846919c3fa28b843df28f5bfa320996d46de0e74c7a28bd0bef02aaaca14b1cec52baba SHA512 9b701c5c5a22b6aa94977a67bc40f3dc9df8337556952658a2a17ecaaa471cd7f7b5b8bf3a0088208087677555f0cbb8760c091b03b96ee70affe3e2b84cf6d5
diff --git a/dev-python/aiohttp/aiohttp-3.8.3.ebuild b/dev-python/aiohttp/aiohttp-3.8.3.ebuild
index d2bdc579f31b..2b4af1cf66e3 100644
--- a/dev-python/aiohttp/aiohttp-3.8.3.ebuild
+++ b/dev-python/aiohttp/aiohttp-3.8.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc ~x86"
 IUSE="test-rust"
 
 RDEPEND="
diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index 49c23b79f20b..be889fb34074 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -6,11 +6,9 @@ DIST freetype-2.6.1.tar.gz 2302080 BLAKE2B 6a5fb98e5fa6cf4b7d7533ad44e364227d8c2
 DIST matplotlib-3.5.1.tar.gz 35320470 BLAKE2B ebf69b62ac587c61ecf8442abaab302019f63a3c9d8db6f7f7fb32f4d14da554fd8305ea6dfed2ff86a5af4e7e4d2b81f14802692fe50c986f7da8545bd26c00 SHA512 a317dbd748e5fc1fafcf80020cb6d38a8888431487beded97acd59d759e67e54f59506b642e4a03d4351c1ac050d15e3f2e2b5443433debc78ddad52881c8d82
 DIST matplotlib-3.5.2.tar.gz 35210006 BLAKE2B e3f90a0cf1d28f041a8cdd6920a8a4efe16169bb4acf85f7b2562196db306eeb692218728ea33c7b62214e7894e83a104954cbef38c45ccbb4f630bd35c0c36b SHA512 32844dfa85dbc43360c1773d748a58d2ab089111c51c825da62956c778a0eeaf10ca33a5c6c094295388a80d5873a2e1b17484e02b653e9e8e5ba98659329974
 DIST matplotlib-3.5.3.tar.gz 35236343 BLAKE2B 0d3f4e15295afe2c737e441325206e77c520a514bc87ab1eebef624f89896a2cf609e8d57b8fa8ef28ecf8c836e20cb296adaa95f81dbfcf3f2a45631e3dd02c SHA512 f431d3046e9c5fbe5d44a16a762e9a178ba34380974964660eaf3681671178866a63b3bad9aad8d3ad423926f7db2965d514e9b1489e3a824a4532a01f0e0670
-DIST matplotlib-3.6.0.tar.gz 35749946 BLAKE2B 1e2e80e124ef1a0a1843ba077c3c933b55a77062fd5cc49d304dd2d12f6323ff60f32113dc0c57388796682841367734283ea5c82e149d6fa3f379516800d131 SHA512 ea8cb274b9aacb4cc9c3b52cf5eaf881074dc73840cba160289e85173d763e96d3ea3628c5cb53f765092f53b9e3d05977281cc0c9d6756529601ca336ec0e27
 DIST matplotlib-3.6.1.tar.gz 35826557 BLAKE2B b30710436a773298dcdf233e592656d9815f55f0daab0cc28811b9adbfd3b2ede08f4c13e0dfa43c5fb283bc1ba96ea793084f3d65ba13b9697d14ffa406a273 SHA512 40b148fe4574eea88e7e74c2844a4811c71651602bd7e0a863482571bfa216c01d4f5fcd36add14af82c5cacdb6ae9d441ed251ee5239d06bcc8d40c9ee8841b
 EBUILD matplotlib-3.5.1-r2.ebuild 7230 BLAKE2B 003f7562ce03d398eecf1bc7cb9485b9109e6ab88a8277dcc26e34ecaee2e452f4af6ab34ff5c8de06c3c1548032cda3ecda9bf8bae635cceb4b4d2d8039b1a7 SHA512 7a325460d335521a132eb30594ea36a910c153f19ecac66303402e2821d0ab130f1fa91a69ae90a6a1746378876234f54d8c05c0695c09a827453c83e7d0b345
-EBUILD matplotlib-3.5.2-r3.ebuild 7391 BLAKE2B 59b395f4d3384793dd72c633e98ea71f64656042b398a2af2d25689285534c047e572779f4e966913c912870c747488d6e9d062766d980e7dd53fdad01647188 SHA512 2dc2ca8a5a7cd7fd679800bfef9208e7679b9bcb4bd267993d9369f00a2c09e6ca0f1abd30d9dfd3712e869b205e1945f29f008f41c5c77e7c506c10fd2fdea2
-EBUILD matplotlib-3.5.3.ebuild 7446 BLAKE2B c49d5f0ce2d14d6c621746217415103d06a1cc6d0c0d682c373eec20d0af0167a55b00ba582df7d7f3745de00692e254547e721aa25dc363261ffd6297424274 SHA512 a474eafc8ec34b70535e889b4ce5606a2ad3a682308346bb5b26868f13a84e31291fdd77b3f522883faefafa1f4f0d6ce2cf399bc9bacbc584ced8a3fabf07da
-EBUILD matplotlib-3.6.0-r1.ebuild 7488 BLAKE2B 83c3401cb7d1bb2d67f2930186ab777bb01f7054677b345ccdaae018fde7637dd492ed447c883f0c020a1cf6eeede3b7b4b09c860413e8236b5278444b3da907 SHA512 27e71506da65ca7bf88bb8b13e276711f3229f9bf8f5b7b2c7e5cd7fe8b420ad9183841b354d0bb89edacfa951eaa1e7085380b176bdd999ed98779334b55f9c
+EBUILD matplotlib-3.5.2-r3.ebuild 7389 BLAKE2B 0d41fcdbb4de4fe4ff68bbe7e77b931cce804cb2ba2ae62c3f7a597db6055b8a3d4e9bb49a084a30688f775a382a46ebb7fd8c1ce1cc914ee0ca2ab6a519b23c SHA512 0812494f86e37a65c4e800f9732437089d556fd866fad6084ad2bc1dd997ae53b5e9b7f431f5be73e8d24efc6afab770c211b8922c6450f4b1cd08ae55eff8c1
+EBUILD matplotlib-3.5.3.ebuild 7442 BLAKE2B d836df9fd184d6f55100527f9ff037e8707e2dd23c76b69beeafcff68c78d1bbbfc3de803b1a7ccdb6e4231d56fd97366495f162f2f9d1142979febf282f4eb3 SHA512 524ced6de727064ed0d2171dc410af864621842d189436941d90761abd3e7318d1704c7f8801ced1049235ab61c0548107805d3d6342f0dd3d085fe4fe657ced
 EBUILD matplotlib-3.6.1.ebuild 7493 BLAKE2B 12e64e26d7f46136281a97b780e8c11e2c611d2e242977dafde4e1f0e4fba09cc336e8b399efdf4353715f395b82ae8af0ea9262380ed4cd66fd5e306ca0b2d7 SHA512 7abb86a401f296ed6a9fd1ff526fa86ae3fcbd4f55c55facaba8e395d1cf19efe14e786e3eb181b272285b1227da7c94f63973c5c543dd5d99fb3b6ce66cc663
 MISC metadata.xml 1074 BLAKE2B 1d7dce116e09939378872c2eaf5153948b7e934626110eb4899d0dfc2781429522328f1c4efd2c40f829da64e19bed8f9fbd1b8907a6e74a5fd54587c1d29e5b SHA512 e344bfc813e09c24a8edfa9c062eb2a6c44535559370f508a27a2de20c6ab92aeb48bc8daf9c357178e513eb2474a33782e4098c0f3bcbb84b11f7388ef1a704
diff --git a/dev-python/matplotlib/matplotlib-3.5.2-r3.ebuild b/dev-python/matplotlib/matplotlib-3.5.2-r3.ebuild
index 841c96b346dd..29caeb903c5c 100644
--- a/dev-python/matplotlib/matplotlib-3.5.2-r3.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.5.2-r3.ebuild
@@ -30,7 +30,7 @@ SRC_URI="
 # Fonts: BitstreamVera, OFL-1.1
 LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 hppa ~ia64 ppc ~ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="cairo doc excel examples gtk3 latex qt5 tk webagg wxwidgets"
 
 # internal copy of pycxx highly patched
diff --git a/dev-python/matplotlib/matplotlib-3.5.3.ebuild b/dev-python/matplotlib/matplotlib-3.5.3.ebuild
index 161714fd0fee..d2ff210428bf 100644
--- a/dev-python/matplotlib/matplotlib-3.5.3.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.5.3.ebuild
@@ -30,7 +30,7 @@ SRC_URI="
 # Fonts: BitstreamVera, OFL-1.1
 LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="cairo doc excel examples gtk3 latex qt5 tk webagg wxwidgets"
 
 # internal copy of pycxx highly patched
diff --git a/dev-python/matplotlib/matplotlib-3.6.0-r1.ebuild b/dev-python/matplotlib/matplotlib-3.6.0-r1.ebuild
deleted file mode 100644
index b448a4981beb..000000000000
--- a/dev-python/matplotlib/matplotlib-3.6.0-r1.ebuild
+++ /dev/null
@@ -1,284 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-PYTHON_REQ_USE='tk?,threads(+)'
-
-inherit distutils-r1 flag-o-matic multiprocessing prefix toolchain-funcs \
-	virtualx
-
-FT_PV=2.6.1
-DESCRIPTION="Pure python plotting library with matlab like syntax"
-HOMEPAGE="
-	https://matplotlib.org/
-	https://github.com/matplotlib/matplotlib/
-	https://pypi.org/project/matplotlib/
-"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	test? (
-		https://downloads.sourceforge.net/project/freetype/freetype2/${FT_PV}/freetype-${FT_PV}.tar.gz
-	)
-"
-
-# Main license: matplotlib
-# Some modules: BSD
-# matplotlib/backends/qt4_editor: MIT
-# Fonts: BitstreamVera, OFL-1.1
-LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv"
-IUSE="cairo doc excel examples gtk3 latex qt5 tk webagg wxwidgets"
-
-# internal copy of pycxx highly patched
-#	dev-python/pycxx
-RDEPEND="
-	dev-python/certifi[${PYTHON_USEDEP}]
-	>=dev-python/contourpy-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/cycler-0.10.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/fonttools-4.22.0[${PYTHON_USEDEP}]
-	>=dev-python/kiwisolver-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.19[${PYTHON_USEDEP}]
-	>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
-	>=dev-python/pillow-7.1.1[jpeg,webp,${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.2.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.7[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
-	>=dev-python/six-1.14.0[${PYTHON_USEDEP}]
-	media-fonts/dejavu
-	media-fonts/stix-fonts
-	media-libs/freetype:2
-	media-libs/libpng:0
-	>=media-libs/qhull-2013:=
-	virtual/imagemagick-tools[jpeg,tiff]
-	cairo? (
-		dev-python/cairocffi[${PYTHON_USEDEP}]
-	)
-	excel? (
-		dev-python/xlwt[${PYTHON_USEDEP}]
-	)
-	gtk3? (
-		>=dev-python/pygobject-3.40.1-r1:3[cairo?,${PYTHON_USEDEP}]
-		x11-libs/gtk+:3[introspection]
-	)
-	latex? (
-		virtual/latex-base
-		app-text/dvipng
-		app-text/ghostscript-gpl
-		app-text/poppler[utils]
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-luatex
-		dev-texlive/texlive-xetex
-	)
-	qt5? (
-		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-	)
-	webagg? (
-		>=dev-python/tornado-6.0.4[${PYTHON_USEDEP}]
-	)
-	wxwidgets? (
-		$(python_gen_cond_dep '
-			dev-python/wxpython:*[${PYTHON_USEDEP}]
-		' python3_{8..10})
-	)
-"
-
-BDEPEND="
-	${RDEPEND}
-	>=dev-python/setuptools_scm-7[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	doc? (
-		>=app-text/dvipng-1.15-r1
-		>=dev-python/colorspacious-1.1.2[${PYTHON_USEDEP}]
-		>=dev-python/ipython-1.18.2[${PYTHON_USEDEP}]
-		>=dev-python/numpydoc-0.9.2[${PYTHON_USEDEP}]
-		>=dev-python/scipy-1.4.1[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-gallery-0.3.1-r1[${PYTHON_USEDEP}]
-		>=dev-python/xlwt-1.3.0-r1[${PYTHON_USEDEP}]
-		virtual/latex-base
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-latexrecommended
-		dev-texlive/texlive-luatex
-		dev-texlive/texlive-xetex
-		>=media-gfx/graphviz-2.42.3[cairo]
-	)
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		>=dev-python/pygobject-3.40.1-r1:3[cairo?,${PYTHON_USEDEP}]
-		>=dev-python/tornado-6.0.4[${PYTHON_USEDEP}]
-		x11-libs/gtk+:3[introspection]
-	)
-"
-
-distutils_enable_tests pytest
-
-use_setup() {
-	local uword="${2:-${1}}"
-	if use "${1}"; then
-		echo "${uword} = True"
-		echo "${uword}agg = True"
-	else
-		echo "${uword} = False"
-		echo "${uword}agg = False"
-	fi
-}
-
-python_prepare_all() {
-# Generates test failures, but fedora does it
-#	local PATCHES=(
-#		"${FILESDIR}"/${P}-unbundle-pycxx.patch
-#		"${FILESDIR}"/${P}-unbundle-agg.patch
-#	)
-#	rm -r agg24 CXX || die
-#	rm -r agg24 || die
-
-#	cat > lib/${PN}/externals/six.py <<-EOF
-#	from __future__ import absolute_import
-#	from six import *
-#	EOF
-
-	# Affects installed _version.py, bug #854600
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-	local PATCHES=(
-		"${FILESDIR}"/matplotlib-3.3.3-disable-lto.patch
-		"${FILESDIR}"/matplotlib-3.6.0-test.patch
-	)
-
-	sed \
-		-e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \
-		-i lib/matplotlib/{mathtext,fontconfig_pattern}.py \
-		|| die "sed pyparsing failed"
-	sed -i -e '/setuptools_scm/s:,<7::' setup.py || die
-
-	hprefixify setupext.py
-
-	rm -rf libqhull || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	append-flags -fno-strict-aliasing
-	append-cppflags -DNDEBUG  # or get old trying to do triangulation
-	tc-export PKG_CONFIG
-
-	unset DISPLAY # bug #278524
-	export XDG_RUNTIME_DIR="${T}/runtime-dir"
-	mkdir "${XDG_RUNTIME_DIR}" || die
-	chmod 0700 "${XDG_RUNTIME_DIR}" || die
-}
-
-python_configure() {
-	mkdir -p "${BUILD_DIR}" || die
-
-	# create setup.cfg (see setup.cfg.template for any changes).
-
-	# common switches.
-	cat > "${BUILD_DIR}"/setup.cfg <<- EOF || die
-		[directories]
-		basedirlist = ${EPREFIX}/usr
-		[provide_packages]
-		pytz = False
-		dateutil = False
-		[libs]
-		system_freetype = True
-		system_qhull = True
-		[packages]
-		tests = True
-		[gui_support]
-		agg = True
-		gtk = False
-		gtkagg = False
-		macosx = False
-		pyside = False
-		pysideagg = False
-		qt4 = False
-		qt4agg = False
-		$(use_setup cairo)
-		$(use_setup gtk3)
-		$(use_setup qt5)
-		$(use_setup tk)
-		$(use_setup wxwidgets wx)
-	EOF
-
-	if use gtk3 && use cairo; then
-		echo "gtk3cairo = True" >> "${BUILD_DIR}"/setup.cfg || die
-	else
-		echo "gtk3cairo = False" >> "${BUILD_DIR}"/setup.cfg || die
-	fi
-}
-
-wrap_setup() {
-	local MAKEOPTS=-j1
-	local -x MPLSETUPCFG="${BUILD_DIR}"/setup.cfg
-	"$@"
-}
-
-python_compile() {
-	wrap_setup distutils-r1_python_compile
-	find "${BUILD_DIR}" -name '*.pth' -delete || die
-}
-
-python_compile_all() {
-	if use doc; then
-		cd doc || die
-
-		VARTEXFONTS="${T}"/fonts \
-		emake SPHINXOPTS= O=-Dplot_formats=png:100 html
-	fi
-}
-
-src_test() {
-	mkdir build || die
-	ln -s "${WORKDIR}/freetype-${FT_PV}" build/ || die
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# broken by -Wdefault
-		"tests/test_rcparams.py::test_validator_invalid[validate_strlist-arg6-MatplotlibDeprecationWarning]"
-		"tests/test_rcparams.py::test_validator_invalid[validate_strlist-arg7-MatplotlibDeprecationWarning]"
-		tests/test_testing.py::test_warn_to_fail
-	)
-	[[ ${EPYTHON} == python3.11 ]] && EPYTEST_DESELECT+=(
-		# https://github.com/matplotlib/matplotlib/issues/23384
-		"tests/test_backends_interactive.py::test_figure_leak_20490[time_mem1-{'MPLBACKEND': 'qtagg', 'QT_API': 'PyQt5'}]"
-		"tests/test_backends_interactive.py::test_figure_leak_20490[time_mem1-{'MPLBACKEND': 'qtcairo', 'QT_API': 'PyQt5'}]"
-	)
-
-	# we need to rebuild mpl against bundled freetype, otherwise
-	# over 1000 tests will fail because of mismatched font rendering
-	grep -v system_freetype "${BUILD_DIR}"/setup.cfg \
-		> "${BUILD_DIR}"/test-setup.cfg || die
-	local -x MPLSETUPCFG="${BUILD_DIR}"/test-setup.cfg
-
-	esetup.py build -j1 --build-lib="${BUILD_DIR}"/test-lib
-	local -x PYTHONPATH=${BUILD_DIR}/test-lib:${PYTHONPATH}
-
-	# speed tests up
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	nonfatal epytest --pyargs matplotlib -m "not network" \
-		-p xdist.plugin -n "$(makeopts_jobs)" || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-
-	distutils-r1_python_install_all
-
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 6e5c277670d4..922c3aa1d7b3 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -23,8 +23,8 @@ DIST numpy-user-1.23.1.pdf 4123384 BLAKE2B d4587c9f979e1ef4734768598d6e106f2b4b0
 DIST numpy-user-1.23.3.pdf 4123384 BLAKE2B d4587c9f979e1ef4734768598d6e106f2b4b0c8222f901a6c4caf0920e41622201252c5bd172b16346e0357138b5ff27c59e56c851be5ae3b7712624bd9cc5b4 SHA512 58e1ab96d2cfbd96df205c86f0a1a09e204349f70d21df7f8481c21ded8b46f4b9ede3216d5cce6c2b9bfc0aacbecdfa198bdb2d4c258a0dd4acb6e3ba421f9c
 DIST numpy-user-1.23.4.pdf 4123384 BLAKE2B d4587c9f979e1ef4734768598d6e106f2b4b0c8222f901a6c4caf0920e41622201252c5bd172b16346e0357138b5ff27c59e56c851be5ae3b7712624bd9cc5b4 SHA512 58e1ab96d2cfbd96df205c86f0a1a09e204349f70d21df7f8481c21ded8b46f4b9ede3216d5cce6c2b9bfc0aacbecdfa198bdb2d4c258a0dd4acb6e3ba421f9c
 EBUILD numpy-1.21.5.ebuild 4250 BLAKE2B 566a16851c2b64a2960c578dd462380573c861ce31aae4ae04f298caa7be278a1d81bb315ae45d6d616d9169ce8c83c4e8308e979149b069f7aee909ef114fa5 SHA512 73185b6fb426e2c0851796ec9487992dfc5655f7b2e862ee881e9af2b9e8121beab5b81f315c91faf287f8aa50215956f5ae9298c8a16e7ad0ba8f5fd675bc50
-EBUILD numpy-1.22.4.ebuild 5018 BLAKE2B a3295f9dad57cd39b62c9095bc5c1e51274821e9747b8147559aab6a572e2761ecabfd10fa77c160e7c0bfd694dfb2ad0b51e2c6a4c1f8b89cb8db73af0c0af9 SHA512 1d8ceb254e27795b592aba6a1347047528d5e1990a339c94b480b0b59cd5470107efa9c61793dee5d0f75de84bd13016d59d837df7d52995f5a4a4540e7ef18f
-EBUILD numpy-1.23.1.ebuild 5066 BLAKE2B 4f5adb42a2631323eb676097ef6cfa343bd53944de342f382e76d4c93e7b9578dbe2f04959a00d17bb8b1a58ea08c4af2503e19bda6f6c1f1b5caab21a33e514 SHA512 d8d3e30fb62933b0907ef322bf5dec7331077cba94fc7cfe32dffdacf3f187d2575ccb85f3bc86eb34d4a085692f4f753153364ec05dbca734f369ffd943d734
-EBUILD numpy-1.23.3.ebuild 4898 BLAKE2B 7723f9258750349af1c391eb58741408aa6dae98b78a40052a4ebb7bd0e79c9e6ee35ebfd2a92d1cdad75ea569cf8830e3279e6e76b300fcf47ab6a797a44544 SHA512 1c295a8ae4ef69f3afa0022ef93912a33100315710ea3a2beaca4c7bd57b837e635b612e5ab3cf5565d78b6e68893a5b6c73e83f6ce20e7e396c4b67db2dbfcc
+EBUILD numpy-1.22.4.ebuild 5017 BLAKE2B f96fc50d46976f644412066a0ca32f3f6cbe68e3af54076bd9567a827d2929cc5789483c54656f51cee2f3153f28382a3901ad0a79ddaef84e552be2ebe8e961 SHA512 368980e6e319284d242669515c225766c56805f95d53ee259b0e88b394132a9d1b0fdaa58c0577c5e12a9282755ce39701f6a8d463792d7a5cc0dd3d3340c6c6
+EBUILD numpy-1.23.1.ebuild 5065 BLAKE2B e984f016156601966e6eb5b8cfe23459e47ae98ae913758da1c8597e5aac41426c11ab902d898798b7faa6d2627b90573f3dfefb516ed6b68657a6d9af0ee267 SHA512 3ff53ea10a7dbcbaa106002cf533cf3f0369409145a4ca9588505e75a55adda8c96fde3e2ece3eb91f30c00a3e8f5a3436f68073417ebdfa801bd1a436ec875f
+EBUILD numpy-1.23.3.ebuild 4896 BLAKE2B cb89f6fd839ea412a25830cc3c94f5b3faa6fc7b2db52ef9d7e5852ccd1825774e1d9df8de918bb0113877bc4a3d8acf56de5c74073db54ef9a7914e550fa61e SHA512 634586d63cdd62f6286a54109b2ca1e699668e8698ca4e21ee9e6726b2f46f2b47304036d3c87177b415c5657a0385792aef0c6a53da81364b9ca6a25a5af520
 EBUILD numpy-1.23.4.ebuild 4904 BLAKE2B dc24a0d2a22d985086a49bdaf0333cdae749fa6ea344252636eb0279dfb6a706cf9574cff1529b64918bc99b0bf0184f76fad4228aa25df22c34dae8ac328a73 SHA512 c4771518334b27985b86b1fc41d322e4523b8a35309052a07a506400b1355e48abe88667550dd69e8c0e6fb9d6481eb1c24cd6edd1aa08b603dc1bd433de087e
 MISC metadata.xml 932 BLAKE2B 7a4af31f613bab05ff542da48bf6ff1484d9df2459f559516e71329451dd739d3df0fead507c8033d94ab9ed516b68efe7f21819a8cd6ca303643d8c8bc34e86 SHA512 32cb8c1ab61521a02cbec38f6ea383f074e50d46aa3462ddcb85710f9d348e8e628cf2a5725e3cd921cc32f02885a1b5f02125639f0ec885384eeeff7f468a06
diff --git a/dev-python/numpy/numpy-1.22.4.ebuild b/dev-python/numpy/numpy-1.22.4.ebuild
index 7f1805a8fb6d..2be8c1d0c0d3 100644
--- a/dev-python/numpy/numpy-1.22.4.ebuild
+++ b/dev-python/numpy/numpy-1.22.4.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
 	)"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc lapack"
 
 RDEPEND="
diff --git a/dev-python/numpy/numpy-1.23.1.ebuild b/dev-python/numpy/numpy-1.23.1.ebuild
index 329105563e47..824af156fd66 100644
--- a/dev-python/numpy/numpy-1.23.1.ebuild
+++ b/dev-python/numpy/numpy-1.23.1.ebuild
@@ -29,7 +29,7 @@ SRC_URI="
 "
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc lapack"
 
 RDEPEND="
diff --git a/dev-python/numpy/numpy-1.23.3.ebuild b/dev-python/numpy/numpy-1.23.3.ebuild
index 4d97df85fe96..2026f4e14c27 100644
--- a/dev-python/numpy/numpy-1.23.3.ebuild
+++ b/dev-python/numpy/numpy-1.23.3.ebuild
@@ -29,7 +29,7 @@ SRC_URI="
 "
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc lapack"
 
 RDEPEND="
diff --git a/dev-python/pandas/Manifest b/dev-python/pandas/Manifest
index dbf8ffad54f2..8b703cef207e 100644
--- a/dev-python/pandas/Manifest
+++ b/dev-python/pandas/Manifest
@@ -3,6 +3,6 @@ DIST pandas-1.5.0.tar.gz 5191537 BLAKE2B c7dec1d0197e6ac860667177f0f255bb327dbd4
 DIST pandas-1.5.1.tar.gz 5199286 BLAKE2B 17d98870f3397d7a9289a18708021a614b1d456e2ea99dae8927727aabb8aab73bd31f25c3035947f8f4c38404e7d971bf999500b300307b19a2cf6029763d0e SHA512 e5f25f21f17f36c6488f14fbfa391beb9f1989652de01cb8346d2826dead9331fea27295ee1e6f42d0875f2f1a91fcd23d606edd339432589bca5ba8d89e5ecd
 EBUILD pandas-1.4.4.ebuild 6486 BLAKE2B 65421968a776be789bd034222242ec3ed5a43b25e0fbe7f136b20ed46d16f8bf99af85673a1544aceef25997fc761f7a558c10f9358b06061a654772529861b3 SHA512 78f9a087894510b87e777e6ed0c64d3c75b640858f8be52332767985dd111dca46d4338d40bfd662d0785d06e8f5609657108eae740442ae6edd0e8cdac9f5e7
 EBUILD pandas-1.5.0-r1.ebuild 6752 BLAKE2B cdf46e171d595990224a00261be8a70cf03c7bf4860d55ac04edf2a8fce8c92d77cc542814023ef9f1f775ed1689f98cbc3fa07dc09e4416a5ecf605e3be844f SHA512 3cb71918734101adf9c27ec6e3f72e41edb086b0a14fc48876bdb0c132f6aee8adc6914c86344319d4888050ad431f18481409198d5bcf7c15e546dac3204101
-EBUILD pandas-1.5.0.ebuild 6579 BLAKE2B 215cbfefa2456ab577cb13e687a034325afc4fdc184d3810dc8495e38588257c8f90f5a4de116f43072b808a1c6716b40759134ac6394cdb526fab5c041a45e4 SHA512 58a27b293a7da2ecf84631789357c22c32e108ee9d12b8385d3d0c4101d887f2d413db17e4013860589c0ccd4700a8d2232a659e16d5c278b8e71ae3ce2726dd
+EBUILD pandas-1.5.0.ebuild 6573 BLAKE2B 3a9802fed6b00bc865b8fdf3ceeb68c537979f83e38b4aab3fd06e8ddd66e41c88a5b7c87cafc214c25139dcddbf44484c1fd0b9f0647ba6f14a468a256a903a SHA512 db1eec6bc4a5309daae1752f41cd6c8476528a812fe9d3f948b1392e155202ca6711d7244db7d7c7f88998b557ccfdfd214f2ae3c79ba5b730d9f08c45d0954a
 EBUILD pandas-1.5.1.ebuild 6837 BLAKE2B d1e6ba85ce3fecfa09420bdab447bc213e7cddb16a34e10135f1d04c734c3fde91caa298fdfdf4c7b9935af623f9a6a4e6cc85cb73498c9f68a54f04bd40e652 SHA512 186326daf4876ca1762fef866b08694c834a41ee18132f14e9e8ec7f7dee40bdb932e833192ba1a3c9888e894feb91652bbb4676d96c4e2dd2981b3bbeebc942
 MISC metadata.xml 920 BLAKE2B d6bd854acdd851d578038657d91adaedf4f220dbdc5905ebba5e35e74437c6d5bc2384061f7796a6f359aa128c526485635debfd0e1a9646d09daed740167c87 SHA512 dcd949e89cae9df918acb3cf8be5ad8c396ee5e646d2179aa2b646fafa15ffc11e9ccf853df8d7fdcc787f88ce7063639d8d87715aaba943774edc8ad98b540a
diff --git a/dev-python/pandas/pandas-1.5.0.ebuild b/dev-python/pandas/pandas-1.5.0.ebuild
index c4c60fd4f595..47ce821852a3 100644
--- a/dev-python/pandas/pandas-1.5.0.ebuild
+++ b/dev-python/pandas/pandas-1.5.0.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/${P/_/}"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="doc full-support minimal test X"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/priority/Manifest b/dev-python/priority/Manifest
index 9e65793e5a5a..0004489dac6c 100644
--- a/dev-python/priority/Manifest
+++ b/dev-python/priority/Manifest
@@ -4,4 +4,4 @@ DIST priority-2.0.0.tar.gz 24792 BLAKE2B c230f74aba3153edafba4bf85965a726ac3d3f5
 EBUILD priority-1.3.0-r1.ebuild 771 BLAKE2B 03f1e1e7622b96eee80e37a991ad03b622a2a00e61bfc82eaf79ef7f04dcac7d5e436a0abe05f4ebc18654c28453d9caca6b0fdc6f873cdb6e8782092c3ca357 SHA512 50e3ae2d7604c32d36f81d6c31c8614a81b778782503f808eb64f3545af6419d7428d2deb85bad4f736f80b49eef62ce832e72c5348dd75e8545f5f78dce9fe6
 EBUILD priority-1.3.0.ebuild 718 BLAKE2B 31df88a983cca618ab29ea6e17efc147a7e3c9b76e4648e3070e58ee0ebc71ab99848090b2f5640ef73e79fee515164f82c15bf4fed3a336d045c141b8cd5d72 SHA512 f0e97a067ebb736e5a50e840ab39618455730cda04991a31f9cc1905f55753635ccc5daf1e2738c654d557ef751ad16580910b531d39115dec6ab83bb3c31ea0
 EBUILD priority-2.0.0-r1.ebuild 701 BLAKE2B 4f965add99cf3b4e05740b8e4658900897c19147e8103ebb908c144b6859a8fd65efc5639a18c30a409764229f4d9b1d87999254e9a7808a8b5fbe46a0d98978 SHA512 410e923e0e0bfbf4c4fa3b9e38d2b762068b8e997462d587f701bd7f227e3c2779092de77b58ce199b70de3b3401bd6eb54ccd9af5fbaba810859a2cb72f9bb8
-MISC metadata.xml 840 BLAKE2B f06ec0d98208bec42462213928f2f312649ff7765747b591e4ec0b68fecbc3666c0a99d328c11d0f0e8a086b2e82dc76a9f82503a6e70a2346c802f9026cc692 SHA512 cf9161bb9d3c488dbec74364385022a067b9911caa9bfc2499c00e49342303ffea899e67eb5dffc8fc5a4285209eb4806db2c28d16f91e8407879101a2d324fd
+MISC metadata.xml 864 BLAKE2B a4d4d8f4f8c2f4fa5223060a708f5ce75d8cb8c9bbee43e3c9a71eb4d06e0ae675e8864fb3538c971617f138cf4f548e2bc2884f930a0fb40bdb270aad0c2736 SHA512 4c9a614833f2e769551cd584cc80601ea7bd5a630afd4de760a6a219cf50bb65fba9db137dcd8ebed52a0a00e606a24288f347785a3e2fbce4777ade324e0080
diff --git a/dev-python/priority/metadata.xml b/dev-python/priority/metadata.xml
index d65b75c18cd3..d7497bdbcdda 100644
--- a/dev-python/priority/metadata.xml
+++ b/dev-python/priority/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<maintainer>
 			<email>cory@lukasa.co.uk</email>
diff --git a/dev-python/pytest-env/Manifest b/dev-python/pytest-env/Manifest
index ff5c41361931..51a8f405db98 100644
--- a/dev-python/pytest-env/Manifest
+++ b/dev-python/pytest-env/Manifest
@@ -1,5 +1,5 @@
 DIST pytest-env-0.6.2.tar.gz 1693 BLAKE2B b303b8b2b486cd5f6c6273fefe709e3986183a56b6758b05f8bde973c561ebba9646538d38783749305740d8bd637966966a109fcd600cd6f6ee059449ffb328 SHA512 0b3bb21fc881023c102b584593c6e28840400ce8190810f33f9a421df4141e17dcfad2943c4159aaab82376b7b47b07b45f97c9cb232a7d17c4d35b55966596d
 DIST pytest_env-0.8.1.tar.gz 6926 BLAKE2B 1d993947c5d67a57832e170e2cc2cbe56f5f1eef37d96790ec3965e5d7b9489771d1890ef7c6f4ae504e1d6d22845cf9b1b3fccf3caeacb3e6ff33d5f86b9279 SHA512 0c99db9c5467f5fe6f8655e540fff4b91884cef3553daf455298d2dc7bb51439418f3149b941d37a777199f28d82eccb2073fdd5e09bfb97cdf24d3ddb1d21bc
 EBUILD pytest-env-0.6.2-r1.ebuild 492 BLAKE2B 83b45fa4c8799fe025a6c1fdddee4ce7f695f03fc35e8e8677c9380ab7a56cd4c924aeef79e6d5c5197da8944ce650218b5681996bbe9ea3d274ed615169365d SHA512 4e80b35540a58eb1149a56c4c99f78d3e2eb2d0234b152a0aaf8c9b5feb66e66d8387e3f69a98c205ab2b5567fe9e9e36907c2d2f31e969746b0a0ba72e5f47e
-EBUILD pytest-env-0.8.1.ebuild 498 BLAKE2B 6049f8269ecb7f8524577221d43dd1d8de87c11d0245da119c447f662a511c3dffe8fda29947ab440a5dcebe6f19cf4eec84eef21c6d5af3a6045ab387f51c1a SHA512 14565efa08009e93c1ce650fe0180b5dc7645c1a4dd7f89afe667152bc928eb5320b6996066a4185e1d0774658ae322f5aacd352ba180b8836e137de3eddd8e1
-MISC metadata.xml 407 BLAKE2B 7353d52edf97f5667e7f3119b1896cc04ce6bb5f3e88eaca88091c7c24dc8a077b50c1b03bca5975c82cf70bf19af6e9a94a59043694980796ca8714850aa0dd SHA512 f0d9b4f02428c70f3d55f70d44f02dc198a363cbf7f00f7469af8cfdd729ef7467f115f98d84f038f6c65b58bbcbcaef5fb79b9992494b3ed598b64a94d9dc71
+EBUILD pytest-env-0.8.1.ebuild 598 BLAKE2B cef8adb2f051f0666e4371195df5e96353c5d690ecb1b14ada126bb60ee20c22a14e1a4224760fe874942dda4e62f3670a232278e804e8e59aab64e2d3a43026 SHA512 729cd4ff5721094e6ce69e2f603ce199506d2d693fb182a4e6ccecf786348e203209199af2a861c6b3beaba6f9986a98f7e59c8f98b0e9bd77ca6cec26e89872
+MISC metadata.xml 404 BLAKE2B 1bb7ed998c97dd5ca315474f49ee320c50edf73b12407da2245e7da097ded44b009f69b2c99590aaecd5d45642c9664b78bf5399b66809007011180590f9013b SHA512 1e9474e482fc0833e3d2d399c431d3ad7a0232a21190ad8c6e533e66f2e902f30c4b0bd6182fe0825738a0ff85f97b258ff9871451f557765086dec90e351f9b
diff --git a/dev-python/pytest-env/metadata.xml b/dev-python/pytest-env/metadata.xml
index ccf6121fada8..49fee13e6537 100644
--- a/dev-python/pytest-env/metadata.xml
+++ b/dev-python/pytest-env/metadata.xml
@@ -7,7 +7,7 @@
 	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
-		<remote-id type="github">MobileDynasty/pytest-env</remote-id>
+		<remote-id type="github">pytest-dev/pytest-env</remote-id>
 		<remote-id type="pypi">pytest-env</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pytest-env/pytest-env-0.8.1.ebuild b/dev-python/pytest-env/pytest-env-0.8.1.ebuild
index 3ab29754ad80..2c0cc5da7303 100644
--- a/dev-python/pytest-env/pytest-env-0.8.1.ebuild
+++ b/dev-python/pytest-env/pytest-env-0.8.1.ebuild
@@ -3,16 +3,20 @@
 
 EAPI=8
 
-DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_USE_PEP517=hatchling
 PYTHON_COMPAT=( python3_{8..11} )
 inherit distutils-r1
 
 DESCRIPTION="py.test plugin that allows you to add environment variables"
-HOMEPAGE="https://github.com/MobileDynasty/pytest-env"
+HOMEPAGE="https://github.com/pytest-dev/pytest-env"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P/-/_}.tar.gz"
+S="${WORKDIR}/${P/-/_}"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
 
 RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
+BDEPEND="dev-python/hatch-vcs[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/python-xlib/Manifest b/dev-python/python-xlib/Manifest
index 82b9b4525536..4eeb4cadad93 100644
--- a/dev-python/python-xlib/Manifest
+++ b/dev-python/python-xlib/Manifest
@@ -1,4 +1,4 @@
 DIST python-xlib-0.31.tar.bz2 211425 BLAKE2B c0a15b11c264942479c86088d8d5bdc0c759ae71df8939feee200ff58ec30d3b2c0a99a119cc56e5c32279b26517e7925cf9124a367dc7d32fcaf0be4f7cd41e SHA512 f98978cd0058ae18f08f9da71b4ff31cd7811040ec1eb03ce065c187f312259d674dd76aad447752c8f508e585838948c90182eef5d5240e6c06b0a5dd1fbd33
-EBUILD python-xlib-0.31-r1.ebuild 924 BLAKE2B c7e2ade75a94f1f7fb7b8c8d6c4a26f93ea7a732a2ea864559fccb0afb9cb71569bf333d5f740c67aa4373f995cbc7ec0a0a5a64bf86a630179093d1f2d8b8cc SHA512 7f7448c0df7228e34de2a7fbc41c39ea3cf564af3d3f821312bf7afa059f9e9c55c0289f8efb0e9ece5532d984aae422da20e176cbc3cc73eb455f03294a137b
+EBUILD python-xlib-0.31-r1.ebuild 923 BLAKE2B 2ae27f4e486622488190da030e3f9df00d693e1ee26e29c70f1008f8db425cc6fc520059fc716deff6664ce787d51c268951c2c8511fbcaecff7c86ce2b96eb8 SHA512 c1ce2f17ff40bc0b09395666a391b59a4f9ef58433d3aa8cd5fb08a65712ca106d7f2a49ddc55031a27e4034a650e4a0ffad3e9dedc0c4cade2bda442f680e3b
 EBUILD python-xlib-0.31.ebuild 891 BLAKE2B 4047fe5708424f0ebeedcdc94bb307218fe3e6faf494e15015a1adc6217fad84589e9451f4c95331523ebcae404e7bcc92e5cd19da7d299d058cca3b6eac770d SHA512 345e6deec4c0146fad01d9b004bb0629a58dc189424273e95f4a4c9d24201d9813fb04f27271bacee726b2e76381c0290760b931e6c2947026122e2b99772753
 MISC metadata.xml 434 BLAKE2B 3fa5d4e6b3b0347d1872805cf074795e486fe64a6b5b3edf326e9a8f81c1f5b86472ec6d906e85ef11493e9aeff9ef8ecfbece69103df037c8237fee3bbbaac9 SHA512 38738c99171d5351a797b12384a0f29b38250bb62cb17ff6250e3215a580500eec3210e22ee9605356c71477b8574b9fde34c5dee944b8437b901adc9b417218
diff --git a/dev-python/python-xlib/python-xlib-0.31-r1.ebuild b/dev-python/python-xlib/python-xlib-0.31-r1.ebuild
index d9b2e3a959c6..6b3f020591e1 100644
--- a/dev-python/python-xlib/python-xlib-0.31-r1.ebuild
+++ b/dev-python/python-xlib/python-xlib-0.31-r1.ebuild
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~riscv x86"
 IUSE="doc"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-python/ujson/Manifest b/dev-python/ujson/Manifest
index 7670ddc4529f..562e127aef18 100644
--- a/dev-python/ujson/Manifest
+++ b/dev-python/ujson/Manifest
@@ -1,5 +1,5 @@
 DIST ujson-5.4.0.tar.gz 7139576 BLAKE2B d3bd6bcc4dc733cafc47e613e2dc503e8cf7faf562d2fad91ea66b1a62dd4a8d67a2c80c392eba0c224f382280e58ff3fff51308c22862aaae5e671b5183027c SHA512 9622e872391d5467455b32e324d7b680487664ca486bfc56ba8c3969853e5db94725cd45e81b535dca80af4a3c718af171ce7adb6dcb9b98a37a8068824f89c6
 DIST ujson-5.5.0.tar.gz 7140414 BLAKE2B cca99fbb8cec447500c0dec34a952c4474acd0149783c887ee713cee60859570e41c9e349d49ff7eeba645d0c04a7e368da2ec8c42b6f55f59e971f834449e3a SHA512 883c0bd8b933557fc98556af1679de6df0372ee83a5533d8ea3f994dc13cd9bcd3140e2532ea1ad24419dab9ffbb59027e00f0a5e7ca285bf68358205a07bcd5
 EBUILD ujson-5.4.0.ebuild 879 BLAKE2B f58b2f5d57429fd3d899023579443447348e2784052777267ccc86c5ab53e79ee72aa09effc370a8ed5fdd43b7d98fe08bb00ccb3e3083e6c3ddfb1d890cd542 SHA512 25da7256c33440a0f8577ebaf46900254fa66be01651895609ca28d2cf244262d2164bcf2f8f550e163bfa6cbc6a2c63c77ebbdbca315b7c354e77f9457869dd
-EBUILD ujson-5.5.0.ebuild 882 BLAKE2B 455e37670271da7001fb4a70d76deeaf23f6ecbff98491eea9017c99a5ed8461f1f95a8b35d82454ee9aa7dfed7f2b4416737ffa98df2b9de6b8c6b207b75011 SHA512 48e15aca252851485946b5277c86f9dceabab29ebb469ffc493f26423fb1fdf2eeef5004ffa91b92511a91ec8041367cc7fcfa5cccd543ee81b08bf46b47eec1
+EBUILD ujson-5.5.0.ebuild 881 BLAKE2B 9f61b276e05d546727363273fb7b13b96447d4927a679876d425a356832a8d6f22b6c69da13d146c177f5ec16e33a2fd04e6a0d0ecac458e9da1964a5d4528b7 SHA512 f57e791c78de0477b0f332ab91c9a4d850dc1387992218ce51bde67a694b4f4c97b6aa08efb3beb17607c634086cab955ba60d181eb045a22d9e34e42867bb78
 MISC metadata.xml 494 BLAKE2B 8e20150926d62643e7ff2110cba22313db0c0e3112290ce08302d57103aa35c42a56921d0b46e0acca2ef83756eb4f7384f23ddb06fe41ef6c4a28921f11ec33 SHA512 d9c0a59f916b84d50e51a21152c1815fea90a909dc9bd44ea620b2a33ca6a92ee237aafe29debcc9d1a2bf63c84112300845309eb0ab1265e5d2b0c05dd313f0
diff --git a/dev-python/ujson/ujson-5.5.0.ebuild b/dev-python/ujson/ujson-5.5.0.ebuild
index 3475075d31c8..9c6a7833ecc6 100644
--- a/dev-python/ujson/ujson-5.5.0.ebuild
+++ b/dev-python/ujson/ujson-5.5.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 arm arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	dev-libs/double-conversion:=