Adding metadata

author: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2023-03-06 15:14:59 +0000
committer: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2023-03-06 15:14:59 +0000
commit: fde3b5bbeb07fb00d002d7686ba1fb259a5e5184 (patch)
tree: c7c2fa1cc942119d9d1f9fc9db5b4c2f15e8fea9 /dev-python
parent: 7be16c0e5ac01853add3329935dacfdaa10b62e9 (diff)
download: baldeagleos-repo-fde3b5bbeb07fb00d002d7686ba1fb259a5e5184.tar.gz
baldeagleos-repo-fde3b5bbeb07fb00d002d7686ba1fb259a5e5184.tar.xz
baldeagleos-repo-fde3b5bbeb07fb00d002d7686ba1fb259a5e5184.zip
97 files changed, 1198 insertions, 397 deletions
diff --git a/dev-python/aiomysql/aiomysql-0.1.1.ebuild b/dev-python/aiomysql/aiomysql-0.1.1.ebuild
index 3264470506ca..10aba7911b00 100644
--- a/dev-python/aiomysql/aiomysql-0.1.1.ebuild
+++ b/dev-python/aiomysql/aiomysql-0.1.1.ebuild
@@ -21,7 +21,7 @@ KEYWORDS="~amd64 ~x86"
 
 RDEPEND="dev-python/pymysql[${PYTHON_USEDEP}]"
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
 	test? (
 		$(python_gen_impl_dep "ssl")
diff --git a/dev-python/alembic/Manifest b/dev-python/alembic/Manifest
index 4a4a4be50199..51964ef919f1 100644
--- a/dev-python/alembic/Manifest
+++ b/dev-python/alembic/Manifest
@@ -1,3 +1,4 @@
+DIST alembic-1.10.0.tar.gz 1146577 BLAKE2B 9063a62a10e3c8a2fc5c7b78d285d6526dd0a4b97775db7881e28667752ac9154a4867b7213ca9dde7df51c97317104cb66a8e42dde22d8678ac2da7b4e8994a SHA512 39deb7182660a4afbcfac4b32c1607ff7d97fe599fa99dc74c6dea41c26e298d3fa0618dbd7c3c8984264d54f6f2b00a0e9bde66dc1aa76a2a64eccc81e85a03
 DIST alembic-1.9.2.tar.gz 1136929 BLAKE2B 26c4ad3185bc274aa4321a0860dc357566625abb51c951f2d0151bfd109f0e0bf7a37075d07ad2f0975127bdd327579f2d9a700f3cc130fbdd1c6458127b2e50 SHA512 d878d48d140be68facdaf0ec25f8582c9e10a369b23e9ee035ae63f8f2ad52d50464c5b8e9c666307edd1a797b6a2c495e56fa890f7dc8f46b3d75a726905ded
 DIST alembic-1.9.3.tar.gz 1137492 BLAKE2B 17dbc5513b7e15daa51f623bfa90febf356caad8d13e215c6007fd0330e569ea4ffddd374c1ab9b7954e38a136c27d2e5d0ff5db026a6c2ad04d242b3cfdbe7f SHA512 dcbde51c26a81f88b102979aa000c17d0af065e96c51484c94c138fc08099e229deb06f5934d499058f25ef87eb5a5de765225fb890a76eb030d1ad6649e57a4
 DIST alembic-1.9.4.tar.gz 1139210 BLAKE2B 5b740803b6bf5b715e9572a91d87d5403d64e665647776d28511704fa17ed81825fe6f5cdab2cec77a0806abb02ef2a7acf5f9702ff87639b90e74d9e22a4b1a SHA512 76e6f86e789cecff78f8e86c34d22a70615158833bc24a26f38fe2d0d5ccd098920e0fe4cbebaadd2c9a4a2e63152720945645000d46a2b6b8b6696ce873f899
diff --git a/dev-python/alembic/alembic-1.10.0.ebuild b/dev-python/alembic/alembic-1.10.0.ebuild
new file mode 100644
index 000000000000..15a1a21d58a0
--- /dev/null
+++ b/dev-python/alembic/alembic-1.10.0.ebuild
@@ -0,0 +1,35 @@
+# 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="Database migrations tool, written by the author of SQLAlchemy"
+HOMEPAGE="
+	https://github.com/sqlalchemy/alembic/
+	https://pypi.org/project/alembic/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE="doc"
+
+RDEPEND="
+	>=dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+	dev-python/mako[${PYTHON_USEDEP}]
+	>=dev-python/python-editor-0.3[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-4[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/astroid/Manifest b/dev-python/astroid/Manifest
index ed745dd8817e..05dfbca39cc5 100644
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@@ -2,3 +2,4 @@ DIST astroid-2.13.2.gh.tar.gz 449022 BLAKE2B c8180057edef860fae6697b40d6b023b5be
 DIST astroid-2.13.5.gh.tar.gz 451241 BLAKE2B 6994c9a62911ab347be4de17b9322ca9957b274c2a42085b5c521bc4a810ab0c0079fda89203910a1d7151ebad1b07cc446c1fc8e88580051029861cfb3465ae SHA512 87920dfe5a4e3e64b77cbeefcdd1e227dd712230aeb957f78b57a50d215ef0601689df26ac97cec65d7690e89b10e1b8ab8f2976d1a9b1a3e9a971eb2142d9d2
 DIST astroid-2.14.1.gh.tar.gz 452889 BLAKE2B f6cee61825d2c86bbf02ba6cc9f48076692d3d71ac2c8a02880a778380b076692aef549ab01829d943323b5829b83ee88009b5136b308da6f81a824fa1f62047 SHA512 47dd132e66645c3da639c68011f4691409af38affa80c5b1863706a864fb8458cdfd100f86929fdaac027a514d285132d8865d2d40996c583077384696a84123
 DIST astroid-2.14.2.gh.tar.gz 453109 BLAKE2B cb4b0795bde841e98712a719ba0870a3f0c616fc777cb3afc1ebbb0f5e49b763241825072d7915df87e778649a5632fec8f48e125cfa67de0b70618e34509157 SHA512 2dad27c0a3ddad5747a021c0700b831fe9f7a557238a2f52d87722c637120d49796a0a8e9e6f27d42ab4bee1c91541b7b5b5fa93dc3ec8a47197f35569a64a3a
+DIST astroid-2.15.0.gh.tar.gz 460733 BLAKE2B cc80ffd9b5804a1a0c94598f75363088dcb971ee322b556e150799a5e18aa16d20c58d9bf7725c2697d34152daa72a20d845e7c56a524d58354913eed338010f SHA512 7ec121b3c7d60e2d48f738fbc4eeae3e32c7135a77fb778db9479d730a757818f549d8bd35facdd67d411d777d57ec620a2448de1f4da23754863cae18717bce
diff --git a/dev-python/astroid/astroid-2.15.0.ebuild b/dev-python/astroid/astroid-2.15.0.ebuild
new file mode 100644
index 000000000000..c6c47a59e6ad
--- /dev/null
+++ b/dev-python/astroid/astroid-2.15.0.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_{7,8,9,10,11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Abstract Syntax Tree for logilab packages"
+HOMEPAGE="
+	https://github.com/PyCQA/astroid/
+	https://pypi.org/project/astroid/
+"
+SRC_URI="
+	https://github.com/PyCQA/astroid/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+# Version specified in pyproject.toml
+RDEPEND="
+	>=dev-python/lazy-object-proxy-1.4.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/typing-extensions-4.0.0[${PYTHON_USEDEP}]
+	' 3.{8..10})
+	<dev-python/wrapt-2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# no clue why they're broken
+		tests/test_modutils.py::GetModulePartTest::test_known_values_get_builtin_module_part
+		tests/test_regrtest.py::NonRegressionTests::test_numpy_distutils
+		tests/brain/test_regex.py::TestRegexBrain::test_regex_pattern_and_match_subscriptable
+		# some problem with warnings (our options?)
+		tests/test_decorators.py::TestDeprecationDecorators::test_deprecated_default_argument_values_one_arg
+		tests/test_decorators.py::TestDeprecationDecorators::test_deprecated_default_argument_values_two_args
+		tests/test_scoped_nodes.py::test_deprecation_of_doc_attribute
+		# requires six bundled in urllib3, sigh
+		tests/test_modutils.py::test_file_info_from_modpath__SixMetaPathImporter
+	)
+
+	# Faker causes sys.path_importer_cache keys to be overwritten
+	# with PosixPaths
+	epytest -p no:faker
+}
diff --git a/dev-python/asyncssh/Manifest b/dev-python/asyncssh/Manifest
index 8421cacba4e9..d319313e46b0 100644
--- a/dev-python/asyncssh/Manifest
+++ b/dev-python/asyncssh/Manifest
@@ -1,2 +1 @@
-DIST asyncssh-2.10.1.tar.gz 483000 BLAKE2B a588d671b3afe9f77f15974578f27e9001e8138284e4313d8188766c66e81942a8d37598ba79af4971c11f900fa7009311c20c86fce0e058d1fdeeec72c9320a SHA512 adaf68f2e4209e9bf91c2018298a281dab490d723bda9d6f7db892aa43e796e38ff904cf39f56c8b545439ca71c89b419e53521f323cb753cf7a2290beb04e12
-DIST asyncssh-2.11.0.tar.gz 482916 BLAKE2B fd410771d4032996b4a75c0cf7250f481a8e5f5498f6a4c31227468eff3dba8f4936c2711e11aadbf313989e395ee679d11b0a28646735f1868bd81680c3f3e3 SHA512 d9736d0d9e486c4a062fbf493d28f2c5b1074baa32879430750115a686600fa97c947ea34b47a1d9962cc44cc32ce6b31fdb0baa455fbde9b63660c5b8454810
+DIST asyncssh-2.13.1.tar.gz 497376 BLAKE2B 6f7dc62e27d2588dc8d21dcbf99520f3dae1f0f02e808c62d08fba7989d6099927fa36daddda4bf584010bbd40f02919905aefa7b90596a2183d685a0ad5806c SHA512 0c027283681a24058dbe18bad5289488d65d5ebecdda34f38ad63a6d84b54fd457475ada9ab7269925ced5eacbd22f27fea739ace99bd83ca9ce8f9b2d5f0714
diff --git a/dev-python/asyncssh/asyncssh-2.10.1.ebuild b/dev-python/asyncssh/asyncssh-2.10.1.ebuild
deleted file mode 100644
index 78351fb4caf1..000000000000
--- a/dev-python/asyncssh/asyncssh-2.10.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DOCS_BUILDER="sphinx"
-DOCS_DIR="docs"
-EPYTEST_DESELECT=(
-	tests/test_connection.py::_TestConnection::test_connect_timeout_exceeded
-	tests/test_connection.py::_TestConnection::test_connect_timeout_exceeded_string
-	tests/test_connection.py::_TestConnection::test_connect_timeout_exceeded_tunnel
-) # network tests
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1 docs optfeature
-
-DESCRIPTION="Asynchronous SSHv2 client and server library"
-HOMEPAGE="
-	https://asyncssh.timeheart.net
-	https://pypi.org/project/asyncssh/
-	https://github.com/ronf/asyncssh
-"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="ECL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/cryptography-3.1[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-3.6[${PYTHON_USEDEP}]
-"
-DEPEND="${REDEPEND}"
-BDEPEND="
-	test? (
-		>=dev-python/bcrypt-3.1.3[${PYTHON_USEDEP}]
-		>=dev-python/gssapi-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/libnacl-1.4.2[${PYTHON_USEDEP}]
-		>=dev-python/pyopenssl-17.0.0[${PYTHON_USEDEP}]
-		>=dev-python/python-pkcs11-0.7.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs
-
-pkg_postinst() {
-	optfeature "support for OpenSSH private key encryption" dev-python/bcrypt
-	optfeature "support for key exchange and authentication with U2F/FIDO2 security keys" dev-python/fido2
-	optfeature "support for accessing PIV keys on PKCS#11 security tokens" dev-python/python-pkcs11
-	optfeature "support for GSSAPI key exchange and authentication on UNIX" dev-python/gssapi
-	optfeature "if you have a version of OpenSSL older than 1.1.1b installed and you want support for Curve25519 key exchange, Ed25519 keys and certificates, or the Chacha20-Poly1305 cipher" dev-python/libnacl
-	optfeature "support for UMAC cryptographic hashes" dev-python/libnettle
-	optfeature "support for X.509 certificate authentication" dev-python/pyopenssl
-}
diff --git a/dev-python/asyncssh/asyncssh-2.11.0.ebuild b/dev-python/asyncssh/asyncssh-2.11.0.ebuild
deleted file mode 100644
index 78351fb4caf1..000000000000
--- a/dev-python/asyncssh/asyncssh-2.11.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DOCS_BUILDER="sphinx"
-DOCS_DIR="docs"
-EPYTEST_DESELECT=(
-	tests/test_connection.py::_TestConnection::test_connect_timeout_exceeded
-	tests/test_connection.py::_TestConnection::test_connect_timeout_exceeded_string
-	tests/test_connection.py::_TestConnection::test_connect_timeout_exceeded_tunnel
-) # network tests
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1 docs optfeature
-
-DESCRIPTION="Asynchronous SSHv2 client and server library"
-HOMEPAGE="
-	https://asyncssh.timeheart.net
-	https://pypi.org/project/asyncssh/
-	https://github.com/ronf/asyncssh
-"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="ECL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/cryptography-3.1[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-3.6[${PYTHON_USEDEP}]
-"
-DEPEND="${REDEPEND}"
-BDEPEND="
-	test? (
-		>=dev-python/bcrypt-3.1.3[${PYTHON_USEDEP}]
-		>=dev-python/gssapi-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/libnacl-1.4.2[${PYTHON_USEDEP}]
-		>=dev-python/pyopenssl-17.0.0[${PYTHON_USEDEP}]
-		>=dev-python/python-pkcs11-0.7.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs
-
-pkg_postinst() {
-	optfeature "support for OpenSSH private key encryption" dev-python/bcrypt
-	optfeature "support for key exchange and authentication with U2F/FIDO2 security keys" dev-python/fido2
-	optfeature "support for accessing PIV keys on PKCS#11 security tokens" dev-python/python-pkcs11
-	optfeature "support for GSSAPI key exchange and authentication on UNIX" dev-python/gssapi
-	optfeature "if you have a version of OpenSSL older than 1.1.1b installed and you want support for Curve25519 key exchange, Ed25519 keys and certificates, or the Chacha20-Poly1305 cipher" dev-python/libnacl
-	optfeature "support for UMAC cryptographic hashes" dev-python/libnettle
-	optfeature "support for X.509 certificate authentication" dev-python/pyopenssl
-}
diff --git a/dev-python/asyncssh/asyncssh-2.13.1.ebuild b/dev-python/asyncssh/asyncssh-2.13.1.ebuild
new file mode 100644
index 000000000000..a65a669657c3
--- /dev/null
+++ b/dev-python/asyncssh/asyncssh-2.13.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-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=setuptools
+inherit distutils-r1 optfeature pypi
+
+DESCRIPTION="Asynchronous SSHv2 client and server library"
+HOMEPAGE="
+	https://asyncssh.timeheart.net
+	https://pypi.org/project/asyncssh/
+	https://github.com/ronf/asyncssh
+"
+
+LICENSE="ECL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/cryptography-3.1[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-3.6[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/aiofiles[${PYTHON_USEDEP}]
+		>=dev-python/bcrypt-3.1.3[${PYTHON_USEDEP}]
+		>=dev-python/fido2-0.9.2[${PYTHON_USEDEP}]
+		>=dev-python/gssapi-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/libnacl-1.4.2[${PYTHON_USEDEP}]
+		>=dev-python/pyopenssl-17.0.0[${PYTHON_USEDEP}]
+		>=dev-python/python-pkcs11-0.7.0[${PYTHON_USEDEP}]
+		dev-python/uvloop[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+distutils_enable_sphinx docs
+
+pkg_postinst() {
+	optfeature "OpenSSH private key encryption support" dev-python/bcrypt
+	optfeature "key exchange and authentication with U2F/FIDO2 security keys support" dev-python/fido2
+	optfeature "accessing PIV keys on PKCS#11 security tokens support" dev-python/python-pkcs11
+	optfeature "GSSAPI key exchange and authentication support" dev-python/gssapi
+	optfeature "UMAC cryptographic hashes support" dev-python/libnettle
+	optfeature "X.509 certificate authentication support" dev-python/pyopenssl
+}
diff --git a/dev-python/axisregistry/axisregistry-0.3.11.ebuild b/dev-python/axisregistry/axisregistry-0.3.11.ebuild
index baf17de4aa70..1efa90db084f 100644
--- a/dev-python/axisregistry/axisregistry-0.3.11.ebuild
+++ b/dev-python/axisregistry/axisregistry-0.3.11.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
 "
 DEPEND="
 	${RDEPEND}
-	>=dev-python/setuptools_scm-6[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-scm-6[${PYTHON_USEDEP}]
 	test? (
 		dev-python/coverage[${PYTHON_USEDEP}]
 		dev-python/black[${PYTHON_USEDEP}]
diff --git a/dev-python/cffsubr/cffsubr-0.2.9_p1.ebuild b/dev-python/cffsubr/cffsubr-0.2.9_p1.ebuild
index 1a1afb614225..c6d1c696f74f 100644
--- a/dev-python/cffsubr/cffsubr-0.2.9_p1.ebuild
+++ b/dev-python/cffsubr/cffsubr-0.2.9_p1.ebuild
@@ -22,7 +22,7 @@ RDEPEND="
 	>=dev-util/afdko-3.6.1[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 "
 
 PATCHES=(
diff --git a/dev-python/charset_normalizer/Manifest b/dev-python/charset_normalizer/Manifest
index f9fb6b20746a..0a661d5f3cd7 100644
--- a/dev-python/charset_normalizer/Manifest
+++ b/dev-python/charset_normalizer/Manifest
@@ -1 +1,2 @@
 DIST charset_normalizer-3.0.1.gh.tar.gz 89120 BLAKE2B ce46758a0e188c2c3370e8cadcf35430e62fc7abb158d4c6c86b4a93a75b30fbff10b584ebaaf9489c47bdcfe9ad3b04d0fe3e474b03b89700364b676caf4e0f SHA512 9c78713b17e9e8d10b2ac8de26b8481dd039aab98eb990d0788f82c354afc8290040da1aa07faed6f90590fed098e793fdf2aa257825222e44571c1810f263ec
+DIST charset_normalizer-3.1.0.gh.tar.gz 90246 BLAKE2B 2e96f7c9910091e81d05a6632f14b6ec9481f1f927551ac8d70c1b320c21b7b4be196118391ec4db3291f74819e9488c71d90dc9a489e51849d251fb97ec8f9d SHA512 77657990605ef342934c140b7a9b38cf843d9739725deb3d755a00000dd1e3a9b25d73986cf26cdb291ea0f32aee0c3f5dfb771cb22b8b19246eb909b78240ce
diff --git a/dev-python/charset_normalizer/charset_normalizer-3.1.0.ebuild b/dev-python/charset_normalizer/charset_normalizer-3.1.0.ebuild
new file mode 100644
index 000000000000..fc1c00e04d27
--- /dev/null
+++ b/dev-python/charset_normalizer/charset_normalizer-3.1.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
+EAPI=7
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="The Real First Universal Charset Detector"
+HOMEPAGE="
+	https://pypi.org/project/charset-normalizer/
+	https://github.com/Ousret/charset_normalizer/
+"
+SRC_URI="
+	https://github.com/Ousret/charset_normalizer/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -o addopts=
+}
diff --git a/dev-python/click-command-tree/Manifest b/dev-python/click-command-tree/Manifest
new file mode 100644
index 000000000000..baaaa333b1b6
--- /dev/null
+++ b/dev-python/click-command-tree/Manifest
@@ -0,0 +1 @@
+DIST click-command-tree-1.1.1.gh.tar.gz 3991 BLAKE2B 7fc40e8273c05aedb8f71ddfe33d640761f3fe8c02afdb8973828b8c247910c67e7469aa43e41bc003dadd741736c0b4ffc48d146cd417051a4b939299a49033 SHA512 e9e8298b8efeb41331f03b8cbe1777bc01fdab246770d975ea27e1b1c513320ab34f61cffd72d19d878669d75d952401dcfffabc0e2d2e70bc52f1a6248f25b0
diff --git a/dev-python/click-command-tree/click-command-tree-1.1.1.ebuild b/dev-python/click-command-tree/click-command-tree-1.1.1.ebuild
new file mode 100644
index 000000000000..c1575a08b053
--- /dev/null
+++ b/dev-python/click-command-tree/click-command-tree-1.1.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 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="click plugin to show the command tree of your CLI"
+HOMEPAGE="https://pypi.org/project/click-command-tree/"
+SRC_URI="https://github.com/whwright/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/click
+"
+BDEPEND=""
+DEPEND="${RDEPEND}"
+
+distutils_enable_tests unittest
diff --git a/dev-python/click-command-tree/metadata.xml b/dev-python/click-command-tree/metadata.xml
new file mode 100644
index 000000000000..736a1167c898
--- /dev/null
+++ b/dev-python/click-command-tree/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ 
+ <origin>gentoo-guru-overlay</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-python/compreffor/compreffor-0.5.2.ebuild b/dev-python/compreffor/compreffor-0.5.2.ebuild
index ebc6850e527a..62030908339d 100644
--- a/dev-python/compreffor/compreffor-0.5.2.ebuild
+++ b/dev-python/compreffor/compreffor-0.5.2.ebuild
@@ -24,7 +24,7 @@ RDEPEND=">=dev-python/fonttools-4[${PYTHON_USEDEP}]"
 DEPEND=">=dev-python/cython-0.29.24[${PYTHON_USEDEP}]"
 BDEPEND="
 	app-arch/unzip
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 "
 
 PATCHES=( "${FILESDIR}/${PN}-0.5.1_p1-remove-unwanted-dependencies.patch" )
diff --git a/dev-python/convertdate/convertdate-2.4.0.ebuild b/dev-python/convertdate/convertdate-2.4.0.ebuild
index 7e18b4d38a68..776013809639 100644
--- a/dev-python/convertdate/convertdate-2.4.0.ebuild
+++ b/dev-python/convertdate/convertdate-2.4.0.ebuild
@@ -20,5 +20,5 @@ RDEPEND="dev-python/pymeeus[${PYTHON_USEDEP}]"
 distutils_enable_tests pytest
 
 distutils_enable_sphinx docs \
-	dev-python/myst_parser \
+	dev-python/myst-parser \
 	dev-python/sphinx-rtd-theme
diff --git a/dev-python/cu2qu/cu2qu-1.6.7_p2.ebuild b/dev-python/cu2qu/cu2qu-1.6.7_p2.ebuild
index bcc8141dd3de..553e87ef46c5 100644
--- a/dev-python/cu2qu/cu2qu-1.6.7_p2.ebuild
+++ b/dev-python/cu2qu/cu2qu-1.6.7_p2.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
 BDEPEND="
 	app-arch/unzip
 	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests pytest
diff --git a/dev-python/cymem/Manifest b/dev-python/cymem/Manifest
deleted file mode 100644
index 9f84911e57a0..000000000000
--- a/dev-python/cymem/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST cymem-2.0.6.tar.gz 8241 BLAKE2B 359c1cee8b3d01a2e659898992c22da7f7e3fab0ae5481d328f660c314a0dde85ca868e63e2c1b55b3624e568f369b8e993da04fa30c2ea79d21472cc6c1f7b0 SHA512 058fef116e02a38960017bfb4347f625fd5bda39cc239c8b434c7c928a9303678e1689ae5860181750fa23d8ee7a0bce1836c33420b6b4799d297df85f2b64e7
-DIST cymem-2.0.7.tar.gz 9911 BLAKE2B 3a54b97e283cf1c7935ff71af9144ed02ec37f85394d75bffa22c162b0d7548f1a0d74c8266d5b634a66dabebc90419fe34d2ade388a9379e2660665aeb27122 SHA512 bc5f95eef51044db48a3bfd4c4db1955dee6fb62f7bd16c103c957d77cec9192a8e11411b84a3449629015a080217ee2e52cca69867f70170498333648f18d0c
diff --git a/dev-python/cymem/cymem-2.0.6.ebuild b/dev-python/cymem/cymem-2.0.6.ebuild
deleted file mode 100644
index 6bcd234028ec..000000000000
--- a/dev-python/cymem/cymem-2.0.6.ebuild
+++ /dev/null
@@ -1,28 +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,11} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Manage calls to calloc/free through Cython"
-HOMEPAGE="
-	https://pypi.org/project/cymem/
-	https://github.com/explosion/cymem
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-python/cython[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_test() {
-	cd "${T}" || die
-	epytest --pyargs ${PN}
-}
diff --git a/dev-python/cymem/cymem-2.0.7.ebuild b/dev-python/cymem/cymem-2.0.7.ebuild
deleted file mode 100644
index 60cdf44f5113..000000000000
--- a/dev-python/cymem/cymem-2.0.7.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2022 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=setuptools
-inherit distutils-r1
-
-DESCRIPTION="Manage calls to calloc/free through Cython"
-HOMEPAGE="
-	https://pypi.org/project/cymem/
-	https://github.com/explosion/cymem
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
-
-PATCHES=( "${FILESDIR}"/cymem-2.0.7-flags.patch )
-
-distutils_enable_tests pytest
-
-python_test() {
-	cd "${T}" || die
-	epytest --pyargs ${PN}
-}
diff --git a/dev-python/cymem/files/cymem-2.0.7-flags.patch b/dev-python/cymem/files/cymem-2.0.7-flags.patch
deleted file mode 100644
index 433fe9e5c890..000000000000
--- a/dev-python/cymem/files/cymem-2.0.7-flags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Don't overwrite user optimizations
-
---- a/setup.py
-+++ b/setup.py
-@@ -18,7 +18,7 @@ MOD_NAMES = ["cymem.cymem"]
- # http://stackoverflow.com/questions/724664/python-distutils-how-to-get-a-compiler-that-is-going-to-be-used
- compile_options = {
-     "msvc": ["/Ox", "/EHsc"],
--    "other": ["-O3", "-Wno-strict-prototypes", "-Wno-unused-function"],
-+    "other": ["-Wno-strict-prototypes", "-Wno-unused-function"],
- }
- link_options = {"msvc": [], "other": []}
- 
diff --git a/dev-python/daiquiri/daiquiri-3.0.1.ebuild b/dev-python/daiquiri/daiquiri-3.0.1.ebuild
index e8df0ea28790..d8c559013ca4 100644
--- a/dev-python/daiquiri/daiquiri-3.0.1.ebuild
+++ b/dev-python/daiquiri/daiquiri-3.0.1.ebuild
@@ -23,7 +23,7 @@ RDEPEND="
 "
 DEPEND="
 	${RDEPEND}
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests pytest
diff --git a/dev-python/decopatch/decopatch-1.4.10.ebuild b/dev-python/decopatch/decopatch-1.4.10.ebuild
index 1701b95b29a4..83a86e464f31 100644
--- a/dev-python/decopatch/decopatch-1.4.10.ebuild
+++ b/dev-python/decopatch/decopatch-1.4.10.ebuild
@@ -23,7 +23,7 @@ KEYWORDS="~amd64"
 
 RDEPEND="dev-python/makefun[${PYTHON_USEDEP}]"
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? ( dev-python/pytest-cases[${PYTHON_USEDEP}] )
 "
 
diff --git a/dev-python/decopatch/decopatch-1.4.9.ebuild b/dev-python/decopatch/decopatch-1.4.9.ebuild
index 1711f808fc05..924170a9b3c0 100644
--- a/dev-python/decopatch/decopatch-1.4.9.ebuild
+++ b/dev-python/decopatch/decopatch-1.4.9.ebuild
@@ -21,7 +21,7 @@ KEYWORDS="~amd64"
 
 RDEPEND="dev-python/makefun[${PYTHON_USEDEP}]"
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? ( dev-python/pytest-cases[${PYTHON_USEDEP}] )
 "
 
diff --git a/dev-python/django-tables2/Manifest b/dev-python/django-tables2/Manifest
index 5b5c8d167dbf..1ba20f0a22ab 100644
--- a/dev-python/django-tables2/Manifest
+++ b/dev-python/django-tables2/Manifest
@@ -1,2 +1,3 @@
 DIST django-tables2-2.5.1.gh.tar.gz 430778 BLAKE2B 7811880ec49a514b74252d32fbc59d800aaa34fb2bf4af5675d1c4555c7a52f9eb3ca67d8d940697146c07de1e42006c6d3880a53b31a386bd088aa6939b056f SHA512 baf955b255dcbcf09250cfdbb2dc1fb51f3f9142ad29bf4ca8888344d1bcbe9f23a59f1509cad7e847d82bb6d410a494ed9eae1d4d4ca633e7f0351e4a98839d
 DIST django-tables2-2.5.2.gh.tar.gz 430733 BLAKE2B 70aa25ca949e4244a089894a26e384d5fbdd77cc5f7b939c9fd594c70114dafd0b8134d8327d247c1272159f278c54c980a5363ad86c75af95b4ffed489468cb SHA512 0a3522cd7500e09bfbe1dd4ee102542f9e6361163195928b2d8ea301133b39aa8d417bba29b93a6166b79b744fd58889af8ae8eb49bcc2251c21dd8b9b64827e
+DIST django-tables2-2.5.3.gh.tar.gz 431016 BLAKE2B 5564cd1ea19ffd7de83f949103bb5a56f987efd1e8a0cb356a0455c2244118b60c7ef78eb8fc7e57e023007046c51b4717470ee3542e1ed8a84b65e481455e75 SHA512 61b79e9fd8c2ea69afe88d7f2dd7f7015e53a6b68800c769106214bbc5818bc4f5b30eebe2d190cd6cc3a36686978befcc9b88fb4a0a7930f5bb37c608345e30
diff --git a/dev-python/django-tables2/django-tables2-2.5.3.ebuild b/dev-python/django-tables2/django-tables2-2.5.3.ebuild
new file mode 100644
index 000000000000..5564e75ca694
--- /dev/null
+++ b/dev-python/django-tables2/django-tables2-2.5.3.ebuild
@@ -0,0 +1,52 @@
+# 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} )
+
+inherit distutils-r1
+
+DESCRIPTION="Table/data-grid framework for Django"
+HOMEPAGE="
+	https://pypi.org/project/django-tables2/
+	https://github.com/jieter/django-tables2/
+"
+SRC_URI="
+	https://github.com/jieter/django-tables2/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+SLOT="0"
+LICENSE="BSD-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/django-3.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/django-filter[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/psycopg:2[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)
+"
+
+src_prepare() {
+	# these tests require tablib
+	rm tests/test_export.py tests/test_templatetags.py || die
+	# these tests require fudge
+	rm tests/test_config.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	"${EPYTHON}" manage.py test -v 2 tests || die
+}
diff --git a/dev-python/django-widget-tweaks/django-widget-tweaks-1.4.12.ebuild b/dev-python/django-widget-tweaks/django-widget-tweaks-1.4.12.ebuild
index 430d26ccb341..ffd3d87f0ecc 100644
--- a/dev-python/django-widget-tweaks/django-widget-tweaks-1.4.12.ebuild
+++ b/dev-python/django-widget-tweaks/django-widget-tweaks-1.4.12.ebuild
@@ -22,7 +22,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/django[${PYTHON_USEDEP}]"
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? ( ${RDEPEND} )
 "
 
diff --git a/dev-python/ensurepip-setuptools/Manifest b/dev-python/ensurepip-setuptools/Manifest
index 840f4a1aa481..c0a3bac284e3 100644
--- a/dev-python/ensurepip-setuptools/Manifest
+++ b/dev-python/ensurepip-setuptools/Manifest
@@ -1,3 +1,4 @@
 DIST setuptools-65.6.3-py3-none-any.whl 1233963 BLAKE2B 2bad02cc00293c9b6615cdcee9f2da4d66f83c494904c0467054ec15cb5650a7b72caaa52bb8925aea84eb6becd52107ba10763c2b241216d91072a1319f5d24 SHA512 6a9bf2230840ab90b228b433552e8813a176a9ad5f6dc74b20da412fe96c4a7f1df6095aac8dc2f25bd2393aae731927875eb9e7bc05203907539fb4a3b5c8fb
 DIST setuptools-67.2.0-py3-none-any.whl 1082973 BLAKE2B 7769ebdbde59e47cfc9f364ab28fada207e0b0826e0a40ccdec4ab4c8536148f8a8e071d688f74464a74dca6fb62ca840f3f54a48ccae5c016dd476634b99d2d SHA512 3987cc21a40b55f3aaae1ec643843dc473f8a3b442461892cbc77cc78f056c7e3736aad8624b68d8061358fbbeb555faf62c498df259de63fe3feecdd0d786e4
 DIST setuptools-67.4.0-py3-none-any.whl 1088291 BLAKE2B 9306200c32a903695edbc6330e6853368fc0dfc9c8b8b79ee6650b90a30f2ed321b9478ae2fb14755718ab7fb25db349d4028405f2aacfb70e6a6e8d0d2d35cd SHA512 b70632f1f7299c107cacfe8f0bbe1e448b660321977562dc0d18144eb997692c579f88e2f25b967f5c97ec8475e9e6314002685435ba6c8d9b5e39e27f8d4862
+DIST setuptools-67.5.1-py3-none-any.whl 1089040 BLAKE2B 3a63dd1cbcbd48110cb1a146f9ce27f4b5898058d5bace6ab504654894cefe2f7883b7d1166bd225b474de07f035e259dab870f708438b4c4d5a0c87b8f6f747 SHA512 64db0154188a67a7bec4862a45585a94ddc87d6bcce9f11caa933428dc590aa90116deb81d1e2850f5372eebec0cfd162f515aaf65bbd68e874c974aaabd0b71
diff --git a/dev-python/ensurepip-setuptools/ensurepip-setuptools-67.5.1.ebuild b/dev-python/ensurepip-setuptools/ensurepip-setuptools-67.5.1.ebuild
new file mode 100644
index 000000000000..c13c3370cbbe
--- /dev/null
+++ b/dev-python/ensurepip-setuptools/ensurepip-setuptools-67.5.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit pypi
+
+DESCRIPTION="Shared setuptools wheel for ensurepip Python module"
+HOMEPAGE="https://pypi.org/project/setuptools/"
+SRC_URI="$(pypi_wheel_url "${PN#ensurepip-}")"
+S=${DISTDIR}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	!<dev-python/ensurepip-wheels-100
+"
+
+src_install() {
+	insinto /usr/lib/python/ensurepip
+	doins "${A}"
+}
diff --git a/dev-python/fontMath/fontMath-0.9.3.ebuild b/dev-python/fontMath/fontMath-0.9.3.ebuild
index 18792f4f3cb4..dff129e6ee12 100644
--- a/dev-python/fontMath/fontMath-0.9.3.ebuild
+++ b/dev-python/fontMath/fontMath-0.9.3.ebuild
@@ -22,7 +22,7 @@ SLOT="0"
 RDEPEND=">=dev-python/fonttools-3.32.0[${PYTHON_USEDEP}]"
 BDEPEND="
 	app-arch/unzip
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests pytest
diff --git a/dev-python/gbinder/gbinder-1.1.1-r10.ebuild b/dev-python/gbinder/gbinder-1.1.1-r10.ebuild
index 2f3f8d0e3205..e69a8110488d 100644
--- a/dev-python/gbinder/gbinder-1.1.1-r10.ebuild
+++ b/dev-python/gbinder/gbinder-1.1.1-r10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-python/gbinder/gbinder-1.1.1.ebuild b/dev-python/gbinder/gbinder-1.1.1.ebuild
index ed0ec498bf97..8cd797c93d32 100644
--- a/dev-python/gbinder/gbinder-1.1.1.ebuild
+++ b/dev-python/gbinder/gbinder-1.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-python/gbinder/gbinder-9999.ebuild b/dev-python/gbinder/gbinder-9999.ebuild
index ed0ec498bf97..8cd797c93d32 100644
--- a/dev-python/gbinder/gbinder-9999.ebuild
+++ b/dev-python/gbinder/gbinder-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-python/gflanguages/gflanguages-0.4.0-r1.ebuild b/dev-python/gflanguages/gflanguages-0.4.0-r1.ebuild
index c1b7d7cd9b51..80b0415720e2 100644
--- a/dev-python/gflanguages/gflanguages-0.4.0-r1.ebuild
+++ b/dev-python/gflanguages/gflanguages-0.4.0-r1.ebuild
@@ -22,7 +22,7 @@ SLOT="0"
 RDEPEND="dev-python/protobuf-python[${PYTHON_USEDEP}]"
 DEPEND="
 	${RDEPEND}
-	>=dev-python/setuptools_scm-4[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-scm-4[${PYTHON_USEDEP}]
 "
 
 PATCHES=( "${FILESDIR}/${P}-remove-setuptools_scm-constraint.patch" )
diff --git a/dev-python/glyphsLib/glyphsLib-6.0.5.ebuild b/dev-python/glyphsLib/glyphsLib-6.0.5.ebuild
index 3d4d8503fec7..6340eeb43a6d 100644
--- a/dev-python/glyphsLib/glyphsLib-6.0.5.ebuild
+++ b/dev-python/glyphsLib/glyphsLib-6.0.5.ebuild
@@ -22,7 +22,7 @@ RDEPEND="
 "
 DEPEND="
 	${RDEPEND}
-	>=dev-python/setuptools_scm-6.0[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-scm-6.0[${PYTHON_USEDEP}]
 	dev-python/wheel[${PYTHON_USEDEP}]
 "
 BDEPEND="
diff --git a/dev-python/glyphsets/glyphsets-0.5.4-r1.ebuild b/dev-python/glyphsets/glyphsets-0.5.4-r1.ebuild
index d69f16e95599..11a61b5f9f56 100644
--- a/dev-python/glyphsets/glyphsets-0.5.4-r1.ebuild
+++ b/dev-python/glyphsets/glyphsets-0.5.4-r1.ebuild
@@ -26,7 +26,7 @@ RDEPEND="
 "
 DEPEND="
 	${RDEPEND}
-	>=dev-python/setuptools_scm-4[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-scm-4[${PYTHON_USEDEP}]
 "
 
 PATCHES=( "${FILESDIR}/${PN}-0.5.0-remove-setuptools_scm.constraint.patch" )
diff --git a/dev-python/http-ece/http-ece-1.1.0.ebuild b/dev-python/http-ece/http-ece-1.1.0.ebuild
index c6061dc4fb94..0cf47206973e 100644
--- a/dev-python/http-ece/http-ece-1.1.0.ebuild
+++ b/dev-python/http-ece/http-ece-1.1.0.ebuild
@@ -20,6 +20,9 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 
+# v1.1.0 is incompatible with latest 'cryptography'
+RESTRICT="test"
+
 RDEPEND="dev-python/cryptography[${PYTHON_USEDEP}]"
 
-distutils_enable_tests nose
+distutils_enable_tests pytest
diff --git a/dev-python/hunter/Manifest b/dev-python/hunter/Manifest
index efb297676672..7812a3e934a0 100644
--- a/dev-python/hunter/Manifest
+++ b/dev-python/hunter/Manifest
@@ -1,2 +1 @@
-DIST hunter-3.4.3.gh.tar.gz 538017 BLAKE2B 92ad2b653d0285059ea2f005c6ba9564f357e1ea438a0fe30087f88efa202aaa504bad65985a88484cf7178c24432ac44705098dabc2667328c71e0ee38f718c SHA512 921bb48ac5d384977908dda060e178e623eb7c1e4298cbf3c0a273cab23695f2a2a60221afb257e54cd144399d2b3b55b80ae9a2c7f71ba452894cc86112d5f7
 DIST hunter-3.5.1.gh.tar.gz 543137 BLAKE2B a06966f78fd442231c08e2aafe57702f7cc16e5db6aa9a1da7288e4a3a05ff9db3dfc49352641610ade31cb967996c3add64f07ddf637f46e5d269e9d0363a9f SHA512 2c302fa8b88c07be5361f11d8c250c5673be9dc691df9e966959eed45eaf0a8499ae8a6381256d83ab7219c818ed981628fb3299ef5d17d7b1d95c43a2fc63a7
diff --git a/dev-python/hunter/hunter-3.4.3-r1.ebuild b/dev-python/hunter/hunter-3.4.3-r1.ebuild
deleted file mode 100644
index c549ca10dac8..000000000000
--- a/dev-python/hunter/hunter-3.4.3-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
-
-DESCRIPTION="Hunter is a flexible code tracing toolkit"
-HOMEPAGE="
-	https://github.com/ionelmc/python-hunter
-	https://pypi.org/project/hunter/
-"
-SRC_URI="https://github.com/ionelmc/python-${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-S="${WORKDIR}/python-${P}"
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-# python-hunter only works if deps are vendored (some .pth stuff)
-#RDEPEND="
-	#>=dev-python/colorama-0.4.4[${PYTHON_USEDEP}]
-	#dev-python/cymem[${PYTHON_USEDEP}]
-#"
-DEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools_scm-3.3.1[${PYTHON_USEDEP}]
-	test? (
-		dev-python/aspectlib[${PYTHON_USEDEP}]
-		dev-python/ipdb[${PYTHON_USEDEP}]
-		dev-python/manhole[${PYTHON_USEDEP}]
-		dev-python/process-tests[${PYTHON_USEDEP}]
-		dev-python/pytest-benchmark[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		dev-python/toml[${PYTHON_USEDEP}]
-	)
-" # toml is an indirect dependency (needed by ipdb)
-
-DOCS=( AUTHORS.rst CHANGELOG.rst README.rst )
-
-EPYTEST_IGNORE=( test_remote.py )
-EPYTEST_DESELECT=(
-	tests/test_tracer.py::test_source_cython
-	tests/test_tracer.py::test_fullsource_cython
-)
-
-distutils_enable_tests pytest
-
-distutils_enable_sphinx docs ">=dev-python/sphinx-py3doc-enhanced-theme-2.3.2"
-
-src_unpack() {
-	default
-	cp -a "${S}" tests_package || die
-	mv -f tests_package/tests/setup.py tests_package || die
-}
-
-python_test() {
-	cp -a "${BUILD_DIR}"/{install,test} || die
-	local -x PATH=${BUILD_DIR}/test/usr/bin:${PATH}
-
-	cd "${WORKDIR}"/tests_package >/dev/null || die
-	distutils_pep517_install "${BUILD_DIR}"/test
-
-	cd ./tests || die
-	epytest
-}
diff --git a/dev-python/hunter/hunter-3.5.1.ebuild b/dev-python/hunter/hunter-3.5.1.ebuild
index e469c3ffc01d..77372a758836 100644
--- a/dev-python/hunter/hunter-3.5.1.ebuild
+++ b/dev-python/hunter/hunter-3.5.1.ebuild
@@ -22,7 +22,7 @@ KEYWORDS="~amd64"
 
 BDEPEND="
 	dev-python/cython[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-3.3.1[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-scm-3.3.1[${PYTHON_USEDEP}]
 	test? (
 		dev-python/aspectlib[${PYTHON_USEDEP}]
 		dev-python/ipdb[${PYTHON_USEDEP}]
diff --git a/dev-python/inscriptis/inscriptis-2.3.1.ebuild b/dev-python/inscriptis/inscriptis-2.3.1.ebuild
index 9095333784a3..d1fd36d52a2f 100644
--- a/dev-python/inscriptis/inscriptis-2.3.1.ebuild
+++ b/dev-python/inscriptis/inscriptis-2.3.1.ebuild
@@ -28,5 +28,5 @@ DOCS=( AUTHORS {CONTRIBUTING,RENDERING}.md README.rst TODO.txt )
 distutils_enable_tests pytest
 
 distutils_enable_sphinx docs \
-	dev-python/myst_parser \
+	dev-python/myst-parser \
 	dev-python/alabaster
diff --git a/dev-python/inscriptis/inscriptis-2.3.2.ebuild b/dev-python/inscriptis/inscriptis-2.3.2.ebuild
index 9095333784a3..d1fd36d52a2f 100644
--- a/dev-python/inscriptis/inscriptis-2.3.2.ebuild
+++ b/dev-python/inscriptis/inscriptis-2.3.2.ebuild
@@ -28,5 +28,5 @@ DOCS=( AUTHORS {CONTRIBUTING,RENDERING}.md README.rst TODO.txt )
 distutils_enable_tests pytest
 
 distutils_enable_sphinx docs \
-	dev-python/myst_parser \
+	dev-python/myst-parser \
 	dev-python/alabaster
diff --git a/dev-python/ipykernel/ipykernel-6.21.2.ebuild b/dev-python/ipykernel/ipykernel-6.21.2.ebuild
index 9b51bb25e82f..9d295ac36111 100644
--- a/dev-python/ipykernel/ipykernel-6.21.2.ebuild
+++ b/dev-python/ipykernel/ipykernel-6.21.2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 
 RDEPEND="
 	>=dev-python/comm-0.1.1[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyter_client/jupyter_client-8.0.3.ebuild b/dev-python/jupyter_client/jupyter_client-8.0.3.ebuild
index a1f917b98cb7..cec240943a10 100644
--- a/dev-python/jupyter_client/jupyter_client-8.0.3.ebuild
+++ b/dev-python/jupyter_client/jupyter_client-8.0.3.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 
 RDEPEND="
 	>=dev-python/jupyter_core-5.1[${PYTHON_USEDEP}]
diff --git a/dev-python/mkdocs-material/Manifest b/dev-python/mkdocs-material/Manifest
index 8b3befdd71e3..ccad0e286316 100644
--- a/dev-python/mkdocs-material/Manifest
+++ b/dev-python/mkdocs-material/Manifest
@@ -4,3 +4,4 @@ DIST mkdocs-material-9.0.13.gh.tar.gz 10930459 BLAKE2B d3d4b25e2e2b524caa70a47c2
 DIST mkdocs-material-9.0.14.gh.tar.gz 10932657 BLAKE2B a43fe024bd4c285801c10a3a45b0e601bc5c338fde51408db8c23cdf84455b606461fffda86d8bcb53374102a32a5efe315467305842a5e9fc5859db26b06b0e SHA512 9821fc1ce6e1b74b920b7c928c9ceb00d8f7489939c58d12c9a7c238ca75b619a23bffe0eccb7653d5303eaf6281e2fbd81392b19ff8f4c1431754544a432297
 DIST mkdocs-material-9.0.15.gh.tar.gz 10923424 BLAKE2B d2980f058001f0246be4ad34496a066b962e9fed8239415dd54dff0287211d97a640a2aca808aea1daec2f445b548153f6efd229bba515c968d50bd609936b4d SHA512 39b4a6d5d50ea27c7cdd2d23cf2d41a79d6dc0e1949346bd8d7c0e9a0792f7a9a9ae15594ff83017211d858d94240a09b0314a6294f268cf43e7337868ba5e69
 DIST mkdocs-material-9.1.0.gh.tar.gz 10868677 BLAKE2B b51fa6e78f087c74a6e2d38d56645492758af0ab2dee16427eb5628c4c3617b3b00b9a2f2ca04c687b98838551873c596b7dffa79cb888ca93f96f05a11f9990 SHA512 1ca7a8250732d737d6e0940243f0d835002736c2eadb5eb0eb1f58fe061d9a277ccd5e99ac3766642c464596d2ce31e445dfa02251b1db0dc1a4adcdbfc90db3
+DIST mkdocs-material-9.1.1.gh.tar.gz 10874113 BLAKE2B 24da8a9c93b46afaf7d2faf3becc3735c72e831b8ed5f3153f493178feffd9ee720b9a394814d8a151a337343065f664c0978fc8b02d357523d62c94c80a1f52 SHA512 e7c023027c9d970fde94a9bbd20e9b22a4f9666f3778660b759937ad855514720b710d8d32fa71802e3455bb1d3545b0451c055edd428098916acb980f465a7f
diff --git a/dev-python/mkdocs-material/mkdocs-material-9.1.1.ebuild b/dev-python/mkdocs-material/mkdocs-material-9.1.1.ebuild
new file mode 100644
index 000000000000..4de43bd469bc
--- /dev/null
+++ b/dev-python/mkdocs-material/mkdocs-material-9.1.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+	dev-python/mkdocs-material-extensions
+	dev-python/mkdocs-minify-plugin
+	dev-python/mkdocs-redirects
+"
+
+inherit distutils-r1 docs
+
+DESCRIPTION="A Material Design theme for MkDocs"
+HOMEPAGE="
+	https://github.com/squidfunk/mkdocs-material/
+	https://pypi.org/project/mkdocs-material/
+"
+SRC_URI="
+	https://github.com/squidfunk/${PN}/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/jinja-3.0.2[${PYTHON_USEDEP}]
+	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
+	>=dev-python/mkdocs-1.4.2[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.14[${PYTHON_USEDEP}]
+	>=dev-python/pymdown-extensions-9.9.1[${PYTHON_USEDEP}]
+"
+
+# mkdocs-material-extensions depends on mkdocs-material creating a circular dep
+PDEPEND="
+	>=dev-python/mkdocs-material-extensions-1.1.0[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+	# simplify pyproject to remove extra deps for metadata
+	"${FILESDIR}/${PN}-8.5.7-simplify-build.patch"
+)
+
+src_prepare() {
+	echo "__version__ = '${PV}'" > gentoo_version.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/mkdocs-swagger-ui-tag/Manifest b/dev-python/mkdocs-swagger-ui-tag/Manifest
new file mode 100644
index 000000000000..2ff058b63eff
--- /dev/null
+++ b/dev-python/mkdocs-swagger-ui-tag/Manifest
@@ -0,0 +1 @@
+DIST mkdocs-swagger-ui-tag-0.5.2.tar.gz 3577775 BLAKE2B 89a73486c0b9075d4695ff5d83d8df92391e3e1fdebcefec40150911d929b710b7754777c5413e84005960cb425e9e825d8345c0fab78b7bafa6b5732bc3d977 SHA512 5b8eac5fad9ed245e6a3dabebff65b1c4af8239091c2557f558383ad965496c711a05d40c5965b313efa022757f3ec52abe894ba984ec4bbf3737d7d16286476
diff --git a/dev-python/cymem/metadata.xml b/dev-python/mkdocs-swagger-ui-tag/metadata.xml
index ddb5b0f1787e..ddb5b0f1787e 100644
--- a/dev-python/cymem/metadata.xml
+++ b/dev-python/mkdocs-swagger-ui-tag/metadata.xml
diff --git a/dev-python/mkdocs-swagger-ui-tag/mkdocs-swagger-ui-tag-0.5.2.ebuild b/dev-python/mkdocs-swagger-ui-tag/mkdocs-swagger-ui-tag-0.5.2.ebuild
new file mode 100644
index 000000000000..1445f8f0d7db
--- /dev/null
+++ b/dev-python/mkdocs-swagger-ui-tag/mkdocs-swagger-ui-tag-0.5.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 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="MkDocs Swagger UI Tag"
+HOMEPAGE="
+	https://blueswen.github.io/mkdocs-swagger-ui-tag/
+	https://pypi.org/project/mkdocs-swagger-ui-tag/
+	https://github.com/Blueswen/mkdocs-swagger-ui-tag
+"
+SRC_URI="https://github.com/Blueswen/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND=">=dev-python/beautifulsoup4-4.11.1[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/click[${PYTHON_USEDEP}]
+		dev-python/mkdocs-material[${PYTHON_USEDEP}]
+	)
+"
+
+HTML_DOCS=( docs/. )
+
+distutils_enable_tests pytest
diff --git a/dev-python/nbclassic/Manifest b/dev-python/nbclassic/Manifest
index b377c2e19a91..86369cfad9f7 100644
--- a/dev-python/nbclassic/Manifest
+++ b/dev-python/nbclassic/Manifest
@@ -1,2 +1,3 @@
 DIST nbclassic-0.5.1.tar.gz 20178622 BLAKE2B 1ff79c9af218011c697016ecef149f42e683607eebb8e199ef75957d9d3127858ce8f443aeedb60844e3277b4c8cd4959d123658a5103ab2112fec469ef01a96 SHA512 1dabc27ad115d1961e7881e7a51653449cae291c74aea222bbf92d49cb7bc9657ae1f1d9a81eafbd70bc0cafd57b75cd2c76bebf91aabc5fdd9eede534f1cec9
 DIST nbclassic-0.5.2.tar.gz 20182217 BLAKE2B 02a91ea461acf56c8aeafab5d2af726c21add89bdfd651be9225fb3ec278de76bf8ab76c30d2e16f3a7b7a7d17f13a58907a14b2389c029dd0bb74af565115d0 SHA512 c26b86ee5958a6bb2b891f0bfff7fd90054727977a5cb29aacf1681e56490dcc7b8275709d74597e7d99940493a39499b8c8832a92fcf1a57955f20e100a10a4
+DIST nbclassic-0.5.3.tar.gz 20199979 BLAKE2B aa509bbd2bab51b94f475e81b7e1c5661370e850680df8f64c86d76ff2aed7a84a0e6c00f36a695ef7f84cdc731fb7613107abc96fb13a3127ded6689d6e81a1 SHA512 07e26d4cb30e3388420ced182a31a050419f4a872256efca6684e4af0e08ec8bf7f6f14f127fe1391457ad5fc792377a1a7bafc0fa1a92eec455454c6321a9ec
diff --git a/dev-python/nbclassic/nbclassic-0.5.3.ebuild b/dev-python/nbclassic/nbclassic-0.5.3.ebuild
new file mode 100644
index 000000000000..e53c6f92d5c8
--- /dev/null
+++ b/dev-python/nbclassic/nbclassic-0.5.3.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-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=jupyter
+
+inherit distutils-r1 pypi xdg-utils
+
+DESCRIPTION="Jupyter Notebook as a Jupyter Server Extension"
+HOMEPAGE="
+	https://jupyter.org/
+	https://github.com/jupyter/nbclassic/
+	https://pypi.org/project/nbclassic/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/argon2-cffi[${PYTHON_USEDEP}]
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	dev-python/ipython_genutils[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_client-6.1.1[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_core-4.6.1[${PYTHON_USEDEP}]
+	>=dev-python/nbconvert-5[${PYTHON_USEDEP}]
+	dev-python/nbformat[${PYTHON_USEDEP}]
+	>=dev-python/nest_asyncio-1.5[${PYTHON_USEDEP}]
+	>=dev-python/notebook_shim-0.1.0[${PYTHON_USEDEP}]
+	dev-python/prometheus_client[${PYTHON_USEDEP}]
+	>=dev-python/send2trash-1.8.0[${PYTHON_USEDEP}]
+	>=dev-python/terminado-0.8.3[${PYTHON_USEDEP}]
+	>=dev-python/tornado-6.1[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
+
+	<dev-python/notebook-7[${PYTHON_USEDEP}]
+"
+
+# dev-python/nbval is missing impls
+BDEPEND="
+	test? (
+		dev-python/jupyter-server-terminals[${PYTHON_USEDEP}]
+		dev-python/pytest_jupyter[${PYTHON_USEDEP}]
+		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/requests-unixsocket[${PYTHON_USEDEP}]
+		dev-python/testpath[${PYTHON_USEDEP}]
+	)
+	doc? (
+		virtual/pandoc
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs/source \
+	dev-python/sphinx-rtd-theme \
+	dev-python/nbsphinx \
+	dev-python/sphinxcontrib-github-alt \
+	dev-python/myst-parser \
+	dev-python/ipython_genutils
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -p pytest_tornasync.plugin
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	# move /usr/etc stuff to /etc
+	mv "${ED}/usr/etc" "${ED}/etc" || die
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/dev-python/nkdfu/Manifest b/dev-python/nkdfu/Manifest
new file mode 100644
index 000000000000..116b7ad8b509
--- /dev/null
+++ b/dev-python/nkdfu/Manifest
@@ -0,0 +1 @@
+DIST nkdfu-0.2.gh.tar.gz 16046 BLAKE2B dbd01a333391ae94fccae6cf7cecccce2b742fcb91fab421208236cfa7576b1a31ebf21dd168813534c8ca401d964c12b73d340ddd8e6e6ca009257a1a306f5e SHA512 3b94b65115e84ca0a065746f92415d7be436484fd9a949ac841955ffd98a061ec7c9016f1d9bc05af1006fcfc2ca21a94f51a0d3a036c27945cf568b75cc7d58
diff --git a/dev-python/nkdfu/metadata.xml b/dev-python/nkdfu/metadata.xml
new file mode 100644
index 000000000000..736a1167c898
--- /dev/null
+++ b/dev-python/nkdfu/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ 
+ <origin>gentoo-guru-overlay</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-python/nkdfu/nkdfu-0.2.ebuild b/dev-python/nkdfu/nkdfu-0.2.ebuild
new file mode 100644
index 000000000000..6931d576f32f
--- /dev/null
+++ b/dev-python/nkdfu/nkdfu-0.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+inherit distutils-r1
+
+DESCRIPTION="Python DFU tool for updating Nitrokeys' firmware"
+HOMEPAGE="https://pypi.org/project/nkdfu/"
+SRC_URI="https://github.com/Nitrokey/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/intelhex-2.3.0[${PYTHON_USEDEP}]
+	>=dev-python/libusb1-1.9.3[${PYTHON_USEDEP}]
+	dev-python/python-fire[${PYTHON_USEDEP}]
+	dev-python/tqdm[${PYTHON_USEDEP}]
+"
+BDEPEND=""
diff --git a/dev-python/openapi-core/Manifest b/dev-python/openapi-core/Manifest
index a361adf97f70..8243379b8dff 100644
--- a/dev-python/openapi-core/Manifest
+++ b/dev-python/openapi-core/Manifest
@@ -1,2 +1,3 @@
 DIST openapi-core-0.16.5.gh.tar.gz 104046 BLAKE2B 7dcda69b6d548a0df8c7727b184c7f7ec6d645e14ab4b4a256f188c6cc4ae9e351bc06ae03770782d81a11dfb5ebc08c20daabbd2151cfe62f84b05f80a47a16 SHA512 59db6d39a950079739b2df4114f26d85be55dc1f42d1661e8e6c17cf878cd8167f29ba4d3b6f40e06e85bb144c68286cb50adf4403091461798144cac05d5bc0
 DIST openapi-core-0.16.6.gh.tar.gz 104008 BLAKE2B bb1bdac98dfc5aef0961624488074363568f53a6c44cb0730be0d103d891d24bed86659f640e0d07da4072edc233c904c0ddcfd9e8b3960ace1af078c0d745e5 SHA512 556636a4698dcd7db6c656333849077abacdac1a440fe58210ad8f02c1f0220e46dea29962346dfb3f89d164ebc986ec750c184840be9a34a5e1dd98fbf8ef98
+DIST openapi-core-0.17.0.gh.tar.gz 129743 BLAKE2B 34b64f2c956218377d37c5f9e382aa503d50556d2a9ff292355831a39ff9632942b3dd6074cf91ba6cdb2fd93e12e4b3700232e720c71e814fde27f08052bb5a SHA512 6c284cbc8656b319291d81b73c3b714e1b9d8f85bbdf4b4636f8adcd0e47e59147f96a9cf117a6fcd49b7eeea4bbdbee28e3b60019add652e527c6af554d1cb7
diff --git a/dev-python/openapi-core/openapi-core-0.17.0.ebuild b/dev-python/openapi-core/openapi-core-0.17.0.ebuild
new file mode 100644
index 000000000000..6f2f0f264af0
--- /dev/null
+++ b/dev-python/openapi-core/openapi-core-0.17.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Client-side and server-side support for the OpenAPI Specification v3"
+HOMEPAGE="
+	https://github.com/python-openapi/openapi-core/
+	https://pypi.org/project/openapi-core/
+"
+SRC_URI="
+	https://github.com/python-openapi/openapi-core/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/pathable-0.4.0[${PYTHON_USEDEP}]
+	dev-python/isodate[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-spec-0.1.1[${PYTHON_USEDEP}]
+	dev-python/more-itertools[${PYTHON_USEDEP}]
+	dev-python/parse[${PYTHON_USEDEP}]
+	<dev-python/openapi-schema-validator-0.5[${PYTHON_USEDEP}]
+	>=dev-python/openapi-schema-validator-0.4.2[${PYTHON_USEDEP}]
+	<dev-python/openapi-spec-validator-0.6[${PYTHON_USEDEP}]
+	>=dev-python/openapi-spec-validator-0.5[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/asgiref[${PYTHON_USEDEP}]
+		dev-python/flask[${PYTHON_USEDEP}]
+		>=dev-python/httpx-0.23.0[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		>=dev-python/starlette-0.21.0[${PYTHON_USEDEP}]
+		dev-python/strict-rfc3339[${PYTHON_USEDEP}]
+		dev-python/webob[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# falcon is not packaged
+	tests/integration/contrib/falcon
+
+	# TODO: these tests fail to collect
+	tests/integration/validation/test_security_override.py
+	tests/integration/validation/test_read_only_write_only.py
+
+	# unhappy about modern django
+	tests/integration/contrib/django/test_django_project.py
+	tests/unit/contrib/django/test_django.py
+)
+
+src_prepare() {
+	sed -i -e '/--cov/d' pyproject.toml || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/openstep-plist/openstep-plist-0.3.0.ebuild b/dev-python/openstep-plist/openstep-plist-0.3.0.ebuild
index f5f950b42494..000f1b1c0748 100644
--- a/dev-python/openstep-plist/openstep-plist-0.3.0.ebuild
+++ b/dev-python/openstep-plist/openstep-plist-0.3.0.ebuild
@@ -18,7 +18,7 @@ SLOT="0"
 
 DEPEND=">=dev-python/cython-0.28.5[${PYTHON_USEDEP}]"
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
 		dev-python/pytest-cython[${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/oscrypto/Manifest b/dev-python/oscrypto/Manifest
index 45a95bdae287..3007bc1fce26 100644
--- a/dev-python/oscrypto/Manifest
+++ b/dev-python/oscrypto/Manifest
@@ -1 +1 @@
-DIST oscrypto-1.3.0.tar.gz 313874 BLAKE2B 6dd3331978d0ca8e63a136988d55bd6e1314078256f6c5141f26d49382e8908b58974c8f8d281a98a7e5efff2e477488baf7a37e3ea4a17bf887c92f9b1d9985 SHA512 b5baf72e1a09615b267be4d1c4baf2375bb939b5bd3d717ca9ca70776541f590a8608bef95991967e23f3794e6220709ed2fe5acdedfe9bfce1921c879a74bec
+DIST oscrypto-1.3.0.gh.tar.gz 313874 BLAKE2B 6dd3331978d0ca8e63a136988d55bd6e1314078256f6c5141f26d49382e8908b58974c8f8d281a98a7e5efff2e477488baf7a37e3ea4a17bf887c92f9b1d9985 SHA512 b5baf72e1a09615b267be4d1c4baf2375bb939b5bd3d717ca9ca70776541f590a8608bef95991967e23f3794e6220709ed2fe5acdedfe9bfce1921c879a74bec
diff --git a/dev-python/oscrypto/oscrypto-1.3.0-r1.ebuild b/dev-python/oscrypto/oscrypto-1.3.0-r1.ebuild
new file mode 100644
index 000000000000..b8d77491264a
--- /dev/null
+++ b/dev-python/oscrypto/oscrypto-1.3.0-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2023 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=setuptools
+inherit edo distutils-r1 optfeature
+
+DESCRIPTION="TLS sockets, key generation, encryption, decryption, signing, verification"
+HOMEPAGE="
+	https://pypi.org/project/oscrypto/
+	https://github.com/wbond/oscrypto
+"
+SRC_URI="https://github.com/wbond/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-libs/openssl
+	>=dev-python/asn1crypto-1.5.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		virtual/python-cffi[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( docs {changelog,readme}.md )
+
+distutils_enable_tests unittest
+
+python_test() {
+	local -x OSCRYPTO_SKIP_INTERNET_TESTS="true"
+	edo ${EPYTHON} -m tests
+}
+
+pkg_postinst() {
+	optfeature "faster FFI" virtual/python-cffi
+}
diff --git a/dev-python/oscrypto/oscrypto-1.3.0.ebuild b/dev-python/oscrypto/oscrypto-1.3.0.ebuild
deleted file mode 100644
index c5ed91fcb2a8..000000000000
--- a/dev-python/oscrypto/oscrypto-1.3.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="TLS sockets, key generation, encryption, decryption, signing, verification"
-HOMEPAGE="
-	https://github.com/wbond/oscrypto
-	https://pypi.org/project/oscrypto/
-"
-SRC_URI="https://github.com/wbond/oscrypto/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND=">=dev-python/asn1crypto-1.5.1[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-RESTRICT="test"
-PROPERTIES="test_network"
-
-python_test() {
-	"${EPYTHON}" run.py tests || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	dodoc -r docs/*
-}
diff --git a/dev-python/pproxy/pproxy-2.7.8.ebuild b/dev-python/pproxy/pproxy-2.7.8-r1.ebuild
index 6d9049372ab6..f5e2555debf4 100644
--- a/dev-python/pproxy/pproxy-2.7.8.ebuild
+++ b/dev-python/pproxy/pproxy-2.7.8-r1.ebuild
@@ -1,25 +1,25 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1 optfeature
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+inherit distutils-r1 optfeature pypi
 
 DESCRIPTION="TCP/UDP asynchronous tunnel proxy implemented in Python3 asyncio"
 HOMEPAGE="
-	https://github.com/qwj/python-proxy
 	https://pypi.org/project/pproxy/
+	https://github.com/qwj/python-proxy
 "
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 pkg_postinst() {
-	optfeature "ssh tunnelling" ">=dev-python/asyncssh-2.5.0"
-	optfeature "accelerated ciphers" ">=dev-python/pycryptodome-3.7.2 >=dev-python/uvloop-0.13.0"
-	optfeature "daemon" ">=dev-python/python-daemon-2.2.3"
+	optfeature "ssh tunnelling support" dev-python/asyncssh
+	optfeature "accelerated ciphers support" "dev-python/pycryptodome dev-python/uvloop"
+	optfeature "daemon support" dev-python/python-daemon
 }
diff --git a/dev-python/psautohint/Manifest b/dev-python/psautohint/Manifest
new file mode 100644
index 000000000000..f8e80518926d
--- /dev/null
+++ b/dev-python/psautohint/Manifest
@@ -0,0 +1,2 @@
+DIST psautohint-2.4.0-testdata.gh.tar.gz 21949984 BLAKE2B a5da67eb4b9f3d0ce5d86469bc0a5f771fa743198836db35121e9c62b66c8b8df00fef6e40e8832e33aee065fe3bdd0a24d1b590bce6fb66d7c43f6719236242 SHA512 03d4962958d3551ffdf99463d28723f6b43d42029843da1b40493b0bfc2e586ebf40db3a2497b36b5fde345de4b6998cfc1131c6fb4e8352b05fb59fc4e90e7f
+DIST psautohint-2.4.0.gh.tar.gz 181009 BLAKE2B bb6ed5ae6b800742d8d1061004bfb49a84e3b9c99977a653ef8eeccf38d9c03261be5b735df20ee93dcf712b8b6ade7a2391937f327206fc2e01f2b5bcbe9022 SHA512 dfc29d020bedf8bd546e395743befb390e9fb01a3025aa10357a32724c9a78236acd57e05300aa26be630c9d43edab8bda731dc4f51c0a07d0bef79112d952aa
diff --git a/dev-python/psautohint/files/psautohint-2.3.0-no-build-library.patch b/dev-python/psautohint/files/psautohint-2.3.0-no-build-library.patch
new file mode 100644
index 000000000000..2245a901e988
--- /dev/null
+++ b/dev-python/psautohint/files/psautohint-2.3.0-no-build-library.patch
@@ -0,0 +1,38 @@
+--- a/setup.py
++++ b/setup.py
+@@ -192,7 +192,7 @@
+         # If we were asked to build any C/C++ libraries, make sure that the
+         # directory where we put them is in the library search path for
+         # linking executables.
+-        if self.distribution.has_c_libraries():
++        if False:
+             build_clib = self.get_finalized_command('build_clib')
+             self.libraries.extend(build_clib.get_library_names() or [])
+             self.library_dirs.append(build_clib.build_clib)
+@@ -432,15 +432,13 @@
+ class CustomBuildExt(_build_ext):
+ 
+     def run(self):
+-        if self.distribution.has_c_libraries():
++        if False:
+             self.run_command("build_clib")
+         _build_ext.run(self)
+ 
+ 
+ cmdclass = {
+-    'build_clib': CustomBuildClib,
+     'build_ext': CustomBuildExt,
+-    'build_exe': build_exe,
+ }
+ 
+ 
+@@ -572,9 +570,7 @@
+       license='Apache License, Version 2.0',
+       package_dir={'': 'python'},
+       packages=['psautohint'],
+-      libraries=libraries,
+       ext_modules=ext_modules,
+-      executables=executables,
+       entry_points={
+           'console_scripts': [
+               "psautohint = psautohint.__main__:main",
diff --git a/dev-python/psautohint/files/psautohint-2.3.0-system-libs.patch b/dev-python/psautohint/files/psautohint-2.3.0-system-libs.patch
new file mode 100644
index 000000000000..fe6b5df3c011
--- /dev/null
+++ b/dev-python/psautohint/files/psautohint-2.3.0-system-libs.patch
@@ -0,0 +1,10 @@
+--- a/setup.py
++++ b/setup.py
+@@ -564,6 +564,7 @@ ext_modules = [
+         sources=[
+             "python/psautohint/_psautohint.c",
+         ],
++        libraries = ['psautohint'],
+     ),
+ ]
+ 
diff --git a/dev-python/psautohint/metadata.xml b/dev-python/psautohint/metadata.xml
new file mode 100644
index 000000000000..e8eceb9e17aa
--- /dev/null
+++ b/dev-python/psautohint/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+  <email>lssndrbarbieri@gmail.com</email>
+  <name>Alessandro Barbieri</name>
+  <description>co-maintainers welcome</description>
+ </maintainer>
+ <upstream>
+  <bugs-to>https://github.com/adobe-type-tools/psautohint/issues</bugs-to>
+ </upstream>
+ <origin>gentoo-guru-overlay</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-python/psautohint/psautohint-2.4.0-r1.ebuild b/dev-python/psautohint/psautohint-2.4.0-r1.ebuild
new file mode 100644
index 000000000000..c0e0f59e5a20
--- /dev/null
+++ b/dev-python/psautohint/psautohint-2.4.0-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-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=setuptools
+inherit meson distutils-r1
+
+COMMIT="1e4c5061d328105c4dcfcb6fdbc27ec49b3e9d23"
+DESCRIPTION="Python wrapper for Adobe's PostScript autohinter"
+HOMEPAGE="
+	https://pypi.org/project/psautohint/
+	https://github.com/adobe-type-tools/psautohint
+"
+SRC_URI="
+	https://github.com/adobe-type-tools/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz
+	test? (
+		https://github.com/adobe-type-tools/${PN}-testdata/archive/${COMMIT}.tar.gz -> ${P}-testdata.gh.tar.gz
+	)
+"
+
+KEYWORDS="~amd64"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+DEPEND="media-gfx/libpsautohint"
+RDEPEND="
+	${DEPEND}
+	>=dev-python/fonttools-4.20[${PYTHON_USEDEP}]
+	dev-python/fs[${PYTHON_USEDEP}]
+"
+BDEPEND="dev-python/setuptools-scm[${PYTHON_USEDEP}]"
+
+DOCS=( doc {NEWS,README}.md )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.3.0-system-libs.patch"
+	"${FILESDIR}/${PN}-2.3.0-no-build-library.patch"
+)
+
+EPYTEST_DESELECT=(
+	tests/integration/test_hint.py::test_hashmap_old_version
+	"tests/integration/test_mmhint.py::test_vfotf[tests/integration/data/vf_tests/CJKSparseVar.subset.hinted.otf]"
+)
+
+distutils_enable_tests pytest
+
+src_unpack() {
+	default
+
+	if use test; then
+		mv "${WORKDIR}"/psautohint-testdata-${COMMIT}/* "${S}"/tests/integration/data || die
+	fi
+}
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	rm -r libpsautohint || die
+	mkdir -p libpsautohint/src || die
+
+	rm pytest.ini || die
+}
+
+src_configure() {
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
diff --git a/dev-python/pymdown-extensions/Manifest b/dev-python/pymdown-extensions/Manifest
index 7423e9971071..f8156dfdb605 100644
--- a/dev-python/pymdown-extensions/Manifest
+++ b/dev-python/pymdown-extensions/Manifest
@@ -1 +1,2 @@
+DIST pymdown-extensions-9.10.gh.tar.gz 1056472 BLAKE2B f691d3fd762b97dd42d59c8e647469a8c0cc4202849661fdcc1c445721c48bd5ea84190a99306b9b5b2215968daf1f19f0765b11fb757045288188e07b55b1a1 SHA512 61784be05ba19424da8964f0b852733900a8f9bd699037f6cb1a3c608133c3c7cb3528549d3165d15340e680a67768d30f687c782cae56fc8030e246bcf4f023
 DIST pymdown-extensions-9.9.2.gh.tar.gz 1017219 BLAKE2B d41f0863654c3d4aa6a947f5fef9d0029368e4a990f48a6997ecd1a0196a6b70198a698a22bfe536217bc001b4d21b69b2d5e3b479616825787648ef33ad1a9b SHA512 7f89f527f4d28ee31bf74dfd2343509592d287e1196e8a5045bbeaa5f2a038defc36e5b52ed53064f6cc797534032ed7a9e733070ff68db099e41614b07e417c
diff --git a/dev-python/pymdown-extensions/pymdown-extensions-9.10.ebuild b/dev-python/pymdown-extensions/pymdown-extensions-9.10.ebuild
new file mode 100644
index 000000000000..c9044cf22cc8
--- /dev/null
+++ b/dev-python/pymdown-extensions/pymdown-extensions-9.10.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+	dev-python/mkdocs-git-revision-date-localized-plugin
+	dev-python/mkdocs-minify-plugin
+	dev-python/mkdocs-material
+	dev-python/pymdown-lexers
+	dev-python/pyspelling
+"
+DOCS_INITIALIZE_GIT=1
+
+inherit distutils-r1 docs
+
+DESCRIPTION="Extensions for Python Markdown"
+HOMEPAGE="
+	https://github.com/facelessuser/pymdown-extensions/
+	https://pypi.org/project/pymdown-extensions/
+"
+SRC_URI="
+	https://github.com/facelessuser/pymdown-extensions/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		>=dev-python/pygments-2.12.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_compile_all() {
+	default
+	# We need to do this manually instead of relying on docs_compile
+	# https://bytemeta.vip/repo/facelessuser/pymdown-extensions/issues/1446
+	# https://bugs.gentoo.org/859637
+	if use doc; then
+		python -m mkdocs build || die "Failed to make docs"
+		# Colliding files found by ecompress:
+		rm site/sitemap.xml.gz || die
+		HTML_DOCS=( "site/." )
+	fi
+}
diff --git a/dev-python/pytest-cases/pytest-cases-3.6.13.ebuild b/dev-python/pytest-cases/pytest-cases-3.6.13.ebuild
index f801315d3b52..5c8db320ac81 100644
--- a/dev-python/pytest-cases/pytest-cases-3.6.13.ebuild
+++ b/dev-python/pytest-cases/pytest-cases-3.6.13.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
 		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
 		dev-python/pytest-harvest[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-cases/pytest-cases-3.6.14.ebuild b/dev-python/pytest-cases/pytest-cases-3.6.14.ebuild
index 52352c77d93e..da7c56ce3f84 100644
--- a/dev-python/pytest-cases/pytest-cases-3.6.14.ebuild
+++ b/dev-python/pytest-cases/pytest-cases-3.6.14.ebuild
@@ -8,7 +8,10 @@ DISTUTILS_USE_PEP517=setuptools
 PYPI_NO_NORMALIZE=1
 
 DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="dev-python/mkdocs-material"
+DOCS_DEPEND=(
+	dev-python/mkdocs-material
+	dev-python/regex
+)
 
 inherit distutils-r1 docs pypi
 
@@ -28,7 +31,7 @@ RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
 		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
 		dev-python/pytest-harvest[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-cython/pytest-cython-0.2.1.ebuild b/dev-python/pytest-cython/pytest-cython-0.2.1.ebuild
index 1ebf708a8d27..9d0b03f1acc1 100644
--- a/dev-python/pytest-cython/pytest-cython-0.2.1.ebuild
+++ b/dev-python/pytest-cython/pytest-cython-0.2.1.ebuild
@@ -32,7 +32,7 @@ BDEPEND="
 distutils_enable_tests pytest
 
 distutils_enable_sphinx docs \
-	dev-python/myst_parser \
+	dev-python/myst-parser \
 	dev-python/sphinx-py3doc-enhanced-theme
 
 python_test() {
diff --git a/dev-python/pytest-harvest/pytest-harvest-1.10.4.ebuild b/dev-python/pytest-harvest/pytest-harvest-1.10.4.ebuild
index c886e6bf6042..d47b4cdd0a18 100644
--- a/dev-python/pytest-harvest/pytest-harvest-1.10.4.ebuild
+++ b/dev-python/pytest-harvest/pytest-harvest-1.10.4.ebuild
@@ -26,7 +26,7 @@ RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
 		dev-python/numpy[${PYTHON_USEDEP}]
 		dev-python/pandas[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-steps/pytest-steps-1.8.0.ebuild b/dev-python/pytest-steps/pytest-steps-1.8.0.ebuild
index a380e7edae78..709674ffdd2f 100644
--- a/dev-python/pytest-steps/pytest-steps-1.8.0.ebuild
+++ b/dev-python/pytest-steps/pytest-steps-1.8.0.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
 	dev-python/wrapt[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
 		dev-python/numpy[${PYTHON_USEDEP}]
 		dev-python/pandas[${PYTHON_USEDEP}]
diff --git a/dev-python/python-pkcs11/python-pkcs11-0.7.0-r1.ebuild b/dev-python/python-pkcs11/python-pkcs11-0.7.0-r1.ebuild
deleted file mode 100644
index 37ff26eb8440..000000000000
--- a/dev-python/python-pkcs11/python-pkcs11-0.7.0-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DOCS_BUILDER="sphinx"
-DOCS_DIR="${S}/docs"
-DOCS_DEPEND="dev-python/sphinx-rtd-theme"
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1 docs
-
-DESCRIPTION="PKCS#11 (Cryptoki) support for Python"
-HOMEPAGE="
-	https://github.com/danni/python-pkcs11
-	https://pypi.org/project/python-pkcs11/
-"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-#hardware device needed for tests
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-python/asn1crypto-1.0.0[${PYTHON_USEDEP}]
-	dev-python/cached-property[${PYTHON_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? (
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/oscrypto[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/python-pkcs11/python-pkcs11-0.7.0-r2.ebuild b/dev-python/python-pkcs11/python-pkcs11-0.7.0-r2.ebuild
new file mode 100644
index 000000000000..8cd2e866e583
--- /dev/null
+++ b/dev-python/python-pkcs11/python-pkcs11-0.7.0-r2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-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=setuptools
+PYPI_NO_NORMALIZE=1
+inherit edo distutils-r1 pypi
+
+DESCRIPTION="PKCS#11 (Cryptoki) support for Python"
+HOMEPAGE="
+	https://pypi.org/project/python-pkcs11/
+	https://github.com/danni/python-pkcs11
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/asn1crypto-1.0.0[${PYTHON_USEDEP}]
+	dev-python/cached-property[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+	test? (
+		dev-libs/openssl
+		dev-libs/softhsm
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		dev-python/oscrypto[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+distutils_enable_sphinx docs
+
+python_test() {
+	cd "${S}" || die
+	epytest
+}
+
+src_test() {
+	local -x PKCS11_MODULE="${BROOT}/usr/$(get_libdir)/softhsm/libsofthsm2.so"
+	local -x PKCS11_TOKEN_LABEL="TEST"
+	local -x PKCS11_TOKEN_PIN="1234"
+	local -x PKCS11_TOKEN_SO_PIN="5678"
+
+	mkdir -p "${HOME}/.config/softhsm2" || die
+	cat > "${HOME}/.config/softhsm2/softhsm2.conf" <<- EOF || die "Failed to create config"
+		directories.tokendir = ${T}
+		objectstore.backend = file
+	EOF
+
+	edo softhsm2-util --init-token --free \
+		--label ${PKCS11_TOKEN_LABEL} \
+		--pin ${PKCS11_TOKEN_PIN} \
+		--so-pin ${PKCS11_TOKEN_SO_PIN}
+
+	rm -r pkcs11 || die
+	distutils-r1_src_test
+}
diff --git a/dev-python/rpyc/Manifest b/dev-python/rpyc/Manifest
index 8a75fcd5f95b..06977f881ece 100644
--- a/dev-python/rpyc/Manifest
+++ b/dev-python/rpyc/Manifest
@@ -1,2 +1,3 @@
 DIST rpyc-5.2.3_p1.tar.gz 1269198 BLAKE2B 288568fcd34787850968d4e3fd9ca7c2d29e506f1331b746104760e678dfef43fd30b08f68b3bdda6df84d488f88dc76cfdd23d5a5ad0a4cefeab468ac6a1b0b SHA512 4b29899a51364779185d2b56f5d5ee4c650c40b8322e5594500222fdcec85414cdbabd41437467e2ff73124a79e8c9cde23dfe89138abb935732ccaba69de2bb
 DIST rpyc-5.3.0.gh.tar.gz 1270508 BLAKE2B c7b0c06ea7151d80d84e057b7991cbc7bcb047f24544b7669d80218f9eeb9342ba58020f608bb615dea932a1380b0afb36ba9f8e216f139ba4aadd4a7efa344d SHA512 371c60dedf3fba3232c5c1d7616a04b8cf2a8295e31b945ab51d0dee5ba5d8769062aafa860db85b951f0283b8800b61972a7f2f7fa3cc69929c7563e74be1ee
+DIST rpyc-5.3.1.gh.tar.gz 1271046 BLAKE2B b7c86aa5cf774d306b2d6fdbac97441533bc5a847aaf03c11b0abf0a07587a2f7d081470d3402fde4251ea6654051d96983feefa2ba7e65a9a95d76f179edcad SHA512 a328903c336483f7110cbbff96173ba0b5ae6cf16f6306c624055bd631d914772c42dcfcf48a275b7dc53241f6b10a397ee49f17b8a3c3c8dbee8f42ac784465
diff --git a/dev-python/rpyc/rpyc-5.3.1.ebuild b/dev-python/rpyc/rpyc-5.3.1.ebuild
new file mode 100644
index 000000000000..5e7ff44e2cd1
--- /dev/null
+++ b/dev-python/rpyc/rpyc-5.3.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Remote Python Call (RPyC), a transparent and symmetric RPC library"
+HOMEPAGE="https://rpyc.readthedocs.io/en/latest/
+	https://pypi.org/project/rpyc/
+	https://github.com/tomerfiliba-org/rpyc"
+SRC_URI="https://github.com/tomerfiliba-org/rpyc/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+# USE flags gdb, numpy are used *only* to run tests depending on these packages
+IUSE="test numpy gdb"
+RESTRICT="!test? ( test )"
+
+CDEPEND="numpy? ( dev-python/numpy[${PYTHON_USEDEP}] dev-python/pandas[${PYTHON_USEDEP}] )
+	gdb? ( sys-devel/gdb )"
+
+DEPEND="${CDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+RDEPEND="${CDEPEND}
+	dev-python/plumbum[${PYTHON_USEDEP}]"
+
+PATCHES=( "${FILESDIR}"/${PN}-5.3.0-no-gevent.patch )
+
+src_prepare() {
+	default
+
+	# Windows specific test
+	rm tests/test_win32pipes.py || die "rm tests/test_win32pipes.py failed"
+
+	# These tests require running sshd
+	rm tests/test_ssh.py tests/test_deploy.py || die "rm test_ssh.py test_deploy.py failed"
+
+	# This test requires internet access
+	rm tests/test_registry.py || die "rm test_registry.py failed"
+
+	# This test fails with NO_CIPHERS_AVAILABLE
+	rm tests/test_ssl.py || die "rm test_ssl.py failed"
+
+	# dev-python/gevent is being removed
+	rm tests/test_gevent_server.py || die "rm test_gevent_server.py failed"
+
+	if ! use numpy
+	then rm tests/test_service_pickle.py || die "rm test_service_pickle.py failed"
+	fi
+
+	if ! use gdb
+	then rm tests/test_gdb.py || die "rm test_gdb.py failed"
+	fi
+}
+
+python_test() {
+	# for some reason, when tests are run via pytest or nose, some of them hung
+	pushd tests > /dev/null || die "pushd tests failed"
+	for x in test_*.py
+	do PYTHONPATH="${WORKDIR}"/${P}-${EPYTHON/./_}/install/usr/lib/${EPYTHON}/site-packages ${EPYTHON} ${x} || die "${x} failed"
+	done
+	popd > /dev/null
+}
diff --git a/dev-python/rstcheck/rstcheck-6.1.1.ebuild b/dev-python/rstcheck/rstcheck-6.1.1.ebuild
index 2ced00aa082c..e89d62d725a4 100644
--- a/dev-python/rstcheck/rstcheck-6.1.1.ebuild
+++ b/dev-python/rstcheck/rstcheck-6.1.1.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="~amd64"
 
 RDEPEND="dev-python/docutils[${PYTHON_USEDEP}]"
 BDEPEND="
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-scm-1.15.0[${PYTHON_USEDEP}]
 	test? (
 		${RDEPEND}
 		dev-python/path[${PYTHON_USEDEP}]
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 712c8268b6c7..4d6fabfa15d7 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,3 +1,4 @@
 DIST setuptools-65.7.0.tar.gz 2618315 BLAKE2B a0989c3fd0ab476d69885d022eccf1a89dc670a17d0b3e73bbe4ffb530e26a838fcd1cfffc4c2720ddd19cb8ba45d42bc31441f1e3bbc32fa71850d208f37cc8 SHA512 0eb2d9de9ef2565cf012db7d68ee18359a1432dd42ecd3fb7d490f73d57b0e7ba2a67e0401f66051127e913f29c2e221e88c0cbf523b0ac9abe7f00b6ab1ded8
 DIST setuptools-67.2.0.tar.gz 2475665 BLAKE2B 1d82e21d5c5f7aea479d468ae5c29c62a86a552e811203794f2246bc715647c18c66ab6d37c9da3092fc2b402cc865c1ab85989092c9beccc440913ad7d51ccd SHA512 2d15719d7a0305535ee853e82b5196af2eaa29cbcf73c59515c2fa8e8c910c25fcf3854aac515789a51a845555b19c95e8d06fef4199cf19ba4a45dda5b7ab66
 DIST setuptools-67.4.0.tar.gz 2484170 BLAKE2B 5c72b2bb813a84337e00c30a1375a24ca997a07100ca7f83afcb76d1fbde1432b049faa76d50ce8c74b3ea753096e63a09359bdcca2cb0d1d57eea21bbe5c2c9 SHA512 d5865283e13a8f42b6b49f9c507f6c41e75a92ad2c4e4c2b4184a410003fadfe7629ed5824340110400143e2ce82cde2e50e9b2898335462376b28f440648cd5
+DIST setuptools-67.5.1.tar.gz 2485370 BLAKE2B ed063a287787e56850cd4f20a8f07cc8670138bdbbb934a0684ead355f234312e6d3cebabffbbc41fb2dd2df27c493878c6660ea073ea00e65d31cef8a6568c0 SHA512 c064415c3169ba87be76f5842266f0f92b766a4eaabacf320c708f5cdbe8d60007e14773889c00c877350dcf0ffa39174fa2e30416f4c7047787aefc26e6fff4
diff --git a/dev-python/setuptools/setuptools-67.5.1.ebuild b/dev-python/setuptools/setuptools-67.5.1.ebuild
new file mode 100644
index 000000000000..a1a31638dbe8
--- /dev/null
+++ b/dev-python/setuptools/setuptools-67.5.1.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
+EAPI=7
+
+# please bump dev-python/ensurepip-setuptools along with this package!
+
+DISTUTILS_USE_PEP517=standalone
+PYTHON_TESTED=( python3_{7,8,9,10,11} pypy3 )
+PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 multiprocessing pypi
+
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="
+	https://github.com/pypa/setuptools/
+	https://pypi.org/project/setuptools/
+"
+
+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"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/jaraco-text-3.7.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/more-itertools-8.12.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/nspektr-0.3.0[${PYTHON_USEDEP}]
+	>=dev-python/ordered-set-4.0.2-r1[${PYTHON_USEDEP}]
+	>=dev-python/packaging-21.3-r2[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2.6.2-r1[${PYTHON_USEDEP}]
+	>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-4.11.1[${PYTHON_USEDEP}]
+	' 3.9)
+"
+BDEPEND="
+	${RDEPEND}
+	>=dev-python/wheel-0.37.1-r1[${PYTHON_USEDEP}]
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/build[${PYTHON_USEDEP}]
+			>=dev-python/ini2toml-0.9[${PYTHON_USEDEP}]
+			>=dev-python/filelock-3.4.0[${PYTHON_USEDEP}]
+			>=dev-python/jaraco-envs-2.2[${PYTHON_USEDEP}]
+			>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
+			dev-python/pip[${PYTHON_USEDEP}]
+			dev-python/pip-run[${PYTHON_USEDEP}]
+			dev-python/pytest[${PYTHON_USEDEP}]
+			dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
+			dev-python/pytest-timeout[${PYTHON_USEDEP}]
+			dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
+			dev-python/pytest-xdist[${PYTHON_USEDEP}]
+			>=dev-python/tomli-w-1.0.0[${PYTHON_USEDEP}]
+			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
+			dev-python/wheel[${PYTHON_USEDEP}]
+		' "${PYTHON_TESTED[@]}")
+	)
+"
+PDEPEND="
+	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+"
+
+DOCS=( {CHANGES,README}.rst )
+
+src_prepare() {
+	local PATCHES=(
+		# TODO: remove this when we're 100% PEP517 mode
+		"${FILESDIR}"/setuptools-62.4.0-py-compile.patch
+	)
+
+	distutils-r1_src_prepare
+
+	# remove bundled dependencies, setuptools will switch to system deps
+	# automatically
+	rm -r */_vendor || die
+
+	# remove the ugly */extern hack that breaks on unvendored deps
+	rm -r */extern || die
+	find -name '*.py' -exec sed \
+		-e 's:from \w*[.]\+extern ::' -e 's:\w*[.]\+extern[.]::' \
+		-i {} + || die
+}
+
+python_test() {
+	local -x SETUPTOOLS_USE_DISTUTILS=stdlib
+
+	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
+		return
+	fi
+
+	local EPYTEST_DESELECT=(
+		# network
+		# TODO: see if PRE_BUILT_SETUPTOOLS_* helps
+		setuptools/tests/config/test_apply_pyprojecttoml.py::test_apply_pyproject_equivalent_to_setupcfg
+		setuptools/tests/integration/test_pip_install_sdist.py::test_install_sdist
+		setuptools/tests/test_build_meta.py::test_legacy_editable_install
+		setuptools/tests/test_distutils_adoption.py
+		setuptools/tests/test_editable_install.py
+		setuptools/tests/test_setuptools.py::test_its_own_wheel_does_not_contain_tests
+		setuptools/tests/test_virtualenv.py::test_clean_env_install
+		setuptools/tests/test_virtualenv.py::test_no_missing_dependencies
+		setuptools/tests/test_virtualenv.py::test_test_command_install_requirements
+		# TODO
+		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_basic
+		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_ignore_errors
+		setuptools/tests/test_extern.py::test_distribution_picklable
+		# expects bundled deps in virtualenv
+		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_in_sdist
+		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_not_in_wheel
+		setuptools/tests/test_editable_install.py::test_editable_with_pyproject
+		# fails if python-xlib is installed
+		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
+	)
+
+	if has_version "<dev-python/packaging-22"; then
+		EPYTEST_DESELECT+=(
+			# old packaging is more lenient
+			setuptools/tests/config/test_setupcfg.py::TestOptions::test_raises_accidental_env_marker_misconfig
+		)
+	fi
+
+	epytest -n "$(makeopts_jobs)" setuptools
+}
diff --git a/dev-python/skia-pathops/skia-pathops-0.7.2.ebuild b/dev-python/skia-pathops/skia-pathops-0.7.2.ebuild
index de42510ebf6f..b8b01846c9eb 100644
--- a/dev-python/skia-pathops/skia-pathops-0.7.2.ebuild
+++ b/dev-python/skia-pathops/skia-pathops-0.7.2.ebuild
@@ -25,7 +25,7 @@ DEPEND="${RDEPEND}
 "
 BDEPEND="
 	app-arch/unzip
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? ( dev-python/pytest-cython[${PYTHON_USEDEP}] )
 "
 
diff --git a/dev-python/sphinx-py3doc-enhanced-theme/Manifest b/dev-python/sphinx-py3doc-enhanced-theme/Manifest
index 81fb1a2d9077..01d0c3c38fc3 100644
--- a/dev-python/sphinx-py3doc-enhanced-theme/Manifest
+++ b/dev-python/sphinx-py3doc-enhanced-theme/Manifest
@@ -1,2 +1 @@
-DIST sphinx-py3doc-enhanced-theme-2.3.2.tar.gz 41894 BLAKE2B 9a38169b7e2c3331267f5c0a102d01cb0185689334adc98abe91626b27217add0abacde3422fe528588322ccc96f6976b80ce0e510cecfa80837d9b595cb2457 SHA512 efeeaf1bbb7f5557f5e1500dd0a49aa001b714f329f594e95676d8833eede7eb5e0fa978257caeab9630360b05f48132ffb00137262c7a5b663cae6a009ed42d
 DIST sphinx-py3doc-enhanced-theme-2.4.0.tar.gz 42093 BLAKE2B 020deec0d589d8052f2cce6faaeb8764b596a042584a0988dbcd73f0dc11c647db35b1b91fac63413ad211025fb98bbcc76a5bb2caa1cece56b907e021a0c20d SHA512 3ba362bf9179bdd69cd50fe7759cecd1ce89c7c5e7cd5f50d6f92af9835369436fc34b5dcc39295197828481041d30cf59dea3a929d232abd6b62e9e066b60f2
diff --git a/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2-r1.ebuild b/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2-r1.ebuild
deleted file mode 100644
index 968a89426c83..000000000000
--- a/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2-r1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Enhanced Sphinx theme (based on Python 3 docs)"
-HOMEPAGE="https://github.com/ionelmc/sphinx-py3doc-enhanced-theme
-	https://pypi.org/project/sphinx_py3doc_enhanced_theme/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.4.0.ebuild b/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.4.0.ebuild
index 75f7c113a54d..8a8c1fbbddbf 100644
--- a/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.4.0.ebuild
+++ b/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.4.0.ebuild
@@ -4,17 +4,17 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Enhanced Sphinx theme (based on Python 3 docs)"
 HOMEPAGE="
 	https://github.com/ionelmc/sphinx-py3doc-enhanced-theme/
 	https://pypi.org/project/sphinx_py3doc_enhanced_theme/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/dev-python/ttfautohint-py/ttfautohint-py-0.5.1-r1.ebuild b/dev-python/ttfautohint-py/ttfautohint-py-0.5.1-r1.ebuild
index a889067156ab..db779b49d866 100644
--- a/dev-python/ttfautohint-py/ttfautohint-py-0.5.1-r1.ebuild
+++ b/dev-python/ttfautohint-py/ttfautohint-py-0.5.1-r1.ebuild
@@ -20,7 +20,7 @@ SLOT="0"
 
 RDEPEND="media-gfx/ttfautohint"
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
 		dev-python/fonttools[${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/ufo2ft/ufo2ft-2.27.0.ebuild b/dev-python/ufo2ft/ufo2ft-2.27.0.ebuild
index 7089f5238554..37546f212a7c 100644
--- a/dev-python/ufo2ft/ufo2ft-2.27.0.ebuild
+++ b/dev-python/ufo2ft/ufo2ft-2.27.0.ebuild
@@ -28,7 +28,7 @@ RDEPEND="
 	>=dev-python/ufoLib2-0.13.1[${PYTHON_USEDEP}]
 "
 DEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
 		dev-python/glyphsLib[${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/ufoLib2/ufoLib2-0.13.1.ebuild b/dev-python/ufoLib2/ufoLib2-0.13.1.ebuild
index e23360b6d20b..7898ae7f09f9 100644
--- a/dev-python/ufoLib2/ufoLib2-0.13.1.ebuild
+++ b/dev-python/ufoLib2/ufoLib2-0.13.1.ebuild
@@ -32,7 +32,7 @@ RDEPEND="
 "
 DEPEND="
 	${RDEPEND}
-	>=dev-python/setuptools_scm-6.2[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-scm-6.2[${PYTHON_USEDEP}]
 	test? (
 		dev-python/typing-extensions[${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/ufoProcessor/ufoProcessor-1.9.0-r1.ebuild b/dev-python/ufoProcessor/ufoProcessor-1.9.0-r1.ebuild
index e06ef226ea89..37cd513b3acc 100644
--- a/dev-python/ufoProcessor/ufoProcessor-1.9.0-r1.ebuild
+++ b/dev-python/ufoProcessor/ufoProcessor-1.9.0-r1.ebuild
@@ -28,7 +28,7 @@ DEPEND="
 	${RDEPEND}
 	test? ( dev-python/unicodedata2[${PYTHON_USEDEP}] )
 "
-BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+BDEPEND="dev-python/setuptools-scm[${PYTHON_USEDEP}]"
 
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/uharfbuzz/uharfbuzz-0.33.0-r1.ebuild b/dev-python/uharfbuzz/uharfbuzz-0.33.0-r1.ebuild
index b3ccf675d4bd..fb36d18da879 100644
--- a/dev-python/uharfbuzz/uharfbuzz-0.33.0-r1.ebuild
+++ b/dev-python/uharfbuzz/uharfbuzz-0.33.0-r1.ebuild
@@ -22,7 +22,7 @@ RDEPEND=">=media-libs/harfbuzz-4.3.0:=[experimental(-)]"
 BDEPEND="
 	app-arch/unzip
 	>=dev-python/cython-0.28.1[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-2.1[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-scm-2.1[${PYTHON_USEDEP}]
 "
 
 PATCHES=( "${FILESDIR}/${PN}-0.33.0-system-harfbuzz.patch" )
diff --git a/dev-python/vttlib/vttlib-0.11.0.ebuild b/dev-python/vttlib/vttlib-0.11.0.ebuild
index 5693619caca6..5edd34137bae 100644
--- a/dev-python/vttlib/vttlib-0.11.0.ebuild
+++ b/dev-python/vttlib/vttlib-0.11.0.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
 "
 BDEPEND="
 	app-arch/unzip
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	dev-python/wheel[${PYTHON_USEDEP}]
 	test? (
 		>=dev-python/ufo2ft-2.14.0[${PYTHON_USEDEP}]
diff --git a/dev-python/xmlschema/Manifest b/dev-python/xmlschema/Manifest
index 11135117197f..bce576f78d37 100644
--- a/dev-python/xmlschema/Manifest
+++ b/dev-python/xmlschema/Manifest
@@ -1 +1,2 @@
 DIST xmlschema-2.2.1.tar.gz 491212 BLAKE2B 75212d7e159b0719bd1c01e8e31da6aab2b6422bb497d7312160aee4d00a920e65a135852441c2c61e83a9d8d65c94d9f5ed0f05e967fb456ffd46f314a4bb13 SHA512 8e3eef6379cbcb67fc0dd90f9a962f0ba890c5c9a1334c2cfe695e701b8a3aa1fa97f8e50c1e87cbdb5f0b7790bb84e1a181c00b678134cfbeeb8578fa78f724
+DIST xmlschema-2.2.2.tar.gz 492479 BLAKE2B 1d06841587172d8e67959e0096ac48c0ea3e63c24fa64d2ce9098a7031800a67aa73da9c7b4dcd1cde6ff8999bbc6c675dd157f962461f12446855788d38638a SHA512 a1bbc30e6233192cd275079019cd902d363b23bc02404686713dc16c05bf3a817676db20b6e6e5e7d8d6b9c9e228be3b19e541d0d3a9946765643894fcedc00e
diff --git a/dev-python/xmlschema/xmlschema-2.2.2.ebuild b/dev-python/xmlschema/xmlschema-2.2.2.ebuild
new file mode 100644
index 000000000000..1f97ee4426cf
--- /dev/null
+++ b/dev-python/xmlschema/xmlschema-2.2.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2019-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="An XML Schema validator and decoder"
+HOMEPAGE="
+	https://github.com/sissaschool/xmlschema/
+	https://pypi.org/project/xmlschema/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	<dev-python/elementpath-5[${PYTHON_USEDEP}]
+	>=dev-python/elementpath-4.0.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	"${EPYTHON}" tests/test_all.py -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/zopfli/Manifest b/dev-python/zopfli/Manifest
new file mode 100644
index 000000000000..3ecb0f1e39fd
--- /dev/null
+++ b/dev-python/zopfli/Manifest
@@ -0,0 +1 @@
+DIST zopfli-0.2.2.zip 205320 BLAKE2B 30bc3ed16c82e9527e5445b0fd758bf841ae970f4b10b6ebe3d88db5cf085a5b8e560e39282cfaacb6074184b08da7c142da330f7ba582fe35b5c1fdbdb0bd51 SHA512 5fd26039ce0bd910714fc4706a72d04bb5cf794957547943174ef12efe089c932802cc6bef4840a532f24d93fa726c0c23b0b1c2e6ec9eb3209c2f54b0eb8ba0
diff --git a/dev-python/zopfli/metadata.xml b/dev-python/zopfli/metadata.xml
new file mode 100644
index 000000000000..ddb5b0f1787e
--- /dev/null
+++ b/dev-python/zopfli/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+  <email>cyber+gentoo@sysrq.in</email>
+  <name>Anna</name>
+ </maintainer>
+ 
+ <origin>gentoo-guru-overlay</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-python/zopfli/zopfli-0.2.2.ebuild b/dev-python/zopfli/zopfli-0.2.2.ebuild
new file mode 100644
index 000000000000..ec4ebc4c0f68
--- /dev/null
+++ b/dev-python/zopfli/zopfli-0.2.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 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=setuptools
+inherit distutils-r1 pypi
+
+DESCRIPTION="Zopfli module for Python"
+HOMEPAGE="
+	https://pypi.org/project/zopfli/
+	https://github.com/fonttools/py-zopfli
+"
+SRC_URI="$(pypi_sdist_url ${PN} ${PV} .zip)"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="app-arch/zopfli:="
+RDEPEND="${DEPEND}"
+BDEPEND="
+	app-arch/unzip
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_configure() {
+	export USE_SYSTEM_ZOPFLI=1
+	distutils-r1_src_configure
+}
author	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2023-03-06 15:14:59 +0000
committer	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2023-03-06 15:14:59 +0000
commit	fde3b5bbeb07fb00d002d7686ba1fb259a5e5184 (patch)
tree	c7c2fa1cc942119d9d1f9fc9db5b4c2f15e8fea9 /dev-python
parent	7be16c0e5ac01853add3329935dacfdaa10b62e9 (diff)
download	baldeagleos-repo-fde3b5bbeb07fb00d002d7686ba1fb259a5e5184.tar.gz baldeagleos-repo-fde3b5bbeb07fb00d002d7686ba1fb259a5e5184.tar.xz baldeagleos-repo-fde3b5bbeb07fb00d002d7686ba1fb259a5e5184.zip