Updating liguros repo

36 files changed, 323 insertions, 91 deletions

diff --git a/dev-python/attrs/Manifest b/dev-python/attrs/Manifest
index 007db1b35f99..f6149e0a6476 100644
--- a/dev-python/attrs/Manifest
+++ b/dev-python/attrs/Manifest
@@ -1,2 +1,3 @@
 DIST attrs-19.3.0.tar.gz 132477 BLAKE2B 6577f39fc15c9e70f0f76ba358099e83c57e226574cb11dbe83747f12e285a284e9d1a218fc1670e0d08be550d42c67cde132604b2cf385d1ee25bda7e57e79a SHA512 b5b641e6732156d1454ed6c49e3a6b29200a8d3f1515fb59aeb85fcb5e9ab6a1d760904de45083cae5250e7bf1a7aa2c1f3ede217240a63f989ae4bb484f2511
 DIST attrs-20.1.0.tar.gz 160766 BLAKE2B 65170484648318b9e6466789a9d212475dd8233c2d89fdd7bdf3b24dab4fd5018f981f30a0fa0df83271a8bcc915f13b03a55e7e42da2e1d8a3a0684430107be SHA512 0be286c9263ea26fbb29a89a1c9a37577577b1147cbf440de257a3652147bcb559c8fc4118a900cef558b9f49b59074a276c8a4843f3e8829278eaae5b70e913
+DIST attrs-20.2.0.tar.gz 160604 BLAKE2B 1536366a943aa2d0517e3c0aa71230c378b20e731cbac78d1c5cc96f2500fb30203ee0939e25c80f8216bcc6dc7ed1fdfc2b23ab7f5d7c712fb05f5ba65739b1 SHA512 829030d8c1fe7bffbbb8d70fc56228f4c378d85a24c89d802e51f63a78abbfa24f46f5aa8b56cb7ba26ef0bf1fb272163873c45c994145de0be45b14c6fb29cd
diff --git a/dev-python/attrs/attrs-20.2.0.ebuild b/dev-python/attrs/attrs-20.2.0.ebuild
new file mode 100644
index 000000000000..f5011ba0d705
--- /dev/null
+++ b/dev-python/attrs/attrs-20.2.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Attributes without boilerplate"
+HOMEPAGE="
+	https://github.com/python-attrs/attrs
+	https://attrs.readthedocs.org/
+	https://pypi.org/project/attrs/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		>=dev-python/hypothesis-3.6.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-4.3.0[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/dulwich/dulwich-0.20.5.ebuild b/dev-python/dulwich/dulwich-0.20.5.ebuild
index b987ef29ef95..28c16b903611 100644
--- a/dev-python/dulwich/dulwich-0.20.5.ebuild
+++ b/dev-python/dulwich/dulwich-0.20.5.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=7
 
-# ready for 3_9, but fastimport isn't yet, #733838
-PYTHON_COMPAT=( python3_{5,6,7,8,9} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/gntp/Manifest b/dev-python/gntp/Manifest
deleted file mode 100644
index 4c2a29ffab28..000000000000
--- a/dev-python/gntp/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST gntp-1.0.3.tar.gz 10839 BLAKE2B f427096ff1e0b81da7f3a6c4f4a477bdedd7c69f632d8ff7bb7780a0b31726341d78852f3819e5ae8764b96513b27c5e3a261e0885645b60b5146d3d36628a14 SHA512 77f4f3801e183eeacceedd2c0588e571e3ffb1d81fc13f222fc593035ed767af487c2242b8cece697b430e04a6dce589c3e91fd5784f29f477964307197053c1
diff --git a/dev-python/gntp/gntp-1.0.3.ebuild b/dev-python/gntp/gntp-1.0.3.ebuild
deleted file mode 100644
index cceb5e32cbd9..000000000000
--- a/dev-python/gntp/gntp-1.0.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_{5,6,7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library for working with the Growl Notification Transport Protocol"
-HOMEPAGE="https://github.com/kfdm/gntp https://pypi.org/project/gntp/"
-SRC_URI="mirror://pypi/g/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
diff --git a/dev-python/gntp/metadata.xml b/dev-python/gntp/metadata.xml
deleted file mode 100644
index 7734f66a7c9c..000000000000
--- a/dev-python/gntp/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>naota@gentoo.org</email>
-    <name>Naohiro Aota</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">gntp</remote-id>
-    <remote-id type="github">kfdm/gntp</remote-id>
-  </upstream>
-	<origin>gentoo-staging</origin>
-</pkgmetadata>
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 4bb1b0a35935..e525958f48a1 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -9,3 +9,4 @@ DIST hypothesis-python-5.29.3.tar.gz 9070885 BLAKE2B 6e106fbc6ed6719c787083c85e3
 DIST hypothesis-python-5.29.4.tar.gz 9071060 BLAKE2B 0668f3c7859fae7024c15f693b1f56ce8d02d6f3b8187d24b2d84e38e7bdb73c0824d2b02cfecc6b40bdfbbb1c91c0aa83d40848c499a97ab7e9223aaa6c78d4 SHA512 9da4b487fd3c56540a20e2fbff635704f0720f422d8a398d0accd24a1fb9517476b0d29135b9113a96e8dc98fcfc31cc53215ad82cb727be54e4e77b44d4c8e4
 DIST hypothesis-python-5.30.0.tar.gz 9071239 BLAKE2B 7d46bc588d35bee187d9c19fafb41b290edb0e4b40022bfcdf502f96631aca7afe3beb6c4f27df27784ab1ef9903df7747284253906140835429e62b19eb1904 SHA512 03423b48aee71eceb84d838433351b48abf041ed1a9b617ea3e0059e8046f1cafd327e4ed4ec65c7893340602ea7d21572b3a8bbd059b27e1d0c9b867a6938b0
 DIST hypothesis-python-5.30.1.tar.gz 9074506 BLAKE2B 00ee6b7244e9bb41d019234838090801f35d57e3ed0d8b1ef454d721841b1ee7833232e001b7ac1d27a9a36d727459ec1581e1f7486e57219eb23065f128254b SHA512 c81caad3e6ee28a9045947e441b28a401ae859b4f16fbfbcdf31b0b83ee30386e3f2c372ed848b14d17b1981b4a0b222b75556bd98950458d14a3cfe0d1075a9
+DIST hypothesis-python-5.32.0.tar.gz 9075649 BLAKE2B c2b375ff45e1e5ad03dc4e94d4947759ef598db5737c96d7fe7367c69a4c284d379bcfac7825a7f4e57c68c18f50164620150ead2cc8ed9e9ee1a912c896ec09 SHA512 0215a5e701f67ab5046eeaad1b158e0b85568b1680bff1a51036f67e0e77c8087fa86e1c69b9c6f6de50a65f220dcdd724ccb7d2df1e3b6d836841d193ee8b16
diff --git a/dev-python/hypothesis/hypothesis-5.32.0.ebuild b/dev-python/hypothesis/hypothesis-5.32.0.ebuild
new file mode 100644
index 000000000000..d016eb0fc6a4
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-5.32.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 eutils multiprocessing
+
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
+SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~riscv ~x86"
+IUSE="cli test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' python3_{6..9})
+	)
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		>=dev-python/pytest-5.3.5[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		!!<dev-python/typing-3.7.4.1
+	)
+"
+
+python_prepare() {
+	if ! use cli || [[ ${EPYTHON} != python* ]]; then
+		sed -i -e '/console_scripts/d' setup.py || die
+	fi
+}
+
+python_test() {
+	pytest -vv tests/cover tests/pytest tests/quality \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/ipyparallel/metadata.xml b/dev-python/ipyparallel/metadata.xml
index 65e452cb691e..5e69ba570304 100644
--- a/dev-python/ipyparallel/metadata.xml
+++ b/dev-python/ipyparallel/metadata.xml
@@ -9,6 +9,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">ipyparallel</remote-id>
     <remote-id type="github">ipython/ipyparallel</remote-id>
diff --git a/dev-python/ipython/metadata.xml b/dev-python/ipython/metadata.xml
index c353219cf559..02f7678d8ef3 100644
--- a/dev-python/ipython/metadata.xml
+++ b/dev-python/ipython/metadata.xml
@@ -41,6 +41,7 @@
 * 他のPython言語プログラムを組み込むのが簡単。
 * pdbデバッガとprofilerへの統合アクセス。
 </longdescription>
+  <stabilize-allarches/>
   <use>
     <flag name="matplotlib">Add support for <pkg>dev-python/matplotlib</pkg></flag>
     <flag name="notebook">Install requirements for the web notebook based on <pkg>www-servers/tornado</pkg></flag>
diff --git a/dev-python/jupyter/jupyter-1.0.0-r2.ebuild b/dev-python/jupyter/jupyter-1.0.0-r3.ebuild
index e4895c7b3f9e..e4895c7b3f9e 100644
--- a/dev-python/jupyter/jupyter-1.0.0-r2.ebuild
+++ b/dev-python/jupyter/jupyter-1.0.0-r3.ebuild
diff --git a/dev-python/jupyter_console/jupyter_console-6.1.0-r1.ebuild b/dev-python/jupyter_console/jupyter_console-6.1.0-r2.ebuild
index f5c34c363934..f5c34c363934 100644
--- a/dev-python/jupyter_console/jupyter_console-6.1.0-r1.ebuild
+++ b/dev-python/jupyter_console/jupyter_console-6.1.0-r2.ebuild
diff --git a/dev-python/metakernel/metakernel-0.25.0.ebuild b/dev-python/metakernel/metakernel-0.25.0-r1.ebuild
index 841d5a6bca94..841d5a6bca94 100644
--- a/dev-python/metakernel/metakernel-0.25.0.ebuild
+++ b/dev-python/metakernel/metakernel-0.25.0-r1.ebuild
diff --git a/dev-python/nbconvert/metadata.xml b/dev-python/nbconvert/metadata.xml
index ac451fd1cfd9..42af7260a2d4 100644
--- a/dev-python/nbconvert/metadata.xml
+++ b/dev-python/nbconvert/metadata.xml
@@ -9,6 +9,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">nbconvert</remote-id>
     <remote-id type="github">jupyter/nbconvert</remote-id>
diff --git a/dev-python/nbdime/metadata.xml b/dev-python/nbdime/metadata.xml
index 7304ab699614..a309ea124aa4 100644
--- a/dev-python/nbdime/metadata.xml
+++ b/dev-python/nbdime/metadata.xml
@@ -9,6 +9,7 @@
     <remote-id type="github">jupyter/nbdime</remote-id>
     <remote-id type="pypi">nbdime</remote-id>
   </upstream>
+  <stabilize-allarches/>
   <use>
     <flag name="webtools">
       Install web-based diff and merge tools.
diff --git a/dev-python/nbdime/nbdime-2.0.0.ebuild b/dev-python/nbdime/nbdime-2.0.0-r1.ebuild
index 3843772dd5dd..3843772dd5dd 100644
--- a/dev-python/nbdime/nbdime-2.0.0.ebuild
+++ b/dev-python/nbdime/nbdime-2.0.0-r1.ebuild
diff --git a/dev-python/nbval/nbval-0.9.1.ebuild b/dev-python/nbval/nbval-0.9.1-r1.ebuild
index 3c5b02fb986a..3c5b02fb986a 100644
--- a/dev-python/nbval/nbval-0.9.1.ebuild
+++ b/dev-python/nbval/nbval-0.9.1-r1.ebuild
diff --git a/dev-python/notebook/metadata.xml b/dev-python/notebook/metadata.xml
index 4ad788392b77..136d2f14a12b 100644
--- a/dev-python/notebook/metadata.xml
+++ b/dev-python/notebook/metadata.xml
@@ -9,6 +9,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">notebook</remote-id>
   </upstream>
diff --git a/dev-python/octave_kernel/octave_kernel-0.32.0.ebuild b/dev-python/octave_kernel/octave_kernel-0.32.0-r1.ebuild
index cf9d55d833bf..cf9d55d833bf 100644
--- a/dev-python/octave_kernel/octave_kernel-0.32.0.ebuild
+++ b/dev-python/octave_kernel/octave_kernel-0.32.0-r1.ebuild
diff --git a/dev-python/pweave/pweave-0.30.3.ebuild b/dev-python/pweave/pweave-0.30.3-r1.ebuild
index 034cf84ea847..034cf84ea847 100644
--- a/dev-python/pweave/pweave-0.30.3.ebuild
+++ b/dev-python/pweave/pweave-0.30.3-r1.ebuild
diff --git a/dev-python/pydotplus/files/pydotplus-2.0.2-tests.patch b/dev-python/pydotplus/files/pydotplus-2.0.2-tests.patch
new file mode 100644
index 000000000000..65d9c5f9f45b
--- /dev/null
+++ b/dev-python/pydotplus/files/pydotplus-2.0.2-tests.patch
@@ -0,0 +1,17 @@
+--- a/test/pydot_unittest.py
++++ b/test/pydot_unittest.py
+@@ -142,6 +142,7 @@ class TestGraphAPI(unittest.TestCase):
+         self.assertEqual(g2.get_edges()[0].get_source(), node1)
+         self.assertEqual(g2.get_edges()[0].get_destination(), node2)
+
++    @unittest.skip(reason="Known to fail on Gentoo, reported upstream: https://github.com/carlos-jenkins/pydotplus/issues/22")
+     def test_graph_with_shapefiles(self):
+
+         shapefile_dir = os.path.join(TEST_DIR, 'from-past-to-future')
+@@ -225,6 +226,7 @@ class TestGraphAPI(unittest.TestCase):
+     def test_my_regression_tests(self):
+         self._render_and_compare_dot_files(MY_REGRESSION_TESTS_DIR)
+
++    @unittest.skip(reason="Known to fail on Gentoo, reported upstream: https://github.com/carlos-jenkins/pydotplus/issues/22")
+     def test_graphviz_regression_tests(self):
+         self._render_and_compare_dot_files(REGRESSION_TESTS_DIR)
diff --git a/dev-python/pydotplus/metadata.xml b/dev-python/pydotplus/metadata.xml
index 1a8b0a1e8515..b86cfef00e1f 100644
--- a/dev-python/pydotplus/metadata.xml
+++ b/dev-python/pydotplus/metadata.xml
@@ -10,8 +10,8 @@
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<longdescription lang="en">
-		PyDotPlus is an improved version of the old pydot project that provides a Python
-		Interface to Graphviz’s Dot language.
+		PyDotPlus is an improved version of the old pydot project that provides
+		a Python Interface to Graphviz’s Dot language.
 	</longdescription>
 	<upstream>
 		<remote-id type="pypi">pydotplus</remote-id>
diff --git a/dev-python/pydotplus/pydotplus-2.0.2.ebuild b/dev-python/pydotplus/pydotplus-2.0.2.ebuild
index 0f696d7b1da1..0fc86a484acb 100644
--- a/dev-python/pydotplus/pydotplus-2.0.2.ebuild
+++ b/dev-python/pydotplus/pydotplus-2.0.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 
@@ -14,25 +14,19 @@ SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="test"
+RESTRICT="!test? ( test )"
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-#	test? (
-#		dev-python/flake8[${PYTHON_USEDEP}]
-#		dev-python/pytest[${PYTHON_USEDEP}]
-#		dev-python/pytest-cov[${PYTHON_USEDEP}]
-#		dev-python/sphinx[${PYTHON_USEDEP}]
-#		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-#		dev-python/tox[${PYTHON_USEDEP}]
-#		)
 RDEPEND="
 	dev-python/pyparsing[${PYTHON_USEDEP}]
-	"
+	media-gfx/graphviz
+"
+DEPEND="test? ( ${RDEPEND} )"
 
-#test phase curently disabled, waiting on upstream to include
-#the required files:
-#https://github.com/carlos-jenkins/pydotplus/issues/12
-#python_test() {
-#	${EPYTHON} -m unittest discover || die
-#	tox
-#}
+PATCHES=( "${FILESDIR}/${P}-tests.patch" )
+
+python_test() {
+	pushd test > /dev/null || die
+		python pydot_unittest.py || die
+	popd > /dev/null || die
+}
diff --git a/dev-python/pythonutils/Manifest b/dev-python/pythonutils/Manifest
deleted file mode 100644
index 6e4b533abb3b..000000000000
--- a/dev-python/pythonutils/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST pythonutils-0.4.0.zip 313577 BLAKE2B 43dbe69d9207c406d8f6290af1e95f023f24e0fe26bd97e6811d467efc18336b4819aabe1b026edbb7227770c42cd5754e887f908d0969c43fb4dfacbe26be0c SHA512 1759f1f267a6dfc2252d2a9a90fcf46f6613ee7e9dc60b6484d434443e7bb1dbc748134ec1355dd904a615d1e8a3874386c482a0ca98ffb51cdf3d9fd4f6999c
diff --git a/dev-python/pythonutils/metadata.xml b/dev-python/pythonutils/metadata.xml
deleted file mode 100644
index 0f39e5ddf4c3..000000000000
--- a/dev-python/pythonutils/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>whissi@gentoo.org</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
-	<origin>gentoo-staging</origin>
-</pkgmetadata>
diff --git a/dev-python/pythonutils/pythonutils-0.4.0-r1.ebuild b/dev-python/pythonutils/pythonutils-0.4.0-r1.ebuild
deleted file mode 100644
index fd5d76768f35..000000000000
--- a/dev-python/pythonutils/pythonutils-0.4.0-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Voidspace Python modules"
-HOMEPAGE="https://www.voidspace.org.uk/python/pythonutils.html"
-SRC_URI="http://www.voidspace.org.uk/downloads/${P}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-python_install_all() {
-	dodoc docs/*.txt
-	use doc && local HTML_DOCS=( docs/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/ruamel-yaml-clib/Manifest b/dev-python/ruamel-yaml-clib/Manifest
index 020eb06c0d55..300c9912c3c7 100644
--- a/dev-python/ruamel-yaml-clib/Manifest
+++ b/dev-python/ruamel-yaml-clib/Manifest
@@ -1 +1,2 @@
 DIST ruamel.yaml.clib-0.2.0.tar.gz 178084 BLAKE2B a4d23e5c931a0c720edb80818ca11bfcc1638f28ec910878f53720139bd8fbd034de6db73154c0e758ceb6c5233c10a2bf7d779f8e7f4a134c8b07cc33382a1b SHA512 7d716e27963b97a1735ba7ff0e581f7ecdfa62725cc42def59ad0ccdf9e23a9f7dfbc3cac298bb3e29362535036b07ba0f523452d6f73248be53c69796637e34
+DIST ruamel.yaml.clib-0.2.2.tar.gz 179914 BLAKE2B 90fe272c3c4f8943e944d43dcf1f61367600bd3b1fb296d7434b27183433267a510b6e41cfd50fac8e17bebcfaa51d7d1ca89d4d23da0b1107c468cafa65ac3f SHA512 5bbab2a23c65b1416480758cf0d0a75dcf8ddece0f8df603ce90f2b1c54356bb6876ac113d53e01c4869e3c9fb22b13ea29e66dc31a09144d4426c3e0f3b9399
diff --git a/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.2.ebuild b/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.2.ebuild
new file mode 100644
index 000000000000..254605aa0280
--- /dev/null
+++ b/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.2.ebuild
@@ -0,0 +1,28 @@
+# 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} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+MY_PN="${PN//-/.}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="C-based reader/scanner and emitter for dev-python/ruamel-yaml"
+HOMEPAGE="https://pypi.org/project/ruamel.yaml.clib/ https://sourceforge.net/p/ruamel-yaml-clib"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~sparc ~x86"
+
+RDEPEND="!<dev-python/ruamel-yaml-0.16.0"
+
+S="${WORKDIR}"/${MY_P}
+
+python_install() {
+	distutils-r1_python_install --single-version-externally-managed
+}
diff --git a/dev-python/ruamel-yaml/Manifest b/dev-python/ruamel-yaml/Manifest
index 4795bf4eddde..a8bfb3f81a53 100644
--- a/dev-python/ruamel-yaml/Manifest
+++ b/dev-python/ruamel-yaml/Manifest
@@ -1,2 +1,3 @@
 DIST ruamel.yaml-0.16.10.tar.gz 147033 BLAKE2B 35e5b0a1bd5a42ee539e66309dbca64bccd9570da427631d230c77d9cc09dc28637abb787c441b4fe8f8f17d9b6b313607887ce79eb631ce8b265cc18570e8fd SHA512 f124575a5054f993d5826d03aa7a9500a1084c5201be1517be36e587bfc60ea4d13b29dbdb3e62bfbd309fe9992590fd0a5028a43f0fd26a5a5cbc9f3dcf423b
 DIST ruamel.yaml-0.16.11.tar.gz 147379 BLAKE2B 777b880a425111b3331008ee8cd9c6555b1a8f22057aab67f3e94289ec89ddd51036d1e1a3302fa5ead4d5a2b061074d1c82375673a3657ef4ec58675d5dbb77 SHA512 84cbabf4dada27bd4088dde17ddd8397b7ac7c75c18775fa76a42894de1573829ed1aa9ec1f5d510ff040a2e1f007293e4873ed7efc066d51edc29a4dc4a4153
+DIST ruamel.yaml-0.16.12.tar.gz 147355 BLAKE2B 6e91116029dba57b81580f4ce34a066fc49ec2c6167c2bd6ec2ae940b16bc12ba53cbd4c62f9ae3975664917ce990b050e9f15b434f5ff66f9dece5426049c9d SHA512 21be4d956d01164b84233c3d3945a4e56351a8fc59c35a8e71b1276da84aa43b125e3860f9884e95a1f895bc53e0b85b6d3f0f4b03512d629a892d8664e3ecd6
diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.16.12.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.16.12.ebuild
new file mode 100644
index 000000000000..9a2e90a7671b
--- /dev/null
+++ b/dev-python/ruamel-yaml/ruamel-yaml-0.16.12.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} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+MY_PN="${PN//-/.}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="YAML parser/emitter that supports roundtrip comment preservation"
+HOMEPAGE="https://pypi.org/project/ruamel.yaml/ https://sourceforge.net/p/ruamel-yaml"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~sparc ~x86"
+
+RDEPEND="dev-python/ruamel-yaml-clib[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}"/${MY_P}
+
+python_install() {
+	distutils-r1_python_install --single-version-externally-managed
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index c8cac70defc8..ec15941b8285 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,3 +1,4 @@
 DIST setuptools-46.4.0.zip 865912 BLAKE2B 452d36132f5648c79c7e1616a93ff6a39ab2f64b2864ee397b4f57e7f72c47d418ff274f5decd35b0591b09800ad2a7cbd71c283550bd0e60a4d85744a57d4ec SHA512 31e58fd1d682089a45d23aa07c3c2c4c952ca016fa4c3416b2cba979d8b57369f80baef98ce857912e506e87d6cb456497a1ce1c75a0cdf1ee25d4e753b58726
 DIST setuptools-49.6.0.zip 2188590 BLAKE2B b789386d31c0d5cbc0c899d24e9af35baad371b698b488ed46b768e8831bae7245b391971e1e402799bc555475c1d8b78bd59a224c26bc78ba68b122a06e0154 SHA512 aad6e74b0e276da0f79c9429860a6d1c7860a30e9a02ce55527abbe7671366640423a1e5476da9ecadfc62ae1bf803cb0c664e2a09cf7619a9c8ac3965b9cf31
 DIST setuptools-50.1.0.zip 2168599 BLAKE2B ebfedb9607dd45f638b689ad73714575a584b112b55f9764d2e72333ded7b9170878b76bc92465fdc4ff60a9ff830c9994efc7d1f0195fd5bf8b50c87e7f8fb4 SHA512 b5b0fa45bf87d567847b0a5275cc06f3847f53282832b8b5a0084412c16f558a9db9b8084e27a34b0e99081275bc714acd494731dd487f5850b7ad59257e5cfc
+DIST setuptools-50.2.0.zip 2168687 BLAKE2B c725fb1103f37cef80f78aa7e0920a8e64c8a03d3f696f521ce94a3466c4a97512bf3a2512a24e9d6e92b277f391e8e5163c22ad28c0d34daace432f44ad4ac9 SHA512 1d6d52bd058b4fd3c8322538b7b31b601c04eaf196b49e89f758d691a65fe6e76fca486ba740fbb96bd817ed67b1d390a3724742977be8cc2963106a73c4c17a
diff --git a/dev-python/setuptools/setuptools-50.2.0.ebuild b/dev-python/setuptools/setuptools-50.2.0.ebuild
new file mode 100644
index 000000000000..48c25396dd75
--- /dev/null
+++ b/dev-python/setuptools/setuptools-50.2.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	app-arch/unzip
+	test? (
+		dev-python/jaraco-envs[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pip[${PYTHON_USEDEP}]
+		>=dev-python/pytest-3.7.0[${PYTHON_USEDEP}]
+		dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
+		dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+	)
+"
+PDEPEND="
+	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+
+# Force in-source build because build system modifies sources.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+DOCS=( {CHANGES,README}.rst docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} )
+
+python_prepare_all() {
+	# disable tests requiring a network connection
+	rm setuptools/tests/test_packageindex.py || die
+
+	# don't run integration tests
+	rm setuptools/tests/test_integration.py || die
+
+	# xpass-es for me on py3
+	#sed -e '/xfail.*710/s:(:(six.PY2, :' \
+	#	-i setuptools/tests/test_archive_util.py || die
+
+	# avoid pointless dep on flake8
+	sed -i -e 's:--flake8::' -e 's:--cov::' pytest.ini || die
+
+	# disable the code disabling non-existing coverage plugin
+	sed -i -e 's:cov = .*:return:' conftest.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	distutils_install_for_testing
+	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
+	# It tries to sandbox the test in a tempdir
+	HOME="${PWD}" pytest -vv ${PN} || die "Tests failed under ${EPYTHON}"
+}
+
+python_install() {
+	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
+	distutils-r1_python_install
+}
diff --git a/dev-python/testfixtures/Manifest b/dev-python/testfixtures/Manifest
index ed2d29ac656c..f2974f18eee7 100644
--- a/dev-python/testfixtures/Manifest
+++ b/dev-python/testfixtures/Manifest
@@ -1 +1,2 @@
 DIST testfixtures-6.14.1.tar.gz 114969 BLAKE2B 21e6b377e24240cb275feed2e160da256ca75884c5a6dc842364986031c3cd21fb1b5bc13f3e8780354d47179e6c038cb461a39a04d34bfc8beebbf9809d6431 SHA512 0da31d5e382984c22ada846c07570d4a179ba819005dd29891e551b99190fabaaf17174456f7ed4864e9c4aa25f7d5d8b86aa123b4628328610d6930c9c5d6bd
+DIST testfixtures-6.14.2.tar.gz 115229 BLAKE2B 311ef13cc6f596aa9d4c54c0cc02e25c412704eefa3474c3a078f4f50ba556e9872d3ecff3d122443986f0917b2e1c6fff8315d20bd319dec1148fd9851321ba SHA512 fbaeefc439a755d9f9e5ee223c6ce00288adfc2d12c9bef70ab06ea7bc4e9757d7a2429ac8046f7171aca1ac7d667f8a26168cd711f1cc4c719d66bbe8210cc6
diff --git a/dev-python/testfixtures/testfixtures-6.14.2.ebuild b/dev-python/testfixtures/testfixtures-6.14.2.ebuild
new file mode 100644
index 000000000000..d28551df4cb7
--- /dev/null
+++ b/dev-python/testfixtures/testfixtures-6.14.2.ebuild
@@ -0,0 +1,56 @@
+# 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="A collection of helpers and mock objects for unit tests and doc tests"
+HOMEPAGE="https://pypi.org/project/testfixtures/ https://github.com/Simplistix/testfixtures"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/django[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-django[${PYTHON_USEDEP}]
+		dev-python/sybil[${PYTHON_USEDEP}]
+		>=dev-python/twisted-18[${PYTHON_USEDEP}]
+		dev-python/zope-component[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	# Prevent un-needed download during build, fix Makefile for doc build
+	sed -e '/'sphinx.ext.intersphinx'/d' -i docs/conf.py || die
+
+	# remove test that tests the stripped zope-component test_components.ComponentsTests
+	rm -f testfixtures/tests/test_components.py docs/components.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	PYTHONPATH="." \
+	DJANGO_SETTINGS_MODULE=testfixtures.tests.test_django.settings \
+	pytest -vv || die
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/vpython/vpython-7.6.1-r1.ebuild b/dev-python/vpython/vpython-7.6.1-r2.ebuild
index ef50542d3182..ef50542d3182 100644
--- a/dev-python/vpython/vpython-7.6.1-r1.ebuild
+++ b/dev-python/vpython/vpython-7.6.1-r2.ebuild
diff --git a/dev-python/widgetsnbextension/metadata.xml b/dev-python/widgetsnbextension/metadata.xml
index fbd75bb3da84..72c4e38a2253 100644
--- a/dev-python/widgetsnbextension/metadata.xml
+++ b/dev-python/widgetsnbextension/metadata.xml
@@ -9,6 +9,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">widgetsnbextension</remote-id>
     <remote-id type="github">jupyter-widgets/ipywidgets</remote-id>