Adding metadata

22 files changed, 289 insertions, 118 deletions

diff --git a/dev-python/griffe/Manifest b/dev-python/griffe/Manifest
index 41ecdb270597..81302ba424a1 100644
--- a/dev-python/griffe/Manifest
+++ b/dev-python/griffe/Manifest
@@ -1,2 +1,3 @@
 DIST griffe-0.29.0.gh.tar.gz 157523 BLAKE2B 2854d6e30898e7aec9b6481215311956bcd9b24eb4b7cb36c11515f36a90467cabfc2cf9320bf4dcb44f04d8dd855cde97a749f7b51529cbfe5bd5e8e4391d9c SHA512 3367e48ac9337d180621fa694babc61dec445cc86b1555a65d14547c95aabda637ef72d86d3a1eb16fc736923876cda6c2ba51fa346551e5e134b490557d1459
 DIST griffe-0.29.1.gh.tar.gz 159747 BLAKE2B b998c2014a883ddb5c845b620ceba7a6edcaf7fbd7178ad356961cd1f0866927008d7ac16c1a0f13e886812ae706b3d117f8cd8e26e5f46999da44d843f0cd43 SHA512 f8405b2ace1dac83e451fa344d395f8e1733362409853b7952cbe10321eb13b7524cb96ba899559a08ebdbc57f997b7ee38ba8951730b288e4f87127e87b100b
+DIST griffe-0.30.0.gh.tar.gz 165537 BLAKE2B aa6b54e6b15dfc48c1caaa7b440fdaf486cd9e838a047248140e32f4a8ae1ba05aed36643f1c2681abe58e0858789df8228eb346bede5909d9016e0d2f9fd9be SHA512 0741ad533243628a08c25e9b9ce91a463653851429bc469f635d740ad3974e1545c3e70e3ce6213b684bd9bfdd283fcaf3721255df0de83b79193ac25617e175
diff --git a/dev-python/griffe/griffe-0.30.0.ebuild b/dev-python/griffe/griffe-0.30.0.ebuild
new file mode 100644
index 000000000000..e171a586e519
--- /dev/null
+++ b/dev-python/griffe/griffe-0.30.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=pdm-backend
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Signature generator for Python programs"
+HOMEPAGE="
+	https://mkdocstrings.github.io/griffe/
+	https://github.com/mkdocstrings/griffe/
+	https://pypi.org/project/griffe/
+"
+# Tests need files absent from the PyPI tarballs
+SRC_URI="
+	https://github.com/mkdocstrings/griffe/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+
+RDEPEND="
+	>=dev-python/colorama-0.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/jsonschema-4.17.3[${PYTHON_USEDEP}]
+		>=dev-python/pytest-xdist-2.4[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+export PDM_BUILD_SCM_VERSION=${PV}
+
+EPYTEST_DESELECT=(
+	# fragile to installed packages
+	# (failed on PySide2 for me)
+	tests/test_stdlib.py::test_fuzzing_on_stdlib
+)
diff --git a/dev-python/grpcio-tools/Manifest b/dev-python/grpcio-tools/Manifest
index ba8e2b54fbb1..b08f678fbf20 100644
--- a/dev-python/grpcio-tools/Manifest
+++ b/dev-python/grpcio-tools/Manifest
@@ -1,2 +1,2 @@
-DIST grpcio-tools-1.54.2.tar.gz 2259586 BLAKE2B efa99e32d3bea5d176856d5befbebff27cef5d67355c4fb6600ec0a05e141d09750ada427bb8a82ecea713e48094b589cee247463a7b1f215c1f56eb346a571c SHA512 7dc849db2fb9d769d66e140d5841fc894acd05d4c20f3a67e472b85121c9718afa56e30175d889eeb76e9f44aea6553a7e915d1502eb7aca721091f5bdd60da9
 DIST grpcio-tools-1.55.0.tar.gz 4481863 BLAKE2B 62ff9201dda6c4c078690ac15db411cc95a36c71863a57510add59beb27db0f11726ff6f8aab0da0f2ba131a7574e2ae27640b0ed2448bfe162db3282d57bc96 SHA512 bcd55e71fb752cd0bbee47fa237db6a1ec6084eaa95fceb2e0f3950b8655ace36edaf4edcdeacd66a5fcf22f163f5bcda710d6b50f0c6b3b3242cda7a019bfea
+DIST grpcio-tools-1.56.0.tar.gz 4484937 BLAKE2B 1879b4a6d076976890edee01556bacf333082258dd942136ae681ceb69be0d9264ef3fa0d536afb440200452b91701576a6879c19bd906e04037907cdb1bbf51 SHA512 f6ddabfd4bb4d4d80e6d86be4bf66d1554cb71ac4f2198a1eaac059b57869aecc81521e25edf1ce359f9f30fa83185bbf22baa1c62aa70778a0104d2ae793022
diff --git a/dev-python/grpcio-tools/grpcio-tools-1.54.2.ebuild b/dev-python/grpcio-tools/grpcio-tools-1.56.0.ebuild
index dd540e526033..324303a5f1db 100644
--- a/dev-python/grpcio-tools/grpcio-tools-1.54.2.ebuild
+++ b/dev-python/grpcio-tools/grpcio-tools-1.56.0.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1 multiprocessing prefix
 
 DESCRIPTION="Protobuf code generator for gRPC"
 HOMEPAGE="https://grpc.io https://pypi.org/project/grpcio-tools/"
-SRC_URI="https://files.pythonhosted.org/packages/b1/a9/db4538e727eb0d627a345ab99c22cab041db98aac1eadfbeadbccc0c4376/grpcio-tools-1.54.2.tar.gz"
+SRC_URI="https://files.pythonhosted.org/packages/1b/3f/3a0133a85eef463f94e9e6fa49394f21e3cf8b7123422020d76e95418e25/grpcio-tools-1.56.0.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-python/grpcio/Manifest b/dev-python/grpcio/Manifest
index a726e40a8baf..975a38072149 100644
--- a/dev-python/grpcio/Manifest
+++ b/dev-python/grpcio/Manifest
@@ -1,2 +1,2 @@
-DIST grpcio-1.54.2.tar.gz 23458404 BLAKE2B f51be300817e4a253ab6d29d2497991487c348ffa7591c494fa98b4a8cb9d764eed393aaad8650e328e3c18f100a45cf22e4a23d8edd5ec7087e984919e74d66 SHA512 1c7f0df6e8bc86bcbb1edfe53164eed59453816e4c70702b918dccf2f64c902ebd415636ab8848eae90de6e51ef3d2b0c1e2955bd30dbb89972df1e881e66848
 DIST grpcio-1.55.0.tar.gz 24163903 BLAKE2B 43d643a42f1048ed3ed423672bfcba2a896461201154e2f106d7773dc2700ca618ff1dcee94828342675701030e1f5c17325931d1d22637833977f7940b93860 SHA512 a1a879fc1fa12cc84fda62aaf7ee6b366b4a8a9fb9ec7912e41269a61dc0390e5583dfbb916e5bc5c0bdc07534fc20aca719a448c9acc8a8923d39d11df1bcde
+DIST grpcio-1.56.0.tar.gz 24308553 BLAKE2B 233623ccaa190926603f3876afb05534d03b08257da5812b10efb2624b940958a5c6dc11b4a210fa61c1f9edb6b08dde7fd8a432a7bb98f23adad9e3cf9dac77 SHA512 fcbcacc3e318dc9b3f85c9723ce7ea10f994284512045fdb320054b6fd9c3e3def0762cd01054b47bf21708ecdcc905cc1a9553af4b8439d9122f3357ee0c46b
diff --git a/dev-python/grpcio/grpcio-1.54.2.ebuild b/dev-python/grpcio/grpcio-1.56.0.ebuild
index 5eb650059480..b7a03bb4569e 100644
--- a/dev-python/grpcio/grpcio-1.54.2.ebuild
+++ b/dev-python/grpcio/grpcio-1.56.0.ebuild
@@ -8,7 +8,7 @@ inherit distutils-r1 multiprocessing prefix
 
 DESCRIPTION="High-performance RPC framework (python libraries)"
 HOMEPAGE="https://grpc.io https://pypi.org/project/grpcio/"
-SRC_URI="https://files.pythonhosted.org/packages/cb/82/f4a1535e6ae5360abd59ab4e8d90a884c680a3997a44c7418364030874dd/grpcio-1.54.2.tar.gz"
+SRC_URI="https://files.pythonhosted.org/packages/ee/d6/62ea04e71abe92406baf8fbe25daee5e90d45571206b8e93c4812ea958b6/grpcio-1.56.0.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-python/munch/Manifest b/dev-python/munch/Manifest
index aff424eeb1bd..c0a33b7f3079 100644
--- a/dev-python/munch/Manifest
+++ b/dev-python/munch/Manifest
@@ -1,2 +1,3 @@
 DIST munch-2.5.0.tar.gz 17015 BLAKE2B 17af271ae082a6e5f91781ba48a440f11cbe85ecb81d47ee2bc51910307080e3ba6c95e99e7475534400b2915a86d8f853bc65d419c3d3b7138bf021e66de25c SHA512 7eca31111f40782a19b49535322bc56d723022d52b0842c4beff512f32fa415a6c75851eb84950358cb6a11693095cafe56364028e48385b11135de414edca21
 DIST munch-3.0.0.tar.gz 19276 BLAKE2B df7b8ee8ff807c2a1ca61974d70379623411db2229d176b890949aa3318f7b2ec1e108a340e55445751c46da24deb0f749d66fb69f9e10e92a04a01c766a73c6 SHA512 d08ac1b19badf0fb17f2dc81e53ab7492e49da225d8fa890fa9227df9d4e2bce395c7d7a8000f635529c1fb2a7eccd4eef10370b76e95b960955985b38003baf
+DIST munch-4.0.0.tar.gz 19089 BLAKE2B 17aba6f5ab3e2e532a9deb8623ef10aa569231e5457b96acacd7c11117db47afa82409f9bf8aa384a8207c23d4af1140dca6db27c73df05658b8ad3997ad071a SHA512 7beeee4d3fd084ac929e796cd62af097c2602a3ec06405f79b562bc6d14577350adbbe02848253c62f0938e706b9056799bfd5b9c2bdff6e559b3903b8cdca5c
diff --git a/dev-python/munch/munch-4.0.0.ebuild b/dev-python/munch/munch-4.0.0.ebuild
new file mode 100644
index 000000000000..007f44a7f28d
--- /dev/null
+++ b/dev-python/munch/munch-4.0.0.ebuild
@@ -0,0 +1,28 @@
+# 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_{7,8,9,10,11} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A dot-accessible dictionary (a la JavaScript objects)"
+HOMEPAGE="
+	https://github.com/Infinidat/munch/
+	https://pypi.org/project/munch/
+"
+
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+SLOT="0"
+
+BDEPEND="
+	dev-python/pbr[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index 923fec76a57b..6c66afbcbcad 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -1 +1,2 @@
+DIST pillow-10.0.0.gh.tar.gz 50537667 BLAKE2B f0ce48e947363c16c0bb08881b42dcf845a142fe7d2162154f5ddce47bf909fc4c829dcb4365ee363680a41c247cea28eef37c879d22959ef69c9dc5adce91f4 SHA512 a963ae8398c609569e1b23d2362f6382cd888698492ba2349f9c931a04c463fbdc27a43e53d1dee8bbb1b5e88c0d5eb655f6f5e9df7d489c206b6acda0adec3a
 DIST pillow-9.5.0.gh.tar.gz 50491974 BLAKE2B 663c14b89ddd1e2d49872994033a04e500d0b6eccbb8d6ce094f58ae1aaf3f215e9984f2afeb43fb83e0c3c93af1150beeb7d5f0abb77c59087901b53fd24e37 SHA512 da0c7a1bde4741ced168c013fdc7afa8af1100bba878bdaeeb9804fed4dcf70c07ed62004ab2c73694eae3d28e2d72d46c155f78b540075aafb36c8e7a5649ff
diff --git a/dev-python/pillow/pillow-10.0.0.ebuild b/dev-python/pillow/pillow-10.0.0.ebuild
new file mode 100644
index 000000000000..37b654e59a65
--- /dev/null
+++ b/dev-python/pillow/pillow-10.0.0.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+# setuptools wrapper
+DISTUTILS_USE_PEP517=standalone
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
+PYTHON_REQ_USE='tk?,threads(+)'
+
+inherit distutils-r1 toolchain-funcs virtualx
+
+MY_PN=Pillow
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Python Imaging Library (fork)"
+HOMEPAGE="
+	https://python-pillow.org/
+	https://github.com/python-pillow/
+	https://pypi.org/project/Pillow/
+"
+SRC_URI="
+	https://github.com/python-pillow/Pillow/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="HPND"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples imagequant +jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib"
+REQUIRED_USE="test? ( jpeg jpeg2k lcms tiff truetype )"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	imagequant? ( media-gfx/libimagequant:= )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	lcms? ( media-libs/lcms:2= )
+	tiff? ( media-libs/tiff:=[jpeg,zlib] )
+	truetype? ( media-libs/freetype:2= )
+	webp? ( media-libs/libwebp:= )
+	xcb? ( x11-libs/libxcb )
+	zlib? ( sys-libs/zlib:= )
+"
+RDEPEND="
+	${DEPEND}
+	dev-python/olefile[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	virtual/pkgconfig
+	test? (
+		${RDEPEND}
+		dev-python/defusedxml[${PYTHON_USEDEP}]
+		dev-python/packaging[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		|| (
+			media-gfx/imagemagick[png]
+			media-gfx/graphicsmagick[png]
+		)
+	)
+"
+
+EPYTEST_DESELECT=(
+	# TODO; incompatible Qt version?
+	Tests/test_qt_image_qapplication.py::test_sanity
+)
+
+usepil() {
+	usex "${1}" enable disable
+}
+
+python_configure_all() {
+	# It's important that these flags are also passed during the install phase
+	# as well. Make sure of that if you change the lines below. See bug 661308.
+	cat >> setup.cfg <<-EOF || die
+		[build_ext]
+		disable_platform_guessing = True
+		$(usepil truetype)_freetype = True
+		$(usepil jpeg)_jpeg = True
+		$(usepil jpeg2k)_jpeg2000 = True
+		$(usepil lcms)_lcms = True
+		$(usepil tiff)_tiff = True
+		$(usepil imagequant)_imagequant = True
+		$(usepil webp)_webp = True
+		$(usepil webp)_webpmux = True
+		$(usepil xcb)_xcb = True
+		$(usepil zlib)_zlib = True
+	EOF
+
+	# setup.py won't let us add the right toolchain paths but it does
+	# accept additional ones from INCLUDE and LIB so set these. You
+	# wouldn't normally need these at all as the toolchain should look
+	# here anyway but it doesn't for this setup.py.
+	export \
+		INCLUDE="${ESYSROOT}"/usr/include \
+		LIB="${ESYSROOT}"/usr/$(get_libdir)
+
+	# We have patched in this env var.
+	tc-export PKG_CONFIG
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO (is clipboard unreliable in Xvfb?)
+		Tests/test_imagegrab.py::TestImageGrab::test_grabclipboard
+	)
+
+	"${EPYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}"
+	# no:relaxed: pytest-relaxed plugin make our tests fail. deactivate if installed
+	epytest -p no:relaxed || die "Tests failed with ${EPYTHON}"
+}
+
+python_install() {
+	python_doheader src/libImaging/*.h
+	distutils-r1_python_install
+}
+
+python_install_all() {
+	if use examples ; then
+		docinto example
+		dodoc docs/example/*
+		docompress -x /usr/share/doc/${PF}/example
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pytest-mypy-plugins/Manifest b/dev-python/pytest-mypy-plugins/Manifest
index 1e72cbeeb64a..3a84cf3d79e2 100644
--- a/dev-python/pytest-mypy-plugins/Manifest
+++ b/dev-python/pytest-mypy-plugins/Manifest
@@ -1 +1 @@
-DIST pytest-mypy-plugins-1.11.1.gh.tar.gz 18201 BLAKE2B a21b089321a3d632225e0ac6aa921b23bba111dcc5234c2ada32522b7659533970a9bd19bb432d3304b0291e32ba067ab75c549c4552ca742835155ab8e711b1 SHA512 ac7a0973aba070c80480681f2910d40c7e510c906f8030413ba5c94f50131df19036c7183bfad3f211d6d375661753b9d4ff2a73b3bd7af06d0f442e94af3f64
+DIST pytest-mypy-plugins-2.0.0.gh.tar.gz 18444 BLAKE2B a9def96003d85d76984067194abdbb5259379c09d359be6a3de7d4a68df2f8c7ebd033632c645297062564943b6cdee885c793172338b52110590be6911f6a75 SHA512 743d88884e3eef03cb52ffde82e42522ea961db6a27be3cba17aadceb47e1456ffd20806559dd7a6b183536aba98e592e97e40911199c4defbe66bfceebbf229
diff --git a/dev-python/pytest-mypy-plugins/files/pytest-mypy-plugins-1.11.1-deprecated-chevron-to-jinja.patch b/dev-python/pytest-mypy-plugins/files/pytest-mypy-plugins-1.11.1-deprecated-chevron-to-jinja.patch
deleted file mode 100644
index ae2885893b6d..000000000000
--- a/dev-python/pytest-mypy-plugins/files/pytest-mypy-plugins-1.11.1-deprecated-chevron-to-jinja.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Chevron, an engine for the Mustache templating language, has been unmaintained
-since 2021 and is not part of ::gentoo. The Jinja and Mustache templating
-languages use the same syntax as far as this project is concerned.
-
-PR issued upstream by <watermanpaint@posteo.net>:
-https://github.com/typeddjango/pytest-mypy-plugins/pull/117
---- a/pytest_mypy_plugins/utils.py
-+++ b/pytest_mypy_plugins/utils.py
-@@ -11,10 +11,11 @@ from itertools import zip_longest
- from pathlib import Path
- from typing import Any, Callable, Dict, Iterator, List, Mapping, Optional, Tuple, Union
- 
--import chevron
-+import jinja2
- import regex
- from decorator import contextmanager
- 
-+_rendering_env = jinja2.Environment()
- 
- @contextmanager
- def temp_environ() -> Iterator[None]:
-@@ -351,9 +352,10 @@ def extract_output_matchers_from_out(out: str, params: Mapping[str, Any], regex:
-     return matchers
- 
- 
--def render_template(template: str, data: Mapping[str, Any]) -> str:
--    return chevron.render(template=template, data={k: v if v is not None else "None" for k, v in data.items()})
- 
-+def render_template(template: str, data: Mapping[str, Any]) -> str:
-+    template = _rendering_env.from_string(template)
-+    return template.render({k: v if v is not None else "None" for k, v in data.items()})
- 
- def get_func_first_lnum(attr: Callable[..., None]) -> Optional[Tuple[int, List[str]]]:
-     lines, _ = inspect.getsourcelines(attr)
---- a/setup.py
-+++ b/setup.py
-@@ -8,7 +8,7 @@ dependencies = [
-     "mypy>=0.970",
-     "decorator",
-     "pyyaml",
--    "chevron",
-+    "jinja2",
-     "regex",
-     "packaging",
- ]
diff --git a/dev-python/pytest-mypy-plugins/pytest-mypy-plugins-1.11.1.ebuild b/dev-python/pytest-mypy-plugins/pytest-mypy-plugins-2.0.0.ebuild
index 77eb3b307c3f..976fda697083 100644
--- a/dev-python/pytest-mypy-plugins/pytest-mypy-plugins-1.11.1.ebuild
+++ b/dev-python/pytest-mypy-plugins/pytest-mypy-plugins-2.0.0.ebuild
@@ -18,18 +18,15 @@ SRC_URI="https://github.com/typeddjango/pytest-mypy-plugins/archive/refs/tags/${
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
-PATCHES=(
-	"${FILESDIR}"/${P}-deprecated-chevron-to-jinja.patch
-)
 
 DOCS="README* CHANGELOG*"
 
 RDEPEND="
+	>=dev-python/mypy-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/pytest-7.0.0[${PYTHON_USEDEP}]
 	dev-python/decorator[${PYTHON_USEDEP}]
 	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/mypy[${PYTHON_USEDEP}]
 	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/pytest[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
 	dev-python/regex[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/pyupgrade/Manifest b/dev-python/pyupgrade/Manifest
index c5670ffcd816..3ff009be94ea 100644
--- a/dev-python/pyupgrade/Manifest
+++ b/dev-python/pyupgrade/Manifest
@@ -3,3 +3,4 @@ DIST pyupgrade-3.3.2.gh.tar.gz 62698 BLAKE2B 5dc1d9e9ea7b91cb2835ffdbc109fb4fcde
 DIST pyupgrade-3.4.0.gh.tar.gz 62408 BLAKE2B a816cea1e2b17790312d4e17ec972a1e09a0dd81c6fe4f7eb28c686b39b468b84190b26cf9ae5a711f70f8c1213c0b472975cc76339f64d2af4b4a8593af6b79 SHA512 cf9b8d8b430949eb0b49ec1b28576db7d6932c83a727660fe5e2cd61ae32e3efba63120580e0184931e3fdd4a4913a0f9cb37984ca83adeab05ab3ca57107b27
 DIST pyupgrade-3.6.0.gh.tar.gz 62595 BLAKE2B a6622985e4b26bfb55cdeebd2323bd912289399bffa167b7d4ac1d16c11072b9b58793193febed31838d72691f3c6882914cd7005391f477a2ca6c78b808a33d SHA512 15b3ea59e0afbd5da0c2e7d60ed938d418107eb99cae7d2a5059fcea3f3ea69f451fed962cbdbb40655c39911c92f21bb9ace55f9b1bc65be2f8870b5b48acb8
 DIST pyupgrade-3.7.0.gh.tar.gz 62560 BLAKE2B 65715106db02e83f801b47aad5e48ba6e84cc42121298a210de8893752392ecbf99953fb6e0b7a2629b76e454523520794b7107226587d7dcfb46eecaad82439 SHA512 cd6b0a1516e91e1e8823333aaa314ca265387ea8dfb5739e428703f2dd798755126dc6269a5d253d6eaa3118d096945e9492f7f122ae306f6d5835b8aa9fa30f
+DIST pyupgrade-3.8.0.gh.tar.gz 62529 BLAKE2B d82a8670bd14294f3320f57643173e8e2963898133f38158902d6c6df01bd6859204a40b8f83ff533ca16ff583f3a739cbbba2a9c3a9205ffd796ba81f6cfbb6 SHA512 af04d68560fb520361ce42be449b26d3c590337ba3b54adfaf610e9477c3e913d3f38f742d055f6e435a3dc7695ae18b22d011b3cfec02b6c41c7b64a6e83b3b
diff --git a/dev-python/pyupgrade/pyupgrade-3.8.0.ebuild b/dev-python/pyupgrade/pyupgrade-3.8.0.ebuild
new file mode 100644
index 000000000000..3df105af07de
--- /dev/null
+++ b/dev-python/pyupgrade/pyupgrade-3.8.0.ebuild
@@ -0,0 +1,30 @@
+# 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_{7,8,9,10,11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Tool + pre-commit hook to automatically upgrade syntax for newer Pythons"
+HOMEPAGE="
+	https://github.com/asottile/pyupgrade/
+	https://pypi.org/project/pyupgrade/
+"
+# no tests in sdist, as of 3.3.2
+SRC_URI="
+	https://github.com/asottile/pyupgrade/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+RDEPEND="
+	dev-python/tokenize-rt[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pywebview/Manifest b/dev-python/pywebview/Manifest
index f4b5de7e2222..d06be7fdc3c4 100644
--- a/dev-python/pywebview/Manifest
+++ b/dev-python/pywebview/Manifest
@@ -1,2 +1,2 @@
-DIST pywebview-3.7.2.tar.gz 440069 BLAKE2B 72a7b53ee72570f3ef0dc2c490f484dca02581490213708b6c45bb487b990d41ca64d477853454549c6cad3543f6381109a2fc54182bb14a720872b1fa240ed9 SHA512 943ce75a29f19b04890e8ae8f3327968b35ba347c8abab9079cfac5e9f93edfa0fbc3999d77a68bb7885d5a7236dc12c75b3a23e1cfbf2fc9fe794089a936db9
 DIST pywebview-4.1.tar.gz 30069532 BLAKE2B ca11bb04c4146204d379414fc6de0cd1e583c36feb126c859d8c8bb0e896bf5eb8de946943729e41d0c564c704d140baf765de2807aec0311348e97624c00f3a SHA512 5cca2912adda83043c86f4b1386c70583fa547424b10c19dc2bfc713407cd9001515844b820e2050962fe84373febfaab495f646c56ab1d48207b47f2c535208
+DIST pywebview-4.2.2.tar.gz 30105686 BLAKE2B fd6cd5131fd42326046e1126951294f7c87245a0580c7269d4bbb8a9fd04048e0db3a5864ff32c646d21734519ac568903dd82de5b750c3d7bcdb90857fe958b SHA512 6922d31bfc7a461948698b96d7e507162ac8718408ca0d8defa138d86c74d653c8026f5b0aa2d62d2147d7a64391f7e4d7726b5fcac0d836907fe5751bd82936
diff --git a/dev-python/pywebview/pywebview-3.7.2.ebuild b/dev-python/pywebview/pywebview-4.2.2.ebuild
index e9885a23c4e0..629f65f5a0d9 100644
--- a/dev-python/pywebview/pywebview-3.7.2.ebuild
+++ b/dev-python/pywebview/pywebview-4.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2022 Gentoo Authors
+# Copyright 2020-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,10 +14,12 @@ HOMEPAGE="https://github.com/r0x0r/pywebview"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="gtk qt5"
-REQUIRED_USE="|| ( gtk qt5 )"
+IUSE="gtk qt5 qt6"
+REQUIRED_USE="|| ( gtk qt5 qt6 )"
 
 RDEPEND="
+	dev-python/bottle
+	dev-python/cryptography
 	dev-python/proxy_tools
 	gtk? (
 		dev-python/pygobject[cairo,${PYTHON_USEDEP}]
@@ -27,4 +29,12 @@ RDEPEND="
 		 dev-python/pyside2[${PYTHON_USEDEP},webengine]
 		 dev-python/QtPy[${PYTHON_USEDEP},webengine]
 	)
+	qt6? (
+		dev-python/pyside6[${PYTHON_USEDEP},webengine]
+		dev-python/QtPy[${PYTHON_USEDEP},webengine]
+	)
 "
+
+distutils_enable_tests pytest
+
+RESTRICT="test" # FIXME: tests fail without message
diff --git a/dev-python/slixmpp/slixmpp-1.8.4.ebuild b/dev-python/slixmpp/slixmpp-1.8.4.ebuild
index dd052e8709d7..a9eb95f0daa5 100644
--- a/dev-python/slixmpp/slixmpp-1.8.4.ebuild
+++ b/dev-python/slixmpp/slixmpp-1.8.4.ebuild
@@ -19,7 +19,7 @@ if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 else
 	inherit pypi
-	KEYWORDS="~amd64 ~riscv"
+	KEYWORDS="amd64 ~riscv"
 fi
 
 DEPEND="
diff --git a/dev-python/sphinx-argparse/Manifest b/dev-python/sphinx-argparse/Manifest
index cc6a6ba198dc..78929c27d15f 100644
--- a/dev-python/sphinx-argparse/Manifest
+++ b/dev-python/sphinx-argparse/Manifest
@@ -1 +1 @@
-DIST sphinx-argparse-0.3.1.tar.gz 42953 BLAKE2B 76c74a270a638b1b894548bc898918fbfa5fde6bcf1ccbf5e69a3daaada829bc1ae27ad8befd18e834646dc2fc3b025f36807c2be894911cc0c6d65294174898 SHA512 3d289c90165eb6a3d7a94dff8e6a429a49eb404ce373e80e007a0cd9abaae1e1236f5393df2fbf11701c349dade9d199640dc398064da4fd50a58a90eb3f8f12
+DIST sphinx_argparse-0.4.0.tar.gz 15020 BLAKE2B 73118f56ff82d52f04066b9d500aebc77eb5a0fecd03fa69f382c0f2afc0cbffdd395da707cf37b59f039e93935f8d5c3fe0e0f7a2820d3b6509dd78b37b0d74 SHA512 b96050da6c02f87c54f9dc9146bed955e99258df740b467575a2b3e9919fa8c4c6d30a736dab24360086bfc0d7d09c4bc7a818700af2c7846eed3a3b99053d65
diff --git a/dev-python/sphinx-argparse/metadata.xml b/dev-python/sphinx-argparse/metadata.xml
index 498a8147049a..66ee50826efd 100644
--- a/dev-python/sphinx-argparse/metadata.xml
+++ b/dev-python/sphinx-argparse/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
- <maintainer type="person">
-  <email>alarig@swordarmor.fr</email>
-  <name>Alarig Le Lay</name>
+ <maintainer type="project">
+  <email>sci@gentoo.org</email>
+  <name>Gentoo Science Project</name>
  </maintainer>
  
- <origin>gentoo-guru-overlay</origin>
+ <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/sphinx-argparse/sphinx-argparse-0.3.1.ebuild b/dev-python/sphinx-argparse/sphinx-argparse-0.3.1.ebuild
deleted file mode 100644
index 490a8b9976fe..000000000000
--- a/dev-python/sphinx-argparse/sphinx-argparse-0.3.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-DISTUTILS_USE_PEP517=poetry
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Sphinx extension that automatically documents argparse commands and options"
-HOMEPAGE="
-	https://pypi.org/project/sphinx-argparse/
-	https://github.com/ashb/sphinx-argparse
-"
-SRC_URI="https://github.com/ashb/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-# requires self to build own documentation
-distutils_enable_sphinx docs dev-python/sphinx-rtd-theme dev-python/sphinx-argparse
-
-python_prepare_all() {
-	# needs test files in workdir to compile docs for some reason
-	cp -r test "${WORKDIR}" || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	if [[ ${EPYTHON} == python3.10 ]]; then
-		EPYTEST_DESELECT=(
-			test/test_parser.py::test_parse_nested
-			test/test_parser.py::test_parse_nested_with_alias
-			test/test_parser.py::test_parse_groups
-			test/test_parser.py::test_action_groups_with_subcommands
-		)
-	fi
-
-	epytest
-}
-
-pkg_postinst() {
-	optfeature "markdown support" dev-python/commonmark
-}
diff --git a/dev-python/sphinx-argparse/sphinx-argparse-0.4.0.ebuild b/dev-python/sphinx-argparse/sphinx-argparse-0.4.0.ebuild
new file mode 100644
index 000000000000..8bff58491d89
--- /dev/null
+++ b/dev-python/sphinx-argparse/sphinx-argparse-0.4.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+DISTUTILS_USE_PEP517=poetry
+inherit distutils-r1 pypi
+
+DESCRIPTION="Sphinx extension that automatically documents argparse commands and options"
+HOMEPAGE="https://pypi.org/project/sphinx-argparse/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	dev-python/commonmark[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest