gentoo resync : 13.11.2021

4 files changed, 34 insertions, 6 deletions

diff --git a/dev-python/spyder/Manifest b/dev-python/spyder/Manifest
index 9323c1cd0c91..70b526d33ba6 100644
--- a/dev-python/spyder/Manifest
+++ b/dev-python/spyder/Manifest
@@ -8,7 +8,7 @@ DIST spyder-5.1.5.tar.gz 23849672 BLAKE2B a0a4db5105d4ecbb76bf3c996ea8ea17142bc4
 DIST spyder-docs-5eb83118155a3765de4a0f863b936bcbe73bb7aa.tar.gz 85362596 BLAKE2B 7294dcd0f169958da132b141379b9b1cf497095981a86416fb98d98f98e30a425fe2e628a523785f932bbc06a2ba1ecddb45bae0df009887db928f879e08cdef SHA512 45f45546b83afb3036348e89ee3eded4d8ecee36ce58fe697da14677fbff8fa2dfe170be7385ecf10e1989817780c07b5676d545ee34e87a8f252929ad72882e
 DIST spyder-docs-78b25754c69a20643258821146e398ad5535c920.tar.gz 69167467 BLAKE2B d2815d552002f329b5fac59329fba3b3b0cd592bcbdacc0878966919e44dbab29548533661e60a1b9b8fd763d57d1e4c2f761782ace1b0a814a5f0cec1f66af9 SHA512 10764367fd5f830d7a3620b9d9e7ec4ab74539c1f48326c0c40f7caff74a50401addc7609fe1558c57dac4649d0a214c0d2d77cecd100bd8574151134e49634d
 DIST spyder-docs-a3a579ce6e7e42c9d9bbd88ac4e76650b7093e5c.tar.gz 88791917 BLAKE2B bdcf52965b592f4a88ee988afcca71ed73b0499397c8c0b7ff36c38d4408f4b76ff285b3d9739d1c126322fdd8c1c6b93f3017edcaf30563da02d8f509d09fe4 SHA512 2717dad17db836330820578c9082505b7f1126fef2a76284d03a443f3317e3a9a294f69e50f075a29580c4ad1bfbd23dcd02fcef93f32645ae5d52ecfb0b8f10
-EBUILD spyder-4.2.5-r2.ebuild 9923 BLAKE2B c01997cf3dd097370a0db952fb4ecfeeed3f3c17c2db6698b0a4d04b228eda94e43013c8430b5a112b0ccf52393f3d4334e38f090519173e171213c368eeecc2 SHA512 9016a2f522e6f988d74aeb20242b3b02cb5c2686f5168c07c2406cc69bf203c2335cd19f09093ca769a2960f3b4745e63d07a8b370c501df076fbfd86583b10e
-EBUILD spyder-5.0.5-r1.ebuild 7900 BLAKE2B e2978c811f658356816fbd306853115094275945d4f0397dcc6700af0f8d76f7416f71702eae9fbe948361889295628d24fbc4066595c6c6a3033d75e7e5317f SHA512 c7b8000415eed95e979ed0d069748bf0be58b4768bd5782f6c9ae7d3996b3e058b984bf70fde77b32769a7079cd9b1fe2e3cf8705344b5971bd554a122ccec48
-EBUILD spyder-5.1.5-r1.ebuild 7181 BLAKE2B 1f290df854b33246fea089e8f0c4bb119c4b276ff9afdda76752fda332fe9483c101dc6e708ec7271b3894b991c74cded6eca2d38fdad97d26b81709f56fb4b7 SHA512 b97b0853e8c5c890f986796a93de605b13d56af423fb1b62d43f8b6def45ac6ba02662e25b46b27016cab764ca897f593c51f05023f1691bde05ca98fee103c7
+EBUILD spyder-4.2.5-r3.ebuild 10242 BLAKE2B 4f1be987a2a565cc1816754ad2cbde22c091345cb6fb4295f9299eb99d0b77242f13eddd05b1b6ef728494c953572693ce1055d751d38bc32559b7afbabec12c SHA512 efc782d8cab53f3f70a97bfccf6e5a2f54efaba9618df1221ad3e2c7bc6ce73edcdfa4318001cd018c6965859945f89dc55cd84265d7c42156a28a57818f92e7
+EBUILD spyder-5.0.5-r2.ebuild 8219 BLAKE2B e95d6cd019398c19e7548b5008f63dab1f29a1c5c25b26fde059a7caf217709cf4c92e952b423385bccb2a27ab16d79fe2ca4a07fbdd19537b8fb731dda813a9 SHA512 3bf7b4947724e15125fdd0a6e655d55d274b3d6a787848da92f0be4050e556fca158228d8e40e212537d7144a720c0e513821b943cdc4d821e6efb0f5c490430
+EBUILD spyder-5.1.5-r2.ebuild 7424 BLAKE2B fbab5dac940bd1c6c0e2cd0f3f0cf1e4cc1d0b59b1f686b172ca5076a282b8c68dbc97294cfdd978b4de40ef2c89270a9adf18f6f5a6a9448d698589573d3e87 SHA512 b71a0868b35122e1dc513f96677eaaff36983a08b1eeeb009b5e7bb0fb2928582c2766832588628fe366787e2382e8d9b7b889146d28d7274d02012e829f6860
 MISC metadata.xml 1316 BLAKE2B 996e794aec3c0a7f3b192fb9a66ebe7afaddc3f1ef2057d36a007770becf3d11ec0d05cf30a520cfb8537c1ae34bc9d89e8bc54224def1f4f2f4b30c657ead53 SHA512 b3cd21a16e51414d22b0f102f88da30ca1c3e596eb032ee7bde3c0d7b396659485c2565f0ed79c437eaca07b535fa3305796386e6023606ad1896edf7d347493
diff --git a/dev-python/spyder/spyder-4.2.5-r2.ebuild b/dev-python/spyder/spyder-4.2.5-r3.ebuild
index 0656eb1aa38d..84debca02048 100644
--- a/dev-python/spyder/spyder-4.2.5-r2.ebuild
+++ b/dev-python/spyder/spyder-4.2.5-r3.ebuild
@@ -145,7 +145,17 @@ python_prepare_all() {
 		-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 "/'python-language-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
index 15c28e9147d6..396662a41603 100644
--- a/dev-python/spyder/spyder-5.0.5-r1.ebuild
+++ b/dev-python/spyder/spyder-5.0.5-r2.ebuild
@@ -152,7 +152,17 @@ python_prepare_all() {
 		-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 "/'python-language-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
index b2318fa8c7e6..41c79713327c 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'" \