Updating liguros repo

55 files changed, 659 insertions, 55 deletions

diff --git a/dev-python/cairocffi/cairocffi-0.8.0-r1.ebuild b/dev-python/cairocffi/cairocffi-0.8.0-r1.ebuild
index ba91b5f72454..bc4f5be94f97 100644
--- a/dev-python/cairocffi/cairocffi-0.8.0-r1.ebuild
+++ b/dev-python/cairocffi/cairocffi-0.8.0-r1.ebuild
@@ -28,7 +28,6 @@ RDEPEND="
 
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 	test? (
 		${RDEPEND}
 		dev-python/pytest[${PYTHON_USEDEP}]
@@ -38,15 +37,8 @@ PATCHES=( "${FILESDIR}"/${P}-tests.patch )
 
 S="${WORKDIR}/${MY_P}"
 
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
+distutils_enable_sphinx docs
 
 python_test() {
 	virtx py.test -v --pyargs cairocffi
 }
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/cheroot/cheroot-8.3.0.ebuild b/dev-python/cheroot/cheroot-8.3.0.ebuild
index 0785fecc4cf2..0124db04df17 100644
--- a/dev-python/cheroot/cheroot-8.3.0.ebuild
+++ b/dev-python/cheroot/cheroot-8.3.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/C/${PN/c/C}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86"
 # Unit tests are temporarily disabled for this version, see below for
 # what needs to be done.
 #IUSE="test"
diff --git a/dev-python/cherrypy/cherrypy-18.5.0.ebuild b/dev-python/cherrypy/cherrypy-18.5.0.ebuild
index 1156d983160d..0cdaca1585c5 100644
--- a/dev-python/cherrypy/cherrypy-18.5.0.ebuild
+++ b/dev-python/cherrypy/cherrypy-18.5.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86"
 IUSE="ssl test"
 
 RDEPEND=">=dev-python/cheroot-8.2.1[${PYTHON_USEDEP}]
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index 5339aef9511b..59d2537eefa2 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -1,4 +1,5 @@
 DIST cfe-8.0.1.src.tar.xz 12810056 BLAKE2B 88cee0b6daa477ca0473c76efc45beb634f6194ecd3f45aaec3791e26b203c5dbd33c649435e0d97924096a72c727d76915bffc0b7ea305f24d5e5f06389c4a0 SHA512 1227b2d32052c70b4b494659849000188fce46fc31a71f3352ba8457ac0b0b17e4bc7c8589874c8586d55aa808ee6c1fceb7df501aafa33599f8df7bfd2b791d
 DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
 DIST llvmorg-10.0.1-rc1.tar.gz 120834583 BLAKE2B 64244ebcb6f2c171c9f606e5eb0adff2794f06c9312a0ca627fb79c107c0c898ac242cf4e92523c3265fa717322601d7e3f4d178515fac95d03ee92312082b06 SHA512 f877f66046969a4055b166ad50ef876a9c8ecaf03e2cdd7c8e1a3348eb5f5180f222fa457b1f090a6660282a0d9f7a1d39cf09a04abe0dde0a6e1e10ccf15597
+DIST llvmorg-10.0.1-rc2.tar.gz 120883192 BLAKE2B d48f4ccb33691cd4997576a6d20b298455687515164f7d8dfa11ec32e197b58132c6bd549c1214c3b36982ef85e1018d4101e7afecee8d2ab67ad15d68c681bf SHA512 8e363d379a73e38ef570fb03d8243a21f37a48ef579a0f08118af4dac48060c0dc24e2bd8175f04241fa424e49b6c85723d2d3552bbe30dd165fe5fb43493325
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
diff --git a/dev-python/clang-python/clang-python-10.0.0.ebuild b/dev-python/clang-python/clang-python-10.0.0.ebuild
index 789c9ee28d9b..55385ff45617 100644
--- a/dev-python/clang-python/clang-python-10.0.0.ebuild
+++ b/dev-python/clang-python/clang-python-10.0.0.ebuild
@@ -13,7 +13,7 @@ llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/clang-python/clang-python-10.0.1_rc2.ebuild b/dev-python/clang-python/clang-python-10.0.1_rc2.ebuild
new file mode 100644
index 000000000000..6d7cb294e651
--- /dev/null
+++ b/dev-python/clang-python/clang-python-10.0.1_rc2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit llvm.org python-r1
+
+DESCRIPTION="Python bindings for sys-devel/clang"
+HOMEPAGE="https://llvm.org/"
+LLVM_COMPONENTS=( clang/bindings/python )
+llvm.org_set_globals
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+# The module is opening libclang.so directly, and doing some blasphemy
+# on top of it.
+RDEPEND="
+	>=sys-devel/clang-${PV}:*
+	!sys-devel/llvm:0[clang(-),python(-)]
+	!sys-devel/clang:0[python(-)]
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+
+python_test() {
+	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
+}
+
+src_test() {
+	python_foreach_impl python_test
+}
+
+src_install() {
+	python_foreach_impl python_domodule clang
+}
diff --git a/dev-python/django/django-2.2.13.ebuild b/dev-python/django/django-2.2.13.ebuild
index 60543908ceab..5b85d6f488d8 100644
--- a/dev-python/django/django-2.2.13.ebuild
+++ b/dev-python/django/django-2.2.13.ebuild
@@ -23,7 +23,7 @@ LICENSE+=" Apache-2.0"
 # admin icons, jquery, xregexp.js
 LICENSE+=" MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc sqlite test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/elasticsearch-py/elasticsearch-py-7.7.0.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-7.7.0.ebuild
index 04145309f90a..338d6fcaddea 100644
--- a/dev-python/elasticsearch-py/elasticsearch-py-7.7.0.ebuild
+++ b/dev-python/elasticsearch-py/elasticsearch-py-7.7.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/elasticsearch/${PN}/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc test"
 
 # tests fail in chroot
diff --git a/dev-python/elementpath/elementpath-1.4.5.ebuild b/dev-python/elementpath/elementpath-1.4.5.ebuild
index b472ce7b0450..5cd74ecf88b4 100644
--- a/dev-python/elementpath/elementpath-1.4.5.ebuild
+++ b/dev-python/elementpath/elementpath-1.4.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/gst-python/gst-python-1.16.2.ebuild b/dev-python/gst-python/gst-python-1.16.2.ebuild
index 34902abc4db6..f0bc9e15d221 100644
--- a/dev-python/gst-python/gst-python-1.16.2.ebuild
+++ b/dev-python/gst-python/gst-python-1.16.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="1.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
diff --git a/dev-python/humanize/Manifest b/dev-python/humanize/Manifest
index d8adbb8174a2..de3e9c5045e8 100644
--- a/dev-python/humanize/Manifest
+++ b/dev-python/humanize/Manifest
@@ -1,2 +1,3 @@
 DIST humanize-0.5.1.tar.gz 20507 BLAKE2B 55d7b598b32658b1d4c4741b37b5c33bdc9d63a5a779455e2fb93e1e4c3a0d8fd58e8522ef82734e1ba2b161fd881829373ba3569baffd9ea3271ad7ed3e7568 SHA512 dd7ad7f3c564cc6abcb6b128e50dbea7f19f7f418bfd936aae2472961c53ec71202133c5c2b5b930ef41ef807b51d6ba1210565627ed32c0b41acc0abd32a2d5
 DIST humanize-2.4.0.tar.gz 46489 BLAKE2B bb2cfeebd25f4aa073539bb616a5d05db2827dd2aaa6f093d46b51415ef3b954918a45f2434b9ce41845389be986200e23b1cb752e8a0bd03649377ea46fbec6 SHA512 20707a59f2f0bbc52e1e5d906e733561f53c3bc429ce24662ea9014d7f73f87a8f3ae9aa62f2564fafbe9de0d6b250e8fecec4a3cb81968c5b24d61ad9627d1b
+DIST humanize-2.4.1.tar.gz 46827 BLAKE2B e9b37283c5a4db1c5b2a9ef61919fe02a4e5720711129910e51b0b3481290c9bfa4e29225db75c37d83884c00065fa71b599ed42fac41414f481167d33091a98 SHA512 5d8534d2e97f375c7ec065dd239334a2a5da9d058f7c0312cb2683c3e42f5b8f99e117782e0888a6e5348f43958523df6609c294f5af7c971d81bd29679a0500
diff --git a/dev-python/humanize/humanize-2.4.1.ebuild b/dev-python/humanize/humanize-2.4.1.ebuild
new file mode 100644
index 000000000000..4785489816a4
--- /dev/null
+++ b/dev-python/humanize/humanize-2.4.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
+# The package uses pkg_resources to determine its version
+DISTUTILS_USE_SETUPTOOLS=manual
+
+inherit distutils-r1
+
+DESCRIPTION="Common humanization utilities"
+HOMEPAGE="https://github.com/jmoiron/humanize/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	# The package uses pkg_resources to determine its version
+	distutils_install_for_testing
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 8d0b41a602c3..4c2402d59592 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -10,3 +10,4 @@ DIST hypothesis-python-5.16.2.tar.gz 9011495 BLAKE2B ecac1ddd0c214a06e8822fc04f9
 DIST hypothesis-python-5.16.3.tar.gz 9011952 BLAKE2B d74a68c4ee1e5aacf4be1da5a4656011b0a15f990106c21298101d36e9a097c5dfd165987ad90a45f3a0b74375c4da609cd750f618242b94f34e03b6de0ee866 SHA512 912d984995d4ad8f06e98eb2cc327629328990fc1c072527ce261b637e16622acaf4d0d93928f9dd2d6601ab78f69aa6cf129d5cd7c1c00e50754ebc06957df0
 DIST hypothesis-python-5.18.0.tar.gz 9013356 BLAKE2B 3863414e54e40ac5f2a45edbb57fbee058e82f04cbde9eadb99ed6b03a2a2684777b46eabdbe136aea74b835e343485d80cfe98c263afa537c7437e7566f796f SHA512 b1a1f37f1f58a6401a31f32ef0e7de452b8a8bd71fe5aeb72eeac197a23b78c3ff17b61f7940e2a2a755f7f008f0ea3df5b0f2ad5e4c0d2d316bf13dbd7cbdaf
 DIST hypothesis-python-5.18.1.tar.gz 9013452 BLAKE2B a513c19a19b3ff49c78d97839dea7d857d9a00f7d42e5e0376cd6fec9ff9a86f9b6b9471da474ec7724e41254105c0ac65fc7d772f01bfc40f6deda200f11629 SHA512 19455699ed50d30767edc5627f797992f2542aeb3ca9e38603a68ffe1108f0287baa183e4dca101f21eaea6c7c7501e135b5baf9e09117a2cae92ec1e437e8b5
+DIST hypothesis-python-5.18.3.tar.gz 9017453 BLAKE2B 85356e723fca66853e388a4a3e791dd4b1cfb80b7a4b62363a4f0d0aeffc44c051eeabd516eebd5737a96050edef978a87788c1141f87aa2e310eda9bf64a0a7 SHA512 baeb4644a90fd8694d88819a46ba1ea6c60ad13e00f07cb923a3d0f43cd4b4d61bd07bf25e45e6d1203f9db44fbe8ec7eca7e029c804659025df89a80520e550
diff --git a/dev-python/hypothesis/hypothesis-5.18.3.ebuild b/dev-python/hypothesis/hypothesis-5.18.3.ebuild
new file mode 100644
index 000000000000..494668bd6a8e
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-5.18.3.ebuild
@@ -0,0 +1,56 @@
+# 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_{6,7,8,9} pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 eutils
+
+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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		>=dev-python/pytest-5.3.5[${PYTHON_USEDEP}]
+		!!<dev-python/typing-3.7.4.1
+	)
+"
+
+src_prepare() {
+	# avoid pytest-xdist dep for one test
+	sed -i -e 's:test_prints_statistics_given_option_under_xdist:_&:' \
+		tests/pytest/test_statistics.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	pytest -vv tests/cover tests/pytest tests/quality ||
+		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/idna/Manifest b/dev-python/idna/Manifest
index 20064ac61302..2a4653132a9b 100644
--- a/dev-python/idna/Manifest
+++ b/dev-python/idna/Manifest
@@ -1,2 +1,3 @@
+DIST idna-2.10.tar.gz 175616 BLAKE2B 2b109491a5751811e6e85244133a1c66b04b577441c250e600a9cb58511f4a0350f9dc386c64ce40464bf644c7434187c61e747c8e9a422443a740ebb766fe22 SHA512 83b412de2f79a4bc86fb4bdac7252521b9d84f0be54f4fb1bde1ee13a210bbfa4b1a98247affbc7921046fb117a591316c12694c1be72865767646554c5207ac
 DIST idna-2.8.tar.gz 174481 BLAKE2B 68e5dddaae30097522e4e661438d7f89a391c5a0e2f72a99e1da88e0af9380f15958d5315fccb4221e7d44a6390a7b0daa537a4752c26cd915bf2d433a4f7cc4 SHA512 8ca5cfe6350c51250bafdac7c6e4ddd54c4a5d6bf7acbcef896760a759868c8e9df1fdf550121d8512fa3eb316dcf031ec6058e03b4f66eadee21b63e2187d33
 DIST idna-2.9.tar.gz 175042 BLAKE2B d111bec6c5682321967818aa3fb828d1f7bc5c056e8c7418589a7b1f9e125aadfd21c6c3329a93b894977c41ad258c4bd38db166b85c1f85c52ca2f0b5acb242 SHA512 2bd3fdae46fe7045640912872b0a3955de3abce62fd222b16ea2c997a04755acc834eeb645e5610d621c176d4b963e1d4a71228fba14efad54999cdf3c02eaf4
diff --git a/dev-python/idna/idna-2.10.ebuild b/dev-python/idna/idna-2.10.ebuild
new file mode 100644
index 000000000000..4a4a7f4a56eb
--- /dev/null
+++ b/dev-python/idna/idna-2.10.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Internationalized Domain Names in Applications (IDNA)"
+HOMEPAGE="https://github.com/kjd/idna https://pypi.org/project/idna/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+distutils_enable_tests setup.py
diff --git a/dev-python/importlib_metadata/Manifest b/dev-python/importlib_metadata/Manifest
index 56de065e7f76..da743c82ead2 100644
--- a/dev-python/importlib_metadata/Manifest
+++ b/dev-python/importlib_metadata/Manifest
@@ -2,3 +2,4 @@ DIST importlib_metadata-1.4.0.tar.gz 26380 BLAKE2B b185183b5a71b822f068856a4b1af
 DIST importlib_metadata-1.5.0.tar.gz 26738 BLAKE2B b2ccc2244a2b9e0d384a22e0805d2a9931a3412afba98246692bc7a10684c9e1cc8435529461d45cd6d0b75c81a75c028b9269860d5de6cd376c70ad30700eed SHA512 074bc38df2a1b20dac62d88e209b2730cc56f8a8bb7f7b99bf766028f602700733448e7cb4d22ea099be38cfc9484ff6a235a46c6c114c3d70883393eeef3aa0
 DIST importlib_metadata-1.6.0.tar.gz 27136 BLAKE2B 55a987a75c78ff39fc5ac5d586cc7b7f9e7340edce505387be22cb291b53dec87e4f362bdb3f9a13f2797b6806f783b3cf0858c9db298266379f706402a43331 SHA512 4108d84a39da3c892a3b448027cca2835f6a68ac790b51b7cc4eb4ec925f5e8322847d86d8e89fbcec474258f592220f283116c82c536130aab70b96cea0435c
 DIST importlib_metadata-1.6.1.tar.gz 29039 BLAKE2B b193afecae1458b0d82fad0fe00878c17f8fa279d8eb43ec80d189d3f33b217fb376023c92be70027579484bbbc9ef949ca75f19660a40275d96ef88e1f2aaf9 SHA512 f5537d80bb72cfd97269e2d83b059fe1085e41ce9cc7eaac30abc819dae4b118bdfd2d17989b693c05f0084b2bb86f73837788087915c94724e8e5344752b626
+DIST importlib_metadata-1.7.0.tar.gz 29233 BLAKE2B a8cd97a384ab06201025fcbdc401fb25788c2eb1dd4f1697ca00e79634cbce32b984cb8a7c2aeacfb0871f92857d08f3ce9c3ae43d698df7401db91add07b6ca SHA512 31f7cda6a1149ca2040032945b19b55d2e97ef8be67db1423c2c2cbb79da3dead46338f3c9eb03b46f9202fca08ed7bf388adc25d34903ddff4b2873c8a89aba
diff --git a/dev-python/importlib_metadata/importlib_metadata-1.7.0.ebuild b/dev-python/importlib_metadata/importlib_metadata-1.7.0.ebuild
new file mode 100644
index 000000000000..0982cef9a7c3
--- /dev/null
+++ b/dev-python/importlib_metadata/importlib_metadata-1.7.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Read metadata from Python packages"
+HOMEPAGE="https://importlib-metadata.readthedocs.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/zipp[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/configparser-3.5[${PYTHON_USEDEP}]' -2)
+	$(python_gen_cond_dep 'dev-python/contextlib2[${PYTHON_USEDEP}]' -2)
+	$(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' -2)
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		$(python_gen_cond_dep '
+			>=dev-python/importlib_resources-1.3.0[${PYTHON_USEDEP}]
+		' pypy3 python{2_7,3_{6,7,8}})
+		dev-python/packaging[${PYTHON_USEDEP}]
+		dev-python/pyfakefs[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx "${PN}/docs" \
+	'>=dev-python/rst-linker-1.9'
+distutils_enable_tests unittest
+
+python_prepare_all() {
+	# remove dep on setuptools_scm
+	sed -i -r "s:use_scm_version=.+,:version='${PV}',:" \
+		setup.py || die
+	sed -i -e 's:setuptools-scm::' setup.cfg || die
+	sed -e 's:test_find_local:_&:' \
+		-i importlib_metadata/tests/test_integration.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index 5341d4df095a..59a3f4b2688d 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -1,2 +1,3 @@
 DIST ipython-7.15.0.tar.gz 5245923 BLAKE2B 36c9712c72a38e918403cdc91fc098904282a48faed3e7faf03a1791356d09b9953c080b1b6f73b958713984748ee8af6d586956ccdad3ddadc60292cefd6d83 SHA512 46b09a8b6e5611d7b11b26aac475e7b823b00653ea6a3bf1a66d294cef22762b38e63c79f1e4e9bea0fe3e6423b058a2a692dc544c082dca37b9bb91c816cd22
+DIST ipython-7.16.1.tar.gz 5136303 BLAKE2B 9baf42c9befa50d78eec29d012aeae7f01886f29642a01845afd4a96d0efb7a4df5b14b68aeeb22d1d621e5427b219f717688a1d5074a6e70ad0509c7ca73a46 SHA512 60259fd6270b0355be67b4f620a58b56ae86e69e14debe2df86df6118548f2290ab3927b8dfab20db1ebd675df697d05eb6994b93625a7b8b6ea07112ddf63bd
 DIST ipython-7.5.0.tar.gz 5118610 BLAKE2B 3f89babc292ea55724c2333076a673ef7fcd0a7a468e972a50c962194a71a0bc3cc9bdea4f96db4c21fe475b4d79dc87c124bcde53e1bc3ae7066a3c0c136e0d SHA512 564027879e53b3716ebe8cb1ed4b516835c15f326c865fd664aa7a4e5f26e1a78a329ff8e19d4acf6249e2acf7382501114cd2258c38bba89f0f382f7dcda09b
diff --git a/dev-python/ipython/ipython-7.16.1.ebuild b/dev-python/ipython/ipython-7.16.1.ebuild
new file mode 100644
index 000000000000..72cb41ac0a13
--- /dev/null
+++ b/dev-python/ipython/ipython-7.16.1.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_REQ_USE='readline,sqlite,threads(+)'
+
+inherit distutils-r1 eutils virtualx
+
+DESCRIPTION="Advanced interactive shell for Python"
+HOMEPAGE="https://ipython.org/ https://github.com/ipython/ipython/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test"
+RESTRICT="!test? ( test )"
+
+CDEPEND="
+	dev-python/backcall[${PYTHON_USEDEP}]
+	dev-python/decorator[${PYTHON_USEDEP}]
+	dev-python/jedi[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	dev-python/pickleshare[${PYTHON_USEDEP}]
+	>=dev-python/prompt_toolkit-2[${PYTHON_USEDEP}]
+	<dev-python/prompt_toolkit-3.1[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/traitlets[${PYTHON_USEDEP}]
+	matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
+"
+
+RDEPEND="${CDEPEND}
+	nbconvert? ( dev-python/nbconvert[${PYTHON_USEDEP}] )"
+
+DEPEND="${CDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
+		dev-python/nbformat[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/numpy-1.14[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/testpath[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-2[${PYTHON_USEDEP}]
+	)"
+
+PDEPEND="
+	notebook? (
+		dev-python/notebook[${PYTHON_USEDEP}]
+		dev-python/ipywidgets[${PYTHON_USEDEP}]
+		dev-python/widgetsnbextension[${PYTHON_USEDEP}]
+	)
+	qt5? ( dev-python/qtconsole[${PYTHON_USEDEP}] )
+	smp? (
+		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
+		>=dev-python/ipyparallel-6.2.3[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=( "${FILESDIR}"/2.1.0-substitute-files.patch )
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	# Remove out of date insource files
+	rm IPython/extensions/cythonmagic.py || die
+	rm IPython/extensions/rmagic.py || die
+
+	# Prevent un-needed download during build
+	if use doc; then
+		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		emake -C docs html_noapi
+		HTML_DOCS=( docs/build/html/. )
+	fi
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	distutils_install_for_testing
+	pushd "${TEST_DIR}" >/dev/null || die
+	"${TEST_DIR}"/scripts/iptest || die
+	popd >/dev/null || die
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	# Create ipythonX.Y symlinks.
+	# TODO:
+	# 1. do we want them for pypy? No.  pypy has no numpy
+	# 2. handle it in the eclass instead (use _python_ln_rel).
+	# With pypy not an option the dosym becomes unconditional
+	dosym ../lib/python-exec/${EPYTHON}/ipython \
+		/usr/bin/ipython${EPYTHON#python}
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
+
+pkg_postinst() {
+	optfeature "sympyprinting" dev-python/sympy
+	optfeature "cythonmagic" dev-python/cython
+	optfeature "%lprun magic command" dev-python/line_profiler
+	optfeature "%mprun magic command" dev-python/memory_profiler
+
+	if use nbconvert; then
+		if ! has_version app-text/pandoc ; then
+			einfo "Node.js will be used to convert notebooks to other formats"
+			einfo "like HTML. Support for that is still experimental. If you"
+			einfo "encounter any problems, please use app-text/pandoc instead."
+		fi
+	fi
+}
diff --git a/dev-python/jaraco-classes/jaraco-classes-3.1.0.ebuild b/dev-python/jaraco-classes/jaraco-classes-3.1.0.ebuild
index 35e7247e99a7..72a6f7164ec9 100644
--- a/dev-python/jaraco-classes/jaraco-classes-3.1.0.ebuild
+++ b/dev-python/jaraco-classes/jaraco-classes-3.1.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/jaraco-collections/jaraco-collections-3.0.0.ebuild b/dev-python/jaraco-collections/jaraco-collections-3.0.0.ebuild
index 937044b5f9fc..680c710ccb08 100644
--- a/dev-python/jaraco-collections/jaraco-collections-3.0.0.ebuild
+++ b/dev-python/jaraco-collections/jaraco-collections-3.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/jaraco-functools/jaraco-functools-3.0.1.ebuild b/dev-python/jaraco-functools/jaraco-functools-3.0.1.ebuild
index cb0e63963d26..21d365d3af3d 100644
--- a/dev-python/jaraco-functools/jaraco-functools-3.0.1.ebuild
+++ b/dev-python/jaraco-functools/jaraco-functools-3.0.1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/jaraco-text/jaraco-text-3.2.0.ebuild b/dev-python/jaraco-text/jaraco-text-3.2.0.ebuild
index 5690e9e1e5bf..9a3c00ccc7dd 100644
--- a/dev-python/jaraco-text/jaraco-text-3.2.0.ebuild
+++ b/dev-python/jaraco-text/jaraco-text-3.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/latexcodec/Manifest b/dev-python/latexcodec/Manifest
new file mode 100644
index 000000000000..cd1b865795d4
--- /dev/null
+++ b/dev-python/latexcodec/Manifest
@@ -0,0 +1 @@
+DIST latexcodec-2.0.0.tar.gz 29919 BLAKE2B 163fe7332aba7628265f1462570c8d22ec4044dd7b7383de8280bbc617ba4dc26e90f12e6777d690c7a8ae4f6564dbf7519bd6f57cf3dca2820a1fc647a1d7ef SHA512 3c0540b4e5dbc88908b26c68b4c6fca573b45a6b17053733b35a16716510bb67ef6099fae8e48e094a6f08be4e4eac48e889366f035ab38f80e31dd61f08a3c1
diff --git a/dev-python/latexcodec/latexcodec-2.0.0.ebuild b/dev-python/latexcodec/latexcodec-2.0.0.ebuild
new file mode 100644
index 000000000000..d3f8bec601bf
--- /dev/null
+++ b/dev-python/latexcodec/latexcodec-2.0.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Lexer and codec to work with LaTeX code in Python"
+HOMEPAGE="https://github.com/mcmtroffaes/latexcodec/ https://pypi.org/project/pybtex/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/latexcodec/metadata.xml b/dev-python/latexcodec/metadata.xml
new file mode 100644
index 000000000000..7eb10f1b3cc4
--- /dev/null
+++ b/dev-python/latexcodec/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>william@ewpettersson.se</email>
+    <name>William Pettersson</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy maintainers</name>
+  </maintainer>
+  <longdescription>
+    Latexcodec provides a convenient way of going between text written in LaTeX and unicode. Since it is not a LaTeX compiler, it is more appropriate for short chunks of text, such as a paragraph or the values of a BibTeX entry, and it is not appropriate for a full LaTeX document. In particular, its behavior on the LaTeX commands that do not simply select characters is intended to allow the unicode representation to be understandable by a human reader, but is not canonical and may require hand tuning to produce the desired effect.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">latexcodec</remote-id>
+    <remote-id type="github">mcmtroffaes/latexcodec</remote-id>
+  </upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index dd49441bc78c..674b5f2e930a 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -1,4 +1,5 @@
 DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c89463bcc7816df1aefe1e3ff989860bbaa92504718f8e15416cfd9f3491c13777cd5cb661877b237b342b0e515b93f5 SHA512 82e120be5cabdfd5111aebbea68a663fe229c8861d73802d6ab09a3bf48f60de333e07e61f8fb61beaa14ac2bea24fcd74fa6f761acaf62469f536b79fcb1e16
 DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
 DIST llvmorg-10.0.1-rc1.tar.gz 120834583 BLAKE2B 64244ebcb6f2c171c9f606e5eb0adff2794f06c9312a0ca627fb79c107c0c898ac242cf4e92523c3265fa717322601d7e3f4d178515fac95d03ee92312082b06 SHA512 f877f66046969a4055b166ad50ef876a9c8ecaf03e2cdd7c8e1a3348eb5f5180f222fa457b1f090a6660282a0d9f7a1d39cf09a04abe0dde0a6e1e10ccf15597
+DIST llvmorg-10.0.1-rc2.tar.gz 120883192 BLAKE2B d48f4ccb33691cd4997576a6d20b298455687515164f7d8dfa11ec32e197b58132c6bd549c1214c3b36982ef85e1018d4101e7afecee8d2ab67ad15d68c681bf SHA512 8e363d379a73e38ef570fb03d8243a21f37a48ef579a0f08118af4dac48060c0dc24e2bd8175f04241fa424e49b6c85723d2d3552bbe30dd165fe5fb43493325
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
diff --git a/dev-python/lit/lit-10.0.0.ebuild b/dev-python/lit/lit-10.0.0.ebuild
index 4f631b669e75..55b531a08716 100644
--- a/dev-python/lit/lit-10.0.0.ebuild
+++ b/dev-python/lit/lit-10.0.0.ebuild
@@ -15,7 +15,7 @@ llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/lit/lit-10.0.1_rc2.ebuild b/dev-python/lit/lit-10.0.1_rc2.ebuild
new file mode 100644
index 000000000000..b9123ef7bf14
--- /dev/null
+++ b/dev-python/lit/lit-10.0.1_rc2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python2_7 python3_{6..9} )
+
+inherit distutils-r1 llvm.org
+
+DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
+HOMEPAGE="https://llvm.org/"
+LLVM_COMPONENTS=( llvm/utils/lit )
+llvm.org_set_globals
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# Tests require 'FileCheck' and 'not' utilities (from llvm)
+BDEPEND="
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+		sys-devel/llvm )"
+
+# TODO: move the manpage generation here (from sys-devel/llvm)
+
+src_prepare() {
+	cd "${WORKDIR}" || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x LIT_PRESERVES_TMP=1
+	local litflags=$(get_lit_flags)
+	./lit.py ${litflags//;/ } tests || die
+}
diff --git a/dev-python/matplotlib-python2/matplotlib-python2-2.2.5-r1.ebuild b/dev-python/matplotlib-python2/matplotlib-python2-2.2.5-r1.ebuild
index 36cd1d8f6be6..203da895b9af 100644
--- a/dev-python/matplotlib-python2/matplotlib-python2-2.2.5-r1.ebuild
+++ b/dev-python/matplotlib-python2/matplotlib-python2-2.2.5-r1.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 # Fonts: BitstreamVera, OFL-1.1
 LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~x86"
 IUSE="cairo excel gtk3 latex qt5 test tk wxwidgets"
 REQUIRED_USE="test? ( cairo gtk3 latex qt5 tk wxwidgets )"
 
diff --git a/dev-python/matplotlib/matplotlib-3.1.2.ebuild b/dev-python/matplotlib/matplotlib-3.1.2.ebuild
index 91b2099a971d..eb1517ece9d8 100644
--- a/dev-python/matplotlib/matplotlib-3.1.2.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.1.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 # Fonts: BitstreamVera, OFL-1.1
 LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~x86"
 IUSE="cairo doc excel examples gtk3 latex qt5 test tk wxwidgets"
 REQUIRED_USE="test? ( cairo gtk3 latex qt5 tk )"
 # tests are fixed in 3.2.1, this version is beyond repair
diff --git a/dev-python/misaka/Manifest b/dev-python/misaka/Manifest
index 2da49ac2e914..efaf55db2516 100644
--- a/dev-python/misaka/Manifest
+++ b/dev-python/misaka/Manifest
@@ -1 +1 @@
-DIST misaka-1.0.2.tar.gz 78702 BLAKE2B a07be5c94098e716d1494c69d84c50f8a78fe3b3a1a21d9a2ecce1c7474de9e493775b50f18cbdfa7c2bfb914fc4229d281282a80523e794de846d0f947238f1 SHA512 ba3ef2e4c66e0e33e21bb554c3e317342929b3d9969aaba7e3dbd745430b3952b6bb7d3142a3049c4de3e3dede7cc68a9810cd43642e014949e4564fcb2cc74d
+DIST misaka-2.1.1.tar.gz 125187 BLAKE2B c739ac13430425fbfef56ff56b8b93a2be8654779793f233dd7be508a462114cef1d4977881646e2a0717adb4a10eac924edcc6e017658a703019c5a0b039b8e SHA512 345cbce4d3b4b7e99e13e32fe4049c6cc27b576685d9d44771a41c486b4fcd8696bd094ab426750ad1841a6d4d1edeee6a60def11559ccf1e3854f2e1bda51d1
diff --git a/dev-python/misaka/metadata.xml b/dev-python/misaka/metadata.xml
index 2140c506669a..ad19de1ffe46 100644
--- a/dev-python/misaka/metadata.xml
+++ b/dev-python/misaka/metadata.xml
@@ -6,6 +6,7 @@
     <name>Openstack</name>
   </maintainer>
   <upstream>
+    <remote-id type="github">FSX/misaka</remote-id>
     <remote-id type="pypi">misaka</remote-id>
   </upstream>
 	<origin>gentoo-staging</origin>
diff --git a/dev-python/misaka/misaka-1.0.2.ebuild b/dev-python/misaka/misaka-1.0.2.ebuild
deleted file mode 100644
index 0d286e7345db..000000000000
--- a/dev-python/misaka/misaka-1.0.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="The Python binding for Sundown, a markdown parsing library"
-HOMEPAGE="https://misaka.61924.nl/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="dev-python/urllib3[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		dev-python/cython[${PYTHON_USEDEP}]"
diff --git a/dev-python/misaka/misaka-2.1.1.ebuild b/dev-python/misaka/misaka-2.1.1.ebuild
new file mode 100644
index 000000000000..f1a7a807f3cc
--- /dev/null
+++ b/dev-python/misaka/misaka-2.1.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="A CFFI binding for Hoedown, a markdown parsing library"
+HOMEPAGE="http://misaka.61924.nl/ https://github.com/FSX/misaka"
+SRC_URI="https://github.com/FSX/misaka/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="dev-python/cffi[${PYTHON_USEDEP}]"
+
+# FIXME: tests requires write access outside sandbox
+#distutils_enable_tests setup.py
diff --git a/dev-python/objgraph/objgraph-3.4.1.ebuild b/dev-python/objgraph/objgraph-3.4.1.ebuild
index 3c4bbdb00f8c..9d9fca972a5f 100644
--- a/dev-python/objgraph/objgraph-3.4.1.ebuild
+++ b/dev-python/objgraph/objgraph-3.4.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://mg.pov.lt/objgraph/"
 SRC_URI="mirror://pypi/o/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 IUSE="doc"
 
diff --git a/dev-python/pybtex/Manifest b/dev-python/pybtex/Manifest
new file mode 100644
index 000000000000..86356b0acb59
--- /dev/null
+++ b/dev-python/pybtex/Manifest
@@ -0,0 +1 @@
+DIST pybtex-0.22.2.tar.gz 363094 BLAKE2B 6e59543a1178f2d3528c8b65b63afd720864fb8f31172e3fa76a36bee3d5dd9f32aa6226fa0a599af0a4705d3c37060417f6e902ec7b900efcc8a6f8487c31e1 SHA512 afabae8c47008651fa9c4c6546bf87f4a2c74d3184f1d0c1b4c2bd68ad8110ea37054026b5934312b86d97354a592bae5c0b6d384003b4e56f0157f6520b77a1
diff --git a/dev-python/pybtex/files/pybtex-0.22.2-fix-test-installation.patch b/dev-python/pybtex/files/pybtex-0.22.2-fix-test-installation.patch
new file mode 100644
index 000000000000..a5420314fd75
--- /dev/null
+++ b/dev-python/pybtex/files/pybtex-0.22.2-fix-test-installation.patch
@@ -0,0 +1,11 @@
+--- a/setup.py	2020-06-02 10:46:54.592360043 +0100
++++ b/setup.py	2020-06-02 10:47:00.482302281 +0100
+@@ -82,7 +82,7 @@
+     ],
+     install_requires=install_requires,
+     python_requires='>=2.7,!=3.0.*,!=3.1.*,!=3.2.*',
+-    packages=find_packages(exclude=['docs']),
++    packages=find_packages(exclude=['docs', 'tests*']),
+     include_package_data=True,
+     cmdclass={'sdist': Sdist},
+     entry_points={
diff --git a/dev-python/pybtex/metadata.xml b/dev-python/pybtex/metadata.xml
new file mode 100644
index 000000000000..8031107368b7
--- /dev/null
+++ b/dev-python/pybtex/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>william@ewpettersson.se</email>
+    <name>William Pettersson</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy maintainers</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">pybtex</remote-id>
+    <remote-id type="bitbucket">pybtex-devs/pybtex</remote-id>
+  </upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/dev-python/pybtex/pybtex-0.22.2.ebuild b/dev-python/pybtex/pybtex-0.22.2.ebuild
new file mode 100644
index 000000000000..5359af384462
--- /dev/null
+++ b/dev-python/pybtex/pybtex-0.22.2.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=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="BibTeX-compatible bibliography processor"
+HOMEPAGE="https://pybtex.org https://pypi.org/project/pybtex/"
+SRC_URI="https://files.pythonhosted.org/packages/source/p/${PN}/${P}.tar.gz"
+PATCHES=( "${FILESDIR}/${P}-fix-test-installation.patch" )
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/latexcodec[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]"
+
+BDEPEND="test?  (
+			dev-python/nose[${PYTHON_USEDEP}]
+		)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pycryptodome/pycryptodome-3.9.7.ebuild b/dev-python/pycryptodome/pycryptodome-3.9.7.ebuild
index e6a6117b2a0d..bf92dd941db7 100644
--- a/dev-python/pycryptodome/pycryptodome-3.9.7.ebuild
+++ b/dev-python/pycryptodome/pycryptodome-3.9.7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2 Unlicense"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="dev-libs/gmp:0
diff --git a/dev-python/pyfakefs/pyfakefs-3.7.2.ebuild b/dev-python/pyfakefs/pyfakefs-3.7.2.ebuild
index b866264b0c15..f2c68f229024 100644
--- a/dev-python/pyfakefs/pyfakefs-3.7.2.ebuild
+++ b/dev-python/pyfakefs/pyfakefs-3.7.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6..9} pypy3 )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 DISTUTILS_IN_SOURCE_BUILD=1
 
diff --git a/dev-python/pyfakefs/pyfakefs-4.0.2.ebuild b/dev-python/pyfakefs/pyfakefs-4.0.2.ebuild
index c064df196ec3..f23510b3baab 100644
--- a/dev-python/pyfakefs/pyfakefs-4.0.2.ebuild
+++ b/dev-python/pyfakefs/pyfakefs-4.0.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 DISTUTILS_IN_SOURCE_BUILD=1
 
diff --git a/dev-python/pyopencl/pyopencl-2019.1.2.ebuild b/dev-python/pyopencl/pyopencl-2019.1.2.ebuild
index fbc6d6a64740..2f72469ccad5 100644
--- a/dev-python/pyopencl/pyopencl-2019.1.2.ebuild
+++ b/dev-python/pyopencl/pyopencl-2019.1.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="examples opengl"
 
 RDEPEND="
diff --git a/dev-python/pytest-mock/pytest-mock-3.1.0.ebuild b/dev-python/pytest-mock/pytest-mock-3.1.0.ebuild
index 816375eebd1c..4e98df61a1ba 100644
--- a/dev-python/pytest-mock/pytest-mock-3.1.0.ebuild
+++ b/dev-python/pytest-mock/pytest-mock-3.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86"
 IUSE=""
 
 RDEPEND=">=dev-python/pytest-5[${PYTHON_USEDEP}]"
diff --git a/dev-python/pytest-services/pytest-services-2.0.1.ebuild b/dev-python/pytest-services/pytest-services-2.0.1.ebuild
index 7b9808fa2730..8875cb0a0719 100644
--- a/dev-python/pytest-services/pytest-services-2.0.1.ebuild
+++ b/dev-python/pytest-services/pytest-services-2.0.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pytest-dev/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pytest/pytest-5.4.2.ebuild b/dev-python/pytest/pytest-5.4.2.ebuild
index db2b97ff63b1..c8caedd2dddb 100644
--- a/dev-python/pytest/pytest-5.4.2.ebuild
+++ b/dev-python/pytest/pytest-5.4.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/tempora/tempora-3.0.0.ebuild b/dev-python/tempora/tempora-3.0.0.ebuild
index 68cf55980855..bc13434facee 100644
--- a/dev-python/tempora/tempora-3.0.0.ebuild
+++ b/dev-python/tempora/tempora-3.0.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index 06767d919a64..47c780f4afb1 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -5,4 +5,5 @@ DIST tox-3.14.5.tar.gz 290075 BLAKE2B 7e412e85981fe11cba4dc6a4ab3df824678b11fe59
 DIST tox-3.15.0.tar.gz 291890 BLAKE2B 9c42c587332eafcfd02d2d8a42588af6253baf9f62e82eb8a8bf10da291b4868b1fe319e38a583bc67bb26ab868b8a123feccd5bd008ce618ceb46d3121c68d2 SHA512 cb21574301d953b361eb5e1d89eefe22e68ae5871036f03d5753ee97c888cadde548d62a50622dd65b3c488143bbbdf8d309bafa3b6a4807871c9e78b6fcdb9c
 DIST tox-3.15.1.tar.gz 292044 BLAKE2B eb3062fb1a2494a6b23e1c6f2c6af56be5879664ae26918e60839d2f8cff98dc6b684a27469eac81c363a3cd3e90abdafe0ab4dc601840023e5263a42301f384 SHA512 334e2129d5418d4733a25419b81cc57e794a11954c21774231e32c93e977f1a7fb71c739adabccb5cdde9428ab69772e8623a0c0a1172855957f7cbcd4a917b1
 DIST tox-3.15.2.tar.gz 293523 BLAKE2B a1a1c84a987d2b2e5194321405775ee3828b8e2c8dcd38c7e780a9d508b789a42f1880cffcecd68c50dfdc37008a4e9a117660fa2c732864c82af6c2eaf5a99e SHA512 9448554452c79039289d2d2c05c974f451647329701372c3e4b154a0161fa768245c0068cd5e3f1221b4b51a07be806f7c66ab9d4ef83a3e8e5964e18b9cde85
+DIST tox-3.16.0.tar.gz 294040 BLAKE2B 2f5ca2c1b0b839b4fe6834cba69d772b9605e6bb00b24d75867de768042cd091a8fd7f5a349867a5de578b96eaad9f59f2ad019203fc6b2c39c9efc6933d2d96 SHA512 f92accae643b01867749f10d01ba0e18ebb36071af55a21cd38ac8f14fa3db1b1e708b22f8601e4d1b172e59fb62588c1252d064be3fb6007002eeaaef716373
 DIST tox-3.2.1.tar.gz 268827 BLAKE2B 764835d04fb0c17f32eb8e2041b83f90d6a729b781a5b5b95e9ecb1162f1c29ed595d4a6369524b390a31853b8003485b27a3a12d63e84f49e92675f1a9bee13 SHA512 79f5a1c8f6e818fbb8444754e3767d880fc1fdfe63b46c518d37440fe2b2f3ce572865aff83d9492c24486fded49893cc31bd9b11254bac4db507260304bc76f
diff --git a/dev-python/tox/tox-3.16.0.ebuild b/dev-python/tox/tox-3.16.0.ebuild
new file mode 100644
index 000000000000..0365e6a79004
--- /dev/null
+++ b/dev-python/tox/tox-3.16.0.ebuild
@@ -0,0 +1,71 @@
+# 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_{6,7,8} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="virtualenv-based automation of test activities"
+HOMEPAGE="https://tox.readthedocs.io https://github.com/tox-dev/tox https://pypi.org/project/tox/"
+SRC_URI="https://github.com/tox-dev/tox/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# doc disabled because of missing deps in tree
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/filelock[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-1.1[${PYTHON_USEDEP}]
+	' python3_{5,6,7} pypy3)
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
+	dev-python/pip[${PYTHON_USEDEP}]
+	dev-python/py[${PYTHON_USEDEP}]
+	>=dev-python/six-1.14[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	>=dev-python/virtualenv-16.0.0[${PYTHON_USEDEP}]"
+# TODO: figure out how to make tests work without the package being
+# installed first.
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		>=dev-python/flaky-3.4.0[${PYTHON_USEDEP}]
+		>=dev-python/freezegun-0.3.11[${PYTHON_USEDEP}]
+		dev-python/pathlib2[${PYTHON_USEDEP}]
+		>=dev-python/pytest-4.0.0[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		=dev-python/tox-${PV}-${PR}[${PYTHON_USEDEP}]
+	)"
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# broken without internet
+	sed -i -e 's:test_provision_non_canonical_dep:_&:' \
+		tests/unit/session/test_provision.py || die
+	sed -i -e 's:test_provision_interrupt_child:_&:' \
+		tests/integration/test_provision_int.py || die
+	# broken with our mock version (?)
+	sed -i -e 's:test_create_KeyboardInterrupt:_&:' \
+		tests/unit/test_venv.py || die
+	# broken with Gentoo Python layout
+	sed -i -e 's:test_tox_get_python_executable:_&:' \
+		-e 's:test_find_alias_on_path:_&:' \
+		tests/unit/interpreters/test_interpreters.py || die
+
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
+
+python_test() {
+	distutils_install_for_testing
+	pytest -vv --no-network || die "Testsuite failed under ${EPYTHON}"
+}
diff --git a/dev-python/tqdm/Manifest b/dev-python/tqdm/Manifest
index 28b3a53c9ad6..250d86e8b5ef 100644
--- a/dev-python/tqdm/Manifest
+++ b/dev-python/tqdm/Manifest
@@ -4,3 +4,4 @@ DIST tqdm-4.40.0.tar.gz 129225 BLAKE2B 85030c11bdba6c1d6da461e3c648bae6ae173577f
 DIST tqdm-4.45.0.tar.gz 140990 BLAKE2B 8699b3a820859406e9bbafaaa48ba1b418e3083898d2b6c3401078996dd03431db259d5ad8a377226a50b80513ef0fc55bdaf2b67fc4a2bdd490bc5fdc04d681 SHA512 7b35f86205c6581ede9bdb0788e7f55be525c3f0f77952803046661c6a7a6cd3c15ed0323376ecedb5cddace1b32a41fee1932033dcaa49f9096dc3b9b674f10
 DIST tqdm-4.46.0.tar.gz 144312 BLAKE2B 93b902d9a362e658f244f3c1b15a3496425cb3e401adf291dc0a9c7c0bd551baa1171a753be8d1c3b877d2cd3ab25e81dddbd8492668d0b0f6ca3cb47d13be1c SHA512 ccdfce4d273e78ced172fc3edb24ac038465169f7b765e7bf779831ef3d0dc72c648c5fb165aba02e0c6dc86c5d0ea3d93d5530b642ddd84e3d284c7354739cf
 DIST tqdm-4.46.1.tar.gz 144383 BLAKE2B 4d72bfbf0c225c779ae2c9bf405f9effdb69cfe7862325b12e8408c17a03b7a87f9cf0d055de598a67132861114c89b237d0ad2509302e452cc67ce9aa34fa48 SHA512 de8710ceb44b6caa073aaa3c9dca281880d752d1b542a3dd87a54884478a185c35ab1969c6cb7242e30ee0511f967cde7bd4fa83a8d4f8c58d3e95ad2bf3bfc6
+DIST tqdm-4.47.0.tar.gz 145749 BLAKE2B 77a5efec763a8e58e071ee571077ee0db72d9243308592519ecd2c38f60d6b621fd7362dd87bdd0759a39f25c19cc3cc889e9a8376dc658ed565ca7e19fc68cd SHA512 4023988cef757f43a6f59f7eddc8f40246cbca4994cea91dbb4a788385c0706f376f4c0fd5c8c47146c10eb8c52be2c9d4855b7bea0a5036162c55447aac95d7
diff --git a/dev-python/tqdm/tqdm-4.46.1.ebuild b/dev-python/tqdm/tqdm-4.46.1.ebuild
index 75999c0d5faf..563276f5d141 100644
--- a/dev-python/tqdm/tqdm-4.46.1.ebuild
+++ b/dev-python/tqdm/tqdm-4.46.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/tqdm/tqdm"
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 DESCRIPTION="Add a progress meter to your loops in a second"
diff --git a/dev-python/tqdm/tqdm-4.47.0.ebuild b/dev-python/tqdm/tqdm-4.47.0.ebuild
new file mode 100644
index 000000000000..563276f5d141
--- /dev/null
+++ b/dev-python/tqdm/tqdm-4.47.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8,9}} )
+
+inherit distutils-r1
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/tqdm/tqdm"
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+DESCRIPTION="Add a progress meter to your loops in a second"
+HOMEPAGE="https://github.com/tqdm/tqdm"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="examples"
+
+distutils_enable_tests nose
+
+python_prepare_all() {
+	sed -r \
+		-e "s:'nose'(,[[:space:]]*|)::" \
+		-e "s:'flake8'(,[[:space:]]*|)::" \
+		-e "s:'coverage'(,[[:space:]]*|)::" \
+		-i setup.py
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# tests_main.py requires the package to be installed
+	distutils_install_for_testing
+	# Skip unpredictable performance tests
+	nosetests tqdm -v --ignore 'tests_perf.py' \
+		|| die "tests failed with ${EPYTHON}"
+}
+
+python_install() {
+	doman "${BUILD_DIR}"/lib/tqdm/tqdm.1
+	rm "${BUILD_DIR}"/lib/tqdm/tqdm.1 || die
+	distutils-r1_python_install --skip-build
+}
+
+python_install_all() {
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/xmlschema/xmlschema-1.1.3.ebuild b/dev-python/xmlschema/xmlschema-1.1.3.ebuild
index fc99c030c534..970be7400279 100644
--- a/dev-python/xmlschema/xmlschema-1.1.3.ebuild
+++ b/dev-python/xmlschema/xmlschema-1.1.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"