Adding metadata

30 files changed, 113 insertions, 198 deletions

diff --git a/dev-python/aiohttp-oauthlib/aiohttp-oauthlib-0.1.0.ebuild b/dev-python/aiohttp-oauthlib/aiohttp-oauthlib-0.1.0.ebuild
index 326e6deb198a..ab0f12bf0b3f 100644
--- a/dev-python/aiohttp-oauthlib/aiohttp-oauthlib-0.1.0.ebuild
+++ b/dev-python/aiohttp-oauthlib/aiohttp-oauthlib-0.1.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://git.sr.ht/~whynothugo/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 SLOT="0"
 LICENSE="ISC"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 RDEPEND="
 	dev-python/aiohttp[${PYTHON_USEDEP}]
diff --git a/dev-python/aioresponses/aioresponses-0.7.4.ebuild b/dev-python/aioresponses/aioresponses-0.7.4.ebuild
index 714308afc169..59fe05334589 100644
--- a/dev-python/aioresponses/aioresponses-0.7.4.ebuild
+++ b/dev-python/aioresponses/aioresponses-0.7.4.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	dev-python/aiohttp[${PYTHON_USEDEP}]
diff --git a/dev-python/aiostream/Manifest b/dev-python/aiostream/Manifest
index 9c90b2209360..25aa9658bef7 100644
--- a/dev-python/aiostream/Manifest
+++ b/dev-python/aiostream/Manifest
@@ -1,4 +1 @@
-DIST aiostream-0.4.5.gh.tar.gz 39797 BLAKE2B 5aeb4da46158d949190af22133f1798831e14f8d8da231d3dc098caaace303061bfa49dfef1d52c533ce20201937bf5da33f36806634b2e73ccbc48c00962486 SHA512 ac1a67a6d27e18e290c5ae5b069de2e7f7205120bc747885261e23155019d5630c1f7b643df3a4fef12844d52cdfc0f1fcdcf5cb35a0061000d426c62dcffb1d
-DIST aiostream-0.5.0.gh.tar.gz 42508 BLAKE2B 44acb97c42aa7fbe56981e5d237fd28eb531e38255a3beca98f0c7fd33a019e1fa525938b6ff21d1c49df5424d1093417003bb280f6d9ee8609a0f475a347a25 SHA512 bcab27272cde42b8a09a41f9b818d8094514eeeab4b1c0304c6d2b908bcf1142d029882d51ab427b34db215dbaedf519c772be2e67a1d7f9ca5a3def0d04b7ae
-DIST aiostream-0.5.1.gh.tar.gz 42439 BLAKE2B fff62e73d0da156a18ec935051e46b2ec17b36b7541db4791083bd1873f53a1ce0576a11e8ca0071bb6194312f184c4eb3cf9c5fdbd37f86768b1111edc867b5 SHA512 a93f2969a19f5e9d0ce334a54be935092b26e2b621ef3fe27bb101fa812360349c77fc9c7dc41b56491b314c236622ab812e2ee0fd9c6c136e431781b3733a75
 DIST aiostream-0.5.2.gh.tar.gz 42945 BLAKE2B 36e4f3c7834df589da3e7ec8bafb6a5b6fe40a1e868fbe0b9b81233f6721852b0e31b12144775db8785835cd5a3a0ca0a88784f7955388efd55b6ce97311b10e SHA512 282139cda0f7d08dd11af88bc3a568054906c2e0e2708f72e0ce3a67d13a44822612e3989c398ab346f8c043f17ad2e5cd2f958b1461325ad9768affec8f63fc
diff --git a/dev-python/aiostream/aiostream-0.4.5.ebuild b/dev-python/aiostream/aiostream-0.4.5.ebuild
deleted file mode 100644
index 883b664308e0..000000000000
--- a/dev-python/aiostream/aiostream-0.4.5.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Generator-based operators for asynchronous iteration"
-HOMEPAGE="
-	https://pypi.org/project/aiostream/
-	https://github.com/vxgmichel/aiostream/
-"
-SRC_URI="
-	https://github.com/vxgmichel/aiostream/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e 's:--cov aiostream --cov-report html --cov-report term::' \
-		setup.cfg || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/aiostream/aiostream-0.5.0.ebuild b/dev-python/aiostream/aiostream-0.5.0.ebuild
deleted file mode 100644
index c3fd9359ea01..000000000000
--- a/dev-python/aiostream/aiostream-0.5.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Generator-based operators for asynchronous iteration"
-HOMEPAGE="
-	https://pypi.org/project/aiostream/
-	https://github.com/vxgmichel/aiostream/
-"
-SRC_URI="
-	https://github.com/vxgmichel/aiostream/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/typing-extensions[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e 's:--cov aiostream --cov-report html --cov-report term::' \
-		setup.cfg || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/aiostream/aiostream-0.5.1.ebuild b/dev-python/aiostream/aiostream-0.5.1.ebuild
deleted file mode 100644
index c3fd9359ea01..000000000000
--- a/dev-python/aiostream/aiostream-0.5.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Generator-based operators for asynchronous iteration"
-HOMEPAGE="
-	https://pypi.org/project/aiostream/
-	https://github.com/vxgmichel/aiostream/
-"
-SRC_URI="
-	https://github.com/vxgmichel/aiostream/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/typing-extensions[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e 's:--cov aiostream --cov-report html --cov-report term::' \
-		setup.cfg || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/aiostream/aiostream-0.5.2.ebuild b/dev-python/aiostream/aiostream-0.5.2.ebuild
index c3fd9359ea01..37b1f0451fe7 100644
--- a/dev-python/aiostream/aiostream-0.5.2.ebuild
+++ b/dev-python/aiostream/aiostream-0.5.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm ~arm64"
 
 RDEPEND="
 	dev-python/typing-extensions[${PYTHON_USEDEP}]
diff --git a/dev-python/ansi2html/ansi2html-1.8.0-r1.ebuild b/dev-python/ansi2html/ansi2html-1.8.0-r1.ebuild
deleted file mode 100644
index 1297a09721a8..000000000000
--- a/dev-python/ansi2html/ansi2html-1.8.0-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Convert text with ANSI color codes to HTML"
-HOMEPAGE="https://pypi.org/project/ansi2html/
-	https://github.com/pycontribs/ansi2html"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 arm ~riscv x86"
-IUSE=""
-
-RDEPEND=">=dev-python/six-1.7.3[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	doman man/${PN}.1
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/ansi2html/ansi2html-1.8.0-r2.ebuild b/dev-python/ansi2html/ansi2html-1.8.0-r2.ebuild
index adfeb1f25440..0dbdae8c8306 100644
--- a/dev-python/ansi2html/ansi2html-1.8.0-r2.ebuild
+++ b/dev-python/ansi2html/ansi2html-1.8.0-r2.ebuild
@@ -9,14 +9,18 @@ PYTHON_COMPAT=( python3_{8,9,10,11,12} )
 inherit distutils-r1 pypi
 
 DESCRIPTION="Convert text with ANSI color codes to HTML"
-HOMEPAGE="https://pypi.org/project/ansi2html/
-	https://github.com/pycontribs/ansi2html"
+HOMEPAGE="
+	https://pypi.org/project/ansi2html/
+	https://github.com/pycontribs/ansi2html/
+"
 
 LICENSE="LGPL-3+"
 SLOT="0"
 KEYWORDS="amd64 arm ~riscv x86"
 
-RDEPEND=">=dev-python/six-1.7.3[${PYTHON_USEDEP}]"
+RDEPEND="
+	>=dev-python/six-1.7.3[${PYTHON_USEDEP}]
+"
 BDEPEND="
 	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/python-discid/Manifest b/dev-python/discid/Manifest
index 7bbf1b7d40f7..7bbf1b7d40f7 100644
--- a/dev-python/python-discid/Manifest
+++ b/dev-python/discid/Manifest
diff --git a/dev-python/python-discid/python-discid-1.2.0-r1.ebuild b/dev-python/discid/discid-1.2.0-r1.ebuild
index d9bfef66369a..8620cb451f3b 100644
--- a/dev-python/python-discid/python-discid-1.2.0-r1.ebuild
+++ b/dev-python/discid/discid-1.2.0-r1.ebuild
@@ -8,6 +8,7 @@ PYTHON_COMPAT=( python3_{8,9,10,11,12} )
 
 inherit distutils-r1
 
+MY_P=python-discid-${PV}
 DESCRIPTION="Python bindings for libdiscid"
 HOMEPAGE="
 	https://python-discid.readthedocs.io/en/latest/
@@ -16,8 +17,9 @@ HOMEPAGE="
 "
 SRC_URI="
 	https://github.com/JonnyJD/python-discid/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
+		-> ${MY_P}.gh.tar.gz
 "
+S=${WORKDIR}/${MY_P}
 
 LICENSE="LGPL-3+"
 SLOT="0"
diff --git a/dev-python/python-discid/metadata.xml b/dev-python/discid/metadata.xml
index 853174b8f2ab..853174b8f2ab 100644
--- a/dev-python/python-discid/metadata.xml
+++ b/dev-python/discid/metadata.xml
diff --git a/dev-python/iso8601/iso8601-2.1.0.ebuild b/dev-python/iso8601/iso8601-2.1.0.ebuild
index d464e8949937..33404d8404f0 100644
--- a/dev-python/iso8601/iso8601-2.1.0.ebuild
+++ b/dev-python/iso8601/iso8601-2.1.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 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 ~x64-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 ~x64-solaris"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/platformdirs/platformdirs-3.11.0.ebuild b/dev-python/platformdirs/platformdirs-3.11.0.ebuild
index 0947849db721..764ad8a9d959 100644
--- a/dev-python/platformdirs/platformdirs-3.11.0.ebuild
+++ b/dev-python/platformdirs/platformdirs-3.11.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/pyside2-tools/pyside2-tools-5.15.10.ebuild b/dev-python/pyside2-tools/pyside2-tools-5.15.10.ebuild
index df2704c753db..24d169ccfa4f 100644
--- a/dev-python/pyside2-tools/pyside2-tools-5.15.10.ebuild
+++ b/dev-python/pyside2-tools/pyside2-tools-5.15.10.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 # TODO: Add PyPy once officially supported. See also:
 #     https://bugreports.qt.io/browse/PYSIDE-535
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+PYTHON_COMPAT=( python3_{10..11} )
 CMAKE_IN_SOURCE_BUILD=1
 
 inherit cmake python-r1
diff --git a/dev-python/pyside2-tools/pyside2-tools-5.15.11-r1.ebuild b/dev-python/pyside2-tools/pyside2-tools-5.15.11-r1.ebuild
index 242a2c91a831..b95967aad0ea 100644
--- a/dev-python/pyside2-tools/pyside2-tools-5.15.11-r1.ebuild
+++ b/dev-python/pyside2-tools/pyside2-tools-5.15.11-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 # TODO: Add PyPy once officially supported. See also:
 #     https://bugreports.qt.io/browse/PYSIDE-535
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+PYTHON_COMPAT=( python3_{10..11} )
 
 inherit cmake python-r1
 
diff --git a/dev-python/pyside2/pyside2-5.15.10-r3.ebuild b/dev-python/pyside2/pyside2-5.15.10-r3.ebuild
index 8750e52264b7..fa43d3ed66e7 100644
--- a/dev-python/pyside2/pyside2-5.15.10-r3.ebuild
+++ b/dev-python/pyside2/pyside2-5.15.10-r3.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 # TODO: Add PyPy once officially supported. See also:
 #     https://bugreports.qt.io/browse/PYSIDE-535
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+PYTHON_COMPAT=( python3_{10..11} )
 
 inherit cmake python-r1 virtualx
 
diff --git a/dev-python/pyside2/pyside2-5.15.11-r1.ebuild b/dev-python/pyside2/pyside2-5.15.11-r1.ebuild
index 0b27c1657d5d..2248e4af791e 100644
--- a/dev-python/pyside2/pyside2-5.15.11-r1.ebuild
+++ b/dev-python/pyside2/pyside2-5.15.11-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 # TODO: Add PyPy once officially supported. See also:
 #     https://bugreports.qt.io/browse/PYSIDE-535
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+PYTHON_COMPAT=( python3_{10..11} )
 
 inherit cmake python-r1 virtualx
 
diff --git a/dev-python/pytest-datadir/pytest-datadir-1.5.0.ebuild b/dev-python/pytest-datadir/pytest-datadir-1.5.0.ebuild
index eecdc52d8f41..626c5bd1f1d6 100644
--- a/dev-python/pytest-datadir/pytest-datadir-1.5.0.ebuild
+++ b/dev-python/pytest-datadir/pytest-datadir-1.5.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/pytest[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-describe/pytest-describe-2.1.0.ebuild b/dev-python/pytest-describe/pytest-describe-2.1.0.ebuild
index b696a3e14adf..dfc4704776ec 100644
--- a/dev-python/pytest-describe/pytest-describe-2.1.0.ebuild
+++ b/dev-python/pytest-describe/pytest-describe-2.1.0.ebuild
@@ -29,5 +29,6 @@ distutils_enable_tests pytest
 python_test() {
 	# We need to disable some plugins because tests don't like unexpected
 	# output
-	PYTEST_ADDOPTS="-p no:flaky -p no:capturelog" epytest
+	local -x PYTEST_ADDOPTS="-p no:flaky -p no:capturelog"
+	epytest
 }
diff --git a/dev-python/pytest-mpl/pytest-mpl-0.16.1.ebuild b/dev-python/pytest-mpl/pytest-mpl-0.16.1.ebuild
index cf1df4a4850f..3522b6d6c9a2 100644
--- a/dev-python/pytest-mpl/pytest-mpl-0.16.1.ebuild
+++ b/dev-python/pytest-mpl/pytest-mpl-0.16.1.ebuild
@@ -33,12 +33,3 @@ EPYTEST_DESELECT=(
 )
 
 distutils_enable_tests pytest
-
-python_test() {
-	# disable autoloading plugins in nested pytest calls
-	#local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	# since we disabled autoloading, force loading necessary plugins
-	#local -x PYTEST_PLUGINS=xdist.plugin,xdist.looponfail,pytest_forked
-
-	epytest
-}
diff --git a/dev-python/pytest-system-statistics/pytest-system-statistics-1.0.2-r2.ebuild b/dev-python/pytest-system-statistics/pytest-system-statistics-1.0.2-r2.ebuild
index 7d2a55e6dd57..197c6faebd5f 100644
--- a/dev-python/pytest-system-statistics/pytest-system-statistics-1.0.2-r2.ebuild
+++ b/dev-python/pytest-system-statistics/pytest-system-statistics-1.0.2-r2.ebuild
@@ -5,6 +5,7 @@ EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+
 inherit distutils-r1
 
 DESCRIPTION="Pytest Plugin Which Reports System Usage Statistics"
@@ -12,7 +13,10 @@ HOMEPAGE="
 	https://pypi.org/project/pytest-system-statistics/
 	https://github.com/saltstack/pytest-system-statistics
 "
-SRC_URI="https://github.com/saltstack/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
+SRC_URI="
+	https://github.com/saltstack/pytest-system-statistics/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -26,7 +30,7 @@ RDEPEND="
 	dev-python/pytest-skip-markers[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	dev-python/wheel[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
 		dev-python/pytest-subtests[${PYTHON_USEDEP}]
 	)
@@ -38,15 +42,7 @@ PATCHES=(
 
 distutils_enable_tests pytest
 
-python_prepare_all() {
-	sed -e "s/use_scm_version=True/version='${PV}'/" -i setup.py || die
-	sed -e "/setuptools_scm/ d" -i setup.cfg || die
-	sed -e "s/tool.setuptools_scm/tool.disabled/" -i pyproject.toml || die
-
-	printf '__version__ = "${PV}"\n' > src/pytestsysstats/version.py || die
-
-	distutils-r1_python_prepare_all
-}
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
 
 python_test() {
 	local EPYTEST_DESELECT=(
diff --git a/dev-python/pytest-xdist/pytest-xdist-3.3.1-r1.ebuild b/dev-python/pytest-xdist/pytest-xdist-3.3.1-r1.ebuild
index db8060267869..c9d4e82bba87 100644
--- a/dev-python/pytest-xdist/pytest-xdist-3.3.1-r1.ebuild
+++ b/dev-python/pytest-xdist/pytest-xdist-3.3.1-r1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/execnet[${PYTHON_USEDEP}]
diff --git a/dev-python/python-axolotl/python-axolotl-0.2.3-r3.ebuild b/dev-python/python-axolotl/python-axolotl-0.2.3-r3.ebuild
index 5e3754eed8fe..2e1413cbc037 100644
--- a/dev-python/python-axolotl/python-axolotl-0.2.3-r3.ebuild
+++ b/dev-python/python-axolotl/python-axolotl-0.2.3-r3.ebuild
@@ -9,8 +9,14 @@ PYTHON_COMPAT=( python3_{8,9,10,11,12} )
 inherit distutils-r1
 
 DESCRIPTION="A python module for the axolotl protocol"
-HOMEPAGE="https://github.com/tgalal/python-axolotl"
-SRC_URI="https://github.com/tgalal/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+HOMEPAGE="
+	https://github.com/tgalal/python-axolotl/
+	https://pypi.org/project/python-axolotl/
+"
+SRC_URI="
+	https://github.com/tgalal/python-axolotl/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -21,6 +27,5 @@ RDEPEND="
 	dev-python/protobuf-python[${PYTHON_USEDEP}]
 	dev-python/python-axolotl-curve25519[${PYTHON_USEDEP}]
 "
-DEPEND="${RDEPEND}"
 
 distutils_enable_tests pytest
diff --git a/dev-python/selenium/Manifest b/dev-python/selenium/Manifest
index 426373381177..e12c59d59f0e 100644
--- a/dev-python/selenium/Manifest
+++ b/dev-python/selenium/Manifest
@@ -2,7 +2,9 @@ DIST selenium-4.13.0.tar.gz 9266949 BLAKE2B fbf6bf204b47648d67f3205729db232097a9
 DIST selenium-4.14.0.tar.gz 9710348 BLAKE2B 038660990ce32c725b7c166031a7e78be5df2f9b1d0abe133e73566a9b9060c189310269fcf5db1330c2a2b1ed2901d8453b7134094528c73ca9dff899258914 SHA512 b41d81eeecdce428bfadfa3dc8c190512eb4243f710730519a3868987fa5f21db4a0fd7666b0dc9f40e56fbcf046f79a799ed32a31b7ab7e3c440d7f990a00bd
 DIST selenium-4.15.0.tar.gz 9954324 BLAKE2B d5baa36c9674e6286be0ce2276fe55eb029f64d9ef8e551d36c6f72458b2e9465107f7e14701163f1ca91d8b32653da72ccccd904fdbe4e89dd3942dc17b59da SHA512 96e1d7684322019adb3ca89c072f2e492d98574f896b905cc037dc9bfc2f58d4713e34d4b8008f6782c3fd43ad316bba95c221fd1cda308e39f4742a51e220e8
 DIST selenium-4.15.1.tar.gz 9954359 BLAKE2B 6305298e7fd29cacb85b4c08a80003970e41c049e787b85cb1b09fd4ee651a0f3f2c50e8c92a5284c4f5611e1709b28df0e49daa937c3f9559471d3ecb0f3424 SHA512 a6c3de89ed3d5ff75a7a92b00386baf091c22e990407f1f747d680885686c411de3853f402b722395ed441f3e970017365bc0978633641ac59a6998a27c1c8b8
+DIST selenium-4.15.2.tar.gz 9954413 BLAKE2B 93f17b7d952f63eb8f2f119398e4dbfe9d850a1b2a2f959a6ee63014aa6a40570782ade4891ae75350ca4e530f0b0c249e3849bedf81b2a3c173e670508c0f46 SHA512 ea716702033426e66ce85a91a00f2c6f24091430304de6b419b99a5ea9ce9fad319ccbf9ea826e440d1b4a333c31c1e39978d82eae066e8b1d13bb312a8669a6
 DIST selenium-selenium-4.13.0.gh.tar.gz 78263115 BLAKE2B 8f06ee9e6a8ac8a63c3f016d3e310ba22ac0bd5566f06f6d6f71f269084bafa00f0627aaf1103f2f28a8785e81ace1652b64a271a23fdc74a56c0bf118ccd2ca SHA512 7156b28326492efa189ec4d5e53e131f4e8fb3aea97ce6632b0a9a81e04e238645b4994e348fa6e3f689e5472f569dfe95fdb11a6bd8456381b85d41fb0ede61
 DIST selenium-selenium-4.14.0.gh.tar.gz 78721372 BLAKE2B f57f5ed30f4439a83308909f5233187f924476de455d9b6504255e56a3217844d206968a96963c0f824c1a7dc5e69a196dde50a0cfb291820e6690be67a87c5e SHA512 b3b3f375ef0589cdc2afb454b50678ebe881d08cea841c697c9a5a4d745fc8ac84f941d2f5bbea9082c6e0c7052b7c5f08207947bb4389b0322c257dc81dcc89
 DIST selenium-selenium-4.15.0.gh.tar.gz 78935989 BLAKE2B 5ff5f620d206ece245a3166cbc77813ec8b5cc79942ad7e5b04df6ed02a0039b1b7af2af4b312cbcfd0e998aab25f4659e3c6aff52ac6d112c9440d49076fb69 SHA512 584e1637202681c2d60418a8e0bf7f8d28cf0edf901f076647c44996a589844a80db27ba52f1cdd22e5af5cc2ccfc890c0c6690a15d0656a35c8ebb9c20e5ee9
 DIST selenium-selenium-4.15.1-python.gh.tar.gz 78936820 BLAKE2B d7a92c69d6fbbeb6d4ba806130e73d49e976de5a37481726d68dc8925eef7a5f9b022ddbe9c1a11cb27ce0fc6790c61fe1146ff56f0e774554fea384124cbf87 SHA512 a4336cac1053648ad1617c814ba7e4e7cdfd2c9480c718cca0e2ef986fef6ffcad1cb56c6b08fcc7943fc3491b00a75961d14bb710c20f4d73bd75a644a4cef6
+DIST selenium-selenium-4.15.2-python.gh.tar.gz 78937488 BLAKE2B 9d064e5f753bdecc7ebab65b5c37cd433c05bf3c7ab09007247290bc782b9e64ec58bd499c838eb51c880c6ace258fef487fa6fb46c334230c5e6f64748014dd SHA512 9f1259b6f1362be5089766d4f51c20defc8f3e8c4a1be25690f9ed8acdccb0c09f64a0cdf0fe871956fb76cb2038663b7f99e620e302f89420fb582a6171fa92
diff --git a/dev-python/selenium/selenium-4.15.2.ebuild b/dev-python/selenium/selenium-4.15.2.ebuild
new file mode 100644
index 000000000000..3f244a395e40
--- /dev/null
+++ b/dev-python/selenium/selenium-4.15.2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+
+inherit distutils-r1 pypi
+
+# upstream sometimes tags it as ${P}, sometimes as ${P}-python, sigh
+TEST_TAG=${P}-python
+TEST_P=selenium-${TEST_TAG}
+
+DESCRIPTION="Python language binding for Selenium Remote Control"
+HOMEPAGE="
+	https://www.seleniumhq.org/
+	https://github.com/SeleniumHQ/selenium/tree/trunk/py/
+	https://pypi.org/project/selenium/
+"
+SRC_URI+="
+	test? (
+		https://github.com/SeleniumHQ/selenium/archive/${TEST_TAG}.tar.gz
+			-> ${TEST_P}.gh.tar.gz
+	)
+"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+RDEPEND="
+	>=dev-python/certifi-2021.10.8[${PYTHON_USEDEP}]
+	<dev-python/trio-1[${PYTHON_USEDEP}]
+	>=dev-python/trio-0.17[${PYTHON_USEDEP}]
+	<dev-python/trio-websocket-1[${PYTHON_USEDEP}]
+	>=dev-python/trio-websocket-0.9[${PYTHON_USEDEP}]
+	<dev-python/urllib3-3[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.26[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO: we may need extra setup or deps
+		test/selenium
+
+		# expects vanilla certifi
+		test/unit/selenium/webdriver/remote/remote_connection_tests.py::test_get_connection_manager_for_certs_and_timeout
+	)
+
+	cd "${WORKDIR}/${TEST_P}/py" || die
+	rm -rf selenium || die
+	# https://github.com/SeleniumHQ/selenium/blob/selenium-4.8.2-python/py/test/runner/run_pytest.py#L20-L24
+	# seriously?
+	epytest -o "python_files=*_tests.py test_*.py"
+}
diff --git a/dev-python/setproctitle/setproctitle-1.3.3.ebuild b/dev-python/setproctitle/setproctitle-1.3.3.ebuild
index 02ab3de40f72..47ab3234aca7 100644
--- a/dev-python/setproctitle/setproctitle-1.3.3.ebuild
+++ b/dev-python/setproctitle/setproctitle-1.3.3.ebuild
@@ -17,6 +17,6 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 distutils_enable_tests pytest
diff --git a/dev-python/vdirsyncer/vdirsyncer-0.18.0-r4.ebuild b/dev-python/vdirsyncer/vdirsyncer-0.18.0-r4.ebuild
index 33b4720eb6d4..c5e12d4da400 100644
--- a/dev-python/vdirsyncer/vdirsyncer-0.18.0-r4.ebuild
+++ b/dev-python/vdirsyncer/vdirsyncer-0.18.0-r4.ebuild
@@ -32,7 +32,6 @@ BDEPEND="
 	test? (
 		dev-python/hypothesis[${PYTHON_USEDEP}]
 		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-		dev-python/pytest-subtesthack[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/vdirsyncer/vdirsyncer-0.19.2.ebuild b/dev-python/vdirsyncer/vdirsyncer-0.19.2-r2.ebuild
index e7c93e35b461..5707d30d5343 100644
--- a/dev-python/vdirsyncer/vdirsyncer-0.19.2.ebuild
+++ b/dev-python/vdirsyncer/vdirsyncer-0.19.2-r2.ebuild
@@ -17,20 +17,17 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm ~arm64"
 
 RDEPEND="
-	<dev-python/click-9[${PYTHON_USEDEP}]
 	>=dev-python/click-5.0[${PYTHON_USEDEP}]
-	<dev-python/click-log-0.5.0[${PYTHON_USEDEP}]
 	>=dev-python/click-log-0.3.0[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
 	>=dev-python/requests-toolbelt-0.4.0[${PYTHON_USEDEP}]
 	>=dev-python/atomicwrites-0.1.7[${PYTHON_USEDEP}]
-	<dev-python/aiohttp-4[${PYTHON_USEDEP}]
 	>=dev-python/aiohttp-3.8.0[${PYTHON_USEDEP}]
-	<dev-python/aiostream-0.5.0[${PYTHON_USEDEP}]
 	>=dev-python/aiostream-0.4.3[${PYTHON_USEDEP}]
+	dev-python/aiohttp-oauthlib[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	dev-python/setuptools-scm[${PYTHON_USEDEP}]
@@ -47,6 +44,12 @@ DOCS=( AUTHORS.rst CHANGELOG.rst CONTRIBUTING.rst README.rst config.example )
 
 distutils_enable_tests pytest
 
+src_prepare() {
+	# unpin deps
+	sed -i -e 's:, *<[0-9.]*::' setup.py || die
+	distutils-r1_src_prepare
+}
+
 python_test() {
 	# skip tests needing servers running
 	local -x DAV_SERVER=skip
diff --git a/dev-python/zope-hookable/zope-hookable-6.0.ebuild b/dev-python/zope-hookable/zope-hookable-6.0.ebuild
index 9713c57d4202..43a4d6330569 100644
--- a/dev-python/zope-hookable/zope-hookable-6.0.ebuild
+++ b/dev-python/zope-hookable/zope-hookable-6.0.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~riscv ~x86"
 
 BDEPEND="
 	test? (