commit: d2b7cdd9d107ba6b170d933fd89d7823e284b6bd Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> AuthorDate: Sat Nov 6 16:20:02 2021 +0000 Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> CommitDate: Sat Nov 6 16:20:19 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2b7cdd9
dev-python/spyder: bring back Code Analysis It was accidentally hit by our sed's Closes: https://bugs.gentoo.org/821409 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org> .../{spyder-4.2.5-r2.ebuild => spyder-4.2.5-r3.ebuild} | 12 ++++++++++-- .../{spyder-5.0.5-r1.ebuild => spyder-5.0.5-r2.ebuild} | 12 ++++++++++-- .../{spyder-5.1.5-r1.ebuild => spyder-5.1.5-r2.ebuild} | 10 +++++++++- 3 files changed, 29 insertions(+), 5 deletions(-) diff --git a/dev-python/spyder/spyder-4.2.5-r2.ebuild b/dev-python/spyder/spyder-4.2.5-r3.ebuild similarity index 96% rename from dev-python/spyder/spyder-4.2.5-r2.ebuild rename to dev-python/spyder/spyder-4.2.5-r3.ebuild index 0656eb1aa38..9d806017200 100644 --- a/dev-python/spyder/spyder-4.2.5-r2.ebuild +++ b/dev-python/spyder/spyder-4.2.5-r3.ebuild @@ -141,11 +141,19 @@ python_prepare_all() { sed -i \ -e '/pyqt5/d' \ -e '/pyqtwebengine/d' \ - -e '/python-language-server/d' \ -e '/python-lsp-server/d' \ -e '/parso/d' \ -e '/jedi/d' \ - {setup.py,requirements/conda.txt} || die + -e '/pylint/d' \ + requirements/conda.txt || die + 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 sed -i \ -e "/^PYLS_REQVER/c\PYLS_REQVER = '>=0.0.1'" \ -e "/^PYLSP_REQVER/c\PYLSP_REQVER = '>=0.0.1'" \ diff --git a/dev-python/spyder/spyder-5.0.5-r1.ebuild b/dev-python/spyder/spyder-5.0.5-r2.ebuild similarity index 96% rename from dev-python/spyder/spyder-5.0.5-r1.ebuild rename to dev-python/spyder/spyder-5.0.5-r2.ebuild index 15c28e9147d..60b669345ea 100644 --- a/dev-python/spyder/spyder-5.0.5-r1.ebuild +++ b/dev-python/spyder/spyder-5.0.5-r2.ebuild @@ -148,11 +148,19 @@ python_prepare_all() { sed -i \ -e '/pyqt5/d' \ -e '/pyqtwebengine/d' \ - -e '/python-language-server/d' \ -e '/python-lsp-server/d' \ -e '/parso/d' \ -e '/jedi/d' \ - {setup.py,requirements/conda.txt} || die + -e '/pylint/d' \ + requirements/conda.txt || die + 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 sed -i \ -e "/^PYLS_REQVER/c\PYLS_REQVER = '>=0.0.1'" \ -e "/^PYLSP_REQVER/c\PYLSP_REQVER = '>=0.0.1'" \ diff --git a/dev-python/spyder/spyder-5.1.5-r1.ebuild b/dev-python/spyder/spyder-5.1.5-r2.ebuild similarity index 96% rename from dev-python/spyder/spyder-5.1.5-r1.ebuild rename to dev-python/spyder/spyder-5.1.5-r2.ebuild index b2318fa8c7e..41c79713327 100644 --- a/dev-python/spyder/spyder-5.1.5-r1.ebuild +++ b/dev-python/spyder/spyder-5.1.5-r2.ebuild @@ -136,7 +136,15 @@ python_prepare_all() { -e '/parso/d' \ -e '/jedi/d' \ -e '/pylint/d' \ - {setup.py,requirements/conda.txt} || die + requirements/conda.txt || die + 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 sed -i \ -e "/^PYLS_REQVER/c\PYLS_REQVER = '>=0.0.1'" \ -e "/^PYLSP_REQVER/c\PYLSP_REQVER = '>=0.0.1'" \
