Updating liguros repo

40 files changed, 313 insertions, 128 deletions

diff --git a/dev-python/cfn-python-lint/Manifest b/dev-python/cfn-python-lint/Manifest
index 209e6b41e969..b5a368b2d5ff 100644
--- a/dev-python/cfn-python-lint/Manifest
+++ b/dev-python/cfn-python-lint/Manifest
@@ -4,3 +4,4 @@ DIST cfn-python-lint-0.36.1.tar.gz 4963743 BLAKE2B 31efc227bf2b5aafff0365d0ca949
 DIST cfn-python-lint-0.37.1.tar.gz 5005775 BLAKE2B f393f4b871a8782e81f71a1a2d011d5d59dee287fa305d1b6c82ac366e7975e5ff02ce96949501ed883c2b86cc6547d148d19d5153bf1b77a675a1b8c33ba96d SHA512 8e2d3419142527431835f935f96bea972057eb471894ddc2b3867ce3cbe490d540fe9b1490b79c84042eba8e5f997cab1aae5aff862aaefeda38351babb04a2f
 DIST cfn-python-lint-0.38.0.tar.gz 5030920 BLAKE2B 3df51d77753ad8f2d8ea76ee2ac8b0c7e89ece043c75503272ee2683dee3a6280ff4f27c3df813b2532b3ee495b3a336b1c82ef649255cf1adea34bcc2fcf7db SHA512 1daf122735a22121e22f448c5867715507ef776a4fb7748c092818302e3226bcd368f03bad22709808864376bd63a916c66a8800a859da7c4d1deae40feaca2d
 DIST cfn-python-lint-0.39.0.tar.gz 5096885 BLAKE2B 50fe41b1dd533c10a011d4729e78241d0153389cd9eda2c887181b62341d5ff38eba223606c2f9e725dfb1a6c934b5f044a236fb2044368a413d434eefd097c4 SHA512 d48116aeefd996943aa1408c76574ec137e96447c7b8950bb1726ff00819611ad6179a8af820ee4d16f493455cf55110e90b78b6d4325036e955529dedf7807f
+DIST cfn-python-lint-0.41.0.tar.gz 5192401 BLAKE2B 1f4c491446b552272cb9fea46d9d07ca559a4ac7526730663b0824d3ba631a333128ca45b2dbbe637286b0495d0198c45ce19b662bb1448125c919ab4fed57b1 SHA512 3ece6a39666dee395c78fed8e23d9228ec7e0cca67d9216b709300bccf48605903252202cb7d05e7c9b9122be11ed4ca39540aba891359633f1772af72a73fa6
diff --git a/dev-python/cfn-python-lint/cfn-python-lint-0.41.0.ebuild b/dev-python/cfn-python-lint/cfn-python-lint-0.41.0.ebuild
new file mode 100644
index 000000000000..76cb0d12eb97
--- /dev/null
+++ b/dev-python/cfn-python-lint/cfn-python-lint-0.41.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6,7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="CloudFormation Linter"
+HOMEPAGE="https://pypi.org/project/cfn-lint/ https://github.com/aws-cloudformation/cfn-python-lint"
+SRC_URI="https://github.com/aws-cloudformation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/aws-sam-translator-1.25.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/importlib_resources[${PYTHON_USEDEP}]
+	' python3_6)
+	dev-python/jsonpatch[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
+	dev-python/junit-xml[${PYTHON_USEDEP}]
+	dev-python/networkx[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.11[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+PATCHES=(
+	"${FILESDIR}/cfn-python-lint-0.30.1-tests.patch"
+)
+
+src_prepare() {
+	# unpin the deps
+	sed -e 's:~=[0-9.]*::' -i setup.py || die
+	# requires git checkout
+	sed -e 's:test_update_docs:_&:' \
+		-i test/unit/module/maintenance/test_update_documentation.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	distutils_install_for_testing
+	"${EPYTHON}" -m unittest discover -v ||
+		die "tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/diff-match-patch/Manifest b/dev-python/diff-match-patch/Manifest
index 6278567ccc5d..98dd5bcdefdc 100644
--- a/dev-python/diff-match-patch/Manifest
+++ b/dev-python/diff-match-patch/Manifest
@@ -1 +1,2 @@
 DIST diff-match-patch-20181111.tar.gz 58554 BLAKE2B 2a74294bb9ac88447cdea794a9c3b44d705d93f7e0777d5e5ece4a306f43df47458a4ba0ec8b16624862a6e4540a605695c3a83ee7dad7749b22210ebe65705a SHA512 9b21726b9c0e350553533c14dd86cca823c6f98ab642e7166cf9348952a57b62bcb0576e3d6a3b76655ea1bcc8cef3fe7f33ffb068b5a4bfb4b4b521042484e6
+DIST diff-match-patch-20200713.tar.gz 60711 BLAKE2B 9108557050d0aced61e8073e0bfa1969e780e4350dba86e3cb159760d180b09ff2502e8b0a664370e0586bb0ca280f29cfebb983cddf051f10204e3cd1026d8f SHA512 f161efed3d87dd0693c98ee81aedb3868787f040f8f9f31015f9f1de04d50046be75b2351a65a4c26ae1d194b983dbc1420799cf70e7c25737ee4eb3cc78a183
diff --git a/dev-python/diff-match-patch/diff-match-patch-20200713.ebuild b/dev-python/diff-match-patch/diff-match-patch-20200713.ebuild
new file mode 100644
index 000000000000..727acdc84be5
--- /dev/null
+++ b/dev-python/diff-match-patch/diff-match-patch-20200713.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Diff, match and patch algorithms for plain text"
+HOMEPAGE="https://pypi.org/project/diff-match-patch/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/docutils-glep/docutils-glep-9999.ebuild b/dev-python/docutils-glep/docutils-glep-9999.ebuild
deleted file mode 100644
index 9380e87e3d85..000000000000
--- a/dev-python/docutils-glep/docutils-glep-9999.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{5,6,7,8,9} )
-EGIT_REPO_URI="https://github.com/mgorny/docutils-glep.git"
-
-inherit distutils-r1 git-r3
-
-DESCRIPTION="Gentoo GLEP support for docutils"
-HOMEPAGE="https://github.com/mgorny/docutils-glep/"
-SRC_URI=""
-
-LICENSE="public-domain"
-SLOT="0"
-
-RDEPEND=">=dev-python/docutils-0.10[${PYTHON_USEDEP}]"
diff --git a/dev-python/errorhandler/errorhandler-2.0.1.ebuild b/dev-python/errorhandler/errorhandler-2.0.1.ebuild
index 356d3822d2f8..f9c9550cd1f4 100644
--- a/dev-python/errorhandler/errorhandler-2.0.1.ebuild
+++ b/dev-python/errorhandler/errorhandler-2.0.1.ebuild
@@ -12,32 +12,12 @@ HOMEPAGE="https://pypi.org/project/errorhandler/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
 LICENSE="MIT"
 SLOT="0"
 
 RDEPEND=""
 DEPEND="
-	dev-python/pkginfo[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.0.1-no-intersphinx.patch
-)
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	nosetests -v || die "Tests fail with ${EPYTHON}"
-}
+	dev-python/pkginfo[${PYTHON_USEDEP}]"
 
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
+distutils_enable_sphinx docs
+distutils_enable_tests nose
diff --git a/dev-python/flake8-import-order/flake8-import-order-0.18.ebuild b/dev-python/flake8-import-order/flake8-import-order-0.18.ebuild
index f6621e43c5e7..9a382e034726 100644
--- a/dev-python/flake8-import-order/flake8-import-order-0.18.ebuild
+++ b/dev-python/flake8-import-order/flake8-import-order-0.18.ebuild
@@ -28,5 +28,5 @@ DEPEND="${RDEPEND}
 	)"
 
 python_test() {
-	py.test -v tests || die "tests failed with ${EPYTHON}"
+	pytest -vv tests || die "tests failed with ${EPYTHON}"
 }
diff --git a/dev-python/genson/genson-1.1.0.ebuild b/dev-python/genson/genson-1.1.0.ebuild
index 528882179571..7612ca5e5658 100644
--- a/dev-python/genson/genson-1.1.0.ebuild
+++ b/dev-python/genson/genson-1.1.0.ebuild
@@ -17,19 +17,8 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
-
-BDEPEND="
-	${PYTHON_DEPS}
-	"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	"
-DEPEND="${RDEPEND}
-	test? ( dev-python/jsonschema[${PYTHON_USEDEP}] )"
-
 RESTRICT="!test? ( test )"
 
-python_test() {
-	"${PYTHON}" -m unittest discover || die "Testing failed with ${EPYTHON}"
-}
+BDEPEND="test? ( dev-python/jsonschema[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests unittest
diff --git a/dev-python/greenstalk/greenstalk-1.0.1.ebuild b/dev-python/greenstalk/greenstalk-1.0.1.ebuild
index 5f7dcca5a399..eb34e6d4b2de 100644
--- a/dev-python/greenstalk/greenstalk-1.0.1.ebuild
+++ b/dev-python/greenstalk/greenstalk-1.0.1.ebuild
@@ -13,20 +13,15 @@ SRC_URI="https://github.com/mayhewj/greenstalk/archive/v${PV}.tar.gz -> ${P}.tar
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
-DEPEND="
+BDEPEND="
 	test? (
 		app-misc/beanstalkd
-		dev-python/pytest[${PYTHON_USEDEP}]
 	)
 "
 
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
+distutils_enable_tests pytest
 
 python_test() {
-	pytest -v tests.py || die
+	pytest -vv tests.py || die
 }
diff --git a/dev-python/imapclient/imapclient-2.1.0.ebuild b/dev-python/imapclient/imapclient-2.1.0.ebuild
index a2c593ebffde..bbce039fc660 100644
--- a/dev-python/imapclient/imapclient-2.1.0.ebuild
+++ b/dev-python/imapclient/imapclient-2.1.0.ebuild
@@ -18,7 +18,6 @@ IUSE="doc examples"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
 
 PATCHES=(
diff --git a/dev-python/indexed_gzip/indexed_gzip-0.8.10.ebuild b/dev-python/indexed_gzip/indexed_gzip-0.8.10.ebuild
index df3e0c94ef12..9fbd1a7f6254 100644
--- a/dev-python/indexed_gzip/indexed_gzip-0.8.10.ebuild
+++ b/dev-python/indexed_gzip/indexed_gzip-0.8.10.ebuild
@@ -14,18 +14,17 @@ SRC_URI="https://github.com/pauldmccarthy/indexed_gzip/archive/v${PV}.tar.gz ->
 LICENSE="ZLIB"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 DEPEND="
 	dev-python/cython[${PYTHON_USEDEP}]
 	test? (
 		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
 	)
 	"
 RDEPEND=""
 
+distutils_enable_tests pytest
+
 src_compile() {
 	if use test; then
 		export INDEXED_GZIP_TESTING=1
diff --git a/dev-python/ipdb/ipdb-0.10.3.ebuild b/dev-python/ipdb/ipdb-0.10.3-r1.ebuild
index 790bc6246e03..790bc6246e03 100644
--- a/dev-python/ipdb/ipdb-0.10.3.ebuild
+++ b/dev-python/ipdb/ipdb-0.10.3-r1.ebuild
diff --git a/dev-python/jinja2_pluralize/jinja2_pluralize-0.3.0.ebuild b/dev-python/jinja2_pluralize/jinja2_pluralize-0.3.0.ebuild
index f15d6b7cf2bc..f5921917fd7c 100644
--- a/dev-python/jinja2_pluralize/jinja2_pluralize-0.3.0.ebuild
+++ b/dev-python/jinja2_pluralize/jinja2_pluralize-0.3.0.ebuild
@@ -18,7 +18,6 @@ IUSE=""
 
 RDEPEND="dev-python/inflect[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/jinja[${PYTHON_USEDEP}]"
 
 python_test() {
diff --git a/dev-python/jsonmerge/jsonmerge-1.6.0.ebuild b/dev-python/jsonmerge/jsonmerge-1.6.0.ebuild
index 2eca6a36f891..8ab7cf2d16e5 100644
--- a/dev-python/jsonmerge/jsonmerge-1.6.0.ebuild
+++ b/dev-python/jsonmerge/jsonmerge-1.6.0.ebuild
@@ -16,8 +16,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-python/jsonschema[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
+BDEPEND="${RDEPEND}"
 
 python_test() {
 	PYTHONPATH="${PWD}" python -m unittest \
diff --git a/dev-python/jsonrpclib/jsonrpclib-0.4.2.ebuild b/dev-python/jsonrpclib/jsonrpclib-0.4.2.ebuild
index 5e0a64078a9f..489138673573 100644
--- a/dev-python/jsonrpclib/jsonrpclib-0.4.2.ebuild
+++ b/dev-python/jsonrpclib/jsonrpclib-0.4.2.ebuild
@@ -19,13 +19,7 @@ HOMEPAGE="https://github.com/tcalmant/jsonrpclib"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/simplejson[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND} )"
 
-python_test() {
-	esetup.py test
-}
+distutils_enable_tests setup.py
diff --git a/dev-python/pydata-sphinx-theme/Manifest b/dev-python/pydata-sphinx-theme/Manifest
index 504bdeaf1f71..790ba2b09e72 100644
--- a/dev-python/pydata-sphinx-theme/Manifest
+++ b/dev-python/pydata-sphinx-theme/Manifest
@@ -1 +1,2 @@
 DIST pydata-sphinx-theme-0.4.0.tar.gz 3276611 BLAKE2B fb260de2ad40f9a3b5e524ef299a5bf2ee9fbe3f36a0b0e365b53a04702f8a5644154535cfa9f1f3c1deced5de8adbbaf5671488b467d3024b9ae3f60a6f7018 SHA512 abe4924277ec41193019e80a26ccb2ce195741fdae9defc9b500ecc2a63ab9070d1eba5a3398415641ef87ccfe8d573ce6fd10eb069e0f13f09891b5b5e2f932
+DIST pydata-sphinx-theme-0.4.1.tar.gz 3279361 BLAKE2B d3538dea9444272f1cb314d8b2bd8656b5114b916f31c4cca078867b02a24c60fc91e5ac367d09335b3ce4b9c9fb44405f61ed70b19ae9fed5d8919fc68f1566 SHA512 dbca1f7bde25c20a5ffb5b37ac808d84c938e6cadb6e0a6bc2d72101993889f4f7be3bdc50488bed1945779d30ca0f131bf74b16be2df00b5fa093f8491fad39
diff --git a/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.4.1.ebuild b/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.4.1.ebuild
new file mode 100644
index 000000000000..3441c45783bd
--- /dev/null
+++ b/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.4.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Bootstrap-based Sphinx theme from the PyData community"
+HOMEPAGE="https://github.com/pandas-dev/pydata-sphinx-theme"
+SRC_URI="https://github.com/pandas-dev/pydata-sphinx-theme/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-with-disclosure"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="test? (
+	dev-python/beautifulsoup[${PYTHON_USEDEP}]
+	dev-python/pytest-regressions[${PYTHON_USEDEP}]
+)"
+
+RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
+
+# ModuleNotFoundError: No module named 'plotly' even if dev-python/plotly is installed
+#distutils_enable_sphinx docs dev-python/commonmark dev-python/recommonmark dev-python/numpydoc dev-python/jupyter-sphinx dev-python/plotly
+distutils_enable_tests pytest
+
+python_test() {
+	PYTHONPATH="${S}"
+	pytest -vv || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/pyls-black/Manifest b/dev-python/pyls-black/Manifest
new file mode 100644
index 000000000000..2dc576125c41
--- /dev/null
+++ b/dev-python/pyls-black/Manifest
@@ -0,0 +1 @@
+DIST pyls-black-0.4.6-gh.tar.gz 5121 BLAKE2B fb1265d40e7c8b85d066d8d3078a60ff719992abcd84efc9d9df582d6fd7e47f211dbed004081413955524e9455218085d78f1d843769a40168ac448139e283c SHA512 e9fa3faec0fb3f2a8bcbdd4c9b8b8e6662d1bcafa88f693b09e2a7a4df8c2d35df8d8f79c50bbb33342a07cde8931e7f136136ff40879898612b13bdff7277fc
diff --git a/dev-python/pyls-black/metadata.xml b/dev-python/pyls-black/metadata.xml
new file mode 100644
index 000000000000..513296e0cbc6
--- /dev/null
+++ b/dev-python/pyls-black/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <upstream>
+    <remote-id type="pypi">pyls-black</remote-id>
+    <remote-id type="github">spyder-ide/pyls-black</remote-id>
+  </upstream>
+  <maintainer type="person">
+    <email>andrewammerlaan@riseup.net</email>
+    <name>Andrew Ammerlaan</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/dev-python/pyls-black/pyls-black-0.4.6.ebuild b/dev-python/pyls-black/pyls-black-0.4.6.ebuild
new file mode 100644
index 000000000000..5ee44ef44a92
--- /dev/null
+++ b/dev-python/pyls-black/pyls-black-0.4.6.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Black plugin for the Python Language Server"
+HOMEPAGE="https://github.com/rupert/pyls-black
+	https://pypi.org/project/pyls-black/"
+SRC_URI="https://github.com/rupert/${PN}/archive/v${PV}.tar.gz -> ${P}-gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/python-language-server[${PYTHON_USEDEP}]
+	dev-python/black[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	distutils_install_for_testing
+	pytest -vv || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/pyls-spyder/Manifest b/dev-python/pyls-spyder/Manifest
new file mode 100644
index 000000000000..c3c63c5cc188
--- /dev/null
+++ b/dev-python/pyls-spyder/Manifest
@@ -0,0 +1 @@
+DIST pyls-spyder-0.1.1-gh.tar.gz 7113 BLAKE2B c504c5393527c13d06de579b3e46938dc52012902229e6859e56c3358990f72861682b7a7166658d874b501f9a797db62296d6f5ef30b25e43df73116091d9b6 SHA512 dabc2e3047b97502daaa5f939e75cf6533284bd89c33b29cbb881a3ddafd5b273ff0915645120515740e07dfb4f22c12d47db699b4744599d5edf87e41abe051
diff --git a/dev-python/pyls-spyder/metadata.xml b/dev-python/pyls-spyder/metadata.xml
new file mode 100644
index 000000000000..5b426849a142
--- /dev/null
+++ b/dev-python/pyls-spyder/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <upstream>
+    <remote-id type="pypi">pyls-spyder</remote-id>
+    <remote-id type="github">spyder-ide/pyls-spyder</remote-id>
+  </upstream>
+  <maintainer type="person">
+    <email>andrewammerlaan@riseup.net</email>
+    <name>Andrew Ammerlaan</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/dev-python/pyls-spyder/pyls-spyder-0.1.1.ebuild b/dev-python/pyls-spyder/pyls-spyder-0.1.1.ebuild
new file mode 100644
index 000000000000..b93f64098721
--- /dev/null
+++ b/dev-python/pyls-spyder/pyls-spyder-0.1.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Spyder extensions for the python language server"
+HOMEPAGE="https://github.com/spyder-ide/pyls-spyder
+	https://pypi.org/project/pyls-spyder/"
+SRC_URI="https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}-gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/python-language-server[${PYTHON_USEDEP}]"
+BDEPEND="test? ( dev-python/mock )"
+
+distutils_enable_tests pytest
diff --git a/dev-python/python-language-server/Manifest b/dev-python/python-language-server/Manifest
index baace4dcfdfc..00ae8568c062 100644
--- a/dev-python/python-language-server/Manifest
+++ b/dev-python/python-language-server/Manifest
@@ -1,3 +1,3 @@
 DIST python-language-server-0.34.1.tar.gz 70238 BLAKE2B 55ec41875907bb6c09f682c8ce6165e7e2fab5d03c3d4758bcbe658968aeeee7f0316a472efe68ddd87872b0e2d34908c8a7e9528aa5eec6d3359b2565a2cbbc SHA512 12404753f4271ec3606cee535ba8e886037bf0c61cc5c4415358066be837e2248f6393124340551387cba7351dee924b4f5ebc9c4e35b1ab0943067968967a90
 DIST python-language-server-0.35.1.tar.gz 72944 BLAKE2B fe469e5365dec4a2192a2ca2f75fc9f05476434c0f6db26d851521149053455b256678ed98c5f1209d30b262808b615a3f7ac77fb604adf1455203e40f93c96f SHA512 278f281c8c82729ad60db2785b3f4b64568de529edb7a6f1b5683d09838ea43ed79182c50e42210e766b9a3f3c10b0c0256121b9925803c45f9e948f144ca994
-DIST python-language-server-0.36.0.tar.gz 74398 BLAKE2B 7a112f22df88bc06eba8c480e9927ce87278e24bf2e8de8c6be407569c195f96e15a5196f70c2840c8619dc512813fff8224df9547c258f045b98c652f5cc686 SHA512 4589812b4e05b9db5d9308ec97c6a701ea0cfdc62d2fe117c7581ee22ccf7ed84377556785500be3a5351277d4e70651d597bd18d629c39821c79b79660fbc83
+DIST python-language-server-0.36.1.tar.gz 74524 BLAKE2B 3337bf4c91204302b26b2496bc79ae6e0c18143f89ef97861dd91760b27406eba8fc9895a2f00c5c2de3a990eeb8ba29ba10319262466a42b1fb362af809060f SHA512 4a8150cf1334e9b2085e9b4ca7165404f30127339bd0fe8db229924c67933bfcd7827a875136b1694a82d4f447255862df116bc6d74a51df8e1ed82a6875914b
diff --git a/dev-python/python-language-server/python-language-server-0.36.0.ebuild b/dev-python/python-language-server/python-language-server-0.36.1.ebuild
index 74fa35bf8bcb..74fa35bf8bcb 100644
--- a/dev-python/python-language-server/python-language-server-0.36.0.ebuild
+++ b/dev-python/python-language-server/python-language-server-0.36.1.ebuild
diff --git a/dev-python/scrapy/Manifest b/dev-python/scrapy/Manifest
index 16086130b31b..12a5aa70c935 100644
--- a/dev-python/scrapy/Manifest
+++ b/dev-python/scrapy/Manifest
@@ -1,2 +1,2 @@
-DIST scrapy-2.3.0.tar.gz 1219150 BLAKE2B ef8e06d604a16ed7f23bf198a010eb626b7d2f84da4401051adc3eda16debbcd6a093eea188e97c5a2ca542612547a2f1c8fad096f7a767faf4aafe288714544 SHA512 be1cc2b62d08b87989a1f33132223deabebb62cc126611d5473425fca46de88f95ad049ce9fb4195eaac57dbfaeb1a49f933fd3211ae602c9c43aea68ec49999
 DIST scrapy-2.4.0.tar.gz 1246653 BLAKE2B a08d0c8c372ff21472c416bb10f31e79f5cd7d12262be3c50cc0eea4989bf3f0bc532908246b4f7fcada4285f8c865109c99d1f35be1bf929eb0e797d4bc5885 SHA512 0ee24ccae664fbe35c1f5b7589a8b24ea9bfad62315e2736a166a839769b5d953bab00f5b34a449a585a3632faee460f484b939a05b3f69a7466b914531ec21c
+DIST scrapy-2.4.1.tar.gz 1248020 BLAKE2B de1827d0764adf834822236b094a9e998d8f55568ada578eedf4360125b747fc86accd20833a0a6f810e1219b9c7c0febf39c64a6d7c5023348f68319c559344 SHA512 639a281ff0f20c51ab4be20e1935a171d06c4ba4b4d4340023cc4ad583266b63ad93d8efeec8bf5ee65ddfb1a72092957c61b3444bc67da4049f6f8102a57d3c
diff --git a/dev-python/scrapy/scrapy-2.3.0.ebuild b/dev-python/scrapy/scrapy-2.4.1.ebuild
index 88e164745ecd..88e164745ecd 100644
--- a/dev-python/scrapy/scrapy-2.3.0.ebuild
+++ b/dev-python/scrapy/scrapy-2.4.1.ebuild
diff --git a/dev-python/spyder-kernels/Manifest b/dev-python/spyder-kernels/Manifest
index bb66ba1f62b0..fb2025ef6db9 100644
--- a/dev-python/spyder-kernels/Manifest
+++ b/dev-python/spyder-kernels/Manifest
@@ -1 +1 @@
-DIST spyder-kernels-1.9.4-gh.tar.gz 72428 BLAKE2B e612905046b25f87deb2013b7d39155ddacf2e3ebe5fb4ee2090ccc28fd6be47571c4423c910c932c248bb69b0b39f762c1a159311413ce3da784bb4b7a076db SHA512 51ae84d2cb05a75d658a57ff43387f1b15c82692660b33ff0b9c6fb80fa7cac92c286e342c4ef1888b2d8c889c6406219538e2d4ad0066e1b8e18481bd191386
+DIST spyder-kernels-1.10.0-gh.tar.gz 77416 BLAKE2B 0d3e3f8228d2a76174e8d7c64a55c9fda384961065673b1b6b64591f476e8932c5dc3fe253b67d94135688b8d346828f88800bdc3bb0b83450d51669218f98b3 SHA512 59a66d9f6c9b53a2cb058e1c493535ee18c3965a62d6ff728cc0f9544c35fbdf56f18024c778c242802f961259231e153cdcd98c867bec84a80ca3541dbcf455
diff --git a/dev-python/spyder-kernels/spyder-kernels-1.9.4.ebuild b/dev-python/spyder-kernels/spyder-kernels-1.10.0.ebuild
index de0d5ab997b3..d7780babc005 100644
--- a/dev-python/spyder-kernels/spyder-kernels-1.9.4.ebuild
+++ b/dev-python/spyder-kernels/spyder-kernels-1.10.0.ebuild
@@ -23,7 +23,7 @@ RDEPEND="dev-python/cloudpickle[${PYTHON_USEDEP}]
 	>=dev-python/wurlitzer-1.0.3[${PYTHON_USEDEP}]
 "
 
-DEPEND="test? (
+BDEPEND="test? (
 	dev-python/cython[${PYTHON_USEDEP}]
 	dev-python/flaky[${PYTHON_USEDEP}]
 	dev-python/matplotlib[${PYTHON_USEDEP}]
@@ -39,7 +39,6 @@ distutils_enable_tests pytest
 python_prepare_all() {
 	# assert False
 	sed -i -e 's:test_dask_multiprocessing:_&:' \
-		-e 's:test_turtle_launch:_&:' \
 				spyder_kernels/console/tests/test_console_kernel.py || die
 
 	distutils-r1_python_prepare_all
diff --git a/dev-python/spyder-notebook/Manifest b/dev-python/spyder-notebook/Manifest
index 1cddbec043ce..40c3ee482455 100644
--- a/dev-python/spyder-notebook/Manifest
+++ b/dev-python/spyder-notebook/Manifest
@@ -1 +1 @@
-DIST spyder-notebook-0.3.0.tar.gz 3862097 BLAKE2B 12f9edb3b49373419e491ae3f123b8c325dddefe5a55e8bb853d720aba2c28fbde0be50ec1e5f74198fa1e21faee8a7378218b3e7b3e8378c82be5ee3a10b9b8 SHA512 9259ccfcd79b7d86d49eda74182e3f1e66188f644ca7560a8929dd07c1a453f17bb976ab325ed55df879a00cbc4d14d3724909fb49c56cf1bbf9665ad69b9ec5
+DIST spyder-notebook-0.3.1.tar.gz 3862401 BLAKE2B cfafc631fc0fe44fadecc1f2509435c0a7b6ce5320c19bbe75be92e4c50275a06e79aa77e8b0cf832fbb1fdb229236c3741208f3081e879528751373d8875126 SHA512 253583b0a080f6359b58583f8c459ae858bafe4b15d24e86c7f144801431bd03254ced3984ac98e1e3349f48ebe5081252d298e59dd88609b7bb22f9e0b6765d
diff --git a/dev-python/spyder-notebook/spyder-notebook-0.3.0.ebuild b/dev-python/spyder-notebook/spyder-notebook-0.3.1.ebuild
index 62cf51dcd617..295c591b3f58 100644
--- a/dev-python/spyder-notebook/spyder-notebook-0.3.0.ebuild
+++ b/dev-python/spyder-notebook/spyder-notebook-0.3.1.ebuild
@@ -28,7 +28,7 @@ RDEPEND="
 	dev-python/traitlets[${PYTHON_USEDEP}]
 "
 
-DEPEND="test? (
+BDEPEND="test? (
 	dev-python/flaky[${PYTHON_USEDEP}]
 	dev-python/pytest-mock[${PYTHON_USEDEP}]
 	dev-python/pytest-qt[${PYTHON_USEDEP}]
diff --git a/dev-python/spyder-terminal/Manifest b/dev-python/spyder-terminal/Manifest
index 6d3f321b1e83..7781002b2c75 100644
--- a/dev-python/spyder-terminal/Manifest
+++ b/dev-python/spyder-terminal/Manifest
@@ -1 +1 @@
-DIST spyder-terminal-0.4.2.tar.gz 9123613 BLAKE2B badad7ba21c5d195bd7251719aeb74044b3d82ff840d0902046028c2dde006fc6c9da0095d1e56893f8f0c1ab01207ba559ef40e1f9d9f794768e4bbf701d1d5 SHA512 ac2755adbee2f8d0a799843fa5c9938ddfe612665452fef7b57d189481fb235c50efbc6665f0ef644db11324697382a65ece71d98051e8e17c6b968f5e94db39
+DIST spyder-terminal-0.5.0.tar.gz 10070777 BLAKE2B 2b556597b62e822a94102c393818c9b479292f1e9b61fb70a48f9627bc5ccd493eeb5624406cbb205970a2b1613bb47310d92a969cf190dee296e34daafb7c2e SHA512 8a73a46adbd628a80a8a7c8f9f50c8ed4a00c64adbb6f0934a32840397f9a5840f516380728abe1e31b659415e82bd38d1a5418bae43229b61e4e6340fc8c19b
diff --git a/dev-python/spyder-terminal/spyder-terminal-0.4.2.ebuild b/dev-python/spyder-terminal/spyder-terminal-0.5.0.ebuild
index 272e299de275..2ac2fc7578cb 100644
--- a/dev-python/spyder-terminal/spyder-terminal-0.4.2.ebuild
+++ b/dev-python/spyder-terminal/spyder-terminal-0.5.0.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~x86"
 RDEPEND="
 	dev-python/coloredlogs[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
-	>=dev-python/spyder-4.0.0[${PYTHON_USEDEP}]
-	dev-python/terminado[${PYTHON_USEDEP}]
+	>=dev-python/spyder-4.1.0[${PYTHON_USEDEP}]
+	>=dev-python/terminado-0.9.1[${PYTHON_USEDEP}]
 	www-servers/tornado[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/spyder-vim/Manifest b/dev-python/spyder-vim/Manifest
index aeac005a18b2..2a079b8271ef 100644
--- a/dev-python/spyder-vim/Manifest
+++ b/dev-python/spyder-vim/Manifest
@@ -1 +1 @@
-DIST spyder-vim-0_pre20200721.tar.gz 291815 BLAKE2B 6fbcd5dfc73de14a3e31deb4e7dae2e1881a1ad4fb07213c04b4c7446b225ebfdbf90c95c441e0b275dd020fa972eddd7b8ef11cab52b44fc369531f82dc381c SHA512 4363606f6329c3be84cab7431c7eda08012ee365e475446dd1addf858896ce1584ff04d3603a0f0a1473d3741b23befd311e3a107a96869da90eb6dc3c844361
+DIST spyder-vim-0_pre20201026.tar.gz 293554 BLAKE2B 1ee4122e5a149d029d67f93acabacf81af47b2a7d9902ef2c3a5bc289e5c532c8b2f15ce59cb0b8bb16eb6b3ea461c3ce44ff85f6f8d022cea5e5b482987a8fc SHA512 98b479b4ab2be5e1cbe730e1d4441c5d557d32ad7caee31ed2e6c936d97554ca50f3f0b0d2cef68be7742653946d3c87a01938479664de4066e22b13441c58fa
diff --git a/dev-python/spyder-vim/spyder-vim-0_pre20200721.ebuild b/dev-python/spyder-vim/spyder-vim-0_pre20201026.ebuild
index 35eae1a65eb1..84046b285ea6 100644
--- a/dev-python/spyder-vim/spyder-vim-0_pre20200721.ebuild
+++ b/dev-python/spyder-vim/spyder-vim-0_pre20201026.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 
 inherit distutils-r1 virtualx
 
-COMMIT="c6f6ad75d1298d4cdadab69d57b2b4e2d235d8f3"
+COMMIT="4d0bf821abb193bfd158e2489970e1873a9f1138"
 
 DESCRIPTION="Plugin for Spyder to enable Vim keybindings"
 HOMEPAGE="https://github.com/spyder-ide/spyder-vim"
diff --git a/dev-python/spyder/Manifest b/dev-python/spyder/Manifest
index 9d648775d12a..9932a8792c86 100644
--- a/dev-python/spyder/Manifest
+++ b/dev-python/spyder/Manifest
@@ -1,2 +1,2 @@
-DIST spyder-4.1.5.tar.gz 11705605 BLAKE2B da22046116ea67c1d4f02ddf44d846fcf4361c45bae57a0b328ae646a1bcdc35494d42cb909c8b4d51cf0ae7c6578c4b4a3c746e55a5055a98dcb6a2b7c3cabb SHA512 9b118d857806791ed83182019088ad5b877fffe5e26cd47b4638cd9bdc68fc6ad8339186046a30715b5ccc6c503bc0a2824b7260f325816c9f750b9af667e3f1
+DIST spyder-4.2.0.tar.gz 11840358 BLAKE2B 26e4cd9865196fb39fa5b49a17f172b3000fe27c5ab6fb1b31ed56d41f118e4016b6ed97ce8cb1b39c65031fc11413f8e426876d3dc8d5af25f12428d0e0c481 SHA512 c1460e2fe9a37c0e6107657de71205682018d87737b3eac16ec92c32d979bf727a6c8955bd2700872b6e91159d1a1efc57cdea52ffc44604fe34b78094de6e7f
 DIST spyder-docs-7fbdabcbc37fe696e4ad5604cdbf4023dfbe8b6c.tar.gz 58822544 BLAKE2B 9ddd662eb0e3b2845a15bc38a0ab994fcf43824a560cf635a29e16b5eb66407706a412ea50a2f8e5c0212675df3422ece649bd1e50e3ecd1c34ee5727f8a2df9 SHA512 ab30f287733681da0b1d15656a44cd320401330309efbff8f0a89f59a15d5c57532a2eab3e8353d8c3856eac0a393385a852663d6698d0a0d309def21d13933d
diff --git a/dev-python/spyder/spyder-4.1.5.ebuild b/dev-python/spyder/spyder-4.2.0.ebuild
index ee0fc7503bee..303e06f22b17 100644
--- a/dev-python/spyder/spyder-4.1.5.ebuild
+++ b/dev-python/spyder/spyder-4.2.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 
-inherit eutils xdg distutils-r1
+inherit optfeature xdg distutils-r1
 
 # Commit of documentation to fetch
 DOCS_PV="7fbdabcbc37fe696e4ad5604cdbf4023dfbe8b6c"
@@ -24,7 +24,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-# Extra indented deps are expansion of python-language-server[all] dep
+# White space separated deps are expansion of python-language-server[all] dep
 # As the pyls ebuild does not add flags for optional runtime dependencies
 # we have to manually specify these desp instead of just depending on the [all]
 # flag. The indentation allows us to distinguish them from spyders direct deps.
@@ -32,12 +32,12 @@ RDEPEND="
 	>=dev-python/atomicwrites-1.2.0[${PYTHON_USEDEP}]
 	>=dev-python/chardet-2.0.0[${PYTHON_USEDEP}]
 	>=dev-python/cloudpickle-0.5.0[${PYTHON_USEDEP}]
-	>=dev-util/cookiecutter-1.6.0[${PYTHON_USEDEP}]
 	>=dev-python/diff-match-patch-20181111[${PYTHON_USEDEP}]
-	dev-python/intervaltree[${PYTHON_USEDEP}]
+	>=dev-python/intervaltree-3.0.2[${PYTHON_USEDEP}]
 	>=dev-python/ipython-4.0[${PYTHON_USEDEP}]
-	~dev-python/jedi-0.17.1[${PYTHON_USEDEP}]
-	dev-python/keyring[${PYTHON_USEDEP}]
+	~dev-python/jedi-0.17.2[${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/parso-0.7.0[${PYTHON_USEDEP}]
@@ -46,7 +46,7 @@ RDEPEND="
 	>=dev-python/psutil-5.3[${PYTHON_USEDEP}]
 	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
 	>=dev-python/pylint-1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-language-server-0.34.0[${PYTHON_USEDEP}]
+	>=dev-python/python-language-server-0.36.1[${PYTHON_USEDEP}]
 
 	dev-python/autopep8[${PYTHON_USEDEP}]
 	>=dev-python/flake8-3.8.0[${PYTHON_USEDEP}]
@@ -62,16 +62,19 @@ RDEPEND="
 	dev-python/yapf[${PYTHON_USEDEP}]
 
 	<dev-python/python-language-server-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pyls-black-0.4.6[${PYTHON_USEDEP}]
+	>=dev-python/pyls-spyder-0.1.1[${PYTHON_USEDEP}]
 	>=dev-python/pyxdg-0.26[${PYTHON_USEDEP}]
 	>=dev-python/pyzmq-17.0.0[${PYTHON_USEDEP}]
 	>=dev-python/qdarkstyle-2.8[${PYTHON_USEDEP}]
 	>=dev-python/qtawesome-0.5.7[${PYTHON_USEDEP}]
-	>=dev-python/qtconsole-4.6.0[${PYTHON_USEDEP}]
+	>=dev-python/qtconsole-4.7.7[${PYTHON_USEDEP}]
 	>=dev-python/QtPy-1.5.0[${PYTHON_USEDEP},svg,webengine]
 	>=dev-python/sphinx-0.6.6[${PYTHON_USEDEP}]
-	>=dev-python/spyder-kernels-1.9.4[${PYTHON_USEDEP}]
-	<dev-python/spyder-kernels-1.10.0[${PYTHON_USEDEP}]
-	dev-python/watchdog[${PYTHON_USEDEP}]
+	>=dev-python/spyder-kernels-1.10.0[${PYTHON_USEDEP}]
+	<dev-python/spyder-kernels-1.11.0[${PYTHON_USEDEP}]
+	>=dev-python/three-merge-0.1.1[${PYTHON_USEDEP}]
+	>=dev-python/watchdog-0.10.3[${PYTHON_USEDEP}]
 "
 
 BDEPEND="test? (
@@ -99,7 +102,6 @@ BDEPEND="test? (
 # This fails because access is denied to this command during build
 PATCHES=(
 	"${FILESDIR}/${PN}-4.1.2-build.patch"
-	"${FILESDIR}/${PN}-4.1.2-py3-only.patch"
 	"${FILESDIR}/${PN}-4.1.5-doc-theme-renamed.patch"
 )
 
@@ -112,7 +114,6 @@ DOCS=(
 	"NOTICE.txt"
 	"README.md"
 	"RELEASE.md"
-	"TROUBLESHOOTING.md"
 )
 
 S="${WORKDIR}/${PN}-${MYPV}"
@@ -126,6 +127,8 @@ python_prepare_all() {
 
 	# these deps are packaged separately: dev-python/spyder-kernels, dev-python/python-language-server
 	rm external-deps/* -r || die
+	# runs against things packaged in external-deps dir
+	rm conftest.py || die
 
 	# do not depend on pyqt5<13
 	sed -i -e '/pyqt5/d' \
@@ -136,41 +139,50 @@ python_prepare_all() {
 	sed -i -e 's:test_dependencies_for_spyder_setup_install_requires_in_sync:_&:' \
 		spyder/tests/test_dependencies_in_sync.py || die
 
-	# some tests still depend on QtPy[webkit] which is removed
-	# spyder itself works fine without webkit
-	rm spyder/widgets/tests/test_browser.py || die
-	rm spyder/plugins/onlinehelp/tests/test_pydocgui.py || die
-	rm spyder/plugins/ipythonconsole/tests/test_ipythonconsole.py || die
-	rm spyder/plugins/ipythonconsole/tests/test_ipython_config_dialog.py || die
-	rm spyder/plugins/help/tests/test_widgets.py || die
-	rm spyder/plugins/help/tests/test_plugin.py  || die
-	rm spyder/app/tests/test_mainwindow.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
 
+	# KeyError: 'conda: base', need conda??
+	sed -i -e 's:test_status_bar_conda_interpreter_status:_&:' \
+		spyder/widgets/tests/test_status.py || die
+
+	# assert 2 == 1
+	sed -i -e 's:test_pylint_max_history_conf:_&:' \
+		spyder/plugins/pylint/tests/test_pylint.py || die
+
+	# https://bugs.gentoo.org/747211
+	sed -i -e 's:test_loaded_and_closed_signals:_&:' \
+		spyder/plugins/projects/tests/test_plugin.py || die
+
 	# AssertionError: assert '' == 'This is some test text!'
 	sed -i -e 's:test_tab_copies_find_to_replace:_&:' \
 		spyder/plugins/editor/widgets/tests/test_editor.py || die
 
-	# RuntimeError: Unsafe load() call disabled by Gentoo. See bug #659348
-	sed -i -e 's:test_dependencies_for_binder_in_sync:_&:' \
-		spyder/tests/test_dependencies_in_sync.py || die
-
-	# Fatal Python error: Segmentation fault
-	# sometimes it works, sometimes it segfaults
-	sed -i -e 's:test_copy_path:_&:' \
-		-e 's:test_copy_file:_&:' \
-		-e 's:test_save_file:_&:' \
-		-e 's:test_delete_file:_&:' \
-		spyder/plugins/explorer/widgets/tests/test_explorer.py || die
+	# hangs till forever
+	sed -i -e 's:test_help_opens_when_show_tutorial_full:_&:' \
+		spyder/app/tests/test_mainwindow.py || die
 
 	# Assertion error, can't connect/remember inside ebuild environment
 	rm spyder/plugins/ipythonconsole/widgets/tests/test_kernelconnect.py || die
 
-	# AssertionError: assert 47 in [43, 44, 45, 46]
-	sed -i -e 's:test_objectexplorer_collection_types:_&:' \
-		spyder/plugins/variableexplorer/widgets/objectexplorer/tests/test_objectexplorer.py  || die
+	# AssertionError: waitUntil timed out in 20000 miliseconds
+	sed -i -e 's:test_pdb_multiline:_&:' \
+		spyder/plugins/ipythonconsole/tests/test_ipythonconsole.py || die
+
+	# AssertionError: assert 'if True:\n    0\n    ' == 'if True:\n    0'
+	sed -i -e 's:test_undo_return:_&:' \
+		spyder/plugins/editor/widgets/tests/test_codeeditor.py || die
+
+	# assert False is True
+	sed -i -e 's:test_range_indicator_visible_on_hover_only:_&:' \
+		spyder/plugins/editor/panels/tests/test_scrollflag.py || die
+
+	# AssertionError: waitUntil timed out in 10000 miliseconds
+	sed -i -e 's:test_get_hints:_&:' \
+		spyder/plugins/editor/widgets/tests/test_hints_and_calltips.py || die
 
 	distutils-r1_python_prepare_all
 }
diff --git a/dev-python/three-merge/Manifest b/dev-python/three-merge/Manifest
new file mode 100644
index 000000000000..6555f1532621
--- /dev/null
+++ b/dev-python/three-merge/Manifest
@@ -0,0 +1 @@
+DIST three-merge-0.1.1-gh.tar.gz 7312 BLAKE2B 06aa9e88b258bdd418276b418da338625e60cc95872db0147fc4a1ede7d7b9c1a716d3c0662236d289a0bd583d405c33259ba6e26af0033be499f68e1298a38b SHA512 3219e7b5813942fac5317673fcb6b051cdf0efbbe6cb2ee7d0ce6eabeeddb9a2dc7c88677f732833192c6a864d2191bd21afb06b3e110ded8712a03bf6bfcdcc
diff --git a/dev-python/three-merge/metadata.xml b/dev-python/three-merge/metadata.xml
new file mode 100644
index 000000000000..4247ee5845f7
--- /dev/null
+++ b/dev-python/three-merge/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <upstream>
+    <remote-id type="pypi">three-merge</remote-id>
+    <remote-id type="github">spyder-ide/three-merge</remote-id>
+  </upstream>
+  <maintainer type="person">
+    <email>andrewammerlaan@riseup.net</email>
+    <name>Andrew Ammerlaan</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/dev-python/three-merge/three-merge-0.1.1.ebuild b/dev-python/three-merge/three-merge-0.1.1.ebuild
new file mode 100644
index 000000000000..a6dd1a854807
--- /dev/null
+++ b/dev-python/three-merge/three-merge-0.1.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Simple Python library to perform a 3-way merge between strings"
+HOMEPAGE="https://github.com/spyder-ide/three-merge
+	https://pypi.org/project/three-merge/"
+SRC_URI="https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}-gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/diff-match-patch[${PYTHON_USEDEP}]"
+
+BDEPEND="test? (
+	dev-python/flaky[${PYTHON_USEDEP}]
+	dev-python/pytest-timeout[${PYTHON_USEDEP}]
+)"
+
+distutils_enable_tests pytest