gentoo auto-resync : 15:12:2023 - 14:48:25

3 files changed, 4 insertions, 84 deletions

diff --git a/dev-python/jupyter-lsp/Manifest b/dev-python/jupyter-lsp/Manifest
index 42bd0980f762..4e23d3235c07 100644
--- a/dev-python/jupyter-lsp/Manifest
+++ b/dev-python/jupyter-lsp/Manifest
@@ -1,5 +1,3 @@
-DIST jupyter-lsp-2.2.0.tar.gz 45769 BLAKE2B 7004a1bc6b8ece280df1bb54a80ca8b7d93a4995a92c909dcc7f6193500b1881ca5beb6fc3b0c1a4e7659465216b05b4ee7b83b1d2973fce5b74a304e87e3fd4 SHA512 0f6d844be172054eed7599eb5f2c2be4c1ebb749176af3f08aa3327849fa045de2b8f9003c67188ed0f1b7ba2e28f1223d0dcca008eaa528caacf38a95c3f59b
 DIST jupyter-lsp-2.2.1.tar.gz 45839 BLAKE2B 5f7af7a335f97f8f35ebcd2cabb9b6377ec3bbc9b756bcd9c02e3b2ab8798855c2de9df7b9c3f1b832672030de660e1b6a475de70708911c1deca128d1cbfe44 SHA512 2f8d5a7a19daedd649810baa43bed5ae994dec7245a793298f5de4c32fd22190ffa3c4a356b3bfda3422fcdce5a34ea081c7f49030db8fcb633f761719ecfe4b
-EBUILD jupyter-lsp-2.2.0.ebuild 2869 BLAKE2B e3bbe99e341955820c75bff48b56c6bec8bd24b833fa8e4f380d56eee4c30a6f2539dddda1b2020ec2f5715be38de9971a3228a8d18b9bc461974467da5e8c3f SHA512 db515865dc17091b58c402d7fc72fab5d055a538f955e9a6df14394aea93ca5190376cd0d1f120943960936cdaff8b9227b7ad8861d15b59a71a13f9bc7f9fde
-EBUILD jupyter-lsp-2.2.1.ebuild 2874 BLAKE2B 8c3f49cf9640cbcd123874dda48e5189d215e833b6e96df3bc7fbd730d4c6c050341c44d0bba9efc8f008d792dfe19faebd516cebf428e71ecc405bae9bfe634 SHA512 ca741e9639242eb78831a59f479c3ff386e92b9a5145214b59a2c6b8df4458678a5b44e0fb0a92d5ee3049da80b6c7e720cac54946214405e52498c99408f1bf
+EBUILD jupyter-lsp-2.2.1.ebuild 3016 BLAKE2B 94e94c2d6dc87e7cc449102d634db329b1baf8918ed0cb64e7abb709d02c548fa9be2c5eb29ff0c110b76fd8a022d4756ce1d7b0ac662720d11471cb77ac3225 SHA512 2e124902260380d8bf4a0738169d04dc6144f9647de9163bb09cd277565c1a4e7276d099bc7599a2b71d8d9b47ccbf7f9b1d9a5e6290b8fb1da5a34c53db0564
 MISC metadata.xml 418 BLAKE2B b5e29964f271efebf225f8f8cabfcda723f20a40693df463a8d0aad04d63dc67b35a16a8ee83fc7d37aff55fc481bceb02d20221c6c11ab3993fd1fd3b5cdbd4 SHA512 4935850508d3b951c3f6e0bd4068303e6f6415024852e276ffd67777dca3da53aa9879ef460287f90b5c66dde02ec10a1eeb249579ef1fabf7dbed882f5cbe42
diff --git a/dev-python/jupyter-lsp/jupyter-lsp-2.2.0.ebuild b/dev-python/jupyter-lsp/jupyter-lsp-2.2.0.ebuild
deleted file mode 100644
index bc36b977c024..000000000000
--- a/dev-python/jupyter-lsp/jupyter-lsp-2.2.0.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# 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=( pypy3 python3_{10..12} )
-
-inherit distutils-r1 optfeature pypi
-
-DESCRIPTION="Multi-Language Server WebSocket proxy for Jupyter Notebook/Lab"
-HOMEPAGE="
-	https://github.com/jupyter-lsp/jupyterlab-lsp
-	https://pypi.org/project/jupyter-lsp/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
-
-RDEPEND="
-	dev-python/entrypoints[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-server-1.1.2[${PYTHON_USEDEP}]
-"
-
-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
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Not packaged
-		jupyter_lsp/tests/test_detect.py::test_r_package_detection
-		"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]"
-	)
-
-	case ${EPYTHON} in
-		python3.12)
-			EPYTEST_DESELECT+=(
-				jupyter_lsp/tests/test_session.py::test_start_unknown
-			)
-			;;
-	esac
-
-	epytest
-}
-
-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/jupyter-lsp/jupyter-lsp-2.2.1.ebuild b/dev-python/jupyter-lsp/jupyter-lsp-2.2.1.ebuild
index 871b1fc88973..0b39d1a62ee2 100644
--- a/dev-python/jupyter-lsp/jupyter-lsp-2.2.1.ebuild
+++ b/dev-python/jupyter-lsp/jupyter-lsp-2.2.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
 
 RDEPEND="
 	dev-python/entrypoints[${PYTHON_USEDEP}]
@@ -40,6 +40,7 @@ python_test() {
 		"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[r-languageserver]"
 		"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]"
@@ -50,6 +51,7 @@ python_test() {
 		"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[r-languageserver]"
 		"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]"