gentoo auto-resync : 03:09:2024 - 12:28:20

3 files changed, 8 insertions, 205 deletions

diff --git a/dev-python/spyder/Manifest b/dev-python/spyder/Manifest
index 2d9225f7a07d..54d5bf71490d 100644
--- a/dev-python/spyder/Manifest
+++ b/dev-python/spyder/Manifest
@@ -1,11 +1,8 @@
 AUX spyder-5.0.0-build.patch 1147 BLAKE2B 68e62f6bd7a021d82f1da8d86c16e2289faac7f760f9bb5dc975053c7f8bb409c79b90eeaf06c5121ca5833442b61929cc640e4f25e6cc27f6118f0fa8f27b5e SHA512 e88cbbeca42ac2720f4e0888df9432d912d3907af267d3fe6a5e658d18d1242c998a70dee88fa0efe9edfcf87a46a40cf75685037d75fce1d596b708acc32096
 AUX spyder-5.2.0-doc-theme-renamed.patch 356 BLAKE2B 666ba289498026ab0679776b8af8f6efe7561a9a736ff19b32eaefcac87d142a55a055556c09f94373869711e81a35ef90832fbfe68acc6cee0f2023742de0be SHA512 396944e6f242bf3b6a27ac9d47f0cc07fd99a55c50f174dbee2fccd1f0b3edf355347bf6291943c3003f55996304d96ce2d2fe45ae7c4291e8425bff73a3a861
-DIST spyder-5.5.5.gh.tar.gz 16258487 BLAKE2B 3fa3ea611fc3267918e4314027c0825905f256a7fe070534c7608a4a42938c3934f34f4dc06fe0cfc0ac32e03fbdc294974672b010aaf9bc32512b817af62e6b SHA512 5f5d25822f20f8ae8767402b037cca78b760768b9bc53ef74ed95839aa59e1c24206457fd4c71003bb9ebffe8daf8ad3bda8dd40e71cc15d3d3ee2030b284b42
 DIST spyder-5.5.6.gh.tar.gz 16304234 BLAKE2B 9d14b96901276ced1644eef8dd57539036aecb067ee361b6581368b371d56b2008350969224992a35fe10ee177babca7f3e941f43b4cc3f432f6d0dec9104ead SHA512 93ce6ac2e71bd4e81ca4a630a6fe152d1bf3c83d6e5c01dda8f3e5ad2735de1948a86642f5bc589c90616935e997526b26367ce178905ad2b80faf81f36f9164
-DIST spyder-6.0.0_rc2.gh.tar.gz 15675811 BLAKE2B 1f6c8a3a952a3b6b1a89b434bd41fbe2e793562f03463c1c95b62997d46c99b8d722620ec4355815f91a8fc57fa559f4ae15b88a058fb41516718d86f9ea6e3a SHA512 3f50ac8eb8594d8a74b885e185e1f46617e63ee726e903d01f97529c48fd0020ac045a495fa0367824a9ca9148d3aa368e03a27c44a42903bb5ad4b1aab38d82
-DIST spyder-docs-32efdaebc11dab0b8e0767717342b7d306dc06ea.gh.tar.gz 94897009 BLAKE2B 30e0b42e34bddb60d8fc986183a363b71455067bc7f4411cb75a00c5758e87501ee07ad0b484caed2aa3cf91153be814c7faf935be8665b6984bce38ebcd0be2 SHA512 9f9aa56ab27aed8d27c3d653119d5c5454b4317a78a7ff27715d91cac9dec79143db85d4f1c87b10fa821eb33abc043912df308fa6c84ade59539bd633eefbd2
+DIST spyder-6.0.0.gh.tar.gz 15687128 BLAKE2B 23319f167eb61fecc477dd3b3deab2d62a1c12109033f262ba31e349b26ba92524bde0399ca2f8ae6ff6bbcbf400360882b92b888644b9d9767f5d894e5c06b6 SHA512 3445481df35707e103646ada5fb7eef94b1b36fdbec31e15d3cb7608f637fcf21238fec0f5747f8c7a1b5bb9770ed5355b4f0fab0f9db57bc888306c6a14c003
 DIST spyder-docs-6951e02799fc7cd1f29456f1d93cfdcb570dad27.gh.tar.gz 93033557 BLAKE2B 395dd2a8ddb6e1b1408ba46cbe0fa452c1f2e69da1f3b6176401ff7395ace1463e63c696e13ee0b79f992b0ceca86228ad113f95ed7873db1b970452bc679f89 SHA512 c631e720e3ca49413482df294fb032285cf217ba94de299c37cb073e4e2bdeb629d16a139db17c569c74c628c50789c90d6085383886d32fa26b942711ccedc0
-EBUILD spyder-5.5.5.ebuild 7378 BLAKE2B faf47a521f16b55b06d5fb73fdddd055a1cc13d4fe11f4ee0becf70c1a80c942e3ed752f330525313abe81ba81bf701e8f6c4d9a85175105951b7a56d4d31bb2 SHA512 77fa17ee795f077077980a06b2f14ffd51bf247c110c2be59039141149a664025658f56387e72b15813958bbc1199e42f3e566a5d4d3e1fc7e7e5891529ab7a0
 EBUILD spyder-5.5.6.ebuild 7365 BLAKE2B ce1833f85dd1b696229e50b1c699137d08807590b09b0340b5a9964d27da8f3e8f019f5f622249a9279ebe6962465afd564727e970df78457480cd25a790014e SHA512 74f39ef432a7ac9bd05c06638fdc08d183eb01daf25273c40f2a89eab66a259bc528ca7b14607bffcfa767e0405dc4c092fbdbd2535cf8abfb34a4d1a2693234
-EBUILD spyder-6.0.0_rc2.ebuild 7577 BLAKE2B d5e4abd3e3474beafaf8cc5d74372f31a2e17beee1f321e59e3033cd475d8e160797a5932de326909bac0427aa724fd04e9059ccbc6888a31329639ca4b445d1 SHA512 a9c2bdf15f72ffb115474453377816dc7b6a1b490b905f46d28653ade1c1fd1b3a96a8f4b5653760aa3cb5bf79008991e32b63a95a454357b9849c5889b42f42
+EBUILD spyder-6.0.0.ebuild 7532 BLAKE2B af1cb3264136d89b99c738836b621f531f87cbe3a426e8335b7620d6e2e84cab85850527bf85afa774ca7c6d758dc1988f5c1af154884bcd4796020919e05504 SHA512 67c9be378739d7fa1b697632357c3df64805d6e010bc9e3e77a95de5c5d3f44e4395cf5339e054c0a787d1c47d0c247a1746d13a53e7cd8b6ea7be81daef7bf4
 MISC metadata.xml 1251 BLAKE2B 81f007eda89ddc66841771a949f76da6f015b49bfbf27b47a7557ab70f1241087f06a5c6675ea8da6aa871937cd705aea888989b468ac11d33420cbe34a27f27 SHA512 24977ed6053ad254748ba4c368bed7f8428d1e5928b586f57e48c01733934894fb1f94df077a71fcd7a00e891e24b776b9e57279f90c2f94728f709a94a90121
diff --git a/dev-python/spyder/spyder-5.5.5.ebuild b/dev-python/spyder/spyder-5.5.5.ebuild
deleted file mode 100644
index 4361d553e778..000000000000
--- a/dev-python/spyder/spyder-5.5.5.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1 optfeature virtualx xdg
-
-# Commit of documentation to fetch
-DOCS_PV="32efdaebc11dab0b8e0767717342b7d306dc06ea"
-
-DESCRIPTION="The Scientific Python Development Environment"
-HOMEPAGE="
-	https://www.spyder-ide.org/
-	https://github.com/spyder-ide/spyder/
-	https://pypi.org/project/spyder/
-"
-SRC_URI="
-	https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz
-	https://github.com/spyder-ide/${PN}-docs/archive/${DOCS_PV}.tar.gz -> ${PN}-docs-${DOCS_PV}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/atomicwrites-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/chardet-2.0.0[${PYTHON_USEDEP}]
-	>=dev-util/cookiecutter-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/diff-match-patch-20181111[${PYTHON_USEDEP}]
-	>=dev-python/intervaltree-3.0.2[${PYTHON_USEDEP}]
-	>=dev-python/jellyfish-0.7[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/keyring-17.0.0[${PYTHON_USEDEP}]
-	>=dev-python/nbconvert-4.0[${PYTHON_USEDEP}]
-	>=dev-python/numpydoc-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/pexpect-4.4.0[${PYTHON_USEDEP}]
-	>=dev-python/pickleshare-0.4[${PYTHON_USEDEP}]
-	>=dev-python/psutil-5.3[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
-	>=dev-python/pylint-venv-3.0.2[${PYTHON_USEDEP}]
-	>=dev-python/python-lsp-black-2.0.0[${PYTHON_USEDEP}]
-	<dev-python/python-lsp-black-3[${PYTHON_USEDEP}]
-	>=dev-python/pyls-spyder-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/pyxdg-0.26[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-24.0.0[${PYTHON_USEDEP}]
-	>=dev-python/qdarkstyle-3.2[${PYTHON_USEDEP}]
-	<dev-python/qdarkstyle-3.3[${PYTHON_USEDEP}]
-	>=dev-python/qstylizer-0.2.2[${PYTHON_USEDEP}]
-	>=dev-python/qtawesome-1.3.1[${PYTHON_USEDEP}]
-	<dev-python/qtawesome-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/qtconsole-5.5.1[${PYTHON_USEDEP}]
-	<dev-python/qtconsole-5.6.0[${PYTHON_USEDEP}]
-	>=dev-python/QtPy-2.1.0[${PYTHON_USEDEP},pyqt5,svg,webengine]
-	>=dev-python/rtree-0.9.7[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-0.6.6[${PYTHON_USEDEP}]
-	>=dev-python/spyder-kernels-2.5.2[${PYTHON_USEDEP}]
-	<dev-python/spyder-kernels-2.6.0[${PYTHON_USEDEP}]
-	>=dev-python/textdistance-4.2.0[${PYTHON_USEDEP}]
-	>=dev-python/three-merge-0.1.1[${PYTHON_USEDEP}]
-	>=dev-python/watchdog-0.10.3[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		dev-python/cython[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/matplotlib[tk,${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pytest-lazy-fixture[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-order[${PYTHON_USEDEP}]
-		dev-python/pytest-qt[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/QtPy[${PYTHON_USEDEP},pyside2,pyqt5]
-		dev-python/scipy[${PYTHON_USEDEP}]
-		dev-python/sympy[${PYTHON_USEDEP}]
-	)"
-
-# Based on the courtesy of Arfrever
-# This patch removes a call to update-desktop-database during build
-# This fails because access is denied to this command during build
-PATCHES=(
-	"${FILESDIR}/${PN}-5.0.0-build.patch"
-	"${FILESDIR}/${PN}-5.2.0-doc-theme-renamed.patch"
-)
-
-DOCS=(
-	"AUTHORS.txt"
-	"Announcements.md"
-	"CHANGELOG.md"
-	"CODE_OF_CONDUCT.md"
-	"CONTRIBUTING.md"
-	"NOTICE.txt"
-	"README.md"
-	"RELEASE.md"
-)
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs/doc \
-	dev-python/sphinx-panels \
-	dev-python/pydata-sphinx-theme \
-	dev-python/sphinx-multiversion
-
-python_prepare_all() {
-	# move docs into workdir
-	mv ../spyder-docs-${DOCS_PV}* docs || die
-
-	# these dependencies are packaged separately:
-	#    dev-python/spyder-kernels,
-	#    dev-python/python-lsp-server,
-	#    dev-python/qdarkstyle
-	rm -r external-deps/* || die
-	# runs against things packaged in external-deps dir
-	rm conftest.py || die
-
-	# Do not depend on pyqt5<5.16, this dependency is carried by QtPy[pyqt5]
-	# Do not depend on pyqtwebengine<5.16, this dependency is carried by QtPy[webengine]
-	# Do not depend on parso and jedi, this is dependency is carried in python-lsp-server
-	# Do not depend on python-lsp-server, this dependency is carried in pyls-spyder
-	# Do not depend on ipython, this dependency is carried in spyder-kernels
-	# The explicit version requirements only make things more complicated, if e.g.
-	# pyls-spyder gains compatibility with a newer version of python-lsp-server
-	# in a new release it will take time for this information to propagate into
-	# the next spyder release. So just remove the dependency and let the other
-	# ebuilds handle the version requirements to speed things up and prevent
-	# issues such as Bug 803269.
-	sed -i \
-		-e "/'pyqt5[ 0-9<=>.,]*',/d" \
-		-e "/'pyqtwebengine[ 0-9<=>.,]*',/d" \
-		-e "/'python-lsp-server\[all\][ 0-9<=>.,]*',/d" \
-		-e "/'parso[ 0-9<=>.,]*',/d" \
-		-e "/'jedi[ 0-9<=>.,]*',/d" \
-		-e "/'pylint[ 0-9<=>.,]*',/d" \
-			setup.py || die
-		# -e "/'ipython[ 0-9<=>.,]*',/d" \
-
-	sed -i \
-		-e "/^PYLS_REQVER/c\PYLS_REQVER = '>=0.0.1'" \
-		-e "/^PYLSP_REQVER/c\PYLSP_REQVER = '>=0.0.1'" \
-		-e "/^PARSO_REQVER/c\PARSO_REQVER = '>=0.0.1'" \
-		-e "/^JEDI_REQVER/c\JEDI_REQVER = '>=0.0.1'" \
-		-e "/^PYLINT_REQVER/c\PYLINT_REQVER = '>=0.0.1'" \
-			spyder/dependencies.py || die
-		# -e "/^IPYTHON_REQVER/c\IPYTHON_REQVER = '>=0.0.1'" \
-
-	# do not check deps, fails because we removed dependencies above
-	sed -i -e 's:test_dependencies_for_spyder_setup_install_requires_in_sync:_&:' \
-		spyder/tests/test_dependencies_in_sync.py || die
-
-	# can't check for update, need network
-	rm spyder/workers/tests/test_update.py || die
-
-	# skip online test
-	rm spyder/widgets/github/tests/test_github_backend.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-# Calling pytest directly somehow passes the pytest arguments to spyder
-# causing an invalid argument error
-python_test() {
-	virtx "${EPYTHON}" runtests.py
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature "2D/3D plotting in the Python and IPython consoles" dev-python/matplotlib
-	optfeature "View and edit DataFrames and Series in the Variable Explorer" dev-python/pandas
-	optfeature "View and edit two or three dimensional arrays in the Variable Explorer" dev-python/numpy
-	optfeature "Symbolic mathematics in the IPython console" dev-python/sympy
-	optfeature "Import Matlab workspace files in the Variable Explorer" dev-python/scipy
-	optfeature "Run Cython files in the IPython console" dev-python/cython
-	optfeature "The hdf5/h5py plugin" dev-python/h5py
-	optfeature "The line profiler plugin" dev-python/spyder-line-profiler
-	optfeature "Vim key bindings" dev-python/spyder-vim
-	optfeature "Unittest support" dev-python/spyder-unittest
-	optfeature "System terminal inside spyder" dev-python/spyder-terminal
-	optfeature "Jupyter notebook support" dev-python/spyder-notebook
-	# spyder-memory-profiler is not compatible with spyder-5.2+ yet
-	# optfeature "The memory profiler plugin" dev-python/spyder-memory-profiler
-	# spyder-reports not yet updated to >=spyder-4.0.0
-	# optfeature "Markdown reports using Pweave" dev-python/spyder-reports
-	# Plugins with no release yet:
-	# optfeature "Manage virtual environments and packages" dev-python/spyder-env-manager
-	# optfeature "VCS (e.g. git) integration" dev-python/spyder-vcs
-}
diff --git a/dev-python/spyder/spyder-6.0.0_rc2.ebuild b/dev-python/spyder/spyder-6.0.0.ebuild
index d7da1d961972..b4c6b1eb1a62 100644
--- a/dev-python/spyder/spyder-6.0.0_rc2.ebuild
+++ b/dev-python/spyder/spyder-6.0.0.ebuild
@@ -18,14 +18,13 @@ HOMEPAGE="
 	https://pypi.org/project/spyder/
 "
 SRC_URI="
-	https://github.com/spyder-ide/${PN}/archive/v${PV//_rc/rc}.tar.gz -> ${P}.gh.tar.gz
+	https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz
 	https://github.com/spyder-ide/${PN}-docs/archive/${DOCS_PV}.tar.gz -> ${PN}-docs-${DOCS_PV}.gh.tar.gz
 "
-S="${WORKDIR}/${PN}-${PV//_rc/rc}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	>=dev-python/aiohttp-3.9.3[${PYTHON_USEDEP}]
@@ -56,13 +55,13 @@ RDEPEND="
 	>=dev-python/qstylizer-0.2.2[${PYTHON_USEDEP}]
 	>=dev-python/qtawesome-1.3.1[${PYTHON_USEDEP}]
 	<dev-python/qtawesome-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/qtconsole-5.5.1[${PYTHON_USEDEP}]
-	<dev-python/qtconsole-5.6.0[${PYTHON_USEDEP}]
+	>=dev-python/qtconsole-5.6.0[${PYTHON_USEDEP}]
+	<dev-python/qtconsole-5.7.0[${PYTHON_USEDEP}]
 	>=dev-python/QtPy-2.4.0[${PYTHON_USEDEP},svg,webengine]
 	>=dev-python/rtree-0.9.7[${PYTHON_USEDEP}]
 	>=dev-python/sphinx-0.6.6[${PYTHON_USEDEP}]
-	>=dev-python/spyder-kernels-3.0.0_beta9[${PYTHON_USEDEP}]
-	<dev-python/spyder-kernels-3.0.0_beta10[${PYTHON_USEDEP}]
+	>=dev-python/spyder-kernels-3.0.0[${PYTHON_USEDEP}]
+	<dev-python/spyder-kernels-3.1.0[${PYTHON_USEDEP}]
 	>=dev-python/superqt-0.6.2[${PYTHON_USEDEP}]
 	<dev-python/superqt-1.0.0[${PYTHON_USEDEP}]
 	>=dev-python/textdistance-4.2.0[${PYTHON_USEDEP}]