gentoo auto-resync : 19:05:2023 - 16:15:42

20 files changed, 293 insertions, 127 deletions

diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index a2ed2300cbe1..3f6e31e7444c 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 0868a8aeec9c..9cb4e02a14ad 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -19,6 +19,6 @@ EBUILD botocore-1.29.132.ebuild 1834 BLAKE2B 50305f707e533627ed4b906b3c5845a931f
 EBUILD botocore-1.29.133.ebuild 1834 BLAKE2B 50305f707e533627ed4b906b3c5845a931f825049d40d8e9d9eedf1323d130634b578f68adb046db30e3e9a4168361da69d99471a7b744407dc103130a114994 SHA512 45952178574e99269d9767374818d867bfcc47ebf0f4c37dbab6cf50089577badb69967bd06b0b2d10b15dcd1c3e8b82adac88404d7c3b7d7784292b4005e797
 EBUILD botocore-1.29.134.ebuild 1834 BLAKE2B 50305f707e533627ed4b906b3c5845a931f825049d40d8e9d9eedf1323d130634b578f68adb046db30e3e9a4168361da69d99471a7b744407dc103130a114994 SHA512 45952178574e99269d9767374818d867bfcc47ebf0f4c37dbab6cf50089577badb69967bd06b0b2d10b15dcd1c3e8b82adac88404d7c3b7d7784292b4005e797
 EBUILD botocore-1.29.135.ebuild 1834 BLAKE2B 50305f707e533627ed4b906b3c5845a931f825049d40d8e9d9eedf1323d130634b578f68adb046db30e3e9a4168361da69d99471a7b744407dc103130a114994 SHA512 45952178574e99269d9767374818d867bfcc47ebf0f4c37dbab6cf50089577badb69967bd06b0b2d10b15dcd1c3e8b82adac88404d7c3b7d7784292b4005e797
-EBUILD botocore-1.29.136.ebuild 1878 BLAKE2B 06c08bef2669a4d7a368940886cbbe9c9cc2dfbfa8b53fb57067957e904723f41b7c9339f776b5cb69a51caa999e5a962212c51e713e6d10b7e76c8e424d1438 SHA512 84ba51a40c75b10dea7795187157ca75d3a27a2d858a4f1a0bd19ab7fd3010eac8b764ff4279f70599eec9c846ad7955aa696338c44c055b04627ed07405e606
+EBUILD botocore-1.29.136-r1.ebuild 2485 BLAKE2B f7c931df1cf3c88ac69706626687c7c96d98c055d54969a36872f91a44028567f2a405a8cb6ce729b78a2f99655a6989db07c57a5e0333b897996e98c401e275 SHA512 9d6f15f5b7035cfc63eeb8e86710eaecb765c20c47b018f834d806212d3ec7506562f7b162886bdcc9cd4e15d8ffd776b1f51c890dbbfadacefec5e787d13b44
 EBUILD botocore-9999.ebuild 1736 BLAKE2B 6ca7ea14855f5f8db2d166ba1f29835d4c994a0a8fa38f3852406289a4465c091909562ac678f1c0bf7e640a594731b0d4319efc0f34f6bc640fbae06746c4bc SHA512 f891bf0eded88d9af3b87fc7c9ee4c6a129d263e672821f3b9654d43bb3bcac41305b834192088d15b50f3f9d36ea95374180cf13e1cb67149595ec63e4cc155
 MISC metadata.xml 499 BLAKE2B e5aaa7da26f200c09adfdf38b68f656bbccbec627cb5d966b280ac2165334e7eec659c89075bcace748f58e2ec3e7d2998e54a688d56ecea2d30653c67dfd35a SHA512 103c554d5dbd967bf9b6e418b3913d9235e7e910d012160909ce0715134ed2e37b06e6a345395f9d16ce08d1cf51f3ce458bce93c6a978fd3dca6610f2acdbd0
diff --git a/dev-python/botocore/botocore-1.29.136.ebuild b/dev-python/botocore/botocore-1.29.136-r1.ebuild
index b446172b3f31..3ced99abe4ff 100644
--- a/dev-python/botocore/botocore-1.29.136.ebuild
+++ b/dev-python/botocore/botocore-1.29.136-r1.ebuild
@@ -31,7 +31,6 @@ RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
 	<dev-python/jmespath-2[${PYTHON_USEDEP}]
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	<dev-python/urllib3-1.27[${PYTHON_USEDEP}]
 	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
 "
 BDEPEND="
@@ -67,6 +66,13 @@ python_test() {
 		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
 		# TODO
 		tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
+		# urllib3-2 compatibility, mock relies on implementation details
+		tests/unit/test_awsrequest.py::TestAWSHTTPConnection::test_expect_100_continue_no_response_from_server
+		tests/unit/test_awsrequest.py::TestAWSHTTPConnection::test_expect_100_continue_returned
+		tests/unit/test_awsrequest.py::TestAWSHTTPConnection::test_expect_100_continue_sends_307
+		tests/unit/test_awsrequest.py::TestAWSHTTPConnection::test_expect_100_sends_connection_header
+		tests/unit/test_awsrequest.py::TestAWSHTTPConnection::test_handles_expect_100_with_different_reason_phrase
+		tests/unit/test_awsrequest.py::TestAWSHTTPConnection::test_state_reset_on_connection_close
 	)
 
 	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
diff --git a/dev-python/flask-api/Manifest b/dev-python/flask-api/Manifest
index db2ded543fa1..487f2e85faa2 100644
--- a/dev-python/flask-api/Manifest
+++ b/dev-python/flask-api/Manifest
@@ -1,3 +1,3 @@
 DIST flask-api-3.0.gh.tar.gz 249620 BLAKE2B 63ce0ce6a2d4755caf40c020fc6b88f3b585b0c30f5800df62c8e442f629b8b489917ff0f0d1266d941478336f38aa0560c144620f6c11d60cbd9e31870bf984 SHA512 c86b919f8681a73be166ddc50022faecb376b1b6f99bd0d78b2f2fc8b64f82bf82779dbdcfbcaa1c5e321ea2d286b95f1a1aab32864e6c3923417d7828c7c79a
-EBUILD flask-api-3.0-r1.ebuild 775 BLAKE2B c45ef603ef3f6495b0e7693440f0d12944a44da14ce96dc72a288e63a65367ac08e3d57c3f5fae0f53ee6fb996ddcd183db2f61e35ada682b5825d3d6c7e930a SHA512 5d1748f8d22043bb533be00ad8d44dc5c49698ea48a5bc8f946bef9d76cd5f7a6727875bf698ba50d2cdbc1f62688e27b1419eea93cadcfe52be61169c0e601a
+EBUILD flask-api-3.0-r2.ebuild 892 BLAKE2B 1a413827c5344afa75809cb747cc1d933781cb0be98de8f4dd59517046c7b639b0285cf608e32ae7c06a27b9f558edacf2db1ca1c5bc8cb12ca34bdae52972da SHA512 a23a74ff4d5a31b4133747ebf8217f7eb959e4145097bad457d9087d53a46ee92a5a967c8c095b588b3590528f529e1079a3a8ad10881d6931487f78e0d98739
 MISC metadata.xml 728 BLAKE2B 54f369da75822026ef30c2f16efac1a478b1f42b8bde27710c73fb7b974cf70b5c266c182f6efc6096f4efc0c11645a74fd19ca30ab2dfd48af4e65a731983e6 SHA512 a009d75f162e2775ec5fb1eda9c12af46c76094d64952effe1dd9aa74ae3bfcd3dc40e4523cda464c8cc14eed150d8cef2175acd294574752d79f0ff8c97e8e7
diff --git a/dev-python/flask-api/flask-api-3.0-r1.ebuild b/dev-python/flask-api/flask-api-3.0-r2.ebuild
index 79ce434fb7a0..924851d79164 100644
--- a/dev-python/flask-api/flask-api-3.0-r1.ebuild
+++ b/dev-python/flask-api/flask-api-3.0-r2.ebuild
@@ -23,8 +23,10 @@ LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
+# tests are broken with 2.3, I don't know if the code works
+# https://github.com/flask-api/flask-api/issues/151
 RDEPEND="
-	dev-python/flask[${PYTHON_USEDEP}]
+	<dev-python/flask-2.3[${PYTHON_USEDEP}]
 	dev-python/markdown[${PYTHON_USEDEP}]
 "
 
diff --git a/dev-python/flask-login/Manifest b/dev-python/flask-login/Manifest
index 1f9672c3dc01..16cb81a9ab06 100644
--- a/dev-python/flask-login/Manifest
+++ b/dev-python/flask-login/Manifest
@@ -1,3 +1,5 @@
+DIST flask-login-0.6.2-werkzeug-2.3.patch 7954 BLAKE2B 4f732dbaa6bdbc8827f52eb9c1d046f2128908df316a1ca94b11ce8033fa8fa506ae41255b8f0e32bc91feae8874b995c2f46d2b7f4fbc5f9020748c5be1db23 SHA512 911fb67e96006073af1df6cf39b4be6eac4aaee63bdcab8d7191b097acb441fd984b3929200db6c0f1f329a65df33acaffc08e88409010fa40f0a787dc47c427
 DIST flask-login-0.6.2.gh.tar.gz 48195 BLAKE2B 74d980f9900d9c583e03caa704cf637c5c6dac6a26e74bc008f47c18213764bafef16e33d9d28eee588b3c2f7d2a5895eae88e5adf755fe0448f7e74d5c65e74 SHA512 b286272ad5f7de2cfc913bee4a3eac46e4c1ce274bb12467009e1abae422f1a855aa49fd898778b8a2e937eebe9fbb387af11815267a2bc120cde943939111ec
-EBUILD flask-login-0.6.2.ebuild 882 BLAKE2B 3a9ef2db30958088d786ed5d94d2de7a936921a9409165edd8b8f2f0a521523513ce51da0e332e7e6e8ba74a9ebe72a73a1ddfdade0584a26e433205191e8efb SHA512 6139a4ff4ab0b10ccb9cdfd1ff21790d95bb5700f10255fb33c698cdc09a912b5190544c5374fe555b590ae2929377912af9c7aa288e55bff8b5ec922f5d565e
+EBUILD flask-login-0.6.2-r1.ebuild 1027 BLAKE2B 07e22f790dd95d4ad26525f0669dafbc5bcb1e4158bd0af2e9dccefd24cfba5dde360246656893c926d026ff3539b9e95df8e574353ce40dd9c16564ea232e5a SHA512 a4395418149d6f549eb3e3dab754f3c2b948dbb1c0ed33e9ebb746ee946cac0ad812821cbc893bafb43b36479df1fb150ea5d8cf8c63a83ef1be321804bb9a40
+EBUILD flask-login-0.6.2.ebuild 927 BLAKE2B 19d8e1fcc0223a5e3fbf061585de1bcc1be613ef4ece043fc18ebfc2c54336cd5ed4fdd35a1b84910a52071413c56ddaa1aaa6e68dd16cb960d93a2c9b8ec21d SHA512 8a87139a24c06bad076593c735b1f9e61c1889b2af3ca99f61152adec68868eb6bad200881100d03456ecdac154f65d1ed9678451b2e30365273b5c801122d0c
 MISC metadata.xml 404 BLAKE2B 8f8070dd3be696102c88bf75e22511b75432dfd17d21f6f3ce084cbae8092bc91ce1cbb7e47d691c7ac502afd58882ccd0bd1ea732df9239a4ec1b70e8728f19 SHA512 0b32444d9f1508697be1a19a6eb57efa5cbff443baf35958c24161d0b716a55d96b0caf66936925970904642fde975d94f4360b8b96d018ebe0fad24216769a4
diff --git a/dev-python/flask-login/flask-login-0.6.2-r1.ebuild b/dev-python/flask-login/flask-login-0.6.2-r1.ebuild
new file mode 100644
index 000000000000..413c07e8cab5
--- /dev/null
+++ b/dev-python/flask-login/flask-login-0.6.2-r1.ebuild
@@ -0,0 +1,48 @@
+# 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_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Login session support for Flask"
+HOMEPAGE="
+	https://github.com/maxcountryman/flask-login/
+	https://pypi.org/project/Flask-Login/
+"
+SRC_URI="
+	https://github.com/maxcountryman/flask-login/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	https://github.com/maxcountryman/flask-login/pull/743.patch
+		-> ${P}-werkzeug-2.3.patch
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/flask-1.0.4[${PYTHON_USEDEP}]
+	>=dev-python/werkzeug-2.3.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	test? (
+		dev-python/asgiref[${PYTHON_USEDEP}]
+		dev-python/blinker[${PYTHON_USEDEP}]
+		dev-python/semantic_version[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${DISTDIR}/${P}-werkzeug-2.3.patch"
+)
+
+python_test() {
+	epytest -p no:httpbin
+}
diff --git a/dev-python/flask-login/flask-login-0.6.2.ebuild b/dev-python/flask-login/flask-login-0.6.2.ebuild
index aa79ee005e7e..763df13fd554 100644
--- a/dev-python/flask-login/flask-login-0.6.2.ebuild
+++ b/dev-python/flask-login/flask-login-0.6.2.ebuild
@@ -31,6 +31,7 @@ DEPEND="
 		dev-python/asgiref[${PYTHON_USEDEP}]
 		dev-python/blinker[${PYTHON_USEDEP}]
 		dev-python/semantic_version[${PYTHON_USEDEP}]
+		<dev-python/werkzeug-2.3[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/hatch-jupyter-builder/Manifest b/dev-python/hatch-jupyter-builder/Manifest
new file mode 100644
index 000000000000..b800574126ce
--- /dev/null
+++ b/dev-python/hatch-jupyter-builder/Manifest
@@ -0,0 +1,3 @@
+DIST hatch_jupyter_builder-0.8.3.tar.gz 54754 BLAKE2B d64a90ba0e06dbbcfa3f2d27d88185f68bc6cadd885fd3691e01d129cb1d73d62efd2d230fe80dd2d8d1323b5efa4d3208f099663b2ed082a196a1b8fc39412e SHA512 c4dc0605338bafeeba21cc7260005815654d3e4646296d91af6fb3199be8645a06b2226608e6b0558ee01c7eed682162eefcf686a7e20636031b95c3a11ae265
+EBUILD hatch-jupyter-builder-0.8.3.ebuild 743 BLAKE2B bcd70f34c6ed4905e59881382122006abc55e62d32f29d46c37116313bfa32a5001d9e52a363ad95f2f8373ba8d328442d8a5fa5e027d79e4a0a8a1b640cebdb SHA512 256b56ada7bfca57f77018dc4fe64213b8a1efccef964c4062eb2ba381e4beac415c1ebd097f5341c22cf44fc4c0cc0d09d1957bd24ec79302f7f9e9273446d8
+MISC metadata.xml 434 BLAKE2B 4891ed3bf24cb6255d2edb5a9ea9203ea43c807cda50963e25cc6527caa20e1308271f1b5cbb246582491814db6e1743e083871ac044511eb5a5fd269288b623 SHA512 a9b103c28eac7767473c2499b9eeefb8796206b2d913bbd35ceb5ff30fbc16881b018d851381400bb0d544e9c9b710907ff52e17deb63a08440eec926c6633e0
diff --git a/dev-python/hatch-jupyter-builder/hatch-jupyter-builder-0.8.3.ebuild b/dev-python/hatch-jupyter-builder/hatch-jupyter-builder-0.8.3.ebuild
new file mode 100644
index 000000000000..2859ccbdd90e
--- /dev/null
+++ b/dev-python/hatch-jupyter-builder/hatch-jupyter-builder-0.8.3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_USE_PEP517=hatchling
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A hatch plugin to help build Jupyter packages"
+HOMEPAGE="
+	https://pypi.org/project/hatch-jupyter-builder/
+	https://github.com/jupyterlab/hatch-jupyter-builder
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/hatchling[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/tomli[${PYTHON_USEDEP}]
+		dev-python/twine[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_DESELECT=(
+	# Calls pip, requires internet
+	tests/test_plugin.py::test_hatch_build
+)
+
+distutils_enable_tests pytest
diff --git a/dev-python/hatch-jupyter-builder/metadata.xml b/dev-python/hatch-jupyter-builder/metadata.xml
new file mode 100644
index 000000000000..af696c7da7fe
--- /dev/null
+++ b/dev-python/hatch-jupyter-builder/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">hatch-jupyter-builder</remote-id>
+		<remote-id type="github">jupyterlab/hatch-jupyter-builder</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/jupyter-lsp/Manifest b/dev-python/jupyter-lsp/Manifest
index 4882a1b622b4..5c3f32057fba 100644
--- a/dev-python/jupyter-lsp/Manifest
+++ b/dev-python/jupyter-lsp/Manifest
@@ -1,3 +1,5 @@
 DIST jupyter-lsp-2.0.1.tar.gz 43962 BLAKE2B 0a030542297c6a311ca2b9a681acf4ae4d196ebaee342fa44a7a5b0c9a3788aecdb7b6a60a4653114ae6c5a69f4da9108a831eda72401643b8bb34cad6d3de43 SHA512 539851c567cf0dfa08c9658fe98941a8aaa90f625cba1d231d54fe3f4e19cbd9f14fc5b54c39798af1d1da40075dbaa7f43e95517934571391c488639f9c66b3
+DIST jupyter-lsp-2.1.0.tar.gz 44667 BLAKE2B 751dcc2d45641b3e4efe949a5e89e7f8bbd95d1d543db32fa5878fe3b30a6569056da7b7cb447f6ffecdb035c88e47ab1e734ba2ff6aa1d16ec248590ff6122b SHA512 296ef188bc353dabb65507f0a303e20aacc30a09cdd0952bc031397b7317b0f0cf314f7320c876ff74b58a9906d5ae4413988009faa4ecee090213aef9d4a620
 EBUILD jupyter-lsp-2.0.1.ebuild 2743 BLAKE2B bcad3f001aa2cb92fcbd9b7f9a8e1302e8fc3e2c6328a4fd7dde58098b15906c0f2eca5022b1b82119130ee1ddada766020d18eba831324bb1349e782f14f704 SHA512 8d33d169a193fbc8f3a2fd1b0cd9a1bec168c44550395c02d56a2952ab4e8677931720b27b6fc441faacadd1aa0bba3e39adf8cad83768643bc40e96f9df85da
+EBUILD jupyter-lsp-2.1.0.ebuild 2743 BLAKE2B bcad3f001aa2cb92fcbd9b7f9a8e1302e8fc3e2c6328a4fd7dde58098b15906c0f2eca5022b1b82119130ee1ddada766020d18eba831324bb1349e782f14f704 SHA512 8d33d169a193fbc8f3a2fd1b0cd9a1bec168c44550395c02d56a2952ab4e8677931720b27b6fc441faacadd1aa0bba3e39adf8cad83768643bc40e96f9df85da
 MISC metadata.xml 417 BLAKE2B 37e0faca144a5da718475df6e957d9664fa5a757735bf65985dba486180dce37621cf3c34cadef4dbefbdb5698192b601a8e0bb1c77f71ba5550e65e47cc5e9c SHA512 6b61ffc68a46993386baa1c1b95850edbfbdb8d4fa40c4111aaf4edbb7d8d4f8ed21960ee01e69e2a8b986f66c6ec4ff938392d7849e204936f05d62ce7e8531
diff --git a/dev-python/jupyter-lsp/jupyter-lsp-2.1.0.ebuild b/dev-python/jupyter-lsp/jupyter-lsp-2.1.0.ebuild
new file mode 100644
index 000000000000..6e4b32461a3c
--- /dev/null
+++ b/dev-python/jupyter-lsp/jupyter-lsp-2.1.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYPI_NO_NORMALIZE=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1 optfeature pypi
+
+DESCRIPTION="Multi-Language Server WebSocket proxy for Jupyter Notebook/Lab"
+HOMEPAGE="https://github.com/krassowski/jupyterlab-lsp"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/entrypoints[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-server-1.1.2[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib-metadata-4.8.3[${PYTHON_USEDEP}]
+	' 3.9)
+"
+
+EPYTEST_DESELECT=(
+	# Not packaged
+	"jupyter_lsp/tests/test_listener.py::test_listeners[bash-language-server]"
+	"jupyter_lsp/tests/test_listener.py::test_listeners[dockerfile-language-server-nodejs]"
+	"jupyter_lsp/tests/test_listener.py::test_listeners[pylsp]"
+	"jupyter_lsp/tests/test_listener.py::test_listeners[sql-language-server]"
+	"jupyter_lsp/tests/test_listener.py::test_listeners[typescript-language-server]"
+	"jupyter_lsp/tests/test_listener.py::test_listeners[unified-language-server]"
+	"jupyter_lsp/tests/test_listener.py::test_listeners[vscode-css-languageserver-bin]"
+	"jupyter_lsp/tests/test_listener.py::test_listeners[vscode-html-languageserver-bin]"
+	"jupyter_lsp/tests/test_listener.py::test_listeners[vscode-json-languageserver-bin]"
+	"jupyter_lsp/tests/test_listener.py::test_listeners[yaml-language-server]"
+	"jupyter_lsp/tests/test_session.py::test_start_known[bash-language-server]"
+	"jupyter_lsp/tests/test_session.py::test_start_known[dockerfile-language-server-nodejs]"
+	"jupyter_lsp/tests/test_session.py::test_start_known[pylsp]"
+	"jupyter_lsp/tests/test_session.py::test_start_known[sql-language-server]"
+	"jupyter_lsp/tests/test_session.py::test_start_known[typescript-language-server]"
+	"jupyter_lsp/tests/test_session.py::test_start_known[unified-language-server]"
+	"jupyter_lsp/tests/test_session.py::test_start_known[vscode-css-languageserver-bin]"
+	"jupyter_lsp/tests/test_session.py::test_start_known[vscode-html-languageserver-bin]"
+	"jupyter_lsp/tests/test_session.py::test_start_known[vscode-json-languageserver-bin]"
+	"jupyter_lsp/tests/test_session.py::test_start_known[yaml-language-server]"
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Do not depend on pytest-cov or flake8
+	sed -i -e '/--cov/d' -e '/--flake8/d' setup.cfg || die
+	# R lsp server not packaged
+	sed -i -e 's:test_r_package_detection:_&:' \
+		jupyter_lsp/tests/test_detect.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	mv "${ED}/usr/etc" "${ED}/etc" || die
+}
+
+pkg_postinst() {
+	optfeature "Language server for Python" dev-python/python-lsp-server
+}
diff --git a/dev-python/jupyterlab-lsp/Manifest b/dev-python/jupyterlab-lsp/Manifest
index b03eae32bf9c..c5b175646fc1 100644
--- a/dev-python/jupyterlab-lsp/Manifest
+++ b/dev-python/jupyterlab-lsp/Manifest
@@ -1,3 +1,5 @@
 DIST jupyterlab-lsp-4.0.1.tar.gz 869528 BLAKE2B 62df16ba8aef6c344324346501191776a0534ddf6b5acff4de477f8f7f8996f7ec78022bada4c16d582fdfb7f916fd70f6c9c176505d25c47e863aa65f681f77 SHA512 8f71a6f39bec08fab8401a7074d65fa9a4bdca66ed3c11f75777095f160e9eab25b75b21f1ea4e509f43ff0beebe777f690c13ad0325b5ee26bcd1ec301119e4
+DIST jupyterlab-lsp-4.1.0.tar.gz 870899 BLAKE2B df1df3fc4dfc6cf268d2a81dcc63683e9b31595d633929b7788da21cfbc20f3da4c202e0d8fdcca3cfe033ed953e661bbaad605b783db8d5a26adc5ae169f2e4 SHA512 1510db853b75aeccc8dfbb9f466214c447fbdc8f885027c99ee7527c7759afa9774cfa682f3f66c6cce37767339b6e54338a7a14f6dc1d30b9944e1d1de8ff3c
 EBUILD jupyterlab-lsp-4.0.1.ebuild 562 BLAKE2B 5515e2b9ce4a942aaf15515f82ecc03f2ef667fc9072ba13c49c4571308bfb06a6c15696bb9be6511df761c02a078819b621db663fc619013d8eb5293dc467a8 SHA512 3012407d81591318ff1d57379b4363e8c5600307f5f200ecc4ab465529cd91195fc43d5a6ff69ed10b22fc63d2653557316f1d94b7feefbaff872d343fc32b8b
+EBUILD jupyterlab-lsp-4.1.0.ebuild 562 BLAKE2B 5515e2b9ce4a942aaf15515f82ecc03f2ef667fc9072ba13c49c4571308bfb06a6c15696bb9be6511df761c02a078819b621db663fc619013d8eb5293dc467a8 SHA512 3012407d81591318ff1d57379b4363e8c5600307f5f200ecc4ab465529cd91195fc43d5a6ff69ed10b22fc63d2653557316f1d94b7feefbaff872d343fc32b8b
 MISC metadata.xml 421 BLAKE2B cbd9c4e3ce5848ed3d0e57832082dd730d2d16a286070639602b8fcd49c49714e7f17b220251b9f16d9c5105248933390b152c060c68522d2c82b1958b09b116 SHA512 97ac68ac4e6920f23120a5818b4404fa0b510b165a44a6455a7bf76edfa298ca137f50bd9c1a87044253f5b873f881362c2667261a4c7fdb182a7d37325520b3
diff --git a/dev-python/jupyterlab-lsp/jupyterlab-lsp-4.1.0.ebuild b/dev-python/jupyterlab-lsp/jupyterlab-lsp-4.1.0.ebuild
new file mode 100644
index 000000000000..f8fbb2f8f9b2
--- /dev/null
+++ b/dev-python/jupyterlab-lsp/jupyterlab-lsp-4.1.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+inherit distutils-r1 pypi
+
+DESCRIPTION="Coding assistance for JupyterLab with Language Server Protocol"
+HOMEPAGE="https://github.com/jupyter-lsp/jupyterlab-lsp"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/jupyterlab-3.6.0[${PYTHON_USEDEP}]
+	<dev-python/jupyterlab-4.0.0[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-lsp-2.0.0[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/jupyterlab/Manifest b/dev-python/jupyterlab/Manifest
index 7a538e337a65..582f4f95e62c 100644
--- a/dev-python/jupyterlab/Manifest
+++ b/dev-python/jupyterlab/Manifest
@@ -1,5 +1,7 @@
 DIST jupyterlab-3.5.3.tar.gz 17114007 BLAKE2B 70d32721a2579331dd4e3481f7241f5e2c5aad6dac851f213de0ac1fc3b76667bea496bca5ea13ee562e9678d51ac45df91c5901d8d3b7dc839977d3d842e67d SHA512 fdacd34ab629da2b5c2eb23f11ba4d44d5b27872e1736850319bcabbe635d31cfa2891c1c5991b152a5c1d94221e3766a20fc91033f556d8e508374bc46d5fe2
 DIST jupyterlab-3.6.3.tar.gz 16847186 BLAKE2B 6916722469ab100a1a240b8a565c9800f35535b2a9b2c39a6bfd275b078d88df9faa1f12d4ce3819155af7b0ed22282836f9b233534bd3e63d8a330d1cd7cd21 SHA512 3d6b4781f9fab02504b2c0223a4d060d80c3442fa6ac53ae326296d69942d68f8545450f671f6ba65c7c4e218aad62ef4f4ceb658899c21aaff3640c3055d364
+DIST jupyterlab-4.0.0.tar.gz 18227222 BLAKE2B 98a6e1cfb4dd72a2cd183cb7210e45a70a9dc9f77200c42f58340889ac97dc2f7bcdb18822f7b9618e955dcf651bfc4b3d2087677cc112a4e2085fe6d70c3014 SHA512 7ed40068fe3f617870bc3fbad0401145baaf79e1688bd2e5a879ad92c8c1058a1a0c5fffafe7c1c0fbf1e77c2bef8e975f39d14e54b739bf8de653c264bffaa6
 EBUILD jupyterlab-3.5.3.ebuild 2574 BLAKE2B 9d56d8393c51ac23d5564e935b0621e7afeffbcc510abf0cab42f971531ec4fe8a0afdb5e3d46839cb579b2e956f905d672e430570a39cf8b3f93c856921f735 SHA512 e8da2a35344d04bc458d628dac61584812fd25cec8da4915511d8014fac086443783f62c685a020bc573e086ee255521f0de6cea6bac011ab15e7280516c9acf
 EBUILD jupyterlab-3.6.3.ebuild 2744 BLAKE2B 12af870b41a8c4e7021ccefddbb659c12e60baf85cb9af3ae640998a97c0edafaccc8fb957aa3875ce8df69bd36cc18370e7e30213588c884c5c5a9686550357 SHA512 bfd6127202e73a99c1f3e764e1674e04d5cd4fc91ab2d0d287d4c99b8521712bb56f868ffb3851d43dad3ac1befef9dbb09952ab6ff954af085ec77792dc3b30
+EBUILD jupyterlab-4.0.0.ebuild 2566 BLAKE2B fae16c460f77211214d52ec0d1aa6fc681f8aaf2fb75c5bcea1daeb8688047a0cafdc4831f441a1b3337e1d2e821ed96383378e6e39d29125a16b18582f9ebe5 SHA512 f32cc330a126317a963b4b1391881f9ba1d7ae4154291b931fc4cfd22ff9dc5acdf2063c28e80018b88fe534df53b8ed2f674cf6fcb258c351ef2fb0b4cd9d42
 MISC metadata.xml 412 BLAKE2B f0b40e19f8ba9dc116f0e4a882cabab6376f22d1eaeb3eac58ecff465ee2aff3564ddbf55e4ffb8971807a39945109a164037a954419671a274d3ac558b102ea SHA512 b6149a03585ca04bc3bf6f3ea6055e8e1fcb620a771359d150df7c22ee16bf09f57c8037df2161021fac0c194be0ac5ec79a31f0511d785e0c5b1ca96d817e42
diff --git a/dev-python/jupyterlab/jupyterlab-4.0.0.ebuild b/dev-python/jupyterlab/jupyterlab-4.0.0.ebuild
new file mode 100644
index 000000000000..a243089c3963
--- /dev/null
+++ b/dev-python/jupyterlab/jupyterlab-4.0.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_USE_PEP517=hatchling
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="JupyterLab computational environment"
+HOMEPAGE="
+	https://jupyter.org/
+	https://github.com/jupyterlab/jupyterlab/
+	https://pypi.org/project/jupyterlab/
+"
+
+LICENSE="BSD MIT GPL-3 Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/async-lru[${PYTHON_USEDEP}]
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	>=dev-python/jinja-3.0.3[${PYTHON_USEDEP}]
+	dev-python/jupyter-core[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-lsp-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-server-2.4.0[${PYTHON_USEDEP}]
+	<dev-python/jupyter-server-3[${PYTHON_USEDEP}]
+	>=dev-python/jupyterlab-server-2.19[${PYTHON_USEDEP}]
+	<dev-python/jupyterlab-server-3[${PYTHON_USEDEP}]
+	>=dev-python/notebook-shim-0.2[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/tomli[${PYTHON_USEDEP}]
+	>=dev-python/tornado-6.2[${PYTHON_USEDEP}]
+	dev-python/traitlets[${PYTHON_USEDEP}]
+	net-libs/nodejs
+"
+
+BDEPEND="
+	dev-python/hatch-jupyter-builder[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
+		>=dev-python/pytest-jupyter-0.5.3[${PYTHON_USEDEP}]
+		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/requests-cache[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_DESELECT=(
+	# These tests call npm and want internet
+	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_uninstall_core_extension
+	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_install_and_uninstall_pinned_folder
+	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_install_and_uninstall_pinned
+	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build_custom_minimal_core_config
+	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build_custom
+	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build_check
+	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build
+	jupyterlab/tests/test_build_api.py::TestBuildAPI::test_clear
+	jupyterlab/tests/test_build_api.py::TestBuildAPI::test_build
+)
+
+EPYTEST_IGNORE=(
+	jupyterlab/tests/test_announcements.py
+)
+
+distutils_enable_tests pytest
+# TODO: package sphinx_copybutton
+#distutils_enable_sphinx docs/source dev-python/sphinx-rtd-theme dev-python/myst-parser
+
+python_install_all() {
+	distutils-r1_python_install_all
+	mv "${ED}/usr/etc" "${ED}/etc" || die
+}
diff --git a/dev-python/pymdown-extensions/Manifest b/dev-python/pymdown-extensions/Manifest
index 79568450221f..3fc6a45b8122 100644
--- a/dev-python/pymdown-extensions/Manifest
+++ b/dev-python/pymdown-extensions/Manifest
@@ -1,7 +1,3 @@
 DIST pymdown-extensions-10.0.1.gh.tar.gz 1063025 BLAKE2B 937273053918cbb8e0245ba38a78a93184a492e21846db60f675d015cc5f942bef5e7085136cc861aa4a6068096e23fdb5f212182d47f245ac6a45127b5ca2a2 SHA512 579aa70c21cffdc7d5ffd927bce071f40bc6ace040cbcb4d15d620a54b97eae2cee7afa049e9005dccc2081dac7db3ff7e2deb2c1c468cf27fe42a306b6e46ab
-DIST pymdown-extensions-10.0.gh.tar.gz 1062913 BLAKE2B a7f0da6ce416ece64ecf4340e9c0c0330858cc972924b7d646abfb2080b10814f81bf4f5ad42895e523edfb1bdb61e805cb66507780fdad04dad7ffa6e266c66 SHA512 660e903705fe379e6ed2c67ede21eea8a4d0e14731e036b556eaccc6a3ab76dce71e29d1581fbd822794d66382970fbc95ece9c2cd2f5854018a81a65e06239a
-DIST pymdown-extensions-9.11.gh.tar.gz 1062074 BLAKE2B d695fa946c264f7ce2da7731fd5ce5388152a2179830108a6b43f769144246c33118084b4b2fe1e45b4255e26dc91871be699043008f67d2f04c5e5396f9ad12 SHA512 7745f0da83e3ecab9ac16947662c7a4da31e9ed62c6c519457083e0e8075f386a10146f18edc59cb17dee383335bb303c109da2ab08501118a53ee7315b1095f
 EBUILD pymdown-extensions-10.0.1.ebuild 1352 BLAKE2B 1c1d5961f011bfab257badfbfba2492e7627e76b0386080a7167dc210e2e3f3625df15466157a1b3aefa0e77ae76b67883e2ed0382f5f9307665b246da491894 SHA512 e9c7dd37e30b109e25e766b0fc997d7422b49329d269a96d66dbb5352701cf7ff8684218d5f188811a71a5c7b032d8671ce3f53343c0c3f68a59aeb8fec36d3e
-EBUILD pymdown-extensions-10.0.ebuild 1354 BLAKE2B 314344afa98ad9ec8a8b06a47f4e8b14282412a7c8990dfc19068f8d58c437d925d5075846d67d7752ad22834ca6906a71a4d46ae697ee86f3912b9a39ef5704 SHA512 a44583fa5023490e02b1e521d891f5ed8285c4bb2f877d7f1a3ad92f90db1ff208e43b3cae777d1037cf7ff540a09720766d1019429f941258fdd4c2ce6d12b1
-EBUILD pymdown-extensions-9.11.ebuild 1351 BLAKE2B b1f0c784c925e6eaa28c5e0347df360d9e3ce5ebd4df116586eb430d00f5239cfea6bec965c4652324fdd10cb4636923b5304f861d5ce1c8d0975085bff2a78a SHA512 3575978522171454980d5421e8b9e772e41a2fa1821a10face999a71e93917050595fc29a4bbe6dce4ae2ac8d82e0abd1fa6a8478784cac68c82b09105c5b214
 MISC metadata.xml 536 BLAKE2B f417ab2132b06eadbf1785654080084c4ef694f983e223ade83d5c77213e4443203a498a168efd68e4a3b1cccbe019c5b88716ac851719b9197deba9d2fd5411 SHA512 51304b48f9e296abea376be300053e041ea331f93e1ec7a2a3cdf10eea0ed6e9b8f04cdcbbed7920b46c60d5f6ce9337e3e25635516871d7b080eb54bfa16f57
diff --git a/dev-python/pymdown-extensions/pymdown-extensions-10.0.ebuild b/dev-python/pymdown-extensions/pymdown-extensions-10.0.ebuild
deleted file mode 100644
index 31418053ff8b..000000000000
--- a/dev-python/pymdown-extensions/pymdown-extensions-10.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# 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_{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 ~arm64 ~ppc ~ppc64 ~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/pymdown-extensions/pymdown-extensions-9.11.ebuild b/dev-python/pymdown-extensions/pymdown-extensions-9.11.ebuild
deleted file mode 100644
index 50b457fc8d45..000000000000
--- a/dev-python/pymdown-extensions/pymdown-extensions-9.11.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# 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_{9..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 ~arm64 ~ppc ~ppc64 ~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
-}