Updating liguros repo

47 files changed, 383 insertions, 258 deletions

diff --git a/dev-python/bcrypt/bcrypt-3.1.7-r2.ebuild b/dev-python/bcrypt/bcrypt-3.1.7-r2.ebuild
index b24df4aec6a7..a307e1aa2534 100644
--- a/dev-python/bcrypt/bcrypt-3.1.7-r2.ebuild
+++ b/dev-python/bcrypt/bcrypt-3.1.7-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
 
 RDEPEND="
 	$(python_gen_cond_dep '>=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]' 'python*')
diff --git a/dev-python/bcrypt/bcrypt-3.2.0.ebuild b/dev-python/bcrypt/bcrypt-3.2.0.ebuild
index 4352af2a1a3c..f0a5e54aa65c 100644
--- a/dev-python/bcrypt/bcrypt-3.2.0.ebuild
+++ b/dev-python/bcrypt/bcrypt-3.2.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
 
 RDEPEND="
 	$(python_gen_cond_dep '>=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]' 'python*')
diff --git a/dev-python/breathe/breathe-4.22.1.ebuild b/dev-python/breathe/breathe-4.22.1.ebuild
index 74dbe452d097..422ac243b207 100644
--- a/dev-python/breathe/breathe-4.22.1.ebuild
+++ b/dev-python/breathe/breathe-4.22.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	app-doc/doxygen
diff --git a/dev-python/cryptography/cryptography-3.2.1.ebuild b/dev-python/cryptography/cryptography-3.2.1.ebuild
index c94c8e54c479..09b76da3bf58 100644
--- a/dev-python/cryptography/cryptography-3.2.1.ebuild
+++ b/dev-python/cryptography/cryptography-3.2.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 
 LICENSE="|| ( Apache-2.0 BSD )"
 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 ~x64-solaris"
+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 ~x64-solaris"
 IUSE="libressl idna"
 
 RDEPEND="
diff --git a/dev-python/docutils-glep/docutils-glep-1.2.ebuild b/dev-python/docutils-glep/docutils-glep-1.2.ebuild
index ad5f7e1ffbe0..2bf8a5ebec48 100644
--- a/dev-python/docutils-glep/docutils-glep-1.2.ebuild
+++ b/dev-python/docutils-glep/docutils-glep-1.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="public-domain"
 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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND=">=dev-python/docutils-0.10[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/docutils/docutils-0.16-r1.ebuild b/dev-python/docutils/docutils-0.16-r1.ebuild
index ae41906ef53c..48d952ae3373 100644
--- a/dev-python/docutils/docutils-0.16-r1.ebuild
+++ b/dev-python/docutils/docutils-0.16-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2 GPL-3 public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~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 ~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=""
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/ecdsa/ecdsa-0.16.1.ebuild b/dev-python/ecdsa/ecdsa-0.16.1.ebuild
index ed5ad2743b67..296c54f34090 100644
--- a/dev-python/ecdsa/ecdsa-0.16.1.ebuild
+++ b/dev-python/ecdsa/ecdsa-0.16.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x64-macos ~x86-macos"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/executing/Manifest b/dev-python/executing/Manifest
index cac75ae3aa6c..3a57de7529d0 100644
--- a/dev-python/executing/Manifest
+++ b/dev-python/executing/Manifest
@@ -1 +1,2 @@
 DIST executing-0.5.3.gh.tar.gz 303234 BLAKE2B cb9de0492c4aa31b53310abf65d97df888278671fbf24e5dc2f3f4b00fd22d233fae2265bffe240c092c5b67bfca1e69ec1c4eaa937a0d4c90bedced1f156e2a SHA512 faf591de8e6354300fb572065bda304c3cbc529725b4044ad4f4ca1f86d892da21598ba7245059824e27894937d46e4ef9ef5962a9d7dff78e4144a3e0e6b388
+DIST executing-0.5.4.gh.tar.gz 330687 BLAKE2B 10f526dfb3a9f72dda788af97547e011425a56d1af73c30f5704fb8d348beb4e4538e118355dd415ec6125507ca9b2b015c02dc0bd81a2ef732a60aafb89f12a SHA512 3953ee1f6667c32fea28f964b395d53e99fa7869e27495a241f70179577865ec430ddfa07776995b6b1aaddd660adf6c6b61a8e8931589c0faeea94743fbc209
diff --git a/dev-python/executing/executing-0.5.4.ebuild b/dev-python/executing/executing-0.5.4.ebuild
new file mode 100644
index 000000000000..a8c5904967b8
--- /dev/null
+++ b/dev-python/executing/executing-0.5.4.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="Get information about what a Python frame is currently doing"
+HOMEPAGE="
+	https://github.com/alexmojaki/executing/
+	https://pypi.org/project/executing/"
+SRC_URI="
+	https://github.com/alexmojaki/executing/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+# asttokens is optional runtime dep
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	test? (
+		dev-python/asttokens[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+src_prepare() {
+	# Kill off useless wheel dep
+	sed -i -e 's/wheel; //' setup.cfg || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# this test explodes when collected by pytest
+	"${EPYTHON}" tests/test_main.py || die "Tests failed with ${EPYTHON}"
+	pytest -vv tests/test_pytest.py || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/fonttools/metadata.xml b/dev-python/fonttools/metadata.xml
index 3b6043b796d6..b50790dd70cb 100644
--- a/dev-python/fonttools/metadata.xml
+++ b/dev-python/fonttools/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-		<email>fonts@gentoo.org</email>
-		<name>Fonts</name>
-	</maintainer>
-	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
diff --git a/dev-python/gevent/Manifest b/dev-python/gevent/Manifest
index 72dcce9035c6..89b185ec1c86 100644
--- a/dev-python/gevent/Manifest
+++ b/dev-python/gevent/Manifest
@@ -1,2 +1,3 @@
 DIST gevent-20.12.0.tar.gz 5898634 BLAKE2B a73129c7d393aedcd84b6e62c890c3b306722876a1ea4c96485096ce2ea7d1db5f03c77ea77a2c35ef41c7a96183246316c577735bcf4b25fb41095282c64d38 SHA512 76c75128ba2b33e47bd85ef2788387aa6d47d230ef9aeac4bceee03e8a2555dd204c321de7d1779fe4f44503e4fca5dce3b43c1922238da994faed0d78e5c4c1
+DIST gevent-20.12.1.tar.gz 5908977 BLAKE2B fd3536de1ca518e889868537cfb856d022ec2be8f5f658cddb06b9797841333a475d2c4d7eb3f97ecd715a19999804e724f8126b189087582452a88076bf5d12 SHA512 63bf8d63ed0eeed63b5ae6b58a2a0a36bb4a606d7d76f51cb59d5b76aa639296264a01455699cfb6abee53c958368c17f4c6bfca1543d04f9d750637b113046b
 DIST gevent-20.9.0.tar.gz 5806581 BLAKE2B 6b1b653fa6e22539e049a9bba3d3a2b9d798a5555ce4ba60ce33ecbdf14bb5201967d22d677e1ce3170129b0763fddfcc5991347186fb102d10ae39e22538c44 SHA512 966efc945b623df2521fffadca3b7e56cae1efe6de904a724765e0593389e8b1305094baa6fbc9f4fa376b1157d0f230b01e2a90de21e4b9650614363edec9f4
diff --git a/dev-python/gevent/gevent-20.12.1.ebuild b/dev-python/gevent/gevent-20.12.1.ebuild
new file mode 100644
index 000000000000..4c4a3a4ce592
--- /dev/null
+++ b/dev-python/gevent/gevent-20.12.1.ebuild
@@ -0,0 +1,86 @@
+# 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,10} )
+PYTHON_REQ_USE="ssl(+),threads(+)"
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Coroutine-based network library"
+HOMEPAGE="https://www.gevent.org/ https://pypi.org/project/gevent/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="doc examples test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/libev-4.31:=
+	dev-libs/libuv:=
+	>=net-dns/c-ares-1.12:=
+	>=dev-python/greenlet-0.4.17
+	dev-python/zope-event[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]
+	virtual/python-greenlet[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_sphinx doc
+
+# Tests take long and fail terribly a few times.
+# It also seems that they require network access.
+#RESTRICT="test"
+
+python_prepare_all() {
+	export LIBEV_EMBED="false"
+	export CARES_EMBED="false"
+	export EMBED="false"
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	append-flags -fno-strict-aliasing
+}
+
+python_test() {
+	cd src/gevent/tests || die
+	# TODO: figure out how to make them work and not hang
+#	GEVENT_RESOLVER=ares \
+#		"${EPYTHON}" -m gevent.tests \
+#		-uall,-network \
+#		--config known_failures.py \
+#		--ignore tests_that_dont_use_resolver.txt || die
+#	GEVENT_RESOLVER=dnspython \
+#		"${EPYTHON}" -m gevent.tests \
+#		-uall,-network \
+#		--config known_failures.py \
+#		--ignore tests_that_dont_use_resolver.txt || die
+#	GEVENT_RESOLVER=thread \
+#		"${EPYTHON}" -m gevent.tests \
+#		--verbose \
+#		-uall,-network \
+#		--config known_failures.py \
+#		--ignore tests_that_dont_use_resolver.txt || die
+	GEVENT_FILE=thread \
+		"${EPYTHON}" -m gevent.tests \
+		--verbose \
+		-uall,-network \
+		--config known_failures.py \
+		test__*subprocess*.py || die
+}
+
+python_install_all() {
+	local DOCS=( AUTHORS README.rst )
+	use examples && dodoc -r examples
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/jaraco-text/Manifest b/dev-python/jaraco-text/Manifest
index 2871515814e1..30a465d95af4 100644
--- a/dev-python/jaraco-text/Manifest
+++ b/dev-python/jaraco-text/Manifest
@@ -1 +1,2 @@
 DIST jaraco.text-3.2.0.tar.gz 14279 BLAKE2B aa8c8903bac61db3d1017408e1aa525f66060422c27b754af343a64e586b64c6623b66881bea62b9b2e89821a40c933d54c9a8cddc7bda08ac108ad08a9524dc SHA512 4107ef1078b44714b6ee5fb6ebd2bb7c35415debc6eaedd8bc18a70a2936cc7c7757acd7b3fac9587201ef52a25d9b29e49f2385a0a08afffb1d0c3de6ecc377
+DIST jaraco.text-3.4.0.tar.gz 15427 BLAKE2B 4f9584b9824c4d73ac9c75bc153048466d826fb37e8240ebec12181c837bca0d8f79a3e1dce25117f4c3e361a48a1566419d2555d430fcb792b5e40eede2713b SHA512 074b963c9ccf020409a28d7ef0053d5b221f9a3b16003ca9eac663f70b1a909b4523f9e5aba606f77108723157f237602f7c9f5079a782c8bfa9fdbbb553cf28
diff --git a/dev-python/jaraco-text/jaraco-text-3.4.0.ebuild b/dev-python/jaraco-text/jaraco-text-3.4.0.ebuild
new file mode 100644
index 000000000000..3ffe16632d88
--- /dev/null
+++ b/dev-python/jaraco-text/jaraco-text-3.4.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Text utilities used by other projects by developer jaraco"
+HOMEPAGE="https://github.com/jaraco/jaraco.text"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	dev-python/jaraco-functools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' python3_6)
+"
+BDEPEND="
+	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx docs \
+	">=dev-python/jaraco-packaging-3.2" \
+	">=dev-python/rst-linker-1.9"
+distutils_enable_tests pytest
+
+python_test() {
+	# Override pytest options to skip flake8
+	PYTHONPATH=. pytest -vv --override-ini="addopts=--doctest-modules" \
+		|| die "tests failed with ${EPYTHON}"
+}
+
+# https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages#File_collisions_between_pkgutil-style_packages
+python_install() {
+	rm "${BUILD_DIR}"/lib/jaraco/__init__.py || die
+	distutils-r1_python_install
+}
diff --git a/dev-python/jeepney/jeepney-0.6.0.ebuild b/dev-python/jeepney/jeepney-0.6.0.ebuild
index a889182dbabc..c3bbc124aa6a 100644
--- a/dev-python/jeepney/jeepney-0.6.0.ebuild
+++ b/dev-python/jeepney/jeepney-0.6.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 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc ~x86 ~x64-macos"
 IUSE="examples"
 
 BDEPEND="
diff --git a/dev-python/lxml/lxml-4.6.2-r1.ebuild b/dev-python/lxml/lxml-4.6.2-r1.ebuild
index 42eb20675d79..8953b2aa69c7 100644
--- a/dev-python/lxml/lxml-4.6.2-r1.ebuild
+++ b/dev-python/lxml/lxml-4.6.2-r1.ebuild
@@ -14,7 +14,7 @@ S=${WORKDIR}/lxml-${P}
 
 LICENSE="BSD ElementTree GPL-2 PSF-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples +threads test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/ndg-httpsclient/Manifest b/dev-python/ndg-httpsclient/Manifest
index 7f161b48de39..3aac79eb3cd3 100644
--- a/dev-python/ndg-httpsclient/Manifest
+++ b/dev-python/ndg-httpsclient/Manifest
@@ -1,3 +1 @@
-DIST ndg_httpsclient-0.4.0.tar.gz 24038 BLAKE2B 147ba36c966b2220c068ce3376bd84259807f66c57141fee4ed95457333cd9d568d19fd4d3348e7ef25d456e3f7d794f83f8302a15beb16f451aa02ef6181848 SHA512 3c0225a20c25cf0f12f03005bb79e738527c0488bb660c1eb3b55c505a0ef503002d37fcffb3d013e5f91101bdd03080a68d5805d6d29b682cc01bdc9f0e4a19
-DIST ndg_httpsclient-0.4.2.tar.gz 25062 BLAKE2B 740075cf3031547028afa3ec2e005e5430e7fbb5c2bfd444e4051c60a9ac14ecacd3048f87f546516bddc4c0403738aa3ef227b3fd763a48bca28da09a47f707 SHA512 c7d6f442242ce01f69d2386b8ed41e4e5f72a2523ecbe38785c4333405f1b000e298133ccc4169d9685a3dcdcf0b20567c8e4b2dfd36f42721d36c73ee27d90a
 DIST ndg_httpsclient-0.5.1.tar.gz 26665 BLAKE2B 1c7f0a8d41b945d2b2a51cd69397ab0943cb91e25013c931f055c5608bc3a0106a99d9b126e8caaac9f8d9b409ec117631fb23f19dfd3194b783548ce3536050 SHA512 b2b4c1b1df87ea1a94811b9ae831e7bf32af27258f487fd5ec319e0e6e0d79dfdb1f7bfadaf397d0693a8a7f0720df170a7fc946aaf10c82e3957ac5464f672e
diff --git a/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.0.ebuild b/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.0.ebuild
deleted file mode 100644
index 1c08567b19c0..000000000000
--- a/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Provides enhanced HTTPS support for httplib and urllib2 using PyOpenSSL"
-HOMEPAGE="
-	https://github.com/cedadev/ndg_httpsclient/
-	https://pypi.org/project/ndg-httpsclient/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P/-/_}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE=""
-
-RDEPEND="dev-python/pyopenssl[$(python_gen_usedep 'python*' pypy)]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${P/-/_}"
-
-# doc build by Makefile in folder documentation is broken
diff --git a/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.2-r1.ebuild b/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.2-r1.ebuild
deleted file mode 100644
index 6fa2736d98c9..000000000000
--- a/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.2-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Provides enhanced HTTPS support for httplib and urllib2 using PyOpenSSL"
-HOMEPAGE="
-	https://github.com/cedadev/ndg_httpsclient/
-	https://pypi.org/project/ndg-httpsclient/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P/-/_}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/pyopenssl[$(python_gen_usedep 'python*' pypy)]"
-# we need to block the previous versions since incorrect namespace
-# install breaks tests
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		!!<dev-python/ndg-httpsclient-0.4.2-r1
-		dev-libs/openssl:0
-	)"
-
-S="${WORKDIR}/${P/-/_}"
-
-# doc build by Makefile in folder documentation is broken
-
-src_test() {
-	# we need to start a fake https server for tests to connect to
-	( cd ndg/httpsclient/test && sh ./scripts/openssl_https_server.sh ) &
-	local server_pid=${!}
-
-	distutils-r1_src_test
-
-	kill "${server_pid}"
-	wait
-}
-
-python_test() {
-	"${PYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# install the namespace (this is the only package in ::gentoo
-	# using it; we'll split it if we add more)
-	python_moduleinto ndg
-	python_domodule ndg/__init__.py
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/ndg-httpsclient/ndg-httpsclient-0.5.1.ebuild b/dev-python/ndg-httpsclient/ndg-httpsclient-0.5.1.ebuild
index 66c4fe6e9c87..759800bcabe1 100644
--- a/dev-python/ndg-httpsclient/ndg-httpsclient-0.5.1.ebuild
+++ b/dev-python/ndg-httpsclient/ndg-httpsclient-0.5.1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P/-/_}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/pyaes[${PYTHON_USEDEP}]
diff --git a/dev-python/packaging/packaging-20.4-r1.ebuild b/dev-python/packaging/packaging-20.4-r1.ebuild
index 372a0c9e51a2..ccf57dbc90e2 100644
--- a/dev-python/packaging/packaging-20.4-r1.ebuild
+++ b/dev-python/packaging/packaging-20.4-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="|| ( Apache-2.0 BSD-2 )"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~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 ~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 )"
 
diff --git a/dev-python/packaging/packaging-20.5.ebuild b/dev-python/packaging/packaging-20.5.ebuild
index d1c52a69be66..e4a114e321fa 100644
--- a/dev-python/packaging/packaging-20.5.ebuild
+++ b/dev-python/packaging/packaging-20.5.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="|| ( Apache-2.0 BSD-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~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 ~m68k ~mips ~ppc ~ppc64 ~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 )"
 
diff --git a/dev-python/packaging/packaging-20.7.ebuild b/dev-python/packaging/packaging-20.7.ebuild
index d1c52a69be66..e4a114e321fa 100644
--- a/dev-python/packaging/packaging-20.7.ebuild
+++ b/dev-python/packaging/packaging-20.7.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="|| ( Apache-2.0 BSD-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~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 ~m68k ~mips ~ppc ~ppc64 ~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 )"
 
diff --git a/dev-python/packaging/packaging-20.8.ebuild b/dev-python/packaging/packaging-20.8.ebuild
index 1446d8d16982..057eb9dac9dd 100644
--- a/dev-python/packaging/packaging-20.8.ebuild
+++ b/dev-python/packaging/packaging-20.8.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="|| ( Apache-2.0 BSD-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~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 ~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 )"
 
diff --git a/dev-python/paramiko/paramiko-2.7.2.ebuild b/dev-python/paramiko/paramiko-2.7.2.ebuild
index 1f2e6a95fdfa..54ad21e71a37 100644
--- a/dev-python/paramiko/paramiko-2.7.2.ebuild
+++ b/dev-python/paramiko/paramiko-2.7.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
 IUSE="examples server"
 
 RDEPEND="
diff --git a/dev-python/pebble/Manifest b/dev-python/pebble/Manifest
index 6e3d8eb60f13..3cc2b5b8080a 100644
--- a/dev-python/pebble/Manifest
+++ b/dev-python/pebble/Manifest
@@ -1 +1,2 @@
 DIST Pebble-4.5.3.tar.gz 23411 BLAKE2B 4e270b0de183074e151f3c7cf8754bd3535efce601c0dfdd5bffbe04a4308aa7db6e6414668471d3af6f1fb374230590d90e2503ba223c2e95b17a2a0d301310 SHA512 e3b17fa6b9ca959560d364e84091e7990921eb9a2aef854c391a5d0e46359b57e5ec1a4239ac97f4c0bb485d0475ad8338c3485c9fdeff7e446a989129738096
+DIST Pebble-4.6.0.tar.gz 23910 BLAKE2B 3a2f1b4cdad898274d53cdfc07b5c933162aef375ae548a39138b50d50376e7f06642dfbff038b431d77715a14414f90fbd77db1c373e988df6afe65cfb5a632 SHA512 445f65cf5a18c864478326ca1198ae49bf5aae3c53e67f68ffdcbdabe3cf16c59468b3d340568986414f45f13684c11da0e3a9fd31f510c391a7fd44cf3dc6e2
diff --git a/dev-python/pebble/pebble-4.6.0.ebuild b/dev-python/pebble/pebble-4.6.0.ebuild
new file mode 100644
index 000000000000..6ce45e081329
--- /dev/null
+++ b/dev-python/pebble/pebble-4.6.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+MY_P=${P^}
+DESCRIPTION="Threading and multiprocessing eye-candy"
+HOMEPAGE="
+	https://pypi.org/project/Pebble/
+	https://pebble.readthedocs.io/
+	https://github.com/noxdafox/pebble"
+SRC_URI="mirror://pypi/${MY_P::1}/${PN^}/${MY_P}.tar.gz"
+S=${WORKDIR}/${P^}
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pyaes/pyaes-1.6.1-r2.ebuild b/dev-python/pyaes/pyaes-1.6.1-r2.ebuild
index ea8a3723404f..e97351061b71 100644
--- a/dev-python/pyaes/pyaes-1.6.1-r2.ebuild
+++ b/dev-python/pyaes/pyaes-1.6.1-r2.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 s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pyclipper/Manifest b/dev-python/pyclipper/Manifest
index bd07145563bc..2b0c4ea3a1b0 100644
--- a/dev-python/pyclipper/Manifest
+++ b/dev-python/pyclipper/Manifest
@@ -1 +1,2 @@
 DIST pyclipper-1.2.0.tar.gz 53504 BLAKE2B 611a86b4173838dc0c77ad765f1ab9d08e73b147936ec60fae63308d5bb0019b40479222b80565f3d3ba5337c1a436fa63306105bb3a698592160eb8b66f3014 SHA512 2b8966a695fd7916786ab7549f8c867aad1d4879f3d20b87d7a4b6e1fff8a36871a440795548e91256ff89e574c04be4390ffbd05bab6b0bb51441c7f8acf674
+DIST pyclipper-1.2.1.tar.gz 51862 BLAKE2B be59011d44ba4364e3e0d1d789c10f76635a5bc690dad8030104fa7965cc118e3529bf6505e5c4e743a8ff21e0d24129be716cd91e09b7521baa64359de364ab SHA512 0fc411bd8fa33fc3e5a71ec149b720b5c2f2e9a5e704d5e175b5930e0e073bacfd26b68e19c00802ab68e7a8946bdfcacae858e2d6d81b87d85b3747fa4a316b
diff --git a/dev-python/pyclipper/pyclipper-1.2.1.ebuild b/dev-python/pyclipper/pyclipper-1.2.1.ebuild
new file mode 100644
index 000000000000..1a3fac3d184b
--- /dev/null
+++ b/dev-python/pyclipper/pyclipper-1.2.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_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="Cython wrapper for the C++ translation of the Angus Johnson's Clipper library"
+HOMEPAGE="https://github.com/fonttools/pyclipper"
+SRC_URI="https://github.com/fonttools/pyclipper/archive/${PV/_p/.post}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P/_p/.post}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/unittest2[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+	export SETUPTOOLS_SCM_PRETEND_VERSION="${PV/_p/.post}"
+}
diff --git a/dev-python/pycryptodome/Manifest b/dev-python/pycryptodome/Manifest
index 03927272fd7d..5c3a1ea1a6e4 100644
--- a/dev-python/pycryptodome/Manifest
+++ b/dev-python/pycryptodome/Manifest
@@ -1,2 +1 @@
-DIST pycryptodome-3.9.8.tar.gz 15633268 BLAKE2B 8c4f8d4839be0fb09556677514ee6c7f832684f20eb4e355cee87eb5b52a5c09e12712c1865ff89fb5dd6c628ca027374c7cab8a2287aafa4eecedf1095f1a12 SHA512 894e763720df284804fd686d5805980853b86773bb3097bf03d929818b9944e5a257e47414275f302966864751e50ae34dea19ad749910f1ceac31833a53ef7c
 DIST pycryptodome-3.9.9.tar.gz 15551299 BLAKE2B ac89bcc2bbe707cb2a9cf2496a2eb74ff5685f11017d60d67558de7ac6cad5c24c43b4074bff01e99378d7c88462e88e88f363c5329fb800e1a7872ad8a34dab SHA512 a1aad4d52256220fe3d5d7f399c2c5e7338d6eb88058da0571fe1c686d74d33ff4bc1c275d4b9373e0ff22f4ddcded75a25387e76fc65047f8612f8856c1bd4d
diff --git a/dev-python/pycryptodome/pycryptodome-3.9.8-r1.ebuild b/dev-python/pycryptodome/pycryptodome-3.9.8-r1.ebuild
deleted file mode 100644
index d716b7115fb8..000000000000
--- a/dev-python/pycryptodome/pycryptodome-3.9.8-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="A self-contained cryptographic library for Python"
-HOMEPAGE="https://www.pycryptodome.org https://github.com/Legrandin/pycryptodome https://pypi.org/project/pycryptodome/"
-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"
-IUSE=""
-
-RDEPEND="dev-libs/gmp:0
-	virtual/python-cffi[${PYTHON_USEDEP}]
-	!dev-python/pycrypto"
-BDEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/pycryptodome-3.9.4-parallel-make.patch"
-)
-
-distutils_enable_tests setup.py
-
-python_prepare_all() {
-	# parallel make fixes
-	#  Multiple targets were compiling the same file, setuptools doesn't
-	#  understand this and you get race conditions where a file gets
-	#  overwritten while it's linking. This makes the files look like separate
-	#  files so this race won't happen
-	ln src/blowfish.c src/blowfish_eks.c || die
-	ln src/mont.c src/mont_math.c || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pycryptodome/pycryptodome-3.9.9.ebuild b/dev-python/pycryptodome/pycryptodome-3.9.9.ebuild
index fc94247ea151..b397d23c0736 100644
--- a/dev-python/pycryptodome/pycryptodome-3.9.9.ebuild
+++ b/dev-python/pycryptodome/pycryptodome-3.9.9.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/pycryptodomex/pycryptodomex-3.9.8.ebuild b/dev-python/pycryptodomex/pycryptodomex-3.9.8.ebuild
index cd0d57747846..9722cfde8757 100644
--- a/dev-python/pycryptodomex/pycryptodomex-3.9.8.ebuild
+++ b/dev-python/pycryptodomex/pycryptodomex-3.9.8.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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="dev-libs/gmp:0
diff --git a/dev-python/pycryptodomex/pycryptodomex-3.9.9.ebuild b/dev-python/pycryptodomex/pycryptodomex-3.9.9.ebuild
index 9561aed7f5ee..2baad24dba7f 100644
--- a/dev-python/pycryptodomex/pycryptodomex-3.9.9.ebuild
+++ b/dev-python/pycryptodomex/pycryptodomex-3.9.9.ebuild
@@ -20,7 +20,7 @@ S=${WORKDIR}/${MY_P}
 
 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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/pyilmbase/Manifest b/dev-python/pyilmbase/Manifest
index fd35c16a42c2..6880958cedc0 100644
--- a/dev-python/pyilmbase/Manifest
+++ b/dev-python/pyilmbase/Manifest
@@ -1 +1,2 @@
 DIST pyilmbase-2.5.2.tar.gz 27525326 BLAKE2B c48a61513457f2c04f3a512963ae27eaf154933ffe7c6ff3e2d71f27f246ae624a34dbe6f8ab500c51a56898ad0f61e6784f5cd3f9c3df591ce347b46ba4ac88 SHA512 62f98695cf56600303db9c2d13d34cacc1851a103d8ffb7e7ce8c6d9d14e6bf02804836c718ae03e8d685ef3dda0cf7b2130e2d363f8095b22a15bf30d706fab
+DIST pyilmbase-2.5.3.tar.gz 27534825 BLAKE2B 4647b4aac074b10c0d1fb35ddb6b5acefca81c0f2debde04987b5df4e290b14b6406fc922949449aaeea7cf4be371a25c93f8fcb9f67c63d65276340bd586a21 SHA512 6da03193d4fea1e97e35008f59304ab408c521ead8495ba411cde5c172cf953be97999971f57398b813d14f1af1d722539a6b74d5ee54b9e74769ea8258d36ba
diff --git a/dev-python/pyilmbase/pyilmbase-2.5.3.ebuild b/dev-python/pyilmbase/pyilmbase-2.5.3.ebuild
new file mode 100644
index 000000000000..d993989e6322
--- /dev/null
+++ b/dev-python/pyilmbase/pyilmbase-2.5.3.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit cmake python-single-r1
+
+DESCRIPTION="IlmBase Python bindings"
+HOMEPAGE="https://www.openexr.com"
+SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/25"
+KEYWORDS="~amd64 ~x86"
+IUSE="exceptions +numpy test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	~media-libs/ilmbase-${PV}:=
+	sys-libs/zlib
+	$(python_gen_cond_dep '
+		>=dev-libs/boost-1.62.0-r1:=[python,${PYTHON_MULTI_USEDEP}]
+		numpy? ( >=dev-python/numpy-1.10.4[${PYTHON_MULTI_USEDEP}] )
+	')
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-admin/chrpath
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/openexr-${PV}/PyIlmBase"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.5.2-0001-Fix-pkgconfig-file-for-PyIlmBase-to-include-prefixes.patch
+)
+
+DOCS=( README.md )
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_Python2=ON
+		-DPYILMBASE_INSTALL_PKG_CONFIG=ON
+		-DPYIMATH_ENABLE_EXCEPTIONS=$(usex exceptions)
+		-DPython3_EXECUTABLE="${PYTHON}"
+		-DPython3_INCLUDE_DIR=$(python_get_includedir)
+		-DPython3_LIBRARY=$(python_get_library_path)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	if use numpy; then
+		python_domodule "${BUILD_DIR}/${EPYTHON/./_}/imathnumpy.so"
+		chmod +x "${D}/$(python_get_sitedir)/imathnumpy.so" || die
+		chrpath -d "${D}/$(python_get_sitedir)/imathnumpy.so" || die
+	fi
+}
diff --git a/dev-python/pytest-asyncio/pytest-asyncio-0.14.0.ebuild b/dev-python/pytest-asyncio/pytest-asyncio-0.14.0.ebuild
index bf496fd7e4a3..bc47f6d01781 100644
--- a/dev-python/pytest-asyncio/pytest-asyncio-0.14.0.ebuild
+++ b/dev-python/pytest-asyncio/pytest-asyncio-0.14.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/pytest-dev/pytest-asyncio/archive/v${PV}.tar.gz -> $
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 ~sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/pytest-5.4.0"
diff --git a/dev-python/qtconsole/Manifest b/dev-python/qtconsole/Manifest
index fac35920fd45..2cf66dd3157b 100644
--- a/dev-python/qtconsole/Manifest
+++ b/dev-python/qtconsole/Manifest
@@ -1,4 +1,2 @@
 DIST qtconsole-4.7.6.tar.gz 424919 BLAKE2B d973b3b94dfad1b38603695e22927bcdcb8a4f2db9f4a638d5fe6a83c24061153dbaa36c26e632708953af32a015af1d40ecbf175dd5314a3b954b15a6625cc0 SHA512 e4e12eb90533e922786b5b6517fba5d9c4dfedf00547f1403c8cd65fb464f5c1a13517df69924e4428e9a8a811dfc359a7768fbaa90adbe02d79cba9a5aa852e
-DIST qtconsole-4.7.7.tar.gz 425068 BLAKE2B 61fa3bede2d531e294e8a272287885ffeff095bca8b998b2a28fd3f4d912b20aa30807fe7d4caf15f8594e7820e037b3c9955ad76e9dd5eb1da2cbe00ca9a941 SHA512 1f04d54138f37b32c112db2cbbc8f79dc16b13bf5dffcc3dd872d43d48ef9ed5454d660e4fab08ccd71344153de391d91558edd0f71a2b626da47779f0f0bb53
-DIST qtconsole-5.0.0.tar.gz 424609 BLAKE2B 0aacc5e274a8a77da6e6891d823fe2a7710a7022f4633ef7a2edd843da5ea314884713356e92016a0dbb58b38ec90bda72fa63f11699c719e1bfa1e64ca61978 SHA512 4fa6a45c7171af57f893eff8bf2cbf5466c7235c2134c8be071e47253f3ad84b951e4c52a1e996fb1fb0233a57400972c524569baf31874f6f84896a6c443823
 DIST qtconsole-5.0.1.tar.gz 424682 BLAKE2B 46f2cdea799786d7b2e9385a5b73ac397925eef9c2403f4d9ebd4ce89241cc1ca6ec494450759db4e017c16abc525505dacaa7452018379da5343c2b1cf24f86 SHA512 4fa7629c68ab7554c20bd8ef885bf4073d64d4c211a0d9035faaa7e4122bd5d182fb97773c8a41f215f9e299309ace591081a0673370b55c796b241211bb4ccc
diff --git a/dev-python/qtconsole/qtconsole-4.7.7.ebuild b/dev-python/qtconsole/qtconsole-4.7.7.ebuild
deleted file mode 100644
index 92020ed2c7b6..000000000000
--- a/dev-python/qtconsole/qtconsole-4.7.7.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-PYTHON_REQ_USE="threads(+)"
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Qt-based console for Jupyter with support for rich media output"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-
-RDEPEND="
-	dev-python/ipykernel[${PYTHON_USEDEP}]
-	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	dev-python/jupyter_core[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-4.1.1[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]
-	dev-python/QtPy[${PYTHON_USEDEP},gui,printsupport,svg]
-"
-BDEPEND="
-	test? (
-		dev-python/QtPy[${PYTHON_USEDEP},svg,testlib]
-	)
-"
-# required by removed tests:
-#		dev-python/pytest-qt[${PYTHON_USEDEP}]
-PDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
-
-distutils_enable_sphinx docs/source
-distutils_enable_tests pytest
-
-src_prepare() {
-	# TODO: these tests require virtx; however, running under virtx
-	# causes pytest to segv on exit (even though tests pass)
-	rm qtconsole/tests/test_00_console_widget.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/qtconsole/qtconsole-5.0.0.ebuild b/dev-python/qtconsole/qtconsole-5.0.0.ebuild
deleted file mode 100644
index 645bccc338f9..000000000000
--- a/dev-python/qtconsole/qtconsole-5.0.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Qt-based console for Jupyter with support for rich media output"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/ipykernel[${PYTHON_USEDEP}]
-	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	dev-python/jupyter_core[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-4.1.1[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]
-	dev-python/QtPy[${PYTHON_USEDEP},gui,printsupport,svg]
-"
-BDEPEND="
-	test? (
-		dev-python/QtPy[${PYTHON_USEDEP},svg,testlib]
-	)
-"
-# required by the tests that are removed:
-#		dev-python/flaky[${PYTHON_USEDEP}]
-#		dev-python/pytest-qt[${PYTHON_USEDEP}]
-
-PDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
-
-distutils_enable_sphinx docs/source
-distutils_enable_tests pytest
-
-src_prepare() {
-	# TODO: these tests require virtx; however, running under virtx
-	# causes pytest to segv on exit (even though tests pass)
-	rm qtconsole/tests/test_00_console_widget.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/qtconsole/qtconsole-5.0.1.ebuild b/dev-python/qtconsole/qtconsole-5.0.1.ebuild
index 645bccc338f9..a824c5c09ce2 100644
--- a/dev-python/qtconsole/qtconsole-5.0.1.ebuild
+++ b/dev-python/qtconsole/qtconsole-5.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 RDEPEND="
 	dev-python/ipykernel[${PYTHON_USEDEP}]
diff --git a/dev-python/reportlab/Manifest b/dev-python/reportlab/Manifest
index af0b297829d8..2bbebb5f0b23 100644
--- a/dev-python/reportlab/Manifest
+++ b/dev-python/reportlab/Manifest
@@ -1,3 +1,4 @@
 DIST pfbfer-20070710.zip 677333 BLAKE2B 100214476a361a5e5d1f3da0999591345f6e3a3f8c6bc3f6a3e9eca734190c6259758a43302c6e41254d33491fe535eb7d5dd07aa9727c912424bebc31fc18df SHA512 6fd4a5d955464b10d13a7b748703450c1fe120d5ed09e8cfa1b4dfa9c183c59fe001df29433af551796b0df62544b7ddc364f9bb1bdcc2cd300434340ffcc4f2
 DIST reportlab-3.5.48.tar.gz 2890211 BLAKE2B bf0cde9b9e80459caee37949dc90a777a56da5d2c8e6dde09bddbdac2f2c55031d92b3c7c6346b6f563904525020c0e4f666b5e2effdd761c81412df21ec60eb SHA512 ce31cb7e9e2226cb6d59d446f90c1df94f0f84077d298f7ba862f5c75995afa20fa077b1ee1ab9a145c9276cee0d75fe61237e001ad0e5b96dfb0027adff3db7
 DIST reportlab-3.5.56.tar.gz 2899527 BLAKE2B 83f14c472a8675449e2f50f806fc5136fceb2c2f307ebd2d34ecad98ce6a67f62971869e05b7d4fe7017b5e728d21d16037ef6f04c3639b0cec8069851e46b64 SHA512 49bafe1b1f0067df1d76a8e61b35ec7062dfffa608f6086241dfa589244bef5784180de7c3d86dc62334282a40a012f7579f5c3cec3c4b0387ba2c482a04c010
+DIST reportlab-3.5.57.tar.gz 2901465 BLAKE2B ecb0459414d359b8feb048ad34cfd782a6913f2e254f6d8832dd076fe63fda82d24c4dda28da9c0cc6765c284d51a45d44459d225899574625212c33800116dc SHA512 d325e389ddd7d3c4d98e462956a3c4b7237c9219728577a1e0599a137d19a27205b223fd13c5c260e2968c435bc06b2e4745945ac056926543a47e52868e21db
diff --git a/dev-python/reportlab/reportlab-3.5.57.ebuild b/dev-python/reportlab/reportlab-3.5.57.ebuild
new file mode 100644
index 000000000000..a51750dbbaf6
--- /dev/null
+++ b/dev-python/reportlab/reportlab-3.5.57.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Tools for generating printable PDF documents from any data source"
+HOMEPAGE="
+	https://www.reportlab.com/
+	https://pypi.org/project/reportlab/"
+SRC_URI="
+	mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz
+	https://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	media-libs/freetype
+	media-libs/libart_lgpl
+	sys-libs/zlib:="
+RDEPEND="
+	${DEPEND}
+	dev-python/pillow[tiff,truetype,jpeg(+),${PYTHON_USEDEP}]"
+BDEPEND="
+	app-arch/unzip
+	test? ( ${RDEPEND} )"
+
+distutils_enable_sphinx docs/source
+
+PATCHES=(
+	# bug 738312, remove -L/usr/lib from link line
+	"${FILESDIR}"/${PN}-3.5.48-usr-lib-LLD.patch
+)
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd ${P}/src/reportlab/fonts || die
+	unpack pfbfer-20070710.zip
+}
+
+python_prepare_all() {
+	# tests requiring Internet access
+	sed -i -e 's:test0:_&:' \
+		tests/test_platypus_general.py \
+		tests/test_platypus_images.py || die
+	sed -i -e 's:test9:_&:' tests/test_lib_utils.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	pushd tests >/dev/null || die
+	"${EPYTHON}" runAll.py || die "Testing failed with ${EPYTHON}"
+	popd >/dev/null || die
+}
diff --git a/dev-python/secretstorage/secretstorage-3.3.0.ebuild b/dev-python/secretstorage/secretstorage-3.3.0.ebuild
index 54a547ffa948..d65f0625b8c1 100644
--- a/dev-python/secretstorage/secretstorage-3.3.0.ebuild
+++ b/dev-python/secretstorage/secretstorage-3.3.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/cryptography[${PYTHON_USEDEP}]
diff --git a/dev-python/setproctitle/setproctitle-1.2.ebuild b/dev-python/setproctitle/setproctitle-1.2.ebuild
index 6bb7c297fa27..dc63ae8a8b54 100644
--- a/dev-python/setproctitle/setproctitle-1.2.ebuild
+++ b/dev-python/setproctitle/setproctitle-1.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/xlrd/xlrd-1.2.0.ebuild b/dev-python/xlrd/xlrd-1.2.0.ebuild
index 62d97efc8edc..9d4e3f8dd5d1 100644
--- a/dev-python/xlrd/xlrd-1.2.0.ebuild
+++ b/dev-python/xlrd/xlrd-1.2.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 
 distutils_enable_tests unittest