gentoo resync : 02.08.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-08-02 19:14:55 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-08-02 19:14:55 +0100
commit: b24bd25253fe093f722ab576d29fdc41d04cb1ee (patch)
tree: 0fcf2afd9f852c4d4c291cf8afaa2c244d598105 /dev-python
parent: 121ed4eec41fbf03e1998d09eede1bf449da63b9 (diff)
235 files changed, 1393 insertions, 743 deletions
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index c6a82c56e5f8..b38d3a636586 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/PyECLib/Manifest b/dev-python/PyECLib/Manifest
index 58e7c0ef163d..80e7a51be770 100644
--- a/dev-python/PyECLib/Manifest
+++ b/dev-python/PyECLib/Manifest
@@ -1,5 +1,5 @@
 DIST pyeclib-1.5.0.tar.gz 6682493 BLAKE2B 3f3a595b67a8e216b90c61f8119be6f40de0863a0d77c4e65c41e699aad0d9a5f1d621e8bb9510d78b9eb495acc5fc5af7178afe127780151b9be60ca246fbff SHA512 89831fc8b04a1488504b632f75da8f2f29bc6b4e33b35d0d4305b4d5ec4bc25c0e16d149580badb15be7dbf8aeb2bdebef81f78f7b7871233afaaf96823e3a3e
 DIST pyeclib-1.6.0.tar.gz 6685306 BLAKE2B 0b758bd500afc7f9d8e38513cc41f1916413d8ad6f3b1bd34d9ff46d6d33321391eaf90164e412154a14d63d4ba61502457bb943e124dd7054a5d5ec20732294 SHA512 507f78388e941e4600f4b77f636ce27b7f63e635f108dd5a452b3f98f779e87d94d8f82239d9d5733846faa5cc574c0474e366d99e44b8f03b70707d352f56c8
 EBUILD PyECLib-1.5.0.ebuild 601 BLAKE2B 83d86a6789e013b4982c93262d673dd7f26ad453a9604d0af4b484c53eae08887e136e1771cc30189019f2654d3ae1b0b8096e77bd0359055d58f6a0a64cd520 SHA512 29f85f4f575703839132e64a84f23b57647d8aff5644b7edb70291e0a79c6945b27e9f0daad5436101bf6a2294639804e139843d5ecc147331f12a56d00aa002
-EBUILD PyECLib-1.6.0.ebuild 598 BLAKE2B c1b72aca6101273ba51783449fa7f9407595192dddcd7d3440cd96488ff9628995dd4d558113ed6239916340c5b97defdf00ce782706899334f9a43f2fe3fa35 SHA512 213538bc83e5de9b7c168e1cd1738e0faf347746778937def7a37de8a643d45d8694155afd7aa9c90938d3c23147d161d1e62732312e2e49466dba0d121df7a6
+EBUILD PyECLib-1.6.0.ebuild 618 BLAKE2B a135ca09a3d15ce0d36f256f6ab3a67e7f2214c41ddbb78c5ddfb793b65f7b31d16f4902492a18bcf9eac20b687930462af2d2ef903934732d7c0785c85bf9d3 SHA512 0c7fc5cac48cd855d2f60ef0a543ecf1ae1a98e8ad41b89a2a22192847e4edea7d8b3742ee2fa8aa7b42c5c0566d674bfcd7fbb6a86b00d064cac3827764f419
 MISC metadata.xml 674 BLAKE2B 82076810eced6e375c341ec804b814d8d9bbad8e02c22a233f1c7891d75e6af7afcb23e835dd49c366e50c56f715b1e8d45675504bb6080347cf826ee66eeb44 SHA512 864d9c85e024752e0060644f9feca3b0d81c6f64610ca60be06c3218e1efc82be66b24bb61b966de238ab6e9278618013f613693fa1fca082287d4f53b4f98e5
diff --git a/dev-python/PyECLib/PyECLib-1.6.0.ebuild b/dev-python/PyECLib/PyECLib-1.6.0.ebuild
index ff9c7e770524..60a5e0b57290 100644
--- a/dev-python/PyECLib/PyECLib-1.6.0.ebuild
+++ b/dev-python/PyECLib/PyECLib-1.6.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
 
 inherit distutils-r1 eutils multilib
 
diff --git a/dev-python/PyGithub/Manifest b/dev-python/PyGithub/Manifest
index f5201a51fc7a..df2e40cd87d5 100644
--- a/dev-python/PyGithub/Manifest
+++ b/dev-python/PyGithub/Manifest
@@ -1,7 +1,7 @@
 DIST PyGithub-1.39.tar.gz 2662602 BLAKE2B 5e3e4ca2483e7ade968f170e7615258b4bcca0f1c6741146c38b3c7405fb1fb66351fa5686863892a6751bc4cb6ea39b6cf4ec0d8e6cc878b302c87512c9d159 SHA512 5fa6e5a1b8e7cbe2be13e7f866ce8586f6ba37bfc8f3bfb5a52497a9edc267c14512e4572f56e898c61b8c84dfc8aa8f325c5eb2563e68450b8a3b2acf8308d4
-DIST PyGithub-1.40a4.tar.gz 2668409 BLAKE2B 5638f228620fc5c6741f79e3272ba374a71b1a0a9fe3d6f0edd45a7b0468fd4ed1a6fe967d37e6169a4cfc90a3f084c948f0d72592cd225569275a3d8ae3546a SHA512 6d832e2a101a80e2b0aec45a99ec2f28d9d64d130bf23f291a643bc8450a86c4ed9296a005de000c975e28d91d52e648937abb09399554b9d17988fd58f280e7
 DIST PyGithub-1.43.7.gh.tar.gz 2832588 BLAKE2B df1bf783d8644493151b7192325cd2feded48dd95853e0f2ccef9e0560c39877de3e38e95a339291e585612c795d2180900dc5db5fecb0f844a97a6d0a5bf04c SHA512 15d7c7ca6a505a259fe59c96db667a278179df7acfe794116f118bb18966c573cbdcd9276fe50b321fd759988810250a0268c2e8e330c1ef5a8bdcc3a50b6391
+DIST PyGithub-1.43.8.gh.tar.gz 2842219 BLAKE2B 7711885beb4cb855ea5a5755abe881f7ae7825feb76cb0ab30aa9ba4a2530440d2816439c43da23a42f134286fa0806875d075920776960f04cdd21131bcf700 SHA512 dc58166ebb27f855ed4f32448029abe7e53b8050d8d99029d460f2dd94180ca8bcef68a75469293abd021f70cc3c67c32061e6439db1b3f1dc77af464c658bb6
 EBUILD PyGithub-1.39.ebuild 593 BLAKE2B 71cd2cf560adbe76214148f890b031e020148b5a60e5b27fc9d3708ad4a5d6351b08e4a8eb4f470456c9092040bfd46f4e46cb9db5b68dc9b4c6af0ff7d1d5ad SHA512 830e8648301bb259e4238c257b1f25a5acf6c171191556bf97573afd3bbdf65b201e4b3a28f389e643a575f66588e31db94ff96dbf76c9734113c38d98719198
-EBUILD PyGithub-1.40_alpha4.ebuild 877 BLAKE2B 317d8169d9557f7ae0e30a9e198f30960343eeec84d7fe0464eafa0bb261d122e53cfa24e0fbb1bb88eb04ac7399d79d7845176b32ef78e8d9bc250bff383d91 SHA512 972f03399698310e0ad6607f1ec614ca3cf77817bd5b79eff6f1c515cbe11399604a85fea6f489bd5f8e7b99058d5616ac2ca2b51639487fc32db1f13efca13d
-EBUILD PyGithub-1.43.7.ebuild 1203 BLAKE2B 62a884f49d8c891180d28b53a08d8c1d119aa73e88040e10318623977f0d82c04b953ac2f5b96dd8c8f48278a834d1fc6f4957ddd831cb08d19de6075c350453 SHA512 c9ca4633a83e0246bbc5d43fd4db216f8c2c4321bbe490a8120f52bf4ad95daf343d5abf7eae8fdd9b7dadc7e7b76db3242474126e341c116a1bd83bdf0106bc
+EBUILD PyGithub-1.43.7.ebuild 1201 BLAKE2B e142dace911dac44389a8407628c295465de3c86926be5f0d49df62c4e602a8346a5714afa6b52028d9d024ea57b3d5fcc1c1b3198a33a34558cbc2060b17399 SHA512 c061c186fee870038de0654d7e671c96d6be95d0cd7662b477d434a6ff73f74c47f002f88d3621f149487de59985e449d79bada852e3676c07a77764d9e27ce0
+EBUILD PyGithub-1.43.8.ebuild 1203 BLAKE2B 62a884f49d8c891180d28b53a08d8c1d119aa73e88040e10318623977f0d82c04b953ac2f5b96dd8c8f48278a834d1fc6f4957ddd831cb08d19de6075c350453 SHA512 c9ca4633a83e0246bbc5d43fd4db216f8c2c4321bbe490a8120f52bf4ad95daf343d5abf7eae8fdd9b7dadc7e7b76db3242474126e341c116a1bd83bdf0106bc
 MISC metadata.xml 446 BLAKE2B e5a5f28e076db18ae39b757db4c480cc7d77314361c050df12276a8770c117140670067c4d1785d7a21fadd1d3435f7245a85f2bb251c57539315bcd97faadb8 SHA512 e29338330c42ccefee0ebeef682c8877a37c01c10ab9976988f846fb8c6d0a02114d0447a682499ff306810d2c12535a3cb031c9728eea016907382cca8ee1b1
diff --git a/dev-python/PyGithub/PyGithub-1.40_alpha4.ebuild b/dev-python/PyGithub/PyGithub-1.40_alpha4.ebuild
deleted file mode 100644
index a57dfea94dae..000000000000
--- a/dev-python/PyGithub/PyGithub-1.40_alpha4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-
-inherit distutils-r1
-
-MY_PV=${PV/_alpha/a}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Python library to access the Github API v3"
-HOMEPAGE="https://github.com/PyGithub/PyGithub/"
-# Use github since pypi is missing test data
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/pyjwt[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.0[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/${MY_P}
-
-python_prepare_all() {
-	# tests requiring network access
-	sed -i -e 's:testDecodeJson:_&:' github/tests/Issue142.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/PyGithub/PyGithub-1.43.7.ebuild b/dev-python/PyGithub/PyGithub-1.43.7.ebuild
index 5585ba44ef02..4c63d604bf8d 100644
--- a/dev-python/PyGithub/PyGithub-1.43.7.ebuild
+++ b/dev-python/PyGithub/PyGithub-1.43.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/PyGithub/PyGithub-1.43.8.ebuild b/dev-python/PyGithub/PyGithub-1.43.8.ebuild
new file mode 100644
index 000000000000..5585ba44ef02
--- /dev/null
+++ b/dev-python/PyGithub/PyGithub-1.43.8.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library to access the Github API v3"
+HOMEPAGE="https://github.com/PyGithub/PyGithub/"
+# Use github since pypi is missing test data
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/deprecated[${PYTHON_USEDEP}]
+	dev-python/pyjwt[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		dev-python/httpretty[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	# tests requiring network access
+	sed -i -e 's:testDecodeJson:_&:' tests/Issue142.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# silly!
+	cp -r tests "${BUILD_DIR}" || die
+	if python_is_python3; then
+		2to3 --no-diffs -n -w "${BUILD_DIR}"/tests || die
+	fi
+
+	cd "${BUILD_DIR}" || die
+	"${EPYTHON}" -m unittest -v tests.AllTests || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/PyQt5-sip/Manifest b/dev-python/PyQt5-sip/Manifest
index 81b534bbbc6c..b38d82827df9 100644
--- a/dev-python/PyQt5-sip/Manifest
+++ b/dev-python/PyQt5-sip/Manifest
@@ -1,5 +1,5 @@
 DIST sip-4.19.17.tar.gz 1056156 BLAKE2B b5a7b4cd3f2152e9b7ee7b715c3ad72c2092598e0405cefc24d6283e9da07e54fd65da89e137618d3b84f3138fff719cf226600135d646e7bd7c538c2a02cdfd SHA512 d393cfc1643663926bd315a8df92abd82bec071bf0488b047625bdac43e9074bc8a510ac23244a7a2d2d181f70af9691db9d0b759e79643981d6afd71a49d3cb
 DIST sip-4.19.18.tar.gz 1056840 BLAKE2B 6c674405e28a64c9db635deca8a00ed78bf52d2551ed578a57d31ae96071ca77ba49e3fc92329942ca61de78bc98049694cc48ef54ea645819fc48f2fae56060 SHA512 e3c58cc6c38b277b3b9fd7adf33df91b47e0385e59d52c543e630a194d73d04d91e0a3845cb3973d1955f77049e75246fa7e6f544e02e1efe0086a297cf1d887
-EBUILD PyQt5-sip-4.19.17.ebuild 2149 BLAKE2B bf6be182e322c0290ebb3d8fe77627cc82f0a59226a8bc1f9ad884f6c46efd783394e076b05c1d54a30908eeee6556be6db519cd27c6244244ad0b6a2dd7eaf0 SHA512 87db2a20b94dc65f8641eb070a9094a61d1c9d6418e40a00fa4fc8b2d096151412a7750603fc149d7b7b1d0e3832f1ed5f9fd70e9948c029c3ba6e16814d8e2e
+EBUILD PyQt5-sip-4.19.17.ebuild 2147 BLAKE2B 57a1dc01a4de554d741ccbabacf704ee37434ca27b7f7ba19b7db0719745e9a02f2e514f4e38e11e016e917637caabd08cc4136762fefd5900930dbc3d8e4610 SHA512 b2c71ee834e6d8465d697f24fca460213a0fca50b0841309d9b1729417cfd9e6f80de4e1e2298fbbc0813b1d6a94c835afd6bce94e288bb8a108202c365b6718
 EBUILD PyQt5-sip-4.19.18.ebuild 2151 BLAKE2B 91cbd13d522b46ab030d5f25f41c9aa3783e579dcc7d96d525576ef8d63735a4e7619871c69e87956cadc0c7c9342a319b18f066f30745da839eace27e41486c SHA512 0ba17e1c999fb3b8257dffe62acb0b15b56ae8b4c0b1ad8baa9004cde3a335866d242786f1876d854f3a4fa186f9590d4cd63108ab37bc63ca88632eed0641e9
 MISC metadata.xml 654 BLAKE2B f52693b58abff10e80d2fe004ccca0b97aa157e07c27005c72fe79bc9ba3894c33042c9be2d10f8fc15aa8f0451041b60255eaad96ec78dedc422e7ca2f58564 SHA512 4ad600dc1af2a9f6494350a028909e51deea7b18bf6a50a6f1860163310bc0534cd530ac5d6dea043e7b7e532fd2219069e12b33271cedc00c7a9dda9161711f
diff --git a/dev-python/PyQt5-sip/PyQt5-sip-4.19.17.ebuild b/dev-python/PyQt5-sip/PyQt5-sip-4.19.17.ebuild
index 72fcbe2e1091..e48ab8a708cc 100644
--- a/dev-python/PyQt5-sip/PyQt5-sip-4.19.17.ebuild
+++ b/dev-python/PyQt5-sip/PyQt5-sip-4.19.17.ebuild
@@ -20,7 +20,7 @@ fi
 # Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h
 SLOT="0/12"
 LICENSE="|| ( GPL-2 GPL-3 SIP )"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
 IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/PyQt5/Manifest b/dev-python/PyQt5/Manifest
index 2c1e836bab7a..bf4d3f62ab1d 100644
--- a/dev-python/PyQt5/Manifest
+++ b/dev-python/PyQt5/Manifest
@@ -4,6 +4,6 @@ DIST PyQt5_gpl-5.10.1.tar.gz 3110469 BLAKE2B 75e24bd8c0739d47eff6212435aa783eaa3
 DIST PyQt5_gpl-5.12.2.tar.gz 3147205 BLAKE2B ad0b09548521ceff869bb44cfceb0c2cf31338f46c76da23582f7949fdcc0e8feee3cc0dc0610e8152dfbc701c3ac765eea7898f5061775a92e2601c5b7ea8ca SHA512 dc23bb7dacb305d4f9a630f2b5c3809d5d6734ba234c9941a3c44c770af8534dd737160dbe007a1f15d5c90e2e52419dd749b3ef942b4e71917c1cea2220a666
 DIST PyQt5_gpl-5.13.0.tar.gz 3152704 BLAKE2B caa9b11f70b656a23d28f4b7b490df544e82f669e38e51e87316917f015f9cf137a0902333323cfc5c6a13bf446067d5714fb33c091efdce03a0f7cfa8771a15 SHA512 72cdd700956f8a5791fd38cac6a348f189eec9e69f3fd79a0c711ff49c770d4982fe62ec9057830d26abc4c12133922df915be0844449212f0bdf338fe1e4cb0
 EBUILD PyQt5-5.10.1-r1.ebuild 5812 BLAKE2B ceb731b308578c3d8dc511f3bb56b49656bca92bb8e4a89cd140d8044d7445bbb3f4e3a018b63cc29624d273bce1dd8976f7f848b8485d08db00022a293b9be8 SHA512 6f2169fb459bbe378db594edb9ae0e56a96b1bd0014c5855ef038229a8bfa4dd328fd7e7f0659469805b81d7c4589f3d306e1fb7a4cac21c4c2658e599d53f84
-EBUILD PyQt5-5.12.2.ebuild 5906 BLAKE2B fb7773047d75058f2c7b8cf523b1a5938cca21b7d18098bdedee450fbaa8971ce0d19d7482bcd84f601ba7dffd7e3d2e73e6df802a82962a03e468d112ce9586 SHA512 f82048493a417e234d028e990312f6a8a28f14b259d97d1b92f9a8285859f9502803ef0e609c6c968b1088ba743f956651a8ca588181d3b723d6f80083f01a8d
+EBUILD PyQt5-5.12.2.ebuild 5904 BLAKE2B 32191a4182088ea16548c68bd45a5081fea20bfd67789380e2150c9ed9c6f919fc6a3cd0620d4b181d393edf5cdfcba8110866f5c51f92e13504d64c4bd9478a SHA512 1ed8f4be78ea9ef0f140d32c5b4fafcb04440237a080a06d88bcac2d8f85a7715c554df4b23de57ba9f332ad7d4c0149dc5e6d831ed1fbf21bf76e8f46cc7ef3
 EBUILD PyQt5-5.13.0.ebuild 5908 BLAKE2B bfc735c4c3606d2247a5486c8eded9121bacd4af52f8d73f87f054ab17054c30e8be576a935e3c618362e71225d6311c7e37b743717c7c08d32819742f266719 SHA512 9fcf1fcbbd30288f06b268a9819263482868a3f4bb100754d7db9fbf76f9d65bc4506b9d5c3c5db098e80973586b2c9e67fbaddb097155fa796e9ad599f3f8ee
 MISC metadata.xml 2594 BLAKE2B 3c8c7159c42e050e4e4487ea8c24bd8d7213f9590656c3ae7152c0dcf151d4db99f07546636df0b7142107f506ae72e8d8c31a34aeafbdd325001030088a5493 SHA512 41e4d7e868a9b101d2bb41e8976b20d460544b1d103b3600b5b7cb5fbfc456538027d4b02283587aa747fd1789d7e675e5ce832df71f3dcd9b22eb095087328a
diff --git a/dev-python/PyQt5/PyQt5-5.12.2.ebuild b/dev-python/PyQt5/PyQt5-5.12.2.ebuild
index e58ee9b526ec..522cf5cdf410 100644
--- a/dev-python/PyQt5/PyQt5-5.12.2.ebuild
+++ b/dev-python/PyQt5/PyQt5-5.12.2.ebuild
@@ -19,7 +19,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
 
 # TODO: QtNfc, QtRemoteObjects (Qt >= 5.12)
 IUSE="bluetooth dbus debug declarative designer examples gles2 gui help location multimedia
diff --git a/dev-python/PyQtWebEngine/Manifest b/dev-python/PyQtWebEngine/Manifest
index b59da07fbeee..2eb477ccc85a 100644
--- a/dev-python/PyQtWebEngine/Manifest
+++ b/dev-python/PyQtWebEngine/Manifest
@@ -1,5 +1,5 @@
 DIST PyQtWebEngine_gpl-5.12.1.tar.gz 42474 BLAKE2B 6cb333d8e429ae6b9f8c20a7486754767639693351605e85c0226ab3f1f065a549d40d69669d91f501fdf2c30346304a547e36b416d275a8bfe4ea621c0633b7 SHA512 2bcb0e4da51de9cfb5128e03c03ada77f2d4b99b0885da910584717681b96759ce4301c325cbbf43602d46746e2d37d81ed62f77dd63b33359fd5fae74d7f010
 DIST PyQtWebEngine_gpl-5.13.1.dev1907131806.tar.gz 43891 BLAKE2B e1c8885ecf910338caf81554d2a0d06f4292ed35d567c98f932c2e9e75aa0b946c0fb6fae0b1b16ec3247061cd8d4d585492a6c5ca41dd016797e538e8ce3757 SHA512 a704a1e7ea1a97a29b741eeb6d06312e459857d88284fd788af9395cefde895a0f48310d90101e1cde6c4f445a76887d8a203f0a8050906637d97c487fb963ed
-EBUILD PyQtWebEngine-5.12.1.ebuild 1705 BLAKE2B b51701dfda0e9d66565a7af45b78ffa6533fd89ee5511682dd054518682f5d646998f78f3302e861572e3f5743ca023bf1c391cbe52bf1bf07e79ff6f84475f9 SHA512 8e544a85482823c00024f2f0675eb6f986e9cd3e5f34e1c2941e256ad4cad09d322011fab51b8674f2631aa49a2c0009e1ac3b4d974b75ce0a3fc5b1359a23f3
+EBUILD PyQtWebEngine-5.12.1.ebuild 1703 BLAKE2B d7e28f4b15836437f1ec47c64da008d5e5f3113f2969dd08750d4f324219290e957391ed6d152cd949bb88afeb87d946b22e92223fb92e8d27160c8d184983fe SHA512 0329d51e5df79ddc6ec2de02365e86f49b3f3267abe492079396646bfd93500649b4261adfc68f4e3c1b86ad58b41a70263f9bfebbf5eb385b52a743dd9847cb
 EBUILD PyQtWebEngine-5.13.1_pre1907131806.ebuild 1707 BLAKE2B 2eba1ecf7b3a889b29e7e38106f7b577f053e2afeb537ff3a2eb612746547c7252965d4f2e82f222010bb7b9152735bca46413300310a718f5d576824fc253f4 SHA512 33216824bd9ab45ce76a36d5b20b2e06b038bba5265b99b217a55883f070b99aaa69d7159bf5bdf307233d48d257242c6b14d5a2776a4067136f274b94ae2322
 MISC metadata.xml 1059 BLAKE2B faf1e1abebc25799040955794a28cdec2f24f1cbe358f15df5fbc400a55453b5281acd7ce0925d122661a3b290771d280d6a2cd7a2d536a5cbe0b0dde4aa9a5b SHA512 b5721a82b18f9c5b9bdac1937d68616c20b290fd609e2cb02dd837b6f435eafc436d68f3aff9593eb43efd30ee2e7201efafad8a38b41a198076305ab9de3862
diff --git a/dev-python/PyQtWebEngine/PyQtWebEngine-5.12.1.ebuild b/dev-python/PyQtWebEngine/PyQtWebEngine-5.12.1.ebuild
index db3904aa506e..98a5fe34affc 100644
--- a/dev-python/PyQtWebEngine/PyQtWebEngine-5.12.1.ebuild
+++ b/dev-python/PyQtWebEngine/PyQtWebEngine-5.12.1.ebuild
@@ -19,7 +19,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 arm arm64 x86"
 IUSE="debug"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/aiohttp-socks/Manifest b/dev-python/aiohttp-socks/Manifest
index eeabff486e2f..09846c5a23d2 100644
--- a/dev-python/aiohttp-socks/Manifest
+++ b/dev-python/aiohttp-socks/Manifest
@@ -1,3 +1,3 @@
 DIST aiohttp-socks-0.2.2.tar.gz 1351798 BLAKE2B 40c9e033de523cad365e95051d48dee5fbd3d964e7b3864393c54d23394a5cfcfcb46cb9d78f25a6101bc97034c77c5a75aef94cfb962054c29bd804e387b0a9 SHA512 218c262cb3eab74166686614ab5a720c31d1ce886cfd655f296c930f648b1d94e909724346769a46b600b8f1bc8ddbc498ee75cd5854e409566a8ead6a7efdab
-EBUILD aiohttp-socks-0.2.2.ebuild 493 BLAKE2B 326b5fff1fa5847e6f08bf0e249e777f78268bd1a0487383c81c9c7a9b0be6ec795b99a8883a44636a48b28d88bfb3674326021e9ac7fa5d37497aad858a4dc9 SHA512 bc723371a1a9e7e53b5b8e1400c76dcd9f7b21d618758e25ef98da3784a5968bd78af1dc8f78845357b1bffbae65d2753a086e3734b3ff7ecf62b1829770f09d
+EBUILD aiohttp-socks-0.2.2.ebuild 910 BLAKE2B 54c6dbbe842bea798ec60d15e6cf1621db8a389237b70234d0b1932207729f5f8864bb83ac9880295e144a5711191bd33658f321199ab6f7f5df063cb6afb78d SHA512 c8b121e6f22b6d0a8ef15c616483ab90afc6142e59cf74982b1942fc17331cfe502fa43cb786cd82161857ab392fe928f5c92b8533404c32ea71c3628a8dea10
 MISC metadata.xml 391 BLAKE2B b2c143f0bebedd76ce3992254b7c068b9707bcc75c552cf994239fbcd32ecb39c981a1a61bd351c29627fc4a65124fb54b5c8533fba5f8638d17b253893e50b5 SHA512 4519a8f883d724ea786cb00023c8e0efae8d343d40c0988154efd27a2bdce7b73e6884f3f406109fabef54b9e2d62e8c07cda7e7d876b148cff0090ba38c2104
diff --git a/dev-python/aiohttp-socks/aiohttp-socks-0.2.2.ebuild b/dev-python/aiohttp-socks/aiohttp-socks-0.2.2.ebuild
index 7e449920dc7f..9b27fc1c0416 100644
--- a/dev-python/aiohttp-socks/aiohttp-socks-0.2.2.ebuild
+++ b/dev-python/aiohttp-socks/aiohttp-socks-0.2.2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
@@ -13,11 +13,27 @@ SRC_URI="https://github.com/romis2012/aiohttp-socks/archive/${PV}.tar.gz -> ${P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
+KEYWORDS="amd64 x86"
+IUSE="test"
+# Tests require Internet access
+RESTRICT="test"
 
-RDEPEND="
-	>=dev-python/aiohttp-2.3.2[${PYTHON_USEDEP}]
-"
+RDEPEND=">=dev-python/aiohttp-2.3.2[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		net-proxy/3proxy
+	)"
 
-DOCS=( README.md )
+python_configure_all() {
+	rm tests/3proxy/bin/*/* || die
+	if use test; then
+		ln -s "$(type -P 3proxy)" tests/3proxy/bin/linux/ || die
+	fi
+}
+
+python_test() {
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/aiohttp/Manifest b/dev-python/aiohttp/Manifest
index 3477072114b4..7f4d314e6abd 100644
--- a/dev-python/aiohttp/Manifest
+++ b/dev-python/aiohttp/Manifest
@@ -14,5 +14,5 @@ EBUILD aiohttp-2.3.2.ebuild 1583 BLAKE2B 4f4268a8b8a32d4d8aa4f982cf386575f9aa008
 EBUILD aiohttp-3.0.6.ebuild 1833 BLAKE2B c0d3a1c13ebd7699ae2d506e78de5df605cfcebcc5c25d06aa5d696e534768dea9a0439cb6dce1aec76c042a07f852e87a228f6b1b8150a8b3f3347f8d914e9f SHA512 67b964d4905c55423ed6a1ed30db93b8439a69d0ec1b3d642f4c9b79da669dcdf4cb012c750c34a616e23767df5a1094218337fc5037a29ea35b87e775755bf6
 EBUILD aiohttp-3.3.0.ebuild 1833 BLAKE2B afc0463eaac8b5bcf7317616a3dab30adb223792c64c7516a528c235e53e72e8254cccfc9c2ee8693b83e56c26ce41dfe0107736d00dfce169d587e7541fbd3e SHA512 5647745d6f7225498f8ff20a13cc050d6e6a45091f5e84b411075ea686772971ab3d82cdfa175353b50d567a01ee9002694b45e5fdf52bcba113ec116d946daf
 EBUILD aiohttp-3.4.4.ebuild 2261 BLAKE2B d2a2ed87c1966d02a25a3d644e3d6b7ddb51fbea0cb8f9db507fd59b562ed297f6bd86f47029cc65b9b6d7b126627776f9892f4f02c279cec89bdab60b452a13 SHA512 57d9346f6372cd6249d7cfb6887db812217868f59170dffc342d45caedf9f04ae716573fc6b583ceb966cd144790237b7f5dfae82a157de65248f49e45394c19
-EBUILD aiohttp-3.5.4.ebuild 2184 BLAKE2B 24418040a58103cfb951e19b24aed1d89ddad4a9ad7867e84c99ef2f12bc8002fd132242e5cec3a16b8ceb45631650cbb0c731eba5c6b0a45b730fed43dc3713 SHA512 3c00cc5f0cf954e85a818ce6f604f1e1686757198648b83fba3a278405953e94784e06c70079aeb71e319dbe97d4b5b702cecb2344b0609da0eff924c224657e
+EBUILD aiohttp-3.5.4.ebuild 2194 BLAKE2B 5d8c82f63b0f6aff4f640da121266e99489073653107f912ac224ea78e5c419af40909994fc8d4fd3e825d0acb4c01eee572b6f7ce77088c7a53f2a988eee4a1 SHA512 35012568426f847ba852b26db64dcd3f6d535692bf897c75b822cc33b5b826a1c526f9f300bc3496b38beef7d940c785b3634704f8137d6a8ea1a2af9ff211d1
 MISC metadata.xml 489 BLAKE2B beb80da34848dfe7b81ed65d75923480644ecf42e2c5ce04a7f66f3e729651fdc6035054482aff966ec9f03cfbb812d3be0afd783af69e37f1002182e4885473 SHA512 d8c9e2edb8a57a3b6b02bb5314aef77dc266af6e80fd0300eb0652c59790232017d0062f5b7361b059c382d1c904f0f46cd0e672d1963e9595f3d4dc7514f182
diff --git a/dev-python/aiohttp/aiohttp-3.5.4.ebuild b/dev-python/aiohttp/aiohttp-3.5.4.ebuild
index 3b9fe39c93de..632b95d6b920 100644
--- a/dev-python/aiohttp/aiohttp-3.5.4.ebuild
+++ b/dev-python/aiohttp/aiohttp-3.5.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/aiorpcX/Manifest b/dev-python/aiorpcX/Manifest
index 529bf12ecd31..d1610b11b508 100644
--- a/dev-python/aiorpcX/Manifest
+++ b/dev-python/aiorpcX/Manifest
@@ -2,6 +2,6 @@ DIST aiorpcX-0.10.2.tar.gz 23312 BLAKE2B 62d04099ae272369f29dea3a34a13b4b5cd6052
 DIST aiorpcX-0.17.0.tar.gz 26346 BLAKE2B 0e60b66dec1ebcabca62e95688761b022a0f2a1062a3bb63c69def67687eb5bfb95d8c671b18ac4990248d7de17b049a7135398e80d23dc9154aaa4c7b17c2d1 SHA512 80731b683e16ad65da71981f81a606647cf3159429db2c37b27b6dc21c2f659fc92d0d0352109e377c2f381a373b9b20eeb0dda0bafe6be482dcf5c10d3bfcb6
 DIST aiorpcX-0.18.3.tar.gz 27464 BLAKE2B 38a59a6352a4c9bc561f75ecdfb0adc87fe82ad8e05622e67903d6e6e3c225647e75cb7a516005840d008f193288a5dea09042e2091a576be108b735fbbe1446 SHA512 982258fb35c1a4b09def64e2729ac5bab528185963ca0f73571d4a36be2aebadd69e607161462b9c5e07ff3b09fa071949432405a32832d438e07103fa1a8636
 EBUILD aiorpcX-0.10.2.ebuild 528 BLAKE2B 41a71518c80d25053a5d708e4ce79c0dce74bcb63b00d8c9dca73a1e454ebebfa2bec7c2e18bdc18dee4e053679f387a64f41f6f99e962ff49a95c7850f37b80 SHA512 5cb8e7d18f6a0c921c3c8dd973a63e58dc3db8e5fe2dd01fe9a7f3b89639f4b4e6095fd9fee2fa4dd1fb77e5835b399a79e005653cca4b2bec57da6dee8a5f38
-EBUILD aiorpcX-0.17.0.ebuild 534 BLAKE2B 8457596a749ef56f1f4493a4c7b5b1aecf4c3845a436c7402bea96edcbd552cafdf41f20b7b05791fdab044d4fa0b688d3967d2152a92538388051b61462de7d SHA512 1531ee211cad70bd2b89cf5f34f3dcea69242e082c8a375a963bad8812ff5501d2e941315a8febf8aaa2594ab4ea1b3c88f56072a1f83260e9980e9c5104f208
+EBUILD aiorpcX-0.17.0.ebuild 532 BLAKE2B 4b539e8afb3ce8ffdb6ff8002be4407e7d84c46b98935deb40d1bbda211156904c4b4fb3388d4fd56760a9c8c0f55a3e6ecf5ae51c01166a7a3325ab6170182a SHA512 6b88f8ab3c5121dfc418888961b97ec1e62443e26959d22fc5cc03389093bf80ae7f21df6e16bc4da2722fbf43bc00d095d4b7a10593c0ad76ff05c52dfcb23d
 EBUILD aiorpcX-0.18.3.ebuild 534 BLAKE2B 8457596a749ef56f1f4493a4c7b5b1aecf4c3845a436c7402bea96edcbd552cafdf41f20b7b05791fdab044d4fa0b688d3967d2152a92538388051b61462de7d SHA512 1531ee211cad70bd2b89cf5f34f3dcea69242e082c8a375a963bad8812ff5501d2e941315a8febf8aaa2594ab4ea1b3c88f56072a1f83260e9980e9c5104f208
 MISC metadata.xml 380 BLAKE2B c1355cf2d901123fa14fadb4f4bf084d385dfd870baa0a2189c68d05cd3bed57ae4f1caaa668211b74b6e2491e3263b99ba8b99446c0e4f5336ea06577dc540f SHA512 b025f50be4d5ba7e95f7ae7b91099498b76b75c7faa28df52f0bb64dbe55b494107f011d42bc4cd6f5c9e5786b2dc1eb8ffc8561334326dff9c99f7877576364
diff --git a/dev-python/aiorpcX/aiorpcX-0.17.0.ebuild b/dev-python/aiorpcX/aiorpcX-0.17.0.ebuild
index b87a61bb4dd1..90d93d456765 100644
--- a/dev-python/aiorpcX/aiorpcX-0.17.0.ebuild
+++ b/dev-python/aiorpcX/aiorpcX-0.17.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/async_generator/Manifest b/dev-python/async_generator/Manifest
index a206cd135d2a..8d0e07c06bbf 100644
--- a/dev-python/async_generator/Manifest
+++ b/dev-python/async_generator/Manifest
@@ -1,3 +1,3 @@
 DIST async_generator-1.10.tar.gz 29870 BLAKE2B 7f1bea82b1ed9ed87774f1fb42af2c58d8f9e34a02f067fad018680d46c94b811075107396b29e948fa5f72131c79f3b45544fae5aeca9f990e809db85bb28dd SHA512 3874b4e474cc7febec981f704672e233512a999e00e1672e46fe3a18e45168373fabc83142926763b7c6fcaf16948e031702d5854694aab4b5cae96b9b1ef819
-EBUILD async_generator-1.10.ebuild 694 BLAKE2B 6d3af75d4f4e480e71bc1181f66fca6ef5715dc2648b596a234b91e21f3647977b472b40511a625106cbb482537bb68ebe03f016dca3716dc3b028455bac764b SHA512 75be118094f69f7cb8ac00574b84ecbe4ea4da9d47181f467d3aab510884679914910dd9964b6877629e1bcf87fefc2135a56dec414ab2374f9baa0e196175bc
+EBUILD async_generator-1.10.ebuild 692 BLAKE2B 4f7efdb7b5654ab8de75cff12623a74ef8993bf18551fe1c15eeee929363250022d179119f97023e69dbb4c4fbc70bb9c8f56a048ded8c3607f6b6dfab874a99 SHA512 ed9fe883fd48c69240eeea8408debe57beb9d68bbba90a2b1931e49db9478e5c340c99debfd621365a270c79626307bcc84e22ed63f79923a3247951c6c22863
 MISC metadata.xml 442 BLAKE2B 93ff73ecbd80ae38cb18b2ffe11bb60c411b7f3ce36b196566e230fecda350a13d19892e672a65fd278038feb53273b39ed7eb42809bd397bb71b8eeb4baf5ca SHA512 fdd4036bac7d48e387e8ad059be940d3eb3cebcf1d6a6079cf4effe25265c3a52d360269fccd8e45f67374d2ce4c2b67245e75fd59656df92a36744265494f07
diff --git a/dev-python/async_generator/async_generator-1.10.ebuild b/dev-python/async_generator/async_generator-1.10.ebuild
index 216110e32063..27d275915a85 100644
--- a/dev-python/async_generator/async_generator-1.10.ebuild
+++ b/dev-python/async_generator/async_generator-1.10.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( MIT Apache-2.0 )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/async_timeout/Manifest b/dev-python/async_timeout/Manifest
index a88aaf38d172..7e3eba56f92e 100644
--- a/dev-python/async_timeout/Manifest
+++ b/dev-python/async_timeout/Manifest
@@ -9,5 +9,5 @@ EBUILD async_timeout-1.1.0.ebuild 687 BLAKE2B c31d7fa2f9f47cc275309a5d76d0a7e165
 EBUILD async_timeout-1.2.0.ebuild 679 BLAKE2B 79e40255cddfa20cff962f045fbf45d73bb967acaef923004574051bf64ec26920f041028c3370bf26732edfb0d32de9d4812e372a3ec677b38866c309299d15 SHA512 fdf7f5f6cc6d5c82e28e21c6e68f3a2d23bb72a43b1197fcdde29d346efe63acf63c6216a93ab3da29fbe315ef8a9d3ac7710a9059455fbacb21ea13c18bd51b
 EBUILD async_timeout-1.2.1.ebuild 769 BLAKE2B 6d8dca0f71de64dd55a2eab295818d2df64e51d774cd4c2fa1dddf6c69ea68f5dc1f35a702779bc76aa40daa4c143d8daa406ce365a004de1ebbf361fa035648 SHA512 dddd3320c35f7223504b500284ce96122b948a38a47144b5f92efc7a822e86ad5f8992d0cf4517af8e5a32adb293584845efe3cd597245ef98db9989219e2191
 EBUILD async_timeout-3.0.0.ebuild 877 BLAKE2B a01317eaaf886515525c77aaf49bf3a23ead7eb0b5ad686af1964fdb1dfe734a6c3ddb185c01a0b0599934608aac0c56df932523c134c20f3bf559726510832e SHA512 49ff65d96b9ba843699a3c04cb699ab68392ef2e2e076b326327a244e18e869357537f16dcc4feaf91f87f197b5cc0607a9a0fa8cdb576a35f635206bd274f55
-EBUILD async_timeout-3.0.1.ebuild 975 BLAKE2B 97badef93f00d807695630a014404b72c8d618a96aa0850fcd9fd135ab4f5790d1594c8e3b9651532aa81c6d5cf76e816a3979be2c4498ec547918dcf60b3fe6 SHA512 aebbd80203fe46971235df7a49193e8678c4f47d3da8a2718fde913218e1166419edd1b53692572666ed7831f0d4c9f98416fe604d44d7a2bc1daf89c85929fc
+EBUILD async_timeout-3.0.1.ebuild 973 BLAKE2B 1ae7cbf17557bb56256981a445da9c76465e2b576ec78c2931738863ca55c6bb75fb89c1013c88d979a40baba7b52042a7abe171040e84ad0a4ba2a68d5cb77a SHA512 43a969030e9de93dadb3dd07b47e8393e8b5036b313823f805655f3eff3af1b29d7b3a1e9d6b22de503e081df28cea4709eaab8e0948273e644b7790adf02dc2
 MISC metadata.xml 435 BLAKE2B a3bf9896730a3f697c6a41257e9f3c168154760ffba1cc5d5660a1442a3b5f5f8032d48ae0b069a412e3ef2e792376e29d3a0867a46576bf8b412acca0798388 SHA512 a7a43ad3fabf98be2d846d8a4bea1ff2a867f934e27d9f88b1c76daaf4d4195f8ffc6039f283313dd009566c732bcb0ab8a847e0b6424afdce902539530637dd
diff --git a/dev-python/async_timeout/async_timeout-3.0.1.ebuild b/dev-python/async_timeout/async_timeout-3.0.1.ebuild
index c463132c66a6..74ee98ace42d 100644
--- a/dev-python/async_timeout/async_timeout-3.0.1.ebuild
+++ b/dev-python/async_timeout/async_timeout-3.0.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 S=${WORKDIR}/${MY_P}
diff --git a/dev-python/authheaders/Manifest b/dev-python/authheaders/Manifest
new file mode 100644
index 000000000000..bd15ab611e6b
--- /dev/null
+++ b/dev-python/authheaders/Manifest
@@ -0,0 +1,3 @@
+DIST authheaders-0.11.0.tar.gz 88501 BLAKE2B a4ef01d206c470c4d97443af2b770d301de59aaed709ab72f439c43e0fa11e20a4a0b7f4122cf3c3212781750a1505af7a8143be9277a7989819948c1c18274a SHA512 7d0d8750eb606f3e52e85159e6b5da2fe377816e7572ee01b6bc90dffa996717c0f2837e52b170ecbd97b7617461a0b96d0736084590673a516e7d3ae7e8f999
+EBUILD authheaders-0.11.0.ebuild 734 BLAKE2B f4700ad87ad5f73ff82b3fed1691f9307880dc0e87ad33db8230c8d9d22529cbc900180fa8c622378672f5f49e188ce10eed07cd47750406825fe8be5cb8138c SHA512 89dd49322ef0febd04964388d63cb90ac274e5019fc33ff3810e8978226e567e827a88a90c0996a0580e4516d1fb0352d78e178d24f53fa318cb239fc7e19468
+MISC metadata.xml 462 BLAKE2B 136929c00b3dc09352eafe4819eb1aa20ca5e6f9742036cc9bbf2dcefaf9e2c9173d39450ac27d5900573e78b3bc5e95de90e06b319ab2ccffb352d96aaf48af SHA512 a748fce55630560f5ad5315361c1cb23db3b74d416fc24bfd61c0aea6f722f363db521efd898f9495838c618ae109f3490fb047d8eba515304304ce7468c2a76
diff --git a/dev-python/authheaders/authheaders-0.11.0.ebuild b/dev-python/authheaders/authheaders-0.11.0.ebuild
new file mode 100644
index 000000000000..a3320424a3b9
--- /dev/null
+++ b/dev-python/authheaders/authheaders-0.11.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_6 )
+inherit distutils-r1
+
+DESCRIPTION="A library wrapping email authentication header verification and generation."
+HOMEPAGE="https://github.com/ValiMail/authentication-headers"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	dev-python/dkimpy[${PYTHON_USEDEP}]
+	>=dev-python/authres-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/publicsuffix-2.20190205[${PYTHON_USEDEP}]
+	dev-python/ipaddress[${PYTHON_USEDEP}]
+	dev-python/dnspython[${PYTHON_USEDEP}]"
+BDEPEND=""
diff --git a/dev-python/authheaders/metadata.xml b/dev-python/authheaders/metadata.xml
new file mode 100644
index 000000000000..1fc8047f9176
--- /dev/null
+++ b/dev-python/authheaders/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<longdescription lang="en">
+			This is a Python library for the generation of email authentication headers.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/authres/Manifest b/dev-python/authres/Manifest
index df7db080e6a2..c70ca47c810f 100644
--- a/dev-python/authres/Manifest
+++ b/dev-python/authres/Manifest
@@ -1,5 +1,5 @@
 DIST authres-0.800.tar.gz 19863 BLAKE2B 01f9264a78ef5a3ee9fa1db17dd4fc5d1e849a5f297f610ab0bda09f4900bca15e63d71c2312e12b1e6173213d3eef938dae996c7bcc599de496b6c77001de87 SHA512 d9e73309064e396c51ed55394ce505c21869d267922df55b6723cb6b2409282c7827d35d381877b5f08e037042e015d59246603d51219c829df7b81011499fe7
 DIST authres-1.1.1.tar.gz 23180 BLAKE2B 8ca2e0a0e93da50188d721be1fd60604ec2fdedb117df39c6e74d454d48d008a1627b45acbc18df3bc3c386794d7ac91e31ccca131c9e6e04f6bb34417f64c50 SHA512 61e73e85e524279d5db37375fbe7b1fcf65a24280ef61124a94e4236ce477c225637690e9d424f5ee3fef8b9cd3d26c6d512dfa3c1c8491fa4f4bf266f88ac80
 EBUILD authres-0.800.ebuild 601 BLAKE2B 574ff453a149edfe7099d477d40b20dcad735e26d1ec767d0a50f494f58524533a066f6e88fef1809b57b371a46683599a80bc05913b9aa4e620be3c2e3d347d SHA512 cf28623b12c682c0c36ebab3fd77febce9b16e5d57cee176207f79239d6d07a775217e31e61474444601defb4b1a39ba49a6a34ed86069d3015f697b4d92ec5f
-EBUILD authres-1.1.1.ebuild 564 BLAKE2B e40a7d0c459ec2ca1e46fd8b6156c7a73868983ac2bebab8c7b9f2323edcd4ef948bf9ddd7f5c2d040c29a2ada01a235c831b1c2e281dd9e737845feae5c88c6 SHA512 e74ef1dc59250a1264161eaa77cfb92d7447974b1508cea2465fd8ae7bfd0baae93d84d2d38c9a9c163075ce3e7ce792c406037be30b27c36daecc640192e709
+EBUILD authres-1.1.1.ebuild 571 BLAKE2B e9c4e4098b213c316a2bf7eaf5f0b337a84f9008d3f929a381893a6416904d0b8ae1dae4cdb827c3600c0b436ce2364528fc966270d71a8faf8417a99a27ca66 SHA512 37388e1459581da89e9de2431a349a9bb00503652b7b4d33980453e9a4b39505959e365fcf4e25a9b3aa47d40a963708f84393d3a28e835aa6d4e3981b8e2fa4
 MISC metadata.xml 659 BLAKE2B 96a0bbbd3a801f527d61237bf4de6b1140cdbb316571efbf4934a0398b6f171ea04bb9c80eca90809ba00eb4b8a2bf9806442752d58e5fc2b43e5c7438425762 SHA512 166514ed6b7ff4e3a3acb703da72e72865ef51b067595375f36bc45541483629582828980befba2711d7b7555f571b91c777162a0996ce57f735a0934c4dfb9d
diff --git a/dev-python/authres/authres-1.1.1.ebuild b/dev-python/authres/authres-1.1.1.ebuild
index 194c7205ebfc..e502ad34aebd 100644
--- a/dev-python/authres/authres-1.1.1.ebuild
+++ b/dev-python/authres/authres-1.1.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://launchpad.net/authentication-results-python https://pypi.org/p
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-python/bcrypt/Manifest b/dev-python/bcrypt/Manifest
index f6ea3661bf54..9d64758a50af 100644
--- a/dev-python/bcrypt/Manifest
+++ b/dev-python/bcrypt/Manifest
@@ -1,5 +1,5 @@
 DIST bcrypt-3.1.6.tar.gz 42216 BLAKE2B 280e2d01d3d5195fe7d32426b9e9bb7b4544dd1c0027a9d1b4be287e21759efcb274cb3f943a913891fd63183f0525f7f301b6d76055a37240a7594240bbff33 SHA512 fcd4f3ec27ee27b4523c9f9b796e9c279895ad66d124fdabaee61b3fb27351b2e8721deb97e7bfc4f07ac4cfad6c2948d467cf21faba2af656ab0030c842244e
 DIST bcrypt-3.1.7.tar.gz 42512 BLAKE2B 5e762f153a5a69c1426748737956fd370e74fcd02e82b5a634e74dbb50fc9e894bdadb4e87eb9cdc580d0853f73ef348d9523ceaf4236df565e39b714bbd1c60 SHA512 bb9a431c8de97d5615d1a7fb67f868d08d839313fd5f3e17d8db40db1870f8b624594352c24c163c6a03485217de873cd92578040350678888728885c7b749de
-EBUILD bcrypt-3.1.6.ebuild 1010 BLAKE2B ad3b2f3468485d0f901d7c3f999c0a25875c172600850364e4697365b473d24ddcde440f75713a1d8b4386e59b7d8bcce25c47963433752db702ca7f9218f36c SHA512 6390e43e845c07658db33bf231ad089cc4f05cfff32d9baaa21b8c1901c0a02bbbad6f12e67f63802faf286154d74142ac8064b181fd2b6945014950f0d843e4
+EBUILD bcrypt-3.1.6.ebuild 1009 BLAKE2B e6c96c4a5a82a9ad174ec84ea4fb76488d69e031a15a40b99e38ab85ce883bbd7aec46e19ddc3c2385efc03d35c1adaacb7382e0c959330302e807a593e45d5b SHA512 7f2b73ccc349c75e778fdf901164bba1c037d31c6aff7e3b4011a0220536a751ee289195dc98b52cabcdd1a20e40105f84db0d8f83df645c667db8616149d2d0
 EBUILD bcrypt-3.1.7.ebuild 1019 BLAKE2B 354ade145be1ce0cdd1f3f9903c31f14d7c6d18015aa65d4bad23dfdc5284c8d544b58988cb866bce94465210c7356f109256df0859624fbacb71e656dfac5ff SHA512 094c0848760d50b4bed62d886087e20d6e9e46f4505bc67f2140bddae3b4736a3648a21f9984b08988f2a1aeda5075bf325047bb323875584a89f42a20dac7e2
 MISC metadata.xml 485 BLAKE2B 789fde3cb8c29c27778293f22f9e3a4453b743d52f5fab1dd2db6d940e4e1bff843d6ccdb4f7374b456b2cd4f80877f453205bb9a5eeee9f6e32382297ab967b SHA512 3b4fb489f9d1ecdee3dedc58dda61aa86c6bc30f29aba50de6dc4faa499276d83fe15518088e4d0e76c98ca30188b2f1b921807821fc73b5dfc592490e6fdb46
diff --git a/dev-python/bcrypt/bcrypt-3.1.6.ebuild b/dev-python/bcrypt/bcrypt-3.1.6.ebuild
index a317f35e7f57..8f48b223b56f 100644
--- a/dev-python/bcrypt/bcrypt-3.1.6.ebuild
+++ b/dev-python/bcrypt/bcrypt-3.1.6.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 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~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 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
 IUSE="test"
 
 COMMON_DEPEND="
diff --git a/dev-python/blockdiag/Manifest b/dev-python/blockdiag/Manifest
index 7398730ef22e..17dc612b3a45 100644
--- a/dev-python/blockdiag/Manifest
+++ b/dev-python/blockdiag/Manifest
@@ -2,5 +2,5 @@ AUX blockdiag-1.5.3-py2_7-test-fix.patch 551 BLAKE2B d7e44b823390b6338bdb2d33cbd
 DIST blockdiag-1.5.3.tar.gz 2704391 BLAKE2B 4d66263d63c73607a9f1e180172be49d25ffd042fb5ab088138dec542a47ee3e68c99442713f32b004ec31ca608686e495d3ec9172f8ab8b074d94d111733144 SHA512 11ff6334d1ae50c103158db6ef9acce76116a17cfb8e0066581c234138f17fabfddd183b154f407fe95dcd414b0054aebdc22682e82a8e7595905f1ee2fd6222
 DIST blockdiag-1.5.4.tar.gz 2693073 BLAKE2B 8a825742b4144667153af00d5e334325f8a3b49823355787dbd577729da8b0fc221ead14ab899ef8aef1800bbc2cdc47f060330bf0a2f2f1bcd055d172d8adbb SHA512 0eef8b3837282ed611e044ee618abca1f799b4a151bc2d7cece140c97ac728b2f3b9a3bb6877d3fed42a74e0173d0cbfd2966521c4dfb21c266975b4062405d2
 EBUILD blockdiag-1.5.3-r1.ebuild 1613 BLAKE2B 356ba9c7c742561fa180b4eb5e7a9ac43179f5a2f0893574128396a59ad35c95cd4ff551c3db4afcb371871efbdfb2af788a64f1420badebbe46c28346ace657 SHA512 38c898c6cec91f13924a34c1d9fecafb58565b49b465632da172be332a71c6420c67eacbfe699b992675a9ac45eec1fccc27ce5964560318085b9d0b971a9548
-EBUILD blockdiag-1.5.4.ebuild 1830 BLAKE2B 1df20c47f2bd53ed59ee82a959a2184e1f65cff56b59b38734084b608d63c72fe9b1a6c6be8a3d235671ec0a4cd4c0dd70d63dfc45405472c85b5a6503dbf89a SHA512 5f1f564fc0a1e77f18abbf9a9533b083ee406c16fabce7a2b77f3f440ee4067c0248d3bf2136f949e487903d828cad0690b29688800daca9eb9a18a1e4749605
+EBUILD blockdiag-1.5.4.ebuild 1828 BLAKE2B f0074666a517f90264dc140ebba439eb93fa056cc136f91c00fa92133f61ce0b78f81f025197285e91056f9a46f917f3624cb7d4a6d346d2494334303acf8b79 SHA512 30081f9558183db8fdeb8f73c68653a26c3339b88951e56b52f42f0ec40f063747041cd08f082ab18e9e5cf867a4ab2af705137b82f52088df3e93dc0c5e9724
 MISC metadata.xml 830 BLAKE2B e53725abf1471f25def5ee17b11893b8395a23d105d1582fd25c39cdbc3334460b6a9737d134c9830cd2af0900c834ba112b15f772ac5bcb0fe2f0740a4557f7 SHA512 0b02e5328a040a199253e3a0aea67552d564989bbbb8c0323c5ccbacc56e44546562ef5a4ba10964eeb10ecc631b4e1c8c902fd3450f6d77290b3d7af354b2c1
diff --git a/dev-python/blockdiag/blockdiag-1.5.4.ebuild b/dev-python/blockdiag/blockdiag-1.5.4.ebuild
index ae884c40081d..56d9d2ae83bb 100644
--- a/dev-python/blockdiag/blockdiag-1.5.4.ebuild
+++ b/dev-python/blockdiag/blockdiag-1.5.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/brotlipy/Manifest b/dev-python/brotlipy/Manifest
index 375e94875b8e..330c5b358283 100644
--- a/dev-python/brotlipy/Manifest
+++ b/dev-python/brotlipy/Manifest
@@ -1,4 +1,4 @@
 DIST brotli-46c1a881b41bb638c76247558aa04b1591af3aa7.tar.gz 19840371 BLAKE2B b9a1c3c2e5b62bd63b392debe54bd1732ac1cb31f88500f0142108b453649d96901d9a03b6db98642cb9abaf9188c06d440f2b8bd3cf57fbbb52196a931f5079 SHA512 dc573c90491032a205f32f0ce9c93e95b06c70a3107caa9501e038a212226c37117d63709a29843367344bf7d18cf32d0c0578b11166387198e12b38b1522406
 DIST brotlipy-0.7.0.tar.gz 19375 BLAKE2B 035dc8757e491bc4fc0d8e2b6b82703eecc8f6f4150da42fda0f6c6f42a617519f5191371eb1dd976b8bbfeab88845bb018b874a395cdbf0ff409a6911f969f5 SHA512 bec8183cf3cc8ba9e594d1a86a8a33d88a6ac8e9c6a6287c837bda3726183ff1b486f2c49da4e489b5b3cb51b57dd5816413b59419920c2ced48435221f1beaf
-EBUILD brotlipy-0.7.0.ebuild 1391 BLAKE2B a9ba9333522a46b821d4a63dcfed7e02f6616ffa2fac484777130d026492ef908196a4ce1624a7e56ac2d6e935858f0e123c0382cc06a912c981bc5625692987 SHA512 d3bb2132eca0e2507213c19b57e1a37681504359805549bcf87638b1e90319f800a1ee35be6215c53c32e2ebd0b90ffff92242f603491f2030f68cff7736760d
+EBUILD brotlipy-0.7.0.ebuild 1401 BLAKE2B 44ef7e82661354a2722ca261de4ead380d9874065afd340753778aeeed25607a33d612780ebddf1314e3153774a71591d9396043182daff5ec622ae996a5fd6f SHA512 e531827d977be2f448e22b17b2b9ff56804d2250c484f12f168e30cdf69ae0462fd12667d5db7287ee58dff858369a17153b8b893e492622a5c76e8e791df44e
 MISC metadata.xml 381 BLAKE2B 0ce0f75aab60659850e7d04532911feea89a4bccf8ec7826ebfb924416af438d5a2bf7981435a22e825b39881ac20a8b2a0bd93a66b2d7b031c72123033f1d78 SHA512 9b3a37c75a62f1873288ffba45ab105225a90d72e01c7ead253b5a903ec28babe152074cc7595d6398104f8ccc50ebfc71ff72c4e620a7dad1b5e57f767cd118
diff --git a/dev-python/brotlipy/brotlipy-0.7.0.ebuild b/dev-python/brotlipy/brotlipy-0.7.0.ebuild
index 4af02f271a99..36eac2049049 100644
--- a/dev-python/brotlipy/brotlipy-0.7.0.ebuild
+++ b/dev-python/brotlipy/brotlipy-0.7.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="test"
 
 RDEPEND="virtual/python-cffi[${PYTHON_USEDEP}]"
diff --git a/dev-python/cgkit/Manifest b/dev-python/cgkit/Manifest
index 9d635342bfa9..2afb91c0e0d9 100644
--- a/dev-python/cgkit/Manifest
+++ b/dev-python/cgkit/Manifest
@@ -5,5 +5,5 @@ AUX cgkit-py3k-pillow.patch 2025 BLAKE2B aa036db10e22b6c92c56a4e0e356d9fa8d14acc
 DIST cgkit-2.0.0-py2k.tar.gz 885682 BLAKE2B f32eb8f05197ae44b3a1d5bf734d779c6e7f53af526f1686348e977f55bc584f565eea9e3831f562dae6aa6715d732465e0d37b07746065e965f945ee1152d18 SHA512 44e57cafc3ba3aa824c44fe4ad04f350dfe053cafa09523acab220e8a5db45dde042b4fcc3e444dc3c248a43ddd94faac6875f579c2063e6c8feba7841472f7c
 DIST cgkit-2.0.0-py3k.tar.gz 885012 BLAKE2B fe48d57ec01ee286c0974b53e088f74db73a19d6cdf9ebde43f3190a46994c803f870f2546583cf6d4bce984895469f61a82e99e6bf98da77443b3857b70b60e SHA512 0c721d728e2cacb3a5518bfdf49810793a7e4a7efdec54a95d9b8b64099996452a08193c90e1b76f57852c3593bf07e4361ba20c17ea3565413d4997e9cf6c2e
 EBUILD cgkit-2.0.0-r1.ebuild 2117 BLAKE2B 2d43f18890634b8c1e1f49c266e7313dc0741427a4226c73b1929a001c5e1162eb385337ec5a57c95f402e78c3309e2570ca6df682446f9b52d2ea3df48d38b5 SHA512 66db9f2bf26b235812f7672fe47b453c48d2d3840f292c56109c9e1bb6a679ef100241a3cfd82ad3bb52804f22fed18e402646d64eaa0713ce8550ea180be9bf
-EBUILD cgkit-2.0.0-r2.ebuild 2121 BLAKE2B c1ed61553e2d16bbf028aa75e817bb132f2a1167ce0d9f94d97ed758e8d90733b2628980ae087e6b63f6e55e1c5bf3b02b3741d2887495eb863ef91eb10043b3 SHA512 8f364bea6127c963d8cfcfe3c2862e7e89e14e619a74e62b980c8f71addc4cc01c00a16be40bb950c50aca75f1daa60f4d6a7ba8a5934440c70c20339dfa92db
+EBUILD cgkit-2.0.0-r2.ebuild 2279 BLAKE2B fe0db791431bf4159cc4efc4565d22d765537402d060381cce4fa2f66f0cf8cac6ff63da792a817bd44e328eff559d8566ee31738ae6261ecb2ec78eafa62a69 SHA512 7292e085697d53552a8e25dec3e3fecbd062284baa2e40ddbd4a29290b191ae8487e588a05e0c9491e56bf3e10001cdb10279e706db832846eb8be1c167932d7
 MISC metadata.xml 613 BLAKE2B 1ab7e4e1a5527090988592c49fdabfa5cb34527ac802efe6f4b144980a88346f6f2bfba8dabd94b63675e811852e3aa6c4dfe12d1ff65562a9c1ef74f8a96fc8 SHA512 276fc1ce3f5ef82f91499436866d31a2807c1d753eabc5bf5494af756086327320f671cd30e4628b4fd4740774a3d7bc83e14175157375abcf01b496589fc85b
diff --git a/dev-python/cgkit/cgkit-2.0.0-r2.ebuild b/dev-python/cgkit/cgkit-2.0.0-r2.ebuild
index b5dd3ab667bc..0edbc19a9c5f 100644
--- a/dev-python/cgkit/cgkit-2.0.0-r2.ebuild
+++ b/dev-python/cgkit/cgkit-2.0.0-r2.ebuild
@@ -55,9 +55,16 @@ python_prepare() {
 		eapply "${FILESDIR}"/${PN}-py2k-pillow.patch
 	fi
 
+	local boostpy_ver="${EPYTHON#python}"
+	if has_version ">=dev-libs/boost-1.70"; then
+		boostpy_ver="${boostpy_ver/\.}"
+	else
+		boostpy_ver="-${boostpy_ver}"
+	fi
+
 	cp config_template.cfg config.cfg || die
 	cat >> config.cfg <<- _EOF_ || die
-		BOOST_LIB = 'boost_python-${EPYTHON#python}'
+		BOOST_LIB = 'boost_python${boostpy_ver}'
 		LIBS += ['GL', 'GLU', 'glut']
 		LIB3DS_AVAILABLE = $(usex 3ds True False)
 	_EOF_
diff --git a/dev-python/cjkwrap/Manifest b/dev-python/cjkwrap/Manifest
index 7846bfda5081..06870d282b01 100644
--- a/dev-python/cjkwrap/Manifest
+++ b/dev-python/cjkwrap/Manifest
@@ -1,3 +1,3 @@
 DIST cjkwrap-2.2.tar.gz 20995 BLAKE2B 35604e2d1aa24a75e1de0f0b17ba592e7588aade42d43e98864f5d83fe598eaa0ca566682cb7c7af566e66f79c9696ba2ae86b1579681688d6cd31469c07a3ff SHA512 c72ce67b10af46018f7aa5d65af030373e8889a28f533a59d55668e5c90a759ad7cb31708dd6ff35561f9e62115edef5bc0facc74b6a6e122d7399d9dc950624
 EBUILD cjkwrap-2.2.ebuild 484 BLAKE2B 06850e89b04a99d052b6efea0ccf7afc3c853f422c87ee1fa29a48ed7e0a7ff24349da47c90a115d885745921eed0dacde23af1f2f4ace7e58a40371340d246f SHA512 68327449ca54b0f730a7415fbf6dc99d9e6a323fbcf534534328a33785a93f2a7d7e0fecf654012034c721fef032ff4e3619c06b382bdd1ab5ab1ce741a293da
-MISC metadata.xml 344 BLAKE2B 2b09c758b212196592a83ba9e2f30591f97d222619bf3a494fcc025789c46d70f55b955400c580dbc9d3f5ea3cdb3662d79e2960d88e8b7e089a741c7fa6041d SHA512 f9e35a54a3d719a4114e2bc758096c1f6365838163ab5f6a3353bd318581683ca4757be60d0dbb8457099c1e174518078091a94e2f23f086903f45be94c4915d
+MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/dev-python/cjkwrap/metadata.xml b/dev-python/cjkwrap/metadata.xml
index d9a6217dd22d..6b0a0fb3a729 100644
--- a/dev-python/cjkwrap/metadata.xml
+++ b/dev-python/cjkwrap/metadata.xml
@@ -2,10 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>juippis@gmail.com</email>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
+    <email>juippis@gentoo.org</email>
+    <name>Joonas Niilola</name>
   </maintainer>
 </pkgmetadata>
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index 1f2a9bf46c50..b34dd14467b2 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -2,10 +2,12 @@ DIST cfe-5.0.2.src.tar.xz 11459216 BLAKE2B 80d9b2ab70b00c0dfd5c5386a44e0c15d8252
 DIST cfe-6.0.1.src.tar.xz 11905772 BLAKE2B abb60e9f9827d1d8a24f0aaf8a1d1e32979293cc401258d230f93290e633645747fd0344af189ac7081b06be2cada503364e1e432b37110ade4b3578e40c7605 SHA512 f64ba9290059f6e36fee41c8f32bf483609d31c291fcd2f77d41fecfdf3c8233a5e23b93a1c73fed03683823bd6e72757ed993dd32527de3d5f2b7a64bb031b9
 DIST cfe-7.1.0.src.tar.xz 12487872 BLAKE2B ca6ec9e45b94823de1dabf9e68f0c97cdd40b5d2a5e5e15d4b2393f6d7fbdee72a541b957cc22ce4cb726d8ee7190228320941d5713aeb59695673b9e9070ceb SHA512 1cd0b80f32aa4de1118c0c676ba96b1fc78b7ff929b01b6589dfe9b4669e599ac8cfb8f5a0abcd3487594193a7dec06b29530ec3fc03042c20a160f0477a79fd
 DIST cfe-8.0.0.src.tar.xz 12868468 BLAKE2B 3cb96c95c4d9713feb7011e4f1ca24be3e7f6c9b458f6cd9e6905f99737312ca44cb701ed5871e47dd583145e5898d53a65c4cda6456af3d4ca31b670ed84409 SHA512 98e540222719716985e5d8439116e47469cb01201ea91d1da7e46cb6633da099688d9352c3b65e5c5f660cbbae353b3d79bb803fc66b3be663f2b04b1feed1c3
+DIST cfe-8.0.1.src.tar.xz 12810056 BLAKE2B 88cee0b6daa477ca0473c76efc45beb634f6194ecd3f45aaec3791e26b203c5dbd33c649435e0d97924096a72c727d76915bffc0b7ea305f24d5e5f06389c4a0 SHA512 1227b2d32052c70b4b494659849000188fce46fc31a71f3352ba8457ac0b0b17e4bc7c8589874c8586d55aa808ee6c1fceb7df501aafa33599f8df7bfd2b791d
+EBUILD clang-python-10.0.0.9999.ebuild 1027 BLAKE2B 93a19a171bf281b848109466adf728bf70ef2bd8eab0170c2cbb3654805cee1500229d65f770b8677406bb6e24fcda374fd793209e1794a8c3ec1365b8175cfe SHA512 93d73da789b92c999b825b64fcfc06ab86a99f251da0739f90a4cdcc0275d5ab52fc4765c1c408b7ad70d80bb7f41627b0a623e635c96e16fc2bbf5d4094a000
 EBUILD clang-python-5.0.2.ebuild 1072 BLAKE2B 19d846f9e6dc2c1671c816f70ef0a1b766cde0ac96040032cd16d0dcdcc9996849725442981e2f6034872ab043dc8f952126852366b1be34a056dc1335aa5a26 SHA512 31dc85d0fe65832a62aa7097661b8db78e9689a627225f9634755a30bfaec9827fc8822365d2c7e29188224a6c4e3347ceec2e3b925e40931872e8b697cd6231
 EBUILD clang-python-6.0.1.ebuild 1090 BLAKE2B c98cb3a9f8426a3ccf544884459a6e551ae22d51ae45843aa63daa10cf0da9bf4d22f9a1ec635e0dbd045d3d93a9349e79d8dea840bb846285ff07619215278f SHA512 0b274c8efda44e4d1a3f9de7cd5b8fac5bb0a60ea5b1878fe8c07df098abdfa9b8a2700debaad7f425951c4b5c4c336fc8661acd8bdac6da4ac97e152e6c13fd
 EBUILD clang-python-7.1.0.ebuild 1099 BLAKE2B 28f23947826044651ab666dffe31466f1c7f8000eec9f5f3fdaaaa6c5380400d144587c305aea974da935938e1c4921e434442cf5d57a8d611bc93b0f7e7c791 SHA512 3a05a76fe779227853c3ffaeb453b2980bc290b238527d89b1a1b3f5be07610b082369d7e42b3e09b26e8408c9db08b55236743dd3f36dfa26398a6bba6c2953
 EBUILD clang-python-8.0.0.ebuild 1099 BLAKE2B 28f23947826044651ab666dffe31466f1c7f8000eec9f5f3fdaaaa6c5380400d144587c305aea974da935938e1c4921e434442cf5d57a8d611bc93b0f7e7c791 SHA512 3a05a76fe779227853c3ffaeb453b2980bc290b238527d89b1a1b3f5be07610b082369d7e42b3e09b26e8408c9db08b55236743dd3f36dfa26398a6bba6c2953
-EBUILD clang-python-8.0.9999.ebuild 1052 BLAKE2B 66a85d6ed0832b2c743738fbca508552fe6b5ce3c9c98336acafefacc9765d8e7c2797d4f8b9406e4c757ad26c893e49a1dbb4e7de8fc88eb841b051a7a29f21 SHA512 f86c607c0d2d78d2555e0c1f1103634e37187d4a7bf369191f34975c3ea3f6ce7d6e28b4e0ed03a987eb36ef3897b43641b8fb6d34f4020fb9657b743f78a17c
-EBUILD clang-python-9999.ebuild 1027 BLAKE2B cf5c8ce565a1ab2a1b1b40ec24be3a43516bd3be798b7f25522238cf950e9cf79aa4bb1a4f71b89a3f15aaa3b659bf5f2ef303e537fb5e375e3e682fd753f6ae SHA512 53c12a7c1ffde026270c8e6c995bddecfc207dfdc995e54a3b5cf61d1fce1c1a5a6240a60c6652bd11aacbbac5fa08749e168808c792fcd923dad296ea1d5fea
+EBUILD clang-python-8.0.1.ebuild 1132 BLAKE2B 3eb755b1510d33954a3b0a3fe704755d095974642f445bdbbdd1ebd18163fd887e34d4054c87c869b093915c967c6198174f3001b2185f59a282a5dc0e85bbdd SHA512 cabf3b6ba8f05ab5c477e6e697d8c31b69ec5e99be2e5d162de29c63c3c65d3317616474e6863cba441b93caeaacc5cccf6d6ac123f0c718efecedb835e20d36
+EBUILD clang-python-9.0.0.9999.ebuild 1052 BLAKE2B dabaed85a2f5a2b35b2ae11ca1217db8bef310ad825d6d731fa631db46226e22add0b93c40cd386eebfb11aad88a2367059c8dac115e965784ab2141fa26526e SHA512 ad45030d16d6ba6b3ab32e6cd8e22333d96c44a0b3770d7eacc2e5351a8180334c4416d40562defae0b2ad8efbc975264b84d011df1185ec726b09ace8c1b27d
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-python/clang-python/clang-python-9999.ebuild b/dev-python/clang-python/clang-python-10.0.0.9999.ebuild
index e85e6476e475..506f79114d25 100644
--- a/dev-python/clang-python/clang-python-9999.ebuild
+++ b/dev-python/clang-python/clang-python-10.0.0.9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
 inherit git-r3 python-r1
diff --git a/dev-python/clang-python/clang-python-8.0.1.ebuild b/dev-python/clang-python/clang-python-8.0.1.ebuild
new file mode 100644
index 000000000000..8da5089887b8
--- /dev/null
+++ b/dev-python/clang-python/clang-python-8.0.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+inherit python-r1
+
+MY_P=cfe-${PV/_/}.src
+DESCRIPTION="Python bindings for sys-devel/clang"
+HOMEPAGE="https://llvm.org/"
+SRC_URI="https://github.com/llvm/llvm-project/releases/download/llvmorg-${PV}/${MY_P}.tar.xz"
+
+LICENSE="UoI-NCSA"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-fbsd"
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# 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}"
+
+S=${WORKDIR}/${MY_P}/bindings/python
+
+src_unpack() {
+	einfo "Unpacking parts of ${MY_P}.tar.xz ..."
+	tar -xJf "${DISTDIR}/${MY_P}.tar.xz" "${MY_P}/bindings/python" || die
+}
+
+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/clang-python/clang-python-8.0.9999.ebuild b/dev-python/clang-python/clang-python-9.0.0.9999.ebuild
index 0fe10a819321..6bf0e1c8573f 100644
--- a/dev-python/clang-python/clang-python-8.0.9999.ebuild
+++ b/dev-python/clang-python/clang-python-9.0.0.9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
 inherit git-r3 python-r1
@@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/"
 SRC_URI=""
 EGIT_REPO_URI="https://git.llvm.org/git/clang.git
 	https://github.com/llvm-mirror/clang.git"
-EGIT_BRANCH="release_80"
+EGIT_BRANCH="release_90"
 
 LICENSE="UoI-NCSA"
 SLOT="0"
diff --git a/dev-python/cloudpickle/Manifest b/dev-python/cloudpickle/Manifest
index 69000fe520e2..1f707c4c399d 100644
--- a/dev-python/cloudpickle/Manifest
+++ b/dev-python/cloudpickle/Manifest
@@ -1,5 +1,5 @@
 DIST cloudpickle-0.3.1.tar.gz 18927 BLAKE2B fab03106f91d475c83c25d0259fcf4e70baa96422bad84e7393967ea480ebe36412b32792a4e334f6a495c795139accaed739a3e3f3d7058352dac2f0f55974d SHA512 81ea17181710f3428bc9c80e2e4b1fa57eadd6781528ed92ce5854ce86cded0b754d98afccd322408786ce4e3a77a1c758be73f197d809dad07c24e9dbb7c68d
 DIST cloudpickle-1.2.1.tar.gz 42138 BLAKE2B 37579a1dbe6c38697236273f67221d2cc497c1bb92a268e39339a9c55a348645cd6e0872ef720e19d0e891359ad6e0af3b6cba8416c431c79979c68c53f9aa7d SHA512 5ec7ddceff7c43e46011370ba00f693dc669a1b3e1cfc42b42483850879d6246073ed20d4ca92698984b4935f5b69e5ae0dd96dad82de3f296e38ce7b644a6d2
 EBUILD cloudpickle-0.3.1.ebuild 649 BLAKE2B b03f481cec5af1f73be2d7e6a64a524e6de9c11fbc80779c7b7bf4f77b1edc0e98a44906a8c3fea6f43ea8986ca38407a73b83c5a4b700f6ee82ef34353dbd20 SHA512 a0acb2a991270b87824512daf57c6f29b77b9c009e393951968d426d4e1bb63288c67baaf302096fa5e222f0e7ad0044ba4c0cf8d94e04586d40f2e1eeab9da0
-EBUILD cloudpickle-1.2.1.ebuild 744 BLAKE2B 3acb211c92a31840413386a1c22fcf9a62d3192e4a2f85bdf3a2c18a0b7b85b3468871019b621a57024e4d3808dba02781edcff99cc2b8cb206d2a4193b7caad SHA512 9e7b1efe103632872e07d0075715269eab7b486702f45aac0aa73ce6194997edd441890bdb68c5af8ed61ed19f391529f9282b02065745484437f31b4b71d8c4
+EBUILD cloudpickle-1.2.1.ebuild 749 BLAKE2B 6bb06894ea14b8949443688268f7c20334a6ced9715589b8463629d9965318cac3d9ac417c3e693450ce4f4d3889f14ed07366f82bf957c0401d3d3bbd678a8b SHA512 45f8b44bb3e387a1d7d5dec5530f70a690c00a3ffb2059434031ea7b5ca153bf33e475fa08cb99a6eea22450e250f458d4846ccf63a6874b4bd8333f372ed91b
 MISC metadata.xml 324 BLAKE2B 1c37428b4d95b58077885d0a53a7f016566b0c1f3b6f6f1304f5f70c4ff3e175e4d4e2f5d1c940c7f231cd143f8592af96136fb303c47cd6762108fb393289b1 SHA512 2f331643b833ea7d97a6e24c21c6583e590204a38cb9ce77361ed7833e35e8c23dfc2b1b430d0e0cf2e45c0781b624f31deb4df6df8044b8dd34a5be16c3b3be
diff --git a/dev-python/cloudpickle/cloudpickle-1.2.1.ebuild b/dev-python/cloudpickle/cloudpickle-1.2.1.ebuild
index ac484042436d..74f40c775fc0 100644
--- a/dev-python/cloudpickle/cloudpickle-1.2.1.ebuild
+++ b/dev-python/cloudpickle/cloudpickle-1.2.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/cmd2/Manifest b/dev-python/cmd2/Manifest
index d06840caa3ae..0eb379961da5 100644
--- a/dev-python/cmd2/Manifest
+++ b/dev-python/cmd2/Manifest
@@ -2,8 +2,10 @@ DIST cmd2-0.7.5.tar.gz 64939 BLAKE2B 57c8d3f4c7c94e8e2627fb5d2cf8c164da72c531808
 DIST cmd2-0.7.9.tar.gz 71298 BLAKE2B d1623e2d6a7ac66058b5a43a9688ba850962fa7b5659c3287a9aef9a7deb16338d71a2c07ef15ec72ee5e62aae0ce3cdf2f202d0d423040b734dee059f1d4876 SHA512 39086794ea57cdfdc7388aaa485770f1a76457bf2b2f58cd4703dc0c082f58a8343aa777304e833133040fdab8ef8451d85bc3c19721432514bb380330823abd
 DIST cmd2-0.8.9.tar.gz 112543 BLAKE2B b55edd450abcff863a34252b724919ace9f65b62b8175f28a1bb4fb64692a67723339a887dac45e87f37db71773689cfa213038740a4b3d165bf95f9cdad1d0e SHA512 80c80b67f8a1709156450fa476215a5466cca2853102f6012f1d83867a311d86a68d441dcea9895b62add731b3d00a7c3ecefde939b4f2ccd61d058ef9386a84
 DIST cmd2-0.9.14.tar.gz 530199 BLAKE2B a503e71959927e01986028da423c11f971972df0826f95cb06ca0594d9b90c19a5502ec19d741ea7a30b0ab9fb6f9d33fb5c20fc37c01695039b69979b862410 SHA512 4a606fc821f32dccb53b0558645850b383f814ae79f65e491376638960c5951ddff3ff860190d6ffe37b9fd616f44659793c1b1389eb76fbb369726cc1108c77
+DIST cmd2-0.9.15.tar.gz 550232 BLAKE2B b9e57ca150ee94cfc38bf394f9a3a8de06c4e63c8787944491fc5802781c3afc585d075b07b636c673dd20e50cd1222a7cd146a6284abc0f87873ccb915ec2a3 SHA512 6a2405e6b83200fb53cc251a4095fea6dfe0d7edd26875aee5121267d7615599aef4d84592be2b72b9cbd38e22e25f320d4c334b82e360140d517b65f2be25a8
 EBUILD cmd2-0.7.5.ebuild 896 BLAKE2B 7099810ad7eddeeb703bd56d9292bbb99b299452527d18662f10e072285af7ca395f9b09c7403da38ca13cfba86d6f7356c6fe9e6038eec47121c69dcf34d2d3 SHA512 2ec25bce60270182d4f20d1f514492821b899f3be7c1e9c1e372509adc06057e666c60a153ef7befd8e5529d762e8d9892125610ed77f31dc55cf0090e7bea2b
 EBUILD cmd2-0.7.9.ebuild 899 BLAKE2B a475b51f4ecc87d0df39bb21550aab47331d2355310a05d051fd089e5a8262e7e34c301fcadb9559fc850e8f7fef452f4d187c51dcaa0d1a3e09dfb8d55edd3c SHA512 937f70ff38800622db1c2b50e159d53f5ac1628a6f0e16a3ab205f5d1aa4b6f74702b206b4be2bae9d1d0afb5a88db481749a52ef5f777f12dd414cb3304fc3a
 EBUILD cmd2-0.8.9.ebuild 979 BLAKE2B 92cfdb67bd7c9619239b8d3b742ec9e004b5c628caa8790859a19ba707d6a2263b63dc84f7e0c5afbf7ebc1a336673507c3de76113e54332c87da1d3661c87a7 SHA512 5c48cf31cc0bf761822c8b78e99a605753023b4b82b8fa634e322c1dae0973c969866ca3f00312b5236aaff59082969165e397ac584d2079118dd57dab2f05ef
 EBUILD cmd2-0.9.14.ebuild 1043 BLAKE2B 4318c067b0e725c9563e9b2955be15e538e999698810d2498406e8492c0470f20ad92c7309df5e704216a5b573c31a2bad0711d17dc9d724c595502923636ea5 SHA512 5d10d8ac67ca49f6fa7c55b4c71c88cfafcdc06b59618a08acfac497548d551717540d4819a7f08148f447d88cf7924a51436bbbf55ff677e2824fc84b34a74b
+EBUILD cmd2-0.9.15.ebuild 1057 BLAKE2B 58d5ab45d1a8ac6f05195c19c9db1c91c5d2bf75784f6ccba5af9014b889e71417e3695abe63c9dd881a4c842b7248ecdfbfc649f55b150bac2e6a87f2f42d6d SHA512 0d3489368f84e25fec9b63cce78502aaf9d6c35bcc6d864613e730267d1710bd4d4d74251947fdca45e7fd63baf9cb69762f7f607d12aa94e670f2a44f865cb9
 MISC metadata.xml 665 BLAKE2B 796824fde35499ef70bd730f7e6c6ae4b239ea278f77188215ae0fc6e062598d943b0ae42ab5b378e8777c7c6a2162b330971bc00572e6dd43c663a3da677aab SHA512 64183ffbb33f229d4295e6fb34d98603d38da0241c6d1593704da866c17e04c9fe7f9500a1256b6e83c919eae019f71da93fdec7f09db99e073dbd809144b735
diff --git a/dev-python/cmd2/cmd2-0.9.15.ebuild b/dev-python/cmd2/cmd2-0.9.15.ebuild
new file mode 100644
index 000000000000..715f6032dc28
--- /dev/null
+++ b/dev-python/cmd2/cmd2-0.9.15.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{3_5,3_6,3_7} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Extra features for standard library's cmd module"
+HOMEPAGE="https://github.com/python-cmd2/cmd2"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/attrs[${PYTHON_USEDEP}]
+	>=dev-python/colorama-0.3.7[${PYTHON_USEDEP}]
+	>=dev-python/pyperclip-1.6[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/wcwidth[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python3_5)
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	# test rely on very specific text wrapping...
+	local -x COLUMNS=80
+	pytest -vv || die
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
diff --git a/dev-python/ctypesgen/Manifest b/dev-python/ctypesgen/Manifest
index 2259066a4388..0cd9f5d77241 100644
--- a/dev-python/ctypesgen/Manifest
+++ b/dev-python/ctypesgen/Manifest
@@ -1,3 +1,3 @@
 DIST ctypesgen-0_p72.tar.bz2 85694 BLAKE2B eab6f01c7fc541f069d131abe255a51dd876e0629639cb46a8fac215da55af80746771cd15a5de4b300c58f56e4b975985953d4efe5327c8d2b29c37c166c393 SHA512 eab85c71a2f98fd03ae582899de680bd861e7e6e20841ac087520f8b844dc686ea519b0510382cedec09ff3fa1d87fcc1c79878a2eb9219d7cc092423813e2e5
-EBUILD ctypesgen-0_p72-r1.ebuild 823 BLAKE2B f5b124923569a694bf55b73156d97a90638135996e8958f2bd3e68057270f0e71345b8f4fdb00fc31ff8a426e6f7316a24269a4af9ef4936d318f89bc0747226 SHA512 9d8369da25cd922a09236c420030ef236f85852fb9a350f734582db0d3ff6b920963fa4dc9afdb16d41002db77e510da6aee2b4b8942211e9efbe4fca6011760
+EBUILD ctypesgen-0_p72-r1.ebuild 822 BLAKE2B d20f0fc80231699281e29edd31c23f7ed9da1684b49f46d3092d36d7c92e1b81a6bb7ecdc2fdd35b5f07b60b86ba18f3eb7edc475e417996a330c8dd894cce8d SHA512 a21056b350b12feee77ce40b94b17f794e4a63e8a93832fed874b981bca8c77848b79d398821e6b940916461b7af9bbc8972909d67351a5020c1e01ed218b047
 MISC metadata.xml 327 BLAKE2B 0c2d0845df5c1de25a375b7cd59ba658b8f60fa45224dd02a9bfe864685f3414dd741aef1b3256e2780470e87ae71d46fd872ecc8ad5f801bf0f281a83c04f04 SHA512 3cc32b4405bb86fec917d9fb3ff5aef6ebc1d4f73474a1cddb34dd6861e7916315a09f5171ddff9e35d61d1aab29cf0be47fa20c347fc8b93e2db6ca8323cb6c
diff --git a/dev-python/ctypesgen/ctypesgen-0_p72-r1.ebuild b/dev-python/ctypesgen/ctypesgen-0_p72-r1.ebuild
index 3f1f7452a12c..287910131075 100644
--- a/dev-python/ctypesgen/ctypesgen-0_p72-r1.ebuild
+++ b/dev-python/ctypesgen/ctypesgen-0_p72-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-python/cython/Manifest b/dev-python/cython/Manifest
index 588bc0d6de3d..8d6c5bfbd955 100644
--- a/dev-python/cython/Manifest
+++ b/dev-python/cython/Manifest
@@ -1,10 +1,8 @@
 AUX 50cython-gentoo.el 388 BLAKE2B 5bc38190b467efa9e7be1a5831022534dbfdc02206fca34f39bb2c897aa50cdebf960589181a9614a50829c380a892a9013e8ec5f538d51f52475cb8d92fdb5b SHA512 dd554d0d6cc220988552b06a20337af20b847e75bee76c90eb92ea979d9c2ae9d64ffa849266ff403d857b3737981de451bf40061bea0533600476bc57661c18
-DIST Cython-0.29.10.tar.gz 2049468 BLAKE2B 1cfae1c5e2d7277d3ac25ab0ff5a7b4346242e6c01d0b7945491f4fb64e0c9b98c593efa41b790aa0437ae72275a0ba3b6fe8614c7efaadc6139823f0e453d71 SHA512 df8430bb89816df84abfc6d59bee8e50f4117e8e82b9c82a889afca390a42a1569a9b5dcde76f40e7c29d728489af34c6fe0cf359912f7b74ac0d014af2171c3
-DIST Cython-0.29.11.tar.gz 2050170 BLAKE2B 47ce8b73371b8f4537e4ad7645dfaccdca207573eba68fa7e5da079db5b739b8cede57a55a19b2bfb28aaf30f8d5b5c9eb8492fdfcc07f533f4e9af036a315ad SHA512 d683cd006afb9778c9c2d755646623977d29d05675be8bc85f711d4a0cadcd5bd7ed623a2a2bc2067898b0d5b99819f2047b91345ecd5e4f0828eea6f62ec83c
 DIST Cython-0.29.12.tar.gz 2050537 BLAKE2B 86c5ffd07e97d549f2d98ae0aa66a03dc2f8e86b3fca304f3fba69f63c1e6d176c57d19f4877cdfd500ca2ebed2eaaebe1ed7cea0099fa23bc7a08c23f1b4f26 SHA512 502756331d8c3618a75a881fc1a20b7e871cd3412904070f3080d5bd0918440230fdae96f096c255fec6b32b81ffcf838f22953b8da23b8845527810f457be60
 DIST Cython-0.29.4.tar.gz 2044382 BLAKE2B b36d27706a3270805f66190a4cf2735eaf20b1b932365b324a433c0e58e63e860ce1500333233c3539ae697886ac0adc361a2c158d5d064a3ea05843debc3f26 SHA512 8f115e36975aaf64eda4df8b0a85378d0c80b3292dbd162be826b939def03bdc9f3eb937676e2367003c2944b570d97f50d7880becfdb2fdc5144077b4a722dc
-EBUILD cython-0.29.10.ebuild 2216 BLAKE2B 7d396720d35fc932ec076178ecd9a62048964d57c8c7970d00c7127034634af38ffeb78c1c26b8885430bf909f358a85ed3aa3856c19e0fbedb009eb0ecfc74c SHA512 f0ae926aea3cf131deb3f7051cb4c1b89dd7b62837c58c625eb3776a43a81048716deb51670221e11a463f33e014d5ba2ee522675f16fd46197b3d6549f911cd
-EBUILD cython-0.29.11.ebuild 2216 BLAKE2B 7d396720d35fc932ec076178ecd9a62048964d57c8c7970d00c7127034634af38ffeb78c1c26b8885430bf909f358a85ed3aa3856c19e0fbedb009eb0ecfc74c SHA512 f0ae926aea3cf131deb3f7051cb4c1b89dd7b62837c58c625eb3776a43a81048716deb51670221e11a463f33e014d5ba2ee522675f16fd46197b3d6549f911cd
+DIST cython-0.29.13.gh.tar.gz 2072564 BLAKE2B 55a8c5c932262972cfa55ee2771e17ab5a57beab03d0dac5668f654a0bf68850ef62b7e59b322c527115af48b7243b9c919e739eaf440338a50b89c4645c0fbf SHA512 79efebfddabf31a046ae86a2c2170e0956098f4b1c7b8bbd338d30be7c96c31ee2d648332fc16ad9cf1e5d0ea4ca1a070b2d31ccbeae0c0f86a2f7700b92f656
 EBUILD cython-0.29.12.ebuild 2216 BLAKE2B 7d396720d35fc932ec076178ecd9a62048964d57c8c7970d00c7127034634af38ffeb78c1c26b8885430bf909f358a85ed3aa3856c19e0fbedb009eb0ecfc74c SHA512 f0ae926aea3cf131deb3f7051cb4c1b89dd7b62837c58c625eb3776a43a81048716deb51670221e11a463f33e014d5ba2ee522675f16fd46197b3d6549f911cd
+EBUILD cython-0.29.13.ebuild 1962 BLAKE2B 9d9ec230a3405d218783a9c7e63089353b3ba508556eb18a6674c8fb158b19f75252fc8200923d382fe6d5bb565cfb77d65914bffb158f2b0404ba4faa1b091f SHA512 773d9110eb17c6055fcb6dc24f2301666736ed119ce4dd6b9f76703f786a21b598cf79259c1e9196cca12772437c2100139d33858d62d80bdc3841151f340e31
 EBUILD cython-0.29.4.ebuild 2160 BLAKE2B 4a854e80cde14979e6a35131b7002a68745978eeda2d370b46f1d816a424296e61b43894e7e488ed7cfe238f2c0a8078639172ecbd9534326965e658b2fd3672 SHA512 b1b9f03ea3addd10e61ae1b855c28a495055a13a859df06ff3869cf3c917101dbe7c0259525103fdc3123c23c5f5c2c5804f7cefd073cb80a0248ea90097e4a2
 MISC metadata.xml 570 BLAKE2B 078d948ba14cbbfb98103ee3746f773c12d35c91e64358950aa0ceb78695e19d8ca4c0c33b388c2c5cd54b83856430a8934d8a40aec74c3aa0d761e0a4a03add SHA512 73c65ef6b088cb50125dd662f263fb1aa1d60c3631aa8453b9ed2ede6bbd839235c6b37c3f8d1a17618c167874d64a3aa6f95c9141c8b6c921eaf4c1c4d68dad
diff --git a/dev-python/cython/cython-0.29.10.ebuild b/dev-python/cython/cython-0.29.10.ebuild
deleted file mode 100644
index 3bd1896df64d..000000000000
--- a/dev-python/cython/cython-0.29.10.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 toolchain-funcs elisp-common
-
-MY_PN="Cython"
-MY_P="${MY_PN}-${PV/_/}"
-
-DESCRIPTION="A Python to C compiler"
-HOMEPAGE="https://cython.org https://pypi.org/project/Cython/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="doc emacs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	emacs? ( virtual/emacs )
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/numpy[${PYTHON_USEDEP}] )"
-
-SITEFILE=50cython-gentoo.el
-S="${WORKDIR}/${MY_PN}-${PV%_*}"
-
-python_prepare_all() {
-	# tests behavior that is illegal in Python 3.7+
-	# https://github.com/cython/cython/issues/2454
-	sed -i -e '/with_outer_raising/,/return/d' tests/run/generators_py.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	if ! python_is_python3; then
-		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
-		local CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
-	fi
-
-	# Python gets confused when it is in sys.path before build.
-	local -x PYTHONPATH=
-
-	distutils-r1_python_compile
-}
-
-python_compile_all() {
-	use emacs && elisp-compile Tools/cython-mode.el
-
-	use doc && emake -C docs html
-}
-
-python_test() {
-	tc-export CC
-	# https://github.com/cython/cython/issues/1911
-	local -x CFLAGS="${CFLAGS} -fno-strict-overflow"
-	"${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	local DOCS=( CHANGES.rst README.rst ToDo.txt USAGE.txt )
-	use doc && local HTML_DOCS=( docs/build/html/. )
-	distutils-r1_python_install_all
-
-	if use emacs; then
-		elisp-install ${PN} Tools/cython-mode.*
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-python/cython/cython-0.29.11.ebuild b/dev-python/cython/cython-0.29.13.ebuild
index 3bd1896df64d..fde90453842e 100644
--- a/dev-python/cython/cython-0.29.11.ebuild
+++ b/dev-python/cython/cython-0.29.13.ebuild
@@ -8,12 +8,10 @@ PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 toolchain-funcs elisp-common
 
-MY_PN="Cython"
-MY_P="${MY_PN}-${PV/_/}"
-
 DESCRIPTION="A Python to C compiler"
-HOMEPAGE="https://cython.org https://pypi.org/project/Cython/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+HOMEPAGE="https://cython.org https://pypi.org/project/Cython/
+	https://github.com/cython/cython"
+SRC_URI="https://github.com/cython/cython/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -30,15 +28,6 @@ DEPEND="${RDEPEND}
 	test? ( dev-python/numpy[${PYTHON_USEDEP}] )"
 
 SITEFILE=50cython-gentoo.el
-S="${WORKDIR}/${MY_PN}-${PV%_*}"
-
-python_prepare_all() {
-	# tests behavior that is illegal in Python 3.7+
-	# https://github.com/cython/cython/issues/2454
-	sed -i -e '/with_outer_raising/,/return/d' tests/run/generators_py.py || die
-
-	distutils-r1_python_prepare_all
-}
 
 python_compile() {
 	if ! python_is_python3; then
diff --git a/dev-python/deprecated/Manifest b/dev-python/deprecated/Manifest
index 17fef0a45496..1e633c4f8e08 100644
--- a/dev-python/deprecated/Manifest
+++ b/dev-python/deprecated/Manifest
@@ -1,5 +1,3 @@
-DIST deprecated-1.2.5.gh.tar.gz 5038752 BLAKE2B 82ceadca4ccef4309b2a7d493620cc8a4dd9160ab7449a3019c9e9bc3a99e8016b6125d4165b71813d9543b7629d55372affdbd14ad2c71d101061595bdb677c SHA512 3a16b5d4f2475788ce919c327b668bb8852dab88adfa959826c9b68ccbfba3207a1c60ca164edacde8a756bd3895225af944a51eebde1230a93a973145231234
 DIST deprecated-1.2.6.gh.tar.gz 5043633 BLAKE2B cc72838dc772db62ca75637268d09cbab4c9acb84b42bd1d2d76397d43b81781cfcef075a9a6e6ca2ab55eda19acae95cdfbdd820c1363e7ea4841fb1cb61b7b SHA512 fcef322c6d9c317081dae365d469d4b26b0d23d8290e7aa0ca18592fb098ae7f535cb5e898cc81e5c734e7e211c847cdd9d5430c1999a4b9612f30934243ee9e
-EBUILD deprecated-1.2.5.ebuild 656 BLAKE2B 9763106db3ce5682550668baa7e5bc03ed271fa8dd115ebde5baaf7cb20016235a0b7e36794468db0264567ad1c64f0e87f2c45e7e3efe626c41e0cde49acbe5 SHA512 58a383055c50ade947e689f9b0ad529d7ee77f40b5d3e50f05a5d80928a022cce56e11f0bb597abc93303643630cf371a5ac304fb52d08d6473471b6ef72503d
-EBUILD deprecated-1.2.6.ebuild 656 BLAKE2B 9763106db3ce5682550668baa7e5bc03ed271fa8dd115ebde5baaf7cb20016235a0b7e36794468db0264567ad1c64f0e87f2c45e7e3efe626c41e0cde49acbe5 SHA512 58a383055c50ade947e689f9b0ad529d7ee77f40b5d3e50f05a5d80928a022cce56e11f0bb597abc93303643630cf371a5ac304fb52d08d6473471b6ef72503d
+EBUILD deprecated-1.2.6.ebuild 654 BLAKE2B 3b20ffa39a7d589623603d4d227ba668af39d08a4b655bf56da18f44eac032cb323250eb23bb935389e68d63cbca1a7e880e1f7875652e5c72ef24d74eb96020 SHA512 d916d0a769494fb6744a0d8fa300445550819ccf367fc38ce8989034843060adb23008d78b190afa614462c5aeb532ce6b7f5e709f8f05b9184d1dc3e99ff0ca
 MISC metadata.xml 326 BLAKE2B 465cb8f46170cfced4ed1ba3af61210b58fba1c1fe0af7f5f9b5d498f1a32993ff19f860231ac84b5f6661a67cc7837aa8a19b81afc108cd44e5d836f3fb93e3 SHA512 19656915996f8905a7c2ea398da098d5ae704445273471730c82c3bc391d4662a6e7fe8bf9b416ce23d3c171008d93bd6b462fe278c7bef64b304b2e467d894a
diff --git a/dev-python/deprecated/deprecated-1.2.5.ebuild b/dev-python/deprecated/deprecated-1.2.5.ebuild
deleted file mode 100644
index 4f502db5e1b9..000000000000
--- a/dev-python/deprecated/deprecated-1.2.5.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-inherit distutils-r1
-
-DESCRIPTION="Python @deprecated decorator to deprecate old API"
-HOMEPAGE="https://github.com/tantale/deprecated"
-SRC_URI="https://github.com/tantale/deprecated/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="dev-python/wrapt[${PYTHON_USEDEP}]"
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/deprecated/deprecated-1.2.6.ebuild b/dev-python/deprecated/deprecated-1.2.6.ebuild
index 4f502db5e1b9..a90eadf150ab 100644
--- a/dev-python/deprecated/deprecated-1.2.6.ebuild
+++ b/dev-python/deprecated/deprecated-1.2.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/tantale/deprecated/archive/v${PV}.tar.gz -> ${P}.gh.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RDEPEND="dev-python/wrapt[${PYTHON_USEDEP}]"
diff --git a/dev-python/diff-match-patch/Manifest b/dev-python/diff-match-patch/Manifest
index eb883c30a4ca..c5e5b2d71bec 100644
--- a/dev-python/diff-match-patch/Manifest
+++ b/dev-python/diff-match-patch/Manifest
@@ -1,3 +1,3 @@
 DIST diff-match-patch-20121119.tar.gz 54113 BLAKE2B 0fcfa46f02f92af0e31ded7c51c651574104fb4d7d70082873981138579b12231dea0eee417614981a96f7ceaa50b288fefdbc21dca687451095dcdc34fe32f8 SHA512 3daff80a6043a0413c515125a21839d9fa1d71f7e2441f4870ebefed35f1accea711814ad231c65de0e3468bbd01402c977fc063ab120b7d9f0e04ef555a8207
-EBUILD diff-match-patch-20121119.ebuild 525 BLAKE2B d93859894916ce73e2658fe8805586fba83a99671b4853788b2b4db0fd36b603f732655c744ef8e85f4fcbed38670aa86bdad69a2d85dee059402c73d3cbfc1b SHA512 6a23a3ed2e7368a5e92918befda639d35a483e2d8da5c578a6c9fa1036249c1e0be0df68e4f24de2544cdaf1cff25bb0f70ea7b4b8aea2306efb12667ec996b0
+EBUILD diff-match-patch-20121119.ebuild 524 BLAKE2B 8d1774ac42b80fdfac0b4a6cf6a6fa45b5636ab5664b23268b32912e64cd888f1bfb9821394c7c1c2c328e0818e94442829ab562755ed9586c0b6341bbb60996 SHA512 d6851d0c61615fc6dd03d24a8efba622df4c5d80c5866b5e8b3556ee7e03597012fd62e9675b8a605ed738fd6cf9bd7e1cfbd2e9970cf9bda16cb772150baba8
 MISC metadata.xml 1275 BLAKE2B b1014d31b63cb9b926bd12d49bf17dd9f204ed5e72522a98926e4c15fd69ced3e826cde8ef86766af00c8d85aa0294b0839b9bed84a9e55c50cd9f2a46f9f55b SHA512 0a5e72080b845fe7ba9b0fb41b51aab1bdc9eb11e702027c9dc1a83c245e54c9b1c667f4e5726a026df75996bdf0ffacf6d3f68ea79705847f657f1b859ee556
diff --git a/dev-python/diff-match-patch/diff-match-patch-20121119.ebuild b/dev-python/diff-match-patch/diff-match-patch-20121119.ebuild
index 63a23390a809..e7adbd9b337c 100644
--- a/dev-python/diff-match-patch/diff-match-patch-20121119.ebuild
+++ b/dev-python/diff-match-patch/diff-match-patch-20121119.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/dkimpy/Manifest b/dev-python/dkimpy/Manifest
index ae8288285bba..f9d20b92a17b 100644
--- a/dev-python/dkimpy/Manifest
+++ b/dev-python/dkimpy/Manifest
@@ -1,3 +1,5 @@
 DIST dkimpy-0.6.2.tar.gz 39197 BLAKE2B e52df97b03075461935e82d2acd17c6eaff8f9fb0b8217b1803dc54434ce2c002e1aa419b0293bdb130045be4edacceaf447dcfc566bef4a5e16e0651ac7365c SHA512 7592153270ea11f59dc67e31a10c91345389d4391f3a9dc9fbd1224410edab4743935763ad5b1016b321bfa7b1c4c0255f26323bd5556f359b0b743bda4e515b
+DIST dkimpy-0.9.2.tar.gz 50263 BLAKE2B e18b1337699c1e843b4878cc84aa9988adaca475cd22b406b558c132a36761669c835dbb9718ba6c40fa5f78efe669d08c8517d6208f783399834737f4805671 SHA512 a1e7ac778f8cf0897793f296061ef67a6945b136db1a7aee18498ce33111d1a0d485b0ce32f52c22c0866be644065e000de57131301000a83a1b55b6a875bfce
 EBUILD dkimpy-0.6.2.ebuild 448 BLAKE2B 56b2378a6df2b9c46d0ab98ed244e11810175442efafc4b8ad9e51a7335af2242924d260e9ddb383301cedbeb6fe0f4a0567daca5a40a7d0b4dbcbc57930f9e7 SHA512 ff09b417f640387c21141ef4e15966f7e7326ac54c578d42bf7c4292fa4f61f32eb778ecb9c7bdc913eb10cc7326aedf869f0ba13593b1e1a2731c4c254e4ae9
+EBUILD dkimpy-0.9.2.ebuild 497 BLAKE2B 14c84d239793b125270fb9d6c568b78ac6e1346f9d1d1079be416d7c955944a57de3047dabc174ac7ab1560b53bc1f333573987f938392e83f85af373f8a9008 SHA512 022da9a3c8198d9d99b7e5956749d070a83fb4240b2baa9dfeec859fc8f27e380878f2ceb253e25c264b31fbcf9afb45367a233f2adec735a1df9c290c325bb6
 MISC metadata.xml 1249 BLAKE2B 736b664d21c016a962c592ce53a86eb3b5de462f6d0ace935bd4b58bd241f961a8b36e652e34fd879d17142ada4772ee583cf776591413ab48f6129f1b18e956 SHA512 b26ef946ab562ed51c8437d66566bc25920428b8c87b27674d48b7e048bb28acae53e14d1b28d780bf8cd85f6cbe34021e80fdae1d76e29107e825cc0fc575a2
diff --git a/dev-python/dkimpy/dkimpy-0.9.2.ebuild b/dev-python/dkimpy/dkimpy-0.9.2.ebuild
new file mode 100644
index 000000000000..8c377b6ba9cf
--- /dev/null
+++ b/dev-python/dkimpy/dkimpy-0.9.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+
+inherit distutils-r1
+
+DESCRIPTION="DKIM and ARC email signing and verification library"
+HOMEPAGE="https://launchpad.net/dkimpy"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/dnspython[${PYTHON_USEDEP}]"
diff --git a/dev-python/dnspython/Manifest b/dev-python/dnspython/Manifest
index 7428b39e87e3..1dcd2f3de845 100644
--- a/dev-python/dnspython/Manifest
+++ b/dev-python/dnspython/Manifest
@@ -1,7 +1,5 @@
 DIST dnspython-1.15.0.zip 252157 BLAKE2B 6766c1e69bc4225b08f3b1b3871fac2aba7ae707de5f16718798ce4d6846308500c5341f9ace1b48d3858ffc965a7295ee42cc2c35ff23ac38d71927dcaecfe9 SHA512 942f7cf083d1b0a9f03f040ceca194c38777f2e40862c388051986112b3f2a4a8426733ff46ec5a155319776e4a856412c3430b052b2f92f251f0e3260eb9bc1
 DIST dnspython-1.16.0.tar.gz 167172 BLAKE2B a246684aae8651d94b4312a4b4cce2236a0c4f2289a8fe8a2bb8e81c6beddf6e81a7d54928bc50f950fde862b27e589e83fa9f7aaff7d263a6442f47fe9bb3bb SHA512 825a1815855e036ea1dfece6ec0d42242f83163960439ecba3da58d9adb85b65dda7e628cf38c386807a6c0c36aa026d5e95f7a1bdc2927aa2f6f042f873c14c
-DIST dnspython-1.16.0_pre20180731.tar.gz 182538 BLAKE2B 3a472091fccc4f37d65681727643677472837fd6be0c4fd6aaa13afd1fd4362eb27a5ba4ff6babca46fe15c2f5318ddbba22ce058b522f763baa797e1e2d1ab9 SHA512 67d17ab7cb48c370c3c2dd5cb935eec5ab7e3ac0c912e179931f395899ad186ba869edd8b870c043ba9fb3545bace18549d2a377f2ae2c278660fc488e68a20d
 EBUILD dnspython-1.15.0-r1.ebuild 1030 BLAKE2B e295a0d3dd2d9a3a9119b973d0dfeba069474ec810c14dd8769f2736524386de3980c4eaed66702b4ac5ccb5f550f1a6c8e01391f6a27e1106ef64a9b8b3d0f8 SHA512 b9096e129cc0fd5c2fb93a1b9b4ed4415cbf091a9033de170cacf9bb770e7912d7449def6561a570473f9ceeea2f83563373e43a6339a29b475295f4724f6233
-EBUILD dnspython-1.16.0.ebuild 1162 BLAKE2B 5c861148155ba2b2aae7acb098fdf58868ceb19357e5e717624ae21ca3a2d329b65e50e324e3fd096c25e2fe46155b467461d548439e28d0d835cb273cfddbf4 SHA512 3fd3ce2a9a9ca7c97c3704bdc6f49eee63c9ef084b802326a31b750c1d042dfc5a7303fb4e17ab3fb67b371eef2102420be513898a0b8c69cf3d0a8b3dcba980
-EBUILD dnspython-1.16.0_pre20180731.ebuild 1224 BLAKE2B bd50703c79abc827e745ba915aa103b02bda0550cc7901780be1f428145e6f3df0932b1c5a2c645f5a827525ef95c8000280c7a879d847c547566b43435e1006 SHA512 0ea74618e8e37584056f1e83def3e7ce86920b67bbfdd1b7387acb7f629fdb27c0cfd0b39694dea41aa02b5690da2039e766bcdaa3b7cbfbd70cc270b2778dbe
+EBUILD dnspython-1.16.0.ebuild 1125 BLAKE2B fea15d75b9b4a27f2e41f528449746756e35d073592e043bfb06597577f67d332b8b9d0279a0daf8e51003e5a2156b04eae231dfe5f5f11770f0df5919b5814c SHA512 64c5d7891e4f1f869f5c291ab1d9e4e8e0f76530d24aee4db84740d6e071d62f53455cc4096801f1bd0c44b10ec4c2e1c163599a46a770d38affe624585ec126
 MISC metadata.xml 1458 BLAKE2B 9a04546a3cb62f7ed6a72a8416e7f38aca15733a444970e84fe0134d0097eca4ae8fab9433f66196539de66a4b6b92103a4531f9248cf508a2e0f4d16c85c172 SHA512 40c86234936ba4f0c01a98266e74d49a80a8a48d4761b887ec84fe3ff9b534e7b6daf3c317d299b1333132a6025e49abf63884e7d6d0634c876dc74b470e0a7d
diff --git a/dev-python/dnspython/dnspython-1.16.0.ebuild b/dev-python/dnspython/dnspython-1.16.0.ebuild
index 99bce355fb93..6baa9b62a202 100644
--- a/dev-python/dnspython/dnspython-1.16.0.ebuild
+++ b/dev-python/dnspython/dnspython-1.16.0.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
-inherit distutils-r1 vcs-snapshot
+inherit distutils-r1
 
 DESCRIPTION="DNS toolkit for Python"
 HOMEPAGE="http://www.dnspython.org/ https://pypi.org/project/dnspython/"
@@ -13,8 +13,9 @@ SRC_URI="https://github.com/rthalley/dnspython/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="examples test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/pycryptodome[${PYTHON_USEDEP}]
 	>=dev-python/ecdsa-0.13[${PYTHON_USEDEP}]
@@ -23,12 +24,9 @@ RDEPEND="dev-python/pycryptodome[${PYTHON_USEDEP}]
 	!dev-python/dnspython:py3"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
-# For testsuite
-DISTUTILS_IN_SOURCE_BUILD=1
-
 python_test() {
 	cd tests || die
-	"${PYTHON}" utest.py || die "tests failed under ${EPYTHON}"
+	"${EPYTHON}" utest.py || die "tests failed under ${EPYTHON}"
 	einfo "Testsuite passed under ${EPYTHON}"
 }
 
diff --git a/dev-python/dnspython/dnspython-1.16.0_pre20180731.ebuild b/dev-python/dnspython/dnspython-1.16.0_pre20180731.ebuild
deleted file mode 100644
index 2384af49beb6..000000000000
--- a/dev-python/dnspython/dnspython-1.16.0_pre20180731.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-
-inherit distutils-r1 vcs-snapshot
-
-GIT_COMMIT="be7e71e54a6edc87ead1b15af8981b8921e0e83d"
-
-DESCRIPTION="DNS toolkit for Python"
-HOMEPAGE="http://www.dnspython.org/ https://pypi.org/project/dnspython/"
-SRC_URI="https://github.com/rthalley/dnspython/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-IUSE="examples test"
-
-RDEPEND="dev-python/pycryptodome[${PYTHON_USEDEP}]
-	>=dev-python/ecdsa-0.13[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.1[${PYTHON_USEDEP}]
-	!dev-python/dnspython:py2
-	!dev-python/dnspython:py3"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-# For testsuite
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_test() {
-	cd tests || die
-	"${PYTHON}" utest.py || die "tests failed under ${EPYTHON}"
-	einfo "Testsuite passed under ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-python/docutils-glep/Manifest b/dev-python/docutils-glep/Manifest
index 1a6a6cee21cd..2eb9c8a0ea99 100644
--- a/dev-python/docutils-glep/Manifest
+++ b/dev-python/docutils-glep/Manifest
@@ -3,6 +3,6 @@ DIST docutils_glep-1.2.tar.gz 6771 BLAKE2B ecb17f69dd2edb12d81ea1bf90789564e86b9
 DIST glep-0.4-r1.tbz2 4667 BLAKE2B 34041a972c1edae500d973a2002719a3208c84e042bad231746f83cde99e9b72db835dbdaef536c50bc73c6bbb27e4dc61fe7563bc520b006a04defa6a952c83 SHA512 098d9f5043a60af9dfac63f6472b576e66ffeda924902ca825ed63f573aeb8bad7c9f9a6853fd99e648683488ee6db2ee55c139df3dde06983b72cfb5dd8cdd3
 EBUILD docutils-glep-0.4-r1.ebuild 1153 BLAKE2B 1db9e9c166a235e4da1e5eddbc767f10d9381283b20169a47fff45d1d2ed39c382412f71929e23b49966c97803cefc67bbde254e2f0cbea0cb24beb7ecb5b235 SHA512 7a40e104bb60ef53a9c3c6df65d6a58331b5d1f671b759e42faee518dad584692997b063b8cee47a0db3988dba08b51177ed7c29cf924c94fa9ebb468d0b48e6
 EBUILD docutils-glep-1.1.ebuild 834 BLAKE2B b489e6691c62e197b4e2728fe05436a7c753a48a1dabe70a46b7a0007d324fcf94b2785d7cdef01dd411029bd10f1b0aca2f5cad8faecdc6b71f8bdd08441776 SHA512 d92f970556aa3c6fb264d36eb1520b00195c6d9fa12837bfbcb49f5ed52f2fa41697fb853b008fd3a2e5b0a5241562f02da93df3cbb4cf151d0fd41c6223d69f
-EBUILD docutils-glep-1.2.ebuild 835 BLAKE2B f7d64aa918745171bdf1848c64063a0b7f81e400eceeeb150f8b902a578435fafad03f7b248caeb023fe56ea93e9fc20ab0c3d3fa27a0c221b7f2d508a392ad0 SHA512 ef3846b94377829ad51f0bed99b53fa8724a8a878d7e911dea39563acc8ad64e20f54cf9e2bc8d8437c3209ca5ab8318a33b8f445ae4fee9171c5eb036f36bee
+EBUILD docutils-glep-1.2.ebuild 834 BLAKE2B b489e6691c62e197b4e2728fe05436a7c753a48a1dabe70a46b7a0007d324fcf94b2785d7cdef01dd411029bd10f1b0aca2f5cad8faecdc6b71f8bdd08441776 SHA512 d92f970556aa3c6fb264d36eb1520b00195c6d9fa12837bfbcb49f5ed52f2fa41697fb853b008fd3a2e5b0a5241562f02da93df3cbb4cf151d0fd41c6223d69f
 EBUILD docutils-glep-9999.ebuild 570 BLAKE2B cb654f71ce1c806d6a99796f7e8384d9c9e9c4b71c9a2a50cc900e5c9b7dac6774f5698f929fef77ea883bc75c219f6ad0e5273a98a6dafae4222c1398b75dcb SHA512 b4542db1a99d274ec73f9ec9d46e0bc4490091d7dcaff07173b401f28e1371f6a80356e33e0158fa1785d5ab949e05c7e7a0822b76e0a5eba437dc22ddd1c5f3
 MISC metadata.xml 264 BLAKE2B f956660bd90e0c6757ce9a7284329bd8f9d14053624a6ac4a017e5a1ffba57ee084542dbc9ac887756dd64930cdb00e33dd56361404bbbd2d2d27213f84da4c5 SHA512 4d8147ee0077ed9f48ca883928f98dd317506bc25a1ba5c96fcd32870dcefae56ff47560cb99eb23a5339f893d19fa4529cc432afb7999dfa04c727cc6989eaf
diff --git a/dev-python/docutils-glep/docutils-glep-1.2.ebuild b/dev-python/docutils-glep/docutils-glep-1.2.ebuild
index 63b86045e925..1f97da36e487 100644
--- a/dev-python/docutils-glep/docutils-glep-1.2.ebuild
+++ b/dev-python/docutils-glep/docutils-glep-1.2.ebuild
@@ -15,7 +15,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 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~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 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 COMMON_DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/eventlet/Manifest b/dev-python/eventlet/Manifest
index 913f5907bd14..74acd7e1740e 100644
--- a/dev-python/eventlet/Manifest
+++ b/dev-python/eventlet/Manifest
@@ -3,10 +3,12 @@ DIST eventlet-0.20.0.tar.gz 466828 BLAKE2B 43beb8f924c5e375a554db3fb90e3c39121ff
 DIST eventlet-0.20.1.tar.gz 469509 BLAKE2B 727844b70c4e1874a58efc95551dd7f12bec1c8d01cadeaedbc49f00a86e1393b690076fe720e8efdf00107f72b892a3a1f4c4921f95656b904221e748df7f09 SHA512 875c1ca82822a486bf28866c7d1f34df2419e7d33450a21740434d2e7f15c37a1090436cb7fe1feaeb5c810d39e4b238206c502323317897c8a42e844cbe7734
 DIST eventlet-0.21.0.tar.gz 484191 BLAKE2B 07d3f5d1dca11032d51fef9ceb624e07da9e93bed914233da9abbdff27f21f2482b9e3417b50a63f383cae13615c6a781104a05dfb66f28d6ab4e469bce06ef9 SHA512 4ee682ca8faf870ff6f1d72e93527028f73ae13d7f755eceafb23f3cde48e52b83ff04b645b7e90299997713de93c52f244db8b81d6abc7788a56ea38c7b0f47
 DIST eventlet-0.24.1.tar.gz 391579 BLAKE2B f8abfe6d18ed3b2edf4b2fa3d197abdd1e9029dd10c035427a2ddcb70cdaa76da114083ce7016af7151927fcb2f93ce6ffa0417dbe1a125948318baaed2f6184 SHA512 867f8ead3a6c0dd692c5cc5d9f1181b04456bdb270ea95d84f7f97da4603b333df539721cda002437c035fac51134bee8cc3495e09b6a25ae1c46fdaf015d0c3
+DIST eventlet-0.25.0.tar.gz 392105 BLAKE2B f528434dadfc15ce91b7842c47d1942963c430758483e56c756267f71910310e5ed6bc8b76cf3e8a9e3421c016776cf5afab6b675e49aaa4420685aee8c8b999 SHA512 f42549ecc6ca6833d611dc178593e69ff0d63881111fe7f9357b26c602a57dccbbc53101b86ed01e1e2b4a201afa8d170ade1052fcec36aab8776c56a8a15b42
 EBUILD eventlet-0.18.4.ebuild 2032 BLAKE2B 63837d2cd0c1bfc60a90edd9dd5fdd9fb350393bf2746b1a26308ab83d768f1929a2126d73fb846ce06db05f93631f806d27c8e8e8b4dd98f4dc38cf3a02093a SHA512 2306655b590f797fe6fde21ba7f0ebcc42480426d14c3a7a484924babf3b82649a4727386bb6ac8845545b698f9d20c563b6bfcec5c3ccd5b18799dc4f1d6c69
 EBUILD eventlet-0.20.0-r1.ebuild 2136 BLAKE2B 93e89d1901920feffc42f891cf588b23638b0ee8974c1653991d568dd3c407e69bf29cbd402677768f49baf99a816fda4b2cf685bd64236b9bca0353f473e7da SHA512 63897686d8a41c07c96047660a29b4c52d6647e65a9a0f832e445f43287b7d684ccf7ccb982d5814fc8e51cc2e680240fc09b50b815a986cde04e3a0d084662f
 EBUILD eventlet-0.20.1-r1.ebuild 2152 BLAKE2B 041c85d02ec79ee2aa0e7893d8b38f7609aff6b4b975b66eb1f1825fef6fe1584ea70fd7f8781b5515e7f77c1aa947cbdd0d4eb6179336f4d608da1db65de37a SHA512 6c6344ff54aa32452821c3b85c633b417034cb31d4fbed24d5cb8c735b81668d1971ea118b8e61a5fe5f2a0ecb684423f61f18f0e5822040332f9bfb342def5b
 EBUILD eventlet-0.21.0-r1.ebuild 2154 BLAKE2B 208f7c80894393af6f730f5b2e104b4e61790245b212ee4165f1f7c4a1072e1f6730ca378a31270a6e334ffc3eb6527543ed908cac608890dbbeb0d071040028 SHA512 12b9056a134542d0053ea237a1311b64aed89f4bbb7c2f61aba1c985b508b5ecaee92f86040ab2eae47ed8ced9f8eb92c22529349c9ef70cdbe75c8beb77eb58
 EBUILD eventlet-0.24.1-r1.ebuild 2353 BLAKE2B 5edc04a9ef60c05729cff78da418afcf058e5f4808bffcae8eb55cc381dcda6698b4b5a53e6a79252360b65276aab54799ac6be4e71650fe4c27a5cecd722e88 SHA512 fa0d91230fb90c4ecc38d7b0b94d0faf3c662019f7dbbc7962c451686e8101795da587003a58bfbb544b7020f446a82a121c381234d9159a29a8f24d0e1b22b3
 EBUILD eventlet-0.24.1.ebuild 2354 BLAKE2B cecac273fa58fca2446c00882b94314733951e3c8ec2c369ff9ba06faeb9fd56408f26d499b3613d96d1473ebdec46c162b2470c1162603980653624035293f1 SHA512 f60b7379073e01931f2134f9c10bbd5b668fb7c1ada4df730f490c3f83fcd872b530afbe240fd1bd9ced707ad183940a4b3efd21d648d845b11ef61859adab89
+EBUILD eventlet-0.25.0.ebuild 2356 BLAKE2B 6c623307f3ad7d1de61c0e80aee3f11cdc392ae0a8f8784b6c1e579e96f0453639b00693e9c7034d6683af1f43648f0046b32abee6c6597f4834586e3f3ade7f SHA512 f09afd1d165b090a4e4bd11b194655c6031dd1cb1391ddbecb71939d1cdc4faa8eb58535d837a32305ccb4dac823e032cb5d8b26766e16817d8e33d9b1b5ba6f
 MISC metadata.xml 380 BLAKE2B abdf12718464c834d63994ad012a6d47279fa6f0e5cb0d075bfbbf24167438220ec9681eac874c93dc3abd9c1498a1a7f658a622f8ebe764cb6803b1b2bb4561 SHA512 8100edfde1885122848aa543b99bbc8529b9dc2aeea3b7efb74a3d1e8e01bdd2110e4cdce2c4ddeab9fd0182f193118e876843a61a25e17355d0916d50331daa
diff --git a/dev-python/eventlet/eventlet-0.25.0.ebuild b/dev-python/eventlet/eventlet-0.25.0.ebuild
new file mode 100644
index 000000000000..ccae643ba72d
--- /dev/null
+++ b/dev-python/eventlet/eventlet-0.25.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Highly concurrent networking library"
+HOMEPAGE="https://pypi.org/project/eventlet/ https://github.com/eventlet/eventlet/"
+SRC_URI="mirror://pypi/e/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc examples test"
+
+RDEPEND="
+	>=dev-python/dnspython-1.15.0[${PYTHON_USEDEP}]
+	virtual/python-enum34[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.3[${PYTHON_USEDEP}]
+	>=dev-python/monotonic-1.4[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]"
+DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
+		>=dev-python/python-docs-2.7.6-r1:2.7 )
+	test? ( ${RDEPEND}
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	# provided by virtual/python-enum34
+	sed -i '/enum-compat/d' setup.py || die
+
+	if use doc; then
+		local PYTHON_DOC_ATOM=$(best_version -b dev-python/python-docs:2.7)
+		local PYTHON_DOC_VERSION="${PYTHON_DOC_ATOM#dev-python/python-docs-}"
+		local PYTHON_DOC="/usr/share/doc/python-docs-${PYTHON_DOC_VERSION}/html"
+		local PYTHON_DOC_INVENTORY="${PYTHON_DOC}/objects.inv"
+		sed -i "s|'https://docs.python.org/': None|'${PYTHON_DOC}': '${PYTHON_DOC_INVENTORY}'|" doc/conf.py || die
+	fi
+
+	if use test; then
+#		sed -i '/This is a Python 3 module/d' eventlet/green/http/__init__.py || die
+#		sed -i 's/^import/from OpenSSL import/g' eventlet/green/OpenSSL/__init__.py || die
+#		sed -i 's/^from version/from OpenSSL.version/' eventlet/green/OpenSSL/__init__.py || die
+		sed -i 's/TEST_TIMEOUT = 1/TEST_TIMEOUT = 10/' tests/__init__.py || die
+	fi
+
+	# Prevent file collisions from teestsuite
+	sed -e "s:'tests', :'tests', 'tests.*', :" -i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	# https://github.com/eventlet/eventlet/issues/152
+	use doc && emake -C doc html
+}
+
+python_test() {
+	# Several errors 1 failure
+	# https://github.com/eventlet/eventlet/issues/151
+	nosetests tests || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		docinto examples
+		dodoc -r examples/.
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/filelock/Manifest b/dev-python/filelock/Manifest
index 53dba43df497..1dbc6b3be695 100644
--- a/dev-python/filelock/Manifest
+++ b/dev-python/filelock/Manifest
@@ -1,3 +1,3 @@
 DIST py-filelock-3.0.10.tar.gz 587469 BLAKE2B 8a116f038f344f282540243a757524bd2e72ab8419a0cbdc35910245b8794cab0f96f93d7d8e3b267018054aa1459892506edc9cbfe1099d141a44be9eaa937a SHA512 1fa4594eaba6689ea61149a60a71e86007297614a1c22dc6c94b4774520d396ff8ad03076dfdbb2ce49d2b6e42c374af065a115c167d81cf6107918abfbe52ef
-EBUILD filelock-3.0.10.ebuild 987 BLAKE2B 573a8cbad2738105268c6e077d3333a716fad616c0c33ff93c1ded4ea8e3e4c016d130da2a62ef033e61246107289de5ef07a85d202ce5a5676f9145a5ed4974 SHA512 5e34a124c1a2e6dfeaec4a4ec4d152385f43d8ce842c5f5e9cdeb8e850ae92a7aae7cabd8643fe2fed921ea7be2ac8a4f17ce076e5fab22b949ef968922b6950
+EBUILD filelock-3.0.10.ebuild 999 BLAKE2B 83299787e278539ad67652d0ab1be18b52e77b5fe7eb26b117a0701ef24f3960dfae92a8e78467fd6b4dca35bf5808bf5d7c117a0bb6474f8aa87022f5eb6672 SHA512 b78f09b0a25fa822101fb1418fa8b4741aa3667012b116f535a1aeedbf099ee8fa9942b363d625bbe9d3ddef5701d942a8a5672e0ee0cf94a6496ce6e79a3734
 MISC metadata.xml 356 BLAKE2B 795142cf645edcb80e9a087e62fadbab50c5db359946ec290dc0c0b1c4ae12a666a0dbba4b2212a27310339c783f0c13e0a28a42df45a4cc9e781674d9514fc2 SHA512 3617ad60e67b84ce0d36bb1caef8a6b1dfac31d487ead4887b70f575726974b27d73208cc8ca0039a2334c6deb6609cf8ed85c8404c6b3a4efe0ad7bbc69507a
diff --git a/dev-python/filelock/filelock-3.0.10.ebuild b/dev-python/filelock/filelock-3.0.10.ebuild
index c5defc6f7946..494e569d66c5 100644
--- a/dev-python/filelock/filelock-3.0.10.ebuild
+++ b/dev-python/filelock/filelock-3.0.10.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/benediktschmitt/py-filelock/archive/v${PV}.tar.gz ->
 
 LICENSE="Unlicense"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/formencode/Manifest b/dev-python/formencode/Manifest
index 8215ea3d1b06..e4f9b0e74c48 100644
--- a/dev-python/formencode/Manifest
+++ b/dev-python/formencode/Manifest
@@ -1,3 +1,3 @@
 DIST FormEncode-1.3.0.zip 347674 BLAKE2B 27cf411224338403036fc99eac5bbaf3d24d211afafae2689e638ea2d9c95f9475bf42246c9bbd50d748fa1d8aad14633da686f63cc409520455b593da0aed34 SHA512 12c7c9fa36173c209682a6e1d68a074c64c9a5bd30e4f6b6b851b55d43c350ce1f79f666a9176add65f6bde554bc5deeb82ac965005f9457c4c2b0447af0cea9
-EBUILD formencode-1.3.0-r2.ebuild 1288 BLAKE2B ef894c270e7cc6106214905da3b693e4feb5bb9e6319b4e50d6291e318c35d053751f8609cde973ba9513d5592966d0046b791bd7c499784535e9136aa7f5a28 SHA512 a79b854f31131dac1a94ef9967145724ccd0daa0b1b7bda93ca04217c5d0828b4dd417a7b05e880de0d3143edcb92f1301acee249c652cfee13549e4a1603615
+EBUILD formencode-1.3.0-r3.ebuild 1284 BLAKE2B c2825d2688e12c4c012dd5a6075d136ee99466a61adc68be23027d36ea7535a90dee9f46c64a632f0816c15390a6c0da18a7ecc06b925d1017df94654d72599c SHA512 a88a527d409588890fb5f8ebea066d168e0a7cb0591b0182c429f7b34a386536ee68923a82721da3cd1c3303ca251ab49e0b4d5dd1b94b5c3597d20740d3f64d
 MISC metadata.xml 313 BLAKE2B b2afc0db55b4200fc468745d4798933c54abac7014e1d3e87080d1601101cff2c6642b31a83b620e9b68b8181dfeeb0f6d8eedec6bedde9d3c5716ccaec7d229 SHA512 75c69f2f2ed7d4415bd057215675f4f4ed90b7c6ac1c402e61c6c2404600a5676298d3f0eeb58d287113ea34304e34ffe3731646d96264f776a37b0812d4db9b
diff --git a/dev-python/formencode/formencode-1.3.0-r2.ebuild b/dev-python/formencode/formencode-1.3.0-r3.ebuild
index a64c1af7d6f9..6a09d0e8b3a3 100644
--- a/dev-python/formencode/formencode-1.3.0-r2.ebuild
+++ b/dev-python/formencode/formencode-1.3.0-r3.ebuild
@@ -20,9 +20,9 @@ IUSE="doc test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
+		dev-python/dnspython[${PYTHON_USEDEP}]
 		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pycountry[${PYTHON_USEDEP}]
-		virtual/python-dnspython[${PYTHON_USEDEP}] )"
+		dev-python/pycountry[${PYTHON_USEDEP}] )"
 RDEPEND=""
 
 RESTRICT="test"
diff --git a/dev-python/idna-ssl/Manifest b/dev-python/idna-ssl/Manifest
index 8fa0e888e375..413e1b899cdd 100644
--- a/dev-python/idna-ssl/Manifest
+++ b/dev-python/idna-ssl/Manifest
@@ -3,5 +3,5 @@ DIST idna-ssl-1.1.0.tar.gz 3377 BLAKE2B 4a3baee5c976bdde4092eb3a980e555a72fb7439
 DIST idna_ssl-1.0.0.tar.gz 3375 BLAKE2B 28ecee9e271619b7a4f3698aacbdbf0e953ed9b52640818007dc86f34145d8ea000260991d44cfa4cd896b74172b0a32962c3053152558b8d621396df2e248de SHA512 d1f7479cc3edff164bb26deb05af757906ba91241bc668f1b087560087a89f741a0b36e166bfb8142128ceed6008621ab36a2556ed2304ea6374c19982bc663a
 EBUILD idna-ssl-1.0.0.ebuild 590 BLAKE2B c6db9cdacb6682f76d50404d294270a0ab7a7a89c69f2393c925a31e054f6a073ffddabb8d3a9129a2a0ae6cbe491ac7c6d3cd2a3e16ef03fce8859c5321582f SHA512 d67f8321eb4fea63e04f20b53089c5a8a536557d07785dba33ebf59b4ab0706f1500bcb02c8a8ca2a1a8be626d13b226ca5c57b4e59b2992cdd4e98d9c75ddd0
 EBUILD idna-ssl-1.0.1.ebuild 525 BLAKE2B f42ca98ebd8dc26f0cb58d621acd7f1f68163776a99973a943fd3e77b1ab16f12c53cc8b433c4cb1b5f50becd2d599d66562fc8fa4472f31a4863ca4f264980e SHA512 a235a7adc2e600f6a289feef6aea72d18851c5630d811de44897b843ce0978effd874fd0aa8dde65217d9e2cbfbb404b213a3fd34874a65f5743c6cca0fffd3a
-EBUILD idna-ssl-1.1.0.ebuild 539 BLAKE2B 1768b13162bf3b1439dc3bd18d339c06c390cbf6bcae847b648d283f42a1578b29aafe146d4c81b48c1af1a1dfbb5720f2f282308d0d7c1e28e77f908eb927dd SHA512 0eedd3dbbdde13912c23cc61ada2684d399c4bf0e67644f0716aaa8235634bdb2f3a0175bca347d65c2c15df0daadb1da2f0626c91527135581bbd49c4f8b333
+EBUILD idna-ssl-1.1.0.ebuild 537 BLAKE2B c00eef54ffa1cfbc755e6291aaa2d2918cb414ae3eea1977418f33f1e42393bcf8b8258d7a026261cf89282171a34b9b76fff1bfa8e11f28977098271e426603 SHA512 c8acd9056562585be4d6f2e7a0452b97a5ca938af6047709ea261fa83de983b0db0318deb401a76345db83fa55d4e2be695f7fe422f1a66d8ce308d0103fc9d1
 MISC metadata.xml 368 BLAKE2B b2f78fb9dea9edf6f2b2a7fb72412302b014e8b1b536653ae12fcd2bc8fa94bb253ff780aedcfd32fcddfcc2030b363e12440dfa4efef1a886e99b8b0acd8dba SHA512 531bbcdb7ec492aa4c38f4352cb0a93c618c60d9f8920ff476f6f8b7991744ccba2188a9e441e696a02d1c4ef4ea9af3afeb2c81a0d046e700796ee45b7f3888
diff --git a/dev-python/idna-ssl/idna-ssl-1.1.0.ebuild b/dev-python/idna-ssl/idna-ssl-1.1.0.ebuild
index ae4e833f87a4..835310677387 100644
--- a/dev-python/idna-ssl/idna-ssl-1.1.0.ebuild
+++ b/dev-python/idna-ssl/idna-ssl-1.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/importlib_metadata/Manifest b/dev-python/importlib_metadata/Manifest
index c90c61ebdae6..ca5214d9d739 100644
--- a/dev-python/importlib_metadata/Manifest
+++ b/dev-python/importlib_metadata/Manifest
@@ -1,3 +1,5 @@
 DIST importlib_metadata-0.18.tar.gz 23341 BLAKE2B e1c43a760b141b0589973672ad1cd6c47e077293353f67ebe2c2b3631265712dcecc8e14a57803539d2276d5d908fae3c4ac07165ddd5937cf53955ff896001e SHA512 2f39789725548bcb37061b0b99f90802a2919339db6b29f95b38811b35f4cafc7acfb4cca1167e28a4738ba195af31344f59ab457d87710764d1ba8f06034b18
-EBUILD importlib_metadata-0.18.ebuild 1359 BLAKE2B a860ed474848bba4cf67513c8a734c2a863ee0a1614b4b34e4759e227f7d1473fd75de51e9c51fa3fff72e67558791f81cddc6ddb975328c6092a0e9d1681c41 SHA512 8e4d95426fd9470cff5583212fc6f4c8120e4e8f32fe14eca40d93def52a09acf3172a0874be35e0f763afc6c9c39b29f4fcddf92768ae205b93ddeb6258d983
+DIST importlib_metadata-0.19.tar.gz 23338 BLAKE2B 10c43bee5324804b359f951e5d375559e3a58663b11f0bda1b39ce82dcdd0ba735083793a954e2ac18b5fd607d9ea5628a86f9c345c83d718a7e46738774e0ee SHA512 2d0126e7430804b2295ec159778082806957cb86b5c7408c38064cc7c7e62229d382778284a5a231925ab336a7cc6da8e705f6bd7ae6da66f11acd1229bda17b
+EBUILD importlib_metadata-0.18.ebuild 1366 BLAKE2B f4ae505284ce2d95ae2da39d4aa47fc5a83672ee41c0f8f379e23287e4d5f743ec3978132fae9c9dd1098f7f3621ed35402a27c867ffe48bf62cb370c7b9738b SHA512 793d3f8582b947f0812e3be611721c40b220bc3dcaff3534259e66c18ddeff6703704ec611cc8153160716adb852be89d65eab2e8eb72e276e635d26953b8b60
+EBUILD importlib_metadata-0.19.ebuild 1415 BLAKE2B b4dc5ef1ce10a8b54a7fc8dd4ab990563a9e7171331c5fb89f7581cec5e0d392849c6965fb9574458061b67f239001d971e2581ab81b89bfa5869e432fbf7571 SHA512 190a1941b0ba1cb2a419b6a18c107da30703c6d4253c321c60f8cc20e2cbf064cbcba890cc3e5f21ce9dd952bcdce530748bec525207e77ed26725323aa31001
 MISC metadata.xml 575 BLAKE2B fd32bd69ffa26679f44ae19012bf57e77219abea01918062e2290e48121209353d5a50eb2aa028ca8359b3c8f40a35c1cc4c48e2f05cb855a3016f2f01da41f2 SHA512 fdb2a87b50b50fd23d97c7dd9875958ad9ae6474f6e0a0e5fb8df12ed381c30e21a71ae2eaf3baf03ae1ab973c0c7827c8a84fa09c8ca52eb938439e4f66e17d
diff --git a/dev-python/importlib_metadata/importlib_metadata-0.18.ebuild b/dev-python/importlib_metadata/importlib_metadata-0.18.ebuild
index dcfb1283d7ba..15de405a5ab5 100644
--- a/dev-python/importlib_metadata/importlib_metadata-0.18.ebuild
+++ b/dev-python/importlib_metadata/importlib_metadata-0.18.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/dev-python/importlib_metadata/importlib_metadata-0.19.ebuild b/dev-python/importlib_metadata/importlib_metadata-0.19.ebuild
new file mode 100644
index 000000000000..b0d853f13ed4
--- /dev/null
+++ b/dev-python/importlib_metadata/importlib_metadata-0.19.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+
+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 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="doc test"
+
+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="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		$(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' pypy pypy3 python2_7 python3_5 python3_6)
+	)
+	doc? (
+		>=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+"
+python_prepare_all() {
+	sed -i "/'sphinx.ext.intersphinx'/d" ${PN}/docs/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build ${PN}/docs docs/_build/html || die
+		HTML_DOCS=( docs/_build/html/. )
+	fi
+}
+
+python_test() {
+	"${EPYTHON}" -m unittest discover -v || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/importlib_resources/Manifest b/dev-python/importlib_resources/Manifest
index 5828b369a490..d2453a92e732 100644
--- a/dev-python/importlib_resources/Manifest
+++ b/dev-python/importlib_resources/Manifest
@@ -1,4 +1,4 @@
 AUX importlib_resources-1.0.2-skip-wheel.patch 305 BLAKE2B 741e9825c64a88696603d31d9b749fcd3756bcb44755730b12d22afddf911d178365904885d2323aa5b331f44f20b6e3306ad03adb60794c6c83cd1b0795c902 SHA512 6e3f90b1544c6de97768aaae708d1bc93494dcdf1cf10d59e48b55406c9a6c9bc9eb5f5c0d034bcff99eae5274c1f1a467a9bd2a4292f0eadf0686286b879f77
 DIST importlib_resources-1.0.2.tar.gz 23602 BLAKE2B 24c27b45ec56d3838b039baf2ebc1e0c5ec582d5cfdeb5cf26587255bf8b32aa1fcf43802cabca3b82b3ddec8cdf2616d10489c3c1aca77c9fa91af1f25ef9e7 SHA512 50bfc5130a2c9c9354efef1cd7132e805ed0f13467ba67172f83e11d907212bef3957aeef51fd904b73996c8280008d99c918637956a470448dfd67ef4807f82
-EBUILD importlib_resources-1.0.2-r1.ebuild 1182 BLAKE2B ac2d16f3e2d5247a13490083c3f89fb987e5a30208d4e0ce63eb5e1fc7a254f80bc8d71f086c4ff26a16223742869dd0f7d262ad55a4b11fa6438545fc9a0caf SHA512 09e57e97cfc798deedbbb26e8053c4a250337eb183ecf6ebdd6bcedf6b12f317ac9b933bf5ee65df432cbc98f75205ff7ededb5dfbecb3a79f8d06a6314e63f0
+EBUILD importlib_resources-1.0.2-r1.ebuild 1238 BLAKE2B 17b3c7c62bbe70844287a51264db2bf044181fb4717d3693bfbfb5ec47d8f0012aae62de2d3a4e7fce666bba910432a032a799bc50bf6330fe144b0b51e050a8 SHA512 a85ccd9735549775bfaa3c804aae7ddac3f42179fc78f4858b522de713a806f5793525ff546111d7a326c09ad11560fd6774ef00905fab3095197136e7d168d3
 MISC metadata.xml 1121 BLAKE2B 51c2d6c7fbdd7da49d9eb489e8268cb7d5ac85c0ed2505784b377cafed49c29fbc895ae5aa831418175f6f826822a92b6491fc82cbffea428a33b9cba76d0408 SHA512 99fd2fc5abc3deafdfc7eab5e159c80836c3b58ddab63e9bf74f102ca917567be0c5068870206410e82937cdb05d68cb9964402bae9291bc3028417cd316f8cf
diff --git a/dev-python/importlib_resources/importlib_resources-1.0.2-r1.ebuild b/dev-python/importlib_resources/importlib_resources-1.0.2-r1.ebuild
index 5ebc09e8110e..e6abfbea8b39 100644
--- a/dev-python/importlib_resources/importlib_resources-1.0.2-r1.ebuild
+++ b/dev-python/importlib_resources/importlib_resources-1.0.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/dev-python/iniparse/Manifest b/dev-python/iniparse/Manifest
index 95c72301fe12..e4b7f9b88678 100644
--- a/dev-python/iniparse/Manifest
+++ b/dev-python/iniparse/Manifest
@@ -1,5 +1,5 @@
 AUX iniparse-0.4-python3.patch 16919 BLAKE2B bb33df2937755ab4381adcdc17e3ae72eb08f0f7d22d640aae06fbe52f16f90218e298c674a030fcc299dcf7107b1073fe4e3ec8f34683d283b9586316bf9aa5 SHA512 ed292dca5b124da5de1617cb2ad4f743b836607226805e488572b37cb08e9a71595ef2e008a26f99f8dd0acaa1308a77cdf58b48cde231524d034138df26ef7e
 AUX iniparse-0.4-tests.patch 779 BLAKE2B ccda778ea17d34d59fe16e0b63fc140ac12c1e06756e1959327787e8f7cf17dd070857b15ee62e5f6a62401da64aedd8819adc2db54936179b0b7b76001e5692 SHA512 543770491ca075463e4947d7adff0c846e31e03ba7b263c37d9728b93486ff751d8066cb5cdec3a244c30e00f6f1edbd39ec6ea1188340d0a3edf460af147ee3
 DIST iniparse-0.4.tar.gz 31278 BLAKE2B 1d92322cedd115a68f4133f477ca772e4d24b48991c07fecf3d22e86ac39f0626ffa7cebecfa15a200dc9fcbfac205c1e17aefa35e335a1f86f3919a3f9c1d58 SHA512 d59eae7c1ce474c89eddb0b0cbff5973444571728aa0c6ce5b3632984353415f7eec4de63cf007c276df0d1bb914b2ea5dd0acc00f3a261285c8e2e9883fbe9a
-EBUILD iniparse-0.4-r2.ebuild 589 BLAKE2B 445844fb17eae561ac70bb4f84bf8598c170fb0e17fde7be4fa85ce0ca79cb34c973e3ecf334b1b7ff420eed6d417e1491694cd4bc13177df70c74e44671e26a SHA512 88a164420f51eb675a9a16274dcf53aeeefa39a74fdbd8534cb3eb90f2530b09ceb6d1856d41535fcd6027e3c030bc9d3b369efcc8bcc21155a52dd53f62a8ac
+EBUILD iniparse-0.4-r2.ebuild 588 BLAKE2B dde5483c9daf477d004389012c657851d0f8cd5b6322507f5cb01e33560eb67cf41a0bab376603102d494d30a6bc40c5afe6eb825ae168c3d4d89bd38eecd7d5 SHA512 24afb8901d3be5d461b27754aca85dd9d4d5ce53767db7a35c0627b89d0f5811e274bdbde38b2343b54069288fb913e6ab679b862edb6c2a4fc340520ce1ad78
 MISC metadata.xml 311 BLAKE2B 04891a9e61e3ea4e639f43044579b5ad5bb5a0cd0b1b9cef41e49b896b73c8d8ac22962f202764082de0355ce7bfa3ce1953a7c7d6d1d3523d4cd8d58fa06ad7 SHA512 f29afa7ed4888925433a7af5746a6d707c51856a95bf08c6f3b705e721091f84e18b1654d5e0cfb2e00d50d8eff2fa169d94a3642c5903e8cc503ff2a833ce72
diff --git a/dev-python/iniparse/iniparse-0.4-r2.ebuild b/dev-python/iniparse/iniparse-0.4-r2.ebuild
index f7c8c47a1463..396e1cdef557 100644
--- a/dev-python/iniparse/iniparse-0.4-r2.ebuild
+++ b/dev-python/iniparse/iniparse-0.4-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT PSF-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND=">=dev-python/six-1.10.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/jaraco-packaging/Manifest b/dev-python/jaraco-packaging/Manifest
index 727a12e0b916..7feac0434d18 100644
--- a/dev-python/jaraco-packaging/Manifest
+++ b/dev-python/jaraco-packaging/Manifest
@@ -1,9 +1,9 @@
 DIST jaraco.packaging-4.1.tar.gz 8820 BLAKE2B 43c14e12439d161f9a42005dcaed4d6945fa35ec3498bed81d2e6d10b08b056838dcf92fd6319951dddcfc908c8d33796bd9515aa5e77a04c02298cdcfd240ba SHA512 381ac1ba3a8eeea1235e719d98b61e38399d3fea1310732b0e2f921a3d46544efbb12c23c03bfa3ecfa07697458cb8930ca5156df7b411509c7b1da0b673d7cd
 DIST jaraco.packaging-5.1.tar.gz 10393 BLAKE2B ddef0ea4006b1a114d81238d5182c03cc50186452b326ef9a02f1a2e745bc731fc6969475a306b25a22d6daec5951e8d11cacd61d519e82cb461140e5003813d SHA512 d86cf6fce8037a9a5f2dfe29c7df810376127b3e02d270bfbc11e16bd43c10e0ab76f2739e5cdf904a9e54ca8d7fc3559e51d089ee39b4486c84902b23be530c
-DIST jaraco.packaging-5.2.tar.gz 11573 BLAKE2B a119fe4e4de636ef5483cc8d16ca0076533c1cb86c8ec7061c0800aed84532a8689613401530223c0048ccd31d1ead974cc8ba37161b1e5601eb659453962e17 SHA512 5199caccf11952ac68f42462652730afec1aaa907495d65dcf9eb7d5ebcde3ebc8d1f2bf7d51543a764222f09606247a28bfedd9fa987d39934724bf7001c459
 DIST jaraco.packaging-6.1.tar.gz 14736 BLAKE2B 278ab889f236b4a53e6f3978b876952e83777da2e1c096801712bb6833fc85b342fe1c18bb7b1bd78a801c6216dbae74a75a416ef29cd4ec0a7017b8d5bd73bb SHA512 a84c71bd880879f172e6527987e9ffa681da28803112a0195fb21153cb6cd1b3d5c00a6d21c562d7c5542349f335bea4a349fd22662f22dd7bf9bef7b6b0f7d8
+DIST jaraco.packaging-6.2.tar.gz 15408 BLAKE2B 21c63b4e400bdf8b4b79873e6a96c7576b91500624c942246a8f64fc06da22e90203832c3c3084803c6ee23af8f102bb23cb12276cd3bba13446815f4a71f0dc SHA512 f8496a9dccb29dbac24927b40bc29d472b8c6bdb939bfcacf70196130ba9c961747a8b75c63574352a8bfeb2a512eb849dfba3344e942f1338ea1538e0767f33
 EBUILD jaraco-packaging-4.1.ebuild 1197 BLAKE2B be57cd0dbe0562cf25139ca1cb70c6b3b349c824840f98059e8b9fc65d1171d9b8642cce9729e4bc72a1594d89fb22a1c68f86287cfec78570857f3ae91b7dc6 SHA512 4561bb60e08a83b1046cc2a28010ee2d4f22f793ea3e85f0f29cf095edc52a1ddddc31319769970ba16ecd21af0d4170f73ccc88ae6166a84cb5ac6939eea2a9
 EBUILD jaraco-packaging-5.1-r1.ebuild 1322 BLAKE2B dd30c72b863ae2f6c1fe2d23c24ad4764f5ecce7eda30c1b8211e6211624885e8b6fac8358baefc89c7bdc3b0b6736623374e5267331b06551f9864066f22240 SHA512 3e583e87a4a5067b81d119c38824dd794919a5fd72c5b9a13f81fe4ae620bca552692c62785199f321029c10d5dfc5c67a9b2a0356cdd099a8b47ee5618f9a9a
-EBUILD jaraco-packaging-5.2-r1.ebuild 1420 BLAKE2B 0a2e9e484d65447b92084bc64bf19c56ec4f0144cd19a728ec4f5b627b0c97bbacaf6d6203a1641cd5e2ea363599cd08f436fb022f58e2487a8571344747b16e SHA512 14c287a80b57e78bc5b156315263d03f9989e470431143f2eec57418051c288c0ba00682fb85c5c6797937c6523f626971aa14ea4973fc471c9658423ca4fa6b
 EBUILD jaraco-packaging-6.1.ebuild 1602 BLAKE2B 20a8a452aa9b20d14f9b8872d75660b0c8d3f0915a6de6d03f9ae26522ee578649123cf5d9f0e7dcc8e65d7a82b46bc6c83c7d2d8afacffef07b64807692da03 SHA512 01d228b64777567adf993c587dbb75f7e34668ab54b7bb7d916bdbcdd89e011772cf26e206598af7d175538622181552dc38240cce4c9a3fb584f87b0405dde8
+EBUILD jaraco-packaging-6.2.ebuild 1633 BLAKE2B a216caef87790eca6560fb7b3979491cbd593cbb3dbeb26ea5474af95df6c853053608ee439745334eb5a154626dc57cc4e53df39d00fdb454196dc321079b20 SHA512 6a46a87fb1b6adee75f025da5616f65c66f35e20e5ac3558cae3f3c5ec681fe16c58f005207d0ecdf180de0f18cc1ddaf03710bc8f6c150b80dfabb2f7124c70
 MISC metadata.xml 651 BLAKE2B 145a05709cfd4b85e623982b7defaf588eb0d68ed3fcbb52655a5a8cd10fcb2cfb269b9179e81e5409be0485f4c71565ecbdc4019d9f07f322d2cfbc3731c2d0 SHA512 d8f857056e0a73cb34903a7001cda6f543eeec0182a87ee2bd660631ab9e855d1214166546c179b9711ec8ed9a5063b14d9362001e67203a7132694112ebf086
diff --git a/dev-python/jaraco-packaging/jaraco-packaging-5.2-r1.ebuild b/dev-python/jaraco-packaging/jaraco-packaging-6.2.ebuild
index 0b92ee431110..bea4c9193a3f 100644
--- a/dev-python/jaraco-packaging/jaraco-packaging-5.2-r1.ebuild
+++ b/dev-python/jaraco-packaging/jaraco-packaging-6.2.ebuild
@@ -14,12 +14,13 @@ 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 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="doc test"
 
 RDEPEND="
+	dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	>=dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
 	>=dev-python/six-1.4[${PYTHON_USEDEP}]
-	<dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
 "
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
@@ -52,7 +53,9 @@ python_test() {
 		|| die "tests failed with ${EPYTHON}"
 }
 
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name '*.pth' -delete || die
+# 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
+	# note: eclass may default to --skip-build in the future
+	distutils-r1_python_install --skip-build
 }
diff --git a/dev-python/jsonrpclib/Manifest b/dev-python/jsonrpclib/Manifest
index 25675f0d122f..cf46ed621f8e 100644
--- a/dev-python/jsonrpclib/Manifest
+++ b/dev-python/jsonrpclib/Manifest
@@ -1,6 +1,6 @@
 DIST jsonrpclib-0.3.1.tar.gz 42704 BLAKE2B e3c83bb25ec83a93fdde8f6f4b8b18de0d0ddd0cc35c04f9f83b1f0e75803211a6f6b85768b0c7f9de4bcac18df721df8057148aa7aa0628dd1d345c2e4d90e1 SHA512 7cd44d44f3952ee7ac4006904427ddd3a69b60e6a0a4eaff4b75d03b1c30f7a65debd69552035a4ee375a33c80ec428fc1ef10979f55316bcfd015603c62304f
-DIST jsonrpclib-0_pre20110820.tar.bz2 14608 BLAKE2B 1cc7fea4984009c1c21d9dfd9cabec10d48406294262b973dcf5f3d3148fc74be5f201ee11c91600e7b6679dbd5716d197d727c89da738d2dc54aa9a0e1dec82 SHA512 80864890982c4a11996cd9fae21029cdf40b089eb6c2d265c645f52fe0a6e858b3405c5d899d2a5908527da04263d93064f365c5308adda1791105bf32329b71
+DIST jsonrpclib-0.4.0.tar.gz 57944 BLAKE2B 3458aee2dc27980ef93d7ae650f7d7485983598c8276f08b104a5b44d5dfb8f6225ba649dc7f6537fa66f6ba86d7082e11e23c7ca051c876a96d1b25efa4fa0e SHA512 357743e34447cd6dbe330c5adfa5541134a0ff8d82549ec47ed741ddf54a7aabb8cd417c501cb9ab814ce2cb90e1c2d4d4f21daac3b379f38be03c38a7ed198b
 EBUILD jsonrpclib-0.3.1.ebuild 702 BLAKE2B c9e86bac9f0c65a7b8cd5a9f248ccd4bb727cf704a8659c80a3a28efd99d81725ac0c1d46f893b5488f705fef4607f05f99b55aa1e0e83deaf2f988fb06a115c SHA512 631ab17f22389cf551882021db4cd20ced366f7d21e28b06d370f2e677cb17af2163a29d7c063e39269726e734d152b6ae58071fa1f2b1edb0cc403da78420fc
-EBUILD jsonrpclib-0_pre20110820-r1.ebuild 573 BLAKE2B d78437cbefdcc6f269bcc1139deeb82a7ad2c96bd4313851d57aca21635a7fd784545f9487ccfa1eacf74f093e80d76294b697a85004e7e6f0ce094b045d6995 SHA512 10a9c32643d393ff9f857eb2d48d708d1635cc52d3369bac0abe05d0cb29b67295d49126380f5c880dd61d83e0676a1934a9610e95c8a0217e1e920964b1b800
-EBUILD jsonrpclib-9999.ebuild 705 BLAKE2B c0c7f0bf81c8bfee7054e19c338ffecea958330eed764674db09289d46d8ee6f3c64fa5ebe219185a10d7a8c941c13fd79798d9eda080566af9315dd9629eb1d SHA512 fd2beba3a9c92c509a3b3451b95a56da3949361d0452ccaa832027507f671678e2c32a7025ca061a58730edd3b6e1ab82cdde9b37360da2951d536d3084f432e
+EBUILD jsonrpclib-0.4.0.ebuild 766 BLAKE2B a2a5bf75799f123d6eed077e2e11a86dea6c284ec32b4a6a213a58dee0c494687bbbb24b950bac2b9e54ac0465d5aeaf3926e17cd0ca81b46263c9d4d6800cc9 SHA512 c9707058624093b11e8c8b4f9e1d9153da6301d0af4842f57a0c9d107796e7c4c5ef571f31b560cd5fe294c2d01d8bf5073b09f2abb5d22d294e70db5301dbef
+EBUILD jsonrpclib-9999.ebuild 766 BLAKE2B a2a5bf75799f123d6eed077e2e11a86dea6c284ec32b4a6a213a58dee0c494687bbbb24b950bac2b9e54ac0465d5aeaf3926e17cd0ca81b46263c9d4d6800cc9 SHA512 c9707058624093b11e8c8b4f9e1d9153da6301d0af4842f57a0c9d107796e7c4c5ef571f31b560cd5fe294c2d01d8bf5073b09f2abb5d22d294e70db5301dbef
 MISC metadata.xml 453 BLAKE2B 852b07f16a1773b07d2efebb8bb338c972a807fe2c7cb99fdfe62a2c6cdcb63098b9b76a2e9173af8f397ab5aea724732296882689fa42dd66381543d84246b8 SHA512 5ecbc0cc593546cfc7bb86cb789df99aa25e38c215971c35e0dab83d6134348f591db126f62f4a578728922b2aaad0d664b797edd85324b51c6b9e6ec0cd264e
diff --git a/dev-python/jsonrpclib/jsonrpclib-0.4.0.ebuild b/dev-python/jsonrpclib/jsonrpclib-0.4.0.ebuild
new file mode 100644
index 000000000000..c7b359ea5372
--- /dev/null
+++ b/dev-python/jsonrpclib/jsonrpclib-0.4.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/tcalmant/jsonrpclib.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/tcalmant/jsonrpclib/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~mips ~x86"
+fi
+
+DESCRIPTION="python implementation of the JSON-RPC spec (1.0 and 2.0)"
+HOMEPAGE="https://github.com/tcalmant/jsonrpclib"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/simplejson[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND} )"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/jsonrpclib/jsonrpclib-0_pre20110820-r1.ebuild b/dev-python/jsonrpclib/jsonrpclib-0_pre20110820-r1.ebuild
deleted file mode 100644
index 1d9c9ecb9b6a..000000000000
--- a/dev-python/jsonrpclib/jsonrpclib-0_pre20110820-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/joshmarshall/jsonrpclib.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-	KEYWORDS="amd64 arm x86"
-fi
-
-DESCRIPTION="python implementation of the JSON-RPC spec (1.0 and 2.0)"
-HOMEPAGE="https://github.com/joshmarshall/jsonrpclib"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	dev-python/simplejson"
diff --git a/dev-python/jsonrpclib/jsonrpclib-9999.ebuild b/dev-python/jsonrpclib/jsonrpclib-9999.ebuild
index 8744005ec438..c7b359ea5372 100644
--- a/dev-python/jsonrpclib/jsonrpclib-9999.ebuild
+++ b/dev-python/jsonrpclib/jsonrpclib-9999.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
 inherit distutils-r1
 
@@ -19,12 +19,13 @@ HOMEPAGE="https://github.com/tcalmant/jsonrpclib"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE=""
+IUSE="test"
+RESTRICT="!test? ( test )"
 
-DEPEND=""
-RDEPEND="${DEPEND}
-	dev-python/simplejson"
+RDEPEND="dev-python/simplejson[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND} )"
 
 python_test() {
-	esetup.py test || die "tests failed with ${EPYTHON}"
+	esetup.py test
 }
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index cead763fb53b..a0ba53c0c8a0 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -2,10 +2,12 @@ DIST llvm-5.0.2.src.tar.xz 23451868 BLAKE2B b7082be2e4ad557b29b9f6869811f262adcf
 DIST llvm-6.0.1.src.tar.xz 25306628 BLAKE2B 60232d4d22f8096b565cc8d81fea0639f24f14e8fc4f66ade69fa15479181f07f655f26dff3fa24bf105762b495da316c5c9352db234bd0af6b9c3fff6d4d881 SHA512 cbbb00eb99cfeb4aff623ee1a5ba075e7b5a76fc00c5f9f539ff28c108598f5708a0369d5bd92683def5a20c2fe60cab7827b42d628dbfcc79b57e0e91b84dd9
 DIST llvm-7.1.0.src.tar.xz 28313784 BLAKE2B b78d9a7fc5ef6e352e77d339e5c4eef5ccedf67c05e7abd949e72619aa8a5ed65e7e5e2008354be8e7916d75581719b99f34227838fcc86c5d0080913c2fb22c SHA512 a7dbd5693d1f2dae6b6e52893a100f9349cbfcfb25c5fdcad46364acbff0dbd3573f8fbc026c68eb9fd56335198aa94b866cc3dd7ea0cbd2cbfb5f8fe3444a7a
 DIST llvm-8.0.0.src.tar.xz 30503732 BLAKE2B d89bdeb0ec7d885e49cfe5ae025da84f00502d409710c0807a3cdd58dbd47c50cf6a635593569483150f7f2ecb0de0310bd6785cb7625219bf9f6224a0d68e1c SHA512 1602343b451b964f5d8c2d6b0654d89384c80d45883498c5f0e2f4196168dd4a1ed2a4dadb752076020243df42ffe46cb31d82ffc145d8e5874163cbb9686a1f
+DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c89463bcc7816df1aefe1e3ff989860bbaa92504718f8e15416cfd9f3491c13777cd5cb661877b237b342b0e515b93f5 SHA512 82e120be5cabdfd5111aebbea68a663fe229c8861d73802d6ab09a3bf48f60de333e07e61f8fb61beaa14ac2bea24fcd74fa6f761acaf62469f536b79fcb1e16
+EBUILD lit-10.0.0.9999.ebuild 963 BLAKE2B 9dadfe70a8e82a552f33303d0325dc06232fdf527558be5d0f52df6486e36b1b075e7ea0f247a4b5bf97338f709179aefefe22685522fc63aef722514c638e81 SHA512 687842ce83e420f1803497501ff70df281b48c6a6129ce45aa8967a304f181cd50847d117ccb4944a56065b6c7874c82a33d8526400988e4d95ab6dc8f3adf1b
 EBUILD lit-5.0.2.ebuild 899 BLAKE2B 688966a355571c6ee01e56dc980df5ef49f966ccde9edd85143d7d306ccea6e2217dd4870ae3210fbf4c615ce8f57950a3aa34d44b98bcacd4a18d617bce79d8 SHA512 f5f36aef2a795c4b7d5c241810bf4e441b5271c3edaaaffe2a3250fed2f08bc1bc4907cab20303747d1c970d74fed16b55fd48e919b741f3cddf6fb1b27e12d3
 EBUILD lit-6.0.1.ebuild 1009 BLAKE2B 6e468d6a7274031b8e81eaa7c0827ae991e8e11f7daeb20d86fbaa56d26b2462a58e58f3afc75369bcd04c229d3c7644c06f97c08e0eb0fb5b04441bf190ea3a SHA512 63870e81d534e9995d2476934962055c6193522dfff741d2a99155ac83d15ff7e7ea81bb89af14e8d3b09e9dea9f6f593f520f062e4af80738bc1afb3183f58c
-EBUILD lit-7.1.0.ebuild 1012 BLAKE2B d1cf0e9cc017dbc69a9bf3af33072d5aa100fb6e3b331086d297dcef9eebc865d443fcd2e0c5905669a09172965a5ad99b2c3b1a44e9e169f766a50f6f621076 SHA512 e8aebe61958a11aacd8c30df491cdcbbf4fd0fe762ceb7e25b80c1276f8ec9d41e76d480a0f86a546787bf9f8b4b1401f50265d4c59cf805e17c72720b76bc53
+EBUILD lit-7.1.0.ebuild 1011 BLAKE2B 947aa38ed1ef868f32392a347c0c959b7e5a1091d59c995b69bf5539c58fe34e2994b0593846fe6fdb61b3d97ebed298e47bd0e71fa1b47cad3822401a56f485 SHA512 464a34437c15520924e783375a9aa9ce581871850a6fb756599d30b65ccc93e8f93114b184c3e155acd7e11382d6f748b8e866fc6400d863c7a9c99b0a818af0
 EBUILD lit-8.0.0.ebuild 1015 BLAKE2B 70ebba5849fe2d5d464d2fb2ddf1a903e992dbab59ced42048c16276bcbc71af3e1c72f8d726bd80d5469080b5c00e0e38aac03f1704c23303092848721e424a SHA512 5af4e2d207b7bb5bafb4ecd21577569f77bb2127bd980dd0d31aed256253a9019de316ae4a9c33ddcd4d1135c67ce5052393d4f827554f0fbb65e9e22f0eefbd
-EBUILD lit-8.0.9999.ebuild 958 BLAKE2B 18ad819d0b277e210a71ce5f7f93be2d37e83b343d8f65576b7f4e158830654367ac8347e551f0a42dbbbf4174caa7aa74ef869f69d04eee8d26fd3f6bf0750a SHA512 662980691abfc4ea922db2bfbee369f6c9645f69e9b8062d2da85fb853b732d174e00e148d65ffa6b9347885ae16372bc223070d08c63edaada3c7bbc183bdbe
-EBUILD lit-9999.ebuild 933 BLAKE2B 926665f411fc4abba8d6d3d2ef314c487fdf548919a790cbcc9ab7ff033756aa17b4b155ee8dc925ad0e99fade0dab02494e1433ea2ffee2bd24415ea609a016 SHA512 5f091d06f9db9b2916618435b1d9807b22c1abbb1d92e286cba3c5f18755b4f73cdb8b7e945e123d0eb1b8e396da6ac410063ba1e179ddb276f06bebf29af7d9
+EBUILD lit-8.0.1.ebuild 1048 BLAKE2B 53f32cdbbace06c015e103c64f3f9a7c91ce32a83718c3090e7429172c654c75d4ddccbeccb912ee28c2a6c2366cd874cb34c4dd73de8503d10dd958df0242c8 SHA512 38dca2c0c4c93d4f6847adf5cfdc67473ab902dc027449c2c065b4dec2704e292815e91d51a4fd538e8cabfee99467d1b34a97752510187c5e5bf9d5ffaeb1be
+EBUILD lit-9.0.0.9999.ebuild 988 BLAKE2B dd1c52a6f8905a40d7eb255a488ab0369e2f7f4c446d57e518f2d4b3bfaabc6c802795553e7125004d448746f02db03634d2360588d534f5e2cf82cf009a8df4 SHA512 b693ce24e3dd3ac9b853221a8ba4a7fcba23443de72e283b145622acf7d15fd9262ad74ec82e46ccbc26b25982d1f5b681e7dfe0e1195bbaf1a9056378f41638
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-python/lit/lit-8.0.9999.ebuild b/dev-python/lit/lit-10.0.0.9999.ebuild
index 0e93abf44986..48607eb9c905 100644
--- a/dev-python/lit/lit-8.0.9999.ebuild
+++ b/dev-python/lit/lit-10.0.0.9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 inherit distutils-r1 git-r3 multiprocessing
@@ -11,7 +11,6 @@ HOMEPAGE="https://llvm.org/"
 SRC_URI=""
 EGIT_REPO_URI="https://git.llvm.org/git/llvm.git
 	https://github.com/llvm-mirror/llvm.git"
-EGIT_BRANCH="release_80"
 
 LICENSE="UoI-NCSA"
 SLOT="0"
@@ -36,6 +35,7 @@ src_unpack() {
 }
 
 python_test() {
+	local -x LIT_PRESERVES_TMP=1
 	./lit.py -j "${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" \
 		-vv tests || die
 }
diff --git a/dev-python/lit/lit-7.1.0.ebuild b/dev-python/lit/lit-7.1.0.ebuild
index 0a4917031147..44546287b4f9 100644
--- a/dev-python/lit/lit-7.1.0.ebuild
+++ b/dev-python/lit/lit-7.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz"
 
 LICENSE="UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~amd64-fbsd"
+KEYWORDS="amd64 arm arm64 ~ppc64 x86 ~amd64-fbsd"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/lit/lit-8.0.1.ebuild b/dev-python/lit/lit-8.0.1.ebuild
new file mode 100644
index 000000000000..a5c86ceac3bc
--- /dev/null
+++ b/dev-python/lit/lit-8.0.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+inherit distutils-r1 multiprocessing
+
+MY_P=llvm-${PV/_/}.src
+DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
+HOMEPAGE="https://llvm.org/"
+SRC_URI="https://github.com/llvm/llvm-project/releases/download/llvmorg-${PV}/${MY_P}.tar.xz"
+
+LICENSE="UoI-NCSA"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+S=${WORKDIR}/${MY_P}/utils/lit
+
+# Tests require 'FileCheck' and 'not' utilities (from llvm)
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+		sys-devel/llvm )"
+
+# TODO: move the manpage generation here (from sys-devel/llvm)
+
+src_unpack() {
+	einfo "Unpacking parts of ${MY_P}.tar.xz ..."
+	tar -xJf "${DISTDIR}/${MY_P}.tar.xz" "${MY_P}/utils/lit" || die
+}
+
+python_test() {
+	./lit.py -j "${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" \
+		-vv tests || die
+}
diff --git a/dev-python/lit/lit-9999.ebuild b/dev-python/lit/lit-9.0.0.9999.ebuild
index 0f71b5bb84ce..399ab4cc6df5 100644
--- a/dev-python/lit/lit-9999.ebuild
+++ b/dev-python/lit/lit-9.0.0.9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 inherit distutils-r1 git-r3 multiprocessing
@@ -11,6 +11,7 @@ HOMEPAGE="https://llvm.org/"
 SRC_URI=""
 EGIT_REPO_URI="https://git.llvm.org/git/llvm.git
 	https://github.com/llvm-mirror/llvm.git"
+EGIT_BRANCH="release_90"
 
 LICENSE="UoI-NCSA"
 SLOT="0"
@@ -35,6 +36,7 @@ src_unpack() {
 }
 
 python_test() {
+	local -x LIT_PRESERVES_TMP=1
 	./lit.py -j "${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" \
 		-vv tests || die
 }
diff --git a/dev-python/miniupnpc/Manifest b/dev-python/miniupnpc/Manifest
index 96498e21c02a..26328dbb9733 100644
--- a/dev-python/miniupnpc/Manifest
+++ b/dev-python/miniupnpc/Manifest
@@ -2,5 +2,5 @@ AUX miniupnpc-2.0.20171102-shared-lib.patch 1220 BLAKE2B 97fa99582f7992587e5f13e
 DIST miniupnpc-2.1.20190408.tar.gz 94216 BLAKE2B 19b0bee46d2f738939fda31c465779a6e6c7c04b2e975aed77c3a642bbfd1c61813367da5f2aa3f351fe1e5a71a842bfcd7b54c4faf589e345ddb1551bc322c6 SHA512 faa0f1363ebb59ca636b6c974188c52903ad07652f8268563c9c1a5826fafc2458d9f521efd3546fbbd4b71b3b14a50ba89dda52757adad1db81c31d9ba0987a
 DIST miniupnpc-2.1.20190625.tar.gz 94461 BLAKE2B 26c881c2ef99640e99a5c9cb138cc88dc29a25cd57fffaeaffcf521ded11402fd34ad1001639cd0659fdef9debd247dded5c1903b69f36b74b059c1e282bcdfb SHA512 d55a959bb2fce2c1747fa95da53d9993220403d2c511b12f489b80a7941b28238561f90a1cd60be9fa2bd62777fbfd3cef370db694b9970f73ccbdf3ef49aa48
 EBUILD miniupnpc-2.1.20190408.ebuild 748 BLAKE2B 67ab0e95d689347412b7c08b9949a059adedd4c62b0705c8cebba7347bdae1727fdaab0138200457289ac1a7eaf425163894b850e69268e9bae55cc660784b1c SHA512 bc8300b2f4df692141a7a46307858677ae37c57b64655f21daad9ded09d51c7d9bd28e861482d08b7681fd4758a3f65ac169a150a0bfbd29be464b567a176ba8
-EBUILD miniupnpc-2.1.20190625.ebuild 756 BLAKE2B d17960d77602df26cde5b78783b1201a066353baea6895363e0a207cc318a7a7b3ceb62bf4494f2e2200c216743abc35e169b5c5bf6d5d24fc2a8a3ea2ae4cc5 SHA512 9c7405c5f98f2e5ae579a5155213f7b8827bf6458f47cb00d277a0d84cc3be2db982fb2042ee13a83aa86503638fac960fa844e31481eea8c22b4a899f9a5cce
+EBUILD miniupnpc-2.1.20190625.ebuild 752 BLAKE2B 6cfc3ea9ac5a47a1623131fc4f01e24c838072a78f5b563499e527a8234486a46e3327e3cf2a987226ec0d8ef2f41a5b3534c327eaaa4b04ee8a45d8891c81a4 SHA512 8027e251c442459f9458296d3d0339f23c90b4c8fe83af614c9f93e83fcb783e98d98bdfd0b8aead5bca8d44da0ec25be6486e4ac25d2dd82fd0765184c85f1d
 MISC metadata.xml 243 BLAKE2B 997913e51bb9c2ba601c78673246d3845d1078f5be11ff209532c5afc9f433d4cfe7a0066ba23677d23ffe368d7ee718df71d28301d45c0473f50e931f674165 SHA512 ded2bb7e056d9081e11b0470aa2874fbe9b5e63f0178bec611291f639763a9bd85a076dbc526e01df1403dea4d0eb28913addb346b676084e690e063b68eca28
diff --git a/dev-python/miniupnpc/miniupnpc-2.1.20190625.ebuild b/dev-python/miniupnpc/miniupnpc-2.1.20190625.ebuild
index b29713da4bc7..04591900a408 100644
--- a/dev-python/miniupnpc/miniupnpc-2.1.20190625.ebuild
+++ b/dev-python/miniupnpc/miniupnpc-2.1.20190625.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""
 
 RDEPEND=">=net-libs/miniupnpc-${PV}:0="
diff --git a/dev-python/mpi4py/Manifest b/dev-python/mpi4py/Manifest
index 4aca40cf0c07..b488031e874d 100644
--- a/dev-python/mpi4py/Manifest
+++ b/dev-python/mpi4py/Manifest
@@ -1,5 +1,7 @@
 DIST mpi4py-2.0.0.tar.gz 1279957 BLAKE2B ad75492ec09edbf6663a8962bcb4592c076ef47cdf8a9c14275077dea0abf4ce01f928d03eec80941fec37941c2ba99287263b71436baf7ed755a84cca2ea983 SHA512 6459b482db782fea1a80499774ebfeb09c828b6c3f1805a0ca306f26f3ebcac52ad1c83bb97a98a01b518b6a6c887f6b99dbda9c37381a5ce05ddff0edb16d81
 DIST mpi4py-3.0.0.tar.gz 1426843 BLAKE2B a68182c6abebac6af73654f04db9eba38f020793a9f6d0f98a5e4a483b0531e44aca3c853c20572123cc02331350bf98f8405ddd12b77e79de732f714437da9f SHA512 29ce8b7fd187aadd0bf8e1928ed00cac3e898ff82432b7a95984a248559b0d580c5af418b1986d83b17ad2cf8cbb45135afacf290ba4d9b75a62b03e9ca08e16
+DIST mpi4py-3.0.2.tar.gz 1429331 BLAKE2B 9e35749a82698ec656553583f01ebd8edbfb3b649c7693a9ff63f9f6abfa3fd41a54cbe4e3a1de55cbaf4dc626602706c776c505d0f5c0d82ebe88f2b4ceeddb SHA512 0a18332fd45e8e80b8dab0761fbaa30444a0d55776af7a2333be17ade827e92d04ac5bb8619ce26937142f344f75de0e5ef6dcb7502f33389716aa9482ddf5ab
 EBUILD mpi4py-2.0.0.ebuild 1114 BLAKE2B e8ba3c2d390b3cb89f4d6a265a14e1a37db4d64de254dc6e0226c12339ded13ae217b03f202bb4f673b73c8225ce4a02aeaffa0bc15acdc2ed19a28a4d911e9a SHA512 2660ff53f787c9ce1dbae757c79328d53062ec317a8d4e72435fc1f8887cbec601f054a879be7465e95f2e385977630289a0bb48f550cc15b9df2e219fcd2aa1
 EBUILD mpi4py-3.0.0.ebuild 1116 BLAKE2B d6023428513b82e92623455a695cf07cacc524ba73ef7d2d4690f87f7da2a630e340993a54961ab12d6812dda09c3ecff3ef92cd846fc75dec8e288c2b33f697 SHA512 cb974499fdb92c7b1b701811bc7c75ed691c7e97e777f4de68c2e1e6546a9ffbfa0271ffa6218becd870597140ac6f1d39b615d7e0d1b0b852e12c3dac0344a0
+EBUILD mpi4py-3.0.2.ebuild 1124 BLAKE2B 011352a5f4293c584337fa2712bdd90f3719a2566833d33a25fc11c417276e990c38cb2b3a8568940812da5c659a238fd426a6d6f569be9adc3299d5e352c260 SHA512 b120ac44398a081b6e6f6de54ab5931e1c02a028736628ab9e4f68abd58a4cd9c84a9aa35c9c9fb2eb9fd9a4b4ad79a3a0c4a15fd549bfd2e0fc097322e16fad
 MISC metadata.xml 1118 BLAKE2B 0bc626a2106e628d7eb639e6ce90c4badb63ec2ea66b0322e7b83418791b7edc4bd443294fba3d31133812416eb4428b5dc47d074da3aeebf6867e8a0998d046 SHA512 7afb6d05007036bf5562d6d262165d8c2576bb49a86f9230f939d6a2ef929affa8461fa6421ffd8d97203a4425b397a8dd8556190364f29622e53a67674978c7
diff --git a/dev-python/mpi4py/mpi4py-3.0.2.ebuild b/dev-python/mpi4py/mpi4py-3.0.2.ebuild
new file mode 100644
index 000000000000..a9ab0f634606
--- /dev/null
+++ b/dev-python/mpi4py/mpi4py-3.0.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Message Passing Interface for Python"
+HOMEPAGE="https://bitbucket.org/mpi4py/ https://pypi.org/project/mpi4py/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples test"
+
+RDEPEND="virtual/mpi"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		virtual/mpi[romio]
+	)
+"
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	# not needed on install
+	rm -vr docs/source || die
+	distutils-r1_python_prepare_all
+}
+
+src_compile() {
+	export FAKEROOTKEY=1
+	distutils-r1_src_compile
+}
+
+python_test() {
+	echo "Beginning test phase"
+	pushd "${BUILD_DIR}"/../ &> /dev/null || die
+	mpiexec -n 2 "${PYTHON}" ./test/runtests.py -v || die "Testsuite failed under ${EPYTHON}"
+	popd &> /dev/null || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/. )
+	use examples && local DOCS=( demo )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/msgpack/Manifest b/dev-python/msgpack/Manifest
index f1b60d57c9b4..0eed92feb429 100644
--- a/dev-python/msgpack/Manifest
+++ b/dev-python/msgpack/Manifest
@@ -4,6 +4,6 @@ DIST msgpack-python-0.4.8.tar.gz 113641 BLAKE2B d22efe13302e28d0701b95b2dc4cf479
 DIST msgpack-python-0.5.1.tar.gz 138953 BLAKE2B 1fb7e5be33992808319e1444ff7f84cc13f034e60ce0ef2f72161bd4ccd0cd1ede27382bc1f365f268557c8ffe503fd12de66eb5840e79760d818e7e2f67fdcd SHA512 e5172e20bb25d2e12ba34ad2805ba4ea0776397986e8bf8e26d21353f57a2dba59a9c6669c817e4e91d5801558a50f95d81e02343f8f0292a01ec5d822fba61c
 EBUILD msgpack-0.4.8.ebuild 764 BLAKE2B 9a5e5880ef71e89506c316880316f56518eed8a3e4abf21c4553235d39801d9506cfbc5cd55a5eaccbaee2d0ed904ab5897aaea4515b7e2679d8d7fe23cc0471 SHA512 c9b4bf69484031066719ed6c2c9db56826c8ec560fe3525332cb20b76c9110fac26d100f5069705ec2f2b5f29999737cde4d8bfc7df2cd12f2bf82a38f48559c
 EBUILD msgpack-0.5.1.ebuild 763 BLAKE2B efa206b2e0c07a00a3e42c03d5d82b3812c7f5273916863bc3e22a14445df5ad0ee8be023d44b323dbf8a29150c7ee2da9eeb0dfb5613602e80e5971f7a979ee SHA512 57a1785ca05eec1a783638552b463a87c102bed67cfe7cfdab37a9b0a95a2d5e5f60665e8c0df44ff932d43e1b5a07276076e1d6a93e6b41ee4fa43dfebc92fe
-EBUILD msgpack-0.5.6.ebuild 1050 BLAKE2B 5b08843794479319c13728680a18f0a7b19802341cde65ca8f20e4257a1ab4d49e09821e9400a09589c2b0e1d109d3362b4f82257b435d2af4b6396a5c32580a SHA512 a6949d11720ec919d65ef8266248adceed37c2417f4d64c0009de598aa2fc2e493275924d1586bf0ec83a215ad76299b4bf80eb858e8dab24e5fcbae040feb5e
+EBUILD msgpack-0.5.6.ebuild 1049 BLAKE2B 9b3a590f35ff95c15a287570e13b06a37ccdbd5efc657387354e69b720a5101280ec94c672fbbbc80bded32aa1bf85bd4b6a545ec36ed59ff0e506a4c65ecded SHA512 cf0ea98b6871a720104e0e7821dce0a740bed4b39942e0bb9c2c6c760265210178be68ccdccfcb5375a12ff12b43e0153932eef12e293b949f07c93987e66839
 EBUILD msgpack-0.6.1.ebuild 1059 BLAKE2B c491ff8283bcbfa389db530623971a6f89c7f0ac7354ca9c65acb2a0fc537c41ce6f45036e7b8af9eb96825da453650b6bd38779b9b68f4816cb07e8b85eecf3 SHA512 6b83b84ce6aa1fa56a7cceb86ae287075905bc30a7d0b33637e75ccfd851a2645a32df4ee3ec03bb95a388166a2c9c4fcb9656c5b09789fb1f43124b99b9dfca
 MISC metadata.xml 550 BLAKE2B 6627bc6b0f417157d1728bac9f8bbf3cbd69eaa4f2b5ba25ada62f01295342ddf5231563e1ab7210acaca476cb807572208a26a20674aaff79bd8c4a47755d92 SHA512 519d1c9d2ce1825bc350fe4b1338246c37d38cfead466989976da6dceca8d033ac33b135b94d9feea79fc555017d681031f414aeb6a09de302ed9f11b6e35416
diff --git a/dev-python/msgpack/msgpack-0.5.6.ebuild b/dev-python/msgpack/msgpack-0.5.6.ebuild
index 3d069eb9c6a3..11d87a6d274d 100644
--- a/dev-python/msgpack/msgpack-0.5.6.ebuild
+++ b/dev-python/msgpack/msgpack-0.5.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc x86"
+KEYWORDS="amd64 arm ~arm64 ppc x86"
 IUSE="+native-extensions test"
 
 DEPEND="
diff --git a/dev-python/openpyxl/Manifest b/dev-python/openpyxl/Manifest
index d73f6f333600..dca488e5bc2c 100644
--- a/dev-python/openpyxl/Manifest
+++ b/dev-python/openpyxl/Manifest
@@ -1,6 +1,6 @@
-DIST openpyxl-2.4.11.tar.bz2 2139621 BLAKE2B 44fe7e471b50deabdea10e677e3b30f2eee62c661203517321e32442639e884c93ff3c4b6e7a0e5c5186bc8320c53d912832d955882b8cdb29c81d8319077c7c SHA512 9d1f9a3cadefec42bd7b6301bc3a37045e59e567a9f74eed3467547e81f060cf1c0ce2fc7f517911cd7f5716a42135a8567a0e0edc42eae0cc0c7a2370b320ae
 DIST openpyxl-2.6.1.tar.bz2 2403827 BLAKE2B 26abdea047b4d283f3d0e3ed499c1d7247d07b7a97426fd681d92798c7c49cc13fd53296e214d2c48e8461a80740a5ae600468bcf41c9cfd5b6f0b244ef3df93 SHA512 cf869b20ae8aeb068139eaddc8c915ba15405d531bc1a6e2b7c8068bad0ca628622c852cc1d4e11dfd8fab0078a9931fc33e5e47bda954b7cc994f60d79753fc
-EBUILD openpyxl-2.4.11.ebuild 783 BLAKE2B 733893c35f22cf020c39c4ada3a88a6b5410394976a4cd4ce16cb6419f3f61b4121a8b1ff1188ec65cb1108f083144e94ac1616382f53f237b22820fa3c392ad SHA512 b77ebc98c635e4fd7fdd05c640f7586e74be00cce7100070958fd9e8fe040a580a77f13e172d9e416e6db6cb0c638a74fe9574c6fc5c3a3739993d24f813f33a
+DIST openpyxl-2.6.2.tar.bz2 2404387 BLAKE2B ce63ed51bc2f475fc12f510307e3cd417321588aa1a9adb5f8b780249898747babf211137d21442eceaff01bcfb4f7b8f3092b3dc64f751aa2b26d404d11fb74 SHA512 e037abd13e050e25146b016c578bb50c008b7c74a19702d9bae14b594ad5f30d352f8443fd5021a169991a96f5d19b84a3acceb9b05a713e8526ad478fffd31f
 EBUILD openpyxl-2.6.1.ebuild 839 BLAKE2B 48be3179e6206e68170ab979618c70d635ff05d256e487f3a187c7e14cb367c85755ea5c238daaabdeebc5847535cac19b94eeebc15c592c424a33b2812691d4 SHA512 98f40d7a3cf608d17a5c49c1f75278ab0dd8cf14d8c8122c99379794fe71d142208369209053a6cf93a1ccc331b111ac54536c6eb5df556b6d94c182e7489135
+EBUILD openpyxl-2.6.2.ebuild 991 BLAKE2B f96b0ac8d34094608a43c512aa4b3ae1861bb29d4da965f57fd1a6da5e9b3a901ec37568d2772647a310aeeb3bd69d8652c3224dfd50a8757ffde0d64e8f1672 SHA512 568bafa0b97f5f0be7305b6175334a62db4838df253e0ab3b89c2799f1d52cde6abfb4599ce40d17cc651b37ead94b3a66926ff591cc4ec249fbcbd55752c182
 EBUILD openpyxl-9999.ebuild 732 BLAKE2B cecca36def0b51c6cc78ae5573548abde5f636732ee725df7765d11548f2f135deb645414d961c3c46abf3a07b373f8adf2909072645b95d890d10b1ee16ff29 SHA512 4e0cfc6f865998e5ef2f07041cc0e8720a71c91d513b920c056f6240a22798d8d9b0dba6e625865a872787cf9c860634609a8577bfbe97372b7e3cfd5b25e3a3
-MISC metadata.xml 449 BLAKE2B f5d81266618fbf1f9b74005ff4b9cdb22fa7d059dbbecdba18dab50b488e48b27ba7d4eb814c1e3baa9a8bd92b232e28f00d21f25c18bea58790c1af5e3a5275 SHA512 c9aa0ab803cc15b6ecbcdcb01fb4c224ee32a53b9054b345329f9d66e2aaacece4b2320878e4f09c0bfac1631b6656bc93c6036d3cec84c1fee27d4737aacee0
+MISC metadata.xml 653 BLAKE2B 7ea56953654fbad2982d2fb0569396bca3d32e2068bf6bceaadbcabd4b02520aea7f0ca04e810bfa5f8c3756658fe1915e53bb824eefca3c420506ddda048656 SHA512 4f8eba0d2bdb3a5b621abf9f2eee89d576d86f5a3e694b9755b0cf55e178e584afa599dad260ff5854cf6a00e0609d740727a62d1addeccc59b05f9e31e60fca
diff --git a/dev-python/openpyxl/metadata.xml b/dev-python/openpyxl/metadata.xml
index c9453db3b537..937a24d030a3 100644
--- a/dev-python/openpyxl/metadata.xml
+++ b/dev-python/openpyxl/metadata.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <longdescription>
-  Openpyxl is a pure Python module to read/write Excel 2007 (OpenXML)
-  xlsx/xlsm files.
-</longdescription>
-  <upstream>
-    <remote-id type="pypi">openpyxl</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription lang="en">Openpyxl is a pure Python module to read/write
+		Excel 2007 (OpenXML)  xlsx/xlsm files.</longdescription>
+	<upstream>
+		<remote-id type="pypi">openpyxl</remote-id>
+		<remote-id type="bitbucket">openpyxl/openpyxl</remote-id>
+		<bugs-to>https://bitbucket.org/openpyxl/openpyxl/issues</bugs-to>
+		<changelog>https://openpyxl.readthedocs.io/en/stable/changes.html</changelog>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/openpyxl/openpyxl-2.4.11.ebuild b/dev-python/openpyxl/openpyxl-2.6.2.ebuild
index ddfec496af3e..5605f80fac2e 100644
--- a/dev-python/openpyxl/openpyxl-2.4.11.ebuild
+++ b/dev-python/openpyxl/openpyxl-2.6.2.ebuild
@@ -1,19 +1,21 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
 inherit distutils-r1 vcs-snapshot
 
 DESCRIPTION="Pure python reader and writer of Excel OpenXML files"
 HOMEPAGE="https://openpyxl.readthedocs.io/en/stable/"
+# Upstream doesn't want to include tests in PyPI tarballs
+# https://bitbucket.org/openpyxl/openpyxl/issues/1308/include-tests-in-pypi-tarballs
 SRC_URI="https://bitbucket.org/${PN}/${PN}/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
@@ -25,9 +27,10 @@ DEPEND="
 		${RDEPEND}
 		dev-python/pytest[${PYTHON_USEDEP}]
 		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP},tiff,jpeg]
 	)"
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
 python_test() {
-	pytest -v || die "Testing failed with ${EPYTHON}"
+	pytest -vv || die "Testing failed with ${EPYTHON}"
 }
diff --git a/dev-python/ovs/Manifest b/dev-python/ovs/Manifest
index 4c348a89dba4..a5fccc11ab8a 100644
--- a/dev-python/ovs/Manifest
+++ b/dev-python/ovs/Manifest
@@ -5,7 +5,7 @@ DIST ovs-2.7.2.tar.gz 74222 BLAKE2B ecf1cfa9cde4824ba927f4fed610ca11129d221f4ecb
 DIST ovs-2.8.1.tar.gz 74483 BLAKE2B a90904e645316b625c7fddcc323270bbb6246d59432392bfbcb05ed0ae258f1fcc0afe7a3716dad519d47725a3f765c99c59dcffc30bc5343de59ccf523cfa76 SHA512 b7133f5c2ae00d508d77122952584cba840d4a22231d1a42105ba2918cf598b12b58c47408c17405bb3c9aa90d24a3d0a9257299626704e367badc982aba62ee
 DIST ovs-2.9.2.tar.gz 77160 BLAKE2B 09304ebb6bdf22a2f62d7e89b159a99d861d4121fa52972ca6bd9d9667564e485a454d99aabb243556f2ba1db7fca8c635c9a4f237aee9ac8830c9b19a51039a SHA512 aa5e5ebf633b36074278dc7fd67da05be71b5fcb139955a8398e40bd3dfe51654b016ef144477b818e5682c5612a16550487a89aa76cb41ee75509d62319a66b
 EBUILD ovs-2.10.0-r1.ebuild 494 BLAKE2B 8b928ab15e48826ba8ba27964cf19760f9672f47be1d48a32da06dd3e833644bc280638359a8e4675a2694dbe3400f742f7effeba28b4df4ac1f33d79a526577 SHA512 578128668432bcb6943b4f3020e9c280bec7ad581a1429ec04c4cea7b0523e6f127b03f0238a90fb85edf667cedbed165c6f37785dab0e45c23752dba502376f
-EBUILD ovs-2.11.0.ebuild 496 BLAKE2B b121159166e0868f641dbb81f1728bc8143dfc69ccaf61460ae8dba92e49c13f3e8b0e4ff8acf9be6a3e055dc2dc95c9ac72afa161923abf99ab0f2a52d80df8 SHA512 d8c479c79c5c823c842a1e9ac3c7db71a745c17622465fb143f056a352a1794942f169ae3722f208e9f7346c70d0f1adfa5e4ae7f82763c47c7774607da6a8b5
+EBUILD ovs-2.11.0.ebuild 494 BLAKE2B 8b928ab15e48826ba8ba27964cf19760f9672f47be1d48a32da06dd3e833644bc280638359a8e4675a2694dbe3400f742f7effeba28b4df4ac1f33d79a526577 SHA512 578128668432bcb6943b4f3020e9c280bec7ad581a1429ec04c4cea7b0523e6f127b03f0238a90fb85edf667cedbed165c6f37785dab0e45c23752dba502376f
 EBUILD ovs-2.7.0.ebuild 476 BLAKE2B 1ccef3f920918c6df8f603d6319e4a059a81adce4a94d6b41119dae0cf43c08a4d4707a8d5cc15a5392729debf14e7603c36e06577c89cd7a9186e16ca3c2c30 SHA512 cdb623a67c2f09d60fe9aff8dbb55baa7d9747bfe03b1bd0f7fbc0ad17cbf0a4c3483da909f02b1b25982c0f3103ff241a8209a3e478f157043d641f52956ef9
 EBUILD ovs-2.7.2.ebuild 448 BLAKE2B 68b809ba263d8e37b3c1f1805e1bb4dde25489d4fa053d2f3456c483ada0bdb2563722eea0930c28f1f3671e77a2ea7614e183968250c10c24cd8e4e4b6fb1ff SHA512 3d4a85dfe147d849be000e4233b408dbde3589c95779fc3b49eb88520f701d7ae8725c4bc2879ebd77e4b5edca084c6f1014b995b0acc8e44e849d58d94f97c2
 EBUILD ovs-2.8.1.ebuild 447 BLAKE2B 8f96b7ce08452416475b8611abb560e7fc69e35128f81bff0d45c4d72d38703ab6b38707119636f23107cb3c6819b9aeb2516683d3db52c8393d9c90cb4968ec SHA512 4858f63af77ba5d69659d93633e143888565cd6faced0e37269fc1d9adaa7a859e5e1c6028432b44c5a84470bb8bf45490282648f87b02513dee4a297fc6b9d2
diff --git a/dev-python/ovs/ovs-2.11.0.ebuild b/dev-python/ovs/ovs-2.11.0.ebuild
index 446dd3058554..2006c9e99595 100644
--- a/dev-python/ovs/ovs-2.11.0.ebuild
+++ b/dev-python/ovs/ovs-2.11.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="dev-python/sortedcontainers[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
diff --git a/dev-python/paramiko/Manifest b/dev-python/paramiko/Manifest
index c19ae3450a1e..7c0b54376536 100644
--- a/dev-python/paramiko/Manifest
+++ b/dev-python/paramiko/Manifest
@@ -2,6 +2,6 @@ AUX paramiko-2.4.2-disable-server.patch 1596 BLAKE2B 7e2ef1e216f34086c06d985556d
 AUX paramiko-2.6.0-tests.patch 1193 BLAKE2B 86063ffd478f5772e2aacbbd6e6a74262ebaa1e67126af598eb589e49484efc15b581df0bbc796c0790a5ca80d6b5a72cbd07782c7790a9782e66f857e9c2336 SHA512 5b5de9c209d6aee83dc57f2f04d1d43f7106ed135fc12427d9237cf63932408c6385f878d02ef5dbb3d09476ee516148208d0390caa21f82a113bf6ed5a8176e
 DIST paramiko-2.4.2.tar.gz 289126 BLAKE2B 767f81a09b32762241eed6661e520e3b3a96acfe8e6e638ea7ae180a8b6866f8f4adeae0a0146d46ecbfccbe71334c5f5c14e2d049744258ca4808ac21365185 SHA512 894c2ebfcfb35a84fe74670d0eb67022a49b7bf165f31acd929045c17509d8a2be111e8319f20513b5034efd033edc6432b2ca2e7027dc7e3c6703166a96790f
 DIST paramiko-2.6.0.tar.gz 304469 BLAKE2B cde861069c8924b2f685675266fd28600ffd24a39074e9ad5db8fd1d010c6e23ca13a2c78a79b23504dfff395b773b171e7c787119d01e3b92a2eec44ca8b40a SHA512 1ac2c3486cb786a1e4640d7b7f8628087f9b78ee247b09dbd3ac2646790da4f12cf95fc4291f27f200b63ec6c11d9ebf5a1283f88cf2de7c2eb6e6f76e892ef2
-EBUILD paramiko-2.4.2.ebuild 1526 BLAKE2B 7ab3ec8d7d0ba9a8ee7391c1d9c410ace9be2a3717e7d91c39076518e9152395ddfe9c290afd27a68471cd209fb3934548c3043a53107057a392655dfbe530b0 SHA512 d2abb05897eaac0334a1a3ebee68521f76c666fbd5a807e79d86f5bf3eb331d4d58a1f14e13dce12ced9fe4fd03b8eaa71a4a7125a9820925e6643a9d4f42ec1
+EBUILD paramiko-2.4.2.ebuild 1525 BLAKE2B c3c37070ba6193ca3997d06d3430fbc2678d4ac0928ea19ecb8d6c610be3c64acf7a25da8d840a73a352a2ce632709dd3277f0911ebea613cfb4f8da8669dd89 SHA512 8ff1bf5279384116fec1f5868681127ffb557aa76999789a3f2c563e6f8d33110e43f31d2e091acd8bba0ddc0b865af6f3a812100c09aa9aa4a5fc2f7bd2ecc8
 EBUILD paramiko-2.6.0.ebuild 1667 BLAKE2B 13f04d9366f552e2e0d3fdfecbfce795ccf46a874054a2c3223e715365ba7d479e4ca15fade78ac7bfaa041df594c71a9ca8bbc2fd7bc8f72c9f2007e6943eac SHA512 90a9f57bc61661a780b154e1f7fd00b2f28e91fa40c91229e641f6a62fd0c92812ee1c0c4801f2d017fb5a9bbd7da47bfb16b38f176087d3c324466f9e0fcf56
 MISC metadata.xml 1306 BLAKE2B 5bf88516d7d34aa0018b00250edddcc3d7044605e59fd9c799775043f2984a071f743994712cbdc009893a01ee9cbd60df85dcd7f644f7dd33e05a426b06391b SHA512 30bbefd00271e8a61c886e638f30aae8aa751dea4ed0e023e50e31d28d528a203c36e80c8a142573a4b39c958be84eca5c7c19986c2eaa86575ad9b3779ef0d1
diff --git a/dev-python/paramiko/paramiko-2.4.2.ebuild b/dev-python/paramiko/paramiko-2.4.2.ebuild
index 559b9089c457..712c01216659 100644
--- a/dev-python/paramiko/paramiko-2.4.2.ebuild
+++ b/dev-python/paramiko/paramiko-2.4.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 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~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 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
 IUSE="doc examples server test"
 
 RDEPEND="
diff --git a/dev-python/pbkdf2/Manifest b/dev-python/pbkdf2/Manifest
index 9c98d9a522e1..bb4ce6263b96 100644
--- a/dev-python/pbkdf2/Manifest
+++ b/dev-python/pbkdf2/Manifest
@@ -1,3 +1,4 @@
 DIST pbkdf2-1.3.tar.gz 6360 BLAKE2B 0a449b593fb1dddd604db687dab1fcdbeae37819dc17d7a875d8f592b1a45ac16903a77de46b72d87fbc2d41217f044046c4b4cf3a10b579e4f21e151d8512d0 SHA512 1297950d045f9b56f5eb9f771fe65091802c1f12f090a8a80fb5e36bfa10f1c1ac3b9dc8088f4a640b840fb7073aadd3fdf39f3979118046ba5cde477d071244
-EBUILD pbkdf2-1.3.ebuild 563 BLAKE2B ee9df0e759be7a3b7a41bd993054d1a5c42b6315f728c6247c6a28b793909d09e85c6fa8773f84a85206c57263b6190b56a55d61a585fb1677f80f6369276433 SHA512 09a7f8bcf50ede1b71481d3c3f1fa99cd4d851e274b721668278df10b3cd64af41ad839614c21ed35fcde303c624f6fd5338a81ecf46fb8a9361265e8c5a0b48
+EBUILD pbkdf2-1.3-r1.ebuild 529 BLAKE2B 03f2d4e5c7ca4959052db57332e843810cb7268247ca9e719f7834387f7b0546ed7cf57b34f84a5c6794eddd611cab9dc259c88099da6c97ec819981f773a6b3 SHA512 3e36facc8292e3c4cf9014e1218a71d2c1046733fe280c30eaaeca78eb633a94ff0f5b832abde0e184797c4ef2622c3feb606d5606ed931cf47d491ec162c18a
+EBUILD pbkdf2-1.3.ebuild 567 BLAKE2B 995a21458cd1b4d10d795c4225b0049e05017bc725099e33f7f3af722ad5aa925c845ea17272af4f48020764c3ec005dad69c851756a1b349347bb3b915b1251 SHA512 ffbefd54d55f793396535af5ee1a2f906e8a311f2266fe2ecfc2a26d422c5b10da10378e14e0cb73fd3a7aac28dfcbcdab5a22f61ba0f688595e328f90e21e04
 MISC metadata.xml 578 BLAKE2B 2bb6c12b4c3661c35e6d109f5c44b665ff826e12aaa334707742785d3ca68aa7661e5ecc5e6dfa55cc44c088ad9de7b1f8136650a214bdc608e7fb9bbf425727 SHA512 dff57e44050eac6feeaa13be6ad1cbbdf9c0c7bb91d3ec7110b3e3861e112c4faaf2d4a279751f9b585303eaeb3d1de98b7fe2fa0a8466acf8dd89ec0e95a6a1
diff --git a/dev-python/pbkdf2/pbkdf2-1.3-r1.ebuild b/dev-python/pbkdf2/pbkdf2-1.3-r1.ebuild
new file mode 100644
index 000000000000..0a5ba8456983
--- /dev/null
+++ b/dev-python/pbkdf2/pbkdf2-1.3-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Implementation of PBKDF2, specified in RSA PKCS#5 v2.0"
+HOMEPAGE="https://www.dlitz.net/software/python-pbkdf2/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE=""
+
+python_test() {
+	"${EPYTHON}" test/test_pbkdf2.py -v || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/pbkdf2/pbkdf2-1.3.ebuild b/dev-python/pbkdf2/pbkdf2-1.3.ebuild
index f25ed8e7ec13..bc554d89dc34 100644
--- a/dev-python/pbkdf2/pbkdf2-1.3.ebuild
+++ b/dev-python/pbkdf2/pbkdf2-1.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy pypy3 )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pluggy/Manifest b/dev-python/pluggy/Manifest
index 15538f3a3961..d1b930e2aaf7 100644
--- a/dev-python/pluggy/Manifest
+++ b/dev-python/pluggy/Manifest
@@ -1,9 +1,12 @@
+AUX pluggy-0.12.0-strip-setuptools_scm.patch 1186 BLAKE2B 443f5af807826baaca7e956759e7ad7ba3e50c0b0955823ee40d4d95ee85c864bd144104dc2a39cea03aa29ef05f799aa28c14763b85ce3c696baaa9cb249c24 SHA512 031e021a9dfda5b64ef8fcd077cfd6373d2e47bb0d989cc31c59ade70e6d31336b7929dc2e55bd675753487b124f3acd3803f14d112080b67f7e2766c4594364
 AUX pluggy-0.7.1-disable-broken-tests.patch 506 BLAKE2B 9f01f31d9b78254c662e15e2580ca78636ebfb7d902828054ada96857863917938f78f8af292549bdfa0ff1bd71cea9ff6e5309bcbb99a00c65ad52290fc23a8 SHA512 bb959e084e388599b468727afd0ed94e445ba65a5e6dd8840470ab7f0c56aed57bde3ab389a48c49dbc5f4bdeb6a60a77cd70c28c778a952bdb1910c362d456a
 DIST pluggy-0.11.0.tar.gz 56897 BLAKE2B 2d40ca953fa0ead7516dd81007ef6f1f88b0ebe45512b031fda9ed69c953bca08109f157676ba2ed545ffb1f8f7bb18fa1b8532635d6fc929c62bf0b5de45128 SHA512 8808f5015fa6f33fcb07047c644706bf3acceed1e107dd617395e61aa9765a45e3a641e49c610ab817ebaa2c4f3b32a15bf347579206e979fe6b844ba2f684b5
+DIST pluggy-0.12.0.tar.gz 57658 BLAKE2B 53c35f16fa73ffd115c7988032593e925e538f1a49a36a0db4db406b013f6f68f293ebbe3673243748d5707e72520192775e59cb8e1bbe4f9a448a5f3ba64651 SHA512 a3a64caefc797334b73b0614e467613b99909037a62dcbfbb0cf917788ee8d12af4f43d7c371634ac6eb6f32a5aa08e51aa8179e70b5998d4d055cd7f535129f
 DIST pluggy-0.5.2.tar.gz 18935 BLAKE2B 8e5bbab9ed0c78a0c6da076ad03618e66780f9ff209f4d08223e7a381eb4d7573727793f4543799e0e557991d4edcdbfd22c0565b69814379806912a4631abf3 SHA512 850b1a7b9e55d46d5deb16b8bc71e3f9d6c26b78fe34379b295a9780f3da8abb3c44f524f175d0392b61fc2d36d66d156db3f499a3c1666e2ff3e3c6344153cb
 DIST pluggy-0.6.0.tar.gz 19678 BLAKE2B 79db59c5f0ce0dd157630d039ec50643f615789b6b993d84e9ab1bdc9ce04b32df336d88df13f13a16a1f0bd4acb7b900208e98c84f007bdc3654f9a1d5f19a2 SHA512 dd58dabe2e65eee64d62c8748c2bbd99457288e99b819eb12312f2acdb0740ac46fd08f83522bc992297b9f14eec14c216c2c9688580f68393bf6fc609e65812
 DIST pluggy-0.7.1.tar.gz 47784 BLAKE2B 49eb28779717ead8963e14101cdfb830feeecff756a59f080e79e70465d48dbbc6e6100305e8b32031cefb0ba06bb10494f29bc8ddd38d4296016ecebaafccc1 SHA512 e19f6c1b3f2e711df1c8b075a2b802751afd218f1b692f08b2434c01d71c402331ff8c937550fbdfece2098f6d6856422d485f193e188916b365ded2e4087697
 EBUILD pluggy-0.11.0.ebuild 850 BLAKE2B 5abdc6916469456d8cd1e27d44795eebdc88a6ceb9e0fdfdad17c1cf7ef0dfff89277aa8a9a6668deca2e0f447f9135e1c8e770d7f0a1db5cea10761fc8697e4 SHA512 713b90e21e5e2efd96d07d8c5ffe2b7adcf9598c0da1d05d9f56af669cab3b7a058579826fe98748bbf848eb445f54df09b466eb602be338e8595d2567e7a451
+EBUILD pluggy-0.12.0.ebuild 763 BLAKE2B e7b32eedcb2a092730a01e24253c4f249640dbe65bc90727a711afae7a802f1f1b94815158c29c717463c89a9df3cca8722d339ee58cf42b84a29e9c9f3e7f2d SHA512 e98823b2be4b8300dcb68571598aa22b3027eeee1334c5339c3c0c8d29fe81282c2d038ae6c6f4ec4a96b43a97d4ab001b8045731ea8fb921599605cdf931eab
 EBUILD pluggy-0.5.2.ebuild 740 BLAKE2B adad43db340232fa1c41831a7b0660e3d2f57edd21df2fe249a3d259d3e01df1cf037b409a519deeaf29d322cab7523d9a798394d13b4fb1e1dde67e5f1a9b29 SHA512 64515e52df6d90ac1254306ab9bd8f7f9ca15d6d91bda3820e8e98ede7e3d25e48e5f63dd3361eb92ae48e8cc97611fe46b7fc0d99cdb2cbeb3d21b6c4c8fef4
 EBUILD pluggy-0.6.0.ebuild 759 BLAKE2B b8977998df79aa3ada2b5b486833320cfa1cfb29b2b9208684b1800f50bfa248db5a7cc58f7c6e82eff02c1031d5bab22468ee7c05d87ababf72462534f67fc9 SHA512 7b37be0d2f4a6b8062bf2ed36f2699980588b8798e71921faa5a705e2ad65688d5f60b7d344b25c29662edcfff43e189d29c64c97f757b1d5e2a6ef369ebbfba
 EBUILD pluggy-0.7.1.ebuild 906 BLAKE2B 9c200bd8157e62413551374ff7ec3539fafcb5e5fffd65c4cd7c158770eb0b7d9bd6367ef5c841f96d5f5e5450f523f04938c6dd7d3c52e78bed9f67b36217d1 SHA512 c82d7afca314e0429e1dd3c434b28a197c92a97b6eea9f286cd7af61b2fdc12ad1b944ad93376a1f40c25b5482a4cc65dd3caddcefe198f997d23d6a8fb03fab
diff --git a/dev-python/pluggy/files/pluggy-0.12.0-strip-setuptools_scm.patch b/dev-python/pluggy/files/pluggy-0.12.0-strip-setuptools_scm.patch
new file mode 100644
index 000000000000..6de5905f1103
--- /dev/null
+++ b/dev-python/pluggy/files/pluggy-0.12.0-strip-setuptools_scm.patch
@@ -0,0 +1,41 @@
+From dc8f1f4371f20ce0f635b46ab0976d6d76ca0c26 Mon Sep 17 00:00:00 2001
+From: Georgy Yakovlev <gyakovlev@gentoo.org>
+Date: Thu, 25 Jul 2019 18:18:59 -0700
+Subject: [PATCH] strip setuptools_scm
+
+---
+ setup.py | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 0f26fa0..9194143 100644
+--- a/setup.py
++++ b/setup.py
+@@ -1,4 +1,5 @@
+ from setuptools import setup
++import os
+ 
+ classifiers = [
+     "Development Status :: 4 - Beta",
+@@ -23,14 +24,16 @@ with open("README.rst", "rb") as fd:
+ with open("CHANGELOG.rst", "rb") as fd:
+     long_description += "\n\n" + fd.read().decode("utf-8")
+ 
++with open("src/pluggy/_version.py", 'wt') as fp:
++    fp.write('version = "{}"'.format(os.environ['PV']))
++
+ 
+ def main():
+     setup(
+         name="pluggy",
+         description="plugin and hook calling mechanisms for python",
+         long_description=long_description,
+-        use_scm_version={"write_to": "src/pluggy/_version.py"},
+-        setup_requires=["setuptools-scm"],
++        version=os.environ['PV'],
+         license="MIT license",
+         platforms=["unix", "linux", "osx", "win32"],
+         author="Holger Krekel",
+-- 
+2.22.0
+
diff --git a/dev-python/pluggy/pluggy-0.12.0.ebuild b/dev-python/pluggy/pluggy-0.12.0.ebuild
new file mode 100644
index 000000000000..9f802dd8e770
--- /dev/null
+++ b/dev-python/pluggy/pluggy-0.12.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="plugin and hook calling mechanisms for python"
+HOMEPAGE="https://pluggy.readthedocs.io/ https://github.com/pytest-dev/pluggy https://pypi.org/project/pluggy/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/importlib_metadata[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=( "${FILESDIR}/${PN}"-0.12.0-strip-setuptools_scm.patch )
+
+python_test() {
+	PYTHONPATH="${BUILD_DIR}/lib" pytest -v || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/protobuf-python/Manifest b/dev-python/protobuf-python/Manifest
index afcc0000fec8..64297f67a101 100644
--- a/dev-python/protobuf-python/Manifest
+++ b/dev-python/protobuf-python/Manifest
@@ -3,7 +3,7 @@ DIST protobuf-3.6.1.3.tar.gz 4490599 BLAKE2B 5a058f937330bd562e364a8d86e0b1376fd
 DIST protobuf-3.7.1.tar.gz 4795774 BLAKE2B a91155169623ee24ba49e397b151829321c01ff06bb27541e6c02701c37ac96ea9606961291ef0d4616dd6dba045bf7e893ec6288f5809d30cc026b60ae76590 SHA512 7d4cfabd4bd55926336a3baafa0bc1f1f15380b1b2af945f70a2bb3ba24c6ac6567f49c492326d6d1c43a488166bff178f9266377758a05d8541d8b242f4f80f
 DIST protobuf-3.8.0.tar.gz 4934577 BLAKE2B 4b86ab216e8a8b2c99c3620da9417c0562498e9d4dbf4957db186f51c62b0ed73b1322635a076b2d4054e015bdf6c8c50cc7fd0cb78d24a93b29d2a5b48f66fe SHA512 ba27c64e5193cd4a144bf0c9dc0d195fbbe6e580aaca01960362f0f185074588ca40046d3bcea76e1deae7508b722f6c5be484ea957122ae8e98229c7c3a4ad2
 EBUILD protobuf-python-3.6.1.3.ebuild 1338 BLAKE2B c2992acc2383bf7ab469f2a538dbd344ecf65d20bec9ebfe1209de791c643bf069c75dfac08e7b8ce1d450b4a468fee47e4903fd2cd8c4df0d4fb8643147986a SHA512 522fd9478da9a732828c8ed4ecfe468ac15218b8527d41e797f792c462987a7e293c56928ab12bddd79002a24772eecfb59f122244e327182f860810cf7fbdc8
-EBUILD protobuf-python-3.7.1.ebuild 1582 BLAKE2B 6f8a76a85b35af2e6379f5903147d3288dc025a07c1f9ef18392cbbcb7574e793927ef8db68bb2cb65a0204f65dfce16794cf1c9658865a46998acdefc253b84 SHA512 ce7aee11bc82e0fa16127acfa7db828f3d1c66b02f16b24fe41b8464d51134d7c8dbefac54f6c80810885afcd68f86199051abe1aa12a394493102ca0980f81e
+EBUILD protobuf-python-3.7.1.ebuild 1581 BLAKE2B 0a1956a1e5168382d5db661b7ccce17f164ac5f34d5746b54f17c94b935d7f6566731440e5d7a560ff4f03314b55f85f65dd9b8b9adb5965cb8799879ccec151 SHA512 6724d4732e02042369ccf2e662964be6493caf34dd166ae58d9afb9dcf5117e425c8f22134357d0b3b72b8e9dfac65837db31f6c317e92eae3517622e3ffb520
 EBUILD protobuf-python-3.8.0.ebuild 1588 BLAKE2B 2f3c23571352caebe00d924bc854a63a4c74edc3b1f884ddc1b621de8cb65cebcb881a0f2f1a505418df8a69dfe0d7413460f647c673e3cae5e44a476be6ddc6 SHA512 1764b45ebc7058d29a447f35d55bc4bfc17b8437d9152096f504e1a2df934a2d94d45e014985fbcd39d2e94343b98a2d0e3307e8665fe8479f26bed13e80f941
 EBUILD protobuf-python-9999.ebuild 1471 BLAKE2B 96473eb9817c078af97121297054a8dd253f22b3741a40d7df78d1494e229391111ade9998973a2f3b4e4f045f7f8389c4123e64fc0d764545cae35376ca6324 SHA512 f81f1b8146f9c26a9a6d343d3121e456f4b71dc6c6b42fbf8c73777d8b48f58088d3bb966b47da7fc01576f2a0989bcbddd414c19412060a2df8af1e97155ab0
 MISC metadata.xml 656 BLAKE2B e63db63e247b105b51b506a404d8edc821cc0ccc276a3f813df3b06951184218e736e57b577ad2f64880250c55ef09c50a9fe04428f7cec02fb04293c337175a SHA512 5d747585e025672d423690fa2d8df09380a1714c2e0adad5838a41f099e3984b70c7f80c5873ea296101898cd92dea70edee964bf01b9d86acb9a1d0140169fd
diff --git a/dev-python/protobuf-python/protobuf-python-3.7.1.ebuild b/dev-python/protobuf-python/protobuf-python-3.7.1.ebuild
index adfcc5209541..806af14728ad 100644
--- a/dev-python/protobuf-python/protobuf-python-3.7.1.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.7.1.ebuild
@@ -25,7 +25,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0/18"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 BDEPEND="${PYTHON_DEPS}
diff --git a/dev-python/publicsuffix/Manifest b/dev-python/publicsuffix/Manifest
new file mode 100644
index 000000000000..b2d3563f8fec
--- /dev/null
+++ b/dev-python/publicsuffix/Manifest
@@ -0,0 +1,3 @@
+DIST publicsuffix2-2.20190205.tar.gz 84498 BLAKE2B 978b788aee4c40d687aff8d140e426658779bc913c846e420147e48f2837582991ff2900c7a483814c5b908c9771e04e04f41bf35795c2d2d1299c5513840e35 SHA512 359052a2b41f63be3f87b23605b5229424f2dcf06b5bd9e9b5f1988cf9df5171188b94d54ed0be37099d94afd6efe6cfa75be27aef262e6c5af0ded61dfc6258
+EBUILD publicsuffix-2.20190205.ebuild 595 BLAKE2B 43d6c505b2544070075d0438fcb9243373bca095f98aaef343b19ea2e35714c30030a8ce09d3c51f3ba5bc3701f8d5e9839f6461897f1c6d246e8e92f559814d SHA512 08ca3e6e83248a31757a5a4e2ae02ab23011c0a6d25d42d8ad4c55ba6116e65ae4930188581ec3393ef6a52dbc8048d7ca2197850c30596985f31e5240a577d7
+MISC metadata.xml 508 BLAKE2B 8f17e4b57f751f1ba01c6f757f99a1679938ab371cb5cefee282674deff14ad686a474f2ed2233ca311fc37916d25ae69803668af807ec27fb0fde4791904633 SHA512 04a41bbaed88b09779131328708b70f59a575449b4307d8cc449b1f365e4c12e5edd7cf93927613b0616b0ec90b6539dc4cedcdb46701d74c580350c3926d18e
diff --git a/dev-python/publicsuffix/metadata.xml b/dev-python/publicsuffix/metadata.xml
new file mode 100644
index 000000000000..1de14ee2fdcd
--- /dev/null
+++ b/dev-python/publicsuffix/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<longdescription lang="en">
+			This module allows you to get the public suffix of a domain name using the Public Suffix List from http://publicsuffix.org
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/publicsuffix/publicsuffix-2.20190205.ebuild b/dev-python/publicsuffix/publicsuffix-2.20190205.ebuild
new file mode 100644
index 000000000000..6784ae27aea0
--- /dev/null
+++ b/dev-python/publicsuffix/publicsuffix-2.20190205.ebuild
@@ -0,0 +1,22 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
+inherit distutils-r1
+
+DESCRIPTION="Get a public suffix for a domain name using the Public Suffix List."
+HOMEPAGE="https://github.com/nexB/python-publicsuffix2"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}2/${PN}2-${PV}.tar.gz"
+S="${WORKDIR}/${PN}2-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	>=dev-python/requests-2.7.0[${PYTHON_USEDEP}]"
+BDEPEND=""
diff --git a/dev-python/pyGPG/Manifest b/dev-python/pyGPG/Manifest
index 39c41b8a01b1..7af488018739 100644
--- a/dev-python/pyGPG/Manifest
+++ b/dev-python/pyGPG/Manifest
@@ -1,4 +1,4 @@
 DIST pyGPG-0.2.tar.gz 15439 BLAKE2B 92c82b8b23c279461a872f118c636fa9cdae3f44910fc34a357983b0b4afea2a7b13c6400499a0fdbb4365357ade64294642178ca07a79ab3b7df89e60146e73 SHA512 93d892a57a27b254bfdc9778b73d341dfec654c2104c578014628df78c43beaf93eafb571ac544d52f334e63f6e5b8c0cfad7c8a0d585ee7211e8649efce8c67
-EBUILD pyGPG-0.2.ebuild 1128 BLAKE2B bd9c98fbeadce7f24d82cd477485e0385f5ff885d50fcd8c7da5e795c9f2d1fb553cb0f7150201e1228ab549ad17565add1a9cc6e12c99b60dc0c323ca3a9563 SHA512 10beb7bc4671fa2db678dfd716c3564f7b705abfe35e437951dcad388bf5988d2f8ee3654d22844bdfc96914898a2a22a75e5311b60ea2733fec90f3554a0298
+EBUILD pyGPG-0.2.ebuild 1127 BLAKE2B 1080ebfd37d6e65e9af7295ac52da9c960d32b761212ca4a005f6222f6b7a30a3b58d78006c72079e0c30df0c4ae24974eaf91cf545f75960725bbbfda6c5d1b SHA512 358a7f8141d1994796229c73aca965d6f98b9509a5b42b0b2330cc258dbafcc8e525a107d77e24afa8d9e9befbdfffcb788cdba41bce0d7d63a3e8240ade9009
 EBUILD pyGPG-9999.ebuild 1137 BLAKE2B 413a02bd7ab8aa9eea83c6b8ae075f7e148d33f95e58485d71fa7db3151bae5f53f842aa2ea60a03ffbce1ed58bf4adeba7317f2220f28533364a14e98c4aa77 SHA512 228b7e18adf0e7d3f10b5432713cd1ee4d329046b141baaa7831fd58ecce010021d71a2d386a265ca5d151bdddf3c451f3678ea8684735b089252fd9d2efe916
 MISC metadata.xml 672 BLAKE2B 27b2cf23f9d5b57b3b125bbfe3bf7e3ee581cb2d438e60295d94bdccc1d7c6549c412df0771b0d20d053f8efaaa1659ef9cc3e948a9afe2c70137047d63772c4 SHA512 3e10843a2625c38e9481e3d7d70318312efdda48c3ebf2c97af5f1319e03840765116856de363da5a7088e0fa25f03c513ec11bbe8eae55d932470e9f3bee420
diff --git a/dev-python/pyGPG/pyGPG-0.2.ebuild b/dev-python/pyGPG/pyGPG-0.2.ebuild
index e3d575a7cd70..f447e9fb6117 100644
--- a/dev-python/pyGPG/pyGPG-0.2.ebuild
+++ b/dev-python/pyGPG/pyGPG-0.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_BRANCH="master"
 else
 	SRC_URI="https://dev.gentoo.org/~dolsen/releases/pyGPG/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
 fi
 
 DESCRIPTION="A python interface wrapper for gnupg's gpg command"
diff --git a/dev-python/pyaes/Manifest b/dev-python/pyaes/Manifest
index ebd897802661..9b705205f500 100644
--- a/dev-python/pyaes/Manifest
+++ b/dev-python/pyaes/Manifest
@@ -1,5 +1,5 @@
 DIST pyaes-1.6.0.tar.gz 28237 BLAKE2B ccce23a58d88582fde56dfe26b774effc00c999c6dd0625e17c5ee7cea7ad1c16c9ab83f452cc4eb47fe88bb7367a37425c1975005249591656bf29ea3af4064 SHA512 32f6bf998b7e200fc73b4852873f60067ac056d646ae87cd8ab55f3ec99c9e26fa2b418b67ba0264a8016311a5f0eb2d40c8e7f917c0715e19f5c3dbf6a8238e
 DIST pyaes-1.6.1.tar.gz 28536 BLAKE2B fa7ca95ae181cd48e21ceaeab42f937c54bc9b90b1a337aaffd6317c8091f813b1fbd2abbc14a600a747829a0e94ac6bdd5624010a27f1c342bfef2390d7c8fb SHA512 00ce3babf72ea18b0de369860cd884058c7c6f3bd8b961c3ff591ef7d3dc0a69fabad5311f61c9f91d2f1a480c8512e34eeced5ec7145ed9f963bf91c5f8838a
 EBUILD pyaes-1.6.0.ebuild 548 BLAKE2B 647f114c7cc7f000fc69e57fd6bc46637649857ab2795e81fce2e35e159ad1b78f60b528687232abffbd814fc9435b3566f71a1693c824738c0709d185818641 SHA512 ff604b02034e403c14fb46c20c94a415b722fc1764b8d44e271637834ef41adc41133ab64648ae6958c0e71c1a0d7079ccbc337d081e04346ecab8a9f987f617
-EBUILD pyaes-1.6.1.ebuild 551 BLAKE2B 80e4c4ebf780e5c311b6a5424e454607bd67dddb184b32a368718af917a6f88c80bbfe8f3c30e14598d42738f441ff50dd60490d6cfebdfcff521b446fc7f6c6 SHA512 34ccfb2fa5ca5b12dbd4e01e246c046b6f0b87e71559d1ba5e97fe49c8ed647303be17a68aaa2ddd665cd21a573aed8c97f45b7691a16459546a2051c8f37a17
-MISC metadata.xml 330 BLAKE2B a1edc8608660194e47165b930dd3f08c6251d1e1899f2c5b986b14a67eeea1911ba1fee97516b640d949ebed958f4523e0351839e25c1f99771d02feee8f532d SHA512 709c6dd149b11725af862bb5d43be89be3f2432b0c3315e4d6cbbf45a98345b8bcbc092e9dd4d21b3501753f3fa9001d5d4ed5c6db6580ad311cc96c3c76cb9a
+EBUILD pyaes-1.6.1-r1.ebuild 596 BLAKE2B c1b7c18e3760b76f20a234f5d57e174755555dab1f17e71f8c80f1095b98474022bfe410ef28c7bea1ec4c477675fe290933d9b01b2c34dba238361ee70feb9c SHA512 3ef81b83f311f71ee0e664c7949895961c8f1f8908b3e609dd6893486108d1d0db628f0f1f145e87360d3d8d1831567169c2ae31bf3fd881b37da32f9ea968cb
+MISC metadata.xml 413 BLAKE2B 8f8dd44dbba6ea7f5428112866c3dcec032237c42001522d4e520d2565d378cd9e6e48dfb9eb1205f78b5e85c4f9964c44075774807d35188eeac72cd1e67fc0 SHA512 63a02ec94c96d1183a71a1a4676d54c3aa915666a0080edb472e169769669ca5268706189613a370b754c66df8879742e0705bd378c7ba9aeb9bfc0015e7a2c8
diff --git a/dev-python/pyaes/metadata.xml b/dev-python/pyaes/metadata.xml
index 936a7fedbd7d..0da1301d49a1 100644
--- a/dev-python/pyaes/metadata.xml
+++ b/dev-python/pyaes/metadata.xml
@@ -5,6 +5,9 @@
     <email>blueness@gentoo.org</email>
     <name>Anthony G. Basile</name>
   </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">pyaes</remote-id>
   </upstream>
diff --git a/dev-python/pyaes/pyaes-1.6.1.ebuild b/dev-python/pyaes/pyaes-1.6.1-r1.ebuild
index dccde7bbabe1..90b8b03fdf57 100644
--- a/dev-python/pyaes/pyaes-1.6.1.ebuild
+++ b/dev-python/pyaes/pyaes-1.6.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
 inherit distutils-r1
 
@@ -16,8 +16,11 @@ SLOT="0"
 KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
 python_test() {
-	${EPYTHON} tests/test-{aes,blockfeeder,util}.py || die
+	local t fail=
+	for t in tests/test-*.py; do
+		einfo "${t}"
+		"${EPYTHON}" "${t}" || fail=1
+	done
+	[[ ${fail} ]] && die "Tests fail with ${EPYTHON}"
 }
diff --git a/dev-python/pycups/Manifest b/dev-python/pycups/Manifest
index e68fe0ee8730..5c8306c6bf92 100644
--- a/dev-python/pycups/Manifest
+++ b/dev-python/pycups/Manifest
@@ -1,7 +1,7 @@
 DIST pycups-1.9.72.tar.bz2 52687 BLAKE2B 37d2bf2afc71b4feabbd5aac0c4dab49142a580b0b82d337709ef79a666ea2ad7942072f4f09923099626103a67f6b9a08a7972481ea28f7a88e13118e194d4d SHA512 db8b06378bf398073e34c89d62aa64cc8e56e93553346484c2e5dd67d046a3aa2f44020b68a7d479203fb2eeba005f8860ad4cebf72f8d7aa9aa15952a36d816
 DIST pycups-1.9.73.tar.bz2 52732 BLAKE2B a6c9750970548ba85cdef4041f716491e9b0cf4273cb5381bca8e57deab457affaa62eccf74d36eb3f8b047e5142c952e56e7e624f85ed7959a769f568824f26 SHA512 ee893d64f1645b71805ac358c4a3cc594f6285f04272ff0558aa60cbc90fafdbac30b623ffcc3a6b739218d9fd7a6a6e1d8cb186a5582f2cc30a518ed4dde810
 EBUILD pycups-1.9.72.ebuild 1255 BLAKE2B 4568166dcf0935cc900039e6344e8df2ba984c447c75e301d535faa06bf04a2e1651bd69b75e606b3235305ac370848fa4a5631ee8548e89014af6d77f058d1c SHA512 9533c094c3cacfecd5124cdd313a7d4e5e9cd63b94f0f745873dcf2918dbc9723a5fc52c9517352eb7a30abeb3322a6cfb4616c88fd13b6535662d84b41f6560
-EBUILD pycups-1.9.73-r1.ebuild 1419 BLAKE2B 4b86b07a1fec179c8e23f428316251fb60650469e4b8a4cc8e927b01c563fecb721470861b090360aab3b3d2698d569e588cbfeab7ce9a98f9d4c990c56ddf07 SHA512 84ebc4a6664d1ccf5769ac04eac5acbeaac7745a69849d5d706c7d550906c47bfa40784cc861ac64233e3580925f86d7aad2ece7d51b3b57a93def40f9490e47
+EBUILD pycups-1.9.73-r1.ebuild 1418 BLAKE2B 2b0df6b3662df5434fb39504a68799cb723308ee1a8d5eb7f41ebf9eb3dd901650725df96c0f29ab027fbe5698c42e05f24aef9e27c068ba9a228e6afaf09f47 SHA512 d6fd99175c6e8d03e73b70924e2a7f31daa2e77183098aeb3ff42afd3425610c1302f56d3f6249a6c5ec8475e796b7addc07e7d47868309265108967e173c7ff
 EBUILD pycups-1.9.73-r2.ebuild 1432 BLAKE2B 9f259400876aa1443d4f976b665d1b2ba3194855a4659d640a3be8fe9ade3908dcdd6040e0b0655d71214e7960ff68723fbc2e1c0f06a51c23f70a1be9084808 SHA512 9c91124e782689475a5fa47a377b6b565e2beff60941ae3729d2c874fbe9c0fd6e4484bff6bb89fad8a39b27d60303f9de0e80e419d14a61e403f66f043a7a94
 EBUILD pycups-1.9.73.ebuild 1327 BLAKE2B 4c7faa8943c4e091cbadb1f039668b0d477570adfc70a57e8565bdfb342ccad308dbef8648abfe193513580ad66583b3bb4024b67fc96afb789aba64f296e1f7 SHA512 445e2fd1524f8cb03867f24deba97dac67156643feb7455aa699442bb100dcb7c713716a4ad8dbe901a4ddcc4341d27fdfdbc0884bc50bb094f51215f9b00b30
 MISC metadata.xml 456 BLAKE2B ea7d7af9ed2baa3cb5270b3da9c5e1c6dc64d1391e0b280ddd1a6e3e8f3317808eb3906e1c9551615ac2218b89685b9ccbfb4d4656e80eeb54cf2d8dec2149c7 SHA512 c8318d150b07e8a369037201bcb9a99a7bc8c406a2a2889f4a1af62166313d4db740e8546f78f0de1e80cddf774f8818e49a4d3e99e906456ffc2f46a562e7ea
diff --git a/dev-python/pycups/pycups-1.9.73-r1.ebuild b/dev-python/pycups/pycups-1.9.73-r1.ebuild
index 89fa946f873a..471e5ea80425 100644
--- a/dev-python/pycups/pycups-1.9.73-r1.ebuild
+++ b/dev-python/pycups/pycups-1.9.73-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://cyberelk.net/tim/data/pycups/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~sh sparc x86"
 SLOT="0"
 IUSE="doc examples"
 
diff --git a/dev-python/pyenchant/Manifest b/dev-python/pyenchant/Manifest
index a9bbaf6d6ca0..ada4cd56e58b 100644
--- a/dev-python/pyenchant/Manifest
+++ b/dev-python/pyenchant/Manifest
@@ -1,7 +1,7 @@
 DIST pyenchant-1.6.6.tar.gz 64010 BLAKE2B cdd0878ca58e05d955bf7d5518de71c02f663a8b00b1437bed8171fcdd08768691a9f9bc2bea0de0e942c2197bc9cbef66a88a114c47df3265c8d8034c95225a SHA512 af6aa1ac77b5718ec4b4aad3d0b88d26e697b472ec8261b23b37fdbf6b399a120ccc3e4ee6579b884c44b0eeb3f95bcdbceea189105c05088a48400a0c8cdb90
 DIST pyenchant-1.6.8.tar.gz 63693 BLAKE2B 5a8f867f3f40e81ec7d2431b678f324619b81942c8ca05a0cddc5acd2a3c645227fe6584b2236cfd440104f552d23786fff064d39762eb62e9e6a9d62ef1c670 SHA512 1a297cd279a0fbea2657bb42f2018a693b7f1d2da420f8cba436f680fb803282432f86e244a098eb7b9ef801059a3ee3c3bbaa748d30ea6357edf9f778e2f0a0
 DIST pyenchant-2.0.0.tar.gz 64022 BLAKE2B ee1200ded8e2a8f9145fece64cee1c8ea3129d540e10708d51acf6491c200a0f39927b47fce51d2e2f932e465d7acd5bb4afd31712183530f6da5e8ea899c0c7 SHA512 c985714bc8ad69b6580fa1dd546243da5f3f92e8681d846ed265b086c486ae7ed33754fba303b450be4c0cb20e975a9a10efbeb700ea5213a11ed00612a93af0
-EBUILD pyenchant-1.6.6.ebuild 746 BLAKE2B 0f37a0d25c120933d044b7cc03d2158f96f0c4cb402c581a8d1b873cf8454f3690d2e0ca3baa3caf38bf8d2f1d3ebb25792ef3ae7c07f04d6f5fb9ddc11ed6cb SHA512 adae3f10f99dc8ba09a1421a16535ec5135a5c4271cd7c445e71e716998d25d9d6f0bcdda1d96523957a04db4ed4b7df9f1fb3abdd544e70dbc3e8d5ddc0451d
+EBUILD pyenchant-1.6.6.ebuild 752 BLAKE2B 2b01b24262849661b4d4c4dfddae1c9046af5e7b3e38f9295e1bdb9526d6ddacffc868c628ad09b6597801bf6c744e35023582da7316319396b108d70cc67543 SHA512 f701e9a4123eecfd75542d3357504421fe4104a754effd9e5eb9191f16995432d1208d7a5173644af00e3e560b54157d6537ef6741b413ab83ee16a4523b8f27
 EBUILD pyenchant-1.6.8.ebuild 753 BLAKE2B 61bcbbda9a3fb4aae972f6a2a58e9c9fa136ee71b117085915f5db1ae635a02b75401dd72629712e8a6c1d8ac8bb19fca2048fcc00b07933998a426cf984c1d1 SHA512 39ac85599226261356e068d40f387628f03929188fb3c6a4a81b02f4e4bd5928f39a3fb531c98d58a31dfe3162b5fec062614d92795aac49e4d9a091d3849641
 EBUILD pyenchant-2.0.0.ebuild 909 BLAKE2B 72f2a853e02cb09fb1430aac45f129b97ade3079171a1a610b056692cef7a197f65f477954daa16a7feeb2c9feef5a94929039f37be8b3ae5c035c62fd8986a1 SHA512 33c2a164c6ed3211d852c9364e6562f3e2db050ebb7713da1b16807bd4a4af3a02aacce55fbb38c8f51f21027375265e85c7be666fff15162ab8d5422709ca38
 MISC metadata.xml 870 BLAKE2B 991969a849f8342f8fcde0b547b58163214703c68ee65864522f6a64d74d8f8a5058619bb9cf00f61533e4cc218da2e3cc217049072b1cd2396cc7fa3ef298e9 SHA512 bf35258041e5664b6cea0a0c697edd684ee32c5a72f3dba7ef4bd87d060f58790d60a120c80dfbe4376cebd8edd9d45b5c2cb6b0fc5562334d8345b398cb565b
diff --git a/dev-python/pyenchant/pyenchant-1.6.6.ebuild b/dev-python/pyenchant/pyenchant-1.6.6.ebuild
index 76685c4a82a2..37f2c1a53f34 100644
--- a/dev-python/pyenchant/pyenchant-1.6.6.ebuild
+++ b/dev-python/pyenchant/pyenchant-1.6.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 arm hppa ppc ppc64 sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ppc ppc64 sparc x86"
 IUSE="test"
 
 RDEPEND=">=app-text/enchant-${PV%.*}"
diff --git a/dev-python/pyftpdlib/Manifest b/dev-python/pyftpdlib/Manifest
index eb658487603a..d02c63c63f31 100644
--- a/dev-python/pyftpdlib/Manifest
+++ b/dev-python/pyftpdlib/Manifest
@@ -4,6 +4,6 @@ DIST pyftpdlib-1.5.4.tar.gz 184986 BLAKE2B 6973b1f7e0fc0c89eb5d79e082690a706b565
 DIST pyftpdlib-1.5.5.tar.gz 184314 BLAKE2B 2d02839c6809674c7b7c4dfd610610a9231799802cc53ad0a05bfabc8985e77c64d9b239628f13bdc22942460b3e923067f084c3c5ac2b7be7671279a08e0351 SHA512 27427154f893812f689adf3a9ceb4ec2d8f0ea7a4bf7b08671dc146c95f09ddd596a27c85e009d8d6647277def48c0bf0a8b76fb3fba5818eda3dfdc6c10795e
 EBUILD pyftpdlib-1.5.1.ebuild 1291 BLAKE2B baf53f0ba139f99fb4b73e4d568b51a8116b340c248dc47bf9c12cc275d00d0c78bc14c88a18a938fc087d815c61d1088c4078cb5bbd2b46802fe1605767fb03 SHA512 9eda99b5c01edb4684bda49e55e101e0c7e1598a94eb54f24f2959c30399106b309c095bc104c0a9cb9f757b1e002046708e01976a0cd1daaa775a8857477636
 EBUILD pyftpdlib-1.5.3.ebuild 1551 BLAKE2B 0f44e8580621483f889459eda6ba102fadf08a8f9b1f68f443d0c6fd7f151e8d6434b3a3740c3f78cbeea60471a71ce43aca61d91db5b5d0c87c88bc0bc026e8 SHA512 7d85ec0dd59708fbf92514ceb08eba848901c6eec26809613e734a20d9545fcb11bf260cb165637ab1861e15a8d1b8a112fd7f0955da028593726d4ed7535a53
-EBUILD pyftpdlib-1.5.4.ebuild 2534 BLAKE2B 132fd0722f42199ad846702b80666a809c05182aa362e5692bd8ed1fb2ac16efaf2b1bbd433ad6162f6fa292b3bfbfb68d677ffb42253a084c4b6ea8ed387e43 SHA512 928f70fa8e66dedd85eba6a396c7377328bef4a5e522c84d2316d25bf540cfd04031a8ccb9ec46f693970ea7fa0b1e01e6a80640fdce9bb111c11206563aedbb
+EBUILD pyftpdlib-1.5.4.ebuild 2540 BLAKE2B 63c8c3afd8080f3434603fffebbf82a9f7cdf16da4553a6d2147cd74073aa58de13c54f69657e1c9f47abaff6628415f31faeacb33904ceaf480a75ce7880cc9 SHA512 d317349d27b8d97da52d76189270f5d9ec75095d4ccea9301c035fc796b76ca29608bf8726945cebc44f781f5d2f0293db299eac30fac6958e614cb1d2389960
 EBUILD pyftpdlib-1.5.5.ebuild 2579 BLAKE2B 3dd76eda87738aab287bd681a26587b58f4b94c6ef8e43bb7e114b4e3519bf897db6c209a8148583ebfdfcb496aa3262f4c01867c1124864f5cdafc5ca1ccbf6 SHA512 c47fb2d860da6248ef9a857cd69a97f15487c29da251a494b0c5247b9e7fa754db3e3ede4a46b25940780e10ca9e36989611bf6917a2c82a3104a4b1bd9e0af8
 MISC metadata.xml 438 BLAKE2B 0e0860eb9d885ec9b432b504bef6a9394cf4a2d6d99751c80fec8441d8910f8a17364e5f32782638ac689abf5cdd3ebcb5fa20e7da3d612a5e8844e8c8a34d76 SHA512 a748827370b53c94fed352cd6bbd7468a22c7ca2f15c4601c98a2689e3a7e652ed28434bcd125fe0f3018d5508600df03130c18d7d67834b28ac0c3480b16345
diff --git a/dev-python/pyftpdlib/pyftpdlib-1.5.4.ebuild b/dev-python/pyftpdlib/pyftpdlib-1.5.4.ebuild
index f0e070e99d3c..c42db67b8843 100644
--- a/dev-python/pyftpdlib/pyftpdlib-1.5.4.ebuild
+++ b/dev-python/pyftpdlib/pyftpdlib-1.5.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
 IUSE="doc examples ssl test"
 
 RDEPEND="
diff --git a/dev-python/pygame/Manifest b/dev-python/pygame/Manifest
index 645318e689f4..acc186b4a3ad 100644
--- a/dev-python/pygame/Manifest
+++ b/dev-python/pygame/Manifest
@@ -1,6 +1,8 @@
 AUX pygame-1.9.2_pre20120101-import-bdist.patch 1609 BLAKE2B 976556f860aa1d9be39a1cc56b0a771850aa6afad4acbf45103ac50f69da3b63f365eb3a3d94402c33233a45fd9adf74bec87e7c40c5e5c58f0b982b9a7d62a5 SHA512 d40d0141ac44d8081e51ec94c72123b7f59b8328569d5d590b8c54c3b33b1088e8ecbf56f80c2ba11a01c735421e5836d3f06b390da564f03448a6482d2fd319
 DIST pygame-1.9.2_pre20120101.tar.xz 2263028 BLAKE2B 401b7cdc32cfc6b960e8a686236d0a310d840b4a41211b602f6fe137f80f3bb358daa5e25758c4e152ab41e50c3864c183a0b6f36176e3dec12db80449e126e1 SHA512 1e82cf720da28d4e4213f6b7a029ab4c9dd592c3155f3d11da8272a7d81d28c54f93402383fa5fa4a4e8863dfc039062838d0317cfedde30a4455e52ce680576
 DIST pygame-1.9.3.tar.gz 2974541 BLAKE2B 38ba1f85d845cf33202819705ad564168fb3bc7041731d50d8c3f6bf1c55bebf41202f8ae9e4c4ba52cabe7335a9df13d7724104015b49842dc7f7aa7b0bfd19 SHA512 8920c598a97b4ff8602391517f070b67263bacb6330e13ea5d7d5432ee592a7c984fe986837b90a032da3d4e717f9df0cc99f0fb39f1cbde1b4f6a4c132feffe
+DIST pygame-1.9.6.tar.gz 3223131 BLAKE2B a4d04c933fcad244d32bd512ef8717e60ec923f361e9e0296b5c7d57c5949d3434a040d028249c5b8f3c865ac3dcdbb32e6f0b223186678595a8625213ba2a17 SHA512 d923c554203a7c35e37921658cb4c5bf50215ab0ff4d2b869a1ee6b2e2ca31d66ec4bbde4287f5a777838ffe932cd15b993cb0224b86e43d684de61c35acbcd0
 EBUILD pygame-1.9.2_pre20120101-r2.ebuild 1916 BLAKE2B 160a97ee19b5e4a8aca9936d0429f33fa7d21ea6264c84334efad4987e16014866393cf33d53c6d73200f3754721382652100b7385fb804da208f830d6ed24e3 SHA512 7132e4ea45575e98fce1dc22af4443c527ed72b03e52fa8ca9365e39ceef31c8776fc512ecec3ca3dd55e7a6996f6d00fa6876d3c633b843c6cc1c64abc722f1
 EBUILD pygame-1.9.3.ebuild 1771 BLAKE2B 769e0442f92383d7c1faf8b589ead937f3db0d6f74b4adf5d3f0c1ae1813ad269dbb6c3eee5bf9938fb359d1ba111b0e57e1110cac4eb9b474c497d8b9c672cd SHA512 4be846496eef065d4f565365ea7002b818788a48622892cdfd1bac3ce67f7429a222f238fa5a8d8e111ef540c16cabc64de2d836ab84fb935afa841333c65044
+EBUILD pygame-1.9.6.ebuild 1756 BLAKE2B 40a7ff3948167a9757b69d0673fcd51a05dd3ff4465aa00e46053b684af7d4d0ba9cf21395ed61c4f69d2bd172093e462711664081ba6636776a4b45703f01de SHA512 f7e261f97588db22d5598becb2a2e4c7278157c485a19a649563562785d12f3364fc5ba12889714c2a5afddfeb61209ddb54970e97a330d3aa57056c9e2585cc
 MISC metadata.xml 408 BLAKE2B ae371ef164069765d0964da714a83c9898ddc190ac295c5ad5bbb6a3c45db5aa415d84ff21dbaa510e5c9852397e6b6b389684c54b67d83d675afd9b3d9a697e SHA512 a6e06c0bed59d5157166577a2dafa53f28a310c56f251bec36af077a79342c6f954fa63a3fa8d3546ca03cc9358e75eeb1ef04c6e0371e43e0b7bff51ffe35dd
diff --git a/dev-python/pygame/pygame-1.9.6.ebuild b/dev-python/pygame/pygame-1.9.6.ebuild
new file mode 100644
index 000000000000..5dc353c70510
--- /dev/null
+++ b/dev-python/pygame/pygame-1.9.6.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+
+inherit flag-o-matic distutils-r1 virtualx
+
+DESCRIPTION="Python bindings for SDL multimedia library"
+HOMEPAGE="http://www.pygame.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~sparc ~x86"
+IUSE="doc examples midi X"
+
+DEPEND="dev-python/numpy[${PYTHON_USEDEP}]
+	>=media-libs/sdl-image-1.2.2[png,jpeg]
+	>=media-libs/sdl-mixer-1.2.4
+	>=media-libs/sdl-ttf-2.0.6
+	>=media-libs/smpeg-0.4.4-r1
+	midi? ( media-libs/portmidi )
+	X? ( >=media-libs/libsdl-1.2.5[X,video] )
+	!X? ( >=media-libs/libsdl-1.2.5 )"
+RDEPEND="${DEPEND}"
+
+# various module import and data path issues
+RESTRICT=test
+
+python_configure() {
+	PORTMIDI_INC_PORTTIME=1 LOCALBASE="${EPREFIX}/usr" \
+		"${EPYTHON}" "${S}"/buildconfig/config.py -auto
+
+	if ! use X; then
+		sed -e "s:^scrap :#&:" -i Setup || die "sed failed"
+	fi
+
+	# Disable automagic dependency on PortMidi.
+	if ! use midi; then
+		sed -e "s:^pypm :#&:" -i Setup || die "sed failed"
+	fi
+}
+
+python_compile() {
+	if [[ ${EPYTHON} == python2* ]]; then
+		local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
+
+		append-flags -fno-strict-aliasing
+	fi
+
+	distutils-r1_python_compile
+}
+
+python_test() {
+	PYTHONPATH="${BUILD_DIR}/lib" virtx "${EPYTHON}" -m pygame.tests
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	# Bug #497720
+	rm -fr "${D}"$(python_get_sitedir)/pygame/{docs,examples,tests}/ || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use doc; then
+		docinto html
+		dodoc -r docs/*
+	fi
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins -r examples/*
+	fi
+}
diff --git a/dev-python/pygments/Manifest b/dev-python/pygments/Manifest
index 9056fe116fff..6b5276238bec 100644
--- a/dev-python/pygments/Manifest
+++ b/dev-python/pygments/Manifest
@@ -5,6 +5,6 @@ DIST Pygments-2.3.1.tar.gz 3124216 BLAKE2B 99a5f96a2d2f9deb1a6b6ad94a21ab7f517cd
 DIST Pygments-2.4.2.tar.gz 9405880 BLAKE2B 20a955fce2b06ab12bd4ede4da9308f1cc5f2286391146fd83f3d598cd38ae66e7df3c1d779c8f6f5de67ad92d032ff02fef8f41141edb007e2f24d3586d82e6 SHA512 c8f378700e99d9e5701ac7e27363921dbabab50a910686aafda1e016c813e99915fcfeed8298323b9b681b3d81f4265ab9a5bb75b8cdff0668c9eff745337b66
 EBUILD pygments-2.2.0-r1.ebuild 1617 BLAKE2B 12203987ca08ccd71d28d8bbfcf1a5bbd4a91f2c9ba2418f6cef611b1735e4a42815d63d731b8d42b5bf6e0104f9078662bef9e03394e62a190a5a954dd5ba98 SHA512 a5a31baec8484f8a30aa29207f6f7ed5ab3dd9819510915a396a624426305d2128fb593e611bb984d18a8a6471a1c151341492d7a5f8d15436fb0854dd4c41ca
 EBUILD pygments-2.2.0.ebuild 1768 BLAKE2B 09ad9ac25d4879a54c59ea4dbdbc2699229d2bb150d81a4ab6a8ce6ec567ede12c5f2a341ca69532459c8510324612da1d4a77b2e7bf2132f7b09084b5b1bac7 SHA512 cf4bf9e7785589231cdc8c31e5ec86714b99c65bb8c71dd0c6defbc2e75d3be6f84429562c727e75e3d5a0149f13c300e442aec19d255c00c57a3312dc111186
-EBUILD pygments-2.3.1.ebuild 1432 BLAKE2B 559c78518805b1a66687cc53ae858f4143ef355647c116b339b4ec188ccf440723c57051022f6d198b7bcdec33c1d206f6055c899628046ec181b448b3d67ef5 SHA512 7753e8558e0252be0204815372fef692c046da229ed019a3c700ae592628d457913ee2ea02a81b61eac1b96bedb6a1a9277ab28f64ac0acfc01f782d3a2b0d06
+EBUILD pygments-2.3.1.ebuild 1429 BLAKE2B e2a7a38d828ae482c574f1236e6149166bc92d98f0022683839e9cb19560e642eaada6c3a2629a68cc5fcac81ff2683117bac5929e9130c88326bf75b3726dea SHA512 3a44862de366f6f5f5f8b6f682efcaa43770b716344eb64baae4940162d3174e78f23d225761a910fe8e23721f8ae8da0f0488d2330fec35540599984aac5ed7
 EBUILD pygments-2.4.2.ebuild 1314 BLAKE2B fa63d9ab360809b8d5ebb7ae45d653b7dd1f3838c2165813c8b2bc0015eaa7d5464588bbac3c95a44e664b9b547b3d6023918451b228f2ea2334fc4f16a8ccba SHA512 af07c65f0a9cb0d8b5cb5c61c96ce6dccfcea86164d00c5c8916ece0827c5cf06d19d0e765332776c32fa921a10704d84cc01311c36339eecc226468dc9be69e
 MISC metadata.xml 542 BLAKE2B 88e44c4b6f29e096e67521c621724d1a5415d089f73612fb8d02ee714a4af1e8080cf98542d7f0c9b1331d919bbeba31b1fa8269a28cc1be841af069a497d889 SHA512 f15732bb743ed5ad4049036c7b87118c89be09e260ae483b4c7e25155a31c0ab8844f8a1050386a0ee81d2b1e55d240f90cab3e28749b8f943baf64ec176814b
diff --git a/dev-python/pygments/pygments-2.3.1.ebuild b/dev-python/pygments/pygments-2.3.1.ebuild
index 69c57625ade6..33d52f25e290 100644
--- a/dev-python/pygments/pygments-2.3.1.ebuild
+++ b/dev-python/pygments/pygments-2.3.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pygobject/Manifest b/dev-python/pygobject/Manifest
index ceb90375c712..b7a47cb4f5c5 100644
--- a/dev-python/pygobject/Manifest
+++ b/dev-python/pygobject/Manifest
@@ -8,10 +8,8 @@ AUX pygobject-2.28.6-set_qdata.patch 847 BLAKE2B 696aa6c48ee900db738f8a92265a625
 AUX pygobject-2.28.6-tests-no-introspection.patch 1257 BLAKE2B 7ff0587b4b40a1519927f8837b5487847ad0d0aa25f57dbaa4b10eaed2eff79f52d6581ca29f1688ebdbe71db231aba56de06c3aa8b246fdd1799320d9a15cc3 SHA512 7d57cb9bbd0b16f4fb0ed9d5eca310c47daf86b89daefa41fb0cf5dd470a6f6a31d0dad31dd261332c039d39bd778f9de8de7260c5856f1b718f72b9aabc01b4
 DIST pygobject-2.28.6.tar.xz 747248 BLAKE2B 5f92794034b2d0559a623db4a7d273a7dc3f099cae87ede91b17e81acac085a9298c6b81b45b4b8540b6a75ced97e474a993437dbfcfc2133d3321d6a979b541 SHA512 37544ea2377258758169b25a2969d5ee1c9ffb9b6e63e05bc7a0471a49ac9169c51ec587d4489172c7d256f53df878a81c1992a08059aa7e43dbbb69f799545c
 DIST pygobject-3.28.3.tar.xz 1005368 BLAKE2B 5c24fd25fa20dbdbd3ad18d7e2eafd8f47f5e28903d9f8dab6110f09ccfc13f865149f0d4bd84bc755bc6e4191b903646930e818d85382dfaf4e05f7107b3ecf SHA512 0abda393dd774f9cea04f883eab53f5ebde81d2439ed18cfe08ef39a1996054ab34bf4e770f70116a4485fb4f9970464b9a950ffa4af76cfa21ecc8d4dff968d
-DIST pygobject-3.32.0.tar.xz 551516 BLAKE2B 4c0b568c900523f4ff6dcf88a85c8780b16004985db6388e29f7d71e7bbac3131779d2652ba760f47cddee8607ca1da7f6144213f29f709069655ec898a125ea SHA512 beb0625e3257cdc2be251624dbf852d2f51bcb95d13bff676b93d46a80d9df94f6fb6ef9850e5c38c56325b72854165fba9ce20ab78f13d99552b3b10ff0fa81
 DIST pygobject-3.32.1.tar.xz 551708 BLAKE2B ba7c34e4747d6a11424a23195f71877ecbd69b463b3c8aae7634a320cc8ec723e24301c0674b9ffbfdcb6d798fddddb5b772a723afc7ac28c23461e84cf7485a SHA512 5b325d0caf4f34f783fc2c664a795809f048eb1639d2f2e375fc147c852d6e29a8ab119438cac76786fb20220c72d5859cc06d6f70c29f976f6a5914e0169915
-EBUILD pygobject-2.28.6-r55.ebuild 3537 BLAKE2B a5b8ed9f09176314ffd8584203f5688399c9aa4320379765c0867c4605e38d2fdfc51986b58960465506e36b70260afdf48e68d4de385b4ce0d0113a20309d40 SHA512 c605ab80a65d3a8e71669c22675b4cf54cb94fefad28126df05504e84b0d867bb5608952c0b0e161df4c8895c159159035622919b9321d81b1f26b34ea677b0a
+EBUILD pygobject-2.28.6-r55.ebuild 3536 BLAKE2B 478dfd88ecda42533718d7b1fbdfddb018903fbbcbd621e7f601d97a44aa4b7e4ae52108933923a7133fcd8dc82b71639a2779cccae4a8aa39cb6265df5dbc16 SHA512 f279574c1fa982286dedd6b4c0afce84d9c3fb1b765b1dd866f307f85d6e6bc56ca8c117ee09168d6059c29a8b265bc57e1a0f813ec4054087809dd3419849c1
 EBUILD pygobject-3.28.3.ebuild 2781 BLAKE2B e61485d38a4ecb0fffab6b2be57ab6eb7f73b7b3d93a3dc5b6053a590b3dc5b8808e015ee799e97e385af58398312c9d4eaf3253ea8edd443e68d7240ee681d5 SHA512 26d77d8707389f991564abcf4367cd8219d41161eff8a8e0a780d40fb678e204ad8873e25813b20fb797fd7a07ac41b32cf2e6f9fe7fb6551ea5628a47bac6b1
-EBUILD pygobject-3.32.0.ebuild 1799 BLAKE2B 30ce722d41ec0cfe78a21bfae59657bbb7c0b247e23ab33753f69922ad236d9939fadb5a51f6d30009d116c5eae973e180bf6ba4d06755e8ad2edd084730ee96 SHA512 3ed9eac4109e19cff59c189da5c04cf53f4ea7f63dd828b5a95b91bbd306f1c5b41eda1cde0a68361cf58da9109d2a9c5f3d0547409e83a4bb92c041a2e65f35
-EBUILD pygobject-3.32.1.ebuild 1800 BLAKE2B 2eed3a626f58d89d8ae19fbe605d34592c05dbfabce32cb7f5ae3ebb93c7f44137b0e2b009fd888ae43c948744144ac8d87f724e87dcec6eede4f588a1b64031 SHA512 54ae349228c42e80c9d7f5562e2bac2ffb59a0ee1566b2d3a962c1eebd2ecc8935746645249c4bc2da603c521ef88f44117c44c9ead20f238dcbbed2c19dfbe1
+EBUILD pygobject-3.32.1.ebuild 1798 BLAKE2B 9649121e98f038ae6a7867eba4327dd3bff549ad463778e953dd96d8510e1c4782632d4c5621596698454cb8ead0459bf32e861dc2b50485c5b79970aa896bd9 SHA512 67c6ba2199a5d699043ea2fee81038c1a8d062d441ebc6b4ac10d01536230e53ee899a854853e05836fd47c277e6bb5210c0b29f0a842c8e275a5e09e592d4c5
 MISC metadata.xml 1220 BLAKE2B 4f2d4f1091eef503e2ca7457418888071d70509e346ded7c5e77839c8e5e6dd1c27957e6645a7f32bc7ba0810aff8a55874e7225f7a9e7674e4c1bfccee2ce1d SHA512 991d11e7aba9fc7d6ccd6971a150d50ebcd397968a9a2c2c901093f598acfa70eb8719a3a590c10433147fde97603012862fe1fc613f766ccaa2a159705a6ae6
diff --git a/dev-python/pygobject/pygobject-2.28.6-r55.ebuild b/dev-python/pygobject/pygobject-2.28.6-r55.ebuild
index 140aef62039f..d5e6f8e523b2 100644
--- a/dev-python/pygobject/pygobject-2.28.6-r55.ebuild
+++ b/dev-python/pygobject/pygobject-2.28.6-r55.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.pygtk.org/"
 
 LICENSE="LGPL-2.1+"
 SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~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 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples libffi test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-python/pygobject/pygobject-3.32.0.ebuild b/dev-python/pygobject/pygobject-3.32.0.ebuild
deleted file mode 100644
index d095090ac667..000000000000
--- a/dev-python/pygobject/pygobject-3.32.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-
-inherit gnome.org meson python-r1 virtualx xdg
-
-DESCRIPTION="Python bindings for GObject Introspection"
-HOMEPAGE="https://wiki.gnome.org/Projects/PyGObject"
-
-LICENSE="LGPL-2.1+"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="+cairo examples test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.48:2
-	>=dev-libs/gobject-introspection-1.54:=
-	virtual/libffi:=
-	cairo? (
-		>=dev-python/pycairo-1.11.1[${PYTHON_USEDEP}]
-		x11-libs/cairo[glib] )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	cairo? ( x11-libs/cairo[glib] )
-	test? (
-		dev-libs/atk[introspection]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		x11-libs/gdk-pixbuf:2[introspection,jpeg]
-		x11-libs/gtk+:3[introspection]
-		x11-libs/pango[introspection] )
-"
-
-RESTRICT="!test? ( test )"
-
-src_configure() {
-	configuring() {
-		meson_src_configure \
-			$(meson_use cairo pycairo) \
-			-Dpython="${EPYTHON}"
-	}
-
-	python_foreach_impl configuring
-}
-
-src_compile() {
-	python_foreach_impl meson_src_compile
-}
-
-src_test() {
-	local -x GIO_USE_VFS="local" # prevents odd issues with deleting ${T}/.gvfs
-	local -x GIO_USE_VOLUME_MONITOR="unix" # prevent udisks-related failures in chroots, bug #449484
-
-	testing() {
-		local -x XDG_CACHE_HOME="${T}/${EPYTHON}"
-		meson_src_test || die "test failed for ${EPYTHON}"
-	}
-	virtx python_foreach_impl testing
-}
-
-src_install() {
-	installing() {
-		meson_src_install
-		python_optimize
-	}
-	python_foreach_impl installing
-	use examples && dodoc -r examples
-}
diff --git a/dev-python/pygobject/pygobject-3.32.1.ebuild b/dev-python/pygobject/pygobject-3.32.1.ebuild
index f38a65845a7e..688535e40eb3 100644
--- a/dev-python/pygobject/pygobject-3.32.1.ebuild
+++ b/dev-python/pygobject/pygobject-3.32.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/PyGObject"
 
 LICENSE="LGPL-2.1+"
 SLOT="3"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~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 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cairo examples test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/pygpgme/Manifest b/dev-python/pygpgme/Manifest
index 05644e787b34..fe55b65bb1bb 100644
--- a/dev-python/pygpgme/Manifest
+++ b/dev-python/pygpgme/Manifest
@@ -1,3 +1,3 @@
 DIST pygpgme-0.3.tar.gz 50100 BLAKE2B d55ddc79a569ddf007552909a142836c54f97f6a5e9b503dec0405d1df387a9aac04f0424b3700cf35bb5d1bd891f0b90f2dc3fb7cc88435da83944adfccdaec SHA512 25fc199a7958adfa3bbb294108792974ba96ee7b15dff98f7933e9b089a6044d83bb7c7b77ca84ea0cab5b182f6d401cee42ecab57ab9ba34aa0b14eb6ce7736
-EBUILD pygpgme-0.3-r1.ebuild 536 BLAKE2B a368f68dd7267f52c37dc3979a61b4d3674e709ed19c7de38cea6c4b08ae0772b0b1281d806b81aa6a4ff98327747ba39a379dcaa81bcebc2e358c2039856e0e SHA512 8d63765b3d25d084a020812c09f37f73c8a0d227d55ab32c6a95c16e905f28c48dba5e274c4012e46f7f0aeeb4f1119c1ea39604ae891a39a0107da6f9ed3b4b
+EBUILD pygpgme-0.3-r1.ebuild 535 BLAKE2B 1ac57467b605c37f6453d633651201eee7df048f1080ff8bc5d525604ee2633708d08b9e02f85f571af70fbd21c0e5b16e3dca86cec2e864ba1692675f79c8ab SHA512 6b7b317411307ae6b10a2ee500a71d4d3b6d692671683e161f9f753f471344b2b5fed2762748a670acec7d1d4a8e6258ea3cc93f6ed878cf16f17bcb8c14470a
 MISC metadata.xml 665 BLAKE2B 4d0fcdc592cc195fecf65d0f7498d562235ba978b7e9723bc7c89786fb6800ca69415e3a80139d7257054e2532b902528cf2862352e3044c5d23d65267844a10 SHA512 1e9974929cc266d7dae9f6f9cec2b7dab4f105765b87b22f675a62ebb75743dd2043bfba3bf8732e4edeb9d18f6301d54324815cd90f3db53821ebd2713702c3
diff --git a/dev-python/pygpgme/pygpgme-0.3-r1.ebuild b/dev-python/pygpgme/pygpgme-0.3-r1.ebuild
index 4d0ee94c2aca..273bce489582 100644
--- a/dev-python/pygpgme/pygpgme-0.3-r1.ebuild
+++ b/dev-python/pygpgme/pygpgme-0.3-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="app-crypt/gpgme"
diff --git a/dev-python/pygtk/Manifest b/dev-python/pygtk/Manifest
index b30cce7ef635..c71826bd6e41 100644
--- a/dev-python/pygtk/Manifest
+++ b/dev-python/pygtk/Manifest
@@ -5,5 +5,5 @@ AUX pygtk-2.24.0-quartz-objc.patch 1023 BLAKE2B 2fca6b1b92f424e853a6724857372f70
 AUX pygtk-2.24.0-test-fail.patch 248 BLAKE2B b71575b455e5e5ba740f412d199572d7be2f2290f84d047bab45c7ed464a029bb23ab9696a96b42b69575d2a977ecbd2fa63ced9b325b456a341f756ce00314d SHA512 e306324fa5542c492942c3a3f0be4d6a53f5641fff4362507195afa89bd73722aa2f65563ce7a8000d04b7824f69d840d3a8a53b8ec39bc31b97d2d215ebfde3
 AUX pygtk-2.24.0-test_dialog.patch 961 BLAKE2B 035021b5a4a94e487f8e4fdd69b83e54d2baea1891ce1bf8378e7375749de4a45477acdfe2a07e259d907bb182c2951bb512e7ded0ffdeed138ab4fce81f81b7 SHA512 13254063895412641b51cb536892f2c4b9bb76ac1ffa92f8d82fa20b80f5c7748392a968315af3731def20392de917a0ae2b4ac0607cee9e2f38911283d33ca9
 DIST pygtk-2.24.0.tar.bz2 2361097 BLAKE2B 35b8ad94f242dcfb5d0593762eaa5480928e63bfbf8d030dd199200daa1dd6fd1769c878517cbb56e3beeaeecedb554b06b04cc35f9b2eefd2d8ec4381daf707 SHA512 64f4344fcf7636e0b2016ffd5310250b5c02a1bf87e44aef39b5d4cf4a5fc50d27cb4f030d4c6802cff61fffb88dee7752821e3d8a4cd1c34dc3745d9ff2f0da
-EBUILD pygtk-2.24.0-r4.ebuild 2705 BLAKE2B 8d8ab339ba8a24685d5385ebcb34a7ba0a03b2aaa1d507592c173ff727af85172564c7a8abf8ec0b330bc3aa12c1810ffe7b4fbb99d8cf4053521c7db1fee927 SHA512 b8aebf7afa4d5cff53855d870b1e93a7fc6b3ec1bcc31e6998805f1ff5301d1d83415a2a596ab262b6b6b98bdce2488938b2b6072b4acd75668834cbba016d1e
+EBUILD pygtk-2.24.0-r4.ebuild 2701 BLAKE2B 1dd5385db59ec65d38dfec853e9856685bd7029d3905a449a751d774e4a6ace6bd21007d8e723da1f4320c375d3c1e93c38e8f90405728b0528732ac7260e85f SHA512 9f4105d2f81716e8f7ca8e2225d0cceede58c7821f6ffb5f4f0403974d60ea6501d4c694deb74f140a908bf5fda1a22bd7a1f38d2080d8ce97236691bc9cc125
 MISC metadata.xml 1105 BLAKE2B 271b1e6baf35487a0746bdb5eebe9a9f7c8f5dc2b14806e717a3fc3b468c063609c0693b3ee881e4538ca789926b5a9987f9fcac1746709f1ba19c36949af72c SHA512 037cab51c9a9cab4649559886753432a9e204dfd3fb2f145946a805fda17c3b544014d10b8b59a5b4b3d8e97d15a0048cd6f295bbca36515e963d52e9ad6181c
diff --git a/dev-python/pygtk/pygtk-2.24.0-r4.ebuild b/dev-python/pygtk/pygtk-2.24.0-r4.ebuild
index 7766afe1888a..b3ec9d058323 100644
--- a/dev-python/pygtk/pygtk-2.24.0-r4.ebuild
+++ b/dev-python/pygtk/pygtk-2.24.0-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.pygtk.org/"
 
 LICENSE="LGPL-2.1"
 SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~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 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-python/pyilmbase/Manifest b/dev-python/pyilmbase/Manifest
index b77d81e50dbf..96746fb84667 100644
--- a/dev-python/pyilmbase/Manifest
+++ b/dev-python/pyilmbase/Manifest
@@ -1,5 +1,5 @@
 AUX pyilmbase-2.3.0-fix-build-system.patch 1169 BLAKE2B 6afa0faf264ffb4c863a148684d162ef3154fa2802cffb2802315933e5df4781fc24d9fca23a985627a29d123a53cd4d6815beaa3b56487cace67896a22ae57c SHA512 691cdeec3361954fd41c085b38f8ec3a2a6a024ac174aeecb2b32df83844c3e25dbffcb3905b91e0b516eea6ac4597a067bb9ac794a25f5d1ac8502094b4095a
 AUX pyilmbase-2.3.0-link-pyimath.patch 454 BLAKE2B 5e2bc6d09bb7012f8d0087aa0d76b8a89280349fa978cbf926cd9cbce1b2b611a6862d73da35642e037ba84161e658915831e63ed9aeafac9db5669e38e5c4f4 SHA512 760a217d5af2e8de48f52351bab18370f3a74453135a401d8f5d964d3c445519ddc41a853c989c4f29d492764e42dfbcf4a8bcf839e43164b4bbe3e125e9d1fc
 DIST pyilmbase-2.3.0.tar.gz 524975 BLAKE2B 7c3114921392ad29198025c672c366e6c98d2da968ed213ccfb446533b81fae4b78c687aba2108e476e16c4e97f11924799d0b0474ff3f82f17632f886bb6a39 SHA512 c20c26155315f2ae38efc183e5f33e2c18610365f5f1bca7a50363a005ff91c8782177293290ea037cf5f164f9b404f5710ce3cccba862e5e7f830727753589f
-EBUILD pyilmbase-2.3.0.ebuild 1427 BLAKE2B 5b353ca731b5efbbf90313789a0540fb469f3c1665359bde264b837703fe0c7e16e82ea3005447216ad2aef00609e1f0b527ab254b9d2c8f6c6e1cad4b36afe9 SHA512 b4a1cc005b53a03ddea0bef680591ea1eb87e231ff6a6fb898f8a104c67c6b08d9893e7b4e20d3c4be73b13f1316922375679a79e24f06303375036d3a876518
+EBUILD pyilmbase-2.3.0.ebuild 1430 BLAKE2B 45eca74d759c47f1338a8e708a303654cb7d4e0118282995e3f5711351f2eddd2187ffc55bba722e47733aaf6ae64b517090e797537885089330a75af0ec3590 SHA512 ca400f9c5b6fdb845ecb80aaba01f4c0ff7e7e88ce85861daaf379ab70469869bfd33bbd647be841d0a745abdae0558e94b7459d74b387a4eaf06b7a057dbf9a
 MISC metadata.xml 537 BLAKE2B 88a1d7d89fac2094eefd766ad23b01c12cc49bff080e83f6ad63318294c97b18ecd83c6d908979ae8345a6601898b7a01295d9db886f0de500e460129d9c4a6a SHA512 c685de970979ac4ad5c3392a4b41b23bb523da5d003e3f6757a8d61fbdf0be1ea2bddc1a756176a9887101cc5bd6e19f5ac7e038e9dc9e5976c676a8817b9a87
diff --git a/dev-python/pyilmbase/pyilmbase-2.3.0.ebuild b/dev-python/pyilmbase/pyilmbase-2.3.0.ebuild
index 7516ec8323e2..82c39de2cb6c 100644
--- a/dev-python/pyilmbase/pyilmbase-2.3.0.ebuild
+++ b/dev-python/pyilmbase/pyilmbase-2.3.0.ebuild
@@ -6,8 +6,8 @@ PYTHON_COMPAT=( python2_7 )
 
 inherit autotools python-single-r1
 
-DESCRIPTION="ilmbase Python bindings"
-HOMEPAGE="http://www.openexr.com"
+DESCRIPTION="IlmBase Python bindings"
+HOMEPAGE="https://www.openexr.com"
 SRC_URI="https://github.com/openexr/openexr/releases/download/v${PV}/${P}.tar.gz"
 LICENSE="BSD"
 
@@ -17,12 +17,12 @@ IUSE="+numpy"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-RDEPEND="${PYTHON_DEP}
+RDEPEND="${PYTHON_DEPS}
 	>=dev-libs/boost-1.62.0-r1[python(+),${PYTHON_USEDEP}]
 	~media-libs/ilmbase-${PV}:=
 	numpy? ( >=dev-python/numpy-1.10.4 )"
 DEPEND="${RDEPEND}
-	${PYTHON_DEP}
+	${PYTHON_DEPS}
 	>=virtual/pkgconfig-0-r1"
 
 PATCHES=(
diff --git a/dev-python/pynacl/Manifest b/dev-python/pynacl/Manifest
index a976d043529d..dfac2c8338bf 100644
--- a/dev-python/pynacl/Manifest
+++ b/dev-python/pynacl/Manifest
@@ -4,6 +4,6 @@ DIST pynacl-1.2.1.tar.gz 3302051 BLAKE2B 96278368427c2b5f1d9508a5d9a36853a9c5039
 DIST pynacl-1.3.0.tar.gz 3405949 BLAKE2B e6a6444eed2cbf134ee6060ef382981f6bfb8396fbae30dc1e16f7702a559b7ea56889d9889adfea09ac6644732fafb98e07da99e3a41392303b6a45f0b494b1 SHA512 815c31a2069cbee1091d7e0ebf0b5572875c4a537311af561b5bce0b9d8051028e367a516b46481453d9780e60e9e7e2a4640d320164059c3974b0319d1cf96d
 EBUILD pynacl-1.1.2.ebuild 860 BLAKE2B 9e00b4a7a68828c4729194110f2124d11a1b29e78158dc14d4787a5ecc555cb1ca731e41918b1dc2ffca31db9585277f327850ea378412b0d026fff179fc90a6 SHA512 454e4595cf84bda0a3d0da5a121d4fc468b5a065d40d89b1f7d5c38b7ca1f8454089625091aad753eb8943bb3487a97bac49ff6548dac7d8b25e341d4dd84d41
 EBUILD pynacl-1.2.0.ebuild 856 BLAKE2B 56c28a21c37d39eabc4fc27189c65a0938b00f43f5b4a18a3e73ce7b698196026f315bc30978fd9c4150ab9da3771b20d777753a576473260578515f5be9b160 SHA512 c11694426a8cf630346c546085b969fe903fee4421d688f3a8732e8545d2866c57b4533db3c050bdadfd3f7b8441a33662a554b691816ee1c0f40400453c3ad4
-EBUILD pynacl-1.2.1.ebuild 1002 BLAKE2B 56b041a58dc7c03d1076fe281e61c0efafd0bd78052980c0837342dea22fd93fd9452ebb0a2fce5922564db8bf5736c0f576bd06e2c53e85ac3cb78138c75727 SHA512 ad89ae2a1112ca2fcd930fdb9b1d70318de20076d97fedefbcaf14edd30fbccb023a59d1d9a3c342fc66b3bc5ec3d6fc73ff25275b568849d9b16d68c077c488
+EBUILD pynacl-1.2.1.ebuild 1008 BLAKE2B bb1697dacf09d2af72cf317860f947b6389b230dc317726a1fa8c815c367163b4f4bc076f4cfb6082a67cbe9463ddc702d4c1b40b0d7f48885e9c7c7fcd27ea3 SHA512 6a1d91d187e207ea6ad1f3bcd951873ad166e800844ad179044eb6d23597421b1f4766d9eb860c20aa634f42ad288b5b63a6f47422a03e657a757f35f8361f77
 EBUILD pynacl-1.3.0.ebuild 1042 BLAKE2B 780d32f4198884886c260c76ce469406037ebde9864ff501b302a03093429fa14af93db3c38a563df66f94bf9fcaff48f87e7526704fbdcba9d8bdd67368e5c9 SHA512 2445255676649fe25321bb44f1aa3e5bdb9012a89ec5d896ed34ff7933e9a85de527c4bc0d088da242aa12c7ac5ffec7ba0f084027130a461c377acc872ef196
 MISC metadata.xml 831 BLAKE2B 39b921264053f9a7f18d9313daf7f3ef6e560eae777917098d8df976e3b9aede850f5073c190a9668440a487f7ac8fe2b6c1535271bb028596da0f3657ee0292 SHA512 8ae9c64a9477e03a593f40e4b5e3fe42adf2e80ab071b63be273c4cb548fef79f5e80ffcdb88786a6703dd28b8254ddd53428854419b669ca71322f7be775e27
diff --git a/dev-python/pynacl/pynacl-1.2.1.ebuild b/dev-python/pynacl/pynacl-1.2.1.ebuild
index 0b74b862fe2d..b998ccccd1e2 100644
--- a/dev-python/pynacl/pynacl-1.2.1.ebuild
+++ b/dev-python/pynacl/pynacl-1.2.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pyca/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-fbsd"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pyotherside/Manifest b/dev-python/pyotherside/Manifest
index 68a863644b56..d176ca79df07 100644
--- a/dev-python/pyotherside/Manifest
+++ b/dev-python/pyotherside/Manifest
@@ -1,5 +1,5 @@
 DIST pyotherside-1.5.3.tar.gz 181811 BLAKE2B ce2b7c4b9490e3d30e0e8a3911907fe3ab5aa9f812d29cf4f633957d5ade5261ab7e3691751b0bc696459080089dfec0439b970ac7ad0bd36aa22eb0c9c87112 SHA512 ff6aa43e72f5492b18403559514e6fdf0d2cee0965556fcafe5fe394b654a7dd2fc3a7d64d4b8f9c0ebf95485821b77022407772b2414539f2ab287e1fb01e93
 DIST pyotherside-1.5.4.tar.gz 183745 BLAKE2B 3dad2486dbc3d2632999aff0a7a7af41f6fefcae011bd1dd92b491b4403bbd62adb9a8520af627d5f96644f4fb25e89ee8fb49277723d5f80521d2add984008d SHA512 feaf95e0c981a8fb8b3a57926f48f803584a371752e7f1d2f3c739ee220960df33ad4ca2a38322f3e56d4f8fde193bd7342105303d847b2f532937e8bf2c3b65
-EBUILD pyotherside-1.5.3.ebuild 737 BLAKE2B 6b62545dc8a1e4796fa87d464633c8ad20db0c5e263f2f061f1ac6bd6de7b6d6e1e7d90891ea5a4bfd3f6de5bbacbb703a674bbae6e449028f300d5ee4275090 SHA512 3ea1ef566e6bee030ee064bca173f498d63832537e5ada96c2bbaf5976a0bb5fb509bdd750e291469c3f40767c79d76980d9725b40b7514b1c4748c59f3c3d7e
-EBUILD pyotherside-1.5.4.ebuild 765 BLAKE2B 939bfd811ed8187e1df97ba089a4913764cdc1272329744ee6e4ca5f7f5002fe7b07b2e67364efc7ec78a84233dfb44c6cbfca51ca5287a9986896f1b36dab96 SHA512 6ad1480e8cd0f8389dc8266fa8c1c365581d0f213ec1cd3534961c74b8dcd100451e9f83b0a1f4126a25ce49accc1d672a5759ac283327544ef807877933bc69
+EBUILD pyotherside-1.5.3.ebuild 773 BLAKE2B d706b42ddbed5736605732074fca25cbe712301775392c8842c81c7821c8a48a4862051f605b81b52622a630f5cea1c7c101d62b56ebd413ce1960fae2d7abdc SHA512 9cd89b56dc933fbf9b19ef62229cf0f0c4d4f2e376ed13c0e16c0d6b9619d644a69ddc7c4323fab7f450db513d0e908ccb90904de836157dd9981b86a211e46c
+EBUILD pyotherside-1.5.4.ebuild 801 BLAKE2B 267d5893bdb8cecbcf78af63e8d8f9ced5a18c021624fea942da354a536b88c2f890f0bbb83a507b3ebe68623cf19a3de0fde211765ca48dbd54a0de3e9023f4 SHA512 dd701b7b779cc5748c3effff70d3ecd9a4162b5db038fe26450e631504868fdc3321921e8909a2d2b65a42c48866fae1e5181a42557326cf53c1423d7624dca5
 MISC metadata.xml 257 BLAKE2B fd7fdb57fdce3a565a08cedc4d99216724e4013515d77ea89cb41a5c01e8f5479cab25fe53d44a705e3a71164cdc3c93e658e61deae654a13e5c2471dd83c57c SHA512 35e59430f93d3bb2e7e3042a2464b84f8e6cdf1e1624c1e7674bfc5147f9b9694da6b39ac081ed5fc22f1623aea889b743cfee11007911f3c8c17cf61443675b
diff --git a/dev-python/pyotherside/pyotherside-1.5.3.ebuild b/dev-python/pyotherside/pyotherside-1.5.3.ebuild
index a0913f2e3399..054abcb7d74d 100644
--- a/dev-python/pyotherside/pyotherside-1.5.3.ebuild
+++ b/dev-python/pyotherside/pyotherside-1.5.3.ebuild
@@ -16,6 +16,7 @@ SLOT="0"
 KEYWORDS="~amd64"
 
 IUSE=""
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
 RDEPEND="${PYTHON_DEPS}
 	dev-qt/qtcore:5
diff --git a/dev-python/pyotherside/pyotherside-1.5.4.ebuild b/dev-python/pyotherside/pyotherside-1.5.4.ebuild
index 4f5a176c2301..dbeb5532b03f 100644
--- a/dev-python/pyotherside/pyotherside-1.5.4.ebuild
+++ b/dev-python/pyotherside/pyotherside-1.5.4.ebuild
@@ -14,6 +14,7 @@ SRC_URI="https://github.com/thp/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="ISC"
 SLOT="0"
 KEYWORDS="~amd64"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
 # Requires active X display
 RESTRICT="test"
 
diff --git a/dev-python/pypcap/Manifest b/dev-python/pypcap/Manifest
index 7bf0cf59ea02..aa5a03e48d31 100644
--- a/dev-python/pypcap/Manifest
+++ b/dev-python/pypcap/Manifest
@@ -1,6 +1,9 @@
 AUX pypcap-1.1.6-mktemp.patch 380 BLAKE2B d9796f4afcde27bcc6ed173e0a206d3f267414c14512d9b636c252dbe9f4f22a0a4c280422d70816175dc6e54484de80bac10f5c4a57d19bb367f6676cafe5a1 SHA512 50a0697847af441ec896409c6526f20635d7e47652d49750305102bd01590d0992ab81461abfa091040662a2393ce7db974c21e2a4952d9067ce5e8d12ddce19
+AUX pypcap-1.2.3-mktemp.patch 379 BLAKE2B 66a6fc449ce5863a0650a7cae5589b52e307559d2ad7220aead363b7b55f816e794df5829a594044efb35b0d283a52fa141445851247994c91d8fbe30353cdb7 SHA512 bac25f5f1b6080e8abca6c1ee7229070651abda020ac67d7d83b1ceb6141ae73dab8aa8a29966760021eea55d28d2e7b124919a29ca6ce1d1cf8caf0e0c9ce67
 DIST pypcap-1.2.1.tar.gz 141506 BLAKE2B 66fb9e96f0e7741b4c1b22a54b2d42a952742315b3e054680ca03b7e4f3761331f62b96eee759a4c2419c256cc2e909e040046522c43ed80cc31d19bb98927ab SHA512 987ae06b8aa53047c31bb316d5301a03ab86fe7882394b07cbfd22da78a2f515706485f39b07c0073c549159616605fe2b03ace33e2067c7cdaa4ba9c4f33ae6
 DIST pypcap-1.2.2.tar.gz 141606 BLAKE2B 7611a7c61e23d2a20a0575dca5404e5c1edd6ba84f072ef0bdc303f35a6b26e69f1e0cf29f6d1a75c6934a84956f57cbc3fdffb39d6122882dc93231e243e3b2 SHA512 fa5b2ba37cafa83b9586d52345bba62ab6203c46a97a7b114ce166864be0e0947737d5bb79d9c12e054255aa9cb9f675a152c78b7e7b1c5a63dd6b54575b7282
+DIST pypcap-1.2.3.tar.gz 151087 BLAKE2B c40e83d46b37deb4064877dfcf64582ff5da272a0d416b51faa43c4bd20625b473c624818aad70238f9429fac2455ae5b0516279faf1612f76f289b53d55417e SHA512 e4f701b6637fbcaf847d72eddc1ed344438008c2f8cbd334c9ce5fe17c9ec36f1f2cb1a146a218b8e464a7eb9a57217a8834a82a035ee96c3c1b56ec70e53bff
 EBUILD pypcap-1.2.1.ebuild 722 BLAKE2B b50cfffcdbcfc38da3d264b30cf9fba4c12715eda6e36b64db274fec54875e424ffc755bd23042e386f0712d034baa5da19a17fa6ee5b5241715360301395eab SHA512 220331b95417faa2e908d46bc7d292a65514da17a7a3c35c3187b61b00451d4c82fa3beea613a96e9a8ce58c9118f8581cc7ab164ee7106d3f7a01efdbe0133f
 EBUILD pypcap-1.2.2.ebuild 722 BLAKE2B b50cfffcdbcfc38da3d264b30cf9fba4c12715eda6e36b64db274fec54875e424ffc755bd23042e386f0712d034baa5da19a17fa6ee5b5241715360301395eab SHA512 220331b95417faa2e908d46bc7d292a65514da17a7a3c35c3187b61b00451d4c82fa3beea613a96e9a8ce58c9118f8581cc7ab164ee7106d3f7a01efdbe0133f
+EBUILD pypcap-1.2.3.ebuild 724 BLAKE2B ad164d454b1fa80860d914f73be15b528bebae7951e5c3e91d09e169b05deb4b9b0660fcaa884b703080a41c257b3c0d90c04e1ac61fb8282a9a0ba829a14acb SHA512 cef27443958ccea3209be0a979837dd6f45ec2ba7f0ec4af23b040ca855c034eb76ac16fe0ea44bcb00a9e264a0b10b49f73802a730d046efb1b71d5fe9596f6
 MISC metadata.xml 577 BLAKE2B 395c10694cd2a574aaf106be5e2487caa66b4b0234b6110d5c83263f5b4bdf9f9c7239ceeaf07f3cab99b7cb1582683fbc54051ab2b686360640e256c6c03084 SHA512 f50b1b47d18538d5a9ef3888eba98cca67fa919a5f3315fda54d098cfea595edbeefb62038035b07bc1b74cad3fdb56399c136512d6cb5b71ddf240594261c98
diff --git a/dev-python/pypcap/files/pypcap-1.2.3-mktemp.patch b/dev-python/pypcap/files/pypcap-1.2.3-mktemp.patch
new file mode 100644
index 000000000000..8cf41ec28974
--- /dev/null
+++ b/dev-python/pypcap/files/pypcap-1.2.3-mktemp.patch
@@ -0,0 +1,19 @@
+--- a/pcap_ex.c
++++ b/pcap_ex.c
+@@ -11,6 +11,7 @@
+ # include <string.h>
+ # include <signal.h>
+ # include <unistd.h>
++# include <stdlib.h>
+ #endif
+ 
+ #include <pcap.h>
+@@ -300,7 +300,7 @@
+ 	char ebuf[PCAP_ERRBUF_SIZE];
+ 	int ret = -1;
+ 
+-	mktemp(path);
++	mkstemp(path);
+ 	if ((f = fopen(path, "w")) != NULL) {
+ 		hdr.magic = 0xa1b2c3d4;
+ 		hdr.version_major = PCAP_VERSION_MAJOR;
diff --git a/dev-python/pypcap/pypcap-1.2.3.ebuild b/dev-python/pypcap/pypcap-1.2.3.ebuild
new file mode 100644
index 000000000000..77cb7235a0f5
--- /dev/null
+++ b/dev-python/pypcap/pypcap-1.2.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} pypy )
+inherit distutils-r1
+
+DESCRIPTION="Simplified object-oriented Python extension module for libpcap"
+HOMEPAGE="https://github.com/pynetwork/pypcap https://pypi.org/project/pypcap/"
+SRC_URI="https://github.com/pynetwork/pypcap/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+
+RDEPEND="
+	net-libs/libpcap
+"
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.2.3-mktemp.patch
+)
+
+python_compile() {
+	local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+	distutils-r1_python_compile
+}
diff --git a/dev-python/pyro/Manifest b/dev-python/pyro/Manifest
index e864e48966e6..b38d0bff1cd9 100644
--- a/dev-python/pyro/Manifest
+++ b/dev-python/pyro/Manifest
@@ -5,5 +5,5 @@ DIST Pyro4-4.76.tar.gz 477132 BLAKE2B 49621974ecb485e1809366d9933ccb1027d62bfc82
 EBUILD pyro-3.16-r1.ebuild 704 BLAKE2B 1270e3906b70a94640880fde94d51122843def778a244791c095dc4a353ddc7794d0494087f013662866f5703ad505ab133ee8ef280dc622aa90a09de1c63618 SHA512 6bcf4f64cb78d82e0d682c7e04112a127228e1aef9abd4977db00136d2eaf68c6a1d78515f71f6dbfd452b2da1737a15efaf67d5539641e2f7ab874b12207d58
 EBUILD pyro-4.41.ebuild 1872 BLAKE2B 51de78b3672b040abfc65da0b245510085e8dd051d59152a4b901dd4e7fa9e6cecd801c5bc17d5898f7acbf5b80c6a065ee033808aaacbd321149fe696301ae2 SHA512 e7ed9d0c300e62123b0b58b959ebfdee5097c58df9fc8cecdf62a548eaffbea7766eddd556f5d21af15203ce4194e676b97b39deab74a35fb7f4463985e03afd
 EBUILD pyro-4.56.ebuild 1872 BLAKE2B 509bbac0dac628598e27defe07f99ca6a025ca5d23522f1ed0f87eb24d069b32ffe3002b81d0afb86b18c93960c5e72d84c34fddb1a44c539652ba1a5f02ddaf SHA512 b7f57aabd06b9a21e5ee18c2012385d9e15e1d91b3668d19cc03f13af5f93ffb8522d5fe69107e3f01832b9e860094fd6438d48f8be22f953dcff87e1b746b9c
-EBUILD pyro-4.76.ebuild 1447 BLAKE2B e9a227ced99e8cc89e7c1f6b7b1c6a313f33d4aa897b1a088ba318d77119b47340ac33f7243cf404c241c75fbe614d7e50ce52beb2d4d23baaf28b936878f3e9 SHA512 fc944ec9458bc5f9007c1cf61c6058ddede1312eb8689d914d736fbf44966b55d5df5372406a946831bf40722d704c097dbfcaa1c6819d353289be450b7fa1ac
+EBUILD pyro-4.76.ebuild 1452 BLAKE2B 76c3db0f7b5cc172a197443b7da428529e54ac200cb96a0eee20f4388fee16347644ab61258e68e00483681e6fe7b42e355bd5f449e4d1f054a6ba51d19b9f48 SHA512 4d911303bff81350025d80c50771188a0083564f5bb61f18ce1197ca4b3ec459579edc2f2fdd954f9224949b358fdcf58b2ce27345a1947cbadab217f9503cc2
 MISC metadata.xml 370 BLAKE2B bf0ecf2b63d7e544a1193349f0d171d107d23e66a067012cdd0ecbc4b736631e3c78fabc0745e88efe711219e8c3ce187da3ac67f4477f8bcf4996546a56a94d SHA512 59ce12c791648049dcaac68c75f9d8af472635442b25c4ba81b37e89d913b5b1954dbc40eac44694e5093008cbc41256ef2a177de1906598bb876ab0ab17d544
diff --git a/dev-python/pyro/pyro-4.76.ebuild b/dev-python/pyro/pyro-4.76.ebuild
index 41ddd249dd2f..c13f60a48f2a 100644
--- a/dev-python/pyro/pyro-4.76.ebuild
+++ b/dev-python/pyro/pyro-4.76.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="4"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pysendfile/Manifest b/dev-python/pysendfile/Manifest
index f43f1d0a214b..e8ae76f3fddd 100644
--- a/dev-python/pysendfile/Manifest
+++ b/dev-python/pysendfile/Manifest
@@ -1,4 +1,4 @@
 DIST pysendfile-2.0.1.tar.gz 19315 BLAKE2B ac5776069de0228d5103053e82786b499478dc3cad57b1f74ede3b8b8724abb780c5b51cf8578ebece7a12ce269b7a9b5bc72f08409077bbce2d4daf63046119 SHA512 d6ee08eb251fac30c90a9ee829fd992f3620697eef2893ced5a2c6273486c3c5fd35c70962585a8d747d578817391f91c929bfeeba8c4485d52a15748229ca9c
 EBUILD pysendfile-2.0.1-r1.ebuild 600 BLAKE2B 3be97984f1347c650861e5c019e189c403b513181430675274e6ebaa99aef36bbdfa7180aff9d5a53077e57e2436172b08cfd97fc32aad88d281f689982432bf SHA512 cc7c1a631d1cd300bed4576f2f41c999ba131b0a5b2144e9836ccdec450d8c0634d78c1cd5c7666b520dabddba82dd5a69786629ef58299547d6c175695c1f43
-EBUILD pysendfile-2.0.1.ebuild 576 BLAKE2B 35207e75ea5409fc7f21ef9a79a81f8d6f9bce788f0935642cec76acba316743cb850b40f3fc1d501429ef7ef852f56c4c2462bcbdbe58b7735e89c656ae73b0 SHA512 6b719085ef80cd2904f87d11e4f0dd6f3ff5413a7faebccf2763b363bcc2fda117496922dd5e8081450cbbf7af82f6ca869527322d52833cfc5ad2916e42c6eb
+EBUILD pysendfile-2.0.1.ebuild 582 BLAKE2B 05743d12d39a96631531aa1194eb6051e43252ac2f278c83899d2ff580afdedaa5ce4840fd60d764c970cde42db9d73e43a32fe79fb610c6540272ee46e3703e SHA512 417ebf85d479bc4c34d794aebfc9fca6081822b78f4e8233135fe1e04b6fd513428d0ec719940ff5c2323c1cbfa8a59d57e4ba31615bac72eafd4bfe62f6ee72
 MISC metadata.xml 461 BLAKE2B 30a174cb9b4196658e94e080e4aad73dbfd3f28bc9c5e0d966672b1d811a6d85cdabf97faa07c89a4a868f2494c46da07f6601c0f08a292f1cd00df3b95e42ae SHA512 1b76475c93a4462264ff4ee5f9b1b3da11fe666f80fbd47322e64f981d3c2ee4d7817fe3d3ef151b991f04fd9353d0b6dda9fe80f732409415fb6d7b0146e17f
diff --git a/dev-python/pysendfile/pysendfile-2.0.1.ebuild b/dev-python/pysendfile/pysendfile-2.0.1.ebuild
index 95905f64ca75..1ffa65ad29d9 100644
--- a/dev-python/pysendfile/pysendfile-2.0.1.ebuild
+++ b/dev-python/pysendfile/pysendfile-2.0.1.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="A python interface to the sendfile(2) system call"
 HOMEPAGE="https://github.com/giampaolo/pysendfile"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/pysol_cards/Manifest b/dev-python/pysol_cards/Manifest
index dece41ec4885..d39cd6f21320 100644
--- a/dev-python/pysol_cards/Manifest
+++ b/dev-python/pysol_cards/Manifest
@@ -1,5 +1,4 @@
-DIST pysol_cards-0.4.1.tar.gz 16635 BLAKE2B 8c4ea9257656e3da66d464e8f251add18bb143bc2152a6ae7c5385650867453b806f1e6bf80abb87af0bcbd3c8072c89dab058b4e7578e8d977123a13489c996 SHA512 96518549770a9d85021a60da17a0d71f4928415f7226fc7d7aecc1c84345b0d46cc16cc33b197f84b31143bc0c91c6459db19c7bcb763fe956a7f5e6a47735d4
 DIST pysol_cards-0.6.2.tar.gz 17032 BLAKE2B dd93ccaf14ffeb9cfc8228d129005b0733ba96ea90fccb105f97ad92fa6077cae30876150f8a866cc6c977563f3ff81118ebf49e87a3db8bf6370afaec67121b SHA512 99ca6de08c1e1cbad0e57d54e1482d021ad8b7c9d4c956df0f199ed4d6a1a367ab5e821ba504f300f38f5ec329f67564aead99df728df0e498d733d55435c7da
-EBUILD pysol_cards-0.4.1.ebuild 546 BLAKE2B 5116be48b217caaa7153c359963aac67472a5ccf4230a6c5b07e47104f69551ffe4917a0f41cc3c738a909f8b26ad0e52a84f16a499d11dbb225c1b994053a36 SHA512 c19a25f44a7d484442bfc05c9eca4ad63d2fe4bca5d4c134a5c46274def61d0e12625ddbabfe696ed3d87b4099f6528871b566849a5b20a16fada803539b9c7f
-EBUILD pysol_cards-0.6.2.ebuild 545 BLAKE2B 0186181072e2bb56e59d9f8ff01e04dc36b1ba307c7df2a5686f726d8e4add2177bf2674c148db7146af93defa2d4a741af2263bb3caca8fd217c751568f2198 SHA512 78dc4117c08366e63c95eb2969fc4a8a400f294fb63bb7f007f7e958cd5f3f2d10dc1fe4c361fad5a365c4cd4a8769f092b5695c3f2d8ab3f9c309640a12eb2c
+EBUILD pysol_cards-0.6.2-r1.ebuild 550 BLAKE2B 53e81e4eb57c9c4a3ca8ae9d12b52ab0f6a9fc5b319dce9be8cee8d97dfb2820c4b52504b3b096ad91e4447ac760f81a9613de4d36f0e7ce8ba1373d176b0ae5 SHA512 d1b9147da03b08cfeca3c88c18bcf0509074d09605752bbfd32468ca09285917b9875a98b3e1c4a46494e2238668212efda3061cd2919ac50cc44dcac054b428
+EBUILD pysol_cards-0.6.2.ebuild 543 BLAKE2B 16e124665a28f9dce7b5407e8ecc3fce60694cdd2690d1a054e229d7fe0917524a87af2f50de27b02239abaa2415da5f5ca70dfbfe3b123610e1faac915d441e SHA512 3fef3a353ecbe6b7b0234cdfed43860a324ca60af26706a05bb98c3107bbc99fa9d5a17355ffd8f574672e94bc7533fe3200cffe6b4c4e06fe7db9851e0aa77e
 MISC metadata.xml 289 BLAKE2B daedbd790704b3663910c8067dbf69dd886eafcac1aad5b2cc18f54a8dc74596a9a4821a945250e2ed997c754151995b675965cbebc64abf5445c1c63db91ba1 SHA512 f48ef730220d3520d2230ebb0caee8e3456c8b8b7255bc978944897c424d1338f7d7a865c37455d279fdca077fb1436233fcf085564b1d1e9802d28e35d7fc1e
diff --git a/dev-python/pysol_cards/pysol_cards-0.4.1.ebuild b/dev-python/pysol_cards/pysol_cards-0.6.2-r1.ebuild
index 5fc779fa07cf..fcf902452a36 100644
--- a/dev-python/pysol_cards/pysol_cards-0.4.1.ebuild
+++ b/dev-python/pysol_cards/pysol_cards-0.6.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pysol_cards/pysol_cards-0.6.2.ebuild b/dev-python/pysol_cards/pysol_cards-0.6.2.ebuild
index 190f6568ed98..96c477cfd9f9 100644
--- a/dev-python/pysol_cards/pysol_cards-0.6.2.ebuild
+++ b/dev-python/pysol_cards/pysol_cards-0.6.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pytest-aiohttp/Manifest b/dev-python/pytest-aiohttp/Manifest
index 33c30d1e6490..1b4ab7fbb78e 100644
--- a/dev-python/pytest-aiohttp/Manifest
+++ b/dev-python/pytest-aiohttp/Manifest
@@ -1,5 +1,5 @@
 DIST pytest-aiohttp-0.1.3.tar.gz 6192 BLAKE2B 23f4eebdefe757328fc8621e29810835fee8e8c3e8cedf45134716cff77208bcd7aa82f537ada5d567b143d342b1a9fa14a5ed1e5208548e55353de1748b270c SHA512 2271f7730b91812a619e04522c13b7e2ff76353179a4588226d0b943b67f7397b966c1d3c24016861cc3eda3a541b3f0d3b2858a6ca3586f7707e10581c34e4c
 DIST pytest-aiohttp-0.3.0.tar.gz 6884 BLAKE2B 02b50fcd14192d23a4b257c2b7cb235966eff52b1c0ac87a4c61a20bc0babdb22eb999938c63e267a797d52ce57c9fb471232db3d0bc6566168a2d73f6404cd4 SHA512 4164166465dc40ff78a86304d1bcd4db9fb3f7dad3188f8ebe2ff151ed51eb0bf9c1b7a608d94cfe3339ee3b6efd4d5abbaa0691388460d5ac95635afa14984c
 EBUILD pytest-aiohttp-0.1.3.ebuild 574 BLAKE2B c851de347f06edcc34b04b6d75847cc4637770df220de07debf9ba9abc567384f30fee0315fb751b9819825f39480bce11fa4cb8b9ebb3d3a325e6d0d5589e48 SHA512 47915bc93ba42e9ab83945e875eb24165d427163fa1256f60cd3a26778d646418bb8fb17f72795160a5da9c2dc8b720b486df3c3ebcb7f8682a78106fbbb2fad
-EBUILD pytest-aiohttp-0.3.0.ebuild 576 BLAKE2B 51be3bad7eb73506b77121244e8b47dc6ae7bd982b1cf69f342cffa1fc6a226717e4b2ec8a1819728616c1488ab26a54b0a8196908831c2ff7519874f96da044 SHA512 9bf71f0f780d136a87cb23f4204add44afabdbab68ef92fd126fd1f51b0cc97a9567e9cc00ce1ce4e758325d99cf803824c3bb54771b65ca3fff668bb945b6ff
+EBUILD pytest-aiohttp-0.3.0.ebuild 574 BLAKE2B f2e046f4c4a6f162b36c27d9acffc5cdc50493777bcc69a09259fd4ad037efbf57e5878affdea01db4d0fffaffbff3b4a2f9231b2df4f7e654ad3b9402787ce7 SHA512 161fe54ac0387d505afe6a9abf4b825d4a9279b7795401fff6637680011f2266db3723b4e59291d3bb340b2e49b4bfe75f005f5257f4cdd38c936be7c56f8b86
 MISC metadata.xml 358 BLAKE2B 8d7d3a4d56967f16b3c8b5facccb0af056201daf975aeaa8cb9b651db735183cb38e35d1a86037306d6c61971690b7093ac8bf0c4197b2ce6228d0323c15ed0d SHA512 4f7db25811be35ac9976bf5707b0ee0927dae9f00d8be85f18eb165708f08ec7c4bb7ebfc4ca021a6432eab8ab25785c8b27959df8ff9dfc2a969b588de68829
diff --git a/dev-python/pytest-aiohttp/pytest-aiohttp-0.3.0.ebuild b/dev-python/pytest-aiohttp/pytest-aiohttp-0.3.0.ebuild
index 9e78899cf5fa..7da2e586711f 100644
--- a/dev-python/pytest-aiohttp/pytest-aiohttp-0.3.0.ebuild
+++ b/dev-python/pytest-aiohttp/pytest-aiohttp-0.3.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pytest-asyncio/Manifest b/dev-python/pytest-asyncio/Manifest
new file mode 100644
index 000000000000..e29316569f90
--- /dev/null
+++ b/dev-python/pytest-asyncio/Manifest
@@ -0,0 +1,3 @@
+DIST pytest-asyncio-0.10.0.tar.gz 13968 BLAKE2B 4e63d527b20c767b8f0777ed684a15abe54009be72db8a50ca3b37ef95dceb884168d8081c651e2bbd6d818529d6809bb3498055fedc7f951f5675d58f50e408 SHA512 78160d1918c5d3d2172f74fa07bf4bf6d0bc416666011dd5b83b3a7f385ec30fc65d49c01bba5dd0e16ad9dcd9d72d8ab062526f3268d60cd2e24a35b5a8f883
+EBUILD pytest-asyncio-0.10.0.ebuild 949 BLAKE2B 945bbebce007188839da358423aa11318088005a71d873cd4c223d83e0f99d0b2dba7db9bf8f8d6561de03ec144ae6320e407379df4755c191888c4d819f8b24 SHA512 9311b00325bf02b1ddb51925f1a3732b32db6d61ea4e95edf5293322f7637f95c81bfd3f5cb110ad7b7e0dc720061f784d4185b80579cf2cbf978e7f35ad1e4e
+MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/pytest-asyncio/metadata.xml b/dev-python/pytest-asyncio/metadata.xml
new file mode 100644
index 000000000000..266e3f19ca59
--- /dev/null
+++ b/dev-python/pytest-asyncio/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/pytest-asyncio/pytest-asyncio-0.10.0.ebuild b/dev-python/pytest-asyncio/pytest-asyncio-0.10.0.ebuild
new file mode 100644
index 000000000000..ee183d8b8079
--- /dev/null
+++ b/dev-python/pytest-asyncio/pytest-asyncio-0.10.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+inherit distutils-r1
+
+DESCRIPTION="Library for testing asyncio code with pytest"
+HOMEPAGE="https://github.com/pytest-dev/pytest-asyncio
+	https://pypi.org/project/pytest-asyncio/"
+SRC_URI="https://github.com/pytest-dev/pytest-asyncio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/pytest[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/async_generator[${PYTHON_USEDEP}]' \
+		python3_5)"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/async_generator[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-3.64[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	distutils_install_for_testing
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/pytest-xdist/Manifest b/dev-python/pytest-xdist/Manifest
index b75d8178ce43..02d1029fdd65 100644
--- a/dev-python/pytest-xdist/Manifest
+++ b/dev-python/pytest-xdist/Manifest
@@ -2,5 +2,5 @@ AUX pytest-xdist-1.28.0-strip-setuptools-scm.patch 926 BLAKE2B 1943edbd4511b40b1
 DIST pytest-xdist-1.23.2.tar.gz 59932 BLAKE2B f2cf73914cf095217fb8b472f5e5f7918435c75f8da1694cc7ceb920ac3a7390d84bea93cca558ba26cf3d14a01815374eab9ea03a137a8a9f5dba2f2d4453a8 SHA512 4aae9a6d74e53a29630d0233d0a903d008023e322de726ef7ab7cf4865f428942f96cc65264e19726cb6213264edaa747da2cb6f368989417ba821f2a3f9b654
 DIST pytest-xdist-1.28.0.tar.gz 61486 BLAKE2B ef8157079ea890342cd566f327588148fa898a3404e3edcffb60ba8ba37d9473b4c2a47fc737f7bb074042c6aadd737ac51f348ce79a718eb446036016cd5e23 SHA512 89b8885103a944ae72535de40028db052f76631ade6f969489d3dc3a1a61a3233df6655d0905d9f5253f23740a15aea824b460c680e79c16f275b31cb2abd6ad
 EBUILD pytest-xdist-1.23.2.ebuild 1030 BLAKE2B 989b87f68c288b535533c9a00f5b797c4b81b90ee2635b9f85e6366d165723a5f57c56400c501bca6c3326d8374ddc7f3aa5bbca6cc761e4c65ec0e910ddb90b SHA512 39a00470970930c6efad4db30661ca0aa6268540b4fae4a4116f31cd84e8fbb447de5a277d0479eed66881d963ee99b42e87378dac53532acfbf1e76e726b692
-EBUILD pytest-xdist-1.28.0.ebuild 939 BLAKE2B 201252800266a6841c4f29a9d120a0fed3d08e25d8eb35aa444b08c3496f3775eb6af1b119fe1f4a737ed435877fbf0c415198253e5b9687cc82c80dd1935128 SHA512 df01680f31ec14a0a0acdbee92b22afc94113cbaf8ce03500a70d477071fe7e95788f09a59e66f24ff42a506651f59521e2213ef5b3ab6d9b152b9c30a8ed67b
+EBUILD pytest-xdist-1.28.0.ebuild 951 BLAKE2B 87b4c9b0f6cb10f1a9879b723a8c86e8da2155ceea40c8e577a4941c4e4fbaf6e92f2d09b47cbdbbb238aa3b8cbebf6daeb9157299160421a05501e0caeb9ade SHA512 e2280729e4a6848d95a03149d160c26dce1bce6b205015d20386220b44ffdf5e5210cb45efed00a379fe74aafcfcb846f1a786a6fb017a878e80386cf7e36167
 MISC metadata.xml 429 BLAKE2B d1c317fa9cb06da79389adbd0d8941511127f1632aa0b5402df24827c526b634e9bfdc822c9f6dbd83a527bf3c9fc4418fffc1dd23b50812d566ff1681508fb1 SHA512 f25800e22c2d0c60991a0544f69e253c5751affd7ba178fdb6fda167baed0b9756bfba1fd850908d9ed05c5cf2091848d91593eec7346d00462cfb54aa1864ae
diff --git a/dev-python/pytest-xdist/pytest-xdist-1.28.0.ebuild b/dev-python/pytest-xdist/pytest-xdist-1.28.0.ebuild
index d716974cfbaf..2bf0d730cc3c 100644
--- a/dev-python/pytest-xdist/pytest-xdist-1.28.0.ebuild
+++ b/dev-python/pytest-xdist/pytest-xdist-1.28.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index 357907eb7407..4896767a1c4f 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -1,6 +1,9 @@
 AUX pytest-4.5.0-strip-setuptools_scm.patch 674 BLAKE2B 4eab3e26423d81614223a88a0124dc4f35892b18ecbcce34280a00774012822fced0045ac7113a50f8f88d042b88e404dbf4d8d3760140c66a48daa3da2a44c6 SHA512 d34d7c1db57804f0d1ff71f3f51c9a736592945fdf564f54c0c20c398c86f08616eb21f75d77457a71738df4d254ec3d69e46aa3378dea6f7913933bcdf45c08
+AUX pytest-5.0.1-test_xfail_rmdir.patch 1589 BLAKE2B 8c4ed570175fa3b2461fd5dde31e6618a0a2af7cef19529995a8f537b0bda1acbabf949761cf36db5f8d1fbf04cf7ec3bc6c40f249d8f158540d85ad2388c768 SHA512 fdf17a7c2d4bde5b1cfa01224cb464c3cae469dd1ab7fcd4158a57525127bc51ea19b777b01b4726a6190ecbde74e47d38cdcdd0fbfba31b4e6c76bac13009ce
 DIST pytest-3.10.1.tar.gz 892420 BLAKE2B 38849ae69bf4380bc1a99aa105cac04be078da4460373dfc16fa555238b2830fa2f5ae6c19de8aa2af9ac18d87c5d2705d62f7b2e67e4a62d843f6a28bbd76fd SHA512 30ff79c0fdcbeef68e1191ff400a20428e391717f06957f554b694b94baaaa565dca01346fe989c3e443c4402f3b2bdbd5564f6303a4447f933fb54cba45628f
 DIST pytest-4.5.0.tar.gz 943607 BLAKE2B 49a0e91fda7f4231fdd39f90eb2daa344d3034c10faff221330ea0ae7482a2a7d0fb9443a0a264db00f1d92568d5a6005cb73e07d8643b46906f7ecff831adcb SHA512 cbffc6216f83491b1de241058315c116697bfaa5206b5f558192a7f861d43dd036d30d0d689bedae7bdee4f0258dd19ef5827c356e11863dd596a5fabe8249fc
+DIST pytest-5.0.1.tar.gz 949744 BLAKE2B c949f0fb6bc0d1430ec7c780537f8aee8ca1ebea5f89035d882434236c6af7d431a610774dbafa93552406e38852627a9f949a6f9198a792de9371efadb4f6ff SHA512 92f5feb263a8708ef6cb8f4565688620b6bfeaef23536cfd24b9bc09515e37fdecd7fa8bcaeeb0775c0be1d8e9dcbd9a56e52f97fb13dc98116efc0056f870db
 EBUILD pytest-3.10.1.ebuild 2442 BLAKE2B 510febc15eb52b5e5c6b66c1849ae23911a88340172027a3c92dabe68de9e49bad4dd10265b9bfaace126b8ef61b9b9dfbe758c264d75c900ab5852dd30a9443 SHA512 ba012c44d8ec1981f36bd95c0ea17570bf64ed28ba51194be772be382adb2b1e239b2556a8549794deda4916ee94dbbe3cddd6aafc13f3d5607f2c8ba59bd5cf
 EBUILD pytest-4.5.0.ebuild 2060 BLAKE2B 1bf5a649b72e1669d37596900fc81264b99c0654c9218635a4fcea4254fd5944cf74a8640ff34a9d359ca236d252d9aa00a0820b3084f42f183913e9a6df6ab3 SHA512 1c4c081301e3ff42caf703196aeeb9bcd377bee18aef182a2c2d499d567285437305c06c0a02f0ce28ff99324af25946b310f8071c6330bcc7ac79bd163ac1f9
+EBUILD pytest-5.0.1.ebuild 1923 BLAKE2B ad6e07b32be669d7225fcb1c9d396c01a601130cb8e2b6a5f06485ee0a1778ee4580ef3d03f864561b99fd2eb91c9421acb3dae426f32a12f9c7acc8af36c4f0 SHA512 5bfb419b68015969f62ccce3c4579d4175ae1937228741dbf1c2a97f3e1828870333446623ec6e3c42cd57a049b5386539ab7479584e2e9030276309098477f2
 MISC metadata.xml 309 BLAKE2B f29391c5f96f44f6329d3665346a5d46ecb4a86d103ae8008769af86126756e76bfa89cfe462e9c219e5f70b64013f662d020c7a2f6015d8cadd0eb25a7614eb SHA512 ba53c13ac716488e3e5dadf5dcfcb697dc9bb13f89e9d0fb98b9a5a6e36cafeeb64d1348008f42497117bf46fb6f3bc288c10a68c4d5ab53c9c02a3ae61b594f
diff --git a/dev-python/pytest/files/pytest-5.0.1-test_xfail_rmdir.patch b/dev-python/pytest/files/pytest-5.0.1-test_xfail_rmdir.patch
new file mode 100644
index 000000000000..5c6154cd92c0
--- /dev/null
+++ b/dev-python/pytest/files/pytest-5.0.1-test_xfail_rmdir.patch
@@ -0,0 +1,38 @@
+From ab39502c98f40c03a2956dcf6c6b9daf5ee41a63 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
+Date: Fri, 26 Jul 2019 02:23:14 +0200
+Subject: [PATCH] In test_xfail_handling, only remove __pycache__ if it exists
+
+Previously, the test failed when the directory was not present,
+which could have been caused for example by invoking the tests
+with PYTHONDONTWRITEBYTECODE=1.
+
+Fixes https://github.com/pytest-dev/pytest/issues/5664
+---
+ changelog/5664.trivial.rst | 2 ++
+ testing/test_stepwise.py   | 3 ++-
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+ create mode 100644 changelog/5664.trivial.rst
+
+diff --git a/changelog/5664.trivial.rst b/changelog/5664.trivial.rst
+new file mode 100644
+index 000000000..3928454ef
+--- /dev/null
++++ b/changelog/5664.trivial.rst
+@@ -0,0 +1,2 @@
++When invoking pytest's own testsuite with ``PYTHONDONTWRITEBYTECODE=1``,
++the ``test_xfail_handling`` test no longer fails.
+diff --git a/testing/test_stepwise.py b/testing/test_stepwise.py
+index 591d67b6c..f61425b6b 100644
+--- a/testing/test_stepwise.py
++++ b/testing/test_stepwise.py
+@@ -207,7 +207,8 @@ def test_d(): pass
+ 
+     # because we are writing to the same file, mtime might not be affected enough to
+     # invalidate the cache, making this next run flaky
+-    testdir.tmpdir.join("__pycache__").remove()
++    if testdir.tmpdir.join("__pycache__").exists():
++        testdir.tmpdir.join("__pycache__").remove()
+     testdir.makepyfile(contents.format(assert_value="0", strict="True"))
+     result = testdir.runpytest("--sw", "-v")
+     result.stdout.fnmatch_lines(
diff --git a/dev-python/pytest/pytest-5.0.1.ebuild b/dev-python/pytest/pytest-5.0.1.ebuild
new file mode 100644
index 000000000000..b124d68a3a41
--- /dev/null
+++ b/dev-python/pytest/pytest-5.0.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Simple powerful testing with Python"
+HOMEPAGE="http://pytest.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+# When bumping, please check setup.py for the proper py version
+PY_VER="1.5.0"
+
+# pathlib2 has been added to stdlib before py3.6, but pytest needs __fspath__
+# support, which only came in py3.6.
+RDEPEND="
+	>=dev-python/atomicwrites-1.0[${PYTHON_USEDEP}]
+	>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]
+	dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' python3_5 )
+	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
+	<dev-python/pluggy-1
+	>=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/wcwidth[${PYTHON_USEDEP}]
+	virtual/python-funcsigs[${PYTHON_USEDEP}]"
+
+# flake cause a number of tests to fail
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-python/hypothesis-3.56[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		>=dev-python/setuptools-40[${PYTHON_USEDEP}]
+		!!dev-python/flaky
+	)"
+
+PATCHES=(
+	"${FILESDIR}/${PN}"-4.5.0-strip-setuptools_scm.patch
+	"${FILESDIR}/${PN}"-5.0.1-test_xfail_rmdir.patch
+)
+
+python_prepare_all() {
+	grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency"
+
+	# Something in the ebuild environment causes this to hang/error.
+	# https://bugs.gentoo.org/598442
+	rm testing/test_pdb.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	"${EPYTHON}" "${BUILD_DIR}"/lib/pytest.py -vv --lsof -rfsxX \
+		|| die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/python-axolotl/Manifest b/dev-python/python-axolotl/Manifest
index 7da0d10774e7..1866527e377f 100644
--- a/dev-python/python-axolotl/Manifest
+++ b/dev-python/python-axolotl/Manifest
@@ -1,5 +1,3 @@
-DIST python-axolotl-0.1.42.tar.gz 53869 BLAKE2B 045d19b38478404b19717daee431a4fc36d187dc511d42ee950b37ef257d98aaee8ba42633888d596265c0d64bfc33f2da9307d45feb4189ec04c03d69687108 SHA512 db9e1cfab87d690619a672b1782942a18b12b17af555959c17bcc3e2581e9c689c57becc0ea884a1129df9dace17684ba03de38b81f8c8c65cab27962ebdb6c5
 DIST python-axolotl-0.2.3.tar.gz 52139 BLAKE2B 8539f4ff6d9d7e57965cdbbd510f499cf344490091fe56b013d1ab60986092ac8a7a76248624993692077020043ea21c1d9448ecf9b76a698b43da4e014f37ab SHA512 1a10dc9df2f95d19b49909d4d136b5266aae19e24ac84f8b263ae7d4de18f77353c737616ac0648b600e05699a90d348f95c6c1659849986becefb4a0277fc80
-EBUILD python-axolotl-0.1.42-r1.ebuild 676 BLAKE2B 323244d130ba6136af1de66f0f701b93214004408d38370f12dfe1d35247a3175f4d66d168c6ebdca687fc5b7edd23c0d8f9a2644ff4dc1a1655e488e5ee87f0 SHA512 3cfc880bd2e8c031ced89a6ed8b0d8b6b67ea381211e3ad3225ca971da944b97aea06dec08ca9d22e24fd197709a77682765ccc24ac2dbc8d3f4b4ab9411afce
-EBUILD python-axolotl-0.2.3.ebuild 678 BLAKE2B 2805568d113a0c17f6fb0359e7c7e4e2d47ecd0479c040c813b3384f886f1a5f2e2fbbb4a3d53a5414ac6839756aee666887650bcb346e1996b5bc474ad8dab9 SHA512 085a6ccb8893f2158e2291141641e377660bc88ac829c5af3b52550326c5b6efc379f602aefac6454fbfb3e058605a47e1cce23702b4b1f34992d7fb851a0db7
+EBUILD python-axolotl-0.2.3.ebuild 676 BLAKE2B 323244d130ba6136af1de66f0f701b93214004408d38370f12dfe1d35247a3175f4d66d168c6ebdca687fc5b7edd23c0d8f9a2644ff4dc1a1655e488e5ee87f0 SHA512 3cfc880bd2e8c031ced89a6ed8b0d8b6b67ea381211e3ad3225ca971da944b97aea06dec08ca9d22e24fd197709a77682765ccc24ac2dbc8d3f4b4ab9411afce
 MISC metadata.xml 734 BLAKE2B 86bb0a6b6c1c45e41917d6ed44a49d6b72acb3de3a466417967b3b7295543af235d958ecc1057b9ae666a96152f9d56e2520d48fef45216024662e9eef07eedb SHA512 b779e5edf07f64d7ec266051a76ea3f3011808811f542c43582d85221e988bd7dbc97581ff59d7b115830a7e4d101306dda24d39f24acaccb3f4f54884e6b3ef
diff --git a/dev-python/python-axolotl/python-axolotl-0.1.42-r1.ebuild b/dev-python/python-axolotl/python-axolotl-0.1.42-r1.ebuild
deleted file mode 100644
index bd16db7b5302..000000000000
--- a/dev-python/python-axolotl/python-axolotl-0.1.42-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A python module for the axolotl protocol"
-HOMEPAGE="https://github.com/tgalal/python-axolotl"
-SRC_URI="https://github.com/tgalal/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	dev-python/python-axolotl-curve25519[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/python-axolotl/python-axolotl-0.2.3.ebuild b/dev-python/python-axolotl/python-axolotl-0.2.3.ebuild
index 66e74fa421f5..bd16db7b5302 100644
--- a/dev-python/python-axolotl/python-axolotl-0.2.3.ebuild
+++ b/dev-python/python-axolotl/python-axolotl-0.2.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/tgalal/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-python/cryptography[${PYTHON_USEDEP}]
diff --git a/dev-python/python-efl/Manifest b/dev-python/python-efl/Manifest
index ab3573d5a9a1..23ad2045c2d4 100644
--- a/dev-python/python-efl/Manifest
+++ b/dev-python/python-efl/Manifest
@@ -2,4 +2,4 @@ DIST python-efl-1.21.0.tar.xz 9544352 BLAKE2B b49fc0e0d795a0334f647f414673fdaf3b
 DIST python-efl-1.22.0.tar.xz 9523624 BLAKE2B b1b7573da8546f580dcd06be03e4746f2e991245c7bbc3477090c5a9365225bca663454a202f8e05ec6c73cbfb7496ee5f92bc2a9997900e6709b01017740db6 SHA512 27e29af764166e803ce6a833c8249a91226a4315dd658631cec57513befccdc9407b04b452054ceab3f77b429d899095b49dbada2e0fd1a63ff6059ef200e497
 EBUILD python-efl-1.21.0.ebuild 1741 BLAKE2B 6b272eac619e1d4a012beb36be641d999e49567646823db3acf62862574f186820f18a4d478595da955cb86b8eac0d5d51d53bdcdeface6609cac797b9457bc3 SHA512 5f4689c9ee6e4dfacc67e0e91c1e38b47692e786f73f8a0f53c2800fda98a60956a447a333500def9662aaf66c762f92bc24945565d04319d31e360065856c52
 EBUILD python-efl-1.22.0.ebuild 1638 BLAKE2B 55f150e9de16b83d09867ee015f24db08f78e967efe177d4756df7b1069e4b5a892da0f3ffe1c0becf21671605dde3dffa767ca908451787eef61bd50f709249 SHA512 0f6214cfd4a15256c8dc1632fe30569f63bafa0294f9028603b16f2f1a776800cd6d51f7a0ec8f9eeb08231fe5d45a8082fdf63553b70dde2b9a1a202a7af908
-MISC metadata.xml 678 BLAKE2B f63779daf5a74d59f8dc65002ae8ec55585ae58c2bb02d951fd1ced15fd68fbb4ffa18239b8ef48347ff18e5cf033faa4a141f8e4fd8898bed6d74a9fd18d065 SHA512 a618f3bf8c4eed0e00b889f2c1bc85d46dc5ef1118f393f4cf10857d0b1a75720c6a719ed97117e40420600059e34eff0be3771fa684b89d437459f012fb7c5c
+MISC metadata.xml 588 BLAKE2B 0d810c31fac4488f392b8d3b57eb830af3b5ce3c970a9087939e35bc33c58d652ad3a6dd1c42c6b2604334b5c098b81465a1dc92e051e9f5b8cf5a047a190ee8 SHA512 9390fbbc9345bd5e580a8a1208d8f2e727dd0d1d562679b5e7b7c3f7a4010ed6154e1c2f9d93502dee73d96cbe28ed771b921f67e4a4921c635ada8056449de6
diff --git a/dev-python/python-efl/metadata.xml b/dev-python/python-efl/metadata.xml
index 1b546bfae6dd..126f2621e76f 100644
--- a/dev-python/python-efl/metadata.xml
+++ b/dev-python/python-efl/metadata.xml
@@ -2,11 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>juippis@gmail.com</email>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
+    <email>juippis@gentoo.org</email>
+    <name>Joonas Niilola</name>
   </maintainer>
   <longdescription>
     EFL is a collection of libraries for handling many common tasks a 
diff --git a/dev-python/python-etcd/Manifest b/dev-python/python-etcd/Manifest
index da7bcf402593..559a68009557 100644
--- a/dev-python/python-etcd/Manifest
+++ b/dev-python/python-etcd/Manifest
@@ -5,5 +5,5 @@ DIST python-etcd-0.4.5.tar.gz 37270 BLAKE2B cdeae8ef7d668c7737f48a8f1513b5e0177b
 EBUILD python-etcd-0.3.2.ebuild 533 BLAKE2B ef24ea6aa88b6520adeb815c7401e39ab675bc4b83340a24b013c99b8b085fd59ff459df6400d5506c7f550eda3b1e0a4a2ae98912f134e8b61792c828369a86 SHA512 b40d232774fc023d2c101ed69d1cc937ba25675df09dcacd9dd28198dd0a8a8d7d9fd2cc68a6d0ece71ff85bb75985485ae05fb84746150cdf5a1488cbf78086
 EBUILD python-etcd-0.3.3.ebuild 545 BLAKE2B 22c32aece623402b8ebcc0fe9da23997d43c6a754743a02038cdffb9a65103fedfdebbfd1797a92038779cbd98165ff24e6be17fa6944b26e9b55102526510b7 SHA512 24785c5a756b6994caa0ece1ebcec52eb3aa94fee65c2fa0e480f4cbf7e4f603e7fad552941402c1ba3dffe93331690c04705396083b6a5f210189dc4c0c1b78
 EBUILD python-etcd-0.4.4.ebuild 545 BLAKE2B 22c32aece623402b8ebcc0fe9da23997d43c6a754743a02038cdffb9a65103fedfdebbfd1797a92038779cbd98165ff24e6be17fa6944b26e9b55102526510b7 SHA512 24785c5a756b6994caa0ece1ebcec52eb3aa94fee65c2fa0e480f4cbf7e4f603e7fad552941402c1ba3dffe93331690c04705396083b6a5f210189dc4c0c1b78
-EBUILD python-etcd-0.4.5.ebuild 715 BLAKE2B df0eae08c18add5aa84c13b95fa3ad257cd61d447758db565a6c56466bc4171795704f04310603161ff0d77923b66ea1780a1bce227a6f79d715ad310ef23dc4 SHA512 997bc582d05495c10a13fd34a0018236c6ac2281a80f8e42d25099f8571f77e40faf56a18852109de0c3e46c0571adbdbb2164cd909cf4f3f1916e8218377847
+EBUILD python-etcd-0.4.5-r1.ebuild 707 BLAKE2B c957c5d2631cf5136f9303e24ec8e0dec31139cfc68ca32c205caa1b7932a79ea264d26915dfae09d1673eaf78ea69a358c6c9ab99e5a6a152b39f9d83050227 SHA512 5592b4d882c05370d088eb7aa44a86ef06c81411d1b09550018dba9bd97da7917b1b39f9c1ca699d0a22f0e716db0b1da0f488445564ff60168680a6b795e9a0
 MISC metadata.xml 524 BLAKE2B cbaa775dd5120eeb49daef5068eb6c4ca8d5ec8ea0beab023eea17398e00098e07e63c1b8584de23836dc9647e35ddc21e271173def87a8dbe97d9aaa46b0c5b SHA512 3e629397cf00d97d1fc0e8ebc7edee5410e7dd50e09bde887f05388b788db22835b80bc3492bde3c4169c623605e7d84b2df465b864bf8b65e5623e74bad4f5c
diff --git a/dev-python/python-etcd/python-etcd-0.4.5.ebuild b/dev-python/python-etcd/python-etcd-0.4.5-r1.ebuild
index 899429718116..31aa61ab47fa 100644
--- a/dev-python/python-etcd/python-etcd-0.4.5.ebuild
+++ b/dev-python/python-etcd/python-etcd-0.4.5-r1.ebuild
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE="test"
 
-RDEPEND=">=virtual/python-dnspython-2[${PYTHON_USEDEP}]
+RDEPEND="dev-python/dnspython[${PYTHON_USEDEP}]
 	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
 	>=dev-python/urllib3-1.7.1[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/python-levenshtein/Manifest b/dev-python/python-levenshtein/Manifest
index f77cb727d527..ccfecd4181af 100644
--- a/dev-python/python-levenshtein/Manifest
+++ b/dev-python/python-levenshtein/Manifest
@@ -2,5 +2,5 @@ AUX genextdoc.py 7029 BLAKE2B 0d4b2c1110838696e1bbe7ef07b30d4bed04955da345171755
 DIST python-Levenshtein-0.11.2.tar.gz 45458 BLAKE2B 073871d18a2b02ba31be51af49ec907ffdf6c390f90e965c0710b5d3462f15238620e6a25b64b5fd19b922074493beec7753a0719714d893c5257eaf753aa4c0 SHA512 67d701e841c9a846948a1f2c70ea06c6473e3ae1437f73df2a2747d576024889a12e00c4a61e95b6c14826554b1ebaf65375cf5be4f26df3b208568403192bf3
 DIST python-Levenshtein-0.12.0.tar.gz 48617 BLAKE2B 67a720f2a76152b008bce86405b4f15f14f203e55c09931f83624c85199626582dcbc255ace914e103e7cd459c8570b0ea0c0d69abfd2c314aa488cb235583a4 SHA512 95df064490970618b003bccbef9071b1a2a3ee4645ac8e851f4205bd4e8123d21ee0ee733adfeec79085faa01ba39902e2a4a26bfb21b70678377579157df4a5
 EBUILD python-levenshtein-0.11.2.ebuild 1063 BLAKE2B 661777fe415995ca30f87b440743cfb7d67256c51b4c8e7ded6c75b562f792221abadf10ebff007f3b4889350e0e795a4748746cd44b65cfd7986eecd5498c3f SHA512 fc20c5aabe4d1cb2071541fd066544997f71818b9969e200389fc04c285b93abd92955e4539fc550a33dfe9c5168cea26314a70cf84b4f2113a917a0ab1d2d77
-EBUILD python-levenshtein-0.12.0.ebuild 1089 BLAKE2B e7924e28bc3446fe060f8269b374cdb695a9bb7198654d588e80f050cb54de26e6130e39e103af56b381a53a389517846eb0ffd5cdf08598ea28ac57efe90dd5 SHA512 411a6ba80ebeecb6063f31e77d5858240b7914a2844191dd3003799100b472fa6cc6dffc77253801f7f90a5eee10b3c6f965ac7e91c2d754573c11987e185a8b
+EBUILD python-levenshtein-0.12.0.ebuild 1088 BLAKE2B 3271f675fd762ccd6546ebec9574fc806a69d08ee6b941750a603b3ec45e1bda8cfedb6b674ecc407eadea5fc2d0e86ce59569ab58433e2680727481b1a92c66 SHA512 739315b9f102b02b0d9c2a74943fe7721b066f83a4cc27e6f4a90381bf43a2402da44c92971e82a834f27849db5154299ca9eea24d9b4bd3f1ee5c8dd3a82df9
 MISC metadata.xml 400 BLAKE2B 6cb97d53cfebfe6960f5adb6b1b10fef856a0944456e89d1f6ade86d8cf8183aa4acc33cbd4829c35a46158b6955a1454ce7143b5cd5538375ad4ab08ebf3097 SHA512 bdda13940bb23190d6d7c43f69d77a231413dbdfd81de5e35568da70e4ab2bc9906cab76890e78da7b1789a376c44658e476ba7c0a4822e7a97b0f37ce36f0f4
diff --git a/dev-python/python-levenshtein/python-levenshtein-0.12.0.ebuild b/dev-python/python-levenshtein/python-levenshtein-0.12.0.ebuild
index 1c4ff0b52872..aedb74cb9c0d 100644
--- a/dev-python/python-levenshtein/python-levenshtein-0.12.0.ebuild
+++ b/dev-python/python-levenshtein/python-levenshtein-0.12.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ia64 x86"
+KEYWORDS="amd64 arm64 ~ia64 x86"
 IUSE="doc"
 
 REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*' pypy) ) )"
diff --git a/dev-python/python-recaptcha/Manifest b/dev-python/python-recaptcha/Manifest
index 513bf5642979..5fdde291f88c 100644
--- a/dev-python/python-recaptcha/Manifest
+++ b/dev-python/python-recaptcha/Manifest
@@ -1,5 +1,6 @@
 DIST python-recaptcha-2.0.0.tar.gz 5556 BLAKE2B b752915eb95343d7cbce483f49ce9d93ecf837c85a1615e414e14226c54dc60ede3187bd127e09769106a7eb06156ab2b73b0a3839743c29b6aba6e6c4d96951 SHA512 3a60062f36833888a110d5979ca7a7f46cef927bfcf427aba72d2f6a99a9c401b20bea997ff8fb2b8435876bed3880371a84568b95da1341940d275cba8ff178
 DIST python-recaptcha-2.0.1.tar.gz 5439 BLAKE2B e985affe7d008f0dda270c9251315cbe381fc2a72514a219f422a1405c41e3d621326cfa32285588d4b5785c0e21251370546847695815b77ede81812d8eddad SHA512 103c0cf65d67fe3e4d4ca5bb0a208ea221642b1a6c11ad1997e3f1cfa56360c81665fc593354f6ea776deea43cbf72c97f3376e2b77fc275332cddee8b3a9739
 EBUILD python-recaptcha-2.0.0.ebuild 771 BLAKE2B 5889d47423245f88faa125e5d0983210b6023357c74476b19ff340a5f572e64172e1b184be9eb0e0f9e41cca817462c5f829c7fd30cdce0c8e4c779d05771a87 SHA512 c4bcecacfb9d341e0e6bb9c56ef7628fdb874e2683bbe431bdecdabb990d91fdb9a3c0015f947c4ea1f89eb3fd9162a1a0b63cef749ef4fc211441d4fbf5472f
+EBUILD python-recaptcha-2.0.1-r1.ebuild 655 BLAKE2B 86ae7e1ac9ae8ef8859dc4e67b397d1b39ba245f0c7aab2ce629ecb8279e67a93d971e79d79b7396cb1c5d9e014d76f657085bd70c90e5d8f31da7e2acd7099f SHA512 8d90b07d3e06c193f59905cd81fa4776df43e4e60f1a3fe3e5459bf2d6b101df0dccce1245b6988db95991d8d6d6b5e22f4cb32ba11354d9cb867631d3ee26b2
 EBUILD python-recaptcha-2.0.1.ebuild 609 BLAKE2B d781fa4d9cf79033a2a300f5cfd704d6f3ebd6a8ef11c93507a0b85815dc41f59e46a7e07240d12c5fcf7eae3ae013bb2bb85b516d42ac5c5a50b60adbd62271 SHA512 0bcfab41a0a5c05d4c54adbcd0f3c5054f3144f7affb1123390bcc567d8673c44f796a7ede736c9dcb69fb348b58f4b4f260ad5c578acf175a37a14998db5e98
 MISC metadata.xml 427 BLAKE2B ba42439a7701580eec32dbadf9a62d7bc8ffbb966d8e997724ff6bd72c366c3db7e2b92a966a7b88a4d2c5f28773c26fecdd6842003682d408c1833bf80795e6 SHA512 7bebdf6b10791c257952c29c3eba4c6886ed240823c14190c5652fbefefa847e25d1ade70e0d611011da9a627459cd5aaca81d6dd0ee57fa848146c3fbac0dcf
diff --git a/dev-python/python-recaptcha/python-recaptcha-2.0.1-r1.ebuild b/dev-python/python-recaptcha/python-recaptcha-2.0.1-r1.ebuild
new file mode 100644
index 000000000000..ab63a2563b07
--- /dev/null
+++ b/dev-python/python-recaptcha/python-recaptcha-2.0.1-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="A plugin for reCAPTCHA and reCAPTCHA Mailhide"
+HOMEPAGE="https://github.com/redhat-infosec/python-recaptcha"
+SRC_URI="https://github.com/redhat-infosec/python-recaptcha/releases/download/v${PV}/${P}.tar.gz"
+KEYWORDS="~amd64"
+
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="|| ( dev-python/pycryptodome[${PYTHON_USEDEP}] dev-python/pycrypto[${PYTHON_USEDEP}] )
+	dev-python/simplejson[${PYTHON_USEDEP}]
+	!dev-python/recaptcha-client"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-saharaclient/Manifest b/dev-python/python-saharaclient/Manifest
index 799a309c3e6e..b9555c9c1506 100644
--- a/dev-python/python-saharaclient/Manifest
+++ b/dev-python/python-saharaclient/Manifest
@@ -1,5 +1,3 @@
-DIST python-saharaclient-2.2.0.tar.gz 111804 BLAKE2B 5a52b7d51c3cc283b7785e7e3495ded4fc3b0b92ff8a8c01c61e6f04a6a54458f50e5505270018586ba08a9e55af809139f4fa892f9e9b86e072d12eee40e47e SHA512 88e630ab1b28404329572adadc3c923b592c47e6a2ccecbd40f79a0f3d6d65eb1476d62c6c5dc0f2d2e6687dbb5e1cdab4011c5c6355f29033b801b8c25f206c
 DIST python-saharaclient-2.2.1.tar.gz 111417 BLAKE2B b4545a161a630caabca9318eb0ead796b417d686cdf2c134f7e8022e3e62e7b01e5db7cff1950826d49798d6e6ea41334138bcf918dfb23a2eaf6527c0788fde SHA512 f5ebbe76d00a9bab4239bc19df2bde30b133b261bf8abb63db12cde9539c5bc92fb1a24b6c9ed6e8a509a44ae2abe98f5e8b74655517a1e2c2126938cc5c517f
-EBUILD python-saharaclient-2.2.0.ebuild 1738 BLAKE2B 554ba20d1cd4c03bd61d54664d548fa0a16738f5c1c45020d7ffccae6aaa61bdc9f7e1347c9fd1fbd8e21942ebba3af991efe4c6f945e8cd8f18fcb5e02a0e30 SHA512 443bc055b43dd26fbcd95843b875bd001af6ac8404b4fa444a139b8dcfc01a3f6f95b27355c1b90420106e55ebdeb41aed2085a94cdce74698992e5d7ef9c0cc
-EBUILD python-saharaclient-2.2.1.ebuild 1740 BLAKE2B 2219c123ff2263340c36c37b3db16292627c0e810acab6652ff28b57291b603c952ed97e52369b434800db251454a60e000de8189e36c827f3fb9e5eb3128b03 SHA512 02a31f26bd75027f6df4d67bd55fe49fabad560f898ba3d14e6e349e89ea686104ac171cfd182e60b1ece19c8ea72a00f9cb3308c5bf7c8220c234c8ddde990c
+EBUILD python-saharaclient-2.2.1.ebuild 1738 BLAKE2B 554ba20d1cd4c03bd61d54664d548fa0a16738f5c1c45020d7ffccae6aaa61bdc9f7e1347c9fd1fbd8e21942ebba3af991efe4c6f945e8cd8f18fcb5e02a0e30 SHA512 443bc055b43dd26fbcd95843b875bd001af6ac8404b4fa444a139b8dcfc01a3f6f95b27355c1b90420106e55ebdeb41aed2085a94cdce74698992e5d7ef9c0cc
 MISC metadata.xml 643 BLAKE2B 2a3c45ea4f9fa3c045cb88796e093436e66719daf71739c7679882f11123f2ac405926c8405046aed4efb55328d7235619192b9b7f978f7571c673e306953834 SHA512 4ab105b6287560e19a7b6ba8e999da16bdb520ff8f1a812e0e17ebff9c1edd2f7ec1475978ee478c556d31af8c201555669c92ff388de45a206b45005ec95d2c
diff --git a/dev-python/python-saharaclient/python-saharaclient-2.2.0.ebuild b/dev-python/python-saharaclient/python-saharaclient-2.2.0.ebuild
deleted file mode 100644
index 6b8d67117b5d..000000000000
--- a/dev-python/python-saharaclient/python-saharaclient-2.2.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="This is a client for the OpenStack Sahara API, aka HADOOP"
-HOMEPAGE="https://github.com/openstack/python-saharaclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/osc-lib-1.11.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-1.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/python-openstackclient-3.12.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	testr init
-	testr run --parallel || die "testsuite failed under python2.7"
-}
diff --git a/dev-python/python-saharaclient/python-saharaclient-2.2.1.ebuild b/dev-python/python-saharaclient/python-saharaclient-2.2.1.ebuild
index 981baeb7c401..6b8d67117b5d 100644
--- a/dev-python/python-saharaclient/python-saharaclient-2.2.1.ebuild
+++ b/dev-python/python-saharaclient/python-saharaclient-2.2.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/qrcode/Manifest b/dev-python/qrcode/Manifest
index 10c9e94006b6..0dcf3958d7e3 100644
--- a/dev-python/qrcode/Manifest
+++ b/dev-python/qrcode/Manifest
@@ -1,4 +1,6 @@
 AUX qrcode-5.1-unicode.patch 961 BLAKE2B f0fffaab08a6e20bf2897b4130f25b1639992a4184114f5ede1833cbbf7e8d9f7aa0fa9ae631d0af8d84ac4c372d96e4f0809fcba6168c2bd6d23a7c39e8baa2 SHA512 f75feb86c8796e73d7089fba8e0c464929452c4be24b2829fd231bd210d2152710529aa3e3266bb88453ee4f69fed2a1f6cdf337a8ff44a345f3f7d56c969af0
 DIST qrcode-5.1.tar.gz 22259 BLAKE2B 1aad710fbfdaa1c1be505038ceedbf02de8bcb2a37ead59265ff03af63b96d6cd740672cb2bd3a8f3b67eb981ed791cf2d53050c02d1499e6efcf1fcce2903c1 SHA512 67a7bb51fe2386f3b1ac0b799d3850d3ca4f61286fdc809654df3f5a1071b503707a9a3e82e595b7611dd9d7b7e74b36e19b86942fb5ad94c256cd7ca9aa02f3
+DIST qrcode-6.1.tar.gz 29363 BLAKE2B 5f31035b6c548c710d0d8198428612fc52417be7af5b5f412a42d264cb6a3ba96de65651049390107cc77e886df2b139942266aba579896f05692177b394ea11 SHA512 4831553932442f5535cba15d5958a656b399112f0f379c28ad9b610c33d88ec6d0613dc7047a2315606e49f027bfd13a15a332ce86b80040d56e1114a0f62251
 EBUILD qrcode-5.1-r1.ebuild 941 BLAKE2B 9d01e4e4da5f18927bb7857d312dd900c5f027b881cacebec53709f75c022c3cd8d3b1019f654cceffc7bcf1fe33fb602624441fa2e1b25414f3c1532ec66bbd SHA512 f21dca34373a98827d48141c1a095b69733b3e633b169b36472050c5339d458c0acfecd44c78e9a65b35c7f4c7792548ad2c66aa9965edbe68e2d32bf0e10fb2
+EBUILD qrcode-6.1.ebuild 904 BLAKE2B 5c6bb7ca1867b9be2cdbac79baa625a770a9cd7a64634f21303421341577c2fa568f70fce75040b8163479e17121472d1d099dcb7950e7270013907d7bf80a4f SHA512 5b502c3b823f76f3b561d74086d47b00c40ec50c626969c086e7065fb24f14634ac38ef671da8cdcb7657b7764c01e8c1134b39087eff44a7ec573cd78618581
 MISC metadata.xml 309 BLAKE2B 1ddae27e1f2ec0dc7c656238d9895afa6034ef205f42bea031b29cc69191b074e29f4049ec8103701cd916e17dae25e26d25d4e61f123d53fc0b0f6321c8d857 SHA512 65fa150581939d81a62bcd84b25e733b5cbf394ee6b201aaf7f64b22eeb75a3466ae0a6e1e230a8bb8f08b678544660e4382eb85fe55754bd64014a3c7b35aec
diff --git a/dev-python/qrcode/qrcode-6.1.ebuild b/dev-python/qrcode/qrcode-6.1.ebuild
new file mode 100644
index 000000000000..b59ee7e4b562
--- /dev/null
+++ b/dev-python/qrcode/qrcode-6.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="QR Code generator on top of PIL"
+HOMEPAGE="https://pypi.org/project/qrcode/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# optional deps:
+# - pillow and lxml for svg backend, set as hard deps
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' -2) )"
+
+python_test() {
+	"${EPYTHON}" -m unittest discover -v || die "Testing failed with ${EPYTHON}"
+}
+
+src_install() {
+	distutils-r1_src_install
+	doman doc/qr.1
+}
diff --git a/dev-python/random2/Manifest b/dev-python/random2/Manifest
index 4c47088ec996..c8c2b7c090ae 100644
--- a/dev-python/random2/Manifest
+++ b/dev-python/random2/Manifest
@@ -1,3 +1,4 @@
 DIST random2-1.0.1.zip 21088 BLAKE2B 69747711e355d3dea2b16562a6b9cdaa170732172e9eaac9a5cee4b8058f569e0c4527aec89e408e6472168fdecfc52b87703d23f153ec04f6ed2c049bcd162a SHA512 31de31c27bc6e07e99c24d30e97d9ddc3085fe557bcb0725881d4ab0b4c06e6208f64ba6267098c7b1be4f115ad45b399e841beecc90f71da2fb7d82982e75ff
-EBUILD random2-1.0.1.ebuild 452 BLAKE2B 4f4fe7182d097612d692d0849e29c9a644f3fa866e9459834766e2fc253ff0cd393503addea5e22a802f6d85ccb5bd8e853980a3f377faab77e882aac861c769 SHA512 9d4a711b481969741cc4057594b99629b6d414c23b8bf01d37976484428f7cf98889881cf8fff6ab7a519a88e23a2c1636b959e7bd6001d9827ede97194cae06
+EBUILD random2-1.0.1-r1.ebuild 442 BLAKE2B caebcd05a59f14960ed510edcc96a004d6f5f98238b847b0dbbe5db8efa2fe29e2b244e6e499bb2a760b754136dca47ff2ca9e325dab10562542316f175c6275 SHA512 82b6cff74668ed531315f36a23485d237a708650b785b5943f4072e17a75be68fc263ece52635e9edd0ee68e63bfd48e1c64b770d8fda44a51557d610da4256e
+EBUILD random2-1.0.1.ebuild 451 BLAKE2B 25ff841764f78cc9651262d1a60f2ef79ad26999feeb327aef4f1b31d57d904b3b5285baf09aeb3ea3e1cd2c261d693928a804155023a04d7392e121e4304f6e SHA512 977e6704a30f034a0c38e6756541f3527d6d90cf754e1d88bd2db64b91822334420b9ba297b7c97dcbea0cd26efc8583a757b7a5c9cf44662f3abb4b95ed7b43
 MISC metadata.xml 303 BLAKE2B 3510f40edd7e8583cebf85be1df4f124c3976f30c1a161fb4cf855ff57d3777a389c181346ba8e77234fb251e20f4b3b9fac10e9ee12f5db74cdda4e35e2913a SHA512 a921cabb1c8d9a5fc1271f2fac0c2a31b9a308d53e0b800b9dd14d3d830d5f9ccc7f0c8a773868033dac656891fabfcf19cb963bbcd035d73bfdb5aecee1f1ab
diff --git a/dev-python/random2/random2-1.0.1-r1.ebuild b/dev-python/random2/random2-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..59faaf8a32c4
--- /dev/null
+++ b/dev-python/random2/random2-1.0.1-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6,7} )
+inherit distutils-r1
+
+DESCRIPTION="Python-2.7 random module ported to python-3"
+HOMEPAGE="https://pypi.org/project/random2/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+BDEPEND="app-arch/unzip
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/random2/random2-1.0.1.ebuild b/dev-python/random2/random2-1.0.1.ebuild
index 3d3b483174c4..7aaec7be4ba4 100644
--- a/dev-python/random2/random2-1.0.1.ebuild
+++ b/dev-python/random2/random2-1.0.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://pypi.org/project/random2/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="app-arch/unzip
diff --git a/dev-python/reportlab/Manifest b/dev-python/reportlab/Manifest
index b744733c8fb2..93de622be3d6 100644
--- a/dev-python/reportlab/Manifest
+++ b/dev-python/reportlab/Manifest
@@ -5,5 +5,5 @@ DIST pfbfer-20070710.zip 677333 BLAKE2B 100214476a361a5e5d1f3da0999591345f6e3a3f
 DIST reportlab-3.3.0.tar.gz 1959255 BLAKE2B 0acd2d306da7836a2324b9a63c158b1b935cd393f5d1eb62cd15f8f4be6e48dac77807d1635ccafc569a47420dc3f4eec49c3ea3852a5a4241b10f0d73550865 SHA512 a6dbe5db13a9e430855ba8139310d8f04ade221c340467c2e0f5bf60c700f17148069358beb057f1667217a09b71ba1ae3112bd02e7c8de00e53a8f852acb8df
 DIST reportlab-3.5.13.tar.gz 2842790 BLAKE2B 1457b5eb18d2f294decd7bbee202f42900a443eb7a31c2af56cc2180154e1bb48c4044c499b14489c23210e78c9bafb3fbbcd0c5a28f1d2e25f57d91dcb48526 SHA512 50afcdb5e844cc7ec5c1cf72ca28556e98ad721dce5b20cfb32fa720d56b221b9bd2662a88ea5647b11306d80e653334635b54165daa02d3062cf9d051bbd24b
 EBUILD reportlab-3.3.0-r2.ebuild 1654 BLAKE2B 75324010068f8d97897151151776bfef87401dfa7859fa7b825d59b667843dde3e5e514e4039893534f7c5a6af5c38a937ab18ad48629c43f7f9a67c28671646 SHA512 a80631147edfc37e13fe28dfb03953e343ce26dfaa8769eda29809c0cdd0c5c39e51e3605e682a15a957268a6a80156e6edef5f9a2eac4949a642fdce8b260d1
-EBUILD reportlab-3.5.13-r1.ebuild 1523 BLAKE2B ebf92f9a176a6d8ab70463e79a73edaf8b77800342d73e68c0b2318cd771d589ee19eba8e627796c8ce73798509a63b14ee5169dad748a52909476c132908858 SHA512 bf25186e74c897c81da65708ee57792532bae693548e6fda7fa7bba2fc87811601f35ce6fc2ee552c0c1c5a1b4c062fc62b5f4906ead7d06d21670ad14dd0b0b
+EBUILD reportlab-3.5.13-r1.ebuild 1522 BLAKE2B 1586b565175b35efd365bf21101c30be61ee0856715592de5b26f2d5e2d4986d509adaa256c8ed8638808bd41728f7329f7935358196095eaf5072806f4086c4 SHA512 3a5b74e84ae4db7aa4e78e0e0befca91ada0ff04aea1693454051227a22a5c61a2ebf3e90eea04659305da3f240f972b1232f1e91853c47b3ff5542b850b61dd
 MISC metadata.xml 441 BLAKE2B b779c5502121b6730f77ce8cff7d8e64fd8510ccf778888a2cf49c5a370c54bd258e91bbb8354cf96350b3a1e5bfd799415c752a1750e3a84ca40e2cfc34b3db SHA512 4c54b763bedc090a8f16642829e4b2f16068a2cd6a8f1ded89ea9faa6425771a32b85a8b49b2f8dd91a51ef16f37051f76b5f899f7b34c7d4c2f37cb94a253a2
diff --git a/dev-python/reportlab/reportlab-3.5.13-r1.ebuild b/dev-python/reportlab/reportlab-3.5.13-r1.ebuild
index ffbe40647e32..3f66f1c4fa6c 100644
--- a/dev-python/reportlab/reportlab-3.5.13-r1.ebuild
+++ b/dev-python/reportlab/reportlab-3.5.13-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="doc examples"
 
 RDEPEND="
diff --git a/dev-python/rst-linker/Manifest b/dev-python/rst-linker/Manifest
index 0240a12ea60f..b32b7ac076d4 100644
--- a/dev-python/rst-linker/Manifest
+++ b/dev-python/rst-linker/Manifest
@@ -1,7 +1,7 @@
 DIST rst.linker-1.10.tar.gz 8820 BLAKE2B 3615353dcce16652aa3528985997467e1501161b012fad44203fd98cc5e91dc32acf6c8492f0797ae748a87c008e5f3437833b435c5cbd85845340b91665e664 SHA512 5541d0ba5299a6efee444ed3c4fb4f108bcdd7c84e4be0b0a44f71c9f13e18d5b5c4c38328a542fe5666d435e1e04c35c0db5535706a45932dc01590813a85cc
-DIST rst.linker-1.7.tar.gz 6798 BLAKE2B d4d5129bd79534cbc58f287a60876153325cde3142b3e516e3a75f22827f78c85edbd8eb2777263e6bf3c04f6ebabc78441647df3ed23950982ebd7ebe156632 SHA512 380cd1b36a1153a6512144b7c83be75dfa95ce397437d34cb76c4c41de6266c77cf1f811f4fb0576838e10bd78e1f46394df11b0f7dc5e3fafeef36b6e8c9ba0
+DIST rst.linker-1.11.tar.gz 12569 BLAKE2B 5418f651322c28d8aff2dc735f8ff72325e895d8f2c12dae4985112112f74023c6103e344f4422e944b32b692713834ae5239bc4193edc76bfa85d9e0a674f4a SHA512 8e748330f60e2e1f859fa3ec3fad706d7bbafc78a402b0df242bda7caff1fad3f1b17873fa9ee749d3d214e094f24a35695c627cf9a8d8f08ca99ee6ad0e4e6d
 DIST rst.linker-1.9.tar.gz 7618 BLAKE2B b344495a217d7cd1c057256701130851975e46c45a740251ce20efa5131feb46a074fb1367a645e89b436b7e093baad1a484d06ca069ebc0f59eca8183ddd36d SHA512 b3e39b025f75bb6ff670f23ee7abd48dcc4e19343626c1ffadd2304a7e3285fe0b7369ace96e47094606e864672c8aeea967a02217b110762e53498dde64b8a7
 EBUILD rst-linker-1.10.ebuild 1450 BLAKE2B 2a35ac52674c3e3c05de9d613f4ba6de62325375122572674dde7ed97350f295286bee3d7e05f65d78c55e88835d944775cc350aa9c3a439f4816ba1b9bddec5 SHA512 4da5bfdf262e26a657898e89383cecaf8e4d3edd8af05cb7017f170fb71c620cbc84cb42d801efcf6adfc3176760ca8e18fb6ee700af40684ddf7118c530cea1
-EBUILD rst-linker-1.7.ebuild 1193 BLAKE2B 253a1f658600b89f25238b5d6fb2b58e95586cd633755dd3a5e31efd611c045391a02cd072d4c61baca6540e54566340e90179c45d36651f262782b5282031cd SHA512 75df4d18c2d98986d40abee47119ba0ea82341c4bcf6aa2cd7c769ef29614256e0e47d297b5d055b9dac43a7e48b1392728fd8e3d7d0a9fea63f1654a0663891
+EBUILD rst-linker-1.11.ebuild 1499 BLAKE2B 2af78fa80d34372e6c96d88d5b8ffe460635e99bfd908a856701858dd4d5bd9b6b4cae16691947f7c56810c0318c823c0b940e00580ddc52eb20330c3411b165 SHA512 58ed8fd14467a1b6359cb72aa240b3de97aee76d45fdf4b028cde19c418abf2c50cbd616ce6961b0f6ee2749b5b142aa19d9daccfbe760b07b41100018ac1e3a
 EBUILD rst-linker-1.9-r1.ebuild 1384 BLAKE2B 91b5b4ebcb375c07c021d7c3aff1c2f3c50fc180aa9917004ca4fbbe9b8addbabb50bd425d6e2fbcad2aa2691953d600545bbd21bb5a45e4e3fc10d159324f42 SHA512 217ca0094dbc59fa4d7e84050ba69a5b7b0f3c78f27ba06f476e308911c72b27bd2abe8d8eb0b8db0fd8aae147950eb32d4d7acbf7523b96e2501e74593e3df9
 MISC metadata.xml 440 BLAKE2B 01a949c99d2843942dd04dc1e3834552dd8b289a776d66acc4247c33064dd7a5c0591504a0c347558788642719fa78db8b95b5c5c06f12f5eb223df8f2343fd9 SHA512 6adc5406eeaf65eaa92644a56006d29909ef2e3cbf41753968d3efab6364a7d41bc98d9f03ed59a1f4c6ee8d2f6b4c75fa02103d04d4e9f065764fec6c0dd9b5
diff --git a/dev-python/rst-linker/rst-linker-1.11.ebuild b/dev-python/rst-linker/rst-linker-1.11.ebuild
new file mode 100644
index 000000000000..e49b066b8218
--- /dev/null
+++ b/dev-python/rst-linker/rst-linker-1.11.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Sphinx plugin to add links and timestamps to the changelog"
+HOMEPAGE="https://github.com/jaraco/rst.linker"
+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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	test? (
+		${RDEPEND}
+		dev-python/path-py[${PYTHON_USEDEP}]
+		>=dev-python/pytest-3.4[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build docs docs/_build/html || die
+		HTML_DOCS=( docs/_build/html/. )
+	fi
+}
+
+python_test() {
+	# Ignore the module from ${S}, use the one from ${BUILD_DIR}
+	# Otherwise, ImportMismatchError may occur
+	# https://github.com/gentoo/gentoo/pull/1622#issuecomment-224482396
+	# Override pytest options to skip flake8
+	py.test -v --ignore=rst --override-ini="addopts=--doctest-modules" \
+		|| die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/rst-linker/rst-linker-1.7.ebuild b/dev-python/rst-linker/rst-linker-1.7.ebuild
deleted file mode 100644
index ebac84504507..000000000000
--- a/dev-python/rst-linker/rst-linker-1.7.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-DESCRIPTION="Sphinx plugin to add links and timestamps to the changelog"
-HOMEPAGE="https://github.com/jaraco/rst.linker"
-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 ~m68k ppc ppc64 ~s390 ~sh sparc x86"
-IUSE="doc test"
-
-RDEPEND="
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-1.9[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		${RDEPEND}
-		dev-python/path-py[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	py.test --ignore=rst || die "tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/rtimulib/Manifest b/dev-python/rtimulib/Manifest
index d6d1c0964f88..f24eb8e2e3fb 100644
--- a/dev-python/rtimulib/Manifest
+++ b/dev-python/rtimulib/Manifest
@@ -1,3 +1,3 @@
 DIST RTIMULib-7.2.1.tar.gz 915114 BLAKE2B 5d8a54d4b1083105c1bb3b854e8474cb81cfd5eff843422e2f66f363ae04dd9e87d4cffc8f26c2a68c4f535d77ca229bc7bb7840c59ba3c6d2d45d5ee7f31987 SHA512 2a9d40f5c4db7c875fe82bd79408d97f9b00a3cd0d1be9b19baa3808b4cd260200b8ce5f5d9a6298df760aaca10555eb317d4a2431cd1c07a1b7953448852b23
-EBUILD rtimulib-7.2.1-r1.ebuild 570 BLAKE2B 1228b6e3448a2bf1c7ce79e8402e1297f2fee3cd8206553210ab7c16bd967030a38d402fa2e2ceeb0ccac2fc5c9082a680b75b7d4597d765f41c9b340061fa6a SHA512 4236b324b75e18d4b5baf0c2fd302a7374a3a7821018ae7661342898f309b2ff5b77ba56707664cb503077384ef4af9a00fd3a0441c7516977489eddab000b22
+EBUILD rtimulib-7.2.1-r1.ebuild 569 BLAKE2B e6bc42272cafd9a8a3a19a7ed18e4b914c46de30be5c5edb0ebbe435215ebd06f68ce2dcbce09d140702e781e749fc086557733bc84892727482be2dbe49ed0d SHA512 228b55c70ed6ed5f10ab9d887440d69e4a68c5d04d11d3fe959e803b6a80a26dae6bbc8c5ce106bd818e208840121806347b82049b6b61cd45fd39bebdcfd347
 MISC metadata.xml 848 BLAKE2B 8a0045ba1eb894fd8b3796e1e301e6bc11510a78f9ce3943309448f5235b0bb8865bed7d81b5da7f5dffdbc251c1a5ce908a5448d109e7e61ab433d234dca868 SHA512 1f5e646966e092c296948894357743d5be29e23e1abead62a748ec3d8237025d212bd48b9b5a15eecfbd486b02bda4e81c5ff2fee4eb08c0ef0d5f91b47e0a3c
diff --git a/dev-python/rtimulib/rtimulib-7.2.1-r1.ebuild b/dev-python/rtimulib/rtimulib-7.2.1-r1.ebuild
index d7dfd2beb7c8..496e2e73de59 100644
--- a/dev-python/rtimulib/rtimulib-7.2.1-r1.ebuild
+++ b/dev-python/rtimulib/rtimulib-7.2.1-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/RPi-Distro/${MY_PN}/archive/V${PV}.tar.gz -> ${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~x86"
+KEYWORDS="amd64 arm arm64 x86"
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/setuptools_scm/Manifest b/dev-python/setuptools_scm/Manifest
index 6dbc40fe18fc..5140c57a9f41 100644
--- a/dev-python/setuptools_scm/Manifest
+++ b/dev-python/setuptools_scm/Manifest
@@ -4,6 +4,6 @@ DIST setuptools_scm-3.2.0.tar.gz 39646 BLAKE2B 922e2e09a9826e8573900e8d279daf937
 DIST setuptools_scm-3.3.1.tar.gz 40183 BLAKE2B 417cb000c3edba7da8e92b8fb5b1d906d2ef0170eecc4c0b9d2ea490ef6bad4cbf5ca172bee0fc536c83605d361604c728bf4097f520ef8e62ee2d4f004e3db1 SHA512 cd8f3d1e97743097791001197c18a2c8336b9e499a543ec5d1ab6e9b613ef1417b59e34c329507a73c2626506ee892ccaee74dddc5c0950ff71c0bdfba954dc3
 EBUILD setuptools_scm-1.15.6-r1.ebuild 1354 BLAKE2B 3edb6f41ae5e11e6eafce2795b49776206340b1f8c637cd33a661a21c41c3fb1acf9d50c6e502e9630d29287fe83b53a022ba909795d25d39e41d52708545dfa SHA512 e43291aa02e92328970431c641492e46b40b9c0619384c4acd15d8bb1ed6368a54b774049ffca2dbd6ce56abe1f0440e4f6e22d5ccc959644864928c41d18b12
 EBUILD setuptools_scm-1.15.7.ebuild 1478 BLAKE2B 06655a6e5a4337ba5bc488d0e4751fde18fc8b130b83f06813452e2a929e4ec4b5283e81fb2a8d16f0697cafb0b7be4c1664fdfcfdb0f967f1a6c000bfe88d04 SHA512 226ffc6926f636a954eddbe8833cb4c41124c0ea880849047f080bb04b4dd25a77fc6dbc1263ea58b8894f82d529dca7af30f646378caee51e02dd282874e8c0
-EBUILD setuptools_scm-3.2.0.ebuild 1309 BLAKE2B 186309420b39824a03d6af4b7b0a37a976e4dd1dd6b4c8fe9fcea33cba0215b42405743c265bfa42d7d06e3de9f7fe724bf3b71bacb5a70d3912f73b7d3900b9 SHA512 bbf78cc21afab618d93b261e7ff1c35b006c1a89c564f8f416468a6fe66b875db20421dda5006b3c3c010aeb8a3a0005ddb713381d4caf789dbd4d6aba39bbfd
+EBUILD setuptools_scm-3.2.0.ebuild 1306 BLAKE2B b0bfb665aeb74618131a3b4a8c431726d51ecac35c1142c27183f34a672450e9286e7aaeba34c3e7d8042ab4fa2905474e844eb4172b7a251154bf14c7d0ad24 SHA512 c6bb267486b6ad41fb4a615e306102201d3838b41f079ee713907088daeb173132b40a0a78b003fbcc472c03c04a8cdad3ab75b9c16abfab7e2bd15afe473964
 EBUILD setuptools_scm-3.3.1.ebuild 1318 BLAKE2B 5e628c70571b727c27ae06c1537fcf890d06a24ad5998077c095bdc3ca41ce9a5e123f4a5e31908b11aa688167ac95dec0fae5ae38d34d44eed4b76b0ef321be SHA512 b608962363a546fdd2db76f688449bc2dc407b5cbcc5287adaeeee7842590c388c6e79af3f1273e254c823b7aee8acd646b244ad480f837cdd57c786a83cae9f
 MISC metadata.xml 511 BLAKE2B 7ee7b4fe4bb93bca13880e9f6f2e0ae90a27fa79f1bb99395d234322a61de1b2f13906069bde898ad6a3f83e8dc03302cae1fe24eed92e1b7fe6e349b98ed957 SHA512 cf1e97d13c127fa92e8bc5e5d41bb308761c6b75f267969662162f50a4a1a9d9f80bd2cb037711d2f5c7204204ddb9873f21cae5d6831a3127f3cddee3878a31
diff --git a/dev-python/setuptools_scm/setuptools_scm-3.2.0.ebuild b/dev-python/setuptools_scm/setuptools_scm-3.2.0.ebuild
index 743d06f43a5a..b35aa523d2ae 100644
--- a/dev-python/setuptools_scm/setuptools_scm-3.2.0.ebuild
+++ b/dev-python/setuptools_scm/setuptools_scm-3.2.0.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 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index 62519a195536..e223e2606782 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -3,6 +3,6 @@ DIST sip-4.19.13.tar.gz 1038815 BLAKE2B 0b6f2941140a535cfdfb51db71cf9a55e5f65be8
 DIST sip-4.19.17.tar.gz 1056156 BLAKE2B b5a7b4cd3f2152e9b7ee7b715c3ad72c2092598e0405cefc24d6283e9da07e54fd65da89e137618d3b84f3138fff719cf226600135d646e7bd7c538c2a02cdfd SHA512 d393cfc1643663926bd315a8df92abd82bec071bf0488b047625bdac43e9074bc8a510ac23244a7a2d2d181f70af9691db9d0b759e79643981d6afd71a49d3cb
 DIST sip-4.19.18.tar.gz 1056840 BLAKE2B 6c674405e28a64c9db635deca8a00ed78bf52d2551ed578a57d31ae96071ca77ba49e3fc92329942ca61de78bc98049694cc48ef54ea645819fc48f2fae56060 SHA512 e3c58cc6c38b277b3b9fd7adf33df91b47e0385e59d52c543e630a194d73d04d91e0a3845cb3973d1955f77049e75246fa7e6f544e02e1efe0086a297cf1d887
 EBUILD sip-4.19.13.ebuild 2890 BLAKE2B 7e98f818a312f0f2f7267974687fd565785d55f52766dbc0f7112f8d8e0bb27d7fcee86093f1d791317002009750c9883e1688f56b7275f09046ed07c8b22d18 SHA512 71c635af1a2a9e9e05fe52e125e15e1e52e4e261d868617d0f4f2fd48f3049b138b966e7db13ec952f3efd50d6054fd5841c95ae9169e58c1745e19ddeb6cf59
-EBUILD sip-4.19.17.ebuild 2446 BLAKE2B ca7377f5a6a3352ae0622fb032a5fa6e5ed3a3b8d993dbb9306364c47b873b055a9a0c54712c4e91f904ff92beb86c428ab85df023eda727a6acebaef9be8359 SHA512 34c1643d95d2244e82e5a948352ea58b43af6bce24994f00d07465906c0b2e80463c0737c7e99eba0358c01acaee41e35c4a0417e444d69d18999c80e376d8db
+EBUILD sip-4.19.17.ebuild 2444 BLAKE2B 7c867822fb01de9ba41383133d99c15bad3aebf6b1ceeea90f1beb94634ad83d110031d3fefb38c0045bb6fb07cb595aaecb6395c1d71ba2152a0892224da4f4 SHA512 7bec526167aef832eeaa32d2e484d59f404a537da64cd22f99bdaab332c891031a8680cc4a3b7da063c20208f00e2d0e4837323056a97fd7f99124e53b4b8587
 EBUILD sip-4.19.18.ebuild 2452 BLAKE2B bab80aaddf65f0ac19e475fc8c6cfb919d6a2697032f7043e32876d651b88d42af8dba1c895c6b47d8bd56052171c56b89ee0d4787975c3939dbd10f7bc42258 SHA512 ba18690557373894f037d05f53da2d699166b46de4ed03a5e4e239d047b04ad8961cfe6ac2bfa7e86a62d5ac2892d2ad6dc6f22a3e374aa9b83f50e83c76c20b
 MISC metadata.xml 648 BLAKE2B f49eaeae5e37d91c569b93fdadc4401e478c54a754290ce37dd51d1d03340ead54f4d0f52389d87b91801a2c1ad0040347e629068a6c0ffe79a9e3442498e4f6 SHA512 1a2a4fb4e7fb35fb6177d62d5c866a5c65c1915ff38de5815823864fb6d9a90beaa8897e28a65f79770a621ccdd83755c682df29a25bf00a76ffd51b215dcdf9
diff --git a/dev-python/sip/sip-4.19.17.ebuild b/dev-python/sip/sip-4.19.17.ebuild
index 458a82626d2e..6317c6a47a25 100644
--- a/dev-python/sip/sip-4.19.17.ebuild
+++ b/dev-python/sip/sip-4.19.17.ebuild
@@ -20,7 +20,7 @@ fi
 # Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h
 SLOT="0/12"
 LICENSE="|| ( GPL-2 GPL-3 SIP )"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/sphinx-aiohttp-theme/Manifest b/dev-python/sphinx-aiohttp-theme/Manifest
index 0d0912dad5a8..045f3c5c272a 100644
--- a/dev-python/sphinx-aiohttp-theme/Manifest
+++ b/dev-python/sphinx-aiohttp-theme/Manifest
@@ -1,5 +1,5 @@
 DIST aiohttp-theme-0.1.4.tar.gz 10723 BLAKE2B afc398bb65e69fcc931f214c613f789da07c89bafd26ff207d4c5666edbe323f77c4a6fec09817d4dc6bb1d40e21ddd82f0b7b5c25dc5fe89b8b83c1c423bad7 SHA512 b487c9095a677baf9471b93be5b9cc3a697f62d2674d27ea4a7aee043e5dd75c5543a0e0a2e51c28e36e5bbf324bcb6d06786b31ae3b492ad2f972c6776c40af
 DIST aiohttp-theme-0.1.5.tar.gz 11132 BLAKE2B e405d3a3ccc0d8568ecc42f8891eebe405d2d75cd47e60910f59ebc979da07362d3cbc20833412a462454b2703aa945f491e85c10b206a356545a13cbc07984a SHA512 106a77665d907c45db1fc2c23990eab61cc70f9f373ce7fe0d231f9744efe5dc7119606bcbdf558ceb038edd7e0cb955531fd74c496923038bcfd799bf67616c
 EBUILD sphinx-aiohttp-theme-0.1.4.ebuild 564 BLAKE2B b00223be97236b9e638138ca3cbbb37f49e304ec1a4cd852641ebd29d4fe3c1410bc69e2744b75a4934e4b6af27beb70dc978da00331deb8ec17b841f5682d3a SHA512 90c40bb2301d3a37a6a85220637b77738ac2b63c0eb7ca337bda899a68da786a13960bfbc0d484d3bcc1002751f15555e76bda99b607d82cf1be6c79cc43bec4
-EBUILD sphinx-aiohttp-theme-0.1.5.ebuild 566 BLAKE2B 525cc18aab65b52e73e3429bf6a5cf60a0765f3eb544d0a1077ce82256a2e93497862018e48315869d8e3d7ae6196f6c9bf06a653260b19d6b34607223c8c0d8 SHA512 ff114b399f620e2271a83ef2cf4ccbf1a20838d3f8289a4d7eb9e27ab71122b4953f40ccd2d3a93fcee761217f2ac647b8c7a595d7eeda1adf8a6399f3b2b844
+EBUILD sphinx-aiohttp-theme-0.1.5.ebuild 564 BLAKE2B cc9c1ba2f8f8e7bfdc678c4c3fd17e5a8f10882efc8954233f9c10fd5be6ea39f744f065f5337cb5f9a6e69174c267d46c6e8a2fe91d0f9137d3430339f681a3 SHA512 3d5b1c56350dd7b10a410b5b131d65b83ae48d7483ee2a542fc4ed3815e61d0c0f52114c78f37f69d9e0879b3a46064c17b38bc90ffb5bb9da14c8ff614d3cdc
 MISC metadata.xml 356 BLAKE2B c6f21942be22de996083446c4cf4d1d188e582ffc7550975b513475021f7097835512409e58eee10f86b205770734c968234d5fc542ec1a622d3883714685824 SHA512 9130b60a4ba5ad45d7bc2ae275485917c365933b215e9551ab000cd5a34a6932a07b02b7513d0890403fbf6a7cd713dd8cfcaaccd1c4819a0a9f15207f062d9a
diff --git a/dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.5.ebuild b/dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.5.ebuild
index b6446239067b..fd1329a2cc0c 100644
--- a/dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.5.ebuild
+++ b/dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
diff --git a/dev-python/sphinx-testing/Manifest b/dev-python/sphinx-testing/Manifest
index 24c32e3e87b2..d4924047a9a0 100644
--- a/dev-python/sphinx-testing/Manifest
+++ b/dev-python/sphinx-testing/Manifest
@@ -1,5 +1,5 @@
 DIST sphinx-testing-0.7.2.tar.gz 11040 BLAKE2B 503e38eabfe8dbe28942f9165a83db2dec0f9ac52e1e55f7298848b7a6b55244e1b5623bfda7f4e1380eab16ef81cf51c6bc11e919a8b45506f17759ae0ee181 SHA512 d267c74d97443db2df69914a825da969021e37fc61b8a664ef382504fa826387a95230bf9259b58c6f26721f33985fa2168d2714342a2166b59740cf1b3ad724
 DIST sphinx-testing-1.0.1.tar.gz 11513 BLAKE2B 46ede243507a0d90b2ad4b918deadb818491bb0ed15ce41886040c52650f9fd348ff57c03766fd1e7719bbb54726f8915e091cf94a5396da946102ca49fd07b2 SHA512 2d377c0c6fe8e34a463b35e96938507a3ca35fa06cd19a2682eb55825e1b88982a80a02ebb9a02a47f11ca5e8fe6a5b9e5c8114d955fa3b774e0148e82121818
-EBUILD sphinx-testing-0.7.2.ebuild 670 BLAKE2B 91b3ea4398ba4e34b54136fb3e101a407cbebff496b6236ef44b462494d579c5fea5b7e216ac2cec3f042b6d6a07a78508ff4dc8808df9a12d7dfe9980e02cbb SHA512 f707f939fbed55ac43e1dd8cb025623de0cbc84fa91aac7cf6de9a2292c6c5bcec448765a1e655535369a09ecb5fe46302127d688e4c631783a752b1ed0a219e
-EBUILD sphinx-testing-1.0.1.ebuild 861 BLAKE2B 9607853fc044848f4a64c547c522a3b90e1a01d9766d8b2a74be7ccf9740b2e24a4b94ad382f60b1f35b35dd4529fdc88006fcd395a99a4d2c940778c4455974 SHA512 7e6996b3b5017ade03c6532860931305a98adc2d62eb6b0e0bee49c8f485acde24aaa198714e1c7b52b82b49a470058c0b1caf731fa1970669ec3b0e8ced87a6
+EBUILD sphinx-testing-0.7.2.ebuild 682 BLAKE2B 5e7808d3dd815bddd4c2fbb0267f43b651643528a5c1eb0d3509fa39e88b1724a5bdd8a2be6e56ceb407c89e156f9bbb23a9b5d10984645cbe559540665c0764 SHA512 cb2b1746e641571c30a859e413cb390ebd9fd222f1a26e76b94c6198d2cf32c6adf6c673371d606a15158b04a377936cde42b333ab8c937a33a1a7a62a1ec2ed
+EBUILD sphinx-testing-1.0.1.ebuild 859 BLAKE2B c1f1bf5588c6e6d003b4ea2b282a0a7f9061c4f4116844c5bfceb25eb1526fc257e5408f02d3dc40249365c45184a436a14557dbd81e3cf820ce0ddcaf287ddb SHA512 cdc23f0c2df1ebf5f4d21b6bcec2de74c392209b7f47c1a4035d6d088c454d1ed623cafe7139884443960f9a939486bab932e8bec5c87d41d3544b6d9d6b7503
 MISC metadata.xml 340 BLAKE2B 9a1df283aab1420d7818f4661b57f6d60cd734016c3711c633b9a6a11c401c8603503530fa5e1f50940bd28c1fed83196c1c543d16b5217b996f6afef23175a8 SHA512 f5299851dc6aa3c3ad1109123ac6c4eb5b5c7e1177fa1f068da5cef0920bbece63a8f1c424c5b95addf661e5a7d15a05a427676f6c272a54741495c77e316b78
diff --git a/dev-python/sphinx-testing/sphinx-testing-0.7.2.ebuild b/dev-python/sphinx-testing/sphinx-testing-0.7.2.ebuild
index 8f3666ba6da4..e56e51ec4256 100644
--- a/dev-python/sphinx-testing/sphinx-testing-0.7.2.ebuild
+++ b/dev-python/sphinx-testing/sphinx-testing-0.7.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm ~arm64"
 IUSE="test"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinx-testing/sphinx-testing-1.0.1.ebuild b/dev-python/sphinx-testing/sphinx-testing-1.0.1.ebuild
index d4cb8e44dbb8..6521d4338690 100644
--- a/dev-python/sphinx-testing/sphinx-testing-1.0.1.ebuild
+++ b/dev-python/sphinx-testing/sphinx-testing-1.0.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/sphinxcontrib-asyncio/Manifest b/dev-python/sphinxcontrib-asyncio/Manifest
index dbb6e0d1b248..ffea9ebbc28d 100644
--- a/dev-python/sphinxcontrib-asyncio/Manifest
+++ b/dev-python/sphinxcontrib-asyncio/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-asyncio-0.2.0.tar.gz 10689 BLAKE2B 9e03989a1ed22d7d467bdb7626e2e908407a0de15a943a432ff9707340f0cefe7caf1684380c25764637798b585b32287c4bcfc0f2014a78b7019547405e7ded SHA512 2ca25717c03385ae9bf879b8efeab8d508292d07f96d941032720d755d3db2e7bbc3c9a33c6103af9d83849ed8878bea1048d349bd0873288ee2addfee9756b7
-EBUILD sphinxcontrib-asyncio-0.2.0-r2.ebuild 1019 BLAKE2B 9e4a1fa3d46c612385990e2dff5beb00f2bdd9beac9940c92a49627cf23e0ba998a0c68b9da881aacfaf16c2bdad9f6c629342b96fed76c1f6ad1597c8ccf286 SHA512 60a75a779341e0525cdab3e8b970c207ec38b62fa9ec186a748b82d46fd21f6ea84886de129ee290e937f95e81df073e150b4b0105d0a77d0d456d40035387e4
+EBUILD sphinxcontrib-asyncio-0.2.0-r2.ebuild 1017 BLAKE2B f62870115c5080db54d9b8f7237f0975b7de4729870532ca2e94a9e9cb8ac03075aaa9b9c79fabba47bd1485ab25e35496feb65bf415f3414f9227e8b6a357bf SHA512 d3f315d4f10bb0f6f553922a18ce9b95b3936638cdc5d56a31fee102b01e9fca98858b1b55fde897e40934baae7326cdfece59767ae62be3a5256e6707574bb9
 MISC metadata.xml 372 BLAKE2B fc779af5274229957de772908e2a2fb9bc0cd75673af9ab88e4b6869164c75b7cca2fff4895beab62bbce984e93255b6578a6360621c5d0eefadcf49ae3f787f SHA512 63aeaf1b521f6c789128dc03be198ddcbfb6dc7e63fa6b24eef1cd23e9557d5de5f7c990514b95dd2b74634f47f3f5db89f233dfbbfb711527e51806bcd5a367
diff --git a/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0-r2.ebuild b/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0-r2.ebuild
index f68ae6d84125..91e8040b2f2f 100644
--- a/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0-r2.ebuild
+++ b/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 DEPEND="
diff --git a/dev-python/sphinxcontrib-blockdiag/Manifest b/dev-python/sphinxcontrib-blockdiag/Manifest
index 00188d00586d..cbd7b3cfeaaf 100644
--- a/dev-python/sphinxcontrib-blockdiag/Manifest
+++ b/dev-python/sphinxcontrib-blockdiag/Manifest
@@ -1,5 +1,5 @@
 DIST sphinxcontrib-blockdiag-1.5.5.tar.gz 12066 BLAKE2B 4913aa53b365a05db2962c81c3f15df748c3424c88dc70bb5c97325c92492852698246b2d644748fde46ccc9ac6535871036851798db6d9db5e9610c5ef58b45 SHA512 4c007e2c394bf90ff84a000cf44ec1d50b39286a32929c89a64320299a70f10e44da35d942e7bb8697a9d61eb6a551f74bd15349cf0b439369aaaf12d175635a
 EBUILD sphinxcontrib-blockdiag-1.5.5-r1.ebuild 923 BLAKE2B 29b6a166090519a8a6d7aa3f381661161429db8e5f912f0a92dcb669ad92b23c550097755ae57bf7024e23fd4b58f3dac496e9f973bb742fe75d083249afd816 SHA512 f5d13643c66e24c6095badf6eecc4072bfdbd41928b2042b901042818229ba21236fd4bb0de71ab6161a5031f861d008b839d1eea2c2b592892a47c52189d875
-EBUILD sphinxcontrib-blockdiag-1.5.5-r2.ebuild 1322 BLAKE2B 985de97e36f3531ac5b3ab35f5e868ae5ae1caedd468544b7e255c67d04b697254ec2220c110ac5fd3622b06e361cca7550c08ee90999c557ca6c1eff9466a01 SHA512 0c97a3c79a693911ff35a6a21c5ca74ac79ac472a0a31496c44bab722c6cbe4283d8039a1a031d9c30e8a3c5854dc29b6b3561b629bcbb45cde19b368e20e80b
+EBUILD sphinxcontrib-blockdiag-1.5.5-r2.ebuild 1332 BLAKE2B 1729c17b7f5be02cd93fe1c0ae8465e6c1f3467b880ee35abdbe0ba44a90d2a3bd68013cd514a4963a9fb67d8a30ca4271972e26c4a73f68dcda3855be017861 SHA512 8e5c0bba10fb943b1ce19e27563167d49b1b1b64152f89b8a9838fda452d57abd2eec66436e10d1d4514940a3b8f817ec5f51d13a902b9d63cad710ad0e60e58
 EBUILD sphinxcontrib-blockdiag-1.5.5.ebuild 674 BLAKE2B 58d9d30ab0ac583c6414fb8a650bdc1bdd37ea55a942fba667cc0bdcd2618d842518c694636ef5d1a09990b36375c1e6ffcc68c68dea88f6d5e6e33ce50a31d7 SHA512 ac98f936ae0824a53ac52a3cbe87b10a67d44c938eef071ff2bcf3e8c9996d32b858acb4777adc39a0d730261dc35278479479fbffbf41176552373312235fb2
 MISC metadata.xml 494 BLAKE2B 07d540997f553498944f9ddc98afa804bf1dd6e4cce5447aa8d7990ebbc375813cb7d9d284915d7bbc181b12cc905923a1b858b663743eb408bca485e40ba22b SHA512 f83022805ed92e559cc35f663da9eed77d33fbe0d25bba287b77fa53235c14534493c493d107af0ad9573d6cd7fbfafe74017fe0b96e65afcdd45c5e3761fdde
diff --git a/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-1.5.5-r2.ebuild b/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-1.5.5-r2.ebuild
index a66bb2552775..693d406f910d 100644
--- a/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-1.5.5-r2.ebuild
+++ b/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-1.5.5-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/blockdiag/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/sphinxcontrib-newsfeed/Manifest b/dev-python/sphinxcontrib-newsfeed/Manifest
index 20fb00ac7cd2..0efb6255cd2d 100644
--- a/dev-python/sphinxcontrib-newsfeed/Manifest
+++ b/dev-python/sphinxcontrib-newsfeed/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-newsfeed-0.1.4.tar.gz 10862 BLAKE2B 708c7a725ac36f54ea735953ba9d230b05da95147eabc91de9d610d3e02ec7d0d1ab8f5882d4e97327da425fc49e1b1a1753e011445ede859edd4f3cd5fb2a16 SHA512 96d9d0c15fca8b62f945bafc8f0eafa62df9c471f7510e2f153e47b66534e5f3041e5c01df772e6c35a9f09baa70064642f7f0fa43ccfd33dd64c2604494f2fc
-EBUILD sphinxcontrib-newsfeed-0.1.4.ebuild 827 BLAKE2B b9378fd412ff863993f7a7d48f9527ae7798f6056ebfe9c4b9c65bf559066747143703bf0ee83a9e361467e5187bfc8ed3385882b75906cc4c3e6ac30527f213 SHA512 3b400e6b75e7f172eae9b096b39a3e8f3e1c63181fcf96b635fedf924e09ecec4a1125105b4a34b5f412a378d4705c53559b01b9aa473385b4ae14f62fd834b0
+EBUILD sphinxcontrib-newsfeed-0.1.4.ebuild 825 BLAKE2B ef5cdf356731e9d3d252684ffe6c8d705bbf3625ba6fa8d0855deb272a3d2d16c1db10bf41bfb47bb5de4adccd362bda3e2b92c3fa7414e1b5e5c4bf589b724e SHA512 3dd49fa315a75fbc37cc0b38ad3e161622362c567f39f331afbb62bf6ca5139ccbe42ab1b0394ac418c3ede92a0196885d0796c5878534f2e5dd43a3fc64322a
 MISC metadata.xml 326 BLAKE2B ee27050dba4cec236f08ae168f2cae643f35f0e20e20d0803f7783694f4f6c3289faea1df4ae326dba6125eb6b7f8d275f449769b76220eca973bc5fcab11e45 SHA512 e47c6ab16713c27cbd5353250642751d73d39bded06b14a6571c2221f9ced2f73c6f33156acd1622789a1aaab6779a49bb85192c130e77aeb3d05d9a1513c69f
diff --git a/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4.ebuild b/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4.ebuild
index 200775feafac..4218c7aeb85c 100644
--- a/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4.ebuild
+++ b/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/sure/Manifest b/dev-python/sure/Manifest
index 753337236d99..55bb786d9e5c 100644
--- a/dev-python/sure/Manifest
+++ b/dev-python/sure/Manifest
@@ -1,11 +1,7 @@
 DIST sure-1.2.24.tar.gz 28089 BLAKE2B 2de015513f36fe101ea1d23a8499bbb06cf54d733bb55d99afc0eea274d1579a155d4d81e62616e655254d885d9fae55c6897560b2a845beca2c90a835d1c037 SHA512 875d2cb220d8915737909df372bedc2266c5c948c6f5ea23f3de5ee57b0f1179d2a0ae3455228d71a4f0f4279c098bb4c142a862b55462d67fd425c0def49a8b
-DIST sure-1.2.3.tar.gz 16921 BLAKE2B 5bc25992a383f6ffdbaacf7f40ce904e19b7c5ccb68de23cf1a876ffb59ea105482264fc17594822477772a084ffb503f54d393566e1e87e15bbb6494049fcc7 SHA512 79f9e7639e468e61858d70cb3184c44e9de30d1ecefb4701e3a305b9fc231b9a4df27e795f8b31da6ddc221ba002bc83dd59621e7f364598c80b831a4bcc9fa9
 DIST sure-1.2.5-r1.tar.gz 52128 BLAKE2B 8370bccba9e9345030dbacd91758dc1be8d122a95079f20676e7867b5c51e335ccf3a41913dce13804d805136c98255605d757f76362e8d3c08c6859a9336129 SHA512 733df3a9482cc23e5f078b554a80a726ed87f4ac307b00166d5ad7d8d40de47fe7d77a7373b213d75fc78849a2ba0dbea89f71c6f29449f52eab448fdf847c45
-DIST sure-1.2.5.tar.gz 19048 BLAKE2B 1bc23ec9695103e05c2ec0d8598a8f5014d41b7afbebc94e29d159bfaeb4896bdd84905cb43a4044417198a0fe41f8ec0bd0fd488c5de6dc966cc6125416079e SHA512 41f097318093b7e1683c38cae7aad3551bcc4e82918d3005388ce660c81a014b0939d3ad9dc12905c50892c82282c3e90aadb01ca7600b593d09afa2549c7135
 DIST sure-1.4.11.tar.gz 45933 BLAKE2B b2146ee56237f4575cab5122279023066a1b9ba20493ced7d729b1afa456f71a38071b721c39594c3ef2fcc912ba934e85e5cb5da576c3b2d20fa7d4926b56b7 SHA512 ed067385bf9cf317a5d55f6c5fc6ee54ee3d592825be398e47c37d31fc9c010cb9316d4e2bcf1d72d53d7e53fd470792d64348aa2bfa5dc43510daaff97742da
 EBUILD sure-1.2.24.ebuild 899 BLAKE2B b6ec26f55e0b5eae6287b2a9dc9f52147aa55aa60956a2e7fc87913856acf9c7e7514d68e0dc8caa9af10513905445c954349b5b97135804ca908bd817a5be59 SHA512 20c15fa0111a24af9c23a9fa4d4c235d816d110f4b5c5fe48b724033281dc375d0bf419a329bbb52e4c263b671c78064acfa961ff79e4cc9663fca5559ef35cd
-EBUILD sure-1.2.3.ebuild 462 BLAKE2B 742545bb12249769c4ce0b2a247739bcd07d6a108d993abee31bc7344e8283d01a9447b2484986ea17569ce04816b46b10a5b26fc39c4d544f0a9f67d240ace7 SHA512 20aa3671374141221a822ce12bce5dec56b8b5bfefab1e15ccd9b85c33dfddcc89c43fd87078c5c0ea9597e7f33c382ac04b4aaa5aa3fc04f6d8f19174678116
 EBUILD sure-1.2.5-r1.ebuild 865 BLAKE2B 7d697928ca942b3db71a54ebce989b465aadc1abd542affdc285e51736d909e31999a9481c5eccf612634255947005fddf556527bd907e51500a4db478155b74 SHA512 bedf200d5c5b5e306387aec2d95e30220de722e0dcac89493b8eb560feec3d92157175e316fa1645fcf25af2c1dff586d4f69fa2d726e8b7c32e9ae27083c2f1
-EBUILD sure-1.2.5.ebuild 462 BLAKE2B 742545bb12249769c4ce0b2a247739bcd07d6a108d993abee31bc7344e8283d01a9447b2484986ea17569ce04816b46b10a5b26fc39c4d544f0a9f67d240ace7 SHA512 20aa3671374141221a822ce12bce5dec56b8b5bfefab1e15ccd9b85c33dfddcc89c43fd87078c5c0ea9597e7f33c382ac04b4aaa5aa3fc04f6d8f19174678116
 EBUILD sure-1.4.11.ebuild 739 BLAKE2B 4b5660f738aa9a3d3282333f1c883af1766ae2bcaeadc0f45616092db60db1d298556a72067e6e0e6cbbfdaace9cc59bb24c88b5160b232c39892a48478a27ad SHA512 97d9624d3e702d0c6c56b89cf406fd814e2df50ba0f03a8c5a00deb60b564049eed1e9b9660a2895202db156c4e423f3dc2dd461712152bcd873b9d29f2bcee6
 MISC metadata.xml 580 BLAKE2B fd57ae5f0db3af8fa1a3752dbc6c5c0d2f614b19b3a791e416fae0e4500f0a3ec8f88a45b46b37745f92d7538f54846379b8ccb8d3cf6afb0cbd613b0eb4bf40 SHA512 ac9536e4de1fd74d326af98154065afb9a42e6b29b5ea2bfb22987be15da16236aa2dda813257be53158edb426c021e4e6a0f954299c64fe55be08f5b0f3b8c4
diff --git a/dev-python/sure/sure-1.2.3.ebuild b/dev-python/sure/sure-1.2.3.ebuild
deleted file mode 100644
index 548465031291..000000000000
--- a/dev-python/sure/sure-1.2.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="A utility belt for automated testing in python for python"
-HOMEPAGE="https://github.com/gabrielfalcao/sure"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-LICENSE="GPL-3"
-SLOT="0"
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/sure/sure-1.2.5.ebuild b/dev-python/sure/sure-1.2.5.ebuild
deleted file mode 100644
index 548465031291..000000000000
--- a/dev-python/sure/sure-1.2.5.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="A utility belt for automated testing in python for python"
-HOMEPAGE="https://github.com/gabrielfalcao/sure"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-LICENSE="GPL-3"
-SLOT="0"
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/tagpy/Manifest b/dev-python/tagpy/Manifest
index c3a7756dd1f2..c46d58157f6c 100644
--- a/dev-python/tagpy/Manifest
+++ b/dev-python/tagpy/Manifest
@@ -1,3 +1,7 @@
+AUX tagpy-2018.1-readme.rst 725 BLAKE2B f40dbe6ab4f03fe0a6141a03ae6f504d202a5c97d605cb22dfa0b9695374260658f8dde0d49e84de0e7d289bff705beed1244215e70cc7f9d8d587d505322a20 SHA512 0d9cd79986a16ad78e76911f9d3c1b36fb706c74c58e9d29dce817bcf4bbd8b29c9596f1228a0524fdf6538f2c685901a159fd9bd0b629d0dd1d60c75c2820b0
+AUX tagpy-2018.1-taglib-1.8.patch 642 BLAKE2B 45c190b621dda7368583c1ab92a01f08fb84d83666953caa5f05c89803db16dc8cd1668e3b891c757c916d27439c4c3143a8a8a2115ad89a8b2f1806dc4a80c9 SHA512 6a3af752fdfd12f6c5f6e52019f3d4f322b9dc3595e810e93ed43e680c1a2f7728efeb8d1180473ca3dfaa7f548d437c32f0a306882ad7f7072388f57ea42caf
 DIST tagpy-2013.1.tar.gz 151463 BLAKE2B 07d35dcff3ca01061c3df03ceb36d7e3fab6b993d3b85ccd44baad19a7c4232d348f470af7a7ee0ab72cf0fcdfd2cfcfa6086306cb3ab4491eebfcf662b37dbc SHA512 4068b33fcbee2d5037149fda3ad0b256a31187ee35146392d0e187acb1d8e57c249da5356cb396cb9f027ed47ff44016466a1faaea0912494535c631f8271d58
+DIST tagpy-2018.1.tar.gz 145501 BLAKE2B acdda6789dae000ba2f664e4a5582f6218f312bed20ec81c4ea54f358bec70d41aceed6704f392a7a32c39d263da81f9c832922942fa179e1865e423dcf28bcf SHA512 2010baa919adadc9fc231deeb093953622ec54c8b6011e2d6a3489b086032de0a71cc26f42439435f26bd7a1ff069e3944dafc61217abe6ea5e81b01b9d18c50
 EBUILD tagpy-2013.1.ebuild 905 BLAKE2B d0c598ac20460ae56b763da47b214d6dea49c336f2f8c9fd95bd44a257d4e389ace9f5a35a5fb6507951720a3737f226a2ec94dab5e06b81d62560661c55dfad SHA512 ec8c9924d7b9a1809835b1f90bd953ddc53f3ae14dc6a94370e914d867cb9c8c59eb30aa2afe43ab9a83c7e3342101857b10fa4b7e073158a228f4cb93a4006f
+EBUILD tagpy-2018.1.ebuild 1225 BLAKE2B 85cce14508c5d83dc2fceec9ec0d41ce2b18454d0829aa95a1d1b637365e7d804a3dec235616cf889543a69072576642ade86cd3bdf78dfdb3b0615a189ebd7b SHA512 dd723b200c131f55eda99f024df417caf2b6b72cb9161d4c45abb11df085502a9a80fe208164cf9bf5ea8887749fe11b75540a8801ae5b834f0acd2889a34453
 MISC metadata.xml 547 BLAKE2B c5c61e36e108060392467ad7bde0c8869b6df0f55367e528e9165d216f4c9674af13ec580c1b2fe6c231843cddd40b621f816c71e1d718126583085780649d66 SHA512 caf162b52bba166e74c1c1c9a6f157ee44d4b7f829c089dee93b6c84a99c847384ff7cd4f03ce191574e58562fdabe29eb4b00281551227f5d274adc3e7ba2d2
diff --git a/dev-python/tagpy/files/tagpy-2018.1-readme.rst b/dev-python/tagpy/files/tagpy-2018.1-readme.rst
new file mode 100644
index 000000000000..83bb4d2671e3
--- /dev/null
+++ b/dev-python/tagpy/files/tagpy-2018.1-readme.rst
@@ -0,0 +1,16 @@
+TagPy is a set of Python bindings for Scott Wheeler's 
+`TagLib <http://developer.kde.org/~wheeler/taglib.html>`_. 
+It builds upon `Boost.Python <http://www.boost.org/libs/python/doc/>`_, 
+a wrapper generation library which is part of the renowned Boost 
+set of C++ libraries.
+
+Just like TagLib, TagPy can:
+
+* read and write ID3 tags of version 1 and 2, with many supported frame types
+  for version 2 (in MPEG Layer 2 and MPEG Layer 3, FLAC and MPC),
+* access Xiph Comments in Ogg Vorbis Files and Ogg Flac Files,
+* access APE tags in Musepack and MP3 files.
+
+All these features have their own specific interfaces, but 
+TagLib's generic tag reading and writing mechanism is also 
+supported. It comes with a bunch of examples.
+\ No newline at end of file
diff --git a/dev-python/tagpy/files/tagpy-2018.1-taglib-1.8.patch b/dev-python/tagpy/files/tagpy-2018.1-taglib-1.8.patch
new file mode 100644
index 000000000000..90c49a29af74
--- /dev/null
+++ b/dev-python/tagpy/files/tagpy-2018.1-taglib-1.8.patch
@@ -0,0 +1,17 @@
+diff -Naur a/src/wrapper/id3.cpp b/src/wrapper/id3.cpp
+--- a/src/wrapper/id3.cpp	2019-03-23 08:26:04.975722018 -0400
++++ b/src/wrapper/id3.cpp	2019-03-23 08:26:54.438399217 -0400
+@@ -220,12 +220,7 @@
+       .DEF_SIMPLE_METHOD(removeFrame)
+       .DEF_SIMPLE_METHOD(removeFrames)
+ 
+-      #if (TAGPY_TAGLIB_HEX_VERSION >= 0x10800)
+-        .DEF_OVERLOADED_METHOD(render, ByteVector (cl::*)() const)
+-        .DEF_OVERLOADED_METHOD(render, ByteVector (cl::*)(int) const)
+-      #else
+-        .def("render", (ByteVector (cl::*)() const) &cl::render)
+-      #endif
++      .def("render", (ByteVector (cl::*)() const) &cl::render)
+       ;
+   }
+ 
diff --git a/dev-python/tagpy/tagpy-2018.1.ebuild b/dev-python/tagpy/tagpy-2018.1.ebuild
new file mode 100644
index 000000000000..c6309a878ecf
--- /dev/null
+++ b/dev-python/tagpy/tagpy-2018.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+inherit distutils-r1
+
+DESCRIPTION="Python Bindings for TagLib"
+HOMEPAGE="https://mathema.tician.de//software/tagpy
+	https://pypi.org/project/tagpy/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="examples"
+
+RDEPEND="
+	dev-libs/boost:=[python,threads,${PYTHON_USEDEP}]
+	>=media-libs/taglib-1.8
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+PATCHES=( "${FILESDIR}/${P}-taglib-1.8.patch" )
+
+python_prepare_all() {
+	cp "${FILESDIR}"/${P}-readme.rst README.rst || die
+	distutils-r1_python_prepare_all
+}
+
+python_configure() {
+	local boostpy_ver="${EPYTHON#python}"
+	if has_version ">=dev-libs/boost-1.70"; then
+		boostpy_ver="${boostpy_ver/\.}"
+	else
+		boostpy_ver="-${boostpy_ver}"
+	fi
+
+	"${PYTHON}" configure.py \
+		--taglib-inc-dir="${EPREFIX}/usr/include/taglib" \
+		--boost-python-libname="boost_python${boostpy_ver}"
+}
+
+python_install_all() {
+	if use examples; then
+		docinto examples
+		dodoc -r test/*
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/texttable/Manifest b/dev-python/texttable/Manifest
index e30fd5723a75..1745401d2413 100644
--- a/dev-python/texttable/Manifest
+++ b/dev-python/texttable/Manifest
@@ -2,4 +2,4 @@ DIST texttable-0.9.1.tar.gz 11074 BLAKE2B 465738a7b980f2a216d63b268044c1a1b8c0de
 DIST texttable-1.6.2.tar.gz 11450 BLAKE2B 8090914b20a93283ea3d533a8120d4d2c5f058a0e79550b29d4b9fa740db5e309d84a7983fb6665149e3624ba7039b67ff6a553b180b915a348e5b53e793d5cd SHA512 e59275c64813bd00fa5172c43491820122b6045e1a416c917576cbf595c1ec24d146e571708379f4b32775bda904f16ced0e9e15ab7b2dde78a214f26a1c4de6
 EBUILD texttable-0.9.1.ebuild 426 BLAKE2B e888f87140391d701eae59056abd2f60c30991efb1070234ebb2a9b2d39d1dd30a536c316f9088ba55e8cbd09d546a7d90009364498b94f77909a9419d378d1b SHA512 65182f08de9b8b952c60adf04fb87f02220f94ef6dd5c17980c57e7bf020161dd459831ae402a25bb7573c7f1717e83a948909743218ef8c9702708d676c38fb
 EBUILD texttable-1.6.2.ebuild 818 BLAKE2B ea52168c3b5b09ade19f3019f2e5127546f176f15ef7ed8b037cbe48c90113b037eb58a9e045ac960ee8716108ec62086668f6d0e09122fa7aad98779e7382fd SHA512 0bdb37f701ab1ff1706a5792fd2689242342d53f5bd5071e522c5f635b3c8c262ebac39db6f9e5d1815046579ea25fe365356a7271acec8c445b933283b50d8e
-MISC metadata.xml 420 BLAKE2B 8af873837a719776cd0b19be2e7dd63656a8620f65dbd81d8b2e68c35ba17fa7c4ddf95dd60e53bb42912b475f4bee9ebee02b8312fcde789922ae9f08b77b0a SHA512 4c300a07ec0a6062c79428596fb523a220376d603105f5ae25e27911967d3212c60885f7f58d11167afc02f9c63c1ee5d57d20597bafe57fbbda32ff3bcd0740
+MISC metadata.xml 330 BLAKE2B ee4c551d00203affdb9666d0d3f58541249543f6aa6a586fda4b028f3b9c5255e61abdc6ef9faf62d1c6dda4f60afed5c8af2090bf6c54d229681c567ff6299a SHA512 900e4bcdc1580e4dee2ab5298c2b1115e0942d95c410d76dbf6cb062f759fecb3d633d9e7f223e92d997ce88d98c2a3d719cdf7cdcc7625a78cc5b3294c3ddec
diff --git a/dev-python/texttable/metadata.xml b/dev-python/texttable/metadata.xml
index d96bfd447119..0c8b76627cee 100644
--- a/dev-python/texttable/metadata.xml
+++ b/dev-python/texttable/metadata.xml
@@ -2,11 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>juippis@gmail.com</email>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
+    <email>juippis@gentoo.org</email>
+    <name>Joonas Niilola</name>
   </maintainer>
   <upstream>
     <remote-id type="pypi">texttable</remote-id>
diff --git a/dev-python/toml/Manifest b/dev-python/toml/Manifest
index db6db1d41cab..e28277dc0942 100644
--- a/dev-python/toml/Manifest
+++ b/dev-python/toml/Manifest
@@ -1,3 +1,3 @@
 DIST toml-0.10.0.tar.gz 16719 BLAKE2B f7863e9cf0ca5185a59d64010346b4b960c40bc3711d4cbd1ad907d15da823319b748df1a5536465e9f36428bf1599624ede3b1fa68cb420684a52ba137227c9 SHA512 26f26c38ce9cd48305218c2c34c5a5407b00aefc25a933f044bb7be22c23cfdfa3b8cf2da952d17760c4b9038df62e405fa039cc7b63dd3e94c9c312f04f9182
-EBUILD toml-0.10.0.ebuild 576 BLAKE2B 131527c874e6a9de5830e70927ce745ea1eb08ab9ba7fe36d02b3f7fe8a99613dacd23124f8df7808614ea7b301fbc0d2cac10ed92a0c561cae895fe758174c7 SHA512 e080c369558dea5ac4fa2c97d92dc98d85bb5ecc07e3a286029a13b1c84d48b68ed155867f9a7ca360d2f15bfda3727f67cb299cf89ddeb6ca84738ebde225f6
+EBUILD toml-0.10.0.ebuild 583 BLAKE2B aded89ca8ea73e470679795f13f63821d197adcfccbc084a0ab6a01ddcdddf715eea78c1a4395e120d6d107b49ba72e738f11410ce6e25f91fec47a9abf7cb35 SHA512 1f1d0f447da9a3130918d6f561b2b1d75105edf93619e1e001df0b0c777eb598367454372ee98ab9e8034d4dd2d1c5dd9bb674c336d74cceb8d0b2c4713d33b0
 MISC metadata.xml 324 BLAKE2B d9ee23ed157896fac55ab5bddc1cf299572ad05d4b1de97749c0ae196f01515272feea6cbb3e93a71ad908cfb1cdac70a702b2d94b6ef2a74ebc25b044b5c049 SHA512 d5578a5e1e35bb8b263dba80e0f56ee663bfc6fafe052a82889e3d1551a5143345645fcb09107b5115f78a1d40dd4b2a50609a2df096cf870ec6409764d7715a
diff --git a/dev-python/toml/toml-0.10.0.ebuild b/dev-python/toml/toml-0.10.0.ebuild
index ae782ee485d1..33d6dd0e398f 100644
--- a/dev-python/toml/toml-0.10.0.ebuild
+++ b/dev-python/toml/toml-0.10.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~sparc ~x86"
 
 # peculiar testing depending on https://github.com/BurntSushi/toml-test. Not
 # particularly worth the trouble.
diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index ac5bfc8abed8..f8095a4b613c 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -4,6 +4,6 @@ DIST tox-2.9.1.tar.gz 1855982 BLAKE2B 3e2f5fd3d3e45e54f96b0a6fc8f9e98bfba3b48540
 DIST tox-3.12.1.tar.gz 283964 BLAKE2B b7cb2394a721f281552d1f614a6059f7025390a4ea03fd970c85330dffb97f601f0c3f8c9c9b05f86b5b92e87ef80fba48676201550581562b8cf3f1b2afa34b SHA512 d7ed7ce17b03b5c8e3ba95e14f547c8dbb9a04ac38b98fb24c09261b5087ffc83b05e9a03607fa53ce61340a3ba69fc4121622f7fe338ce8ed402d25d59c7e6a
 DIST tox-3.2.1.tar.gz 268827 BLAKE2B 764835d04fb0c17f32eb8e2041b83f90d6a729b781a5b5b95e9ecb1162f1c29ed595d4a6369524b390a31853b8003485b27a3a12d63e84f49e92675f1a9bee13 SHA512 79f5a1c8f6e818fbb8444754e3767d880fc1fdfe63b46c518d37440fe2b2f3ce572865aff83d9492c24486fded49893cc31bd9b11254bac4db507260304bc76f
 EBUILD tox-2.9.1.ebuild 1307 BLAKE2B f9523dd73e57889bc345f1e6d9e47a70b5c63727bd029fd0cdeeba79ca0e6c523248c845270035d4e26d70f31ea788fe94e2d69529bb99625db2a1f49880553c SHA512 09987e74d9cdf82fee990dc7e1813ed8df54a8ffbc157413c6fa0b61763853640066c108b78556601d16f278bdd303d572f4721dcc8dbcd7f4183187f4fe4692
-EBUILD tox-3.12.1.ebuild 1419 BLAKE2B 1f0e72e54f89624464ae9f46c70f0d61f584b9e2523e73795e612b2022cc1244ae8802e2be685a549e7a9469028b482b7bd31fb6fea3852144b51a63ea3a0992 SHA512 57a64b605d495e672f780902d2b89af27f625817f133e9250e62131652fda714d302d86a54cafa91bec6addde00ab66744ae44cb9350220754816fbc31f48056
+EBUILD tox-3.12.1.ebuild 1426 BLAKE2B 15589a21a935bcf10acbd34b31d7ab9e1802a2103f0f808e79e68b6f4f15980d3a9d5e8718ed18b3735a2e51876d6908ba95fef9c5eb7d90ba06747f5fca29c2 SHA512 2a8c3a43627434aebcc32ac8b7b3d4ccde437ab0e850c81bfce73df659e3593d00a9518c51e0edea1cfa0af445cd79d76024bbae54e97d847afae4790ba5222f
 EBUILD tox-3.2.1.ebuild 1953 BLAKE2B 20ef7befbe5fced2de522b65745e159fdbdc323c887eaad5feeda601bc68180651716913e8c84a5fe778a52ce3dcd0db2b7ee76309cd3e7583c2b90914c0ad74 SHA512 255146b77fedd2a709cb6b0bffeac1469811028d7dd806219107139bc27a171826dee2cb0d65672e8e206cd8c0d37fa5d84dab8d81b53aa6b5627b39a9e0e376
 MISC metadata.xml 357 BLAKE2B bdd98bc9f7cc557df1218d1d6c6dd6c0b77fe41ac2e7133728cec5e0709059b60d778fcc958c6932996dd6776c89aeb2e5d1059ee92e8aa824296c512145a2c7 SHA512 8955a371491a0ec5c85704134be03aef40584281a4c7cc74b3d63a0820050692ac7ebeca042b8847fe415170d83dacb27bb51a1d545da0ee28e77c7e405e59c3
diff --git a/dev-python/tox/tox-3.12.1.ebuild b/dev-python/tox/tox-3.12.1.ebuild
index 00af2159a863..60b49b252a61 100644
--- a/dev-python/tox/tox-3.12.1.ebuild
+++ b/dev-python/tox/tox-3.12.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/tox-dev/tox/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm64 ~ia64 ~sparc ~x86"
 
 # doc disabled because of missing deps in tree
 IUSE="test"
diff --git a/dev-python/translate-toolkit/Manifest b/dev-python/translate-toolkit/Manifest
index 803c85066c92..a7a0c06338b4 100644
--- a/dev-python/translate-toolkit/Manifest
+++ b/dev-python/translate-toolkit/Manifest
@@ -1,5 +1,5 @@
 DIST translate-toolkit-2.0.0.tar.gz 1106464 BLAKE2B 419caa924b36abd45cd285a28594dad7d1d49dd149961a686382f848e85d6bb15c4cbf52b28881efa7643a9470a51d2c00c57ce52c153a113296344054e31038 SHA512 a349f64438683bb00a7a7ba0537b7c9a268e6222d2df67991eb5d47b05a446a6049bf42918edc97ba8b08a89a42850eb37f6b4b917ccf5c44494885a853ffe1f
 DIST translate-toolkit-2.3.1.tar.gz 7668931 BLAKE2B b8426c06cfd01d6afcc88b629cf464e6fa91a49a6a3399cdc693395f67677bc8eeb4bb1ce0b5a1653ce0e6cafabf76cc102ab462d0482cbf311e5369f65df678 SHA512 8928d1d681dfb4cd9100ae6128f6e1d7e85ff518e6f529c37d01e34679470e9d964c08dfbb902edc23403ff6f6912d0a4236fe0cb21819d00d9ba46c3009ace3
-EBUILD translate-toolkit-2.0.0.ebuild 2124 BLAKE2B 6f168f4695e08794ee2e119161b461d395f5716c8b890d8de03379cb14dac91ee29453901e22799c37b396eed6489a987ed86d3c0c4075654f41812098ca051d SHA512 d965826040b3fc028f220f27e1feae66f93cb16a6c2ed4dc60e9620633147cab13aac6d5e534c851c4c664560ec3a0fde09182892ce4238c98f77bd9081c8495
+EBUILD translate-toolkit-2.0.0.ebuild 2123 BLAKE2B 373d36db17a6d38bceeebb03bd3dade8b2165c45358b87e0c9ea7ada23d53b27f0d00d2e16f5964c77f86be83eb4f2ac47cc114fad2d489ae6e45d803b109687 SHA512 9961aae2b6fc8b6c0efc505b0dcc185c088d0ced6ef120520ddeb8952985cc892ae381c7da9109b49bba55f38bcb481cc113579270341041f0bb7545ac69c51b
 EBUILD translate-toolkit-2.3.1.ebuild 1972 BLAKE2B 42c198a1ae055f866519bececbafe557786fecf4b80aacce68325cb394c6529dec13ae00ebb88e70861713f5412b5217a1cc14e07b5de4c08630f5aae9cd7fad SHA512 9f95d9710345b309bd131724440facaf79da97a1c9f223e75101849b45133b0d4855352bcb92b0be7181f0c77f329460d6cf037d1fed68d0d42368fce1481dba
 MISC metadata.xml 666 BLAKE2B 8f550fcb2d34ecd84e4125645f127260c154022bd7cf03b7742313632627c207a476f1e4a98c83b5d5890beff7558ec548f16c675135822d790146c842bec04b SHA512 34bae48b0be0aa5ef195757bded33736a051ad563ceac7be514bee3b54c67637f308d7a7844fa0657bbb4bc6ad987bd3ee9b04d65d16fdbd6d5d7791e4bd155d
diff --git a/dev-python/translate-toolkit/translate-toolkit-2.0.0.ebuild b/dev-python/translate-toolkit/translate-toolkit-2.0.0.ebuild
index ed9150238742..b2ad89f0d1e2 100644
--- a/dev-python/translate-toolkit/translate-toolkit-2.0.0.ebuild
+++ b/dev-python/translate-toolkit/translate-toolkit-2.0.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc +html +ical +ini +subtitles +yaml"
 
 COMMON_DEPEND="
diff --git a/dev-python/trustme/Manifest b/dev-python/trustme/Manifest
index 96d551330ac8..84f2b7d420d5 100644
--- a/dev-python/trustme/Manifest
+++ b/dev-python/trustme/Manifest
@@ -1,3 +1,3 @@
 DIST trustme-0.5.0.tar.gz 21232 BLAKE2B 3804fe4e9b7049da0bab926bb1180af6bbb8f882cfb16109bed040ca50c85e7b83b5468c3388dd8478ee9fc6478523bba98c39b74cb76c86a72761a26685122e SHA512 7ce5041b8d3687fa462fe93e55b2f83549ab805cec4a2a94c9178a02af557cf8900fe6c05bae0bf100eb36181952fb2bc31cb1d4d6ad6ed2fd2b0706d569518f
-EBUILD trustme-0.5.0.ebuild 925 BLAKE2B b123598d85677428c4ed65d8ab7fb20574de5443eb6f43e393a4c3de78e343ba7afeae25e68e8cdb594f45bfd064955cad9789770f5153d0d49dfc4bbfa36b6f SHA512 4e37ad7c44d60930380bbdb8a9392d30946634c81c473af02618d8cd123f68fd9c2acf1d5b163e4bb22217e6add690766b9026c41461f14c53ce2e6534603833
+EBUILD trustme-0.5.0.ebuild 935 BLAKE2B c852809a40a3fc5cacbde6b1b4d720ccf5c219c620f0ca62372c276d6aa69504401c25588c6dff68945cd34278db3fa39f952e7bd340f7ac18f839b184c97487 SHA512 7c13729c43a8d8f44cba8fb40682055f7b545ec878f6ca8bac7f19d5c4bad7671863f32b0a50eefb68008ef8d26b48a1c16c05e83b05170c9f7fb29527d66be4
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/dev-python/trustme/trustme-0.5.0.ebuild b/dev-python/trustme/trustme-0.5.0.ebuild
index 50fd9fa9611b..d316b2809a5c 100644
--- a/dev-python/trustme/trustme-0.5.0.ebuild
+++ b/dev-python/trustme/trustme-0.5.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 MIT )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="test"
 
 RDEPEND="dev-python/cryptography[${PYTHON_USEDEP}]
diff --git a/dev-python/twisted-web/Manifest b/dev-python/twisted-web/Manifest
index aa5c728a3b0f..8703a0853057 100644
--- a/dev-python/twisted-web/Manifest
+++ b/dev-python/twisted-web/Manifest
@@ -1,5 +1,5 @@
 DIST TwistedWeb-13.2.0.tar.bz2 403931 BLAKE2B b003889c566b9063ffbef9eeb3f98af22eff4ba1b10cf2db1eb76ff3da08ac45d3892790943348c0d1cf4a28d8e66050aca9281409b47e48df42ec036a25e1af SHA512 69e721ec456214d000f88268340b7cf21186073af11e7f906bf95c9a1bfaf49fdc5832b4e39586ebdddd3f1378bf823ab147de58d7aa9e8491a2561a54389a1f
 DIST TwistedWeb-15.2.1.tar.bz2 231092 BLAKE2B 2bd561f973f0ce8ac67c1ee947f07b9b4fb82f7cff6e543ad324d8ef3e60d3be28b6290abd173362d49d824d4d4c23223361d30d94702176c385f5b9a7c048f3 SHA512 e2b155deed9b240f92f173e0fb188c1538ef2275cc6564b838dac8a5ac4c460e664791623cd3e3cde996b63f1619eff8d62636c2813e8b81da5054b8eea365e1
-EBUILD twisted-web-13.2.0.ebuild 1127 BLAKE2B 2206089f97d40c46130bad092e1a4618137abfc3fde48fc839e106ee7d394a574024c5d767550a24c7024a664e8062ac82e83571d6572df51e7d1acd121ecb84 SHA512 20d2f5bb58c1e9974d2606f7eac40639d99a1c446095b14d89e4b905442349c4573b59e26bdf33f2cbcabcc1800cd30a99562ce9f06d9a391c8e90f327ceb617
+EBUILD twisted-web-13.2.0.ebuild 1130 BLAKE2B 2ae4a86f0dd7c25d8458758a81bba58dd70a152093b60513ee480c957326fb2d35d48dc4ed44a01b1ad9329bea863e29655773dea155b0d0c10e42195b948f29 SHA512 10fdec1d3a5929b14ebecc36e82bfdb20c2169ca53182da308c8b3a0f1894664950cefea32d4d2346790818d5bcae58f4e98878250727d4c2abff8e92870802c
 EBUILD twisted-web-15.2.1.ebuild 1124 BLAKE2B efb3d72f351e6f27a2a3984e6cd4510662acba62f00edf59a8c66bf4832d66d7b16009f2e961cfc79854225af55097f24a03e4a7659e2853ee12f6fe68368233 SHA512 79716ae8b4e2710e84eddd7214e8fe788d6737e931898af37a4919d8c47d7f67fb6d6918dc6a66d32a33928eb79680ae0eefe9e13ece470021f26fb85c074cf3
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/twisted-web/twisted-web-13.2.0.ebuild b/dev-python/twisted-web/twisted-web-13.2.0.ebuild
index cf18e709ba5e..eeed9b823c9c 100644
--- a/dev-python/twisted-web/twisted-web-13.2.0.ebuild
+++ b/dev-python/twisted-web/twisted-web-13.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -9,7 +9,7 @@ inherit twisted-r1
 MY_PN="TwistedWeb"
 DESCRIPTION="Twisted web server, programmable in Python"
 
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~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 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="soap"
 
 DEPEND="
diff --git a/dev-python/twisted-words/Manifest b/dev-python/twisted-words/Manifest
index 415f3355bbeb..332e2c72bbab 100644
--- a/dev-python/twisted-words/Manifest
+++ b/dev-python/twisted-words/Manifest
@@ -1,5 +1,5 @@
 DIST TwistedWords-13.2.0.tar.bz2 176411 BLAKE2B a8972dc504fd03a5d3eda5a6c908989ca6561124617b12cca5b1379fb1cf5ee37aa52c798b08023d1e381e4738c784091188c2f07952bb2192ba25d027907b4c SHA512 84ff45f86a0c3d7074fdfcd01159833b461780b75c5135d7a1cc2b3c4c918ad2299c217e8f5ef8e9a71f87a005ec1037fcf870e56601fcee50347ac2e1c39105
 DIST TwistedWords-15.2.1.tar.bz2 168483 BLAKE2B 55d83e146b83212ad42d25479fe59b88f885e948127ee7f52afe69da9d5513ee709c7ad8bcc564e1e77cdcfd63f3f1592624e7dd7d957bc18a753a94a4ef76aa SHA512 aca278a69f5c4deceab0e6f1c6461186131e4b9e7558970175cd5a70232eb7096c3c10fd300a9d22612e97dceeba71765118af45eed7a610678f66d9036452e7
-EBUILD twisted-words-13.2.0.ebuild 499 BLAKE2B cb080062e56854f25138376478f3c04839007a3bdc6d22b306f31083add9461216130fe46cfc842f00c8d3e9e855ff26ca784ef29db33d65f8e025fc26527d1f SHA512 bab25a6be4e57772d5d6b3efe34042315c03ec428205c17f9acfa2554cc1396f2c3962774aef6d0585b65df5a2e719528d9653d222caadb5e6b3aad0930ba38a
+EBUILD twisted-words-13.2.0.ebuild 502 BLAKE2B ffa14d29f581742a3761f93eae1630cb02e89a49ed4eb9edf753f0b41886d6f57c56114259eeb7df8a570e83e34eb1bc5be15997e6119bdfd6a946531d09ce7d SHA512 305f00edafb146c4af17f7c17594c91a276af3309eb6828c0e3231cf6b57cc87e789b91fade2716b926b4017e7effc476f19996c67f53e972751f08b9668f8c9
 EBUILD twisted-words-15.2.1.ebuild 505 BLAKE2B 594e0685ed44c0956261489557532545dd284459bd426e945e2eb1defdcb682a7cc1876ded9b943c9bf15b801864bbdfbe17819008cb8d2d1f74df377e3d4cdd SHA512 0be3a1b8121cb6aeb821baddf9a156c849ad0f9ae2de6c30139e00915b181f1a69aab61222f6ca879c29dec3f9bf0a91643c4cfb49e64f382bde9132a0de9170
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/twisted-words/twisted-words-13.2.0.ebuild b/dev-python/twisted-words/twisted-words-13.2.0.ebuild
index 3ab879eaa8a5..817f04c70b5c 100644
--- a/dev-python/twisted-words/twisted-words-13.2.0.ebuild
+++ b/dev-python/twisted-words/twisted-words-13.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -8,7 +8,7 @@ inherit twisted-r1
 
 DESCRIPTION="Twisted Words contains Instant Messaging implementations"
 
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/typing-extensions/Manifest b/dev-python/typing-extensions/Manifest
index 3557b44e99aa..62ba0be8d1df 100644
--- a/dev-python/typing-extensions/Manifest
+++ b/dev-python/typing-extensions/Manifest
@@ -1,3 +1,3 @@
 DIST typing_extensions-3.7.4.tar.gz 36058 BLAKE2B f9e5efe9a7d51beb683bd4a88d7c1cab247b2c4cfd300131591bd04837dc15af277a8725c04566b9317be577f8f11e330f2d0169b52c3e9f92a8d3140e9e69d0 SHA512 82c15e6e67dde23456c3b01705729804dc21bd2088dee3aa63e53a5e597f474d34b1a37fb16bc5e3497f93d338c0115f49a070621523fb0fa3e994632785c6d9
-EBUILD typing-extensions-3.7.4.ebuild 804 BLAKE2B ff4253a32643dc8e7c05c3d7307a03dc3a6767f55c4c506834e64cba79eb174077e3ecdc48d73e0f3454dff1dee991383d3ec531e9f94101c253e272314b40fc SHA512 e1284d6f9c080ddb72e033953e4cf36effe1e3fb5d9ef68934ac19893f097b2801ff65cd189d53a6c5ded2f5ec2d82da66745116992d1a361ab4cdabd8a99430
+EBUILD typing-extensions-3.7.4.ebuild 802 BLAKE2B d883475aac2888afb8947ec827be840395df31e4ec324e17310b55494901428b4301746032fd1c681899c61bc96202bf427aa5ffb9ee1a98e3c6cfb053a1969d SHA512 8945055e1fb43d2efac9ca59d4dd475f384226c44560d9075f178560170b132acca87f3093f68027648f8d7c176595039e07a9773445fb011bc9ebe87f5e20dc
 MISC metadata.xml 309 BLAKE2B 22c8c811a8b91dfcc0b4b8e2b6081e10cefda4e3a37733ac985c7412b71bd995dbf21b43ef6766a80e6decf3a5d9c6878623785eed9fcb817b63a7ca853502f7 SHA512 c483306bdc995969591e21452fd1cb20310e5e9e496b2b4a0ace1c1533023b6225dad6ea156ee12f0045e9bfb6a5426d9a16f05131395b960e529b3194b4331b
diff --git a/dev-python/typing-extensions/typing-extensions-3.7.4.ebuild b/dev-python/typing-extensions/typing-extensions-3.7.4.ebuild
index 84e920351e6a..cfb07103f218 100644
--- a/dev-python/typing-extensions/typing-extensions-3.7.4.ebuild
+++ b/dev-python/typing-extensions/typing-extensions-3.7.4.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/utidylib/Manifest b/dev-python/utidylib/Manifest
index 429d79b4c2a1..ac1e4a917b61 100644
--- a/dev-python/utidylib/Manifest
+++ b/dev-python/utidylib/Manifest
@@ -1,3 +1,3 @@
 DIST uTidylib-0.3.tar.bz2 13809 BLAKE2B c6b495933ecdc21543c79e3ff200cc06ec4ebc1682cf9172bd988a08afef8b69db17eec4b88665aff5dc6cef371f3c665f6de3ffcc1dc515f778b523333c891b SHA512 4503f2a6366e5110740b312df2300d62bb68e1e1032184e9b56dee75995309c76d4f8e5851c73e7c8e08cca7bba9c74436d8dfc0524f115f3abb2bdf5529cc35
-EBUILD utidylib-0.3-r2.ebuild 971 BLAKE2B 8bb5976a8f9204abd89615607aa287356979f941de7f15adbedea97e95b9dc582f0f72e15a4bc56fa538cd81215b01006d7128fdcc9d7c2df311b60b82aa96d8 SHA512 17f22cf4e83cbd7fdae12dbf5d2df1c043e59452a37276ada6d57c5e920fcd7701e8d8be0ecabbc758b5f1abea6f1780061f6cc0b8440324322871048956d108
+EBUILD utidylib-0.3-r2.ebuild 970 BLAKE2B 02aca84cedeb527b3d2a1601d13d8715d3d794b991fc0722e8055ef4ce3761653cd13dae4c9fbe777569fd7bc96b2aea7add931d260828e0f98e50df151e8213 SHA512 d505f5a799f85c9e9a654e02c1595ed84834bf635e74ca34c9c9eae5615f7c9e7cc94c82f5b05716231239332bc3b935ad2cc2cdb92b8ee27a135f92a6143b86
 MISC metadata.xml 372 BLAKE2B 58932a89c0765511f1231a3ea43ac6509792a03b345655f7d15ec306a33a0264d49b32352c57e8d3cc73294c8cfcbd679289011312bdbed55459f6751dabffa0 SHA512 d6602ff98aa2ae6a69cad590ab014cbe5b3f1fc1b28c64e91025140fbecaa78c49d6e45bc8b8b5432b0cfe4c91402db3d3954db92905ddc42c13540a9c1e2ab5
diff --git a/dev-python/utidylib/utidylib-0.3-r2.ebuild b/dev-python/utidylib/utidylib-0.3-r2.ebuild
index fe5dfcb6d60f..f3fdd8dbb5e2 100644
--- a/dev-python/utidylib/utidylib-0.3-r2.ebuild
+++ b/dev-python/utidylib/utidylib-0.3-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://dl.cihar.com/${PN}/${MY_P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm64 ppc ppc64 x86"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/dev-python/vobject/Manifest b/dev-python/vobject/Manifest
index a8b5c1439a7c..9592a545552e 100644
--- a/dev-python/vobject/Manifest
+++ b/dev-python/vobject/Manifest
@@ -2,6 +2,6 @@ DIST vobject-0.9.3.tar.gz 57744 BLAKE2B 01a9083faa7f2a84e2f6f09d9f9f14afb5558d86
 DIST vobject-0.9.5.tar.gz 215577 BLAKE2B 0312a0c1377ce8141e32422fbf9b4dab253398ccf83bb530929ac052537213b065d7550cd0d926a52a00e27271faa942797b65899fcbe3b8b955ca15c6a114a8 SHA512 087b394ad6c48c359ee1cabb90cbc85cb305ed9e65199f33c19f386c7075b70273e5fddcf7fde5356b140ead7a581efd917594e4d493e720c4e1a632f797acc7
 DIST vobject-0.9.6.1.tar.gz 216565 BLAKE2B 3097c3291337299f12d015a75509b0d3f14a1cd452f90e4445c3804d2ac8db0ea5858a3674eb688f66aaa5c048b155675fe36513a78b16714aa7bff2a0fd86b2 SHA512 499f22a1a9e60398a89d3d6fa472a0b4c9dd00b98440a4ce873da824f83cef1b0a5eb9e5051267931707a3eef00a1d3fb83ff63ffe857b403c4ac3a131f18dff
 EBUILD vobject-0.9.3.ebuild 776 BLAKE2B feca2dbcc2838c43bc1feb48839199205c077ae65959a1def6132ac11a2fc5b46159b1a25993b2d4ccc84dc51614f123829e988d64975ca4a20c000a796fb120 SHA512 9ec2c9764f073f6bf2f581396928a978eb56ec6c4bc0eca1763829cd620e7aedbda3e736778f98d1eb490d8a416acde41e219ff30912e4a8d802248428a78c84
-EBUILD vobject-0.9.5.ebuild 789 BLAKE2B 0589d617de4cfb9be2b1019d86fd016459ea6b39737f6a457f2ab2d0cfebb5cc5ea5738f0b67d46c10e8b3e866667eedb7383f521dfc41dd359cfd7038d29231 SHA512 3dff965f4f2dee2ceef483285b81f49f8cb502ae705fd778655453d133a31e691cd598591116da3f4b877375068b6e331b662e912e3ca95731561e99684ac241
+EBUILD vobject-0.9.5.ebuild 788 BLAKE2B 41038a1014cc1bbac7683fa52be4acd5f21ee2cf67b856d8ddd75230afe8c9f2a0be3f94bc95c5a0102eab5128985b2202c5569e89d16285aef8b48dead015fc SHA512 3f57e3514674b059ce20ace6d3034b9123a0be77aae9a470de3dc92480deeaf66aba99a7f65e6e38954fd00128d824cef90faeaa0c3ce364543f7a5734ce187f
 EBUILD vobject-0.9.6.1.ebuild 792 BLAKE2B dde2310cc5a8679b83bcc02a71228093e575a10aa2a335d16a5fe174e08c8b808acb3fa0415c2d1e28fa47293579a01132fb43ed059b59a80f227b8b2664d405 SHA512 83395750d841a666d7fae1cec09a18ca5aca27de104ee8532c9555763c80b00070df77b77a30e2c47bfb6829570ec82cc33d7163b4aaeab9d019dcc8d301e104
 MISC metadata.xml 322 BLAKE2B e0e386d11610176cc9b83ec3e1c6cf3d53306b01dbe272be61538592057e125ae6eb196e60e8c6588d80a3f8413f9f5bbe9e373f7e6670f1bb53bd043cd9be39 SHA512 d50380968c2886e5fb7971f90ee38189b9f325513eb0e0e039638ec0b466b3c54c20be5ac056a49fd28923e061d658200898f26850dcbe2c0d58114c0b732a02
diff --git a/dev-python/vobject/vobject-0.9.5.ebuild b/dev-python/vobject/vobject-0.9.5.ebuild
index 2158c4b9c91e..22e324dd8021 100644
--- a/dev-python/vobject/vobject-0.9.5.ebuild
+++ b/dev-python/vobject/vobject-0.9.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/eventable/vobject/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-python/python-dateutil-2.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/xmpppy/Manifest b/dev-python/xmpppy/Manifest
index 9a8f5a6dfec1..51fa41fe0ff5 100644
--- a/dev-python/xmpppy/Manifest
+++ b/dev-python/xmpppy/Manifest
@@ -1,5 +1,5 @@
 AUX xmpppy-0.5.0_rc1-ssl_fields.patch 1243 BLAKE2B 64ae57e8ae53529d1c5bd36d76195f85574e3c73436d4e09811ee31a7e1f085531d8747174821a9bf5b7ace90ecdb98e871ed6bb1948a7d1cd22bea10da94463 SHA512 4f9065add9da4a1ef66ee13834f0a3f16b9fa8b2ffc5d3938756683ff6ee3b514fd154739e08e471f5ef7eb6331c25abd6c60ec9d56f8a4e1c57521e8510b766
 AUX xmpppy-hashlib_ssl_deprecation.patch 2990 BLAKE2B 42d41ede7f8283ab39f6024a478c082511700a978ff87046efdae7c25116fb4230ddcdf8ca6ebe7dbfaf6bb2e0c5575be700a28caf241314324445fcd08d62ef SHA512 1b085dad2d71daf81d7be877a4710c900895f6725322e52210ad3f3e2eba0ef609119ada5ab6c42a3f880317a66555ba3e13187b06cacd7c454189c4152f67f7
 DIST xmpppy-0.5.0-rc1.tar.gz 84993 BLAKE2B 69cac1653e5bc8a31ed1e88acc89c5f04937d3f1dc618fef85f97167a8f4afbe8ab2d469b718dbd614508214e4074899b7ad4f31c28f6677086c1112f7dfd58f SHA512 53a37d1a8adcdc8a652e4a6efce2a7c35b4c5ef79ee7ae93134ab6d5a74f96647efbd0954eac60c26a2b507fdb7ee3e607427b11fbd1e22290a23793f03b4699
-EBUILD xmpppy-0.5.0_rc1-r2.ebuild 815 BLAKE2B 7efcff6533c512aeeac4e6f982d56072d9e3b2b3db665dc937b58c2f46563da267f8921c15476e3b83e11d4ee595f92eb0df5d586f3d0a5905802cc662fe5eff SHA512 605465389d2a4efb6c698af85f2b2df427995d82213de9847df1097dc80bbe0689fe4eaa2c2feb56a9b44671de96068260a2e4ed3eced5441bb6b2c4a84c8592
+EBUILD xmpppy-0.5.0_rc1-r3.ebuild 811 BLAKE2B 72685e44cf9981e7ad4b5a457f93f0261e371bc162a148a1eed212f08df99e22cde3525c6c9a11a3f5aa22522af93e9c23b8dbf557b39b8c384f9f20356da3cd SHA512 c1f12a039b20db8da4a605c43d1c02310d18f1628b3955f05d956496b7bd9526f4e69febc549ab0724a5d9832d3962c1789c4ccb7acd96345ba8436100d3cb20
 MISC metadata.xml 722 BLAKE2B 146d079cb57b6ba7b69df6b13621ccb3a8af275f104d221f783c3a51ca90b99e9057cf49f9e2ad2f970fea32ecc14e0995eaae31aba7c96d727c5ad5dc51bf20 SHA512 669662f0f5c8f767b221abc07d59eedc4d97762316951bcda01ba249c831a7ef47e90dfd18c22f243e2b8851b7a616128c78036a619ca1a5dd846208e7632773
diff --git a/dev-python/xmpppy/xmpppy-0.5.0_rc1-r2.ebuild b/dev-python/xmpppy/xmpppy-0.5.0_rc1-r3.ebuild
index bdf5748f70d5..3fc1671aa609 100644
--- a/dev-python/xmpppy/xmpppy-0.5.0_rc1-r2.ebuild
+++ b/dev-python/xmpppy/xmpppy-0.5.0_rc1-r3.ebuild
@@ -20,7 +20,7 @@ IUSE="doc"
 
 RDEPEND="
 	|| (
-		virtual/python-dnspython[${PYTHON_USEDEP}]
+		dev-python/dnspython[${PYTHON_USEDEP}]
 		dev-python/pydns:2[${PYTHON_USEDEP}]
 	)"
 DEPEND="${RDEPEND}
diff --git a/dev-python/zipp/Manifest b/dev-python/zipp/Manifest
index 9f3f673969a1..c3149f35eadd 100644
--- a/dev-python/zipp/Manifest
+++ b/dev-python/zipp/Manifest
@@ -1,5 +1,5 @@
 DIST zipp-0.5.1.tar.gz 10763 BLAKE2B 4f70d6ed94203d4b9fb9127930a07797c3cbfa023e0cd472e9d3a18e1877619dbefee654cd0364592a594b6e9e0aabc813e0560695bb18f8e3a64cb4ce76f0e2 SHA512 d4486ae98159677cd481cddb3bd00d5d2237dc94f0f3129b03994800b0e136c12b05e02d2ca7d628043dabce323f34dd919b9ba731549656802527abdcfea120
 DIST zipp-0.5.2.tar.gz 10875 BLAKE2B 97e56b8e1cbff2344ee6b385085e6c821d61bd2c2510ac54e50a3f706515f1e22789168c97599787787b47f09dabe55abb594f5724d1d540f62d8d68fc32e36f SHA512 8c84b620844315ab1f1aa3c5bb29dcdf1271a0139198b5c3d6aa31ecb9a86f0dcef963819403d971ae0461c737312c064572c57ecf32d73dc973a5f69cf0375c
 EBUILD zipp-0.5.1.ebuild 1045 BLAKE2B ba2452da28b41fdc3d8ed0db560f149fe77a4839a556fb8114d13490e51ac6a087665f427029585bb7877003d1fdcd53d9997a5250000f840f06643437cb2621 SHA512 ebdcdfeffddb439985b144ae72c3738d08503e400526cd7f3ce1ee4ee9ad29429904df5d5df3d42807b67c28f51eebe6e66cc2232ca90854fb35f97a3b802016
-EBUILD zipp-0.5.2.ebuild 1045 BLAKE2B ba2452da28b41fdc3d8ed0db560f149fe77a4839a556fb8114d13490e51ac6a087665f427029585bb7877003d1fdcd53d9997a5250000f840f06643437cb2621 SHA512 ebdcdfeffddb439985b144ae72c3738d08503e400526cd7f3ce1ee4ee9ad29429904df5d5df3d42807b67c28f51eebe6e66cc2232ca90854fb35f97a3b802016
+EBUILD zipp-0.5.2.ebuild 1101 BLAKE2B a4a00ba10249c7a843ad1efa9fc01fe60115dca806f73067c58097fb08c6b7f84a685e5f4b470a19700d246ddc2eeb55ee8fe4cb908dd619ef57b7963f2cca29 SHA512 8d80a353b269a7a991b522045038ec8fed38294189b7c71b36f6801b0e34d32b427df7c384510ff83b6aa9d1b433f1f474503a2c2a806f7f1c52820ae7629b1b
 MISC metadata.xml 523 BLAKE2B b2c729977d84466557f0fae273e5463a41fded78780842e4a92899cc79ad8cf2843fe9c397a70f1d7cab8a7ca317a6723b119047323e0be8862b7294afe96b33 SHA512 82b88eb00bb385c47ebf5c5cd560de25e4f865086983fd9a5767b7fb286406dd06273e8a596df31aba57baaf051b7c353f50f445753541de5b15e6a439132381
diff --git a/dev-python/zipp/zipp-0.5.2.ebuild b/dev-python/zipp/zipp-0.5.2.ebuild
index 2d0e62d3d6e3..a4274319df41 100644
--- a/dev-python/zipp/zipp-0.5.2.ebuild
+++ b/dev-python/zipp/zipp-0.5.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="doc test"
 
 BDEPEND="
author	V3n3RiX <venerix@redcorelinux.org>	2019-08-02 19:14:55 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-08-02 19:14:55 +0100
commit	b24bd25253fe093f722ab576d29fdc41d04cb1ee (patch)
tree	0fcf2afd9f852c4d4c291cf8afaa2c244d598105 /dev-python
parent	121ed4eec41fbf03e1998d09eede1bf449da63b9 (diff)