gentoo resync : 18.08.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-08-18 18:16:17 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-08-18 18:16:17 +0100
commit: fc637fb28da700da71ec2064d65ca5a7a31b9c6c (patch)
tree: 326613a08f25851c388715e205576a2e7d25dc4f /dev-python
parent: b24bd25253fe093f722ab576d29fdc41d04cb1ee (diff)
240 files changed, 2850 insertions, 1836 deletions
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index b38d3a636586..fa5af67aba79 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/URLObject/Manifest b/dev-python/URLObject/Manifest
index 895e9ec37da6..8c88df3fefef 100644
--- a/dev-python/URLObject/Manifest
+++ b/dev-python/URLObject/Manifest
@@ -1,5 +1,7 @@
 DIST URLObject-2.4.0.tar.gz 12533 BLAKE2B e5fcd97267ef66124074ddc830c547df5bad026c17139301b0917bdc43d4f5382ec06d8c752cb38f8c53cdb77513a78efeb14241d419476fd291f38bd22de912 SHA512 1334c8d8dbb93f50fb6672ae5c2e1dbb8c880af65c18c96c7bc65bb46ae894ab0696d36236036c1e4434a6e75b692ecd0b37055ef9b55fb50ffbaf13197b1701
 DIST urlobject-2.4.2.tar.gz 25457 BLAKE2B c5d3ed0f38b3fd58ac52638059497cc53347bb378d737f87f2fadf43368ced9450cea0147c49a7cee5b29b4805bebbd22817910d922813882aee5b7f467dd653 SHA512 970c5900171fa64624cd2ed2ba7f3a761057eda5c1fc07f881e8b7c74bde0cbbb7fc6c7c8694d8b8be0e991322da148528d99ff6fb2d4b75e1ddd1c2f474b4f3
+DIST urlobject-2.4.3.tar.gz 26325 BLAKE2B 6c73bab1768d8676ccd7411175877a17a8b64e2498345443bfd8e28873c1ba9aacf158cfcac739d8ae1abf7d7845bc5fa5f478441d6d99530a9395b236b118f0 SHA512 2bd08ba5695c8277eeed154d7f414939e8b471e83f1fc6b9db93931f8e49dea4583036b0b7fb8d820e0b214bdc4bf2fe78987eb6a5c63ba70611aea6365c2972
 EBUILD URLObject-2.4.0.ebuild 430 BLAKE2B 9574c5710b9b8c53c094bb76cf16763b5e0c9bd4508e63401507595199c9bcdcfb6efb318783febf91971453b0257261f80508fce401bca9e8f1c8a8b038134b SHA512 5ee0615f1e67eb0d1eca12a97ae67a3dc16b134886316b32f701f2cf408d7ac5105c8ccf30bfeb34aff69a3f759da97259a4e0c0a0e112694c55b638e4d5a2c5
 EBUILD URLObject-2.4.2-r1.ebuild 747 BLAKE2B fbccb25075878fc05714845bc1c80372b20110b84008d1be916c1d3dcd53462828b617bccc998a6449685ea75d1c509c5caabf20fb7b90ff6675d1ac5afd259a SHA512 6d25ab8ba47aacc760af5fa2c2ef443ccc954ac72928222ef885655597f09316033dfba9059707534d764b414aed5551f30cf2b5b57d459e9339c0b82fa574db
+EBUILD URLObject-2.4.3.ebuild 993 BLAKE2B 2bdd6f1791f39a80214e3db654d1e26c5b3d82d2727d62359b8642922787e76c367a910674f5112751b2fa9cb18cae9a6d5d4d4a5c85bec61a505d379e407675 SHA512 9c50040ea8efd765415b675b1fa96e795c878df0950b104da5b7a04fe9efb45419aab2dd4b2aebe27ba4a0620b8c8f10aef4ffe786ad3d2469c865980911bac1
 MISC metadata.xml 359 BLAKE2B eebe59144ebb3622f044879ca30a76d9dc852f936efffbf8da19ab24912d91247fa06d35787c067931ef1a619b79669635e9420ddc66d4571fb6482f54349e75 SHA512 dacc5d5ba44600cd31a8f4980af6dcb28d00b98ef32e411a8845d6241d4eddc3ed30597d64f925dac219026fe1ad250e6b3b38ae00e912499cf3393dace020c4
diff --git a/dev-python/URLObject/URLObject-2.4.3.ebuild b/dev-python/URLObject/URLObject-2.4.3.ebuild
new file mode 100644
index 000000000000..52b54f19514b
--- /dev/null
+++ b/dev-python/URLObject/URLObject-2.4.3.ebuild
@@ -0,0 +1,41 @@
+# 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} )
+
+inherit distutils-r1
+
+GITHUB_P=${P,,}
+DESCRIPTION="A utility class for manipulating URLs"
+HOMEPAGE="https://pypi.org/project/URLObject/"
+# note: pypi tarball lacks tests
+# https://github.com/zacharyvoase/urlobject/issues/39
+SRC_URI="https://github.com/zacharyvoase/urlobject/archive/v${PV}.tar.gz -> ${GITHUB_P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+
+S=${WORKDIR}/${GITHUB_P}
+
+python_prepare_all() {
+	rm "${S}/urlobject/six.py" || die
+	find "${S}/urlobject" -type f -name \*.py \
+		-exec sed -e 's/from \.six import/from six import/g' -i "{}" \; || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/awscli/Manifest b/dev-python/awscli/Manifest
index 49478eb268e1..986cf7eba417 100644
--- a/dev-python/awscli/Manifest
+++ b/dev-python/awscli/Manifest
@@ -2,8 +2,12 @@ DIST awscli-1.16.104.tar.gz 1186611 BLAKE2B 8f0918b86c37e184ffc8055cb16a02379fd3
 DIST awscli-1.16.125.tar.gz 1201382 BLAKE2B 4412aad3e892527c053cc5baedaf9fcdf82f9c28fc1c19249713d5bbf174ad01ca61e2519702f67580c67ac389359e4493c3ad16646216619516a8ec76f37a2f SHA512 01d66d2baf26377f5315f5b3b0bf52fe6643c0e695e83c75178d819b29ebf3d55b1ad4a4ab4065540fc091d2e12090687a1046dc586715c4021dc30519bf2feb
 DIST awscli-1.16.148.tar.gz 1227053 BLAKE2B 3dd32671fff511933703a418c34df8a0c71bad02ae76391eb279cb1148f7ae989dd1d98a9752a894e81f6feef55781129b82d938bc0b16f7bb0ccb8be0d1571c SHA512 c609e109da24e6d58f8c4bfaedfc6ded593dade51e60f66af4b1885d38920eada4fde8a4f67266931484981a6c6a9bb19ef8c36b3b3915a83f3d933912b6bb02
 DIST awscli-1.16.190.tar.gz 1283492 BLAKE2B 9030c7d1c992b15d816cb611a132ab6cc50e58576bc60120aa1de7b87cd863e530f0b46eecb7fb50f2aeab6e11cd840a330d59ad509f0936c4aab04d26432bdd SHA512 ffea030a45128e6e4fd8530488b9a3d8868915a7eb557144d82fd84e50b3ad73acc4b3217298539cdd3d8ac1ee57f9262930bf009357b21d5f5b4fa70ec021f7
+DIST awscli-1.16.215.tar.gz 1344712 BLAKE2B 408c30ec166d1614a6b877b0d88ce3c41668fe4c0e147c4a4df5652b5c9cd19735da8af857dba5534f84dc35dba1d35aaf2409ff68bfa4464e4abcdd711d26ff SHA512 16168fa034498df09587854e4c628b6b4e5ed589a7c023c2a48fb740715f14a2aba53bafa6dba7d6a16a50292f0bb19027bd5704901a009d95795c05cf71f5b5
+DIST awscli-1.16.220.tar.gz 1363235 BLAKE2B 9db063972092dee9d03cbd6567544df2c8c0fdcc57f447667b402903bd39c46ca61c3ee06e7c00bd37a99bdbc14847a86415ed2eb7621a5f57606c03ac602ee3 SHA512 b1c2d1e8ac41e92735b6b48f112b59ea869c210991511a51725b38223865c57bb64687ad6f1ef03ab620a133bc6afd1e530ea5f2912824097638c46926b7e3cd
 EBUILD awscli-1.16.104.ebuild 1303 BLAKE2B 9184f3902b65399d161b1a52664ba89d00cf6d5e836b1c5788ff445dfa2abd44374948174111770c8083ea529d1510a42ceaaa2a7271a5e3c3b10319b8d85362 SHA512 4096b4edb702e60ab310ae66c82375800961d94e544e5efc203ab489b753511abcea57c6ed5a1868a739ee428a3ccc9861fd3442e45de43fd821f106e298ed87
 EBUILD awscli-1.16.125.ebuild 1303 BLAKE2B 9184f3902b65399d161b1a52664ba89d00cf6d5e836b1c5788ff445dfa2abd44374948174111770c8083ea529d1510a42ceaaa2a7271a5e3c3b10319b8d85362 SHA512 4096b4edb702e60ab310ae66c82375800961d94e544e5efc203ab489b753511abcea57c6ed5a1868a739ee428a3ccc9861fd3442e45de43fd821f106e298ed87
 EBUILD awscli-1.16.148.ebuild 1303 BLAKE2B 9184f3902b65399d161b1a52664ba89d00cf6d5e836b1c5788ff445dfa2abd44374948174111770c8083ea529d1510a42ceaaa2a7271a5e3c3b10319b8d85362 SHA512 4096b4edb702e60ab310ae66c82375800961d94e544e5efc203ab489b753511abcea57c6ed5a1868a739ee428a3ccc9861fd3442e45de43fd821f106e298ed87
 EBUILD awscli-1.16.190.ebuild 1303 BLAKE2B 9184f3902b65399d161b1a52664ba89d00cf6d5e836b1c5788ff445dfa2abd44374948174111770c8083ea529d1510a42ceaaa2a7271a5e3c3b10319b8d85362 SHA512 4096b4edb702e60ab310ae66c82375800961d94e544e5efc203ab489b753511abcea57c6ed5a1868a739ee428a3ccc9861fd3442e45de43fd821f106e298ed87
+EBUILD awscli-1.16.215.ebuild 1304 BLAKE2B 6636b1a295156b3dd5887c6eb734368f516c18812af8472c8954f6bc056d2e32c2c35261c180db714a2cb51e38090245ea792793a72345dfa2af5836c0dfd5ae SHA512 81e65f6f925ab25959a0c22aea53a341f4152be66c2af0168d0f934bff05ddbb57415e45f205325befb480ad741e137cf14f19a262f67d56cab38699dc930bf9
+EBUILD awscli-1.16.220.ebuild 1304 BLAKE2B a4687c4aa3cef1ce9c24d3c84353080684fc5547e3322b161b8216d1255625c137ed3f787a7fc24e12519c0e88b9b5d4a2a5aad450a1e8a40fb10cb2f8a37cb8 SHA512 61d3a69714931f89ac2710365ce13f847bcadf115b89bf30ed951e1347324b4a1316f814cf86f87184c2a0cfc10a353788b13b7db76173b7b2fea8cd1ce8902f
 MISC metadata.xml 316 BLAKE2B 29c8ad67f4e7c5db4439aeae00deda8b57bb36bea7bd6490ae60efaa30cd2db1f7b2cff5b21558cdadea05f9caa8a9f4ee580fe2ea80959fe6ef7ef6f740c550 SHA512 86b3359e64e41ac4f2216e5bbcee6468100df3cd6e9c25595527d6819a2c27ce327797163a3a43bab11516a4826cff47825449cb797d7fe845794700a3a2bed0
diff --git a/dev-python/awscli/awscli-1.16.215.ebuild b/dev-python/awscli/awscli-1.16.215.ebuild
new file mode 100644
index 000000000000..db0d753213de
--- /dev/null
+++ b/dev-python/awscli/awscli-1.16.215.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=( python{2_7,3_5,3_6} )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="https://pypi.org/project/awscli/"
+#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+# requires network access
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-python/botocore-1.12.205[${PYTHON_USEDEP}]
+	<dev-python/colorama-0.3.9.0[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	<dev-python/rsa-3.5.0.0[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.1.12[${PYTHON_USEDEP}]
+	<dev-python/pyyaml-3.13.0[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/aws-cli-${PV}"
+
+python_test() {
+	nosetests -vv || die
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED%/}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/dev-python/awscli/awscli-1.16.220.ebuild b/dev-python/awscli/awscli-1.16.220.ebuild
new file mode 100644
index 000000000000..7d7999f4f678
--- /dev/null
+++ b/dev-python/awscli/awscli-1.16.220.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=( python{2_7,3_5,3_6} )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="https://pypi.org/project/awscli/"
+#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+# requires network access
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-python/botocore-1.12.210[${PYTHON_USEDEP}]
+	<dev-python/colorama-0.3.9.0[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	<dev-python/rsa-3.5.0.0[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.1.12[${PYTHON_USEDEP}]
+	<dev-python/pyyaml-3.13.0[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/aws-cli-${PV}"
+
+python_test() {
+	nosetests -vv || die
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED%/}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/dev-python/backports-csv/Manifest b/dev-python/backports-csv/Manifest
index 48de51b8fa57..57f185ba431b 100644
--- a/dev-python/backports-csv/Manifest
+++ b/dev-python/backports-csv/Manifest
@@ -2,4 +2,4 @@ DIST backports.csv-1.0.5.tar.gz 12050 BLAKE2B b6c5c4b846040167c081166fc4f0f0fb2d
 DIST backports.csv-1.0.7.tar.gz 20836 BLAKE2B c9360890f4ace39564072afa6ee32d5ee5682f1703fbe87eea8b4a04c5575ab5bd63a813f0a86d3c5945429fb9e56693db38a80dec098e4ed7701684f1006570 SHA512 5b82b79ea865381a738f1d77a472d97118f853290fb4fd787537a8dcc7247b33cf8cf507519ad88d55419efa97f86ba9ef3f003b067b1f9cff87e08c2395969b
 EBUILD backports-csv-1.0.5.ebuild 706 BLAKE2B 2366b035e29963930683fa645bc1eecc1ddec161e354f75bc829265d28e4a905720a1cc004574f54ea98f1a898ee70dbcb8d641e5dbb7eeec911ca39b8ea525b SHA512 61815210c9888675624f06a0fa55f5f5dbfc17964d94491e98e910a7b222b615b82f9a0ae6f32f15a796f221a16608730c211ca3566f9656a1faa1d423a9c985
 EBUILD backports-csv-1.0.7.ebuild 833 BLAKE2B b7942210ef8e51fa3c5392057f8f25ee9d7282bc470f968092296f3638e58306dcdd7de6252d57e94a746cac02c26c17af1d3c8494df715e8582651aa95c0bce SHA512 1478acf9333516980c643c0d27d4a8f71958131e1878bc608f8365564ff9dbb87311486c47ee09610b65c96b52ebf3be55fb940be8ee927eb4e001c7ab446542
-MISC metadata.xml 481 BLAKE2B 1d665b2355084e42cbc53d3738075a30c345cce5680d924a98b6895270b45c2c8ced51817065c551ceb260b038a8ab2184eb74d1aed820efa5a348c059a403fc SHA512 9d810ab9a87293ed1148cedb346d7fb94304fb7777cb6d8584bf5ec77f4e507188223ae6ecb4ea0cf007ddc171921b5499064aee1aef1f39e7be9f079c475628
+MISC metadata.xml 482 BLAKE2B fab9cf82120cae287eda87ebacd96e10a0ea271df200cffd224986f04d632f2cfe9ee82fd96dfa404410b8b930686a150ceafda98206b2d638b80ce26cc3c877 SHA512 3973cdc0242a097b7860ed221806a32bbe016a7e554745faec02394f5838f01ed2436569420b30b0410ba156ec0b3788397657aee1465beb983b4faeb1570cef
diff --git a/dev-python/backports-csv/metadata.xml b/dev-python/backports-csv/metadata.xml
index c8bd9d982ff2..51ed615faef8 100644
--- a/dev-python/backports-csv/metadata.xml
+++ b/dev-python/backports-csv/metadata.xml
@@ -5,7 +5,7 @@
     <email>grknight@gentoo.org</email>
     <name>Brian Evans</name>
   </maintainer>
-  <maintainer type="person">
+  <maintainer type="project">
     <email>python@gentoo.org</email>
   </maintainer>
   <upstream>
diff --git a/dev-python/backports-os/Manifest b/dev-python/backports-os/Manifest
index 874dc5329001..7cd7233cbd3c 100644
--- a/dev-python/backports-os/Manifest
+++ b/dev-python/backports-os/Manifest
@@ -1,3 +1,3 @@
 DIST backports-os-0.1.1.tar.gz 11359 BLAKE2B 8c1f9ba4d62d9b6b625d31c902feb7532919a0a42064133ef07756a3806a6423a479f5b3c4c9824ebb421a9e1901d8932aa024ced7dd7700119236c186d11137 SHA512 d17c5f6146401fa96c02f2d848d515a5d1dd587ee2199b5e45c177e1853e21e7e7c205a4d89322c5aada71e3a7b34bc7f9afe8183625f76e4ba26aedf2150268
-EBUILD backports-os-0.1.1.ebuild 971 BLAKE2B d39d9808f99149483247e850cb34996e7a848c68f763f066b0b9971cffb1ce3cf88dccdcff8da3afe6169dee348449e379ff85d4b8d5afc4c83ff4f4a7277cad SHA512 99ff4c3683b0db3d50bd1065e25088614e7a3277e3593cea1244db2c766950b255dbfeee436980c497f1e0c44224c9e94492940e563b1d7df875ac494fa749bd
+EBUILD backports-os-0.1.1.ebuild 969 BLAKE2B 1f184a26ed118a035d9acebdf1296426d320acede70dd369e65597f57a1153fa74b3d30074343c5ec8f8dc1f97f7fc933cbea73cb65b970343c919d02c790547 SHA512 b8f5fadd31b04713e107bb7b5a745fd7c1cd775c80544fa6a75b27789fccf2084955d97b4a4570d0580650536c7c180b55046cb444707748472e79f81bb68f70
 MISC metadata.xml 243 BLAKE2B f40c5d69470d5136cba32e1ea6b2351ca1842a5d83381e0bef3e063e266c64bebb9ba85e1f155010e219b136c2827c989d9adf3b2c6b2f6ca265f03339c9a7ce SHA512 640630eb9d42c319ca1da37b03a03677a3dd4e48f28ce2690b64f6e4e7d5885cfda41d439f3f9d8b009be04891b043a5b0ac6f9d43b701f65c8fcc0e0613b04a
diff --git a/dev-python/backports-os/backports-os-0.1.1.ebuild b/dev-python/backports-os/backports-os-0.1.1.ebuild
index ae4c9631a0f6..2ce1ba7175a0 100644
--- a/dev-python/backports-os/backports-os-0.1.1.ebuild
+++ b/dev-python/backports-os/backports-os-0.1.1.ebuild
@@ -36,6 +36,6 @@ python_test() {
 python_install() {
 	distutils-r1_python_install
 	# main namespace provided by dev-python/backports
-	rm "${ED}/$(python_get_sitedir)"/backports/__init__.py* || die
-	rm -rf "${ED}/$(python_get_sitedir)"/backports/__pycache__ || die
+	rm "${D}/$(python_get_sitedir)"/backports/__init__.py* || die
+	rm -rf "${D}/$(python_get_sitedir)"/backports/__pycache__ || die
 }
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index a7fc48c2f60d..a51452ef1a4d 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,8 +1,12 @@
 AUX 1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch 1056 BLAKE2B ecdf805cd61e337d4152d56952aeb8b78bfdd871b4da060d025ca4e3f974b3b7a907eee71ce6de1bc6cff8130fa81391aeaa2c5537b1baf159ce23500908a5f4 SHA512 c3be1a6457990168c759f03b24de8f78242b9c06f189553e416ce75fee6a77dce68967a551dfd83e1be096db9baeca019b75526c4886c672eca35282e307f229
 DIST botocore-1.12.122.tar.gz 5492931 BLAKE2B 05371245cd0de404713f920d0651f9bbdcabe9508c5e27f692adc4cda7ac2f7fba24b2b95a26b788e4960b01553c1746f08b9db4f38e4629c5703fd6872893be SHA512 f92581ac6b8a46d4af8b55b391e6e75c452f83a4ffde6c940c9f85b2215a3eda44e8b2672f469769b4d9a0d7ac2823540f45c1822279b6264d016986f2b06c53
+DIST botocore-1.12.205.tar.gz 5794632 BLAKE2B dfa0813ee1cd4d6d699fc27f2777da95b1719779bbb84f3d7d61da5c85b76c79286acfe304c598bade8d5320088070d1d69d99689f32f6efb05f04ffa66492ac SHA512 53d3770d8b771f3bbedbc0d6046cebec0b3961550c38ec29be4dd2b8c5f4da0150e70417f2070131746ab5c0df40ebce4ef6a1a2d6de0ce8d03e9928dbeeb594
+DIST botocore-1.12.210.tar.gz 5859196 BLAKE2B 4ce448ea4bbf5bc21b84395188a7236a0d9f18c87c98fa3269185a2d947dd84f78cfa43b1806f51783f6009e1cbfba2d8833b5e3e6633eb3c4185dfd5ffaab77 SHA512 85e0679597935ed13ddd85997156a424df5b32bed1c96c65f89cc9eafd653015f87f261a042574bd8773dc46c76fb38da4bbddb031f20226fdab708c2438b1ce
 DIST botocore-1.12.4.tar.gz 4800384 BLAKE2B 121019d3c33872fdd874ddba36ecc8612a6354068ce7b759cbe7f35a9787e84c34d3a71ef3fdd2d721d3c3973a7600e4398cb7cd2a3ba698464c15137845bdf3 SHA512 8d196984f5623df403a8a23a9b7e7061e59c0ca56103f89d749d6ad7d92168ccae267f85312f2949cee322776d7948f1ecfda3d9d2783e8ba92fde7a178e8cac
 DIST botocore-1.12.81.tar.gz 5383717 BLAKE2B 0bafd6038cf4a5d1fa4f0597024b09eca48ab95d071cccd09b1910ccf839719114166fab7d78bd2b30dec4b4993a0751d9504260636174df5f76f02495e79960 SHA512 d3be22af53a8c6dd55be3fa0b84a55cdce22d30d6e6f04b0bb69539b8107c86de6b5494079e3af40f9b5285ef10c21e69c85295e5cd7c6dc5ab5be91718a2ea9
 EBUILD botocore-1.12.122.ebuild 1489 BLAKE2B ae51526223136a8809a7c834cae3db2b95f940870ccc96b64d7c79dbdad83ca85e235cf169357fd25b4632aa0a87b0d8c7d7ebb739487435518a8a595b9139be SHA512 9c8e8400fad4fc0adef47bfa77767a0e59bef09c98a54492c0f0a56739b65b0689df8cf3702eab42e545a9dd257a5b820e39c31b9f23860f7792940dad4521b2
+EBUILD botocore-1.12.205.ebuild 1491 BLAKE2B a04a6b9d9484a791fae9e3357f4581ff921ed0d1f8ac371762ca940f9ca63ed6fd058286e7d0994cb24c3c24d3ef10c4e856439283158b2d26754a23d7ad5e55 SHA512 2994d917c6b9e77db5e29498055e3a75454ac5734aca70eb5204ddeda5312bd85d4b6daff934e14c94a880c40f8aa05c4060d0b8d69fa243b7af4a8daf14aaee
+EBUILD botocore-1.12.210.ebuild 1491 BLAKE2B a04a6b9d9484a791fae9e3357f4581ff921ed0d1f8ac371762ca940f9ca63ed6fd058286e7d0994cb24c3c24d3ef10c4e856439283158b2d26754a23d7ad5e55 SHA512 2994d917c6b9e77db5e29498055e3a75454ac5734aca70eb5204ddeda5312bd85d4b6daff934e14c94a880c40f8aa05c4060d0b8d69fa243b7af4a8daf14aaee
 EBUILD botocore-1.12.4-r1.ebuild 1489 BLAKE2B ae51526223136a8809a7c834cae3db2b95f940870ccc96b64d7c79dbdad83ca85e235cf169357fd25b4632aa0a87b0d8c7d7ebb739487435518a8a595b9139be SHA512 9c8e8400fad4fc0adef47bfa77767a0e59bef09c98a54492c0f0a56739b65b0689df8cf3702eab42e545a9dd257a5b820e39c31b9f23860f7792940dad4521b2
 EBUILD botocore-1.12.81.ebuild 1491 BLAKE2B a04a6b9d9484a791fae9e3357f4581ff921ed0d1f8ac371762ca940f9ca63ed6fd058286e7d0994cb24c3c24d3ef10c4e856439283158b2d26754a23d7ad5e55 SHA512 2994d917c6b9e77db5e29498055e3a75454ac5734aca70eb5204ddeda5312bd85d4b6daff934e14c94a880c40f8aa05c4060d0b8d69fa243b7af4a8daf14aaee
 EBUILD botocore-9999.ebuild 1491 BLAKE2B a04a6b9d9484a791fae9e3357f4581ff921ed0d1f8ac371762ca940f9ca63ed6fd058286e7d0994cb24c3c24d3ef10c4e856439283158b2d26754a23d7ad5e55 SHA512 2994d917c6b9e77db5e29498055e3a75454ac5734aca70eb5204ddeda5312bd85d4b6daff934e14c94a880c40f8aa05c4060d0b8d69fa243b7af4a8daf14aaee
diff --git a/dev-python/botocore/botocore-1.12.205.ebuild b/dev-python/botocore/botocore-1.12.205.ebuild
new file mode 100644
index 000000000000..f81c7d0b849a
--- /dev/null
+++ b/dev-python/botocore/botocore-1.12.205.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_5 python3_6 python3_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3."
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc test"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/guzzle_sphinx_theme[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	test? (
+		${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=( "${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch" )
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	PYTHONPATH="${BUILD_DIR}/lib" nosetests -v tests/unit || die "unit tests failed under ${EPYTHON}"
+	PYTHONPATH="${BUILD_DIR}/lib" nosetests -v tests/functional || die "functional tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/botocore/botocore-1.12.210.ebuild b/dev-python/botocore/botocore-1.12.210.ebuild
new file mode 100644
index 000000000000..f81c7d0b849a
--- /dev/null
+++ b/dev-python/botocore/botocore-1.12.210.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_5 python3_6 python3_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3."
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc test"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/guzzle_sphinx_theme[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	test? (
+		${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=( "${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch" )
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	PYTHONPATH="${BUILD_DIR}/lib" nosetests -v tests/unit || die "unit tests failed under ${EPYTHON}"
+	PYTHONPATH="${BUILD_DIR}/lib" nosetests -v tests/functional || die "functional tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/brython/Manifest b/dev-python/brython/Manifest
index e0bbcf4fdf2f..46877fe92753 100644
--- a/dev-python/brython/Manifest
+++ b/dev-python/brython/Manifest
@@ -1,7 +1,3 @@
-DIST brython-3.7.0.tar.gz 10334976 BLAKE2B cbbd3b77c1ef4cb5459621e33456ea7e1999428c0aaf2e52f60f4c1a3c737c84649880dc7e06d9f5b19fd4a172982ee3c1bd8df4f2e264818d6e5cac0908bdb1 SHA512 38f42c5c4399317c9a75af3159776d15047d6c09fd89b3f4d244f9077684cdcb3aec2a33304b6fe0005c129291b2b1ecfb0274f766da6005c0ff215751660df0
-DIST brython-3.7.1.tar.gz 9898874 BLAKE2B 2fbdfae401662878138c5315fc821de77125476d1567dcc395b018891282ca3880ec63e377d9ab8381060e54b6d4947f036f75a518ef363b2549d29a12eace78 SHA512 0ab073cd12ae5f2c45a205b37d20d68a996d6ba7247e8a3b8e461158147070294bebba46368c6618771b6bcac11d5a253d63be02cbab1241c11d74ae56d0fd17
 DIST brython-3.7.2.tar.gz 10403203 BLAKE2B 1fb7778a961c68a873033321fdf7a5b24f422d52195ff1f0606384c76007ab87a1949ead2ffcd7b660b544a9833acf90b254a542ea8856510579bacd0be8477d SHA512 76bdbc005832b4980e38ff4bf2fd705291eb06ee6b9f0c4b25a90df9ab4e6da6638990abb37ebf526d064f54823a9b4ff387edd919db69b1eb3bfc8ed27d6290
-EBUILD brython-3.7.0.ebuild 737 BLAKE2B 388ec69293a20ca8ee9129a7e607a9be66fffb389f83c9afd46395fc926d89a1a7fbb0fd6548fb65fc34f4714166113c230dee79d98a718deadca6f02316db97 SHA512 9b1a57bb0cc4e0c1517fa1aeef31a6ff2874ff8242e3ffbb423128f9d38ec7939d77b6e64e27d2728111e7ad370ede61d9c90a515140477e22cb21e474974c95
-EBUILD brython-3.7.1.ebuild 741 BLAKE2B 48eaff3ade0815638ffa2993fa919ff9d3cd956849035fd79fa2799e9b898b9f37ee365aa58e5e71681bc3f94f8292f8f8f05cf81175082b45387720574fa0c7 SHA512 8013d341e474f2ebc39f5b6d47a70c669ee59176ac905e7943dc2c5555f2cc9599fb5e50fc6fe1282a60d96a7f5b93c3dfded839d15f3ebcf3257ec360938793
-EBUILD brython-3.7.2.ebuild 741 BLAKE2B 48eaff3ade0815638ffa2993fa919ff9d3cd956849035fd79fa2799e9b898b9f37ee365aa58e5e71681bc3f94f8292f8f8f05cf81175082b45387720574fa0c7 SHA512 8013d341e474f2ebc39f5b6d47a70c669ee59176ac905e7943dc2c5555f2cc9599fb5e50fc6fe1282a60d96a7f5b93c3dfded839d15f3ebcf3257ec360938793
-MISC metadata.xml 467 BLAKE2B 06e617c5b2362ad41950d7d90d2f3ef25a2858f6c4b88df6edfd6ee01aeb32d1988d30bb66c0d9b0f3c5ed771596678f03aa5c707f016dd1d01259d11f1acced SHA512 a9c3c34e617cc5a3ea80f30c8de8964712af694d8048197662ce2c68d521279761751824a55c68bde5b75444495f176cbcc7d867c46924729391d3488fc3100a
+EBUILD brython-3.7.2.ebuild 763 BLAKE2B 66644fd554fa874e2418ed7abf84a65ad0910ee6b5a1a8a6e992e30a5889a05d4af1feeae9faea69b5b8f100e5e33022884215e617fe3ee7abeb2686517dc01b SHA512 bd6d15c121077acdfbb37138cea0d5f685994d9dc7227061d6cd55126d3a4acc41d9aba8f03799d7121d5a6ef08038c1298cf1e164757e9fc035f343bfd38163
+MISC metadata.xml 345 BLAKE2B ab7c78390c35a156fed3a3507ab979347fef95259f4083a28ba2c925356907158a0e7249cc4e6e46cc9117e418a07a3f91a67ba34163aa5be657ca37bf11b318 SHA512 ff1357bc421a8f96fe10ddc253035271616da444fb6cca11d3b263629c12abfbfc17324d06e744c95c319fe525763ff752db69aa3439edaa3fdc3e7e56c5bb05
diff --git a/dev-python/brython/brython-3.7.0.ebuild b/dev-python/brython/brython-3.7.0.ebuild
deleted file mode 100644
index d035d0287952..000000000000
--- a/dev-python/brython/brython-3.7.0.ebuild
+++ /dev/null
@@ -1,36 +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} )
-
-inherit webapp python-single-r1
-
-DESCRIPTION="A Python 3 implementation for client-side web programming"
-HOMEPAGE="http://www.brython.info"
-SRC_URI="https://github.com/${PN}-dev/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="amd64 ppc ppc64 x86"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-need_httpd_cgi
-
-pkg_setup() {
-	webapp_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_install() {
-	dodoc LICENCE.txt README.md
-	rm -v LICENCE.txt README.md bower.json .{git*,tra*} server.py || die
-
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	webapp_src_install
-}
diff --git a/dev-python/brython/brython-3.7.1.ebuild b/dev-python/brython/brython-3.7.1.ebuild
deleted file mode 100644
index 447c9b9ba91f..000000000000
--- a/dev-python/brython/brython-3.7.1.ebuild
+++ /dev/null
@@ -1,36 +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} )
-
-inherit webapp python-single-r1
-
-DESCRIPTION="A Python 3 implementation for client-side web programming"
-HOMEPAGE="http://www.brython.info"
-SRC_URI="https://github.com/${PN}-dev/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-need_httpd_cgi
-
-pkg_setup() {
-	webapp_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_install() {
-	dodoc LICENCE.txt README.md
-	rm -v LICENCE.txt README.md bower.json .{git*,tra*} server.py || die
-
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	webapp_src_install
-}
diff --git a/dev-python/brython/brython-3.7.2.ebuild b/dev-python/brython/brython-3.7.2.ebuild
index 447c9b9ba91f..29277fb2ae96 100644
--- a/dev-python/brython/brython-3.7.2.ebuild
+++ b/dev-python/brython/brython-3.7.2.ebuild
@@ -12,10 +12,12 @@ HOMEPAGE="http://www.brython.info"
 SRC_URI="https://github.com/${PN}-dev/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
+RDEPEND="${PYTHON_DEPS}"
+
 need_httpd_cgi
 
 pkg_setup() {
diff --git a/dev-python/brython/metadata.xml b/dev-python/brython/metadata.xml
index cd18966fc62c..36e30a512a19 100644
--- a/dev-python/brython/metadata.xml
+++ b/dev-python/brython/metadata.xml
@@ -1,10 +1,6 @@
 <?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>Gentoo Python Project</name>
-  </maintainer>
   <maintainer type="person">
     <email>monsieurp@gentoo.org</email>
     <name>Patrice Clement</name>
diff --git a/dev-python/cachelib/Manifest b/dev-python/cachelib/Manifest
index 79f5b954157a..ef47c5714f5c 100644
--- a/dev-python/cachelib/Manifest
+++ b/dev-python/cachelib/Manifest
@@ -1,3 +1,3 @@
 DIST cachelib-0.1.tar.gz 9844 BLAKE2B 7281a3851281c2babd3d144db0e22270e5c196eaaf62f975844f9972538e571a36a855f8a0209e2f38d1a962dd52d0d7fcefa1f6d3b97c3f5dcd119585c7ade8 SHA512 8ed41a14f3bc36393ecdce7dcc0023ce954900f4541463cf08b823b6c11a28532812c9873d32991f023986ed2ded39a560ee556447bc6d4c3e45c3d4d749c2b9
-EBUILD cachelib-0.1.ebuild 508 BLAKE2B c14c923b4cc51fd30165e89f962210b4726c3b0dfceb7cabc7a70ebf0fc8a374d746c4a7ee2b76e5d8d317b9fac5e133f780de88ddeaeea5c45eb471fe2bb8ad SHA512 8ea25eaafdc76e7cc768f623e7c29849a986232e7bc457fce8082a0c945eba541481371a6f4959f252b73f0049d1d241cc37d98bf42415a8db58ef589712d8ea
+EBUILD cachelib-0.1.ebuild 506 BLAKE2B ea9a9a7675c8b846fd65ecbc30957f3978f379adcb56737ca10a2a120b4ed3c4be7c04b0c4fdc73ba69c780dacba3ff0b221857d6d1daba567f4cdbb2e9d4d53 SHA512 9e158ce3405fd96817c56e3b16b46b7588b60d293ae3a0739c8d9000434551a8fc367de3e495862b226a618ec3c5050eeebbed6ce71dbd94799f811be18c0294
 MISC metadata.xml 348 BLAKE2B 548d0e9474e9d2c42f0c4d0fb60d0cf53053fb7d4b2b62dcef25c0d1dac802b32af0af53189c8dea4b57309126840efd38a4fab3fc79000f782b82c9927b7a4f SHA512 b602b68d9c5d5fc239ddd37449d0edfb2909c8a8a5fd45c51c669a390149c107af0d5b198d65ef34e5f83aea1f225b8f136d693460abfa6ae27bc57232ca17cb
diff --git a/dev-python/cachelib/cachelib-0.1.ebuild b/dev-python/cachelib/cachelib-0.1.ebuild
index 492ed3c8d99a..937ba108d67b 100644
--- a/dev-python/cachelib/cachelib-0.1.ebuild
+++ b/dev-python/cachelib/cachelib-0.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/certifi/Manifest b/dev-python/certifi/Manifest
index 40a635f80cf1..3b7f2bfd956b 100644
--- a/dev-python/certifi/Manifest
+++ b/dev-python/certifi/Manifest
@@ -1,10 +1,12 @@
-AUX certifi-2018.4.16-use-system-cacerts.patch 340 BLAKE2B 42278c6b40ef6daef71a2ef3da75baf78833906c1cd018757b0b45d8ca623cbb5de15e5d5cfa444eb360738b368ad2111bb5594beaeb910275c65267b7532a34 SHA512 8c0b36be0ce23132fe739be4a173f537f4f8870fe0f5e2c98add13e94c0c23490cd0aac30e289193820790eb8580770e178e32b9f16b28255fd95565d6015faa
+AUX certifi-2018.4.16-use-system-cacerts.patch 314 BLAKE2B 30c9d53dba96f0062df843c98e507a477888a5d8d4de32fded32c9c6729c3e71690a1a1463372d991fbeb5135298a8fe308ab2ea10521e4a5408591eb1a336a6 SHA512 ff533ca05a736e35c1c567e0da6e79124bc7e070fa1db03fdcda6989df885a16568e4d0dffe07658480b1141dd1fc4c374230c46ce7d7b20e0ada82600ae9141
 DIST certifi-2018.10.15.tar.gz 145887 BLAKE2B 695b4236d67022f12639850fdcd169570330f9dd59aee165a39143d5dc5867b8685859bc48c8af07d41b7124970748ceb97cf1f7557563865e6b3293f668393b SHA512 3324ae6c4b99dda6f48aa9f0918fe045a19b19b26fcfdcca4be93ec967b9e4112d863c982686837b327f1663e308250d56ea337caeeeeb96579e08b20fca92df
 DIST certifi-2018.11.29.tar.gz 153772 BLAKE2B fb146409560beb85731b136541012f3f114a8e35c1b0ae9a9bac31d10642dc4ff3cad6a7e722e14e1d5092f9d4e3d7f5c4acb231edd2602d3452a6c9cebd323c SHA512 6a6bf1ff98caefcdbf78a8c83e11e155368bacdd806f0ae0c6afa8f513667df6598e594b3584de61acdca3d6049f4a776937f2aa8672b602bd6db7b737f6074e
 DIST certifi-2018.4.16.tar.gz 149967 BLAKE2B 4a69ec495266d54032dfabc9c17d0b1e78ad1467214f9f981feb4fae279c1f4b5f0bc3f7a643c2229b17d19e32c1ea894dc16d73b036a0b32f17faa9ac55615c SHA512 96369b318df9592ed4ff48d79ae695f89d27d85e8f5de72548fccb19ac15b83a33fb8bc096a3092d7a7f5b201af08805576888418c7927cf48b892df56464682
 DIST certifi-2018.8.24.tar.gz 146866 BLAKE2B 92a609bffd777a624d18e612e2fa504b1cd4f0764f979d22bf6785158fb928d30984fba16b839f6b4066395dadcca485e6215c6f0b6b550d891673a79ea77c08 SHA512 bb0af24570dd4806bc80cd438cae42db82f820de815a6148b184f58c19cd91a03f9275815559817a84220dcbd7c87a4a7d12e35cf4a95a1dbad286a1dfecf907
+DIST certifi-2019.6.16.tar.gz 156721 BLAKE2B 3990a9c122dbaf554f4482ad97192efa66f1cf54e83bd4ee67248bbea8797dc4da38ab537230a8263a491a2a2115528138965480ef4da6d6cba9ac2af5bff830 SHA512 4641626bc5073cd0b3a520855ddef1007dcb42933baa7a3469856f936e725581042bcbd5b67e984ba9748e7faa62b9125cba7dc160dcc5db2eafe46461a29f5e
 EBUILD certifi-2018.10.15.ebuild 1417 BLAKE2B b93161fce15a55cb9131c6c90b56981f7b82524deb0831ebbf00b2f05088db53894fca47b5fb3a11fe0099632ad447a8092fb67f2a74428ca8f8cab56c74aa5b SHA512 c82821bd3a079b417d5fcac7eadb0fac0b739468587109cdbbbbd2861cd39d002a0d80bd6deec8f1e1af1c2d977b5370e33eee93a30392f4353633734c934d96
 EBUILD certifi-2018.11.29.ebuild 1424 BLAKE2B 1e61f55b832357bfa38af6093dddce06dec6b1d39386300df8cc1578d865a9a85ff70cf59f862d93e5104a6748c083050d3629aeaeca9d43068f641a76a70989 SHA512 9d57eff51970edc246351178de3f4bedbbc0f1d936c3ef42895ec26735dfbdc41de342dea6da066ab82fbe149dcb7a47415725d016e1d15068163d8804f4c1b9
 EBUILD certifi-2018.4.16.ebuild 1416 BLAKE2B 48ac08224435ba34e10f7af84c882de4cd50bd7e24b0ca66ee83db9f2e8a955e2163ef1ef8d8dd90b9413a4447cf1c2d15cba9956c5d6e7a7e3d1a3d577e7dca SHA512 8c2ec3d4d0471359c79e47296eb66f7d0a40e06b79b582f276721bbeeb5dac35ab07c24fef472b54e435850350962d1d2e1c8dfd32711ef36311e6f51cc8bdcc
 EBUILD certifi-2018.8.24.ebuild 1429 BLAKE2B 462a10d705e5878059893d1ff0551790c00a70d67895451c91642d6bd1ce30d7708e3af5aa51b89418b969ed7e26377ba7369560da33af20f2c2c4da6f8e1fe8 SHA512 ea4b536af66ecd7a39fce8428cc78cacf1b55a183f822c7e83752e6baa5d0c78d52913255970fa8fb960dd501d967352b2dd372492daed35495eb558570182ae
+EBUILD certifi-2019.6.16.ebuild 1415 BLAKE2B e37e59485fc7509f9264a8bf51f41e6aa62c7392cb65f99b4b89c19fa4bc15b9d31ea2c4147c3492c2ea42f4fb7038620caad30dff68287964b99ca0f1d6472c SHA512 708beb10511cbbb20b5097abd4bc7827045f62e0007bc1295ce368e83866a01c0259ef646231fec9dbf1304fa399d4526795fc5702dd3f5f4063ec18acf72cb5
 MISC metadata.xml 320 BLAKE2B ba5c3c1018c5cba293969a523ab6c388f5bc0d0cfdfc69a4b143f1c966aad036df449bb091eacdeae2335a6bdc722da85882caad2a447bf87b600da2ed7c5309 SHA512 0e99564887f0a0b314056b2e1f4b6e3afcaf908de6824a2cc87deab9d1832566e97b8ba88cc7d2bdc5d11e7f1c8532830fc59602efd8c2f1a6061c0ad4853fdd
diff --git a/dev-python/certifi/certifi-2019.6.16.ebuild b/dev-python/certifi/certifi-2019.6.16.ebuild
new file mode 100644
index 000000000000..50b26cdf12c1
--- /dev/null
+++ b/dev-python/certifi/certifi-2019.6.16.ebuild
@@ -0,0 +1,43 @@
+# 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} pypy{,3} )
+
+inherit distutils-r1 prefix readme.gentoo-r1
+
+DESCRIPTION="Python package for providing Mozilla's CA Bundle"
+HOMEPAGE="http://certifi.io/ https://pypi.org/project/certifi"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~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=""
+
+RDEPEND="app-misc/ca-certificates"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+# Do not drop this patch -- this will affect system's security
+PATCHES=( "${FILESDIR}"/certifi-2018.4.16-use-system-cacerts.patch )
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	eprefixify certifi/core.py
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	local DOC_CONTENTS="
+		In Gentoo, we don't use certifi's bundled CA certificates.
+		Instead we remove bundled cacert.pem and patch certifi
+		to return system's CA certificates.
+	"
+	readme.gentoo_create_doc
+
+	# Precaution -- nothing should use bundled CA certificates
+	find "${D}" -name 'cacert.pem' -delete || die "Failed to delete bundled CA certificates"
+}
diff --git a/dev-python/certifi/files/certifi-2018.4.16-use-system-cacerts.patch b/dev-python/certifi/files/certifi-2018.4.16-use-system-cacerts.patch
index 009f21168c1e..1c21a2ae1e02 100644
--- a/dev-python/certifi/files/certifi-2018.4.16-use-system-cacerts.patch
+++ b/dev-python/certifi/files/certifi-2018.4.16-use-system-cacerts.patch
@@ -2,14 +2,9 @@ Use system's CA certificate store
 
 --- a/certifi/core.py
 +++ b/certifi/core.py
-@@ -19,9 +19,7 @@ class DeprecatedBundleWarning(DeprecationWarning):
- 
- 
+@@ -21,4 +21,2 @@ class DeprecatedBundleWarning(DeprecationWarning):
  def where():
 -    f = os.path.dirname(__file__)
 -
 -    return os.path.join(f, 'cacert.pem')
 +    return "@GENTOO_PORTAGE_EPREFIX@/etc/ssl/certs/ca-certificates.crt"
- 
- 
- def old_where():
diff --git a/dev-python/cjkwrap/Manifest b/dev-python/cjkwrap/Manifest
index 06870d282b01..c6b4bd9c885f 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
+EBUILD cjkwrap-2.2.ebuild 472 BLAKE2B b5d00af80bf6fd365675b804e5fcb592c5ab0d6f8520cea33d845e5ef86ecee9077389b0a2626aaeadc411a83294361d73def79525b356dd0cfe7ce4ff335759 SHA512 daa761f55dc12e1a4de8aac76ac82c6005a822d01e17d16bd53ebb41aa9f9bf03234cc92992bb691ac69382912197de8e1d1275b9ceb6c74c31402c5d4c3790d
 MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/dev-python/cjkwrap/cjkwrap-2.2.ebuild b/dev-python/cjkwrap/cjkwrap-2.2.ebuild
index 6c260242ccf9..d8b4cb6c0f8b 100644
--- a/dev-python/cjkwrap/cjkwrap-2.2.ebuild
+++ b/dev-python/cjkwrap/cjkwrap-2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{5..7} )
 inherit distutils-r1
 
 DESCRIPTION="A library for wrapping and filling UTF-8 CJK text"
-HOMEPAGE="https://fgallaire.github.io/cjkwrap/"
+HOMEPAGE="https://f.gallai.re/cjkwrap"
 SRC_URI="https://github.com/fgallaire/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-3+"
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index b34dd14467b2..6bf8aecad5b7 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -3,11 +3,11 @@ DIST cfe-6.0.1.src.tar.xz 11905772 BLAKE2B abb60e9f9827d1d8a24f0aaf8a1d1e3297929
 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-10.0.0.9999.ebuild 1059 BLAKE2B 38dedf48dafdcafbef15e24255df373c5ab288465a0bedc711ab0de1fe2a72d5377ea16c68af4519f2f763de32e4017251f55e9bed069c82be6d26eabd470948 SHA512 b86477f547cb290f61a5e7e975aec95583e30d43f78b2618d909bab333aa5e574ce5ea8e3197098d3e299387f1d6bbf8814da67a74da6e3dcb369bb77f1433f1
 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.1.ebuild 1132 BLAKE2B 3eb755b1510d33954a3b0a3fe704755d095974642f445bdbbdd1ebd18163fd887e34d4054c87c869b093915c967c6198174f3001b2185f59a282a5dc0e85bbdd SHA512 cabf3b6ba8f05ab5c477e6e697d8c31b69ec5e99be2e5d162de29c63c3c65d3317616474e6863cba441b93caeaacc5cccf6d6ac123f0c718efecedb835e20d36
-EBUILD clang-python-9.0.0.9999.ebuild 1052 BLAKE2B dabaed85a2f5a2b35b2ae11ca1217db8bef310ad825d6d731fa631db46226e22add0b93c40cd386eebfb11aad88a2367059c8dac115e965784ab2141fa26526e SHA512 ad45030d16d6ba6b3ab32e6cd8e22333d96c44a0b3770d7eacc2e5351a8180334c4416d40562defae0b2ad8efbc975264b84d011df1185ec726b09ace8c1b27d
+EBUILD clang-python-9.0.0.9999.ebuild 1084 BLAKE2B 5cfa8935bd4d873e9c8c66f7340723525c0e583b7342725154c85f1e9aa1de58e4a242a0a0334002567bd253d8cd66513e40803dfcd28e6f9be76fc625f76b23 SHA512 9ce4a9f2e03fedfe40dbb7a7d19138e0382447e4f99648fbacc0419cb298c64deca82d29b8bf0c85ac1d5ad34f42e35208f152d16146ef9caa9f260f717885f8
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-python/clang-python/clang-python-10.0.0.9999.ebuild b/dev-python/clang-python/clang-python-10.0.0.9999.ebuild
index 506f79114d25..ce6a903df4ab 100644
--- a/dev-python/clang-python/clang-python-10.0.0.9999.ebuild
+++ b/dev-python/clang-python/clang-python-10.0.0.9999.ebuild
@@ -12,7 +12,7 @@ SRC_URI=""
 EGIT_REPO_URI="https://git.llvm.org/git/clang.git
 	https://github.com/llvm-mirror/clang.git"
 
-LICENSE="UoI-NCSA"
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
 KEYWORDS=""
 IUSE="test"
diff --git a/dev-python/clang-python/clang-python-9.0.0.9999.ebuild b/dev-python/clang-python/clang-python-9.0.0.9999.ebuild
index 6bf0e1c8573f..70de2ed55129 100644
--- a/dev-python/clang-python/clang-python-9.0.0.9999.ebuild
+++ b/dev-python/clang-python/clang-python-9.0.0.9999.ebuild
@@ -13,7 +13,7 @@ EGIT_REPO_URI="https://git.llvm.org/git/clang.git
 	https://github.com/llvm-mirror/clang.git"
 EGIT_BRANCH="release_90"
 
-LICENSE="UoI-NCSA"
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
 KEYWORDS=""
 IUSE="test"
diff --git a/dev-python/cli_helpers/Manifest b/dev-python/cli_helpers/Manifest
index afbdebc55619..91ee1f4eef06 100644
--- a/dev-python/cli_helpers/Manifest
+++ b/dev-python/cli_helpers/Manifest
@@ -7,4 +7,4 @@ EBUILD cli_helpers-1.0.0.ebuild 601 BLAKE2B 91b79943d8404e1730cf5a56af2e4cd58a11
 EBUILD cli_helpers-1.0.1.ebuild 651 BLAKE2B f59049620bc9d66bc472fab7d5fbefa66eeeebcbf375cc9e42471c8005a06e9b1a49e68c1a5be1b053d1f0a640599c0595d67fbbbbdf6c2ec8b4ddb6d8ec98d7 SHA512 caea109dfa202f5eea3e8865d25bb908b99ead7821b4b746761e4f7245fb770859668fc92187a6ae92f2223f8fd8c55774e7c66c4273ded34e49b7a2eb60cc8c
 EBUILD cli_helpers-1.2.1.ebuild 971 BLAKE2B d9093cfec13b41a6f2480406e002582f4e79ff6a3a98fe967f6ab73c5916c432b77cea547eed9c77a530f597c1dd02e659143bb1ab5842c6e1413835a8a41ad2 SHA512 5ae9610d22da8a05147e1f9e5db61d3f46361a3775e4e41f5116d619b39d354a0750d0e1609a6e79a398a1845200872a67af1c403f591b1ef30e3ef8338ab621
 EBUILD cli_helpers-9999.ebuild 959 BLAKE2B 04d3a02e0f236a690fdb8a2aa6b91c64d00fac4042acf3c09e88a1452eb9fe622800c3fae60427159bfc7e54f11baac79adfd3f4c8bd5d3a2be7466430898b97 SHA512 29adea347d6d6e14eb375aba42c307303baecfd5e6b71a9f28b2ec597462c6b31376a8e6d54ef28a3492ef03c8a0d14d36c5d1710d0fbbd800774fdee4122f44
-MISC metadata.xml 406 BLAKE2B c9dda1fafe8338ff28ec2bb3f4d3b886ea70558a54bf7a61147b4cd6feb2b1a02dec7757aa2d69dcdf5fefede321fdf8ff97548bd8065af9ff5362742adb73b0 SHA512 1f248941b8af03410a414ca6a487c431ba3ceada7b6898b5a63169109ca44acd122dc6dd42ebd3e6b8aafe57590e80aaaddd21824fc82c830674bbd1cf571a83
+MISC metadata.xml 407 BLAKE2B a1128f59da6b44295f47017d6c08b582d58b51b551e4ec866ca0b40778c4353f9c633fbbd3423df0d89b7c85f81caece2fa3a9ce40be2fbf4231961dde1aaf92 SHA512 19d20ea5cc6006d8b35576e7d68167b797eb677cbd62a150f82ac6738ae43d658d9461ae3ed0499b259812ab7b1e4aeb30348436c25fd96e95cc75667fad803c
diff --git a/dev-python/cli_helpers/metadata.xml b/dev-python/cli_helpers/metadata.xml
index b4426629df10..ad9e3e04b43d 100644
--- a/dev-python/cli_helpers/metadata.xml
+++ b/dev-python/cli_helpers/metadata.xml
@@ -5,7 +5,7 @@
 		<email>grknight@gentoo.org</email>
 		<name>Brian Evans</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
 	<upstream>
diff --git a/dev-python/click/Manifest b/dev-python/click/Manifest
index 905d182b4591..3744180f698d 100644
--- a/dev-python/click/Manifest
+++ b/dev-python/click/Manifest
@@ -8,5 +8,5 @@ EBUILD click-5.1.ebuild 1213 BLAKE2B 03d408ca41c1d8388774e33e99256cbac1e6a5a1e76
 EBUILD click-6.6.ebuild 1200 BLAKE2B fb5deaa2c1ac14b0f4653835afd3e22718cb4f44795cc315087ed61940993597d0392893e20c0c0ad262a68e50a09712d2b1babe6c21ce671cf5b1fd0d196172 SHA512 d33eb4ffd768d1a26641a62f7ed035b7bcd53a838e9ec413553f3951261b82e37c4905accaa3beeaa09ae6b52dbaaef6d923febc19de75320f1149d2f9be9ea0
 EBUILD click-6.7-r1.ebuild 1419 BLAKE2B 6dcb7b0998d5e05082260d3ef13f86dc8b4794675cf2c24e447c1b9c97787b842ac5a8f5135870f7764be2b3a167e7f7b91ed84cff9729299bf78e85e9d2e4a1 SHA512 6fc30acbbe305fca880f4a192568039d3ebd084ccfa0858d17dc07e11010c97132dff9df7d2f492190d080d6f7dc09c5056eab0371bc348cf51f41468bf6d691
 EBUILD click-6.7.ebuild 1307 BLAKE2B 2f13b521b88d734b69b9be4fc7bbc5cdb5aaf761121fafa9eb4c3fdd5f1f382844b543900a63e0af803dd43d46031018abbd8c73c52557126a3547ade1b2192c SHA512 ea837a3e2d42cf681efe634352b85ce8e63f568289f335dce6d42fe6fd5bd2f576fd52b70835fe4cd58e073013bde5e6ed55b8e29fcf352c12e3f9437e26c617
-EBUILD click-7.0.ebuild 1200 BLAKE2B a25d0932a8c935ebb3632138392f3bcaa9eaa27b9f72ef7ac9771bc7a40b0cabe5010ed3a43c97fbd0bee160f20cf947740924ac319604ce492b06521bd68f0e SHA512 0533ef18ebdf22e11b0430933da21aea643abade42fc89a86869c3bcdc131007e0ccb23a50a4deeb494e31e078a412db6bf5e2004b604cd899a177e91a2ad569
+EBUILD click-7.0.ebuild 1206 BLAKE2B 10bcc9173104bf70ab0ec06469325d9927e1cb334889d041f9b4628bd3cd4dec39f5b0aec0adce6480704fd0a3aa204d820cf8347f6a76a192369d3c05a4eefe SHA512 a653390bd78944695a8045be98e2aa83d7f5ce4ff9c1e9797e7ac2ab3daf2f7a530b836415adb0654b2a79c40ffd3930bb8c1b19620f366557030b89fd111827
 MISC metadata.xml 308 BLAKE2B 813de6efdb1f5f1c8f59f403d8d7d46a4f75bd7b135a46714aba69ac841e12d650ac0c0bc53af62e3c240998fcbdc11a12cde34397af99e7483b29a7b701f1a7 SHA512 6dd2c4334b6ad8b0942f5cbd443e7bd5cefdcadf2541d341f46fa153a28a6ab5f074270638796efe6a7df48a20be9abcb3f41bfa19c58b1e30ed13fe56b1d6d1
diff --git a/dev-python/click/click-7.0.ebuild b/dev-python/click/click-7.0.ebuild
index 3f5b491c7586..bdacbb26441f 100644
--- a/dev-python/click/click-7.0.ebuild
+++ b/dev-python/click/click-7.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://palletsprojects.com/p/click/ https://pypi.org/project/click/"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="doc examples test"
 
 DEPEND="
diff --git a/dev-python/cmd2/Manifest b/dev-python/cmd2/Manifest
index 0eb379961da5..5d0dd2c2031f 100644
--- a/dev-python/cmd2/Manifest
+++ b/dev-python/cmd2/Manifest
@@ -3,9 +3,11 @@ DIST cmd2-0.7.9.tar.gz 71298 BLAKE2B d1623e2d6a7ac66058b5a43a9688ba850962fa7b565
 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
+DIST cmd2-0.9.16.tar.gz 550919 BLAKE2B 0c8fa50bc1df503b17fc1c753ddac755968a0d4886921baf5f1113cbe7d8928b6ee0be49c93e697e00a1951deaee5c35403da74ad4d14fabf566dbe8abf27bfc SHA512 63b973e63fe48675a25c76b5c79d3838aad8fea62e50287cc72f2dc431e798535fc24caf589a2358012e6c8c601e8b46ac08b0da63ca64e46727890657d7ddfa
 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
+EBUILD cmd2-0.9.16.ebuild 1057 BLAKE2B 58d5ab45d1a8ac6f05195c19c9db1c91c5d2bf75784f6ccba5af9014b889e71417e3695abe63c9dd881a4c842b7248ecdfbfc649f55b150bac2e6a87f2f42d6d SHA512 0d3489368f84e25fec9b63cce78502aaf9d6c35bcc6d864613e730267d1710bd4d4d74251947fdca45e7fd63baf9cb69762f7f607d12aa94e670f2a44f865cb9
 MISC metadata.xml 665 BLAKE2B 796824fde35499ef70bd730f7e6c6ae4b239ea278f77188215ae0fc6e062598d943b0ae42ab5b378e8777c7c6a2162b330971bc00572e6dd43c663a3da677aab SHA512 64183ffbb33f229d4295e6fb34d98603d38da0241c6d1593704da866c17e04c9fe7f9500a1256b6e83c919eae019f71da93fdec7f09db99e073dbd809144b735
diff --git a/dev-python/cmd2/cmd2-0.9.16.ebuild b/dev-python/cmd2/cmd2-0.9.16.ebuild
new file mode 100644
index 000000000000..715f6032dc28
--- /dev/null
+++ b/dev-python/cmd2/cmd2-0.9.16.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/consonance/Manifest b/dev-python/consonance/Manifest
new file mode 100644
index 000000000000..4aa8c123d47c
--- /dev/null
+++ b/dev-python/consonance/Manifest
@@ -0,0 +1,3 @@
+DIST consonance-0.1.3.tar.gz 30762 BLAKE2B c30db2741a851ae1ef02361102c432d931925125d8648c0e5b1a88005f480219eaf81e8205559dd709b43e98b3925777d1fecf702577e38c3ec1c8f4e8a19cce SHA512 9f36f81b453dc4de2217a997580bb3f8747c86a8116275ba5a0e86cc66ec62d6490ae20c0e5f7401d1c16d601686936ba7b789999941c657a0b508ce0dea1cea
+EBUILD consonance-0.1.3.ebuild 937 BLAKE2B 41985834b6654fec89e37fb7e1130e613260e39b94b91be1e5e4677332541bcd87e192e017fe3395c97e0e751f4209d07b3c345f22f86e6bcb600c64f7ac75c0 SHA512 9337e3a079d62142948f10e222d7ee3023a2ef30e9610bff86c6d5b284f9a0961fd7d605f3b2c224c6e4f031d266c16d9f028922de1234cad63a8d3db1e5598b
+MISC metadata.xml 701 BLAKE2B d1246e2203f6a6608679daba3f06f6a6bb59774cc6f14031deedc2b563bfeabf09badb2963bb77546d4bda9ed90e20edadafc48e54a99b24d468b76588e8383a SHA512 fe10d9dea796dee568d6538f2d3125ebbf06f62c361494b3cf0e4130a5418a35184f64ec95139e11e135fb6d99fd2e4c3213dd65572866763a103e42d54ce7b2
diff --git a/dev-python/consonance/consonance-0.1.3.ebuild b/dev-python/consonance/consonance-0.1.3.ebuild
new file mode 100644
index 000000000000..fa72b7ed54a8
--- /dev/null
+++ b/dev-python/consonance/consonance-0.1.3.ebuild
@@ -0,0 +1,42 @@
+# 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="WhatsApp's handshake implementation using Noise Protocol"
+HOMEPAGE="https://github.com/tgalal/consonance"
+SRC_URI="https://github.com/tgalal/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+# Tests require an active internet connection
+RESTRICT="test"
+
+RDEPEND="
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/dissononce[${PYTHON_USEDEP}]
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+	dev-python/python-axolotl-curve25519[${PYTHON_USEDEP}]
+	dev-python/transitions[${PYTHON_USEDEP}]
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	use examples && dodoc examples/*.py
+}
diff --git a/dev-python/consonance/metadata.xml b/dev-python/consonance/metadata.xml
new file mode 100644
index 000000000000..79d7a64269f7
--- /dev/null
+++ b/dev-python/consonance/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>ck+gentoo@bl4ckb0x.de</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		Consonance implements WhatsApp's handshake process
+		which makes use of Noise Pipes with Curve25519, AES-GCM,
+		and SHA256 from Noise Protocol.
+	</longdescription>
+	<upstream>
+		<bugs-to>https://github.com/tgalal/consonance/issues</bugs-to>
+		<remote-id type="github">tgalal/consonance</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/cython/Manifest b/dev-python/cython/Manifest
index 8d6c5bfbd955..bcefe00d3861 100644
--- a/dev-python/cython/Manifest
+++ b/dev-python/cython/Manifest
@@ -3,6 +3,6 @@ DIST Cython-0.29.12.tar.gz 2050537 BLAKE2B 86c5ffd07e97d549f2d98ae0aa66a03dc2f8e
 DIST Cython-0.29.4.tar.gz 2044382 BLAKE2B b36d27706a3270805f66190a4cf2735eaf20b1b932365b324a433c0e58e63e860ce1500333233c3539ae697886ac0adc361a2c158d5d064a3ea05843debc3f26 SHA512 8f115e36975aaf64eda4df8b0a85378d0c80b3292dbd162be826b939def03bdc9f3eb937676e2367003c2944b570d97f50d7880becfdb2fdc5144077b4a722dc
 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.13.ebuild 1971 BLAKE2B 37e685eac0b519a4c4bad0ce3b325bb63427f1dd39859f82b15c723e2e2225f4f922188b26c8fc0cd1069e2e4d2ebe6134a0f6c194e972869ad004203a9b02da SHA512 c22b620debddf7935d54738741b32ac65642c67f7434c9a3b5794365ec172ccc1ad01cd748a97d58e7daaee3d7e4bdfb3509e4964b7ce8e60bb3d9525c8b33a8
 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.13.ebuild b/dev-python/cython/cython-0.29.13.ebuild
index fde90453842e..5af794bfd500 100644
--- a/dev-python/cython/cython-0.29.13.ebuild
+++ b/dev-python/cython/cython-0.29.13.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 toolchain-funcs elisp-common
diff --git a/dev-python/deprecation/Manifest b/dev-python/deprecation/Manifest
index 886c7ee3f9f3..df12d486501f 100644
--- a/dev-python/deprecation/Manifest
+++ b/dev-python/deprecation/Manifest
@@ -1,3 +1,7 @@
 DIST deprecation-1.0.1.tar.gz 9596 BLAKE2B afc4cb457ce224f120d41944e6eb71c212ef4d40d5a7c5d6d695d31bd105a4a5291daf5d3c7af0f94b58049f7e745e7e5be462495de88c48cabf5a28c22b3637 SHA512 fc35e6516e1617e2baad598a91e5d83ca95ab8a2d6a2753751d6752675de93cb44210109450a2aad9eb52b3c772a8b753c1d42ab2356c6663d2a03c4f779f086
+DIST deprecation-2.0.6.tar.gz 13381 BLAKE2B 1f21a4b8bd9293d50e9068762d4f909afe02fb1f7a8f352c5b3d5d10e0da90d122927a97cf060bec626ff8538478f83740dc1d79e050fe43dc27ade8729f26d1 SHA512 69dcf5e07cfc1c746564e03063088cce65690e2b34cffe327d59edad24f00d23cf9904089ab9ff5e67dce2b6b02ed617e53959be4a907074440ddb778576aa2f
+DIST deprecation-2.0.7.tar.gz 17077 BLAKE2B da3fb5db53f281c29e2af40335ef4038e37d133563b85d0ea795a314fd9f2d725a98c100aca338dc9ebe60bb1000476e0debcfdc9c4583108004df207cb36747 SHA512 4412e2e95f4aa4b3d5598346a6649c8d945d7401ac2d0fba3b6f6eef567403c8454ebe537e8de646903cd0c2308f48ecb949dae3015ba7617edd2fa3a26ed429
 EBUILD deprecation-1.0.1.ebuild 467 BLAKE2B 223c9caae66c8830dd03170bce2a31e0afe98af0d2801efa9aff54479c93853cdf1df2e66cb71b6dcfdcf57849e2a3e8690438cdb26e4493f8cdd3806411d006 SHA512 5f90ee69bf623a018861dc4f21b26112eb84ec9613c402fe286a35b4f15f6e3e5d2ee502ec97e6590537e0e384a4e896fba64c377a28399e431eb8165c896dea
-MISC metadata.xml 427 BLAKE2B 1ca92b3053beaa34b86a67c5aeff8101054ccd29889999682f95d18101a11c4c345740340d633d3fc4bc0f9f60d30b27b25ecb14d97723f3a330c66b639730de SHA512 c69de16cd81869a341c8113ec6b89d639a038de10b9b96e9fc2ccea0593f7e6d3fd2969618c97631c1c9fb377f48d07f62c928bdc1fe1d880eba28fe4f9e7454
+EBUILD deprecation-2.0.6.ebuild 678 BLAKE2B c2eb5be9f24b9b602adc7108ef6e3da3c30a6c92505017404c3b028f7792fe0f543723f639d6906740ac391bd3ad8c568802bb3b891883633784f6e0deaefa86 SHA512 ccf8038e987837569ab0a29c33e7cd003c4337746df961cd3e4d4271295989e905960d29764ca2cd36d7466dc0a79b487ea8716af98fd391ee3cbf6a77704ff2
+EBUILD deprecation-2.0.7.ebuild 975 BLAKE2B 9c5121d996cf07e1709e97011a207ac8208b87e257d96f8cdd15961766c8ba92eff73d55ddd9b34a3dc642ad50fe29d49a2b0ca9691eb7c26c34575c3cbdbb4f SHA512 851cefe5000af75464ce5093d43da2561afc0fd75b1688550ddb81278dddfd27f81109c54345c87faee9b6139a18aae93a92a975152316d642fc04f69814d95e
+MISC metadata.xml 635 BLAKE2B 5f363fe7d6dfea7c8e2a2d250134dab625e1b349be4f12c7438adeb6bd81ee1332762259b38a9460ad6de845152151e272a8454aeef86ad8994a0f755a8db89e SHA512 6878bae4d120e4d0db92023f5fbae1eba8a056515fe2746f34fcbc931d6cae8ca0c0d972eb91a571ad462fa140bcee15b6401dbbb96af09eadffb147ec3a826a
diff --git a/dev-python/deprecation/deprecation-2.0.6.ebuild b/dev-python/deprecation/deprecation-2.0.6.ebuild
new file mode 100644
index 000000000000..73bd41c2de64
--- /dev/null
+++ b/dev-python/deprecation/deprecation-2.0.6.ebuild
@@ -0,0 +1,30 @@
+# 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="A library to handle automated deprecations"
+HOMEPAGE="https://deprecation.readthedocs.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/packaging[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/unittest2[${PYTHON_USEDEP}]
+		${RDEPEND}
+	)
+"
+
+python_test() {
+	"${EPYTHON}" -m unittest discover -v || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/deprecation/deprecation-2.0.7.ebuild b/dev-python/deprecation/deprecation-2.0.7.ebuild
new file mode 100644
index 000000000000..7b4f8a12a278
--- /dev/null
+++ b/dev-python/deprecation/deprecation-2.0.7.ebuild
@@ -0,0 +1,43 @@
+# 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="A library to handle automated deprecations"
+HOMEPAGE="https://deprecation.readthedocs.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc test"
+
+RDEPEND="dev-python/packaging[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/unittest2[${PYTHON_USEDEP}]
+		${RDEPEND}
+	)
+"
+
+python_prepare_all() {
+	sed -i "s/, 'sphinx.ext.intersphinx'//" docs/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build 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/deprecation/metadata.xml b/dev-python/deprecation/metadata.xml
index ff92bdf665f9..f24663f48abd 100644
--- a/dev-python/deprecation/metadata.xml
+++ b/dev-python/deprecation/metadata.xml
@@ -11,4 +11,9 @@
 	<longdescription lang="en">
 		A library to handle automated deprecations
 	</longdescription>
+	<upstream>
+		<remote-id type="pypi">deprecation</remote-id>
+		<remote-id type="github">briancurtin/deprecation</remote-id>
+		<bugs-to>https://github.com/briancurtin/deprecation/issues</bugs-to>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/dissononce/Manifest b/dev-python/dissononce/Manifest
new file mode 100644
index 000000000000..0c9cf68c2c75
--- /dev/null
+++ b/dev-python/dissononce/Manifest
@@ -0,0 +1,4 @@
+AUX dissononce-0.34.3-fix-test-requirements.patch 1099 BLAKE2B 9bd65c18b440181187dbce8f8d6c3c97902d127e904efd9514fd7d2c987b16c4f82ea10e7182ef3a72b73998d3cb76c3a3ee4838f4f3b3d83dfd40b1ad748273 SHA512 e875717877881372e3b446e5a1eee4f3aa0deaf5381e16c54992ecc0c0b8e36e44419dcda3a8603bbbed1cb3bcb8710f8cafc086a016a6c49267b10b443023b8
+DIST dissononce-0.34.3.tar.gz 594227 BLAKE2B e37ce7a41aa71f36a60b14b3da50df5c387aa64c472a48fe76d66f05ee495673b2719fb0ca0fab196992c4920eeba72701d47defceb70c2d85f5f894d13d40dd SHA512 f192c3f6abc3943fa8fffe959d3db74e810483c9f5868cc128a851ffc42069d084c0d935ca74fd45d5bcce3fe2cfeeb788094dc34f0567ed709ddfb57275fa18
+EBUILD dissononce-0.34.3.ebuild 945 BLAKE2B d8c1c92dfa4569a9d4677f1a07de6e3080e18b30e643ee21c677732c2eca8d40ea2a76c0cdb56ebc18dc7750e3f1b5cbe8e80bfd6e72ef3bfacd7d07774177d3 SHA512 42d8801f59f4e3169d1ae71d97a023b7a4f454acf8dc57c88c52138dd190f9cbd904f58df785bc7ce157059a27a168aea4ce3436c10aae10e4f8266745bce006
+MISC metadata.xml 778 BLAKE2B e90b3dc114969d571a98c02d61d7521698cd404ab8c83c712e07b99ef8e5d2d82e6d88752456b533ca914f5848a0220ba5c757e4e25ba94958119372038bbf4c SHA512 c929362f5f2cdf534639282686fc9227eea4071e7e042939f41f8e092eff4b1d561e466bf10269bae4c9158fa7cb99c130d4597131b6df8d7893e1986bcaa0fa
diff --git a/dev-python/dissononce/dissononce-0.34.3.ebuild b/dev-python/dissononce/dissononce-0.34.3.ebuild
new file mode 100644
index 000000000000..c5583d3590b2
--- /dev/null
+++ b/dev-python/dissononce/dissononce-0.34.3.ebuild
@@ -0,0 +1,45 @@
+# 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 implementation for Noise Protocol Framework"
+HOMEPAGE="https://github.com/tgalal/dissononce"
+SRC_URI="https://github.com/tgalal/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples test"
+
+# Currently no tests are available,
+# they will be added in future by upstream.
+RESTRICT="test"
+
+RDEPEND="
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/transitions[${PYTHON_USEDEP}]
+"
+
+DEPEND="
+	${RDEPEND}
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+PATCHES=( "${FILESDIR}/${P}-fix-test-requirements.patch" )
+
+python_test() {
+	esetup.py test
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	use examples && dodoc examples/patterns/*.py
+}
diff --git a/dev-python/dissononce/files/dissononce-0.34.3-fix-test-requirements.patch b/dev-python/dissononce/files/dissononce-0.34.3-fix-test-requirements.patch
new file mode 100644
index 000000000000..037706f4866d
--- /dev/null
+++ b/dev-python/dissononce/files/dissononce-0.34.3-fix-test-requirements.patch
@@ -0,0 +1,32 @@
+From 4fad01ef1689380b6de685aef5e85ebb1696cce5 Mon Sep 17 00:00:00 2001
+From: Conrad Kostecki <conrad@kostecki.com>
+Date: Sun, 2 Jun 2019 01:19:16 +0200
+Subject: [PATCH] setup.py: fix test requirements
+
+/usr/lib64/python2.7/distutils/dist.py:267: UserWarning: Unknown distribution option: 'test_requires'
+Package installs 'tests' package which is forbidden and likely a bug in the build system.
+
+Signed-off-by: Conrad Kostecki <conrad@kostecki.com>
+---
+ setup.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 77cd54b..4d4423f 100644
+--- a/setup.py
++++ b/setup.py
+@@ -5,12 +5,12 @@
+ setup(
+     name='dissononce',
+     version=dissononce.__version__,
+-    packages=find_packages(exclude=['tests', 'examples']),
++    packages=find_packages(exclude=['tests*', 'examples']),
+     install_requires=['cryptography>=2.5'],
+     extras_require={
+         'GuardedHandshakeState': ['transitions']
+     },
+-    test_requires=['pytest'],
++    tests_require=['pytest'],
+     license='MIT',
+     author='Tarek Galal',
+     author_email='tare2.galal@gmail.com',
diff --git a/dev-python/dissononce/metadata.xml b/dev-python/dissononce/metadata.xml
new file mode 100644
index 000000000000..e93d01b15460
--- /dev/null
+++ b/dev-python/dissononce/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>ck+gentoo@bl4ckb0x.de</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		Dissononce is a python implementation for Noise Protocol Framework.
+		A main goal of this project is to provide a simple,
+		easy to read and understand practical reference for Noise enthusiasts,
+		implementers and users.
+	</longdescription>
+	<upstream>
+		<bugs-to>https://github.com/tgalal/dissononce/issues</bugs-to>
+		<remote-id type="github">tgalal/dissononce</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/django-taggit/Manifest b/dev-python/django-taggit/Manifest
index 86f0f984ac80..7324f8c94334 100644
--- a/dev-python/django-taggit/Manifest
+++ b/dev-python/django-taggit/Manifest
@@ -1,5 +1,5 @@
 DIST django-taggit-0.24.0.tar.gz 44534 BLAKE2B 7a7c756cebc57bc870407d85b81c527ca7cfa5933050e02e5ea5ad18e2879732ea8993c725a4a8b1ded95bcefae3a8f4afa7c38d323bde347be7fb8a5d36c229 SHA512 669fd69c8c66dc4561fa87e94c7277d3de9aeb14136e8911b542dd3e6af84751781f5985c63deba5defedfa80e6650cafd608e206932ff4dfdfc80f796035a8c
 DIST django-taggit-1.1.0.tar.gz 41780 BLAKE2B 9f9460bc2f8fe3e42ca3c9f206e23f48c3761b486db026a4818e0a3934064bbe467a477b81cca0d8f133233db17558de2dc40779748a190408af090f8ce942d3 SHA512 974c1ef77e28b764707aceb9c5030c531ac57ea25ee112e46bf6c100f9ccfb186fe8681042425de25850b04b8925d844af9d35d4221f86e4426529037a47d36e
-EBUILD django-taggit-0.24.0.ebuild 495 BLAKE2B 603c4dfc6a0cfd46bd279e0590a26839cbd558e873b9e1f9a5eee2311e631e9f230a053c7f079f9df7918db3235dc80a3488a9b84d4522b21fe90e396b01e323 SHA512 106122ceb00eeda6e8d3763f22a01a0319e577ae2d2ce05175b7e003576265fa7b9535d53c9fba59a07a33d7b6072f513803b343ccc03b44942da3b7af700039
-EBUILD django-taggit-1.1.0.ebuild 495 BLAKE2B 603c4dfc6a0cfd46bd279e0590a26839cbd558e873b9e1f9a5eee2311e631e9f230a053c7f079f9df7918db3235dc80a3488a9b84d4522b21fe90e396b01e323 SHA512 106122ceb00eeda6e8d3763f22a01a0319e577ae2d2ce05175b7e003576265fa7b9535d53c9fba59a07a33d7b6072f513803b343ccc03b44942da3b7af700039
+EBUILD django-taggit-0.24.0.ebuild 479 BLAKE2B 8999728bd585e2c06fc066c52dbade3a14d532788be43a09c3f5c31f43d19a00a6380b6c8258ce4380773da3b9dde6c1a0036f5b839e6565a5b4febfb28a65ae SHA512 f9ec71ad54d906cd7b24dba151d100afe72488209f7a31462fed04245812c7b3f6fb5fdd4665287e8a631ef6fcd90e76caf79cef5f5a1b0ceec9c417bcccedf2
+EBUILD django-taggit-1.1.0.ebuild 479 BLAKE2B 8999728bd585e2c06fc066c52dbade3a14d532788be43a09c3f5c31f43d19a00a6380b6c8258ce4380773da3b9dde6c1a0036f5b839e6565a5b4febfb28a65ae SHA512 f9ec71ad54d906cd7b24dba151d100afe72488209f7a31462fed04245812c7b3f6fb5fdd4665287e8a631ef6fcd90e76caf79cef5f5a1b0ceec9c417bcccedf2
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/dev-python/django-taggit/django-taggit-0.24.0.ebuild b/dev-python/django-taggit/django-taggit-0.24.0.ebuild
index 95d4513a3f12..8fe718cdfbfb 100644
--- a/dev-python/django-taggit/django-taggit-0.24.0.ebuild
+++ b/dev-python/django-taggit/django-taggit-0.24.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019 Sony Interactive Entertainment Inc.
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-python/django-taggit/django-taggit-1.1.0.ebuild b/dev-python/django-taggit/django-taggit-1.1.0.ebuild
index 95d4513a3f12..8fe718cdfbfb 100644
--- a/dev-python/django-taggit/django-taggit-1.1.0.ebuild
+++ b/dev-python/django-taggit/django-taggit-1.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019 Sony Interactive Entertainment Inc.
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-python/docker-py/Manifest b/dev-python/docker-py/Manifest
index ed2d6a3bffea..36a5d09a31d7 100644
--- a/dev-python/docker-py/Manifest
+++ b/dev-python/docker-py/Manifest
@@ -1,13 +1,9 @@
-DIST docker-py-2.4.2.tar.gz 180890 BLAKE2B 57518a0c8481fde0198100354225cd8a2908af6d3ca2690d98ad80b386ca4c688c7ccd6a34634ce04fb5ab1553b6c0dfbc75d28333a10f28de7188fe2ee7ffde SHA512 3367066b2acd96b85bef28aef00c91d752dc25b3055575b4f2f9c0b981eb4bca81a742bc6da5f97cf039cd9c7d818e3f80101997fe3a2e2c6f3a9c42fd3111c2
 DIST docker-py-2.7.0.tar.gz 196369 BLAKE2B dd181dbf32f5afda06e748cb49f15d5fc6ff4a579c64b505308ad0d96913ddc8065d165090ec2b20e1f17a4519988a5665dd7a8c7643ca53aaa4385ceecb1341 SHA512 15cf1d8949d71e472f7636ff975cbc4c5f3e18e2d193cb603ade1397a56d0c1ec239167b71be325af99105bc36590a0f0faa1ab010f36fe8baca7807ddfa191b
-DIST docker-py-3.5.1.tar.gz 209381 BLAKE2B de0992aff9af240eeb79b66f0f7ca11aca4132cbef0ca9796cfa778b0f44e2ebf83858d0e4df2b9dd813caa83e1c301829152362a6983e5ee96dd5806815ee6f SHA512 8e927794cd308e17fc75f3c6569026c9b9c9f44eb2aa1c191dcfc6d1aabc36bdd341795ba9a2243ae2a27c428868c9f45e8bfabd7c1c798f3f4c85b7855eda6d
 DIST docker-py-3.6.0.tar.gz 213435 BLAKE2B 28301a508ef346373f8ac4033b697a71092c4162ba1be81bc69c513d1de700326a4e8ffcb1c015e20516aa1a09d31162d54182985eea3dc1dc23d6e79ef28fea SHA512 b32acb2585995c3c5bdef95ea4bbb6bcadba3b9fca81a3e637dc294b5dbd3823ee6c98236c4bb197373a96feafcaae665b9c64b805abd52e1ae27aa42079278d
-DIST docker-py-3.7.0.tar.gz 220407 BLAKE2B 3ba217957ff8746fb399ba23e4513810ffd96a758bfc5eba908ab3c66eb0a9711d94e5d9f517c301602961a21490659628d0a3deec3a4286155a4f5469304a3b SHA512 444634a26d0ce7af4850f346286cdac7f2c597aa6ce349c6371dbaa670aa0bcc2fa192221783b2059750d682580e34fcc5e115aeda0884838bf966decf9d0070
 DIST docker-py-3.7.1.tar.gz 220882 BLAKE2B a7547d2989b3fc2dfc38dfffb909508b7a5b3f8ee6b0fc874a73d0cdfaa17fe28c971f5a226893a41d893e75b1b2e4c74da806996e85b097b3a85b2d8dadcfcb SHA512 0a89c5fc05423d913b1029390318d9cd4ca54a3b4df1e9a9f459e27fa114fd7b03047ff95f3ea2ef6bb2cb48c5f6fe712da11c940249d3b253aa3fe74b8b1c98
-EBUILD docker-py-2.4.2.ebuild 1559 BLAKE2B 3bb505f2e65f2d12cf839bc666d3286fd4e7f7d92bd2ad7ea295680361f31759df6b8ff37ab5bfba18b0fb93e60cc5c0dd6119d048422532c5616560555198ba SHA512 bf7c5a7bcd7e1e5160bb831ec466f7e1904e765432f021d9fed8e894e776f3bc015b4a670e4383ad2e493d53d68f4fa5a0bf789b48a31dd9d8f21e1dedc5956a
+DIST docker-py-3.7.3.tar.gz 221311 BLAKE2B 6bdfc5cd53fccec6e060d08ebde845d373f961a8a418e3bfbeac79e736f64aa07807a4f2074d243765d10c0e4cc87c672d039cdefe4223ec1b33b56cf4ea31a9 SHA512 d3217361617f12e841bfa443c7ab4b44ca5f7ead8b40834919aad9043220efa7611a8bd18cbec6adc4d98f2551bfb169535e1eec904b90425648093c0d6a1722
 EBUILD docker-py-2.7.0.ebuild 1512 BLAKE2B 3816813d7a0259d7a4342ca575590ea4fd395f010e74f0b2ada6c1b0f34b22332784d88a9fe7a2777ef00199e78e785a96dc3ad46f182cee9719b6b97e850fa2 SHA512 2e9bd5037ccf6a133859d54c0f6f5859ec0f36222de0517f13ed2785ec6ba03ba36a9559b41633cf03a1b73c2fd8ecd6ead3e8e22c8f88947e732bd219aa8052
-EBUILD docker-py-3.5.1.ebuild 1382 BLAKE2B 1a72c74b83392be048bd4d0ac7198ebf206ead9ec2effe04cc4bac4e5191be6c4e1d69a474b19468ab172f438b12968ea1265ab18847a4b382d26b7c6b26fb85 SHA512 b9db4951ed806bd410d025a3e848a9250d30486ce16d5ad87af3e554fad0eaf802613c979f5973d975601d804501cdf2fdaaec511325fa014d5a8589dc0b881f
 EBUILD docker-py-3.6.0.ebuild 1424 BLAKE2B 0aa4a503cdf0dfaf3a317a4499b9505fe4479c0ed76aa7c018d39d05a8f20ed3cb40b2a2edbf7d5f1654073739e03302c89a398174cfa872d01625cabfa99356 SHA512 86c16d4bd30b7eaecd727c240154f5d529478251a75fc40d9a1caee1c69958c8e6b6a7fdc3ea2e3156ebae95b03e62939e3607f520900b43f9b4be645198b182
-EBUILD docker-py-3.7.0.ebuild 1426 BLAKE2B 54e7659153510592ea0a600a66e2dd961fb04596727d74b61bc679c89d4d1949ad444748ce24ffcb7cd7c916c26ec55a64547551e375911192f85a311abc82c9 SHA512 368e67f47da94ecbb9d522599d2e53a39340a1e34bfc48604e728b5c51c5864882b0dc9b7986329810a38c614d13f5fafa3e36bfe294a97e4015c20419a39ad6
 EBUILD docker-py-3.7.1.ebuild 1425 BLAKE2B f51c0bc038dfce1ea5f4901c3163802d30977af6591a7906f12379b87255b52eed9811a21f8433d026d576ec56314becde7514ae4310f3df77be05acadf0582d SHA512 5a257dd1de90d8c737f1700f205cfee7ed317b59a3e73f2eae14f4591736703980dc061a90b5cff67dbf747d03a2899f01c03b8a6f1c6de5755c91d5038de938
+EBUILD docker-py-3.7.3.ebuild 1426 BLAKE2B 54e7659153510592ea0a600a66e2dd961fb04596727d74b61bc679c89d4d1949ad444748ce24ffcb7cd7c916c26ec55a64547551e375911192f85a311abc82c9 SHA512 368e67f47da94ecbb9d522599d2e53a39340a1e34bfc48604e728b5c51c5864882b0dc9b7986329810a38c614d13f5fafa3e36bfe294a97e4015c20419a39ad6
 MISC metadata.xml 402 BLAKE2B 449733b9057dfcde3dd0ff82df6a9cf870d1138d3c721a39174a71f54a359422cb3411f513f68662b1c840480c4aa253f8fe77a2afe1020e82c4e7c81dc4d691 SHA512 13bee9843188ebf018e25e2a738fd0ecc10ddb3508bbbe3e47048a9ec714196498ea71044a57a20b4c649eacd0672b956d20a3e5487047723cbda9047ca214cd
diff --git a/dev-python/docker-py/docker-py-2.4.2.ebuild b/dev-python/docker-py/docker-py-2.4.2.ebuild
deleted file mode 100644
index 4b5d48530b51..000000000000
--- a/dev-python/docker-py/docker-py-2.4.2.ebuild
+++ /dev/null
@@ -1,56 +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} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python client for Docker"
-HOMEPAGE="https://github.com/docker/docker-py"
-SRC_URI="https://github.com/docker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-
-RDEPEND="
-	>=dev-python/docker-pycreds-0.2.1[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.18.0[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.12.2[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.11.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )
-	$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.9.1[${PYTHON_USEDEP}]
-	)
-	doc? (
-		dev-python/recommonmark[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.4.6[${PYTHON_USEDEP}]
-	)
-"
-
-python_prepare_all() {
-	sed -i -e "s/import pip//" -e "s/if 'docker-py'.*/if False:/" setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build docs html || die "docs failed to build"
-		HTML_DOCS=( html/. )
-	fi
-}
-
-python_test() {
-	py.test tests/unit/ || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/docker-py/docker-py-3.5.1.ebuild b/dev-python/docker-py/docker-py-3.5.1.ebuild
deleted file mode 100644
index 8e16af3feb1c..000000000000
--- a/dev-python/docker-py/docker-py-3.5.1.ebuild
+++ /dev/null
@@ -1,50 +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} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python client for Docker"
-HOMEPAGE="https://github.com/docker/docker-py"
-SRC_URI="https://github.com/docker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc test"
-
-RDEPEND="
-	>=dev-python/docker-pycreds-0.3.0[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.18.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )
-	$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.9.1[${PYTHON_USEDEP}]
-	)
-	doc? (
-		dev-python/recommonmark[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.4.6[${PYTHON_USEDEP}]
-	)
-"
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build docs html || die "docs failed to build"
-		HTML_DOCS=( html/. )
-	fi
-}
-
-python_test() {
-	py.test tests/unit/ || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/docker-py/docker-py-3.7.0.ebuild b/dev-python/docker-py/docker-py-3.7.3.ebuild
index 2573b1681c68..2573b1681c68 100644
--- a/dev-python/docker-py/docker-py-3.7.0.ebuild
+++ b/dev-python/docker-py/docker-py-3.7.3.ebuild
diff --git a/dev-python/dominate/Manifest b/dev-python/dominate/Manifest
index 1b1ffeedde92..1d3a541a092f 100644
--- a/dev-python/dominate/Manifest
+++ b/dev-python/dominate/Manifest
@@ -1,7 +1,7 @@
 DIST dominate-2.3.1.tar.gz 27887 BLAKE2B 3ac0820bd0cb79e648dc947d3cb69aa207e3c129cbae05daaca8fd3a6e22c67bd20fa350ce211986451caa7feb5b60c8ff692e568073e007c34de7cb8847b8a1 SHA512 599147cd9aabc7c3bc24e6c82a13b690808899107999a3b0d7d3f2f113b38c90f2c720298ffdcdf1933d2573cced05d730dab53265397b7fc010e57feabc10b3
-DIST dominate-2.3.4.tar.gz 27834 BLAKE2B 12eadd39e5088768c2cfc15e23093c53c58d90dab6346ac78d47da8b7d41fb50fabf4e186b9fea18ecb54fe8b6dae03a489b27a1942cfdc13437afe9e86919ef SHA512 6cab8d6d795498d70f28c80064407616e74e027ac112f8e097509482dce000e45c3599989430a17f71631616a860e84d842b2bfac39b4be466593b5cfb20123c
 DIST dominate-2.3.5.tar.gz 27875 BLAKE2B 72bac3554888427a3ed46f8e6a681ff8f48d37043fecc3ff984e65190bfd09bd28ab887168d7e56e0ce2fe8f7c986a4f9d4f47d2041524f53960a5ca3751826a SHA512 a48fff16fc3430201d757a5947c08397f821acdc07a2bd13bb77d65b0d71919726cf4f4792d591cf84ca05912223f439e9cb63e9d18b9a743b217e21ec97d3c2
+DIST dominate-2.4.0.tar.gz 32810 BLAKE2B 07dcaa1c4c748951e6f1e7e650cc25df7b59a2933370df6f6da67c22edb05cfff35f0daa9137ec7a68061722006a3de2233dd4802ad4c9e587cda4284e4094bd SHA512 a14f5dead31364543839c54a6ea4e16d796c9c99277a8fe2cb29edfb2f8259f45befcb33923fe6932cc7da25d9c09cc54d1ea1bd12cc11c52fe6ba52f4f9ef8f
 EBUILD dominate-2.3.1.ebuild 601 BLAKE2B 4171d3aac39646662f7f7ebf1c385ac76345384934155f215f4e0c52eefb1a62660aa520347af763466b36701e1a040ebec9fde40b586aa8c7523141b5dac799 SHA512 5fee8dfda24408ada65451f2bb1285cdb02fab6dd908ecd6fe57894864b69e9bc80026d7518b9a058246558d69ffa2c1069a9552d358fadd693d8b3411537078
-EBUILD dominate-2.3.4.ebuild 603 BLAKE2B cfea3ed2ed54d9efe4c6dc81da676e88b25c7da292a2f0dbff0f2db67a5db266c76e153327b971eb6f2efae1dcf3a867f411f59c54215a90583e9a30fa7c8da8 SHA512 00ca75a622d9040b81e9b8513440a32b371feaa29f9f6ddc529cf0fe055e909e0e7b1a02be4d5ded870c29a614d806ef0c63e1f4aa449c60d5a7880c7f38c2b2
 EBUILD dominate-2.3.5.ebuild 603 BLAKE2B cfea3ed2ed54d9efe4c6dc81da676e88b25c7da292a2f0dbff0f2db67a5db266c76e153327b971eb6f2efae1dcf3a867f411f59c54215a90583e9a30fa7c8da8 SHA512 00ca75a622d9040b81e9b8513440a32b371feaa29f9f6ddc529cf0fe055e909e0e7b1a02be4d5ded870c29a614d806ef0c63e1f4aa449c60d5a7880c7f38c2b2
+EBUILD dominate-2.4.0.ebuild 604 BLAKE2B d8642d6a152c4fb8116aa439f19691ff2bba07172c69deb32540e5bdba5eaad10b4115578f40e41bab2d35e68c1a416f51b826cba7bbc22b970c6ed0a6e285a4 SHA512 6362ce7770c6908dfbf0d4e6330bdc952953985a3501226917e664d08ff3c9a8e185aac1f7af59676996d55ea46fe25a6e9558cb39179a70a7daa51e9a9e054a
 MISC metadata.xml 771 BLAKE2B b57440fdd8bad6140d982af019944cc740ba47183908dc2505c1436448e735cd63f537b3ef2158b6014c4dc050128b13881b368ef9ed5e840b37f7e88ac72a25 SHA512 2af8875459291f59c07ece49ac0edeab74408f54031878c1b03581bdbcfcb509caf37ee30d03e2f86f59dd67aba62c54808ca5a6c67037717113c3bfb6f9961e
diff --git a/dev-python/dominate/dominate-2.3.4.ebuild b/dev-python/dominate/dominate-2.4.0.ebuild
index e3351d0beca1..1b6ca3ac3a8d 100644
--- a/dev-python/dominate/dominate-2.3.4.ebuild
+++ b/dev-python/dominate/dominate-2.4.0.ebuild
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
-DEPEND="
+BDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
 "
diff --git a/dev-python/elasticsearch-curator/Manifest b/dev-python/elasticsearch-curator/Manifest
index 8165badb559f..bd231d540d49 100644
--- a/dev-python/elasticsearch-curator/Manifest
+++ b/dev-python/elasticsearch-curator/Manifest
@@ -1,10 +1,7 @@
-DIST elasticsearch-6.1.1.tar.gz 28462503 BLAKE2B a3ac6edf6ed110fc3832bc6b1c5e4d7acbc67ee2faeba35d9dc7215bbcf10fb3617cfbc050687d7361fc4b6f644afe9cbfc23591b5ae26e692f38dbf13872e7d SHA512 dcc23ef80ad2545490508d3e9db2fd0e6ae9a99cece0990f537c522265961dad234734548d1d86288af7f65a6ee681f5624d2c0e71df0e1dcc32fdb56dcefe92
-DIST elasticsearch-curator-5.4.1.tar.gz 294363 BLAKE2B 180882cee9ed3424569705beda727f823cea0cfc47897d06b1cb8258166e40fc9913eb266481b09155a0f5f88b52a680b9187f69417983c2d78b5d24874489c3 SHA512 a2f187d99ebcf8069bfd472316aefe501719400268120c250812670e5525209cebffa913f5fb988305d963bb2a7b61cf47426905b856e34f41afd3a9d67d28f3
 DIST elasticsearch-curator-5.5.4.tar.gz 221161 BLAKE2B 41828800dd9237142767d3163b3d87770ea5b904858991598cce2feb7c3a22d85c0d73275a2f232099ea82e7346fc20080a3bfef692ee808b730d3e4e6de405d SHA512 99ed18592105d19791513ad713115b6e2a6b589ab8b4e3fc4435b2878e25f552e0bda8d63cb6279970afc6ba39d9f3db17af1b4fb44500fe8a14b060e1530258
 DIST elasticsearch-curator-5.6.0.tar.gz 221555 BLAKE2B cbf1f645b266d2d08914ff74fd5c63bcd5661ef68a8b9286ed59b05d52d50e18e8d18e00b3a0e037f8e6452ce79213280b5ecffaf6af0a3fb70ef92458c80efa SHA512 7dc02b5d15228ea96254dc7dd8069d8396c5d3df883b7ab42936c7612b0f16f5399131563703ccd05469facee7ddf20a720daf62a2713943a4b9a0c9448dd676
 DIST elasticsearch-oss-6.3.2.tar.gz 29418577 BLAKE2B 152640dc01a10f44ba43f87f68361cc0dd5e1cf54d0ff92377f3acd1a12a247f002ffe2d003cc53760e891278249c10b1d6d4eb978b0bb1c1ebf8879a2cfcb9a SHA512 3c51a860414f7e55900b1d9a350bdbc3e673c8445e316454c2480315b4b9fc08df58090c6281cecc3ae63d12d78d6bd58e228b3371aa325db799ce18758a21f4
 DIST elasticsearch-oss-6.4.3.tar.gz 33727639 BLAKE2B b4f4821af7a2447a6a16158c32bf676ebbfd8598fde8af558dd19d6e365df66be17d0984e3acb9380a0d5e0cff486b85f6edf96312bd3bb3fc5ae52c270306f3 SHA512 b1147baa95119a8a96779125351358b4c62f2a546b65a9750c11d1d1b9270f06db6da8ff1d9ad11efade1eaea8487087e2d8839b0edfc5da6d9b54da6c6df4e7
-EBUILD elasticsearch-curator-5.4.1.ebuild 3222 BLAKE2B 8743dd44943e95d6cab29d9f9268c21fabd757caeb08a2bc75bb66340c7256f3a9bdf7a160a7a6acc1268ecea72b03d4964d434fa26849589b2f2142b89d0c61 SHA512 1ef1fbbc8f2335d5bb55020530016096c9347a447b4545d5aaeccc01a740a24aa700d64281afd32b81c0eb43de2b54ed888b97f718e04b50f3f8fc81f6506765
 EBUILD elasticsearch-curator-5.5.4-r1.ebuild 3664 BLAKE2B 1714647e31bc93192589bd89730a4f89463ebd0e1690e52047dc3bc86ea1be77b45bbd1b88d38f9cc472c0dddde381f53bb23b0d3dc6933aa6447bae30d71523 SHA512 d4983d75d7a447f6b368d907b5bae29bd495aef86fee9dd7d56c9e26bf22a57d7370ac9b486cf1e28f2be4082dba8c3416a62ffea4d06caa89f5043eb4bba97d
 EBUILD elasticsearch-curator-5.6.0.ebuild 4551 BLAKE2B 5c2643e3ee6ad4f9fb53a8a8a913029e5a2bcffe92d6455729c43ae73d4bda926ac3ae82bd505259d848c4384f5e8ae5d039bb2428364549f843a1c99e668d92 SHA512 bd3a0e8251aff67aebd5c287071b76401cffd781724298f5f0021df4ec5c1f90716d6320223605586d15bc04801111b126d709784b417e7ac48c4c19b9b6f909
 MISC metadata.xml 469 BLAKE2B 7c08e8c5ee97bee865afa27423349bf1998d868fea946d5d61b3eab77094a782d151677bac74f1b8c7ebbc4d88d323c3806251b463627994fcbda2a812524224 SHA512 38e98a77a6da51e077ac9a0dc77059276c58f56f8e26ca45a26df3ec16641dcb46ca9bccf85fd0dc9a358de1ac1424bfffd4cfc3d8213272ec6193663c89860e
diff --git a/dev-python/elasticsearch-curator/elasticsearch-curator-5.4.1.ebuild b/dev-python/elasticsearch-curator/elasticsearch-curator-5.4.1.ebuild
deleted file mode 100644
index 356801ca1a8b..000000000000
--- a/dev-python/elasticsearch-curator/elasticsearch-curator-5.4.1.ebuild
+++ /dev/null
@@ -1,118 +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} )
-
-MY_PN="curator"
-ES_VERSION="6.1.1"
-
-inherit distutils-r1
-
-DESCRIPTION="Tending time-series indices in Elasticsearch"
-HOMEPAGE="https://github.com/elasticsearch/curator"
-SRC_URI="https://github.com/elasticsearch/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}.tar.gz )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-RESTRICT="test"
-IUSE="doc test"
-
-RDEPEND="
-	>=dev-python/elasticsearch-py-5.4.0[${PYTHON_USEDEP}]
-	<dev-python/elasticsearch-py-7.0.0[${PYTHON_USEDEP}]
-	>=dev-python/click-6.7[${PYTHON_USEDEP}]
-	>=dev-python/certifi-2017.4.17[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.20[${PYTHON_USEDEP}]
-	>=dev-python/voluptuous-0.9.3[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		virtual/jre:1.8
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/nosexcover[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_prepare_all() {
-	# avoid downloading from net
-	sed -e '/^intersphinx_mapping/,+3d' -i docs/conf.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	emake -C docs -j1 man $(usex doc html "")
-}
-
-# tests fail in chroot
-# https://github.com/elastic/elasticsearch/issues/12018
-#
-# running tests in non-chroot environments:
-# FEATURES="test -usersandbox" emerge dev-python/elasticsearch-curator
-python_test() {
-	ES="${WORKDIR}/elasticsearch-${ES_VERSION}"
-	ES_PORT="25123"
-	ES_INSTANCE="gentoo-es-curator-test"
-	ES_LOG="${ES}/logs/${ES_INSTANCE}.log"
-	PID="${ES}/elasticsearch.pid"
-
-	# run Elasticsearch instance on custom port
-	sed -i "s/#http.port: 9200/http.port: ${ES_PORT}/g; \
-		s/#cluster.name: my-application/cluster.name: ${ES_INSTANCE}/g" \
-		"${ES}/config/elasticsearch.yml" || die
-
-	# start local instance of elasticsearch
-	"${ES}/bin/elasticsearch" -d -p "${PID}" -Epath.repo=/ || die
-
-	local i
-	local es_started=0
-	for i in {1..20}; do
-		grep -q "started" "${ES_LOG}" 2> /dev/null
-		if [[ $? -eq 0 ]]; then
-			einfo "Elasticsearch started"
-			es_started=1
-			eend 0
-			break
-		elif grep -q 'BindException\[Address already in use\]' "${ES_LOG}" 2>/dev/null; then
-			eend 1
-			eerror "Elasticsearch already running"
-			die "Cannot start Elasticsearch for tests"
-		else
-			einfo "Waiting for Elasticsearch"
-			eend 1
-			sleep 2
-			continue
-		fi
-	done
-
-	[[ $es_started -eq 0 ]] && die "Elasticsearch failed to start"
-
-	export TEST_ES_SERVER="localhost:${ES_PORT}"
-	esetup.py test || die
-
-	pkill -F ${PID}
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	doman docs/_build/man/*
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	ewarn ""
-	ewarn "For Python 3 support information please read: http://click.pocoo.org/latest/python3/"
-	ewarn ""
-	ewarn "Example usage on Python 3:"
-	ewarn "export LC_ALL=en_US.UTF-8"
-	ewarn "export LANG=en_US.UTF-8"
-	ewarn "curator ..."
-}
diff --git a/dev-python/elasticsearch-py/Manifest b/dev-python/elasticsearch-py/Manifest
index d74ded86ed1d..bc9a0109694d 100644
--- a/dev-python/elasticsearch-py/Manifest
+++ b/dev-python/elasticsearch-py/Manifest
@@ -1,25 +1,4 @@
-DIST elasticsearch-5.6.11.tar.gz 33864199 BLAKE2B 08884e6367007835ec1d248912d4127ade4d5fff85927df86ee7de4ebf5ee9bc9639940c89b71739cf17fd389d0c47a23cc48ccd1777b94830f1614663fd7487 SHA512 cc0ec89889e23d7aa3e03a2bb76bf6bb40b3084a8a13da99851c4770533048283d36b4c13322b4689480914e5e57c4c998d4abba44d8caa44ffdb21edb207a9c
-DIST elasticsearch-5.6.7.tar.gz 33789994 BLAKE2B 4e5f4e55cb3875adee7528e26187659b5bac7b2def9d22d438f888fb33ce116654b54859d8430b203c14939bd3821240f8ed209ce120388256e9389ab9acd11c SHA512 2c9fbe8d3ccdced6242b5d876cb9a25a3ef1b94f9de0720aa438458b0235082220621afffe7976664bf08b13b4aee157c28a5d519b5594e6d9d7855c24e93056
-DIST elasticsearch-5.6.9.tar.gz 33794793 BLAKE2B a056443b1f71b3af773b5195147927017456e1c9a6517c549cfe7e4ec70f0ff4ec9363c9ef6376b7b942e82f811cd5927d44eb9f9eb8022a56e54a85b4ba7c46 SHA512 4e61a4c5f79d0439a414f1e9361f855cdb2f79322cf592bad43132605922fb8ded6368b01e05ef6bcbee49911943c2a3b6be5fd6d0900abddfe03c736cca96d6
-DIST elasticsearch-6.0.1.tar.gz 28026460 BLAKE2B a70cd36affaccccf1ea552167e585a35cc748de1137cf4b23387798ae31b851104ccc19f8be83ecc645bcebfba344b5e55a397a9cbb0b380c4a118f1f0ffecf2 SHA512 b86a04acd194e7e96e3a32de6ab4983d6569ffb1714f2af9e2b49623004987e13e57c5db055153a188f5d2d7eea63d649fa87769f7625f3fc4923e0cd5b8f3ee
-DIST elasticsearch-6.1.3.tar.gz 28454781 BLAKE2B 80c42a64fb533a5b2f0a2c6ea154b129e327acc0d2addc6f1dd5fd949573459ec87118e12b98791642fdfa8e92927d749dd60119adcb398fca56e6e00b0811e2 SHA512 af10cc571ab55f52ab73a86373fa8359214a7866fbb6d2910669e6be897bae30c41c007c3be5803a7f07736041f32cf36425c182a18fab39499321ed9eb4b349
-DIST elasticsearch-6.2.3.tar.gz 29050159 BLAKE2B 32a722e3861abf024a4b82ffe97877896cf3ffc76aac34fd942eeb9ca490ac41f3bf530b6313104fdf2c4900ea377d57837c465c6de6f983afac99802586b1c7 SHA512 8103c2b817cd5e14057c28372f379bb9c2b7833698818882c649d349904163d0c69d147836d03428619535652902532f7e5abc1e23214ad735c54b1d914acabf
-DIST elasticsearch-oss-6.3.0.tar.gz 29418173 BLAKE2B fbe5e08de6628f221d38ebda0c8dc2a63eba0f916e289ef6f587b64817f78fd8f9b8bfaa4db6c05223cd4ff2e4c2213a63b68ef886c56ba2b963238e42e78090 SHA512 679c7b86590b7d006476ddaef2c3eb285d444d30f44877a7b34a0d6bb8ea043477944e9c0d6c4d1d85557aa6b3b724bc8b1025d95af26cf0f19a73b5f701a2aa
 DIST elasticsearch-oss-6.4.0.tar.gz 33727061 BLAKE2B dd0ff95bb124103ca340b480c5192c9919ef226d4c3ef1b61accd0df2ee9b60a8215693b3db0fa327a4d6791de66746654144a9172210687e8a2efa9f6f4dde3 SHA512 0197dcf24bdb81cbcfa492d899363528816143962abd1925a5092e8177c25e8ca490afe5868b41057b3cded296f59f38ed11ba0156a820b6c877c69a5888846c
-DIST elasticsearch-py-5.5.2.tar.gz 83415 BLAKE2B 6adf9d5e05c2d097590bc78df9c9a7a948194a4106d718464c04e705380984b51d8f7e04fe9d0eaa6518d6d8767aa064c99512cf827a31e993178ee3c28a8815 SHA512 c5c9583179e87b13c7edf14baeb5a360369f37a953049c3c7e101c379cf895c8fe743d5edaaee6aa0fa4ee6cdab9364c0177097ad780ed3d85ede754088520a3
-DIST elasticsearch-py-5.5.3.tar.gz 83461 BLAKE2B 8281c841f55d2bf9749e9914ef38f0d06a32cb0367e06ccfe853f628b549a736e5a7ea0d457eadc541058f352bffb2431c077af0b1eb47bb10f4c9d37182d36e SHA512 cbf4a993d5c2245c72a87d2edfa8eae50b5fc474c42ae6d3dd8503941b86ae030925de486047305fa18ee273dbed8e0a2bd66ddf8ec8724ba8d04c1489dd3393
-DIST elasticsearch-py-5.5.5.tar.gz 83691 BLAKE2B cf4475130d0055419018415a83110c693aa6821331bfddbef5225766aa094faae2886ceae1c55aaec15b4cdf295f914cd67d56d9e79996d4a4fac6515b2e1d3c SHA512 686fa7c5b29233687f0c3d531cb9754a8c9dfa43902bb4cfdeb276166aefdca2a31bc2ee302cdace6ccfabd76aa7e08c77ac745e3c4696b5ec368f0f6c0c7efc
-DIST elasticsearch-py-6.0.0.tar.gz 83197 BLAKE2B 5ca16c9b881fe6f8c4944e8eec69be0532fe472564b12dbaa40225b29b8a2b88974e35ed2ab733722023da3ed877a2934bb545387ffdcf307d519950a8971880 SHA512 1d6c27654f9470837e9cb9866cb6f5305d63cac9dc6bddc06309e378a5e7b7fe3d21cae5ffd115685fe8ddcfd8cbbe1457d74799dde0fc7427f90fc870f1c444
-DIST elasticsearch-py-6.1.1.tar.gz 83575 BLAKE2B fc7cd690208a401b83fd1b86957dc49b2bd686248f2d78901551c26e67e06f4c7f6175346fd0374ff509477f571a8074ac30aa0e2cca1c73b11b6cdce67bfe33 SHA512 f593865de8879ac42cbbd35dd6bcc1da9513124556dcd3f1d8240e9d2818682136bfac09387c50797f4daada33699a7f5c1591172a7d89c3bd865595a5706c18
-DIST elasticsearch-py-6.2.0.tar.gz 89784 BLAKE2B 150668b378d50ea2d62f75a71127b524d44e5d69bc96905f70b38162598a11ab77aa34814788e4177f668a1109191bdbb4c28698da608a35c70a45026ad9c22b SHA512 f7205db8b8608ce52657a114a38f59b95ed0ea5acb0a5f18197be6baebde80fd88210a5f88fb5d2770f82f1dc7212d038d801f96c7d18cfe1e77c16ee0fa5208
-DIST elasticsearch-py-6.3.0.tar.gz 90835 BLAKE2B 3c1fba5b70474b6119678fd2d9234b625fca120d7fbd1ab048ff455daf30f4784e468fe0e62b4866ef13d344144e9d7b53bbbc0ad9725e7c5132b79275785242 SHA512 ee60840b7e9706141a650821f705f1bb92fe3c4c282ecad71b3912ad25025519f456b45af85109a900094a53c47c374e450d771c1ef3a3690400272c6f8a47bc
 DIST elasticsearch-py-6.3.1.tar.gz 90047 BLAKE2B 765d0a34bd22067e07f4e862eb72f2b67bd0db3516abdf76cdc0d4f24de3db6941b4dbc6afb6315667d640514415cf08ff6de127c84ab36ef9bf062d4e687d55 SHA512 b975a6b446b760bf62289e855768a26b9e104aba9cd399cf275f59f2755efa00bd55c99a746751dad2f7a18f581a1b124c1bb9b91f5c3dc9fb00138c9d198aea
-EBUILD elasticsearch-py-5.5.2.ebuild 2749 BLAKE2B 37c4e6345cbea49c6a7368f0cdb52f1c1837187589126840a8411a4bc0d873a9f5ed1ab69ebdfed1908c344a950ac5304347bae055123c1a15aa1a36e8cd60e8 SHA512 e7924e2f5e1a043d5bc82b38162eb282bbd1d12ec1ea74eb3ffd10b54e5f8d8c1ea1623d435ed7254429e2d6cc8aa3cb20fd490a9dec0f96fd113e2bdf86cce6
-EBUILD elasticsearch-py-5.5.3.ebuild 2751 BLAKE2B b5643750f12dc7f861ebc1f4ceec9597c9cf5c9d7de7de48acf3a705702f67fb42b0b2f88b469712d70a9e103759b6277e5a0e45da2b4afd0403d7e9bf43f920 SHA512 0e09a1284338c825705746fc6b889d229d70cbba0cc78dce5f012bb4cabf97e3672d3971e584a239198aeecbe15bdf5398165f42e2432d532d7bb78e416e4d7b
-EBUILD elasticsearch-py-5.5.5.ebuild 2752 BLAKE2B 97d03a05754a982373bf083ef31de712644bbcbdc2bcdb4378dfcdfe81ac20309570b20828213f84f1a7327a02cdcb37ba4cbe4e37de030f23330d46d6e4da7e SHA512 41406999df8160666ae317b4c8138b1f1a10777ab981fdfcb5cdc1379c69314a668851cf2e05d8ccfb5b54c19f072611a01aa1e66f443061d4cd30ed85e3f92e
-EBUILD elasticsearch-py-6.0.0.ebuild 2751 BLAKE2B 342aaf5ed5828863111bc187a4bb561a5b5e6810e4dabfc7718e080a81ecd7a17166486524ab550528ec5a2660ffa01b60c86a0368ab54bed04b357779e818b2 SHA512 77dd5fb0085ddfccde8252a71845ab5f6c17600517108e6a14e42077400b140b53e58dc89d9335b087f285bcdbc6a619574fe59459a5372204cc0843c31ce837
-EBUILD elasticsearch-py-6.1.1.ebuild 2751 BLAKE2B c007d5669c8b4dcc9375cd83a06d79eb88e2cccda9ec3bdb4985d78d31bfc9401820c86dbe436ebfc289bdf7c6cb955217a334d0f28de88642d5db01598dd964 SHA512 263524a51666c44c4bce3176a3a68b5df56ff321c026382ef15786436f3d6186dc332e1ba76b6608b09fadd56401a9448065fcbfef513826ce86cb54a9156fef
-EBUILD elasticsearch-py-6.2.0.ebuild 2751 BLAKE2B acfa9ac458ae5174cb95871013d9c5cb6f1f6a4f815e2d237c7aa54e83851d784b3e81e0c67bbfbb7e4988dcf4992ad97cd57e23bd8f0b497f5218150f893fcc SHA512 12d55c739c6a97b52f562dca07188b9406bf1f0497d3347933f2897060ba408dd920e46322fc89b1429bdb45a76ac30639dd92f880c1a9160cb5c2b876b881a7
-EBUILD elasticsearch-py-6.3.0.ebuild 2755 BLAKE2B 8f7ee0afce86250122634da1782dc016018d96447a0c4988d21e00d9d8591d8ffed5d32082cd382774acc7c02329b75a677ace8e66ba236244c60b36af0cabbc SHA512 33c9e2943f7acd3b7ea34e69fcf97c724e0fa81c0d60d5978635adcbbd5d7ae13e2dc62c16532db8cceb3b7f0cd3a4d46b5181bfec57f1a25cb6696e1d7dff53
 EBUILD elasticsearch-py-6.3.1-r1.ebuild 2601 BLAKE2B d3447d9fc518bd287a5ac9750d8713cecaf3e9871b07750734073abae339a14ba49427fc921246da724b6d3d18cd6b38fbfcea23869386d12b2a7290eb671d84 SHA512 5e6ad003403b4b802abf28279b96f699187f1db632389ccb0965e072863492480270648ce1bf73693e3fb7e7cfecfe5b835fa613d11ee4929a22c19f7a4f2a04
 MISC metadata.xml 592 BLAKE2B 3535c37456da9c7904e88e5921c6fd27bf6790178a0f847d0a302aae76e4c68889d31337383ac1d0a1dbb55d7f37bc056bced2f2de29c4d85864b881feeb3405 SHA512 752265ff356d02b2825ac2ef5e5177649cdcdd31b5a3738e3638af89a7bfef8b16fef8332e67c3ac03285318b22e455795c75d408a1abfc99068a1d4015eade0
diff --git a/dev-python/elasticsearch-py/elasticsearch-py-5.5.2.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-5.5.2.ebuild
deleted file mode 100644
index ee4f3c193d17..000000000000
--- a/dev-python/elasticsearch-py/elasticsearch-py-5.5.2.ebuild
+++ /dev/null
@@ -1,102 +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} pypy )
-ES_VERSION="5.6.7"
-
-inherit distutils-r1
-
-MY_PN=${PN/-py/}
-DESCRIPTION="official Python low-level client for Elasticsearch"
-HOMEPAGE="https://github.com/elastic/elasticsearch-py"
-SRC_URI="https://github.com/elasticsearch/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}.tar.gz )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="examples doc test"
-
-# tests fail in chroot
-# https://github.com/elastic/elasticsearch/issues/12018
-RESTRICT="test"
-
-RDEPEND=">=dev-python/urllib3-1.21.1[${PYTHON_USEDEP}]
-	<dev-python/urllib3-1.23[${PYTHON_USEDEP}]"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-1.3.1-r1[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
-		<dev-python/requests-3.0.0[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pretty-yaml[${PYTHON_USEDEP}]
-		dev-python/nosexcover[${PYTHON_USEDEP}]
-		virtual/jre:1.8 )"
-
-python_prepare_all() {
-	# 643684
-	sed -i -e /urllib3/d setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	emake -C docs -j1 man $(usex doc html "")
-}
-
-# FEATURES="test -usersandbox" emerge dev-python/elasticsearch-py
-python_test() {
-	ES="${WORKDIR}/elasticsearch-${ES_VERSION}"
-	ES_PORT="25124"
-	ES_INSTANCE="gentoo-es-py-test"
-	ES_LOG="${ES}/logs/${ES_INSTANCE}.log"
-	PID="${ES}/elasticsearch.pid"
-
-	# run Elasticsearch instance on custom port
-	sed -i "s/#http.port: 9200/http.port: ${ES_PORT}/g; \
-		s/#cluster.name: my-application/cluster.name: ${ES_INSTANCE}/g" \
-		"${ES}/config/elasticsearch.yml" || die
-
-	# start local instance of elasticsearch
-	"${ES}"/bin/elasticsearch -d -p "${PID}" -Epath.repo=/ || die
-
-	local i
-	local es_started=0
-	for i in {1..20}; do
-		grep -q "started" ${ES_LOG} 2> /dev/null
-		if [[ $? -eq 0 ]]; then
-			einfo "Elasticsearch started"
-			es_started=1
-			eend 0
-			break
-		elif grep -q 'BindException\[Address already in use\]' "${ES_LOG}" 2>/dev/null; then
-			eend 1
-			eerror "Elasticsearch already running"
-			die "Cannot start Elasticsearch for tests"
-		else
-			einfo "Waiting for Elasticsearch"
-			eend 1
-			sleep 2
-			continue
-		fi
-	done
-
-	[[ $es_started -eq 0 ]] && die "Elasticsearch failed to start"
-
-	export TEST_ES_SERVER="localhost:${ES_PORT}"
-	esetup.py test || die
-
-	pkill -F ${PID}
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/_build/html/. )
-	use examples && dodoc -r example
-	doman docs/_build/man/*
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/elasticsearch-py/elasticsearch-py-5.5.3.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-5.5.3.ebuild
deleted file mode 100644
index b3208f47c467..000000000000
--- a/dev-python/elasticsearch-py/elasticsearch-py-5.5.3.ebuild
+++ /dev/null
@@ -1,102 +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} pypy )
-ES_VERSION="5.6.9"
-
-inherit distutils-r1
-
-MY_PN=${PN/-py/}
-DESCRIPTION="official Python low-level client for Elasticsearch"
-HOMEPAGE="https://github.com/elastic/elasticsearch-py"
-SRC_URI="https://github.com/elasticsearch/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}.tar.gz )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples doc test"
-
-# tests fail in chroot
-# https://github.com/elastic/elasticsearch/issues/12018
-RESTRICT="test"
-
-RDEPEND=">=dev-python/urllib3-1.21.1[${PYTHON_USEDEP}]
-	<dev-python/urllib3-1.23[${PYTHON_USEDEP}]"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-1.3.1-r1[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
-		<dev-python/requests-3.0.0[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pretty-yaml[${PYTHON_USEDEP}]
-		dev-python/nosexcover[${PYTHON_USEDEP}]
-		virtual/jre:1.8 )"
-
-python_prepare_all() {
-	# 643684
-	sed -i -e /urllib3/d setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	emake -C docs -j1 man $(usex doc html "")
-}
-
-# FEATURES="test -usersandbox" emerge dev-python/elasticsearch-py
-python_test() {
-	ES="${WORKDIR}/elasticsearch-${ES_VERSION}"
-	ES_PORT="25124"
-	ES_INSTANCE="gentoo-es-py-test"
-	ES_LOG="${ES}/logs/${ES_INSTANCE}.log"
-	PID="${ES}/elasticsearch.pid"
-
-	# run Elasticsearch instance on custom port
-	sed -i "s/#http.port: 9200/http.port: ${ES_PORT}/g; \
-		s/#cluster.name: my-application/cluster.name: ${ES_INSTANCE}/g" \
-		"${ES}/config/elasticsearch.yml" || die
-
-	# start local instance of elasticsearch
-	"${ES}"/bin/elasticsearch -d -p "${PID}" -Epath.repo=/ || die
-
-	local i
-	local es_started=0
-	for i in {1..20}; do
-		grep -q "started" ${ES_LOG} 2> /dev/null
-		if [[ $? -eq 0 ]]; then
-			einfo "Elasticsearch started"
-			es_started=1
-			eend 0
-			break
-		elif grep -q 'BindException\[Address already in use\]' "${ES_LOG}" 2>/dev/null; then
-			eend 1
-			eerror "Elasticsearch already running"
-			die "Cannot start Elasticsearch for tests"
-		else
-			einfo "Waiting for Elasticsearch"
-			eend 1
-			sleep 2
-			continue
-		fi
-	done
-
-	[[ $es_started -eq 0 ]] && die "Elasticsearch failed to start"
-
-	export TEST_ES_SERVER="localhost:${ES_PORT}"
-	esetup.py test || die
-
-	pkill -F ${PID}
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/_build/html/. )
-	use examples && dodoc -r example
-	doman docs/_build/man/*
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/elasticsearch-py/elasticsearch-py-5.5.5.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-5.5.5.ebuild
deleted file mode 100644
index 300b20c1f1be..000000000000
--- a/dev-python/elasticsearch-py/elasticsearch-py-5.5.5.ebuild
+++ /dev/null
@@ -1,102 +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} pypy )
-ES_VERSION="5.6.11"
-
-inherit distutils-r1
-
-MY_PN=${PN/-py/}
-DESCRIPTION="official Python low-level client for Elasticsearch"
-HOMEPAGE="https://github.com/elastic/elasticsearch-py"
-SRC_URI="https://github.com/elasticsearch/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}.tar.gz )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples doc test"
-
-# tests fail in chroot
-# https://github.com/elastic/elasticsearch/issues/12018
-RESTRICT="test"
-
-RDEPEND=">=dev-python/urllib3-1.21.1[${PYTHON_USEDEP}]
-	<dev-python/urllib3-1.23[${PYTHON_USEDEP}]"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-1.3.1-r1[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
-		<dev-python/requests-3.0.0[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pretty-yaml[${PYTHON_USEDEP}]
-		dev-python/nosexcover[${PYTHON_USEDEP}]
-		virtual/jre:1.8 )"
-
-python_prepare_all() {
-	# 643684
-	sed -i -e /urllib3/d setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	emake -C docs -j1 man $(usex doc html "")
-}
-
-# FEATURES="test -usersandbox" emerge dev-python/elasticsearch-py
-python_test() {
-	ES="${WORKDIR}/elasticsearch-${ES_VERSION}"
-	ES_PORT="25124"
-	ES_INSTANCE="gentoo-es-py-test"
-	ES_LOG="${ES}/logs/${ES_INSTANCE}.log"
-	PID="${ES}/elasticsearch.pid"
-
-	# run Elasticsearch instance on custom port
-	sed -i "s/#http.port: 9200/http.port: ${ES_PORT}/g; \
-		s/#cluster.name: my-application/cluster.name: ${ES_INSTANCE}/g" \
-		"${ES}/config/elasticsearch.yml" || die
-
-	# start local instance of elasticsearch
-	"${ES}"/bin/elasticsearch -d -p "${PID}" -Epath.repo=/ || die
-
-	local i
-	local es_started=0
-	for i in {1..20}; do
-		grep -q "started" ${ES_LOG} 2> /dev/null
-		if [[ $? -eq 0 ]]; then
-			einfo "Elasticsearch started"
-			es_started=1
-			eend 0
-			break
-		elif grep -q 'BindException\[Address already in use\]' "${ES_LOG}" 2>/dev/null; then
-			eend 1
-			eerror "Elasticsearch already running"
-			die "Cannot start Elasticsearch for tests"
-		else
-			einfo "Waiting for Elasticsearch"
-			eend 1
-			sleep 2
-			continue
-		fi
-	done
-
-	[[ $es_started -eq 0 ]] && die "Elasticsearch failed to start"
-
-	export TEST_ES_SERVER="localhost:${ES_PORT}"
-	esetup.py test || die
-
-	pkill -F ${PID}
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/_build/html/. )
-	use examples && dodoc -r example
-	doman docs/_build/man/*
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/elasticsearch-py/elasticsearch-py-6.0.0.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-6.0.0.ebuild
deleted file mode 100644
index 7536f2f9cfda..000000000000
--- a/dev-python/elasticsearch-py/elasticsearch-py-6.0.0.ebuild
+++ /dev/null
@@ -1,102 +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} pypy )
-ES_VERSION="6.0.1"
-
-inherit distutils-r1
-
-MY_PN=${PN/-py/}
-DESCRIPTION="official Python low-level client for Elasticsearch"
-HOMEPAGE="https://github.com/elastic/elasticsearch-py"
-SRC_URI="https://github.com/elasticsearch/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}.tar.gz )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples doc test"
-
-# tests fail in chroot
-# https://github.com/elastic/elasticsearch/issues/12018
-RESTRICT="test"
-
-RDEPEND=">=dev-python/urllib3-1.21.1[${PYTHON_USEDEP}]
-	<dev-python/urllib3-1.23[${PYTHON_USEDEP}]"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-1.3.1-r1[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
-		<dev-python/requests-3.0.0[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pretty-yaml[${PYTHON_USEDEP}]
-		dev-python/nosexcover[${PYTHON_USEDEP}]
-		virtual/jre:1.8 )"
-
-python_prepare_all() {
-	# 643684
-	sed -i -e /urllib3/d setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	emake -C docs -j1 man $(usex doc html "")
-}
-
-# FEATURES="test -usersandbox" emerge dev-python/elasticsearch-py
-python_test() {
-	ES="${WORKDIR}/elasticsearch-${ES_VERSION}"
-	ES_PORT="25124"
-	ES_INSTANCE="gentoo-es-py-test"
-	ES_LOG="${ES}/logs/${ES_INSTANCE}.log"
-	PID="${ES}/elasticsearch.pid"
-
-	# run Elasticsearch instance on custom port
-	sed -i "s/#http.port: 9200/http.port: ${ES_PORT}/g; \
-		s/#cluster.name: my-application/cluster.name: ${ES_INSTANCE}/g" \
-		"${ES}/config/elasticsearch.yml" || die
-
-	# start local instance of elasticsearch
-	"${ES}"/bin/elasticsearch -d -p "${PID}" -Epath.repo=/ || die
-
-	local i
-	local es_started=0
-	for i in {1..20}; do
-		grep -q "started" ${ES_LOG} 2> /dev/null
-		if [[ $? -eq 0 ]]; then
-			einfo "Elasticsearch started"
-			es_started=1
-			eend 0
-			break
-		elif grep -q 'BindException\[Address already in use\]' "${ES_LOG}" 2>/dev/null; then
-			eend 1
-			eerror "Elasticsearch already running"
-			die "Cannot start Elasticsearch for tests"
-		else
-			einfo "Waiting for Elasticsearch"
-			eend 1
-			sleep 2
-			continue
-		fi
-	done
-
-	[[ $es_started -eq 0 ]] && die "Elasticsearch failed to start"
-
-	export TEST_ES_SERVER="localhost:${ES_PORT}"
-	esetup.py test || die
-
-	pkill -F ${PID}
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/_build/html/. )
-	use examples && dodoc -r example
-	doman docs/_build/man/*
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/elasticsearch-py/elasticsearch-py-6.1.1.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-6.1.1.ebuild
deleted file mode 100644
index b97c874489db..000000000000
--- a/dev-python/elasticsearch-py/elasticsearch-py-6.1.1.ebuild
+++ /dev/null
@@ -1,102 +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} pypy )
-ES_VERSION="6.1.3"
-
-inherit distutils-r1
-
-MY_PN=${PN/-py/}
-DESCRIPTION="official Python low-level client for Elasticsearch"
-HOMEPAGE="https://github.com/elastic/elasticsearch-py"
-SRC_URI="https://github.com/elasticsearch/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}.tar.gz )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples doc test"
-
-# tests fail in chroot
-# https://github.com/elastic/elasticsearch/issues/12018
-RESTRICT="test"
-
-RDEPEND=">=dev-python/urllib3-1.21.1[${PYTHON_USEDEP}]
-	<dev-python/urllib3-1.23[${PYTHON_USEDEP}]"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-1.3.1-r1[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
-		<dev-python/requests-3.0.0[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pretty-yaml[${PYTHON_USEDEP}]
-		dev-python/nosexcover[${PYTHON_USEDEP}]
-		virtual/jre:1.8 )"
-
-python_prepare_all() {
-	# 643684
-	sed -i -e /urllib3/d setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	emake -C docs -j1 man $(usex doc html "")
-}
-
-# FEATURES="test -usersandbox" emerge dev-python/elasticsearch-py
-python_test() {
-	ES="${WORKDIR}/elasticsearch-${ES_VERSION}"
-	ES_PORT="25124"
-	ES_INSTANCE="gentoo-es-py-test"
-	ES_LOG="${ES}/logs/${ES_INSTANCE}.log"
-	PID="${ES}/elasticsearch.pid"
-
-	# run Elasticsearch instance on custom port
-	sed -i "s/#http.port: 9200/http.port: ${ES_PORT}/g; \
-		s/#cluster.name: my-application/cluster.name: ${ES_INSTANCE}/g" \
-		"${ES}/config/elasticsearch.yml" || die
-
-	# start local instance of elasticsearch
-	"${ES}"/bin/elasticsearch -d -p "${PID}" -Epath.repo=/ || die
-
-	local i
-	local es_started=0
-	for i in {1..20}; do
-		grep -q "started" ${ES_LOG} 2> /dev/null
-		if [[ $? -eq 0 ]]; then
-			einfo "Elasticsearch started"
-			es_started=1
-			eend 0
-			break
-		elif grep -q 'BindException\[Address already in use\]' "${ES_LOG}" 2>/dev/null; then
-			eend 1
-			eerror "Elasticsearch already running"
-			die "Cannot start Elasticsearch for tests"
-		else
-			einfo "Waiting for Elasticsearch"
-			eend 1
-			sleep 2
-			continue
-		fi
-	done
-
-	[[ $es_started -eq 0 ]] && die "Elasticsearch failed to start"
-
-	export TEST_ES_SERVER="localhost:${ES_PORT}"
-	esetup.py test || die
-
-	pkill -F ${PID}
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/_build/html/. )
-	use examples && dodoc -r example
-	doman docs/_build/man/*
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/elasticsearch-py/elasticsearch-py-6.2.0.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-6.2.0.ebuild
deleted file mode 100644
index 9f5cc806e6af..000000000000
--- a/dev-python/elasticsearch-py/elasticsearch-py-6.2.0.ebuild
+++ /dev/null
@@ -1,102 +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} pypy )
-ES_VERSION="6.2.3"
-
-inherit distutils-r1
-
-MY_PN=${PN/-py/}
-DESCRIPTION="official Python low-level client for Elasticsearch"
-HOMEPAGE="https://github.com/elastic/elasticsearch-py"
-SRC_URI="https://github.com/elasticsearch/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}.tar.gz )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples doc test"
-
-# tests fail in chroot
-# https://github.com/elastic/elasticsearch/issues/12018
-RESTRICT="test"
-
-RDEPEND=">=dev-python/urllib3-1.21.1[${PYTHON_USEDEP}]
-	<dev-python/urllib3-1.23[${PYTHON_USEDEP}]"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-1.3.1-r1[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
-		<dev-python/requests-3.0.0[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pretty-yaml[${PYTHON_USEDEP}]
-		dev-python/nosexcover[${PYTHON_USEDEP}]
-		virtual/jre:1.8 )"
-
-python_prepare_all() {
-	# 643684
-	sed -i -e /urllib3/d setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	emake -C docs -j1 man $(usex doc html "")
-}
-
-# FEATURES="test -usersandbox" emerge dev-python/elasticsearch-py
-python_test() {
-	ES="${WORKDIR}/elasticsearch-${ES_VERSION}"
-	ES_PORT="25124"
-	ES_INSTANCE="gentoo-es-py-test"
-	ES_LOG="${ES}/logs/${ES_INSTANCE}.log"
-	PID="${ES}/elasticsearch.pid"
-
-	# run Elasticsearch instance on custom port
-	sed -i "s/#http.port: 9200/http.port: ${ES_PORT}/g; \
-		s/#cluster.name: my-application/cluster.name: ${ES_INSTANCE}/g" \
-		"${ES}/config/elasticsearch.yml" || die
-
-	# start local instance of elasticsearch
-	"${ES}"/bin/elasticsearch -d -p "${PID}" -Epath.repo=/ || die
-
-	local i
-	local es_started=0
-	for i in {1..20}; do
-		grep -q "started" ${ES_LOG} 2> /dev/null
-		if [[ $? -eq 0 ]]; then
-			einfo "Elasticsearch started"
-			es_started=1
-			eend 0
-			break
-		elif grep -q 'BindException\[Address already in use\]' "${ES_LOG}" 2>/dev/null; then
-			eend 1
-			eerror "Elasticsearch already running"
-			die "Cannot start Elasticsearch for tests"
-		else
-			einfo "Waiting for Elasticsearch"
-			eend 1
-			sleep 2
-			continue
-		fi
-	done
-
-	[[ $es_started -eq 0 ]] && die "Elasticsearch failed to start"
-
-	export TEST_ES_SERVER="localhost:${ES_PORT}"
-	esetup.py test || die
-
-	pkill -F ${PID}
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/_build/html/. )
-	use examples && dodoc -r example
-	doman docs/_build/man/*
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/elasticsearch-py/elasticsearch-py-6.3.0.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-6.3.0.ebuild
deleted file mode 100644
index aec27df0aa61..000000000000
--- a/dev-python/elasticsearch-py/elasticsearch-py-6.3.0.ebuild
+++ /dev/null
@@ -1,102 +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} pypy )
-ES_VERSION="6.3.0"
-
-inherit distutils-r1
-
-MY_PN=${PN/-py/}
-DESCRIPTION="official Python low-level client for Elasticsearch"
-HOMEPAGE="https://github.com/elastic/elasticsearch-py"
-SRC_URI="https://github.com/elasticsearch/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-${ES_VERSION}.tar.gz )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples doc test"
-
-# tests fail in chroot
-# https://github.com/elastic/elasticsearch/issues/12018
-RESTRICT="test"
-
-RDEPEND=">=dev-python/urllib3-1.21.1[${PYTHON_USEDEP}]
-	<dev-python/urllib3-1.23[${PYTHON_USEDEP}]"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-1.3.1-r1[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
-		<dev-python/requests-3.0.0[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pretty-yaml[${PYTHON_USEDEP}]
-		dev-python/nosexcover[${PYTHON_USEDEP}]
-		virtual/jre:1.8 )"
-
-python_prepare_all() {
-	# 643684
-	sed -i -e /urllib3/d setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	emake -C docs -j1 man $(usex doc html "")
-}
-
-# FEATURES="test -usersandbox" emerge dev-python/elasticsearch-py
-python_test() {
-	ES="${WORKDIR}/elasticsearch-${ES_VERSION}"
-	ES_PORT="25124"
-	ES_INSTANCE="gentoo-es-py-test"
-	ES_LOG="${ES}/logs/${ES_INSTANCE}.log"
-	PID="${ES}/elasticsearch.pid"
-
-	# run Elasticsearch instance on custom port
-	sed -i "s/#http.port: 9200/http.port: ${ES_PORT}/g; \
-		s/#cluster.name: my-application/cluster.name: ${ES_INSTANCE}/g" \
-		"${ES}/config/elasticsearch.yml" || die
-
-	# start local instance of elasticsearch
-	"${ES}"/bin/elasticsearch -d -p "${PID}" -Epath.repo=/ || die
-
-	local i
-	local es_started=0
-	for i in {1..20}; do
-		grep -q "started" ${ES_LOG} 2> /dev/null
-		if [[ $? -eq 0 ]]; then
-			einfo "Elasticsearch started"
-			es_started=1
-			eend 0
-			break
-		elif grep -q 'BindException\[Address already in use\]' "${ES_LOG}" 2>/dev/null; then
-			eend 1
-			eerror "Elasticsearch already running"
-			die "Cannot start Elasticsearch for tests"
-		else
-			einfo "Waiting for Elasticsearch"
-			eend 1
-			sleep 2
-			continue
-		fi
-	done
-
-	[[ $es_started -eq 0 ]] && die "Elasticsearch failed to start"
-
-	export TEST_ES_SERVER="localhost:${ES_PORT}"
-	esetup.py test || die
-
-	pkill -F ${PID}
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/_build/html/. )
-	use examples && dodoc -r example
-	doman docs/_build/man/*
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/future/Manifest b/dev-python/future/Manifest
index 7b76830acfd2..140ef7cb312b 100644
--- a/dev-python/future/Manifest
+++ b/dev-python/future/Manifest
@@ -1,3 +1,5 @@
 DIST future-0.17.0.tar.gz 827812 BLAKE2B 14bfce4927386b157da91e6bbad547e21bb622f7e81997bc4ac400842cec5f7a50d7a0f5a743c4c76a7b80be0dcb6f54c06901311fd27781d89a8d2df1cce7e9 SHA512 f2396379e8e36753aeafdf27225c2551a31b10036f21201f1c24d63c1bb318dbd491ec977af514a19a4d477b397df9eed9711be797a64e86fc00c4692729d876
+DIST future-0.17.1.tar.gz 829119 BLAKE2B 95210b5128d25d6c189cd38bced873f096802690e8fab5f4591c08fa913c41dc255e24af1931cad91d872a286f690f47bf6e0aa365e2f6508b03b0d305779c26 SHA512 50094c44db81afbfd37ee25e1710ed11ecb2c2d64ad076fb62a2688dd36a9696ab26b0d7989bf1ecb10da251961a0ee6bb37c4dbd115f70384cd8c9a675d0b2d
 EBUILD future-0.17.0.ebuild 1048 BLAKE2B a60d74627cd3f3dfe6b043857056012ff81e49c436d6290e8cee470bc843ccaf0d3fa7fa143852cad228411d28cd0467f3186241555d55d673cc31b1d109bf43 SHA512 026c93d4feed6ba82bf389d617a90e4a1e26855f5f0d4f12216f6164758009358c4068a4c35b1d5286d4a0fb1e4fbf74dcebcf045d5450e4678925071db0e9e6
+EBUILD future-0.17.1.ebuild 1059 BLAKE2B 34564f40ddc19809c026d43627051976e80abee068d589f8de77d717c3486968b624b5f93174bbe1667151b1f65e123523edb5b0bfcc947fd4199778a230eed0 SHA512 b720669405747f0216479a3e2cdef1bc2f7965a80ffb889a620d95350d393172b621a0275650bfa4ec0a413c329fdd3820c337120085e855d9e3bab160b09260
 MISC metadata.xml 309 BLAKE2B ac0715185226cea8e3c38698ed3e494b6464d86dad0211e4d0583e3ceb6634c2b1ec230d9dff659d5ef47208b6f3358c701a0c42e49848816ae99703cab82f46 SHA512 e01e3b2733211e1eb6aaef4da19265c7165411a46fde4c2156118700c315bc2ad52cd87de1b90355741de77d91aa22eed5f9e5847d45186bf7138d246cd775e4
diff --git a/dev-python/future/future-0.17.1.ebuild b/dev-python/future/future-0.17.1.ebuild
new file mode 100644
index 000000000000..c70e5416eaee
--- /dev/null
+++ b/dev-python/future/future-0.17.1.ebuild
@@ -0,0 +1,48 @@
+# 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}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Easy, clean, reliable Python 2/3 compatibility"
+HOMEPAGE="http://python-future.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx-bootstrap-theme[${PYTHON_USEDEP}]
+	)
+	test? (
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+)
+
+python_prepare_all() {
+	sed -i "/'sphinx.ext.intersphinx'/d" docs/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build docs/ docs/_build/html || die
+		HTML_DOCS=( docs/_build/html/. )
+	fi
+}
+
+python_test() {
+	pytest -vv || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/gnome-python-base/Manifest b/dev-python/gnome-python-base/Manifest
index 25e4b2260a72..30bc14b29e8a 100644
--- a/dev-python/gnome-python-base/Manifest
+++ b/dev-python/gnome-python-base/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-python-2.28.1.tar.bz2 562220 BLAKE2B 9bd14132974b6d42183debfc8f492fcee168a1671dfd27eead7aaa8d5ca12108bcda239b30df87bf41de3a0ab68191f095d63fdad05c151f6204f34f3bf14bdf SHA512 632d91d416f8209c2bc8d576d1229069e00f2cfeedb3441a5f151e12973ed740c0bb26d18d5c16cfeeb64ca35933537997277450001cffd96d8d5077027d45f2
-EBUILD gnome-python-base-2.28.1-r1.ebuild 1084 BLAKE2B 54421cf9521be56727d1bf96425a02a5d4dc50ad1038e7d5495d6ccb1881230cd3ae69c0a5871467c0218dee760917f9c8323f7c53dd48c7b6c8d42445eedd4c SHA512 1d97e3195c01aaffbd3c94b3f01a189d809f80208ddc232f0fc4c0a4ad6cdabe611af40dde0c81c851cf0edb2bf49e66dbc6165d36538bee4d4fd82dffcde9c4
+EBUILD gnome-python-base-2.28.1-r1.ebuild 1134 BLAKE2B 6ef79ad4d1da5e4126ebef0758eaa2268666f38316110b2a3be703cde2abe9eaafe778b4ad7fd36953810d661274d2a29aca93d2805dde8f7e56994bcbbb9e2e SHA512 701ad668c662a3266aef5fc54c7e631f154b38168c9b21850f479eef5a08e1d9a4eaa3fee1e287d24bb57b8bbd32c113c77d1fc9eef3e0fd3d4c34ab8163481b
 MISC metadata.xml 346 BLAKE2B 91249958bb5009cfc1acd263df53300b212a94fc654dc245e3f5540816d0260cd1e29d45a82677a5a38b66bb19579f05c8de49663f60c1827deaf71e0fe56504 SHA512 29ed867f32b1dc618689a6347b164ebe291bb061b90302dbfacd0c126a00bbcd7eaadcee11b075cb2c0fbf6e6534725a649a58e49dd1ea23cdd3f73af83ace77
diff --git a/dev-python/gnome-python-base/gnome-python-base-2.28.1-r1.ebuild b/dev-python/gnome-python-base/gnome-python-base-2.28.1-r1.ebuild
index 540f323b3815..e5b88706d9e3 100644
--- a/dev-python/gnome-python-base/gnome-python-base-2.28.1-r1.ebuild
+++ b/dev-python/gnome-python-base/gnome-python-base-2.28.1-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 GCONF_DEBUG="no"
 PYTHON_COMPAT=( python2_7 )
 
-inherit versionator eutils gnome2 python-any-r1
+inherit versionator eutils gnome2 python-r1
 
 # This ebuild does nothing -- we just want to get the pkgconfig file installed
 
@@ -16,6 +16,7 @@ PVP="$(get_version_component_range 1-2)"
 SRC_URI="mirror://gnome/sources/${MY_PN}/${PVP}/${MY_PN}-${PV}.tar.bz2"
 
 IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 LICENSE="LGPL-2.1"
 SLOT="2"
 RESTRICT="${RESTRICT} test"
@@ -23,10 +24,9 @@ RESTRICT="${RESTRICT} test"
 # From the gnome-python eclass
 RDEPEND=">=x11-libs/gtk+-2.6:2
 	>=dev-libs/glib-2.6:2
-	$(python_gen_any_dep '
-		>=dev-python/pygtk-2.14.0:2[${PYTHON_USEDEP}]
-		>=dev-python/pygobject-2.17:2[${PYTHON_USEDEP}]
-	')
+	${PYTHON_DEPS}
+	>=dev-python/pygtk-2.14.0:2[${PYTHON_USEDEP}]
+	>=dev-python/pygobject-2.17:2[${PYTHON_USEDEP}]
 	!<dev-python/gnome-python-2.22.1"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
@@ -35,6 +35,10 @@ KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-li
 
 S="${WORKDIR}/${MY_PN}-${PV}"
 
+src_prepare() {
+	python_setup
+}
+
 src_configure() {
 	gnome2_src_configure \
 		--disable-allbindings
diff --git a/dev-python/gnome-python-desktop-base/Manifest b/dev-python/gnome-python-desktop-base/Manifest
index c60a18d3838a..a21fb2c86b20 100644
--- a/dev-python/gnome-python-desktop-base/Manifest
+++ b/dev-python/gnome-python-desktop-base/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-python-desktop-2.32.0.tar.bz2 621277 BLAKE2B a6ec5161eff68cbe9820a1ca1f31d39d9cd4c2e944564fe9ed36f06723bad8ec7525f488cdf6e5f9556ad42053e88e3cee3405146caf778df59aa639f0108099 SHA512 51beefd21fa3aa6242ba4c66e57d940372fbf4a84ffe34063339f6e7e7c22e76d281b25d5f113de3780a0dbf733c7e07142f05a285056cda26736323b4185d18
-EBUILD gnome-python-desktop-base-2.32.0-r1.ebuild 1077 BLAKE2B f23c2c1c7d01d629ceb342a66f8d1d9885b7560104d0fed0a8e04c0f8bd0a128814c2767766b0ee3e1679d05b17c860221fecded360d7b9b9bdfe4a2b4fbe44d SHA512 3de5611926b91175e217c7e65f976f6445007726b1afb212f1b29ccb4f4c07f99f2d71af7354639e395c541f704ab0681ec62544811163a60546a3fcd8b5d4d7
+EBUILD gnome-python-desktop-base-2.32.0-r1.ebuild 1114 BLAKE2B ee63de4b79ca498ec02282d3775c8e71ff2365248fcb84d4930e0f8da85e81d174d70e237d79b35e92684fe9c37fb1db59d68226077be2681cdd4fb2afd15c16 SHA512 e0d789ba7d6adb998a51dd0ae2a14d3fccec7095495092b19cee267079cdd5f88ab6faada61bb0a81dc737d6b51f4da0f368e9f1577eb288c1fa4850bf727eae
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-python/gnome-python-desktop-base/gnome-python-desktop-base-2.32.0-r1.ebuild b/dev-python/gnome-python-desktop-base/gnome-python-desktop-base-2.32.0-r1.ebuild
index 18367683dba2..34bb482c9c13 100644
--- a/dev-python/gnome-python-desktop-base/gnome-python-desktop-base-2.32.0-r1.ebuild
+++ b/dev-python/gnome-python-desktop-base/gnome-python-desktop-base-2.32.0-r1.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"
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 GNOME_ORG_MODULE="gnome-python-desktop"
 GNOME_TARBALL_SUFFIX="bz2"
 
-inherit gnome2 python-any-r1
+inherit gnome2 python-r1
 
 # This ebuild does nothing -- we just want to get the pkgconfig file installed
 
@@ -17,11 +17,13 @@ HOMEPAGE="http://pygtk.org/"
 KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
 IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 LICENSE="LGPL-2.1"
 SLOT="0"
 
 # From the gnome-python-desktop eclass
-RDEPEND="$(python_gen_any_dep '>=dev-python/pygtk-2.10.3:2[${PYTHON_USEDEP}]')
+RDEPEND="${PYTHON_DEPS}
+	>=dev-python/pygtk-2.10.3:2[${PYTHON_USEDEP}]
 	>=dev-libs/glib-2.6.0:2
 	>=x11-libs/gtk+-2.4.0:2
 	!<dev-python/gnome-python-extras-2.13
@@ -33,6 +35,7 @@ RESTRICT="test"
 
 src_prepare() {
 	gnome2_src_prepare
+	python_setup
 	python_fix_shebang .
 }
 
diff --git a/dev-python/gnome-python-extras-base/Manifest b/dev-python/gnome-python-extras-base/Manifest
index e62b76e79998..faff0fab659b 100644
--- a/dev-python/gnome-python-extras-base/Manifest
+++ b/dev-python/gnome-python-extras-base/Manifest
@@ -1,4 +1,4 @@
 AUX gnome-python-extras-base-2.25.3-python-libs.patch 2243 BLAKE2B 05e6d4383c91237fe248afbbe3e04f111b60f3119bcddb99c72adeb671c973379c6c241bdf184dc9dc81b67e347582f631dad175ca39036a3fe2a3f415a659fa SHA512 f9ddacdcffaaf6933e3ab28f843892a4754677a29987d512ebc3810245fb793f8a242b479e47fd63dc7756c817a510e04cda2548aa6bb4d88ce4649c2b1759ed
 DIST gnome-python-extras-2.25.3.tar.bz2 370489 BLAKE2B 9ca41f953ed75009f732c811372a560a1fcaf8e81bf4187117c40e61009296df62ed413cfc47194329bb92053762748cd14c3849d0f4a0fe7ccfff8ad72c3529 SHA512 6994b8b5d6ccc009edc7ddfad373b9164d8162f1007972652f6086dca30cac6941ab68ef467d15c972ab05c4ae0e19ec72edc2643636d22a01a3f5a719251467
-EBUILD gnome-python-extras-base-2.25.3-r1.ebuild 1307 BLAKE2B 3628d40a09589ef1acee78bf632b2337503c3c26cab23dcb5c014aaa5870d0ec12d77b6d034cc89ed3b3c8327f8cc3961f13fe6b5161d1b36ee5bf6ba1342acc SHA512 a82a22c5edb1049e12d5c4bbd137f7e560293bcb9d5813ecea0754c9a95c02c405599d13363afddbffd3919cfe202cc5ec30a22063203d1e401fbeb4e59e2410
+EBUILD gnome-python-extras-base-2.25.3-r1.ebuild 1322 BLAKE2B a8c08c9ee2475f2c65ac63a6b92fd356ea7d81f14348970c2d3048b4bb8ed80d96247a9165d4a3b0b5dd0609ba9be829ca403e0664f42316b6196e062716d82b SHA512 f859ccc1dc575c792ed3e7f791f9196111b327dc372127ca603b92b20106ee91d7d2f4d7afebb1dabbab1e1b7dae7ec351a42fd69e7a7f79e5b742ead77246b3
 MISC metadata.xml 346 BLAKE2B 48d899b0b769e7edf07feeb6349bd66595360a1fd09a3c9bc5385485729eba9f1eb462e508e6691fe47dd571be396a29fa266fc998cc8d2ff772b353713fcda9 SHA512 e7e631f5ebe3a81d0431366152d6f7a2d21958a031746d6b2fd6ac9ef3f145d78fb30d1014b0912e9d720b3be7c6d2fdc544bb840a9f12fddf37ffdcf65933bd
diff --git a/dev-python/gnome-python-extras-base/gnome-python-extras-base-2.25.3-r1.ebuild b/dev-python/gnome-python-extras-base/gnome-python-extras-base-2.25.3-r1.ebuild
index cfcd4a3af74e..bbf4fe11e0d6 100644
--- a/dev-python/gnome-python-extras-base/gnome-python-extras-base-2.25.3-r1.ebuild
+++ b/dev-python/gnome-python-extras-base/gnome-python-extras-base-2.25.3-r1.ebuild
@@ -1,19 +1,20 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 PYTHON_COMPAT=( python2_7 )
 
-inherit versionator autotools eutils gnome2 python-any-r1
+inherit autotools eapi7-ver eutils gnome2 python-r1
 
 # This ebuild does nothing -- we just want to get the pkgconfig file installed
 MY_PN="gnome-python-extras"
 DESCRIPTION="Provides python the base files for the Gnome Python Desktop bindings"
 HOMEPAGE="http://pygtk.org/"
-PVP="$(get_version_component_range 1-2)"
+PVP="$(ver_cut 1-2)"
 SRC_URI="mirror://gnome/sources/${MY_PN}/${PVP}/${MY_PN}-${PV}.tar.bz2"
 
 IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 LICENSE="LGPL-2.1"
 SLOT="0"
 RESTRICT="test"
@@ -21,7 +22,8 @@ RESTRICT="test"
 # From the gnome-python-extras eclass
 RDEPEND=">=x11-libs/gtk+-2.4:2
 	>=dev-libs/glib-2.6:2
-	$(python_gen_any_dep '>=dev-python/pygtk-2.10.3:2[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+	>=dev-python/pygtk-2.10.3:2[${PYTHON_USEDEP}]
 	!<=dev-python/gnome-python-extras-2.19.1-r2"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
@@ -38,6 +40,7 @@ src_prepare() {
 	epatch "${FILESDIR}/${P}-python-libs.patch" #344231
 	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
 	eautoreconf
+	python_setup
 	gnome2_src_prepare
 }
 
diff --git a/dev-python/google-auth-oauthlib/Manifest b/dev-python/google-auth-oauthlib/Manifest
new file mode 100644
index 000000000000..48507e4b8a15
--- /dev/null
+++ b/dev-python/google-auth-oauthlib/Manifest
@@ -0,0 +1,3 @@
+DIST google-auth-oauthlib-0.4.0.tar.gz 73664 BLAKE2B bc98af5a85b26ced36171dae4e9a498b08ddfb92cf557805a238d68fe8bc251c61be6f051db391f4c30fae0aacf139cd0cd88c3e42cdc73efeaaa36407c9496d SHA512 49760914c02b41b7252062c8cb99b133b342463aa2b66b42dd5f320320010425e6952009514cbf89a4704648113693b35db1d3aa3636fc1297a25e59635a7dd5
+EBUILD google-auth-oauthlib-0.4.0.ebuild 639 BLAKE2B e86e8c87bef47600876fcfc58d1c827bb44688da47f44e80fadfe57a9ae8480b279f87d457e4110f85ad856b90520fcde76e664c0138fa8d234909f024e84926 SHA512 31449383156850ebaf0f4761cd95f1aaf44f8023cd0196a0f3db5a07032b5329fc3d30e1e183a8c2b9036200102fac6f4b5e7dd35406c4e9a9cf88646b510418
+MISC metadata.xml 470 BLAKE2B 36db489a9e55bd13107658ae61a02e1ab39323c8eeda79b918b193471664adb2ffc2457324be492619a387d600e5dc72e08df323f17e0141793a12cdda79b89d SHA512 79b59e2f899a165f0e3a98ad3f3e809e264fb6d9b0d399329b19af3d2ab2c1628d99d9574fe4f9532646c648b6392a9cdbd9bb21739cf5d37b19c56438e185b2
diff --git a/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.4.0.ebuild b/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.4.0.ebuild
new file mode 100644
index 000000000000..65c76d3333d9
--- /dev/null
+++ b/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.4.0.ebuild
@@ -0,0 +1,22 @@
+# 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} )
+inherit distutils-r1
+
+DESCRIPTION="Google Authentication Library"
+HOMEPAGE="https://pypi.org/project/google-auth-oauthlib/ https://github.com/googleapis/google-auth-library-python-oauthlib"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/click[${PYTHON_USEDEP}]
+	dev-python/google-auth[${PYTHON_USEDEP}]
+	>=dev-python/requests-oauthlib-0.7.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/google-auth-oauthlib/metadata.xml b/dev-python/google-auth-oauthlib/metadata.xml
new file mode 100644
index 000000000000..ce124ee72b82
--- /dev/null
+++ b/dev-python/google-auth-oauthlib/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>linder.gabriel@gmail.com</email>
+    <name>Gabriel Linder</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">google-auth-oauthlib</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/greenstalk/Manifest b/dev-python/greenstalk/Manifest
index bbe9dc75f2a5..555820520378 100644
--- a/dev-python/greenstalk/Manifest
+++ b/dev-python/greenstalk/Manifest
@@ -1,3 +1,5 @@
 DIST greenstalk-0.5.2.tar.gz 5317 BLAKE2B 1dd461f0a3a97210cad1c2a1957483477334c015e97184db22c3048c5152b4b7a2a0a5768cf79190c4f8c3115fc61557d3cb453fb56194db9906c5d29e7734e9 SHA512 a270e0c6aaab1ce93e695413c8c12a2546cffb5d3cd11b20679c1f4f8238a68b8e9ed59c0b1c5ec3ed3319d3cd32e8bfef68533e092645d2832546024dfa68db
+DIST greenstalk-1.0.1.tar.gz 12898 BLAKE2B fc0b90ba95b09e1490025175339c3f9eb7afed16db40ec34031305a3d487582fc7305b1990424f53a06887a34c30ab4f957db01a640576aa1c5db30511161c0f SHA512 8b57ec0c7fd3a60c24e8ddd7d51f31c0986317cbceb0f7045bbd720ca58e8f3c896f2f9924de7b1e8693844c814ecdebc020972d895468d1b0e7d055bf628b16
 EBUILD greenstalk-0.5.2.ebuild 468 BLAKE2B e7255d89a1de96ce313ec2d22adeba6b9ce3cba61b189682d0b6451e97ac00fdbe58b1076cd3cccce4a550dfe60931b27ccfac2e9243e7e7db0d29c24c0148dc SHA512 d947c6cbec0eec880fd8139153f82923c9707fe4bccf7100b09bc88d95331fd1c6772cbc52ad82507aadb94fd18de50ef83d91cc2a8c0a39f99dd8ef9b870537
+EBUILD greenstalk-1.0.1.ebuild 643 BLAKE2B ea2970a82b087642bcdcbd585d739abafd58ed1d335d4122ffda588fa026d01e363dbf9ee9557730ce3d78856c976ed87fc54f43a085b252f86094a7776984d0 SHA512 1da2a5e62a9670fa3415cb7e09ac755160a4e0bef92af0cb8f0ec6286833a2dea24af886412248c67323a5bd7aaacfe9da324be3d9b4afb88d941cc770be326a
 MISC metadata.xml 468 BLAKE2B be86df42ba2a9a693ef6d6ff7dc2840a5a8ad749978f4ce6a77e43fa7ad1f0f14c0a3ef7fed355ce17cdfdf94bd40d1650851aa3910c6a7f85af36753f329505 SHA512 e484b320e2e44edc72cf5cdacb7355cfea180a3193738f233667cbc28384933d4defa8fd3415032cb863acd4d2cbbfa3992e116ec6b14f29a34078a56fab9264
diff --git a/dev-python/greenstalk/greenstalk-1.0.1.ebuild b/dev-python/greenstalk/greenstalk-1.0.1.ebuild
new file mode 100644
index 000000000000..98bafab82c34
--- /dev/null
+++ b/dev-python/greenstalk/greenstalk-1.0.1.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=( python3_{5,6,7} )
+inherit distutils-r1
+
+DESCRIPTION="A Python 3 client for the beanstalkd work queue"
+HOMEPAGE="https://greenstalk.readthedocs.io/ https://github.com/mayhewj/greenstalk"
+SRC_URI="https://github.com/mayhewj/greenstalk/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="
+	test? (
+		app-misc/beanstalkd
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+python_test() {
+	pytest -v tests.py || die
+}
diff --git a/dev-python/grpcio-testing/Manifest b/dev-python/grpcio-testing/Manifest
index dab6e4c3d45c..9ba2e2606b5e 100644
--- a/dev-python/grpcio-testing/Manifest
+++ b/dev-python/grpcio-testing/Manifest
@@ -4,12 +4,14 @@ DIST grpcio-testing-1.18.0.tar.gz 16603 BLAKE2B 6f6170211701b56d5937947ef227cf91
 DIST grpcio-testing-1.19.0.tar.gz 16355 BLAKE2B c4b88f4fdb358ca121593b1628faacf269e02ce1de8693401197883aed94005ae1903da9b92f77b77afa92f05a74ec6f65fbea22e6f16b7acaeba90283890b88 SHA512 82522447620ab0155cc3e4a159897942da15726ea7e29a0dccd76fa39e718539c8f05353b718729c87f77864873ae51f2b28487676ba6f26ccd9851a17f1973e
 DIST grpcio-testing-1.20.1.tar.gz 16553 BLAKE2B 5ea6a92238cc086a030c23666340f32bb00941518f0507a2db306feccc568263813be6819d4bcd593f7e52575f79b1ef29d3024e591227b530815a95211a2c73 SHA512 5cce728015466ae6f14c28258abc71e73ef0b195ba2a874999d3a18f9f8e45450b50a3b4d3ee72f07d8c306a324de60383bfb0e12e5331968fe28519e0f2cb08
 DIST grpcio-testing-1.21.1.tar.gz 16879 BLAKE2B 4595b99b174db549a2637c9e203e7de0a799086c0119751927b7d57b3837958e296671cbc7b6dd5598d8ea10fedbb23380de200604367308186c03ed77e607ea SHA512 3556c21f0d51a5b4cbfcf8eeec2b383b1aca5056337d3ee8f46a5dcc7c7fc4507b858d2309232e982650495a83d1d80f6fa251f25f77a6b180817fab8d4c4527
-DIST grpcio-testing-1.22.0.tar.gz 16425 BLAKE2B b0eef2c42e0af82f56a7091fe5e82506df5e631a9e6a6624f1c9e84d6cd7d28247f8ff74bbe6f6b9207947a3436d51885195ae4029f9c2b1d32774c3a50e8873 SHA512 2eae97416bd27fabba7d9205d929fc6fa2781184a2d68f2c4bd0a4c045cb4c5f87ad58188f6eb81f0985a2b0bae710d39433d4ddd36ea72312cca292a1286969
+DIST grpcio-testing-1.22.1.tar.gz 16718 BLAKE2B c90717c5910be42a161fd08746b898a691cdc80f631991f718c061bf56e3e8851b49ab2219a59ebe80f4d878c713230ef6355095e78aa1d0c164aad570dd27d9 SHA512 90f366bbf352e7f7165f91ac4605ed74a7f7b08f1981838f0d218396c54983cc0752121fa890abbfcdba719461093ab3e5ce47e95d3e68047fcba1b7f5820d73
+DIST grpcio-testing-1.23.0.tar.gz 17042 BLAKE2B 42eeaf657355c569dd62e0acdad99449b2d70d725f493a727168314ca8f4a8016b3a39521b8796cc6160472e455385004079857ed88e796c964304d99b5361e4 SHA512 3eb370f5a6568a22a87c72c8bad1c4ae537d36b19fa45039620dc3ae645561bd4836cd430fdf6f64a7687178412c4a2e51fb6474d470039e310f639f86c351f3
 EBUILD grpcio-testing-1.16.1.ebuild 520 BLAKE2B faadbd2e92ec9eb144a3a5dae19e22dd2dc05b2dbb6d5e6de47017c2d8f7ce259ffab586a73dd7263fb939c8749f33789eb3d8292f2a1e75e6c68a5ca190fadd SHA512 d8e2fae154f4e69212278ac6a5a360ecb41b39311188afdf2e025e4f95a76feb8c6ec8d9391168bc68346b2d990094116eb871eee51a78eb046985156736bd9e
 EBUILD grpcio-testing-1.17.1.ebuild 520 BLAKE2B faadbd2e92ec9eb144a3a5dae19e22dd2dc05b2dbb6d5e6de47017c2d8f7ce259ffab586a73dd7263fb939c8749f33789eb3d8292f2a1e75e6c68a5ca190fadd SHA512 d8e2fae154f4e69212278ac6a5a360ecb41b39311188afdf2e025e4f95a76feb8c6ec8d9391168bc68346b2d990094116eb871eee51a78eb046985156736bd9e
 EBUILD grpcio-testing-1.18.0.ebuild 520 BLAKE2B faadbd2e92ec9eb144a3a5dae19e22dd2dc05b2dbb6d5e6de47017c2d8f7ce259ffab586a73dd7263fb939c8749f33789eb3d8292f2a1e75e6c68a5ca190fadd SHA512 d8e2fae154f4e69212278ac6a5a360ecb41b39311188afdf2e025e4f95a76feb8c6ec8d9391168bc68346b2d990094116eb871eee51a78eb046985156736bd9e
 EBUILD grpcio-testing-1.19.0.ebuild 522 BLAKE2B df149020fd4d3b66348cd08db83e3669cbfadb8c62110efb0e643af2737be7eb2576ed04217722936cff8eb6f11fac521edcdf22aebd46245f845ba0ffce6410 SHA512 90ad1fbbd670eb50c52d02a51963aec60287d8b803d99df335c84436fe7476a376c312ec1e1d68f285838ef7bcbf4719516879ca806283e1dc8d49a833ef4a7d
 EBUILD grpcio-testing-1.20.1.ebuild 529 BLAKE2B e979c297fd2d73d9f94f28f4b6a6e569ee4d999368ad2c038f0cb6072192b27eacee5d711f0465435c251672efb88ee9671899bf71020d087576b11642abe3f8 SHA512 df1fce2b675a777f4fad8899efb9d0413b334c5fddc4f1cb6ed747ce3945c856f3c3ab6b453009aff586612ebbd58a943f43dd98fd0d151c4facac2f700e1731
 EBUILD grpcio-testing-1.21.1.ebuild 529 BLAKE2B e979c297fd2d73d9f94f28f4b6a6e569ee4d999368ad2c038f0cb6072192b27eacee5d711f0465435c251672efb88ee9671899bf71020d087576b11642abe3f8 SHA512 df1fce2b675a777f4fad8899efb9d0413b334c5fddc4f1cb6ed747ce3945c856f3c3ab6b453009aff586612ebbd58a943f43dd98fd0d151c4facac2f700e1731
-EBUILD grpcio-testing-1.22.0.ebuild 529 BLAKE2B e979c297fd2d73d9f94f28f4b6a6e569ee4d999368ad2c038f0cb6072192b27eacee5d711f0465435c251672efb88ee9671899bf71020d087576b11642abe3f8 SHA512 df1fce2b675a777f4fad8899efb9d0413b334c5fddc4f1cb6ed747ce3945c856f3c3ab6b453009aff586612ebbd58a943f43dd98fd0d151c4facac2f700e1731
+EBUILD grpcio-testing-1.22.1.ebuild 529 BLAKE2B e979c297fd2d73d9f94f28f4b6a6e569ee4d999368ad2c038f0cb6072192b27eacee5d711f0465435c251672efb88ee9671899bf71020d087576b11642abe3f8 SHA512 df1fce2b675a777f4fad8899efb9d0413b334c5fddc4f1cb6ed747ce3945c856f3c3ab6b453009aff586612ebbd58a943f43dd98fd0d151c4facac2f700e1731
+EBUILD grpcio-testing-1.23.0.ebuild 529 BLAKE2B e979c297fd2d73d9f94f28f4b6a6e569ee4d999368ad2c038f0cb6072192b27eacee5d711f0465435c251672efb88ee9671899bf71020d087576b11642abe3f8 SHA512 df1fce2b675a777f4fad8899efb9d0413b334c5fddc4f1cb6ed747ce3945c856f3c3ab6b453009aff586612ebbd58a943f43dd98fd0d151c4facac2f700e1731
 MISC metadata.xml 462 BLAKE2B 159e29c960dba2f197de7e1b8eda84162039ecdb35777aeb00314f8af9a7bc0771071e63a1528c922519568594f06971b228036914500d2ce3d33b411ddf0685 SHA512 8326b0e1b98c2921b461ad44663711318f2c48e4e411380de4b4bb26fca11d726d627fe47ccd0d1149348b55aa9391d97d144f654d016a1fccb34791f5850487
diff --git a/dev-python/grpcio-testing/grpcio-testing-1.22.0.ebuild b/dev-python/grpcio-testing/grpcio-testing-1.22.1.ebuild
index 0f6ea5237441..0f6ea5237441 100644
--- a/dev-python/grpcio-testing/grpcio-testing-1.22.0.ebuild
+++ b/dev-python/grpcio-testing/grpcio-testing-1.22.1.ebuild
diff --git a/dev-python/grpcio-testing/grpcio-testing-1.23.0.ebuild b/dev-python/grpcio-testing/grpcio-testing-1.23.0.ebuild
new file mode 100644
index 000000000000..0f6ea5237441
--- /dev/null
+++ b/dev-python/grpcio-testing/grpcio-testing-1.23.0.ebuild
@@ -0,0 +1,22 @@
+# 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="Testing utilities for gRPC Python"
+HOMEPAGE="https://grpc.io"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="~dev-python/grpcio-${PV}[${PYTHON_USEDEP}]
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/grpcio-tools/Manifest b/dev-python/grpcio-tools/Manifest
index 7f97b4e754e6..b839172d276e 100644
--- a/dev-python/grpcio-tools/Manifest
+++ b/dev-python/grpcio-tools/Manifest
@@ -4,12 +4,14 @@ DIST grpcio-tools-1.18.0.tar.gz 1925482 BLAKE2B a8a97e3a6204593bcc0e96d392652d31
 DIST grpcio-tools-1.19.0.tar.gz 1920614 BLAKE2B 00d3a702071d33a51fe47aea6ef47d58e2901df6b55cee8fba1c382e45695fce32e2fc20e438d48b5024b7a80373bea76466f2981f58b106192016078f2df214 SHA512 f9832237a0ec3e1dc8550dce5c0b06bfe43d1bd164b251c1bf9b8075ee647f23c8da31f90c84cd7f047682832876616ec5c73b495cb4a1fa2d83982cf368eee2
 DIST grpcio-tools-1.20.1.tar.gz 2018570 BLAKE2B 9c2ba04b06df9883ac79726aafec6eb129c338be93c61d49cafea29d4849bd497bd45da106431b7e17ece281037cfb0a53ed33ca7078306b727812fbce9df9b4 SHA512 2888e5c3ec92733b43b6bd115bbbfc2bace99ffeeff513a8c1c98fb670853a4407de41a5449613f88d8586fc21809d5a0c6de953dc211f3108b32198964db2ee
 DIST grpcio-tools-1.21.1.tar.gz 2032788 BLAKE2B f26e94c92ebe076496a8738dcbdf9b67dedd5fd60426632589ba88bffd3943cd094881d61b4c67e25660902ec10887a0ed154dc9e6e33d97460313514f4d5eb6 SHA512 624f23bf9d7d6787d4b65e60d948feb88548ed6963443cf8cb1a3eaeaf03dd2ca9a8fd9e8a6882137b781b737b23934b84e3a922df95da95885bbd5f3de873b5
-DIST grpcio-tools-1.22.0.tar.gz 2030853 BLAKE2B c1d9ea157a6a532b321f5e1b66e2f7e97044d5058cf3a198a031fe0ac7788e59f37a241a54741410ab67210a956e642131572774ede338a55f8f2edf66039d29 SHA512 0b733afb78ca60ce3ec0479cd0c4faf0d0d43ab2e015145d19f1c4736c79d0e3776813d0147e7e71f21f6cff2747eeb641fcf1399455936fd7b507bf38b38896
+DIST grpcio-tools-1.22.1.tar.gz 2022553 BLAKE2B bd94ece55c5e9e41c923c1beb5a2deb2b49d6ac479401b9de622d8a3fb0deb7e852d7da3a0239442d7560135565af1fda80ab43f7def870488dd17cf52c1dce5 SHA512 92d65c40ccda268154dbc21a9b7607f4ccee8feb0c5eeb0d88ae0d34ca80b3e1e7a6a2f8b7059aa904a7cb3654b0e23ceeebe44f58c08b713bf78ab7e4faed4d
+DIST grpcio-tools-1.23.0.tar.gz 2025916 BLAKE2B 7dc3854e29731f7736ef08526142e31e9b14df2b08367cddc9dd69a0b5ebb53938a9a24284e5228fd603402960507d7903eb7a6c90a1243ed311cd595eda0f26 SHA512 306e1de073bffd036643dee6fdaf8c2f48cf810fc4403b02a5b2aa44ba77d8c985181b23ec20d787261786b1c6e4930f8e5a253752da95beeb257ff0555175cb
 EBUILD grpcio-tools-1.16.1.ebuild 678 BLAKE2B 08cf87936b8367382223332522d1ef2f36d4bccfeb63ab9b57dcf45072aa0c8cb62fb3fcdadd8c57d0f84426e9c66988e5a25524222d40b553f5a1fd614e485d SHA512 3c6602867b69f2a6a99a467c5472076fa8bc1ec7ab6bd56418756fccf9f059559b130aaae82183456a6741a5d43f11c46f01634f2215ef8b4e3b9c379f903acc
 EBUILD grpcio-tools-1.17.1.ebuild 757 BLAKE2B be33fe87e9af5532a5ec7855157d0ec91e9245575f54ee4f3bc691e097a2efed968fb741345b97e7fb05f68e0cae5e1d23894ef810b7adbbb03c19906c3e2625 SHA512 516051181a7ced9f6444a6dc68840ff4ec787711a21574d74ac00c84bdfd0cdd78830c6312ca6ca516dba20771a2ad86c916b692a71a7c7d5576a7df14acbda4
 EBUILD grpcio-tools-1.18.0.ebuild 757 BLAKE2B be33fe87e9af5532a5ec7855157d0ec91e9245575f54ee4f3bc691e097a2efed968fb741345b97e7fb05f68e0cae5e1d23894ef810b7adbbb03c19906c3e2625 SHA512 516051181a7ced9f6444a6dc68840ff4ec787711a21574d74ac00c84bdfd0cdd78830c6312ca6ca516dba20771a2ad86c916b692a71a7c7d5576a7df14acbda4
 EBUILD grpcio-tools-1.19.0.ebuild 759 BLAKE2B f6e127ee9d8d8a98a5f810ca27ac3bf15041a58d95abc247e6c79fc1d7045c71919a29a92a8e54f08707ca16d9cd069bb2c114ea900aaa1f042682ca6f9c261a SHA512 124ebbaa082a3acfb3a033d1ac8210c6f7d22a79b99494bbe6da518c22650d65fa5866b514c9b420640a23e3e1d6b2a065f0a97d956e76dd07f27bf3d240b6e7
 EBUILD grpcio-tools-1.20.1.ebuild 743 BLAKE2B 4f83bd6cf1287fd769fdd0e11501bdbb5bfd0d9c5afa0ca5674f6e3f05dcc52f8d477f1fddd2ff59765b019c1cd72da5044b1f816209942c8399532599425451 SHA512 0ee07931ac0f0c54fd445e0baf0b64b3fc56651011e731301cc99bf4fbc747df94f226c1310c6d0e8de48c27986749be76190ce8638fa38e8721d848f370ebfc
 EBUILD grpcio-tools-1.21.1.ebuild 743 BLAKE2B 4f83bd6cf1287fd769fdd0e11501bdbb5bfd0d9c5afa0ca5674f6e3f05dcc52f8d477f1fddd2ff59765b019c1cd72da5044b1f816209942c8399532599425451 SHA512 0ee07931ac0f0c54fd445e0baf0b64b3fc56651011e731301cc99bf4fbc747df94f226c1310c6d0e8de48c27986749be76190ce8638fa38e8721d848f370ebfc
-EBUILD grpcio-tools-1.22.0.ebuild 743 BLAKE2B 4f83bd6cf1287fd769fdd0e11501bdbb5bfd0d9c5afa0ca5674f6e3f05dcc52f8d477f1fddd2ff59765b019c1cd72da5044b1f816209942c8399532599425451 SHA512 0ee07931ac0f0c54fd445e0baf0b64b3fc56651011e731301cc99bf4fbc747df94f226c1310c6d0e8de48c27986749be76190ce8638fa38e8721d848f370ebfc
+EBUILD grpcio-tools-1.22.1.ebuild 750 BLAKE2B 4547a8a98b268186bd0b0c0f33dae4cab8fe8cb166a7b91fa1890337688f4993763387ec2347c8ea5dffe8e4047f2f0fd893265c634e83854f2de68bcf8e5049 SHA512 1030458099fc0f1a1c0de8433aa1350ea465e9060d8cf94b34f2043418313a57499ba99974113c970ed265a71ae8f09007664ca2a3232c476636dd75cfc27c9c
+EBUILD grpcio-tools-1.23.0.ebuild 750 BLAKE2B 4547a8a98b268186bd0b0c0f33dae4cab8fe8cb166a7b91fa1890337688f4993763387ec2347c8ea5dffe8e4047f2f0fd893265c634e83854f2de68bcf8e5049 SHA512 1030458099fc0f1a1c0de8433aa1350ea465e9060d8cf94b34f2043418313a57499ba99974113c970ed265a71ae8f09007664ca2a3232c476636dd75cfc27c9c
 MISC metadata.xml 476 BLAKE2B 62016e9a321f9c5b06d8a473d75b5efca8246df90ef9a67a33c02c416c58a8ee1be875cd54567d55bc9f10ef32082e11c01a9f1550293137aab8942e05dcf744 SHA512 cedbae8a8d9d7c6689c676c433aa6fea3c16d41911e0ee4a30929dbf2adb8ff72a2f0d81f996196a3b4090f8a5103a54eab4c651b359f9487d59955a6861152d
diff --git a/dev-python/grpcio-tools/grpcio-tools-1.22.0.ebuild b/dev-python/grpcio-tools/grpcio-tools-1.22.1.ebuild
index c9f032bd7710..36d23bc9bf4a 100644
--- a/dev-python/grpcio-tools/grpcio-tools-1.22.0.ebuild
+++ b/dev-python/grpcio-tools/grpcio-tools-1.22.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 
 RDEPEND="dev-python/cython[${PYTHON_USEDEP}]
 	~dev-python/grpcio-${PV}[${PYTHON_USEDEP}]
diff --git a/dev-python/grpcio-tools/grpcio-tools-1.23.0.ebuild b/dev-python/grpcio-tools/grpcio-tools-1.23.0.ebuild
new file mode 100644
index 000000000000..36d23bc9bf4a
--- /dev/null
+++ b/dev-python/grpcio-tools/grpcio-tools-1.23.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=( python2_7 python3_{5,6,7} )
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Protobuf code generator for gRPC"
+HOMEPAGE="https://grpc.io"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="dev-python/cython[${PYTHON_USEDEP}]
+	~dev-python/grpcio-${PV}[${PYTHON_USEDEP}]
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+	!<net-libs/grpc-1.16.0[tools]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+python_configure_all() {
+	export GRPC_PYTHON_BUILD_WITH_CYTHON=1
+	export GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS="$(makeopts_jobs)"
+}
diff --git a/dev-python/grpcio/Manifest b/dev-python/grpcio/Manifest
index 46dc39e96143..00305d9ff352 100644
--- a/dev-python/grpcio/Manifest
+++ b/dev-python/grpcio/Manifest
@@ -1,15 +1,18 @@
+AUX grpc-1.22.1-glibc-2.30-compat.patch 3169 BLAKE2B 35e3631c607994ee8519c2794f75f3e2a33f6b65aefcea508f15ba5e22fbf4fe8e0d3df6f5eae4cf08357b5f231db926b525c38b714b3fb7f5916c3ccc262b87 SHA512 cd9f507d6101e356f1fa5d5f502f49ab3c3988acdaea68de5359cbb0de4f4d50983b084cd0612cb5f1a27319076a87252328fcafb0dc47160914be8833d28d9e
 DIST grpcio-1.16.1.tar.gz 14514047 BLAKE2B e4fc7f196f3e377afb0a103aca60337dd63b3b0f84846e7e2a4622a0102d4300782f08367e1429e1fd021dd90b151f17dd927a25a749f35724c7d2a41a6943a6 SHA512 efd7fb36a61e2ee872c0807a8198cabe8f1f9003bd5bce7cd46c75541752c0f745db02bbfe3f37f572531e15df60913f2b08b678545f176fe683f3e64e22124f
 DIST grpcio-1.17.1.tar.gz 14563233 BLAKE2B 61ccfaa967ee348f02f5a201e4f36f25d4fa09a1af11c6b5a0f345d13bf86f0fb12c3aea125c5bc27925698e0a23a9592806fe5db92fa37360cdcaf88e596189 SHA512 bf8dc6b7ce2f4a0765377fbae085395caef9f0cd0a2b4a779b3bf1667c6aba5fff034168bff9539f96dea76b2c97d7586305715c850d10e54918337458a4ee95
 DIST grpcio-1.18.0.tar.gz 14601124 BLAKE2B 4dc57243759c573b960e841def6af335f490fc6aa285f88979b4c66365b104a84269688c589ed7ae797527b04124a9997937f5bf33b179978077b2b680e515f5 SHA512 da791a418e0f6f3a7be921e107586837edcd2020dc8dab1107712372ebd4896b6b94e00d7501ed957e4ab0d5f7d6a3f2b57477ff33c55eb5e4ad7828b2f21624
 DIST grpcio-1.19.0.tar.gz 14621509 BLAKE2B b756ba60d317baa089b8ee57c458bc68fb72e61a87150f1ef3366fea23456ca8d5bd443ba1579d1bef5d0049f249fc8c2c6e7c7cc0967eb58c102fb03d783103 SHA512 620459dd1a22cf60cb6bccb1b7dd64175f1efdfc098152cfa1889ad0a727b7a92b72f9de28b57e9a45cc8d2c22e2fc36307af8ab52ced454a91aedeaf7158273
 DIST grpcio-1.20.1.tar.gz 13882426 BLAKE2B 4211d9dedc7ba858a5124798f17b3b158f255d055f32f5947191fcb5fd45cca9c97aa3f8c4966e7195add5289ba3747a77b2f0c01a35762ffbeba6938c76046d SHA512 0ac126d8b2c25204bb03daccfc9b17016bc18dd31f89f6e208f2ae39d7e6fd17ae04a8178367a5334421d959b14fd3d31ac71a692b48a060d98f983553fcc3e2
 DIST grpcio-1.21.1.tar.gz 13919484 BLAKE2B dcad98da8db4aa588facc30d1b010ec1e4d5f8085751422277631329f1c4949ba3e2c3882829354025a845992ba9972df1c48a277df93caef9015969f9423aef SHA512 0ea20490ce5e776a6253d4b89dd9d9091afb7462d6bd6bd9d2d3329979d61360a3e31abbd043b90d0908512cf7ff2668bb21cb472fbf0ad5a3b5963073850dd7
-DIST grpcio-1.22.0.tar.gz 13925872 BLAKE2B 96cb2244e6fe11c628349b21026906336981d51661474f4e871ad33125cd183255cd9eb2de2eca9af00f80ddd1989dde80e60cdbe5bc833225980c63e12c92fc SHA512 912672209e2192fadaef79fe6cd79575d386e54ca0362f43e8e7138ca1f3673ea6a55f884257e9fb1780bae78664816675279a7f5ee799cc5d25ae43287729b1
+DIST grpcio-1.22.1.tar.gz 13923342 BLAKE2B 6d211b93a7597f568d106e0d6e3d30b90d7b4bf6fae42b163f2ae04e01c4b323c4d7c2a5380ccdbab14f9a6986c86fae4948bc827a97c189f915bc24738fc426 SHA512 5392041a021b0523fc7a615070ea0f907fc960cb69ffba1e7fcdf0aa8e498cb33f567d9eec795dc06662f558884dcabcc17a1ae4a26fcaa479b0a43c08e8b913
+DIST grpcio-1.23.0.tar.gz 13977223 BLAKE2B b9f95aaf397eae9610280937980e4b2694af98e6cd5f80015dd83c67ec6bf9c41e76474f873627d6c6cc35fe9af3b45f14aabb6ea809b51cf5f0bb0f3b702794 SHA512 ff3cd9d2380a158ea7a49ba2c9cd5bd1ec98194aa48cf2d45596ab93f0e8a6d6ed0291e5dfc52bca79c62950e6a0ce387819d19f036c0dd1e6dc7b737c1ee97f
 EBUILD grpcio-1.16.1.ebuild 921 BLAKE2B b6299a97f90c14a8fd60c148cbe6449a8025b391c69a7f3a9fa1201e06317a687982c873437b270ddceaa5470d5077cc840cc931c65a6e7cb442ad7342f75c8d SHA512 70b3fd83bc2bbbbd2e1cfd93624a5f6a18e2a126165ec5d2d1d946e5f77a672ecf2a2ddcc3f21e29d14e0d3e65e97edb89f98034b0b81644adf516ff3ae48259
 EBUILD grpcio-1.17.1.ebuild 1049 BLAKE2B deb945f6d1486f3df5baccc9339655f4173d499a1786e5424a221fa9c10d99da4a59140c2a8e04e43269c2150ec946f9c980051cd271d399cee9e46f7c309576 SHA512 cbf9bd692af1b73af88515d8b4ea590f99dbd8249988ac8454029435468e02895e1eaf78eb831745911cadf292423c167a2d272fb7641c550b1c4fadf6b5bdd1
 EBUILD grpcio-1.18.0.ebuild 1049 BLAKE2B deb945f6d1486f3df5baccc9339655f4173d499a1786e5424a221fa9c10d99da4a59140c2a8e04e43269c2150ec946f9c980051cd271d399cee9e46f7c309576 SHA512 cbf9bd692af1b73af88515d8b4ea590f99dbd8249988ac8454029435468e02895e1eaf78eb831745911cadf292423c167a2d272fb7641c550b1c4fadf6b5bdd1
 EBUILD grpcio-1.19.0.ebuild 1097 BLAKE2B d9eec593595d99eecc5ca5e127f1ab24b015715bfd76b19013788c793aea428732daddcd6458889142a1ec542cc82bbdcf1f74d6b0f158faf4a4722efedf5d36 SHA512 353cad322f66ea4dd434f8c26b29220b5911a66e53228b6f87b34fbb6fa143e9f13dd78be15b9e1aa60b912837e73c7e0554a015c6c788cd8421b416962a9b7f
 EBUILD grpcio-1.20.1.ebuild 1090 BLAKE2B 990ee36dfe1faae8fa5319c13785922e5890113a1c8ef6445189f39ef5e1ad05a4077d439a3ee4e3b73e552478ce4499354b309b5b12e8e73dc1a750cbf938d4 SHA512 77765fae6c0e39c95226da41ffb82f9ed4c4ab9d6df35c59743c352ec66b179cadc5f30d323b6f642d3e24c780f29408bd03b7ea8beb891e4f867dbecf156faa
 EBUILD grpcio-1.21.1.ebuild 1090 BLAKE2B 990ee36dfe1faae8fa5319c13785922e5890113a1c8ef6445189f39ef5e1ad05a4077d439a3ee4e3b73e552478ce4499354b309b5b12e8e73dc1a750cbf938d4 SHA512 77765fae6c0e39c95226da41ffb82f9ed4c4ab9d6df35c59743c352ec66b179cadc5f30d323b6f642d3e24c780f29408bd03b7ea8beb891e4f867dbecf156faa
-EBUILD grpcio-1.22.0.ebuild 1090 BLAKE2B 990ee36dfe1faae8fa5319c13785922e5890113a1c8ef6445189f39ef5e1ad05a4077d439a3ee4e3b73e552478ce4499354b309b5b12e8e73dc1a750cbf938d4 SHA512 77765fae6c0e39c95226da41ffb82f9ed4c4ab9d6df35c59743c352ec66b179cadc5f30d323b6f642d3e24c780f29408bd03b7ea8beb891e4f867dbecf156faa
+EBUILD grpcio-1.22.1.ebuild 1160 BLAKE2B 0b6a41225f2177c211b218a9f21120369adca0f373384069ec08ab60c6c9e338121309ba6ec813b4fdc67a81da3f6242546f556491bc37ef67a67674b245b1e7 SHA512 8372b6fefaf920796dcdf1888f70ade08f15e823166ab197e77db2e09c9596597d6fc7f35404edef51e5c67360014d4467e6ddba32434c431fa93ae41c24e9e4
+EBUILD grpcio-1.23.0.ebuild 1160 BLAKE2B 0b6a41225f2177c211b218a9f21120369adca0f373384069ec08ab60c6c9e338121309ba6ec813b4fdc67a81da3f6242546f556491bc37ef67a67674b245b1e7 SHA512 8372b6fefaf920796dcdf1888f70ade08f15e823166ab197e77db2e09c9596597d6fc7f35404edef51e5c67360014d4467e6ddba32434c431fa93ae41c24e9e4
 MISC metadata.xml 470 BLAKE2B ad01d702b7a0ffe570bd30f50d47bb4fed725fbdff6f838acc54ac767d0cee88bb28bb0642f804fb04858d36a63f8ff7e110e4ae1dd26b8eb539b0a5c77cf5d0 SHA512 bf26387089977138bcf6be78b469bb412988e96c6bf5b4a9897f452378ce71fab1012a7d9268fb55f2883bc9636b712b59abe5498ffdcf199417d97fb09cd90b
diff --git a/dev-python/grpcio/files/grpc-1.22.1-glibc-2.30-compat.patch b/dev-python/grpcio/files/grpc-1.22.1-glibc-2.30-compat.patch
new file mode 100644
index 000000000000..90bd9115893f
--- /dev/null
+++ b/dev-python/grpcio/files/grpc-1.22.1-glibc-2.30-compat.patch
@@ -0,0 +1,78 @@
+From d1d017390b799c59d6fdf7b8afa6136d218bdd61 Mon Sep 17 00:00:00 2001
+From: Benjamin Peterson <benjamin@dropbox.com>
+Date: Fri, 3 May 2019 08:11:00 -0700
+Subject: [PATCH] Rename gettid() functions.
+
+glibc 2.30 will declare its own gettid; see https://sourceware.org/git/?p=glibc.git;a=commit;h=1d0fc213824eaa2a8f8c4385daaa698ee8fb7c92. Rename the grpc versions to avoid naming conflicts.
+---
+ src/core/lib/gpr/log_linux.cc          | 4 ++--
+ src/core/lib/gpr/log_posix.cc          | 4 ++--
+ src/core/lib/iomgr/ev_epollex_linux.cc | 4 ++--
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/src/core/lib/gpr/log_linux.cc b/src/core/lib/gpr/log_linux.cc
+index 561276f0c20..8b597b4cf2f 100644
+--- a/src/core/lib/gpr/log_linux.cc
++++ b/src/core/lib/gpr/log_linux.cc
+@@ -40,7 +40,7 @@
+ #include <time.h>
+ #include <unistd.h>
+ 
+-static long gettid(void) { return syscall(__NR_gettid); }
++static long sys_gettid(void) { return syscall(__NR_gettid); }
+ 
+ void gpr_log(const char* file, int line, gpr_log_severity severity,
+              const char* format, ...) {
+@@ -70,7 +70,7 @@ void gpr_default_log(gpr_log_func_args* args) {
+   gpr_timespec now = gpr_now(GPR_CLOCK_REALTIME);
+   struct tm tm;
+   static __thread long tid = 0;
+-  if (tid == 0) tid = gettid();
++  if (tid == 0) tid = sys_gettid();
+ 
+   timer = static_cast<time_t>(now.tv_sec);
+   final_slash = strrchr(args->file, '/');
+diff --git a/src/core/lib/gpr/log_posix.cc b/src/core/lib/gpr/log_posix.cc
+index b6edc14ab6b..2f7c6ce3760 100644
+--- a/src/core/lib/gpr/log_posix.cc
++++ b/src/core/lib/gpr/log_posix.cc
+@@ -31,7 +31,7 @@
+ #include <string.h>
+ #include <time.h>
+ 
+-static intptr_t gettid(void) { return (intptr_t)pthread_self(); }
++static intptr_t sys_gettid(void) { return (intptr_t)pthread_self(); }
+ 
+ void gpr_log(const char* file, int line, gpr_log_severity severity,
+              const char* format, ...) {
+@@ -86,7 +86,7 @@ void gpr_default_log(gpr_log_func_args* args) {
+   char* prefix;
+   gpr_asprintf(&prefix, "%s%s.%09d %7" PRIdPTR " %s:%d]",
+                gpr_log_severity_string(args->severity), time_buffer,
+-               (int)(now.tv_nsec), gettid(), display_file, args->line);
++               (int)(now.tv_nsec), sys_gettid(), display_file, args->line);
+ 
+   fprintf(stderr, "%-70s %s\n", prefix, args->message);
+   gpr_free(prefix);
+diff --git a/src/core/lib/iomgr/ev_epollex_linux.cc b/src/core/lib/iomgr/ev_epollex_linux.cc
+index 08116b3ab53..76f59844312 100644
+--- a/src/core/lib/iomgr/ev_epollex_linux.cc
++++ b/src/core/lib/iomgr/ev_epollex_linux.cc
+@@ -1102,7 +1102,7 @@ static void end_worker(grpc_pollset* pollset, grpc_pollset_worker* worker,
+ }
+ 
+ #ifndef NDEBUG
+-static long gettid(void) { return syscall(__NR_gettid); }
++static long sys_gettid(void) { return syscall(__NR_gettid); }
+ #endif
+ 
+ /* pollset->mu lock must be held by the caller before calling this.
+@@ -1122,7 +1122,7 @@ static grpc_error* pollset_work(grpc_pollset* pollset,
+ #define WORKER_PTR (&worker)
+ #endif
+ #ifndef NDEBUG
+-  WORKER_PTR->originator = gettid();
++  WORKER_PTR->originator = sys_gettid();
+ #endif
+   if (GRPC_TRACE_FLAG_ENABLED(grpc_polling_trace)) {
+     gpr_log(GPR_INFO,
diff --git a/dev-python/grpcio/grpcio-1.22.0.ebuild b/dev-python/grpcio/grpcio-1.22.1.ebuild
index 095bde11b67c..cdd2bdd1ec3e 100644
--- a/dev-python/grpcio/grpcio-1.22.0.ebuild
+++ b/dev-python/grpcio/grpcio-1.22.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 
 RDEPEND=">=dev-libs/openssl-1.0.2:0=[-bindist]
 	>=dev-python/cython-0.28.3[${PYTHON_USEDEP}]
@@ -28,6 +28,8 @@ DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 "
 
+PATCHES=( "${FILESDIR}/grpc-1.22.1-glibc-2.30-compat.patch" )
+
 python_configure_all() {
 	export GRPC_PYTHON_DISABLE_LIBC_COMPATIBILITY=1
 	export GRPC_PYTHON_BUILD_SYSTEM_CARES=1
diff --git a/dev-python/grpcio/grpcio-1.23.0.ebuild b/dev-python/grpcio/grpcio-1.23.0.ebuild
new file mode 100644
index 000000000000..cdd2bdd1ec3e
--- /dev/null
+++ b/dev-python/grpcio/grpcio-1.23.0.ebuild
@@ -0,0 +1,40 @@
+# 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 multiprocessing
+
+DESCRIPTION="High-performance RPC framework (python libraries)"
+HOMEPAGE="https://grpc.io"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND=">=dev-libs/openssl-1.0.2:0=[-bindist]
+	>=dev-python/cython-0.28.3[${PYTHON_USEDEP}]
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	net-dns/c-ares:=
+	!<net-libs/grpc-1.16.0[python]
+	sys-libs/zlib:=
+	virtual/python-enum34[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+PATCHES=( "${FILESDIR}/grpc-1.22.1-glibc-2.30-compat.patch" )
+
+python_configure_all() {
+	export GRPC_PYTHON_DISABLE_LIBC_COMPATIBILITY=1
+	export GRPC_PYTHON_BUILD_SYSTEM_CARES=1
+	export GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=1
+	export GRPC_PYTHON_BUILD_SYSTEM_ZLIB=1
+	export GRPC_PYTHON_BUILD_WITH_CYTHON=1
+	export GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS="$(makeopts_jobs)"
+}
diff --git a/dev-python/gst-python/Manifest b/dev-python/gst-python/Manifest
index 02bb0c7f3ab3..1e3aa05fe46c 100644
--- a/dev-python/gst-python/Manifest
+++ b/dev-python/gst-python/Manifest
@@ -1,3 +1,3 @@
 DIST gst-python-1.14.1.tar.xz 405312 BLAKE2B 29be6f79b20a27e0d21f27cbf29b1881216e412c3c4ea016f3ee6bd921ec7b73139f74a20528f7f704526786347b065d246940f152d61a64e4eb926dbb44bb87 SHA512 32537e6556b69d00cb0b467239c148c0b9c282b76786be395e053a30554b84aea7c22e7fe6fc6faf77b35fca82fb799df4f52c114b282d0a6ea660f67dc40c53
-EBUILD gst-python-1.14.1-r1.ebuild 1978 BLAKE2B 8ba332c351c8e40da61ed9244acd97053745e2b4143769eab4373fb52297039ec919582d34ded0b6553caba7b173912cc0e1dd69a824bb5e5525d1f57bf5581e SHA512 6ce14ffca98724edc4e32be707b3878fb56efc5bb32df595b780cdee89810dcad7e979b2bdb6f81363d99d81b93692dfcc377e68d930c61662e6d53c382de5b9
+EBUILD gst-python-1.14.1-r1.ebuild 1983 BLAKE2B a203909217bb7c635e19883152b7a9981ad837e214ff2f104ae6b19ac1bd45a7e4178003d9c5dfe48e7e965f64f6c034a3f6cbd7021e6411b4f68cb88f09af86 SHA512 d38d7fec2fa29de7f5ce813532407494447afadf30de402d785cb4ae9ed0bf43152007340ee0d7f6be36a69d20291766e03e4693e2c1e93d97287d08a3fd675b
 MISC metadata.xml 272 BLAKE2B b1575d88177572e472e66c7cce4fb4c0d98aeb02edb03e800c2b2f2702b5c81c6c012c264655fce8c3170e44bfa117c81b85cdbb9f409714ab216c7a6f2b4482 SHA512 7dffa3bd729f24f9081f6b1c3db474cb26c54e95752a37140c5a9836299f26b3d0aa73e7c448e6b773478cb0112eaaf70f783d2b2f3d2868b1a2def8e6a9b8ea
diff --git a/dev-python/gst-python/gst-python-1.14.1-r1.ebuild b/dev-python/gst-python/gst-python-1.14.1-r1.ebuild
index dc221fd89fc7..9cc16ba9afd9 100644
--- a/dev-python/gst-python/gst-python-1.14.1-r1.ebuild
+++ b/dev-python/gst-python/gst-python-1.14.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python{3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
 
 inherit ltprune python-r1 xdg-utils
 
@@ -13,7 +13,7 @@ SRC_URI="https://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="1.0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
diff --git a/dev-python/httplib2/Manifest b/dev-python/httplib2/Manifest
index 5155832409d7..ed40338232e3 100644
--- a/dev-python/httplib2/Manifest
+++ b/dev-python/httplib2/Manifest
@@ -4,7 +4,9 @@ AUX httplib2-use-system-cacerts.patch 2357 BLAKE2B 0a169ed30f7cc6736fae31a25d21d
 DIST httplib2-0.10.3.tar.gz 204500 BLAKE2B f71d679b42865bd8e56f708e71d475bfc6988267b07cf7af298ae7ba2c132a67fa04f54f36dfa0d222f86f421ade40724638fdc5840f340da0e8e1a717bb6cdd SHA512 d024986ffd577858017d7a8cfcae98a6cd04b8c89634ea302df4c1443eb2381cecca6ffbb631c9d4260335a3462df6d5604ec485aa591a05cb0231a3f6745aaa
 DIST httplib2-0.11.3.tar.gz 215815 BLAKE2B 912d7cf56b941cc5ecaac23e16e20c17a31dc81b1ecb755cd3be36f0aaaf62302a760ca82104abb9052ee5c7d0c91baf04425303d124165085a06a20a66e5ba1 SHA512 e74be0ba945aaf5836ef14f4b8262e2be4b7f2a1df52b60f8ae7109d9727e117a69a8b7e4f524fb91997781af031a8a7c2112a7ab2b5d9f5c94b04a56aa04659
 DIST httplib2-0.12.1.tar.gz 218582 BLAKE2B 98c41a96b4e78897e803dbac3d6fedb25ad78f48d0b14ea29340f18da66be4622c7f0ae49acb2f4abca9542a174295d91aa21a6313b15501c4c1e590720a40bb SHA512 b083f0f5e22b384fd61eac428c1c60209702cf595762eadf6734afcf3cef6c3df8c7f2bedc5d782a4a6120a1dec51f910298f678c634c6b5e5d31348d9e10d25
+DIST httplib2-0.13.0.tar.gz 219494 BLAKE2B 5bb46582b9962266c9b431be7d323720f780075d6c60527e29c45415a001fc671b4bac95912f023e198250013a3b5a2442c02fa3284abba19bb3828bbc96ddb6 SHA512 b447531f18eb7d288cce9b1ab4b59c4302bd8db8eb095a102f9d730cb49644a1dc531ca007bb9c9a7321c9876ec0ce953317561fc94a51b02bcb749d2de1fa83
 EBUILD httplib2-0.10.3-r1.ebuild 935 BLAKE2B e2257cc6984e94b06cc07a6179501a9aa83b947a05f9a30efd93f8771e733e516c588361e62355ed89e27200c6ccbd505c3edf14d7ef5427875c64ab8b1c6b46 SHA512 3842aca942c11e96386e9d8aad2939816ada9cc6b97089d226044bec978be8b2d6799a7628ba45fda20596745e46d4934aea8b6f270e5e100dccc702de83241c
 EBUILD httplib2-0.11.3.ebuild 961 BLAKE2B 63cce5b170da61a1f6992e7e6a3a416cab109771062cda3abf73c69a9fe6ec7d7b41a18efb6354f5472534108976f6e91458ce22a9f54f0a214ddb3a85761717 SHA512 56807467df22c7e8f34378033c74e9b87850a0a1b64a0d9ee1f3454607eae9da2878c21d90cedaf120b76fc9c986a1c98c989ef5d00e9729d76ed53d99f8db48
 EBUILD httplib2-0.12.1.ebuild 952 BLAKE2B 9cdc1c7e6d3f1640058cab2570f36d4540fb4e8d2ba5f65e26f2edd814d8d1af7df7665c958dacb5009a1db74f49ceca3ec67e56e7d9a739efbe1f1f07dc4ff0 SHA512 c55a1e98b1e6b71a4399004b099280fe3140ba8f2c49f472f4a5db7073be65fe712f66a445b88ae15b06dabec0e46649beba2812dc78e7748ae14d1b73122363
+EBUILD httplib2-0.13.0.ebuild 960 BLAKE2B 735c5a52871671f58708e9f87be95c628e622f3c2ac7495e4c8a2a7cdd2ecbb70c4c11c0c184ca88fc05bd5bdf2d69df51eb24086e211caa91b98e46342ba4f0 SHA512 433c94511fde80b7c7b676f0f9c25ba27c3defdcfb4225bc431a3b35caba1d3e1c6344b18bab6decf6156c3b16d3689c619c6a7aff747fda4b647d088c46dfdf
 MISC metadata.xml 437 BLAKE2B a688f70bc4de310ac3b250f2832c0803e25ea04fcc6a2b5569fc18f90b46f01ef0978bbccae980faaf74f385bed83b3da8179434614851da491ec62c0cfe92ef SHA512 fae017eb657512165f1d931910349a683417f98de8d70248d6b898a1e038212b9c2b1baebeae818126badbb57efb3b3ba1d647b25b759376ba5c3a719ed900a9
diff --git a/dev-python/httplib2/httplib2-0.13.0.ebuild b/dev-python/httplib2/httplib2-0.13.0.ebuild
new file mode 100644
index 000000000000..ea68c21b0a1a
--- /dev/null
+++ b/dev-python/httplib2/httplib2-0.13.0.ebuild
@@ -0,0 +1,39 @@
+# 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} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A comprehensive HTTP client library"
+HOMEPAGE="https://pypi.org/project/httplib2/ https://github.com/jcgregorio/httplib2"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="app-misc/ca-certificates"
+
+# tests connect to random remote sites
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.12.1-use-system-cacerts.patch )
+
+python_prepare_all() {
+	chmod o+r */*egg*/* || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	if [[ ${EPYTHON} =~ ^(python2.7|pypy)$ ]] ; then
+		cd python2 || die
+	else
+		cd python3 || die
+	fi
+
+	"${PYTHON}" httplib2test.py || die
+}
diff --git a/dev-python/imapclient/Manifest b/dev-python/imapclient/Manifest
index cd79e05eef3a..da93df9ecb8b 100644
--- a/dev-python/imapclient/Manifest
+++ b/dev-python/imapclient/Manifest
@@ -1,4 +1,7 @@
 AUX 0.12-tests.patch 1596 BLAKE2B 2150cdfd5ae8135f83bd77f6260ab9bc4c2396c9ec6c7fe0e6d4c595ccf09272fd6b991aac89e93f3e267ab129ac15a0ba7c1589af291001987f9be5b279fd87 SHA512 87cd44146f273bf4d77df34eeb4f921eaaa36bfed951769b7c7b8b729b21ca078f8e7a907d98529f917c88754c48b5cc08acb53ac7786dd6b205b567a50d2c0d
+AUX imapclient-2.1.0-py36-tests.patch 1224 BLAKE2B f3a9a7257f8eed538d9c030e1c8682da0a507d5d9c6f1a92f8d42daceaab214c1d033b4ddeb8f6f5081c53f7e464f72830202b048067d8685eaf761f9aa1bdb3 SHA512 cea2d0b0744cc76d52abda07a031b0e61a96e6019172e0e5490f6e32f757c6850344caa41b22d0db9fd814153c1f78d9d48260281d362ebf1eb2d9a05f9b4800
 DIST IMAPClient-0.13.tar.gz 102427 BLAKE2B f087b6e89c45810f359bed889345e6748ebf9ae90f6e3c4e013097a4e57d3f5ab0ec21906cfdccc03a344d92ccc442d58e38e687cd0761d86956047e89fedb03 SHA512 daebaf7f4180b6c9c6f4a486b313abfdd06f3ed8ece18a19bf46a50e56c2094e85de8a8e4efb8850566378eba016c10816611d03852caf637ee1d43f3c8a418f
+DIST imapclient-2.1.0.tar.gz 85925 BLAKE2B 9725be7988c4bec105fda73389241e39e6c006bccd8130125b280041d13becd6a71a1832763171daf25dfb4e7b4a7fc86c0a3afa93216c3dc4370b19348c0a5e SHA512 57e5824504f2667cf41ac4983130e16a5ea73ea37f29cdb16295eb725b56eda55db26a12e380acb579ef6b8540d38ae6badac5dd5b644d4419cbe9151f634e70
 EBUILD imapclient-0.13.ebuild 1707 BLAKE2B 19d3cf70fe646da3b55033656ac0d4e0bf40be9b0549db998751ba5cca4ff14d19b4997146e4d5c5294a29ea2aec70672e70cfb87fefeb224e2b8cf4a9a62873 SHA512 99919483e6f7ff1d585ab7ea44e54ea4101a096035ff4a6972d32da2a2c8af4d16bbd1fd2c13831d3f33f993a609cce573b2afc847c768525d8728b6f85aeac7
+EBUILD imapclient-2.1.0.ebuild 1113 BLAKE2B 99d851c9455ba6f4cea1473e8947c74f89a2e7d3610af9c753e52b75a4670e1773f5d5c662dab292332d07e3bad9567e90970bff262c1104c2c3bd441437a9c4 SHA512 80e2690f10c123d9abbd7f768d7ce49cc29e40afe281596318a3ea3dd0aef22b07b7b4e308e276e0bb6b9afd2e90f452fe2c8667c12e78894ebcf4882c615133
 MISC metadata.xml 313 BLAKE2B 89d6cfc58f1d5e5e5e0737bf8fafc74e26800234041390fdc259aaf4a49b9c8aacbf9c5c2c55e8ddac4b5010dd70a2ca349f41ee15a0812335522354381bd151 SHA512 b8b32e8bfcf59a3f7134ca2f562365c02e590a2d6e8e5eae9c6d3dbe2d4918b973b614aa38650cc67a5c34167b6293f4dede92e53f635f079a050bb26289d48b
diff --git a/dev-python/imapclient/files/imapclient-2.1.0-py36-tests.patch b/dev-python/imapclient/files/imapclient-2.1.0-py36-tests.patch
new file mode 100644
index 000000000000..d9a429a27671
--- /dev/null
+++ b/dev-python/imapclient/files/imapclient-2.1.0-py36-tests.patch
@@ -0,0 +1,28 @@
+From 26fb9c9794ad0b2541320d71d5704fce5642a53c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sat, 10 Aug 2019 09:15:37 +0200
+Subject: [PATCH] test_imapclient: Fix LoggerAdapter version check
+
+The LoggerAdapter behavior change has been backported into Python 3.6.4.
+Update the check to expect logger.log() call in 3.6.4+ rather than 3.7+.
+
+Fixes #383.
+---
+ tests/test_imapclient.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/test_imapclient.py b/tests/test_imapclient.py
+index 91ccfa9..0f12823 100644
+--- a/tests/test_imapclient.py
++++ b/tests/test_imapclient.py
+@@ -604,8 +604,8 @@ def test_redacted_password(self):
+         adapter = IMAPlibLoggerAdapter(logger_mock, dict())
+         if six.PY3:
+             adapter.info("""> b'ICHH1 LOGIN foo@bar.org "secret"'""")
+-            if sys.version_info >= (3, 7):
+-                # LoggerAdapter in Python 3.7+ calls logger.log()
++            if sys.version_info >= (3, 6, 4):
++                # LoggerAdapter in Python 3.6.4+ calls logger.log()
+                 logger_mock.log.assert_called_once_with(
+                     logging.INFO,
+                     "> b'ICHH1 LOGIN **REDACTED**",
diff --git a/dev-python/imapclient/imapclient-2.1.0.ebuild b/dev-python/imapclient/imapclient-2.1.0.ebuild
new file mode 100644
index 000000000000..2b5dec6af405
--- /dev/null
+++ b/dev-python/imapclient/imapclient-2.1.0.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{2_7,3_5,3_6,3_7} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="easy-to-use, pythonic, and complete IMAP client library"
+HOMEPAGE="https://github.com/mjs/imapclient"
+SRC_URI="https://github.com/mjs/imapclient/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples test"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' -2) )"
+
+PATCHES=(
+	# fix incorrect assumption about py3.6 behavior
+	# https://github.com/mjs/imapclient/pull/384
+	"${FILESDIR}"/imapclient-2.1.0-py36-tests.patch
+)
+
+python_compile_all () {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	local DOCS=( AUTHORS.rst NEWS.rst README.rst )
+	use doc && local HTML_DOCS=( doc/html/. )
+	distutils-r1_python_install_all
+	use examples && dodoc -r examples
+}
diff --git a/dev-python/importlib_metadata/Manifest b/dev-python/importlib_metadata/Manifest
index ca5214d9d739..85b5b5a80191 100644
--- a/dev-python/importlib_metadata/Manifest
+++ b/dev-python/importlib_metadata/Manifest
@@ -1,5 +1,5 @@
 DIST importlib_metadata-0.18.tar.gz 23341 BLAKE2B e1c43a760b141b0589973672ad1cd6c47e077293353f67ebe2c2b3631265712dcecc8e14a57803539d2276d5d908fae3c4ac07165ddd5937cf53955ff896001e SHA512 2f39789725548bcb37061b0b99f90802a2919339db6b29f95b38811b35f4cafc7acfb4cca1167e28a4738ba195af31344f59ab457d87710764d1ba8f06034b18
 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
+EBUILD importlib_metadata-0.19.ebuild 1421 BLAKE2B 1a847f367c90077958c6229ecfbd0c69e62f820f01c5a7e59e926e334f257b34dd8831edd506f30edaa6112094cc4ec33de50559a9dab6731cc14280ae699699 SHA512 fce535f98e691c07caf170679d86ec45fe6991b8b1a385af3ce23581c720354a8adb8009c37070de4e2186c9eeb323bc5faa64628d455908c5d6826b1e684f72
 MISC metadata.xml 575 BLAKE2B fd32bd69ffa26679f44ae19012bf57e77219abea01918062e2290e48121209353d5a50eb2aa028ca8359b3c8f40a35c1cc4c48e2f05cb855a3016f2f01da41f2 SHA512 fdb2a87b50b50fd23d97c7dd9875958ad9ae6474f6e0a0e5fb8df12ed381c30e21a71ae2eaf3baf03ae1ab973c0c7827c8a84fa09c8ca52eb938439e4f66e17d
diff --git a/dev-python/importlib_metadata/importlib_metadata-0.19.ebuild b/dev-python/importlib_metadata/importlib_metadata-0.19.ebuild
index b0d853f13ed4..8c74d5303223 100644
--- a/dev-python/importlib_metadata/importlib_metadata-0.19.ebuild
+++ b/dev-python/importlib_metadata/importlib_metadata-0.19.ebuild
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/dev-python/importlib_resources/Manifest b/dev-python/importlib_resources/Manifest
index d2453a92e732..1ecff89e9c8a 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 1238 BLAKE2B 17b3c7c62bbe70844287a51264db2bf044181fb4717d3693bfbfb5ec47d8f0012aae62de2d3a4e7fce666bba910432a032a799bc50bf6330fe144b0b51e050a8 SHA512 a85ccd9735549775bfaa3c804aae7ddac3f42179fc78f4858b522de713a806f5793525ff546111d7a326c09ad11560fd6774ef00905fab3095197136e7d168d3
+EBUILD importlib_resources-1.0.2-r1.ebuild 1244 BLAKE2B ee5bb8f8d0b1ca8530fbbb67a1e4327c0122ac39760ef351d6705ead1b64a98a70539b5d35af16d5be99fd23964d905f34095c9bf8dc2068a1e1d00b3cbf80ed SHA512 420c782def3b598afbaa7955df2ca3f61e006fff70cb23023e4348224aef226c81c6c1dfd613bc2dd4cafbfd7435e4716b7068ce7daf7461089cc091e5ec278a
 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 e6abfbea8b39..af52d40b75ab 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="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/dev-python/jaraco-packaging/Manifest b/dev-python/jaraco-packaging/Manifest
index 7feac0434d18..c8b403be7e3e 100644
--- a/dev-python/jaraco-packaging/Manifest
+++ b/dev-python/jaraco-packaging/Manifest
@@ -5,5 +5,5 @@ DIST jaraco.packaging-6.2.tar.gz 15408 BLAKE2B 21c63b4e400bdf8b4b79873e6a96c7576
 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-6.1.ebuild 1602 BLAKE2B 20a8a452aa9b20d14f9b8872d75660b0c8d3f0915a6de6d03f9ae26522ee578649123cf5d9f0e7dcc8e65d7a82b46bc6c83c7d2d8afacffef07b64807692da03 SHA512 01d228b64777567adf993c587dbb75f7e34668ab54b7bb7d916bdbcdd89e011772cf26e206598af7d175538622181552dc38240cce4c9a3fb584f87b0405dde8
-EBUILD jaraco-packaging-6.2.ebuild 1633 BLAKE2B a216caef87790eca6560fb7b3979491cbd593cbb3dbeb26ea5474af95df6c853053608ee439745334eb5a154626dc57cc4e53df39d00fdb454196dc321079b20 SHA512 6a46a87fb1b6adee75f025da5616f65c66f35e20e5ac3558cae3f3c5ec681fe16c58f005207d0ecdf180de0f18cc1ddaf03710bc8f6c150b80dfabb2f7124c70
+EBUILD jaraco-packaging-6.2.ebuild 1639 BLAKE2B bd85e1746690171ee4dde3bb5e44b895ca17305c43946dbc7cd69684a13efc4de23bc39f86fb36caf211a2d0a6855219dfe9368d4570e006b16396bc7387ea4c SHA512 7bf6684f3bc9d21d9a8a6ed599cac2d2934ffed42cb55bbd6e776e356380299b75b9acab493a20abaa59b16f8e3621e381e1efdda809f22258eabddc634f5dce
 MISC metadata.xml 651 BLAKE2B 145a05709cfd4b85e623982b7defaf588eb0d68ed3fcbb52655a5a8cd10fcb2cfb269b9179e81e5409be0485f4c71565ecbdc4019d9f07f322d2cfbc3731c2d0 SHA512 d8f857056e0a73cb34903a7001cda6f543eeec0182a87ee2bd660631ab9e855d1214166546c179b9711ec8ed9a5063b14d9362001e67203a7132694112ebf086
diff --git a/dev-python/jaraco-packaging/jaraco-packaging-6.2.ebuild b/dev-python/jaraco-packaging/jaraco-packaging-6.2.ebuild
index bea4c9193a3f..bec56e117f67 100644
--- a/dev-python/jaraco-packaging/jaraco-packaging-6.2.ebuild
+++ b/dev-python/jaraco-packaging/jaraco-packaging-6.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/dev-python/josepy/Manifest b/dev-python/josepy/Manifest
index eacfd66e292d..f45d1520f6c1 100644
--- a/dev-python/josepy/Manifest
+++ b/dev-python/josepy/Manifest
@@ -1,7 +1,5 @@
-DIST josepy-1.0.1.tar.gz 50251 BLAKE2B eb75e05dec890c92043357740829edf96f49f0c77b85211b9a9077ef39bfe59df2ee5952c1569559a07b6505870d796b3aa9e2b0fdba6943860b035f09a004b2 SHA512 51f0e1286a05ebc42f388d13e47e7bd2d1eb11ba1cf06f4d52d627d4a3c2d01f73f1ce9c9ff23ed7dd78ba18142af23e3de4277a63dc69b433bbc3e7aedfd6eb
 DIST josepy-1.1.0.tar.gz 51286 BLAKE2B 57da7c74308b7698e84e19307283f9c09e61ee4f99ffcc98f02f50c24a96efd485540b878d5d52248a51f81356ab406654c6016614e32a1810cc1ff46b49ba39 SHA512 eee886565b1cb92e6d7a42f1e3666a158c162fb891f90de844118ac32b24f6deccf2eee5990ba100827109203f7da99c2b55735fb7bda05fd7a447dca39d6362
 DIST josepy-1.2.0.tar.gz 53130 BLAKE2B 1308ac60d32c65d8117e87474ed178f3e582de1f5bd958f31cac9a5837e0006a64291f9b8752ab1282d7f656d8931ecba54cb311888106618da993ab5bd773ff SHA512 1e746cf8e02c86a728d1a502000bba3c7db829f29dcb49ed40c7398d2ec904e830d267c60b444d57c3cf44d6ae829d3f3f4fd4288dcb3d5f47ab96d06a2d6bc5
-EBUILD josepy-1.0.1.ebuild 647 BLAKE2B 4bc9fdf0ad4903835760de27e4f3f0333a666539d849f64fdd924447c71f0725f5048b927fd8eb7bd1936cce2b3f5d9115050d93d965ad5957d405d007a05710 SHA512 5bd5868597481178a1c6681b76a789a5f2fa8acc8f591c8d9916778aedb9f88cdd188ce20e41d73787193b50f9ae2ba88c14e6848d8d3f00d1f2a32a6b0ac89e
 EBUILD josepy-1.1.0.ebuild 664 BLAKE2B eba819fe93372091eb15d7f823a6c1358510bf3b63a9a3f0eed1820f268439819d80e4ef1fdbc500d9354a676f2f3c602fcafc19c1ea9b5fdafc5bed052af125 SHA512 d9249729b1802dd9c536e191cce9d07e68cf1bfcce978a1379e3a29d85fdafd7949f390036e424deed14fb863595330cbfc0178c8f23ff3a3c97f41ee05dab85
-EBUILD josepy-1.2.0.ebuild 666 BLAKE2B 7ce82a9c6a32a4ce91dc196999c7c7ca86057dbe021b08552158da0dc6b09a1698d3902a3ec7cbc8374b3e72bffdaf2b8e4ee4e6b3337f982bbf9f6682b94ce7 SHA512 cadb12d942348ccdf72744b5c3bbbdd5719d59c90ba7df14b6334df9548c40f405ab22e9b48679e106ce073a1c1f21d685bca783d216ea27874aa66388744fa6
+EBUILD josepy-1.2.0.ebuild 664 BLAKE2B eba819fe93372091eb15d7f823a6c1358510bf3b63a9a3f0eed1820f268439819d80e4ef1fdbc500d9354a676f2f3c602fcafc19c1ea9b5fdafc5bed052af125 SHA512 d9249729b1802dd9c536e191cce9d07e68cf1bfcce978a1379e3a29d85fdafd7949f390036e424deed14fb863595330cbfc0178c8f23ff3a3c97f41ee05dab85
 MISC metadata.xml 510 BLAKE2B dd45e914009523f3f80abf257ab42238c0e033978f344e9d4dc7cf28293f39dc0e5b195129ef065fbdcc979a48166fdacf3c81b1fcc808017625595a5674170d SHA512 0742fcd82de64649d12f10a2c7b20baf1a928943f4ecadd4995f23e13471d584f17ec188b0b98aa1f675f9b44d7d8446dd4525b2b7617ec6b547c0074d6c9139
diff --git a/dev-python/josepy/josepy-1.0.1.ebuild b/dev-python/josepy/josepy-1.0.1.ebuild
deleted file mode 100644
index 3add6207a926..000000000000
--- a/dev-python/josepy/josepy-1.0.1.ebuild
+++ /dev/null
@@ -1,25 +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 python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="JOSE protocol implementation in Python"
-HOMEPAGE="https://github.com/jezdez/josepy"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-0.8[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}
-	!<=app-crypt/acme-0.20.0"
diff --git a/dev-python/josepy/josepy-1.2.0.ebuild b/dev-python/josepy/josepy-1.2.0.ebuild
index 63f431f7dc3c..a345fc6f3611 100644
--- a/dev-python/josepy/josepy-1.2.0.ebuild
+++ b/dev-python/josepy/josepy-1.2.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 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/jupyter/Manifest b/dev-python/jupyter/Manifest
index d3ce36cf8819..da8373ba31af 100644
--- a/dev-python/jupyter/Manifest
+++ b/dev-python/jupyter/Manifest
@@ -2,5 +2,4 @@ DIST jupyter-1.0.0-file-colision.patch 1727 BLAKE2B 59bf5e567e6da9e9f3d841789429
 DIST jupyter-1.0.0.tar.gz 12916 BLAKE2B 36476eaf0119613ba6d9f153aab1658f43951dc3879cb6a9e90d8fba14cc1247305e18fda2251127faac4e68867efd3ef57129675bbe89a17a6469255efcade2 SHA512 1f0bc83f7a127c98ccf4b3868814116aa272ea5d0baac52d7a022305af7e2da28ca2b90fa3554ff085d8df3eb6d8b8cde80bf02b8e66064c59900b926d73c520
 EBUILD jupyter-1.0.0-r1.ebuild 1298 BLAKE2B 6ec6c6dc466fa2f2aca6d1777a07ac74f58972e1fcca6e78f98c8cdfbde68b1d5d4e44526671644a3211065ea4b791c91372ca1cbf265e376f8af2a13fb2f3cc SHA512 79fe7b6ca66447bf31e0868b160ace51dcb4dc8774db51272234dbc8918185083de35237856e4223eadc9e0249bc270fa710dae317296a056190cc1c9ecf84ab
 EBUILD jupyter-1.0.0-r2.ebuild 1288 BLAKE2B d449cdcf51fca9dd3e6fc7103947e69b5fde877d98c8df09ea4ad7224bb1742d0d7a3f561caa08c475974cdcbe0bb6b4f39e0b13b6ad5282d1d836de64d3e713 SHA512 28ac8c0fbf26c70d262a0c69b4f23ff661c398f363fe5afa31b24360c7da87ed83333a0b1eb52acb278409cb201b1712edbc25bcaa5cd02b77ff21ea0172ab5d
-EBUILD jupyter-1.0.0.ebuild 1069 BLAKE2B 8ebdbf05a5a0e1fe1cee60f30d736cb11b3d223afeff0af96e1aad39ac7429014186f0b1b189c88735c0ce3d14c9104cc878eb15a6e26ca8ea472a7ac720bf9e SHA512 fb4b3d65f7b2d33214811dd353eb78c9efe271e6e5ad54f907b62ab604eeff015fb0d15ff4ddc8da2f7c2814e14f6a6f984cc29dc6d5af60f00a48e315a4c58d
 MISC metadata.xml 518 BLAKE2B 9698e2cc9423ef542d9cfb8b19be99b925a4098fa1350ad0806c384c495aca26852cedac070d7b83db27444413f72e201f7daac1ce30d05bffc09ac8270b2d7e SHA512 3838bb1bd86e45821a6793faa2afcffa0a887876e35fd36a2b21e6e6312256f94ab79026232197752c922ad51208dbc04a30c43e0bd0ab8d7945ee4fe2947999
diff --git a/dev-python/jupyter/jupyter-1.0.0.ebuild b/dev-python/jupyter/jupyter-1.0.0.ebuild
deleted file mode 100644
index c0be2175677b..000000000000
--- a/dev-python/jupyter/jupyter-1.0.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="Jupyter metapackage. Install all the Jupyter components in one go"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc"
-
-RDEPEND="
-	dev-python/notebook[${PYTHON_USEDEP}]
-	dev-python/qtconsole[${PYTHON_USEDEP}]
-	dev-python/jupyter_console[${PYTHON_USEDEP}]
-	dev-python/nbconvert[${PYTHON_USEDEP}]
-	dev-python/ipykernel[${PYTHON_USEDEP}]
-	dev-python/ipywidgets[${PYTHON_USEDEP}]"
-DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	# Prevent un-needed download during build
-	if use doc; then
-		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( "${S}"/docs/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/libtmux/Manifest b/dev-python/libtmux/Manifest
index 228a5ed8659f..fdd18fbe3948 100644
--- a/dev-python/libtmux/Manifest
+++ b/dev-python/libtmux/Manifest
@@ -1,3 +1,3 @@
 DIST libtmux-0.8.1.tar.gz 37696 BLAKE2B 48f780ed2c1243c752d35d58f1a7eee4d59297047abcfb0c02c8c9206ad2f8c7df9c2968935e30457dd14be8a9110b9cb1e3b7daf4d5df43e3533e400cd8b21c SHA512 c45e8c761fb9a6b827feff96d4bb263fb0419509a1bd450ac4038d7ad0b96b3047f0d6f3c7bbaa16686918ecfe3c8d189b99982574e4056abf5a491b20e0e7f1
-EBUILD libtmux-0.8.1.ebuild 676 BLAKE2B 3f7f42fa2305111aa785cdef6ef2690122369ef09d58efe57b797e271b5a9cf0390a6d276b69f25ae214355d94f12a6d96a7fdeb2370522d383c8e156980a265 SHA512 080858d629bd06dec3703d65b6e07f36ce9a379ab9d2263883c1794a858ff4a3c2e891e021a52cdb559961c01400743f571b4120c8afc6b6d5e0c3bc50dc7952
+EBUILD libtmux-0.8.1.ebuild 660 BLAKE2B b5fec4fc30236a2283fc82016c32ac2f6659140c85c639f91792e84047f149dc906455a6ebfe907a1f94e04ab5fbe642e755bacfb8fa43a4280d6e51da7a993e SHA512 9131806a41b82b547b10ff5b1ef90a7130c8771828355d3c7b63365b4b1a0d7a9d199aa9c89cd2abe88dcc6c9c2d727f3c64281ea86f7065f08671875c220b5b
 MISC metadata.xml 255 BLAKE2B 2bb3830b8cec850703f7912f4c22f5b0abeabeed0715222bc56141779d02160773cfd0f85417c553c1cd8f2738bfeb78c56dffb8e648e572019319657646d1ba SHA512 522158915afe67937f81ba572a918a2de8ca1f8591e097da56799c97870d7c44756c1acd8224d63bd3375c2b9ebc0e1ce50816899117948a48065a27804883bf
diff --git a/dev-python/libtmux/libtmux-0.8.1.ebuild b/dev-python/libtmux/libtmux-0.8.1.ebuild
index 517f2c71e586..2c538082e6c2 100644
--- a/dev-python/libtmux/libtmux-0.8.1.ebuild
+++ b/dev-python/libtmux/libtmux-0.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019 Sony Interactive Entertainment Inc.
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-python/libvirt-python/Manifest b/dev-python/libvirt-python/Manifest
index 1154da6979fc..c3c85f95aac3 100644
--- a/dev-python/libvirt-python/Manifest
+++ b/dev-python/libvirt-python/Manifest
@@ -1,8 +1,8 @@
 DIST libvirt-python-5.2.0.tar.gz 193270 BLAKE2B fecd1a07091746779a91e0cfeb9c3068048ee7e51d2f79064b4ee529a19b78d04ba53a5abab68182a1fa9c4a82f459fa9e971c33fcd10b42fe7011be17f7c6e2 SHA512 afee2dcaf08d530e6298fdf2db674af217b9e4115941258b5815aba00087d96db6eb421c9854d7dca0f9dfe24069df72aadd969c924545e72be216f01bc173cc
-DIST libvirt-python-5.4.0.tar.gz 193623 BLAKE2B b19ebde80c4e922139802d316a82a6d0b45d6087a4dbd5f801507c18fc5558bfd8983171df55b4efb6c2ad36235f6ddab402473b66450b4d031a5e4ce7705266 SHA512 589cd68189d7a8b611127f6dbae4853659ce98c02d22242b6c8ab646dd04e657f912ddc8f11595f656ac14a1fc4528a941b8a05d52cdb1951ce91c89af0599c6
 DIST libvirt-python-5.5.0.tar.gz 200364 BLAKE2B 198c9858573c383ab818deae6bd42c6ad7efd58b9a661a80f06f4f0fc0d72e9da98546b07443397609d4c9454ece4e02759b53016f078bdae84580474e2bb49d SHA512 3098c5a0315488aa515a9b00e69add8de3dc372d2f82a8b1cbc6d01287a133855095f7c34510ad900adbd1c56e6a53bdfe3d251c48411acd243c2300d659332b
+DIST libvirt-python-5.6.0.tar.gz 201352 BLAKE2B 16f88b9c15214af0ec97ee39912139d6ab07473a9f65a735303f5241d10d75e46db68378b33c9c139f6a9e43f7143a4c30fdbe187e50e004cfb5205dda03d0a3 SHA512 a6bf7c661127ae0ed5962ed7bc9cefe09907e82969525ee0ea8f8f70b5fee8f200b6ba9d35aefcb7b132f59e34162ba40e75e93aff297808bc1dd23f548da428
 EBUILD libvirt-python-5.2.0.ebuild 979 BLAKE2B fb91ea46f10a7d83215fae5c8557626ca99e16d893f3c3ab27b2b528bf1e85e0473eb011d43597ff63105b8cffe5d9de28cd22688893715f8a13cb05c16b2268 SHA512 af012b0e554b13c1de26c9ebf67a384d553b03ef30e96f90253d441e8064a2b9cf586af9375f82339a2b16225fee326bbfaa9633f6173ad248d4f7f23673d6cd
-EBUILD libvirt-python-5.4.0.ebuild 972 BLAKE2B ff738ca6dc085799245e2b4abd6653cff131409c6ded81a5e647bb9b8f8879050d161dd415ece999e84bea6be572a4daeb832fc12354b2bdeef45654de5291f3 SHA512 fb4fd08b39be642fc824572f13eec89d505670641c1d4b0ac418584ace3f6c6ae2b545699a35e88111f97921a302e03a23be55d2f31a62e101514a5a033f73c1
-EBUILD libvirt-python-5.5.0.ebuild 972 BLAKE2B ff738ca6dc085799245e2b4abd6653cff131409c6ded81a5e647bb9b8f8879050d161dd415ece999e84bea6be572a4daeb832fc12354b2bdeef45654de5291f3 SHA512 fb4fd08b39be642fc824572f13eec89d505670641c1d4b0ac418584ace3f6c6ae2b545699a35e88111f97921a302e03a23be55d2f31a62e101514a5a033f73c1
+EBUILD libvirt-python-5.5.0.ebuild 979 BLAKE2B fb91ea46f10a7d83215fae5c8557626ca99e16d893f3c3ab27b2b528bf1e85e0473eb011d43597ff63105b8cffe5d9de28cd22688893715f8a13cb05c16b2268 SHA512 af012b0e554b13c1de26c9ebf67a384d553b03ef30e96f90253d441e8064a2b9cf586af9375f82339a2b16225fee326bbfaa9633f6173ad248d4f7f23673d6cd
+EBUILD libvirt-python-5.6.0.ebuild 972 BLAKE2B ff738ca6dc085799245e2b4abd6653cff131409c6ded81a5e647bb9b8f8879050d161dd415ece999e84bea6be572a4daeb832fc12354b2bdeef45654de5291f3 SHA512 fb4fd08b39be642fc824572f13eec89d505670641c1d4b0ac418584ace3f6c6ae2b545699a35e88111f97921a302e03a23be55d2f31a62e101514a5a033f73c1
 EBUILD libvirt-python-9999.ebuild 972 BLAKE2B ff738ca6dc085799245e2b4abd6653cff131409c6ded81a5e647bb9b8f8879050d161dd415ece999e84bea6be572a4daeb832fc12354b2bdeef45654de5291f3 SHA512 fb4fd08b39be642fc824572f13eec89d505670641c1d4b0ac418584ace3f6c6ae2b545699a35e88111f97921a302e03a23be55d2f31a62e101514a5a033f73c1
 MISC metadata.xml 518 BLAKE2B ac9993d622790a5cec52f737de0494b7ac6a5a6e17e66ccad8e4862257ba8926d688fa4b6e68cd96ea5a4f2d35825204219fd79bc5917d05a6f39787f80bc1df SHA512 243b815c70c65046d672bc2b4a05d67f61c6e70dc6677ef7e8b76783979d801793f8d864a33ed9c64072c4fa30786d4455c82c82fa37933dac0b0efac2264083
diff --git a/dev-python/libvirt-python/libvirt-python-5.5.0.ebuild b/dev-python/libvirt-python/libvirt-python-5.5.0.ebuild
index a020f3273876..b0d227f81e12 100644
--- a/dev-python/libvirt-python/libvirt-python-5.5.0.ebuild
+++ b/dev-python/libvirt-python/libvirt-python-5.5.0.ebuild
@@ -13,11 +13,11 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://libvirt.org/git/libvirt-python.git"
 	SRC_URI=""
-	KEYWORDS=""
+	KEYWORDS="amd64 x86"
 	RDEPEND="app-emulation/libvirt:=[-python(-)]"
 else
 	SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 	RDEPEND="app-emulation/libvirt:0/${PV}"
 fi
 S="${WORKDIR}/${P%_rc*}"
diff --git a/dev-python/libvirt-python/libvirt-python-5.4.0.ebuild b/dev-python/libvirt-python/libvirt-python-5.6.0.ebuild
index a020f3273876..a020f3273876 100644
--- a/dev-python/libvirt-python/libvirt-python-5.4.0.ebuild
+++ b/dev-python/libvirt-python/libvirt-python-5.6.0.ebuild
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index a0ba53c0c8a0..1caa1ebe195f 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -3,11 +3,11 @@ DIST llvm-6.0.1.src.tar.xz 25306628 BLAKE2B 60232d4d22f8096b565cc8d81fea0639f24f
 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-10.0.0.9999.ebuild 995 BLAKE2B 8c6c5d8db23190085ff16b91eab188f94cf9938a45b8cdb7d8a0f488f4431ba07c823fe270383978ab3b850bf9bb68544ec8e5429b5bfd3e05c8da59191b2b71 SHA512 eedb9b2e32c313db08637c95f3086cc76d7d5505ae9b29bd3aefc630cddda51a0152c58a4d9d61aa5b3cf8667fbcf647c7bdfe77c02371abfca245d3a99b21f9
 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 1011 BLAKE2B 947aa38ed1ef868f32392a347c0c959b7e5a1091d59c995b69bf5539c58fe34e2994b0593846fe6fdb61b3d97ebed298e47bd0e71fa1b47cad3822401a56f485 SHA512 464a34437c15520924e783375a9aa9ce581871850a6fb756599d30b65ccc93e8f93114b184c3e155acd7e11382d6f748b8e866fc6400d863c7a9c99b0a818af0
 EBUILD lit-8.0.0.ebuild 1015 BLAKE2B 70ebba5849fe2d5d464d2fb2ddf1a903e992dbab59ced42048c16276bcbc71af3e1c72f8d726bd80d5469080b5c00e0e38aac03f1704c23303092848721e424a SHA512 5af4e2d207b7bb5bafb4ecd21577569f77bb2127bd980dd0d31aed256253a9019de316ae4a9c33ddcd4d1135c67ce5052393d4f827554f0fbb65e9e22f0eefbd
 EBUILD lit-8.0.1.ebuild 1048 BLAKE2B 53f32cdbbace06c015e103c64f3f9a7c91ce32a83718c3090e7429172c654c75d4ddccbeccb912ee28c2a6c2366cd874cb34c4dd73de8503d10dd958df0242c8 SHA512 38dca2c0c4c93d4f6847adf5cfdc67473ab902dc027449c2c065b4dec2704e292815e91d51a4fd538e8cabfee99467d1b34a97752510187c5e5bf9d5ffaeb1be
-EBUILD lit-9.0.0.9999.ebuild 988 BLAKE2B dd1c52a6f8905a40d7eb255a488ab0369e2f7f4c446d57e518f2d4b3bfaabc6c802795553e7125004d448746f02db03634d2360588d534f5e2cf82cf009a8df4 SHA512 b693ce24e3dd3ac9b853221a8ba4a7fcba23443de72e283b145622acf7d15fd9262ad74ec82e46ccbc26b25982d1f5b681e7dfe0e1195bbaf1a9056378f41638
+EBUILD lit-9.0.0.9999.ebuild 1020 BLAKE2B 15f2957d15b60232f4d60c31481b4129fba74aa3d1dd5e16b9f57c6f1adcc54f4f3bee552adc429667a54b6b728b0d802b18010192e5cccc27912d8419e754c0 SHA512 e2eb892b05030c33f35f975fbe63b143f173c3c415b67a80d8d3a11f93779375cc0380f13026f4c2edd74dd7fe671ab47bd8df4f5d65aad3de6086e3033eeaae
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-python/lit/lit-10.0.0.9999.ebuild b/dev-python/lit/lit-10.0.0.9999.ebuild
index 48607eb9c905..ca5855806da0 100644
--- a/dev-python/lit/lit-10.0.0.9999.ebuild
+++ b/dev-python/lit/lit-10.0.0.9999.ebuild
@@ -12,7 +12,7 @@ SRC_URI=""
 EGIT_REPO_URI="https://git.llvm.org/git/llvm.git
 	https://github.com/llvm-mirror/llvm.git"
 
-LICENSE="UoI-NCSA"
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
 KEYWORDS=""
 IUSE="test"
diff --git a/dev-python/lit/lit-9.0.0.9999.ebuild b/dev-python/lit/lit-9.0.0.9999.ebuild
index 399ab4cc6df5..c6bd8d6e177b 100644
--- a/dev-python/lit/lit-9.0.0.9999.ebuild
+++ b/dev-python/lit/lit-9.0.0.9999.ebuild
@@ -13,7 +13,7 @@ EGIT_REPO_URI="https://git.llvm.org/git/llvm.git
 	https://github.com/llvm-mirror/llvm.git"
 EGIT_BRANCH="release_90"
 
-LICENSE="UoI-NCSA"
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
 KEYWORDS=""
 IUSE="test"
diff --git a/dev-python/lxml/Manifest b/dev-python/lxml/Manifest
index c61e52841360..b81767587aed 100644
--- a/dev-python/lxml/Manifest
+++ b/dev-python/lxml/Manifest
@@ -2,7 +2,11 @@ AUX lxml-3.5.0-cross-compile.patch 1518 BLAKE2B 70907747332021789933759d3e2620d7
 DIST lxml-4.2.5.tar.gz 4414081 BLAKE2B c1c75a0a0c33011e2becb729de2c15dd786dd12bddeba4f2f26032d0d17104f258b471f5f961cbf96340df66cbce3e874d7a16c59731af280a309132b669d1b9 SHA512 4cf336d3e1471e8a26492760a143881517d12eb1c2dad82f8786540471bfabd68f8c795d97b7362166418c2be3c7996816638fdbd5a594536b9981478b90fdfe
 DIST lxml-4.3.3.tar.gz 4378439 BLAKE2B 30c2a29e58951164fbff1c9d23362d46987c86b671e0cfa6cf15cbbb3db23ead856786babe57ce553f7b8a66d8ac333410ea1bb3b8b521aac43a038b90daf488 SHA512 cbc1cd30bac4b9ac845d99949c8c231a7870398f942695df5a00586d70d0f6b6ebd457a1a9306806af7d0fd521a14c54d266902943263927a0d940abc3cdf5c0
 DIST lxml-4.3.4.tar.gz 2488557 BLAKE2B 5059ea45d3d833955636216a7c096322496882de4592a0d19604885dca8dffbc763afb7dc804b7a34561d0c94dfa2130a61835d6c12b97dc83008e8fa33e098a SHA512 7349cb4805e538da5b11edcb79fcd09ddedf0d52e50273a4e587f209e6b147b50737c45dcfc8eb3ee8e7be8f99769046f704c5fc8c35cee74d5d22ef72d503ed
+DIST lxml-4.4.0.tar.gz 939001 BLAKE2B 9fc473729286e98cd73e4b39d7acf22ccb957dd4b366924dc171a6c89c2e435a3dae771342eb3b143451b0550960cb821430de3e8f6470dc87e3a85efc389314 SHA512 23e7b5157a6520f3e1dab76b023e828a5afe9d0103e2d3ff8fd1a8791000ed8f859e26fe9809676b89d4ef9fa4b27a6f1662a2b0f54e5ae04776643f5b06c0c3
+DIST lxml-4.4.1.tar.gz 939355 BLAKE2B 0e9ebc894ebaa7994ee7ce1491683ff892ceac5dbae6bd90fd4d5ac04ec59d6c85edba37160a605c8c1b38119cdccdc8b97b62dc43f76705d7ebb595410c666c SHA512 08857f5e15d6b4badb8bea96fc7aaf3a02a504f9b87171e01c6ace25250d254691c64661dca8e723824cabac4753c59ffa667ac0b6042506b05e4357389e658c
 EBUILD lxml-4.2.5.ebuild 2348 BLAKE2B a226eeaa080552fbde23fe44dcdda766c4d463b1103440cec93ebb84e79ddaae62dc328e5825639368ee21fd4ad2ddd32f2c08f3c0b7ef81f48c8e92a284312a SHA512 9e16806fb9e602b5f60be9e5b24b1ce7bed7a643a632d37e12dbdb79defeb312bbf4628c9f2842b12ee3f7d36ca11922aa9edffeb3898ff8465b34210f29f653
 EBUILD lxml-4.3.3.ebuild 2438 BLAKE2B bdd51ec36c142e2f2f0562e989e3fa9577e164848f0a7c67f9335f6211d3507bf08bfce14316a66a9673cce701602e952f6f489f243e8ad9a3bb66e05149025c SHA512 7e4c36f1dd8bd95d695ca75b68d4bae3ffd8bc81681115d4c91f68eeff19d601bc8cd42669b05e6b2ee52bf895093854208d05db5c0786a0c4b1eef121ddd420
 EBUILD lxml-4.3.4.ebuild 2449 BLAKE2B 77d23aa3eebd636103112a20740821bfaa5087642bfad207232eb4fcf1290f5fc18d372b9ae41215284441a17604e049f6978d3ee1b58fba230b2964d2af1841 SHA512 d0256c53ba71116ad254b0a681e01a01a49545a358e706dec491f4878c4ecfe14d67d8e409f454d6db7c6659ab14c6cb8c1c03ed25990bc37f52f45a16cb351e
+EBUILD lxml-4.4.0.ebuild 2297 BLAKE2B 2c469078740b99424abd7e44e9319b8b4a7d2b7616751b9b4fbe7815aae7d860ed1faeee27c6474578177a0e299c2997266e33428fd044a1ddd1b228ee179fd3 SHA512 0ec43c451aa31fda566d72b55221beb9b5946292c5a1fc424835175dcb38bc604187a11032d323e45eeda4fd2241e38d538ed68ff51189d4bd0c8f166e4b1638
+EBUILD lxml-4.4.1.ebuild 2297 BLAKE2B 2c469078740b99424abd7e44e9319b8b4a7d2b7616751b9b4fbe7815aae7d860ed1faeee27c6474578177a0e299c2997266e33428fd044a1ddd1b228ee179fd3 SHA512 0ec43c451aa31fda566d72b55221beb9b5946292c5a1fc424835175dcb38bc604187a11032d323e45eeda4fd2241e38d538ed68ff51189d4bd0c8f166e4b1638
 MISC metadata.xml 317 BLAKE2B ba93bbba5105423b6640b86b29f2a54ff50c9daf42424915cfe25049e983ca03c6f2fc066d4e27fe42292e8290b7091bc00d5a40f49d368a3dd6acce42c4504e SHA512 900609bfd7cd032821afb5d1f6e5c25287178f06a49e59431a710d4e76187a2b41a4a0da383d257777a2120b60f15620da37c70d145eca4a84aa30a08b824fae
diff --git a/dev-python/lxml/lxml-4.4.0.ebuild b/dev-python/lxml/lxml-4.4.0.ebuild
new file mode 100644
index 000000000000..e7c16048171c
--- /dev/null
+++ b/dev-python/lxml/lxml-4.4.0.ebuild
@@ -0,0 +1,80 @@
+# 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} pypy )
+
+inherit distutils-r1 eutils toolchain-funcs
+
+DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries"
+HOMEPAGE="https://lxml.de/ https://pypi.org/project/lxml/ https://github.com/lxml/lxml"
+SRC_URI="https://github.com/lxml/lxml/archive/${P}.tar.gz"
+
+LICENSE="BSD ElementTree GPL-2 PSF-2"
+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 ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc examples +threads test"
+
+# Note: lib{xml2,xslt} are used as C libraries, not Python modules.
+RDEPEND="
+	>=dev-libs/libxml2-2.9.5
+	>=dev-libs/libxslt-1.1.28"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	$(python_gen_cond_dep 'dev-python/cython[${PYTHON_USEDEP}]' python2_7 'python3*')
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/cssselect[${PYTHON_USEDEP}] )
+	"
+
+DISTUTILS_IN_SOURCE_BUILD=1
+S=${WORKDIR}/lxml-${P}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.5.0-cross-compile.patch
+)
+
+python_prepare_all() {
+	# avoid replacing PYTHONPATH in tests.
+	sed -i -e '/sys\.path/d' test.py || die
+
+	# don't use some random SDK on Darwin
+	sed -i -e '/_ldflags =/s/=.*isysroot.*darwin.*None/= None/' \
+		setupinfo.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	if ! python_is_python3; then
+		local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+	fi
+	tc-export PKG_CONFIG
+	distutils-r1_python_compile
+}
+
+python_test() {
+	cp -r -l src/lxml/tests "${BUILD_DIR}"/lib/lxml/ || die
+	cp -r -l src/lxml/html/tests "${BUILD_DIR}"/lib/lxml/html/ || die
+	ln -s "${S}"/doc "${BUILD_DIR}"/ || die
+
+	"${EPYTHON}" test.py -vv --all-levels -p || die "Test ${test} fails with ${EPYTHON}"
+}
+
+python_install_all() {
+	if use doc; then
+		local DOCS=( README.rst *.txt doc/*.txt )
+		local HTML_DOCS=( doc/html/. )
+	fi
+	if use examples; then
+		dodoc -r samples
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "Support for BeautifulSoup as a parser backend" dev-python/beautifulsoup
+	optfeature "Translates CSS selectors to XPath 1.0 expressions" dev-python/cssselect
+}
diff --git a/dev-python/lxml/lxml-4.4.1.ebuild b/dev-python/lxml/lxml-4.4.1.ebuild
new file mode 100644
index 000000000000..e7c16048171c
--- /dev/null
+++ b/dev-python/lxml/lxml-4.4.1.ebuild
@@ -0,0 +1,80 @@
+# 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} pypy )
+
+inherit distutils-r1 eutils toolchain-funcs
+
+DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries"
+HOMEPAGE="https://lxml.de/ https://pypi.org/project/lxml/ https://github.com/lxml/lxml"
+SRC_URI="https://github.com/lxml/lxml/archive/${P}.tar.gz"
+
+LICENSE="BSD ElementTree GPL-2 PSF-2"
+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 ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc examples +threads test"
+
+# Note: lib{xml2,xslt} are used as C libraries, not Python modules.
+RDEPEND="
+	>=dev-libs/libxml2-2.9.5
+	>=dev-libs/libxslt-1.1.28"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	$(python_gen_cond_dep 'dev-python/cython[${PYTHON_USEDEP}]' python2_7 'python3*')
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/cssselect[${PYTHON_USEDEP}] )
+	"
+
+DISTUTILS_IN_SOURCE_BUILD=1
+S=${WORKDIR}/lxml-${P}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.5.0-cross-compile.patch
+)
+
+python_prepare_all() {
+	# avoid replacing PYTHONPATH in tests.
+	sed -i -e '/sys\.path/d' test.py || die
+
+	# don't use some random SDK on Darwin
+	sed -i -e '/_ldflags =/s/=.*isysroot.*darwin.*None/= None/' \
+		setupinfo.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	if ! python_is_python3; then
+		local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+	fi
+	tc-export PKG_CONFIG
+	distutils-r1_python_compile
+}
+
+python_test() {
+	cp -r -l src/lxml/tests "${BUILD_DIR}"/lib/lxml/ || die
+	cp -r -l src/lxml/html/tests "${BUILD_DIR}"/lib/lxml/html/ || die
+	ln -s "${S}"/doc "${BUILD_DIR}"/ || die
+
+	"${EPYTHON}" test.py -vv --all-levels -p || die "Test ${test} fails with ${EPYTHON}"
+}
+
+python_install_all() {
+	if use doc; then
+		local DOCS=( README.rst *.txt doc/*.txt )
+		local HTML_DOCS=( doc/html/. )
+	fi
+	if use examples; then
+		dodoc -r samples
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "Support for BeautifulSoup as a parser backend" dev-python/beautifulsoup
+	optfeature "Translates CSS selectors to XPath 1.0 expressions" dev-python/cssselect
+}
diff --git a/dev-python/m2crypto/Manifest b/dev-python/m2crypto/Manifest
index 4b9672a5904f..e1954386ccb7 100644
--- a/dev-python/m2crypto/Manifest
+++ b/dev-python/m2crypto/Manifest
@@ -1,5 +1,7 @@
 AUX m2crypto-crossdev-0.31.0.patch 505 BLAKE2B 09adce189073dab0cf7e49ed2291ab2f140cd3b26ad771e9c6819315388dc5ef6be26fb730018c1869bcc8d68c54a1e0c54b3ffa422c981597c7a3518a174c9a SHA512 bc13bda02e42937e1793c46dbcbdd0ba887d49360899cbecfc53f5580bbdb070cf76d6f986e146aac0cf6733edadec855cb64b1e25ec74212f82f90a425bfb7b
 AUX m2crypto-libressl-0.31.0.patch 8211 BLAKE2B dc36c1e77f6fa9f260d465c0e61168a9ddd82f382c46f31c06a3ef5972cbbe225f665eac17999f7c8a0b74e1702f82451fed5a39691577b050f477bbf7a2ee2e SHA512 ea100feabae82cf1c1237f55354847935a9c49e05c780e01d8fef959d2a10abc4b9f14c56ea50cba68ff59eb67c3cf5136ff92e9dc456960327e0c582b55720d
 DIST M2Crypto-0.31.0.tar.gz 1292016 BLAKE2B 3f1e0e8f686719ff87fa3a51cdc287be989fa1554866582deb1968fd04605270e14cbfd280f64211c043c5d8cb77a09e6a8cec6824ab15416ab94366aa73d2a3 SHA512 9f3e2afda4b8ac14aa64a1534e446eb6895ec7182ce5b7ded8008178e01139d383561a87f8c9fb5fe4b9c257ba5c6b93339955eb9e2f7417cd3f4832c35c4598
-EBUILD m2crypto-0.31.0-r2.ebuild 1352 BLAKE2B 93fed1fd0a2d67a10cc54957f82d4e0029e25ac7349d56114e310d6b52b1035aeb8d592fce51fbd78910499039bd8a6d35fb2d7c1cb6f2799f3794761df8604b SHA512 ef87960d482e8491135f5a871731e5e8af838d862016e6be3683954ca0956f144f937517529a206dfa5c116c8c0e4dc1168372e5739e5be9130381b5e993a5f7
+DIST M2Crypto-0.35.2.tar.gz 1117706 BLAKE2B efa15e023be7755b94c642bb23eade912edcbbb76bcdfed3414d27937cd705ec4c83069ca620fe20e58e126549ba7f98e84f6f8330b78133a8a8b953d18f467b SHA512 3608b29a8e7d0732a2359e35fcaae191447aa7c0211ca3d057eed6cee7f0819f5c1121e7d41caca8cdea3c7911f8c447ee475b1b3d125e8dc3adde2718a59f36
+EBUILD m2crypto-0.31.0-r2.ebuild 1515 BLAKE2B 3cc2223d5714513962c326cd45bed685cac3f03e104ab47c287bcdffd726a11b528c91e7147f4d2156effdc4098e11d89464fb64aea397b452b6586b84f2abcf SHA512 8d0e4a5ec4b7f9302eae28c97622ea00f85f16290cc4b78a03682d476d13d0e73184bcdc0fa14e42249ff68f0b1decfb16454d7b2d1645792d19d84c7843dcc1
+EBUILD m2crypto-0.35.2.ebuild 1412 BLAKE2B 5c717244dc0242bfbd49297b7f82282010f469c8c37f65902a506e1edb0cf21eec9c5143278746ca7ab859f60a08c838e9aba1efbb9351d5e0bc892f8cf75525 SHA512 81fe16ace64b91bb73cbc3e1c07a3d887d69610dbfc3aaf6d2186261cdef61195334d8e8f6322bca2f1eb68c74e174f082254c608b03edb6e0a304adba5fe9f7
 MISC metadata.xml 380 BLAKE2B 99a1c8e8202bed7c6d0ff8cdff3f17b664791405b082be2b7d72b3fe2b77bf89c886666d9bdce6a96c540b9518042b9d49b9af926ca10ab4c5b3b416182de01c SHA512 f2e3b4228c45471f0132b3bb412f017f4006eb82bd63e187db3efdfd3f412c1db19bdb79d37630bb059f75ef69f110687b8924d22c2aef0101cb40eb3486f1e6
diff --git a/dev-python/m2crypto/m2crypto-0.31.0-r2.ebuild b/dev-python/m2crypto/m2crypto-0.31.0-r2.ebuild
index 17cac8b10d3a..c88a6032975d 100644
--- a/dev-python/m2crypto/m2crypto-0.31.0-r2.ebuild
+++ b/dev-python/m2crypto/m2crypto-0.31.0-r2.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python2_7 python3_{5..7})
 PYTHON_REQ_USE="threads(+)"
 
-inherit distutils-r1
+inherit distutils-r1 toolchain-funcs
 
 MY_PN="M2Crypto"
 
@@ -41,14 +41,26 @@ PATCHES=(
 	"${FILESDIR}/${PN}-crossdev-${PV}.patch"
 )
 
+swig_define() {
+	local x
+	for x; do
+		if tc-cpp-is-true "defined(${x})"; then
+			SWIG_FEATURES+=" -D${x}"
+		fi
+	done
+}
+
 python_compile() {
 	# setup.py looks at platform.machine() to determine swig options.
 	# For exotic ABIs, we need to give swig a hint.
-	# https://bugs.gentoo.org/617946
 	local -x SWIG_FEATURES=
-	case ${ABI} in
-		x32) SWIG_FEATURES="-D__ILP32__" ;;
-	esac
+
+	# https://bugs.gentoo.org/617946
+	swig_define __ILP32__
+
+	# https://bugs.gentoo.org/674112
+	swig_define __ARM_PCS_VFP
+
 	distutils-r1_python_compile --openssl="${ESYSROOT}"/usr
 }
 
diff --git a/dev-python/m2crypto/m2crypto-0.35.2.ebuild b/dev-python/m2crypto/m2crypto-0.35.2.ebuild
new file mode 100644
index 000000000000..86b019473876
--- /dev/null
+++ b/dev-python/m2crypto/m2crypto-0.35.2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 2018-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5..7})
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 toolchain-funcs
+
+MY_PN="M2Crypto"
+DESCRIPTION="A Python crypto and SSL toolkit"
+HOMEPAGE="https://gitlab.com/m2crypto/m2crypto https://pypi.org/project/M2Crypto/"
+SRC_URI="mirror://pypi/${MY_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-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="libressl"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	virtual/python-typing[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-lang/swig-2.0.9
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-libressl-0.31.0.patch"
+)
+
+swig_define() {
+	local x
+	for x; do
+		if tc-cpp-is-true "defined(${x})"; then
+			SWIG_FEATURES+=" -D${x}"
+		fi
+	done
+}
+
+python_compile() {
+	# setup.py looks at platform.machine() to determine swig options.
+	# For exotic ABIs, we need to give swig a hint.
+	local -x SWIG_FEATURES=
+
+	# https://bugs.gentoo.org/617946
+	swig_define __ILP32__
+
+	# https://bugs.gentoo.org/674112
+	swig_define __ARM_PCS_VFP
+
+	distutils-r1_python_compile --openssl="${ESYSROOT}"/usr
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/node-semver/Manifest b/dev-python/node-semver/Manifest
index b87d7816a3f9..518425af5d1b 100644
--- a/dev-python/node-semver/Manifest
+++ b/dev-python/node-semver/Manifest
@@ -1,3 +1,5 @@
 DIST node-semver-0.2.0.tar.gz 10236 BLAKE2B f4f48761a0086b8a2e79307427b4dc93954362452f653042582024cee593b4b7fefb1a14d3d4ea6832255209b054c9bdb05b02cb101af1e359a1266c472c5149 SHA512 7c636d94a262723c5e50123433c9c7af38424c46711c1b8e001931b242fc9703a084a0426b75e6884104a4adc6104a298355bf3c1604b9cae0ddab7d5f11b430
+DIST node-semver-0.6.1.tar.gz 17952 BLAKE2B f7d48f7d0373acdad56ef6745f09653163f3bcfbed26820ff77205d7bb479b0c9debfd79f719d3eb973d3cec06b0bac3773f06351712c274f90a2dcf5c658694 SHA512 d1f406d6e82f02c3e0eb0f4e1506279b00e7f31875f45bfbd7f87e6777b46676003bb7b39241bdeae616c6506dd85c60e61217460c55dd5079ea87cd818cd6bc
 EBUILD node-semver-0.2.0.ebuild 750 BLAKE2B 740e89bd8d3ebd462302b13f11a08573d34b0fa7cf0e7c50210e203bd9dc3d0bd8656cd97f19be80383b1927fded69d209bd5e839bc057bfdd2a99f2338b7716 SHA512 82474c5fc7f1d029a6ca5472c8557f538e2cf757f6602613addaf3cf8da1c62c85d7e460284abefb0ef89cf65f3293c4a75100d47eeebcc9438d994bae41d5b7
-MISC metadata.xml 745 BLAKE2B bafe049cf8ac9f5a735151a2b6ecc4ec60345fb21936017a554523164d5eb7e04a806381f20c257b6507d22201a747887e8a83654abc1387b52de17477b0d975 SHA512 615429b43049be7deaf2334ff5c1cd73289d42569ccbf0dcfc3dc3cb5851b2f5b162c9a0f5c5466a9b2623eff311ff733e1edb322f9a818bf169f05b59fbd48f
+EBUILD node-semver-0.6.1.ebuild 1079 BLAKE2B 6b90acfa6b90bb56b88abd1075220149eba6db06a78525025c492518f74ab6cb2a4e9d5e95873334ae76a57a1933d518c1780a85419148fbb76cbc19a5fb50c1 SHA512 edbe6c1d946b4ed617c7eb49007115785c8d4e85f230f8c4429995a8102d00c27be73e145aca2204274d419822ff5f6b91f4d8488753feeb1be450636f1a2d95
+MISC metadata.xml 786 BLAKE2B f7fc468fd3228c485674f4816c1cab1f5220024f39108ca033e4581233d0534376dcc907629774716b5cdc16e7d243e884fe6d17a57d362342e5edd32a4a8f81 SHA512 51b36d6a15b21c6490ba5f19494b23b94bcbe4a5aaf28e6bb6034596b850872bece0a066f3ea6f11f610759492e1060b3d932736254ff0af7a895a9261d74799
diff --git a/dev-python/node-semver/metadata.xml b/dev-python/node-semver/metadata.xml
index ea78022d7b82..06beedd4c6bd 100644
--- a/dev-python/node-semver/metadata.xml
+++ b/dev-python/node-semver/metadata.xml
@@ -1,23 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>luigi.mantellini@gmail.com</email>
-    <name>Luigi Mantellini</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <longdescription lang="en">
-    Python port of the semantic versioner for npm (semver).
-  </longdescription>
-  <upstream>
-    <remote-id type="pypi">node-semver</remote-id>
-    <remote-id type="github">podhmo/python-semver</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>luigi.mantellini@gmail.com</email>
+		<name>Luigi Mantellini</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription lang="en">
+			Python port of the semantic versioner for npm (semver).
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">node-semver</remote-id>
+		<remote-id type="github">podhmo/python-semver</remote-id>
+		<bugs-to>https://github.com/podhmo/python-semver/issues</bugs-to>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/node-semver/node-semver-0.6.1.ebuild b/dev-python/node-semver/node-semver-0.6.1.ebuild
new file mode 100644
index 000000000000..38da8d9ff050
--- /dev/null
+++ b/dev-python/node-semver/node-semver-0.6.1.ebuild
@@ -0,0 +1,37 @@
+# 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="Python version of node-semver, the semantic versioner for npm"
+HOMEPAGE="
+	https://pypi.org/project/node-semver/
+	https://github.com/podhmo/python-semver
+	https://github.com/npm/node-semver
+"
+# Tests are currently missing from PyPI tarballs
+# https://github.com/podhmo/python-semver/pull/31
+SRC_URI="https://github.com/podhmo/python-semver/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+S="${WORKDIR}/python-semver-${PV}"
+
+python_test() {
+	# Ignore 2 tests that fail with Python 2
+	# https://github.com/podhmo/python-semver/issues/30
+	pytest -vv --ignore semver/tests/test_passing_bytes.py \
+		|| die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/nodeenv/Manifest b/dev-python/nodeenv/Manifest
index 40cc36f4d869..edc1e5453625 100644
--- a/dev-python/nodeenv/Manifest
+++ b/dev-python/nodeenv/Manifest
@@ -1,3 +1,3 @@
 DIST nodeenv-1.1.3.tar.gz 32368 BLAKE2B 4b3b9213c115a55c0b084505b05f1d646e7519175ba42845af6b2a0933cb75574b54257a524c561e1b90614848bd6d68e0dbaf382692529476a69d1bf7cc7aa5 SHA512 54829345bda2130c3728f33e04ee68c36cab281c9f6f68ae257bfd5019c51fe5b80bb95e931ebdd7403aad4db4a41062bc59251786811a1563c18b2745f4e7db
 EBUILD nodeenv-1.1.3-r1.ebuild 446 BLAKE2B c10abbbd94c2ee417e1a6a5e9b49ece07f546e937bdc6f2d21b16e4560e13a28665598a8141c3f9a8ce782e61f7fa86a4969f155d02d06e2012b56f01142a39b SHA512 2341381f0d991c17ee1ef00d24d5855697aa786f1da172cb42a2383ea502c6f462c07faf421e4cefff3a95e24bdccbce232a098e686776cf4f81b27200af8663
-MISC metadata.xml 363 BLAKE2B 96b7a87ed64267fda3cccdb1b831b6b9a2e9267423d135a607bb3d84edff9021287800268fc68531ae83cec65dbd8dd6b5e310e535fe1dd9d345e97d8bbbfbaf SHA512 ca85de4fa9429a328628ca5a344d92891697b92abae5476f81a7cb583a0e947f7ae585e0c4c4a2f9af00daee800bc76b3ae701aeb595277f70bfbeb1c93c8529
+MISC metadata.xml 362 BLAKE2B 5e3b70f0d8049ba6ece30933fcb91db7f533fa647091c6f8cc240b4f074043a0da1b3d1078d10ef41c05311c6ea991ca52b978dafbb8f3591348871f168ddc33 SHA512 16874c2d41c9d85485115c5128ebf55439ed1b163f1e919d847177971718e7a113afa36216c35a8d19f6d92f474001084013bf75797fe82f6d25a369d42e8fd5
diff --git a/dev-python/nodeenv/metadata.xml b/dev-python/nodeenv/metadata.xml
index 2dbc7987f8a7..8df7ead50ee9 100644
--- a/dev-python/nodeenv/metadata.xml
+++ b/dev-python/nodeenv/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="project">
+    <maintainer type="person">
         <email>monsieurp@gentoo.org</email>
         <name>Patrice Clement</name>
     </maintainer>
diff --git a/dev-python/nose/Manifest b/dev-python/nose/Manifest
index 9b2dbb840090..eb7e8e482a99 100644
--- a/dev-python/nose/Manifest
+++ b/dev-python/nose/Manifest
@@ -2,7 +2,7 @@ AUX nose-1.3.7-coverage-4.1-support.patch 950 BLAKE2B 451402abfaf917b42584fb2530
 AUX nose-1.3.7-python-3.5-backport.patch 1802 BLAKE2B 8513cd506f7031ec4af1a4acd619b1bc01da05a1a81e95d3d9dfa097b131727229a05228315252a67c57ab15aaf2dc90df59c7ff3c726ae62f4a5ef86776bb87 SHA512 032c4c291edd76bb594329578e57483942ced2a46c3f6cd4e914d905f3894e420cc4da0ba2a63c266c81dd4d8f40b8df180f56ac75cb3c5e83e0309bbac573b2
 AUX nose-1.3.7-python-3.6-test.patch 3289 BLAKE2B 4f19c4f6e4f376cb09896f9e7b054753c339ad371e151f01cc8c54e83ecffee72e4959d827a88d03b4944192b43085b50017ef8b8785222125ce32fac5831717 SHA512 0be6e49f08a4098b4c5dd1d9678e757c8f1f317fb13bd355a035c44bcdd9cd043be1755bb97c4ca78397985f07f6fc486ddd10cb56dd8d8774d631eebcc81127
 DIST nose-1.3.7.tar.gz 280488 BLAKE2B 4bb479b2786f813f9e9a5fd401e30023a473a053ae013d7887be15af415422c09fb399af6058ae99ed65c5fa4da84eb274eb805e895ca74db159d952905f5be4 SHA512 e65c914f621f8da06b9ab11a0ff2763d6e29b82ce2aaed56da0e3773dc899d9deb1f20015789d44c65a5dad7214520f5b659b3f8d7695fb207ad3f78e5cf1b62
-EBUILD nose-1.3.7-r1.ebuild 2465 BLAKE2B d01cef8b8dc0c72c9b976f061f3acf4e7a6d0ab2d077cf54da76dfd7547f86a587b0f762d6c255db27b59b51eeec49404c576b4184328862aecee75b7d678905 SHA512 4b4dc5948b007448a7da73df1b02d1101648da8a87a307a76c7ee6d58da625e589d0c349ffa4444f2a3f8b05a4b01cf21598f3dbf6d388407dccc7ca271100bc
-EBUILD nose-1.3.7-r3.ebuild 2768 BLAKE2B dcd6d1fb13a64cdbc637dcfe6138221715068ab71fbfc3273366e38430ddfa7cc20c9a35029375341e291f7a8f3ec28fdb3e3d0f7127630a6dbc49aef99af1c2 SHA512 00a570703aa002a745b7f74dff34870dc8f4c8b0a8a0432ede71479abaf72a797c10019f9b484ed95fe20be43e251ad2794cea7e52dc213df36b9315ae6fdf41
+EBUILD nose-1.3.7-r1.ebuild 2462 BLAKE2B 5ab9fedfc20bab5af58391f4ffc4b39bc8b5b2df676e23d0fd0ce2b6864e1e89b106ae82525fd3771a2e448720a3b30da0194d8ad19023d0f6ed71f8eb92d597 SHA512 921ffaa4947c759b54a7e4c7164de9ec5fea7847d366ac236337a1a99f9aab39c6e76fb672df8870d955a341f9b50dcfbf4af21882b59e011111db2d0ee2219d
+EBUILD nose-1.3.7-r3.ebuild 2765 BLAKE2B e2c69d9635db5df648aeb3cd3705c182cea34b8392c6b2709618063d6f11327530ada4f13d01d3131d7feee8419989f2f303def95b28087cc0f885e421f0c2d6 SHA512 8edd046546eadca3912a621b24e3d4aaf567987c26da4510179705056bbc4819e93dbfbf3799e54f17ca7e00077810fa7cf5026ce4fe0faa3036c511b0fc9352
 EBUILD nose-9999.ebuild 2229 BLAKE2B 49b85be43d903924108b0a03ff1d5b8557c1902654b286c34fb90b5d56dcbf56e40180073f7d82f20bfb1235d1eb109d23822f7cae438d285fef553c12d3bf59 SHA512 7195a0528141d360c0ae9390b309afc0074c3b8f8ddbc964f3f46c557c3bd80904be7a49b5de92f487285f77af51490716428ea2b060b8496cd89c3b6468f1fe
-MISC metadata.xml 432 BLAKE2B d2e71400e1d6c6fd0f03ffe106d6c5c7e6ee4b657a2958b4dcc8749fc475bed1b0f44279a557b27451ef5fb31363bac7c5cf5d6433c1ac1901eace3a66bfd826 SHA512 d4ff137034358979e2b59fa11e18ff17ade90c1c2127f5c769a58c8867a5de1a4736c2d22cad063b9119067578feb6401305f6acfd3e05d897b3f01f273e5530
+MISC metadata.xml 373 BLAKE2B 43ba4a1d3072a67aa7ada67e06fb1fe53cb9f2305143f23553705c3b8a0a12f10d295f458a7f9a08bc7273fc4ef8f87460ce53919f7f26d58da186f5bba02a52 SHA512 88a78ed0996cc2252a6cc707fbaa081b8ae3d03620dafcce844d6e760437dfc916d3a0244d3bf4fd9005d6cfd731858a9aa5b7fe99a89dc47a7ef75b2f8663dd
diff --git a/dev-python/nose/metadata.xml b/dev-python/nose/metadata.xml
index 1b59d602e352..13648a4f19f0 100644
--- a/dev-python/nose/metadata.xml
+++ b/dev-python/nose/metadata.xml
@@ -8,6 +8,5 @@
   <upstream>
     <remote-id type="pypi">nose</remote-id>
     <remote-id type="github">nose-devs/nose</remote-id>
-    <remote-id type="bitbucket">jpellerin/nose</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/nose/nose-1.3.7-r1.ebuild b/dev-python/nose/nose-1.3.7-r1.ebuild
index 327beed811d3..5e2e145620db 100644
--- a/dev-python/nose/nose-1.3.7-r1.ebuild
+++ b/dev-python/nose/nose-1.3.7-r1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Unittest extension with automatic test suite discovery and easy tes
 HOMEPAGE="
 	https://pypi.org/project/nose/
 	https://nose.readthedocs.io/en/latest/
-	https://bitbucket.org/jpellerin/nose"
+	https://github.com/nose-devs/nose"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
diff --git a/dev-python/nose/nose-1.3.7-r3.ebuild b/dev-python/nose/nose-1.3.7-r3.ebuild
index e66f8269099a..0aa4e7adb49c 100644
--- a/dev-python/nose/nose-1.3.7-r3.ebuild
+++ b/dev-python/nose/nose-1.3.7-r3.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Unittest extension with automatic test suite discovery and easy tes
 HOMEPAGE="
 	https://pypi.org/project/nose/
 	https://nose.readthedocs.io/en/latest/
-	https://bitbucket.org/jpellerin/nose"
+	https://github.com/nose-devs/nose"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
diff --git a/dev-python/notify2/Manifest b/dev-python/notify2/Manifest
index 897559aaaa1a..eeb10b58c188 100644
--- a/dev-python/notify2/Manifest
+++ b/dev-python/notify2/Manifest
@@ -1,3 +1,5 @@
+DIST notify2-0.3.1.tar.gz 17792 BLAKE2B 649df1934d1fffb97dabbf2f483204c55427fbede851840d642da2e4e62a9bda9d49670e60f5b2cda36b62ee47b7d0cd861d757d338867547dce3c7d61ddf7b4 SHA512 0b69a64e0a7e4955ee767c975db92c5c60d28c0e54f77498cfb98390771a8f536631fc34e42b5c46c138dfa1054b5516a0809b8e3b0cb9237a39825ddb827109
 DIST notify2-0.3.tar.gz 8798 BLAKE2B 57e1eeaa96b9e5354991db36440abfbf80471887c094e41dd6ccff72f1b1b35524bebf83b44afa455c64cdc3fb7b0ef66d2517ca499340a3d001e796828ff9b6 SHA512 3290a5ff291d5500bcf631094fcf10302b234353eb8c26b91e7cd264238443866aadc15224d51eb6608e16b7ffbc9316d4bc551e5ad9de2a48b12a31b195739f
-EBUILD notify2-0.3.ebuild 661 BLAKE2B c51004146b77120c01930cb3e4704a17dc58f58f9ebf3dff0b4557107d4e88774918628bc252bc02696f9a526232875269b739ee517ff7fa47995de42b1d0023 SHA512 86a34828ceafdc1abc08dd915b3a8b0df4f38e050e1bbfe8340aa0e887c0943f718b8d53055bb4672ca2ec24f5706e5d30d8b4a117c9c0a29e65ef037650b89c
+EBUILD notify2-0.3.1.ebuild 678 BLAKE2B 602e8091115dfd7de602b7c3647e5c37f369f63fbe0d7417e471ab89d80d9ed4f62aa2aa31aa31eeb320f94a691ea6281a3022c1c1921e92da9b9d92b8b6ae17 SHA512 755039c3dbc3e1f23e9b431ef4ffa2aa1d2ca18e3cc06193f10eef0c068218a78bef8d8aa3f59c8e78f822c509dea0e7c2b7ed321fa1028f93939b4247f9befb
+EBUILD notify2-0.3.ebuild 673 BLAKE2B d33eba87b4f9b6ac833a301a7fc5eda4ec0aed563502f5d710052d9048ecc52a839af973ba15771a329ee276fb30f1b42d06557ea2abbf4035ff204e05ff6ba5 SHA512 344ff5e49820b85635dd962bf369ec20fb1fb1619b0fb3a17c6ef7fcfafd9e3705b83120af5931257f6772a3a67c2cbf5c2aef25829ab82dae22c7d68a8656ab
 MISC metadata.xml 465 BLAKE2B 477ef3b148c7916372b0c12fc450dc9bacb59c609a3e3e005be6f8d5a268661405744c16180b336e34f4782f7e3a38ba17e63747d46199d0eb161e23d8415eaa SHA512 8024b5c580d09b74bf6a258dad507bec09d0c7bbbd10861bc2f866dd71acd7a858e7175dcb1d670cfdbade64da3f607667434a8587de6ceaeee7da028ce332ba
diff --git a/dev-python/notify2/notify2-0.3.1.ebuild b/dev-python/notify2/notify2-0.3.1.ebuild
new file mode 100644
index 000000000000..0e2390bd25f7
--- /dev/null
+++ b/dev-python/notify2/notify2-0.3.1.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,3_6} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Python interface to DBus notifications."
+HOMEPAGE="https://bitbucket.org/takluyver/pynotify2"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="examples"
+
+RDEPEND="dev-python/dbus-python[${PYTHON_USEDEP}]"
+
+python_test() {
+	virtx ${EPYTHON} test_notify2.py || die
+}
+
+python_install_all() {
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins examples/*
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/notify2/notify2-0.3.ebuild b/dev-python/notify2/notify2-0.3.ebuild
index 2b7d2cb84b03..af1a65048b69 100644
--- a/dev-python/notify2/notify2-0.3.ebuild
+++ b/dev-python/notify2/notify2-0.3.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
-inherit distutils-r1
+inherit distutils-r1 virtualx
 
 DESCRIPTION="Python interface to DBus notifications."
 HOMEPAGE="https://bitbucket.org/takluyver/pynotify2"
@@ -12,13 +12,13 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm ppc ppc64 x86"
 IUSE="examples"
 
 RDEPEND="dev-python/dbus-python[${PYTHON_USEDEP}]"
 
 python_test() {
-	${EPYTHON} test_notify2.py || die
+	virtx ${EPYTHON} test_notify2.py || die
 }
 
 python_install_all() {
diff --git a/dev-python/nuitka/Manifest b/dev-python/nuitka/Manifest
index eef8ebc48352..d335c942fd9f 100644
--- a/dev-python/nuitka/Manifest
+++ b/dev-python/nuitka/Manifest
@@ -1,9 +1,9 @@
-DIST Nuitka-0.6.0.4.tar.gz 2010373 BLAKE2B 96d31fde6d087bea81051bfcc208d52466b9c45785c2167c61721440fe930906958ee840bb98258c7c1b98c067302049afd63bbf5cfd422a69c1994675c29c70 SHA512 f9a30ad578b80679c0313be84150adff83a90b35c758487fc9f5240d527cf0a905b6257a0dfdf2a2c8c7322688108a6673c56238480344adce123d67416eb197
 DIST Nuitka-0.6.0.6.tar.gz 2011509 BLAKE2B 1a5d37acd50bbb7d1a380306aa18d68ab6559fe3d90b988032cd36458e5ec663c2ba1597f50da89c6b2360f35cd576a2219860b0d74bb3d835db9525d10f22bf SHA512 d893e49a2f91d310b4a86ddd1566990b66ae202bde642af8b7e45554ed6b2abf4b6b694bb03d020b15d9b748c0dd31ac1a79c77fcc9d15468ce37faf475e8beb
 DIST Nuitka-0.6.2.tar.gz 2064701 BLAKE2B 9144bbae98584c64a642ede1155f26f88afa1ffe6d1e75f88039fe99f191e0939efc5ce7e71b2b9c661004213990e4896a392e2fce995a0649d45ed5b3a18168 SHA512 94547cdabaf6c591ff5d49179dc4538fa624b40a6d63e318aeabe371b7cfdbd9b1c9c41918a4ea1dfa816a7222c5587ed17c1980d89be6d9151ecc8cdaa8c5a5
 DIST Nuitka-0.6.4.tar.gz 2211662 BLAKE2B 4831782516503f128911321bb9755db9ea7d48fe0438dbff1fbc9ded3c690dc0d2f4dd14f0f5a5b8c66cb2b8e8d380e9658b590a48316497b42f78e68a8ae5ea SHA512 89e882b5fa37fd5a1357f69e13db7c340bc6d5471e18b7796cc1b7bd9970c480f8fecb9a7b11e19e41e936c5f90ef204b7409146a362beb6946f3d8f88cdf93e
-EBUILD nuitka-0.6.0.4.ebuild 630 BLAKE2B 5526f072dba96751c9fa057829fedbe82dcf2a032ae2f6df815e54783a216d6d2a363b49f0e4b0f0b1627299e4f94ca79198b46e69830b3a0ef2a90afc2ec9ca SHA512 764095edacfea35fe8eed86c5588821895f49d3e2d7c7ca244661c7910e9e7796e1ebcef6ca31d1759c0ccdf433fece6944a5d003b644b1e0c88a55272ed9837
+DIST Nuitka-0.6.5.tar.gz 2239333 BLAKE2B 687b82863ad5cb78d1c1b3b353ecee8a44eccbcd73eee70181bfe274d7e9d6011323bde9e320cd13c8c67deeef86de5e93c61592b56ca9fa9412fcfa3d152a06 SHA512 785dc60b4a42061401066ed510a3bc82988a0f8947372dcbd381c7b9cf6c2907c9cc0510c8188b0526c7fa3d9f3ec43207b46190a8485cf1e546b5316fa6dbdb
 EBUILD nuitka-0.6.0.6.ebuild 630 BLAKE2B d3bb6daa3a87b32053a2d1714e987444eb9affaf3aabaecd04ec86252917442c7fe0030c410d1aa382ed1ddf62fb1845c078dcf300b7cdf481e9c8b06a84ae1b SHA512 93869f9df917064bf0fc50cab19fbb092bb7cc5b8eb163b321ae9733a534a08375871c4a0b664a59042302c8a869ca2fbb036d8b3e64f898ad1029ad4ca7b909
 EBUILD nuitka-0.6.2.ebuild 624 BLAKE2B 6f48d803688d8cd8f218de5745cffa2eab45f87b2d37a2c692eff4d40423792400c358afa1c9d290320138f4251ac661f07421a562164d95b5c37a0f5de61bf1 SHA512 5876f5dd0989ce5a33111ffa6ddeb3276c1f86e84f1f4618571dd39fd7be47e19eb5cb45fb1c03069e5899190e2499861ea4828a5d3b58988e2cd43cefbc044f
 EBUILD nuitka-0.6.4.ebuild 633 BLAKE2B 00a59a13fb3fcc70b125cd2e2accd66bfdbcbdf32f6b0b514776e82f3b8a0b0a897675bc661cd4a0b6ad1fbb4e55bfec1de99d4db085a6e10b449f83dbf4400c SHA512 38adeab05597ce90376e886d6de6a2da9167b3362684e16bd81da6d1c258841c74aa0725e180dab7f7f4f70ac5ac03326d5ea8370eb3119181e2d02cc23eb545
+EBUILD nuitka-0.6.5.ebuild 604 BLAKE2B 2d82b54251cee6a597ccc056729844960fa2bb5b8f18663cd48037961dab9ef59974f07ab40361a288f6741d1ecdc1ba2003bc79772b24d31187e10518520e78 SHA512 64dfdee81e18e6e0632784e8c86442c0e88607ecad92b9be667792041984bd04adcbaefdbedffc6e570b37cf36336d7727fc26e7138ee1fdcae34f272e2adfbf
 MISC metadata.xml 750 BLAKE2B 56bff65b936301e2d0347e553a1ea85b89c4c991697f665b47b01dfd7e40b94726fca15c67e4387fb79ec19f77851e275bb80c48ded3f76e6cf4cb81d10ba90f SHA512 01ed4ef871d9d43ccb30b60e5051f513b56d7ab3eb46ad64b76e6ee8f53f0088c4a3d75227a0870e82664476954d6603f70614232735f107bb24a06702c014ab
diff --git a/dev-python/nuitka/nuitka-0.6.0.4.ebuild b/dev-python/nuitka/nuitka-0.6.0.4.ebuild
deleted file mode 100644
index f90b09327492..000000000000
--- a/dev-python/nuitka/nuitka-0.6.0.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_5 python3_6)
-inherit distutils-r1
-
-DESCRIPTION="Python to native compiler"
-HOMEPAGE="http://www.nuitka.net"
-SRC_URI="http://nuitka.net/releases/${P^}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-RDEPEND="${DEPEND}
-	dev-python/appdirs[${PYTHON_USEDEP}]
-	dev-util/scons[${PYTHON_USEDEP}]
-	"
-
-S="${WORKDIR}/${P^}"
-
-pkg_postinst() {
-	elog "nuitka needs app-admin/chrpath for building"
-	elog "stand-alone executables"
-}
diff --git a/dev-python/nuitka/nuitka-0.6.5.ebuild b/dev-python/nuitka/nuitka-0.6.5.ebuild
new file mode 100644
index 000000000000..ed2ba72a1c00
--- /dev/null
+++ b/dev-python/nuitka/nuitka-0.6.5.ebuild
@@ -0,0 +1,25 @@
+# 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 eutils
+
+DESCRIPTION="Python to native compiler"
+HOMEPAGE="https://www.nuitka.net"
+SRC_URI="https://nuitka.net/releases/${P^}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/appdirs[${PYTHON_USEDEP}]
+	>dev-util/scons-3.0.5[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${P^}"
+
+pkg_postinst() {
+	optfeature "support for stand-alone executables" app-admin/chrpath
+}
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 3741b5350877..228e5f01aee4 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -20,6 +20,6 @@ DIST numpy-user-1.16.1.pdf 592508 BLAKE2B 88ef7aac2998fd8eeebc3ab92df9ad9ba139b6
 DIST numpy-user-1.8.1.pdf 408305 BLAKE2B 2956e42ebad45b021f72c7e71d357d953ea8a26639b4c6e81dbe1718052304ac5ce1a7f96646d94ad48bf737ddc6962fcbc304e31dfce32b85cb8165b0ada6e0 SHA512 9e646e89e7e67834fa596e43082b43842d1c59287d22fd8d20c9f0a1d3d56a518a08cc2c036de4972ad0d6d9d3c2f56e2210f76e7244d3f7547b5204d84d3c7c
 EBUILD numpy-1.14.5.ebuild 4100 BLAKE2B ef8db45fdbcd2a3e43065b74e2498e8a555727925594073631b7743f6e73f244cb302abf29b11c567e83bfd2667362ae0bcaf7e89e97b7a8a9cf7151f7cfcddb SHA512 1c82e4f559c04130d2c70d43c1a9142eb7da2f1def3aeb8b736b8b97ad1c71b1b081dfe8b54a32f56342bccb8f55fa6a4ccc01abbe3153baf2d806a396122b60
 EBUILD numpy-1.15.4.ebuild 3911 BLAKE2B 93ec5d217f42a505248509d642a0039c6342d2011b9c41cbbc45ae9ebb34e8445b6aeef1e8e827b99a78525b37569e33b22c4a0ffdd1af4b4d4237d8dd2bba43 SHA512 c72491e09fb7d85bb33b245eb9106fde1e6209c891651d46c101ac43174d934f1994503f93db3ff032292ffc6a59c3b78e747fa310d6a9dd2a7fc4dc092cc431
-EBUILD numpy-1.16.1.ebuild 3931 BLAKE2B ab8432f6fecf5b5a7d54410ffb22786808d958cbacac260262929d240721a00df3982bb679f47e238c3f769ab24cc08b1cc31a20c524dd85d98d48f9567d9a00 SHA512 ce0349a7b111f50cdbae132fec2de20647b0bb254c69408e5e68d8837a8a9039e8ce2259f4af1182876966f797b467857361f2a87f0ff3d1e78ff1f423acdae9
+EBUILD numpy-1.16.1.ebuild 3940 BLAKE2B e53c0d7c1fbf619fc4df91428c411b5ff1b3d3195ac7b06cc568e29d11ac0cff6e93111e988bd50330c70723d5d21a542a3b4f42a603186644a4a22fad0c4dca SHA512 77d9e194f48bf57406e6ea974fa3d44ae848d78ac4a023f2ddedba31208fb72b820403aef2f053d105aaa20848f66762053f7d2818ceb14d21b80f97d5e10410
 EBUILD numpy-1.8.2.ebuild 3986 BLAKE2B 398fe9fc9afbaaf6e92a70c311a18fc47856453446bdd1a0db578c9885c53640a6faa1a6c8bc5c61450b4eb6bbe07eabc5593cbd2ea21eea8c51a68306d68b4a SHA512 58879a52e5bd331fb7dd363f8f5548a5c85a7b931b2cd5ab8b87e6cbd735997bfa9ae9e58bb940e3cb3766c1cac8929a4043fa256b40d1ff5183b56a4eba2d8d
 MISC metadata.xml 876 BLAKE2B 5e257d6ea3c59c5819d854db7b7db3ebff53b5c87b5ce9348786085f09db12aa6fc8fa86393b9e6c06760ac0d9f36a52fdfb1865c9d1d9ad5526d74d3d53e8b1 SHA512 d35d0954ff8f21e370edeab3ce3e5ab501bf216c93399e807ede6f1910ba0ea41359425bf894d813a39442fb92a724fe83ec8a5c64e6bd97de9422f67700d549
diff --git a/dev-python/numpy/numpy-1.16.1.ebuild b/dev-python/numpy/numpy-1.16.1.ebuild
index 1ec2abd0447f..89aa5f734305 100644
--- a/dev-python/numpy/numpy-1.16.1.ebuild
+++ b/dev-python/numpy/numpy-1.16.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
 PYTHON_REQ_USE="threads(+)"
 
 FORTRAN_NEEDED=lapack
diff --git a/dev-python/os-brick/Manifest b/dev-python/os-brick/Manifest
index aca9ce8f3151..f40f7b61afd1 100644
--- a/dev-python/os-brick/Manifest
+++ b/dev-python/os-brick/Manifest
@@ -1,7 +1,5 @@
 DIST os-brick-2.5.5.tar.gz 174931 BLAKE2B 0efa117c756728062ef0ae3bdff4ce8127bd0d800cac906960c9f2d5fcd79820e2b72753744f8acfbc52a8dce8a357583283e2adacb692cbb391c5b198b4a919 SHA512 a343cb9194ca1b497bdec55853258b8d51b109abbb3ea406aab672e87c5c68d00511928d8690bca88c37e65bb4d8bfb4cab2cd3ba6fbff2794edbdcb681e0cc0
-DIST os-brick-2.8.1.tar.gz 178634 BLAKE2B f73006272af801f2d84990c90187ce979b7fab0993ab203efad5b05159af9b861afc73a277b9bd52765448f1ee4daf7e974802846ea2784a346ffdc2a0de23f0 SHA512 9dfe399688ced12d6c7d8e552bd7dc0e01938ee5e138cad690c72cc541714ae0216cb8c0a5007635f3815c2d89187576af7febd3311e9d201082a6fd66a2f7eb
 DIST os-brick-2.8.2.tar.gz 179510 BLAKE2B c72c1f0260fc541a9f6ca9f984b934f718dadd7ec0909a4b2483bb190e1ad587084174a33e1a7c81a52728817286bc3887474ea2c39d7f43e8e71a4a9a4baaef SHA512 0e9237f9baf5338d123bec1b22285ff8c4c31a89d60cf8480985a144c45c2766322cb359f3d548676b2631883664c5797e687bbe4d2d9ec5cd38e10e53d394ff
 EBUILD os-brick-2.5.5.ebuild 1468 BLAKE2B 46eb46eaf474b181407156a5843c7e75dc03df3ad166e14fd7e6b25de6752cea46dc007f91bdd342fb0414517e1f410a75bcce15817aa1ed91f3297adcf13325 SHA512 ee1e0803cf8e705f9a721706d358165e3aa6027a0acaecd8f85da64374ed6aa1e129c75fa3ae9243efb1c0a22858f1a1de896cc8af9e0af58dbad44beb0b6ac7
-EBUILD os-brick-2.8.1.ebuild 1470 BLAKE2B 2edce4ad636d375d50ebb740fa37fa461b637b4887ab7f3e546c61bd83cdbd75dca6918c8fb922b3efab4bd232ca2459b60719cfea80a93b5be118d30885eff3 SHA512 d81fcd8c8c7a5ae52a2626f1edbea67a2f75dad8fed04082d86136bdd7cc12cd3aaa21a3bc4ad026f125a099739cec57d3983c3af9993441901b373872e547e6
-EBUILD os-brick-2.8.2.ebuild 1472 BLAKE2B 61558b800dedc2671608259909f1b36ae6aa321322577635e8805fd90754b2b8fae0ad6da0beb741f31728d7be4fe202a01d9a470ff8a8277e2c33f9ab63c88d SHA512 e1a825bcd59491bcecf685745fca1c9d5854fb95d01c40cfbbe1eda1f7c6cad01ac0bee54a983f78ba1ddefe52704dbc7220e579a504f7ca2b2d81eafaf28db0
+EBUILD os-brick-2.8.2.ebuild 1470 BLAKE2B 2edce4ad636d375d50ebb740fa37fa461b637b4887ab7f3e546c61bd83cdbd75dca6918c8fb922b3efab4bd232ca2459b60719cfea80a93b5be118d30885eff3 SHA512 d81fcd8c8c7a5ae52a2626f1edbea67a2f75dad8fed04082d86136bdd7cc12cd3aaa21a3bc4ad026f125a099739cec57d3983c3af9993441901b373872e547e6
 MISC metadata.xml 381 BLAKE2B 6d5a168e81b27c1e9a5ada920a182616c150d5f5ca204e334067f4bcce2878b19152810391d0506b9e4bf1dd287bc56fda035d576c5fee64a9ff2fecfb7b39c3 SHA512 b3cdc328f38ade8cd2ebb44c533ec0c79fbd1c187999bcf6c9c04104ba7c29136f0a0d6d57016aa6c7b607e66bfc511eaeff90c6d1a9708c494f4358b324f3b9
diff --git a/dev-python/os-brick/os-brick-2.8.1.ebuild b/dev-python/os-brick/os-brick-2.8.1.ebuild
deleted file mode 100644
index 1c44322da69a..000000000000
--- a/dev-python/os-brick/os-brick-2.8.1.ebuild
+++ /dev/null
@@ -1,44 +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="OpenStack Cinder brick library for managing local volume attaches"
-HOMEPAGE="https://github.com/openstack/cinder"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-privsep-1.23.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
-	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/os-win-3.0.0[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/os-brick/os-brick-2.8.2.ebuild b/dev-python/os-brick/os-brick-2.8.2.ebuild
index f9c5853de38e..1c44322da69a 100644
--- a/dev-python/os-brick/os-brick-2.8.2.ebuild
+++ b/dev-python/os-brick/os-brick-2.8.2.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"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pcapy/Manifest b/dev-python/pcapy/Manifest
index bb0dc0696cd6..aa4c11d9b01a 100644
--- a/dev-python/pcapy/Manifest
+++ b/dev-python/pcapy/Manifest
@@ -1,3 +1,5 @@
 DIST pcapy-0.11.1.tar.gz 31439 BLAKE2B c41a9ead869aea65470ff5db368f9eb8a813ac5aec4cde23e2375d1d9d5f9d9885d2ae88a147eb21820e3c1875ffa490a1476b346bd0eaf5082bab9e239bfb16 SHA512 60eebbeae84da33d7bd2eb2398687007a305e8986fcc183d8061fa50bbc0cdf9a66c17461a32a652ca39952dd0935b164bd98a200f82ffef00ffaa55409522a3
+DIST pcapy-0.11.2.tar.gz 32040 BLAKE2B 467d35dff94d2f32e66f9caae88bb43218f3391745230347c39e1db241543e4e9431cfe49185151025201d0913ca102d1f9567f4cf70a83d6fbbade76ec35ecf SHA512 353a2240a9b8541f30f9df472b6977664f94966fbda327aa72f73f26257086caf1db13d55c57859abf2237f5867c11b6ab582742e04d5c16184ea42dc547301c
 EBUILD pcapy-0.11.1.ebuild 614 BLAKE2B 63a77610fe1070b5a9bb2c355de48748d7b7528477f6b34446841a908db5c50bc2744dfb940f957e29696f96816d4dded803170a4c715cb38df1dd8ae202a0b0 SHA512 f2315991450d136806627d7c6cad6a42393f5f6ea3ebeff5abdc3a9c371a41ae710abcdf85c4e5b7040ce30da91ecc2ce1c9345671be895ffb93a0b6bb82a92b
+EBUILD pcapy-0.11.2.ebuild 611 BLAKE2B cdd9fb5365d70cc5333afdb317de5ab1a672bbfea7b705169e38aad7a8d3d84ddaf53413a7d1f9d639750ef849e76e31f235ad0eee7c5713a6985fdc1c9a2e37 SHA512 ce96227f633bf4cad8f894804b1a7aa50bf8582ec7b86833c65c92f0935018701f613bb39dd5553e8459b47c03d3c46154f7b3d30d2d32cff8ef11068177c0b9
 MISC metadata.xml 358 BLAKE2B c89fc0ed9212d67a3ac2992ec231ee3a26c473e19e317ab3c0bb1002212838299a55ec6db99950d852c6760941e5c698f04db2213544ce9089303519a38e8c79 SHA512 f7a17e837c410ac604a0e1b4493c7219846a8c8cbcd5b4fb84ffc401b98c8eeacba4731dabad6f61bf1e4f172157c174d6a039725174e2f58b9dfbb89998635d
diff --git a/dev-python/pcapy/pcapy-0.11.2.ebuild b/dev-python/pcapy/pcapy-0.11.2.ebuild
new file mode 100644
index 000000000000..78a8a1c5989d
--- /dev/null
+++ b/dev-python/pcapy/pcapy-0.11.2.ebuild
@@ -0,0 +1,24 @@
+# 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} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python pcap extension"
+HOMEPAGE="https://www.coresecurity.com/corelabs-research/open-source-tools/pcapy"
+SRC_URI="https://github.com/CoreSecurity/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="${DEPEND}
+net-libs/libpcap"
+
+python_test() {
+	cd "${S}/tests" || die "Unable to activate test suite"
+	"${EPYTHON}" pcapytests.py || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index 4ff6c1f939f0..73223cc5750c 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -8,5 +8,5 @@ DIST pillow-6.1.0.tar.gz 33523149 BLAKE2B 305613aa1f444327c0a70a9e88b51035dc87c1
 EBUILD pillow-3.4.2-r1.ebuild 2493 BLAKE2B 01326658c00545bcd6162167e735c4805b3b4ceb159a24f2b76c993edba56bfee27ea51b5bcd3db401f07f3ec794286042f603bc03e9a4c41934fd0073ddcd43 SHA512 88c6758dbd10f8c9e5ad8637c3bd14cabf8c66d9ea8fafa5e7d824d460c1eb4e2ca209832018acfc654c17550199df6fddbc14fc3b44c725dfe0690a70ed520f
 EBUILD pillow-5.4.1.ebuild 2770 BLAKE2B e3a3b8f2ae0ff3aca9e881f6355651125cb3d606a0332d614d68be02cb8f5a81a4ce002d1676f9ece74bc8a120076ed9e2f9b741ae30996da6e4d1de85975f1b SHA512 bbf551cadcd03fde029c19678b47267c0558b42e0c7b93a64c634f5ddd576c05bea04b26e568bb3d632d0c18505eec4f4a1d0e797f9a66caed2de8e8d8dcba3a
 EBUILD pillow-6.0.0.ebuild 2773 BLAKE2B 9332930703d43e2600618b3ecf24471a52288348ea1067c2508948cdb2addbc22ee37ca077e2c5773e8335949ed0331dea1ecd57b43e9152abb70c9ab48af3a0 SHA512 89cb0af57b9fd3347a88418b65943d5c2569598bd4a2fa822c3fef9a2a538150506581342124080fb5a64f52f331aac65662947c0d514de6840e3c48cf4ce8a6
-EBUILD pillow-6.1.0.ebuild 2776 BLAKE2B 79e2cb6931059aae03c1bb4c5e52e2dc8c4b717c525f1d4ce3250ca1800f2a90d7db0fe7ef135bdc301e554ddb4f582ac83c936e0a34afdffcf192f9544cba18 SHA512 005db4fe72b81c9a2fbe1edcb9a917adf4b887fdd6d887da8e1180b55099d7c7042775cd50d172c25005652c699a80a9b5f133834e55fc385a07cc6d11b4a936
+EBUILD pillow-6.1.0.ebuild 2783 BLAKE2B dbe85b17382d85e30fed56c9bbfea8807a42e0edff06f7d8d53e2cfab69e42182a232328d046fcd394ff1e8e28e854132422d0f573ac2efe22a780e2d7f60956 SHA512 1f8d6408f63a6f5bc2bd182eee1c9cb1c1b6d455b182a91167c502b2033d058fa9bb88d59ad078ac6fce1cbbd8709a4161371d13d9cf5ee4dcd579254afc6ad7
 MISC metadata.xml 476 BLAKE2B cb4b4524b417cf9ab8938074443a4d1519ab16d90d459878b45fdaadf46b75d4454cc6718a2963fc14db0948ada0cc92c89e53ee9a830f43228b54c12cdff28b SHA512 a3de4e446d11e115ff85062a12866ebc5988079eabb658927fe2f319df5b0e944ca751d1070b051f44733ab22533496b2b006ec831b99e04f81fef55900cab6a
diff --git a/dev-python/pillow/pillow-6.1.0.ebuild b/dev-python/pillow/pillow-6.1.0.ebuild
index ca751b2624ca..cbb40c52feb7 100644
--- a/dev-python/pillow/pillow-6.1.0.ebuild
+++ b/dev-python/pillow/pillow-6.1.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/python-pillow/Pillow/archive/${PV}.tar.gz -> ${P}.ta
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp zlib"
 
 REQUIRED_USE="test? ( jpeg tiff )"
diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest
index b2229c0fbe36..01f06235b3ec 100644
--- a/dev-python/pip/Manifest
+++ b/dev-python/pip/Manifest
@@ -8,11 +8,13 @@ AUX pip-9.0.1-disable-version-check.patch 1031 BLAKE2B 148e528aab19de021f193ac56
 AUX pip-disable-system-install.patch 1070 BLAKE2B 85bfd82888a169cf771467f4f811b9859fddc1cfd134ac21be42b9fd93d84118354fa23a2f4b0ec9c67024f571ba7035665302671420221b52f3fc89f24b1af3 SHA512 bb0a9a32b2eac0a12276c3f0527534226c03868300f54945d20eec16902ad51cbfdace9d79b0caa304bc641323194031a5ca9e5e784366a44527441bd0f3c231
 DIST pip-10.0.1.tar.gz 1246072 BLAKE2B e08607be43e1d7b9c7bbc12dff73bc3170953f48f8f7439a0b27b9d540f23eb3bca7873211a5f1448b5cedd6e8e12983af6fa4666bba3ac4700059d170036733 SHA512 983cce8375ff0304263209c69be16e5be7a58af340b8c3ffddd64fcea130b2f8f8a98305ab31e9c3eed9a0d039c73777c88bde3bf2ea1e184fa3e0a2faa97fd4
 DIST pip-19.1.tar.gz 6320747 BLAKE2B 9b69fcdef751d6938a7c67f44692afa7088f660ab1e0ae113d21d0f48b4e29f43e0f0bcc137cf16ac0324ea3b500bd2a84234823f8d82556d6727f68139aab4b SHA512 0d2442c22c41133118353ba98f45260f0615a891725b2a069d8fbf26ec4033cc7297bb671944c3dcc1f68800b91e92e58fb407ca5a333382e20ac4bb5c9e0cb6
+DIST pip-19.2.2.tar.gz 6381643 BLAKE2B 3c7d3c070d9bc52557b67c8fc34274d8c769179e01758b63d69c5da48d94a5980ecba62f8b74135ee2f08b4686f8835dee5da5d30fc12af0044f7f0180b3f50b SHA512 ca634925e21aba338aa65f80d258833c6622b4c1d85eaf827fa5439aed62d7c6d64fde91cfebc05bd83eb215b019b690379cf5c4ac85a2f32d6357e6bd95fd88
 DIST pip-9.0.1.tar.gz 1197370 BLAKE2B 3618161690d5e0a38d141f9b51baea4aaa3fdc225664ef180bbeecf6e2df95e9ea4f97c63fe3a68f84f4fb5ebcc74e316827253c7e07b03565e58113bbaa918a SHA512 ee59efb4b009ff6543b7afdea99b9cbbee1981ecc03af586acda76674024d3b66dab23049e68f3da9448734984619fc1eaba6e965c9dd3d731973376c8a42e25
 DIST setuptools-41.0.1-py2.py3-none-any.whl 575966 BLAKE2B 332986453a35e4ec36ab2bdb80a8b0a70ffe4fec1bb874f481b0d8e31016a26d53070f90d0eea9030b8c48a1f9bc21a54d8a5a2b70096e1f8db84d42449903e4 SHA512 c84ddf1d1ea90216b2c475f3e4879f4e6792a859adf61db70d67f49a35f2cb4df6fd6d93049881e6d2a8d914768edfcd091475206bb5da3ac66c41c4b9147102
 DIST wheel-0.33.1-py2.py3-none-any.whl 21496 BLAKE2B 41bb9ed91d43f94209a010c286d541da9d68b9e727ec8a339fe3c24fb806746b1de5b62c6cd26d2c2841be17406e1f99353b6d172f5258540faeba014945e9e8 SHA512 761ad8cb96557b146642871e1f8ce75849a9828193d992a19d072236b9f8452ab54907a3b82bc7441f75f036155ae21b7450120e0c4c19aa5100b58337945ac0
 EBUILD pip-10.0.1.ebuild 1370 BLAKE2B ce5cb9a267f445b689a017e22b69e8be077180110b45b4d32de6a2ac4c1a753f674d79a751e2d9c51aac20b085f1765cfab294d36ca384bf7cac8546e7c1fab0 SHA512 fb02b5083dffb94195e0f74bf782900f01a73de888d27f76ebb05093b337ae81418939c86062f78556785d6871dc7018c271387dfe36296d0a47701f1ca10828
 EBUILD pip-19.1.ebuild 3465 BLAKE2B 647982e0fa28779940255e9869b94521319c01559fc92f521b394cfb88e19719f0b069bb226a1c3add8186554456626ed323b429948deab3fa334614331a3c4f SHA512 89a138a6cb171b7e0e9ea60387038ebd7d515a627d9e9ba121dd55ddc60822da295e6718dbd75d63a91bf5a6c30d685524c2162a1ef801d387ea8a1a1f284b05
+EBUILD pip-19.2.2.ebuild 3467 BLAKE2B e57d949ae5510e7389cd8a12ca7d8ddf8051e8296e3ae8343e967d7f777fabaae2fa32ce283b7880858804630c8fc7e69d4dc4b7f762758b9fdf1a5bd6b71bdf SHA512 890c6da6d3bcb8a569a843d32a76a057b803c556d00f01cbc8e14708d3b2427adc04b033be34b25dff89e294d5d87425ba8c177f2d90f3ee85b17e11738bba48
 EBUILD pip-9.0.1-r1.ebuild 2331 BLAKE2B edca4ecfeac1bc3bffbb066b83fa87669304ccd59dcfe165fd4cb207f8155ba2836df80a2e15c954ae5513b060fc9bab1df1d5a15870815f199bf51e19781b50 SHA512 711042823b41c10c1db502afc046424c71f081c38dc173e5bc06d58de5ca57f2e3106d4ef24134f8e79e557228f63f49c91eee1e037a2416cdfdbb592fabe221
 EBUILD pip-9.0.1-r2.ebuild 2486 BLAKE2B 6603040dcac85d4ef25da1dc4c2d16ce95a596154cffc9e28dffa3599a6a63cbb2cf61acd6f21a02d41cb3c33cd296808613f274d562292504e319cea9983b14 SHA512 65c03aea96b4e5f76cb26b4fb0f1da824ec670a87c0cbc2965730ff0292b84874abaffc8aed84d469dd19d97c0816f2ae8550af04340f64885551b7a1c6223a7
 MISC metadata.xml 366 BLAKE2B 6cfb3fe9bd6fa72a5bc5aafb74d7f79eaa1fdf273cf45be4fb7989fd917ea8b1ad60a855770cc51944611e7590abeec450ed02c7c9ae8d850084c2b4f7c0d009 SHA512 43ccb12f2797cb70b59ff495d149c32c813e5145c65521eda9a86f675eac7756eefadeb9f4ca977e8e8c7019bae144b445240e6d7128da771eaf6d19559336f6
diff --git a/dev-python/pip/pip-19.2.2.ebuild b/dev-python/pip/pip-19.2.2.ebuild
new file mode 100644
index 000000000000..1d2a8c7a3721
--- /dev/null
+++ b/dev-python/pip/pip-19.2.2.ebuild
@@ -0,0 +1,97 @@
+# 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} pypy{,3} )
+PYTHON_REQ_USE="ssl(+),threads(+)"
+
+inherit bash-completion-r1 distutils-r1 multiprocessing
+
+SETUPTOOLS_PV="41.0.1"
+WHEEL_PV="0.33.1"
+
+DESCRIPTION="Installs python packages -- replacement for easy_install"
+HOMEPAGE="https://pip.pypa.io/ https://pypi.org/project/pip/ https://github.com/pypa/pip/"
+SRC_URI="
+	https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	test? (
+		https://files.pythonhosted.org/packages/py2.py3/s/setuptools/setuptools-${SETUPTOOLS_PV}-py2.py3-none-any.whl
+		https://files.pythonhosted.org/packages/py2.py3/w/wheel/wheel-${WHEEL_PV}-py2.py3-none-any.whl
+	)
+"
+# PyPI archive does not have tests, so we need to download from GitHub.
+# setuptools & wheel .whl files are required for testing, exact version is not very important.
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="test -vanilla"
+
+# disable-system-install patch breaks tests
+RESTRICT="!vanilla? ( test )"
+
+RDEPEND="
+	>=dev-python/setuptools-39.2.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pretend[${PYTHON_USEDEP}]
+		<dev-python/pytest-4[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		<dev-python/pytest-rerunfailures-7.0[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		<dev-python/pytest-xdist-1.28.0[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/scripttest[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}/${PN}-19.1-disable-version-check.patch"
+	)
+	if ! use vanilla; then
+		PATCHES+=( "${FILESDIR}/pip-19.1-disable-system-install.patch" )
+	fi
+	distutils-r1_python_prepare_all
+
+	if use test; then
+		mkdir tests/data/common_wheels/
+		cp "${DISTDIR}"/setuptools-${SETUPTOOLS_PV}-py2.py3-none-any.whl tests/data/common_wheels/ || die
+		cp "${DISTDIR}"/wheel-${WHEEL_PV}-py2.py3-none-any.whl tests/data/common_wheels/ || die
+	fi
+}
+
+python_test () {
+	# Exclude tests that fail for some reason. Some of these failures may be Gentoo-specific.
+	python -m pytest \
+		-n $(makeopts_jobs) \
+		--timeout 300 \
+		-k "not (svn or git or bazaar or mercurial or test_pep518_uses_build_env or test_install_package_with_root or test_install_editable_with_prefix or install_from_user or install_user_conflict or upgrade_user_conflict or build_env_isolation or config_file_venv_option or get_legacy_build_wheel or install_user_wheel or uninstall_non_local_distutils or install_from_current_directory_into_usersite or uninstall_editable_from_usersite)" \
+		-m "not network" \
+		|| die
+}
+
+python_install_all() {
+	local DOCS=( AUTHORS.txt docs/html/**/*.rst )
+	distutils-r1_python_install_all
+
+	COMPLETION="${T}"/completion.tmp
+
+	# 'pip completion' command embeds full $0 into completion script, which confuses
+	# 'complete' and causes QA warning when running as "${PYTHON} -m pip".
+	# This trick sets correct $0 while still calling just installed pip.
+	local pipcmd='import sys; sys.argv[0] = "pip"; import pip.__main__; sys.exit(pip.__main__._main())'
+
+	${PYTHON} -c "${pipcmd}" completion --bash > "${COMPLETION}" || die
+	newbashcomp "${COMPLETION}" ${PN}
+
+	${PYTHON} -c "${pipcmd}" completion --zsh > "${COMPLETION}" || die
+	insinto /usr/share/zsh/site-functions
+	newins "${COMPLETION}" _pip
+}
diff --git a/dev-python/pmw/Manifest b/dev-python/pmw/Manifest
index 0c49669093b8..154375397205 100644
--- a/dev-python/pmw/Manifest
+++ b/dev-python/pmw/Manifest
@@ -1,6 +1,8 @@
-AUX pmw-1.3.3-install-no-docs.patch 496 BLAKE2B f2ef8e3c1bab1dc2913c7e78d6c2d72b53c094a9a3cbc0746fcb7e3fad3a45cfdf4a7fd62332726d7398f0a45eeff7feddb55f8fe518c8f12b749406e16ddaaa SHA512 6925199967f5d980285165f13339903947ca3c1841a279a79913c68a3d7a7e381d34b1a3c5af359a5c63b1a0d94dcb6e883c661a222e96cdc1aa8a9239f31811
+AUX pmw-1.3.3-install-no-docs.patch 480 BLAKE2B ad4403d5bf71ae2fc2788c5a8efef3c7bb763deadee84b91db994f1c2522043302be7ef5c06fe7327a86ca12eb68c4143d7bd004154cf06ddd3b999632fd15f6 SHA512 7ac3e8914ff603ac30d081bb373dcea57466738f63b540d44ff4d768ccf8f6c253a3e0a5446119886401be4b85b2660be55a1bdffec8a607e0e78acfdf8b50f7
 DIST Pmw-2.0.1.tar.gz 830448 BLAKE2B c78fef1570a34b9784f936f16856c4450164d8a232770e59cc084c1113888af8ee002cd1c7ddeadcddaacb5eae9ff58fcbfc270fc066875523e31a9d26770cd3 SHA512 99654e961aa40a64eebc08fe473e94da0ce431e6465255c68c251dfd544a51edef1a5d97dfd89ce756eb5f7fcf917dbef27f646ba9451ab72f3d460daa09a556
 DIST Pmw.1.3.3.tar.gz 451232 BLAKE2B 2ea74cf010b094539b1e052850b358e05a561aee1990de7184244b77a4133c1259ff54fa6e47c5368dac4bf81bf23e9217742ef1327ab7e20b8dca27ebf5f333 SHA512 d63fad8f8c5bb9b8cb940b10bdf9e3bc1dabe714e10f32c587d5e1097ef0767492602984089172d85cf57c8ebf34acf555b8fe73a2157c6f734ee36042803668
 EBUILD pmw-1.3.3-r2.ebuild 1227 BLAKE2B b95220e48ef2ad28960a750d36f7429a0cd02d67345262c9a95d68b629167f57e0db542e0701868770ca817a7b8c27c76e6e74ba4dfed17d2ccde84b1079ce43 SHA512 1c5fa6dcecf737a07309652a046cafbfcdf9333a8dea32626fe8a08fcb1867bdc0746a1bdb79814418203ddd0ab8c38a57fbda0e2c9c83429dd1d571953927ba
+EBUILD pmw-1.3.3-r3.ebuild 1227 BLAKE2B 75e6d9ddc49ad39b374881b0c2f060ba074580e8f449cd0a7609b1fb25bfc3138ee73e3ff7847e5cefc50ce3012050f848c9ba85f3f09a6f1338e9cafe096a9a SHA512 114d858580a4fb2086ce9a6d3631d274eb2ec68106d93885d13e8fc2039dbb6c260fd9545ffcd896fe22ff203c3a2a8e80b5cfe3a2ec33c5be71457961704c26
+EBUILD pmw-2.0.1-r1.ebuild 1211 BLAKE2B e1c94009cb50eca463b9269d51aa651f38ad950b7706b00fbd6fc7219aa344e68d767ca6575194e14d6ece7df9453775378eb9a1c1195a9d489590386acc489c SHA512 b332cc7ede4bfdd7ad17154251acb4d59f12f599bf40cfaf8c62b3ba5311eb2705af4134fe0e8314324e71961b91bf2f7e5864d6fd0d83c7b7b7d872b7188199
 EBUILD pmw-2.0.1.ebuild 1202 BLAKE2B 7a120d5cd8844e563293c1f6aca1cf5109cbded43b11881c4b3cce69a3035219dbae8a515a838450ff5fc94066ff10b686c537f4f3d851165d35c94729a6a4ba SHA512 b9d367e773baae18b3d05e8e71008c6d19d4493a677af4ff3b5b615b0f592503b80c8fde635a8226339bfb6a4b9bedcea269943f06575d564468e22e4ace1cde
 MISC metadata.xml 366 BLAKE2B c2d56d3c744468056b41ca45aaff5263692a9055807ae406644d9c482489f004271d932d56e078a2d66bdca3f17332e0ac03c7f93d7d41890db0eaa90c004002 SHA512 f0bac4e4faad03c83434cc214c0a0befebcbd1cd7eb89663d6058dcb36ee791102b081595e604409d278f01d7c2062f1d1ca1e01e1194e44826f66e6121697f7
diff --git a/dev-python/pmw/files/pmw-1.3.3-install-no-docs.patch b/dev-python/pmw/files/pmw-1.3.3-install-no-docs.patch
index 979e24abf59a..bbfd0f35f1c4 100644
--- a/dev-python/pmw/files/pmw-1.3.3-install-no-docs.patch
+++ b/dev-python/pmw/files/pmw-1.3.3-install-no-docs.patch
@@ -1,10 +1,10 @@
  src/setup.py | 2 --
  1 file changed, 2 deletions(-)
 
-diff --git a/src/setup.py b/src/setup.py
+diff --git a/setup.py b/setup.py
 index a5f9039..cfcf8a2 100755
---- a/src/setup.py
-+++ b/src/setup.py
+--- a/setup.py
++++ b/setup.py
 @@ -16,9 +16,7 @@ setup(name="Pmw",
  		'Pmw.Pmw_1_3_3.lib',],
  
diff --git a/dev-python/pmw/pmw-1.3.3-r3.ebuild b/dev-python/pmw/pmw-1.3.3-r3.ebuild
new file mode 100644
index 000000000000..652f36827a09
--- /dev/null
+++ b/dev-python/pmw/pmw-1.3.3-r3.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 )
+PYTHON_REQ_USE="tk"
+
+inherit distutils-r1
+
+MY_P="Pmw.${PV}"
+
+DESCRIPTION="Toolkit for building high-level compound Python widgets using the Tkinter module"
+HOMEPAGE="http://pmw.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="py2"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="doc examples"
+
+DEPEND="!dev-python/pmw:0"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/src"
+
+DOCS="Pmw/README"
+# https://sourceforge.net/p/pmw/bugs/39/
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}"/${P}-install-no-docs.patch )
+
+python_test() {
+	cd "${BUILD_DIR}/lib/Pmw/Pmw_1_3_3/" || die
+	PYTHONPATH=PYTHONPATH=tests:../../
+	cp tests/{flagup.bmp,earthris.gif} . || die
+	for test in tests/*_test.py; do
+		echo "running test "$test
+		PYTHONPATH=tests:../../ "${PYTHON}" $test || die
+	done
+}
+
+python_install_all() {
+	local DIR="Pmw/Pmw_1_3_3"
+
+	if use doc; then
+		dohtml -a html,gif,py ${DIR}/doc/*
+	fi
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins ${DIR}/demos/*
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pmw/pmw-2.0.1-r1.ebuild b/dev-python/pmw/pmw-2.0.1-r1.ebuild
new file mode 100644
index 000000000000..9795b10364b7
--- /dev/null
+++ b/dev-python/pmw/pmw-2.0.1-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_REQ_USE="tk"
+
+inherit distutils-r1 virtualx
+
+MY_PN="Pmw"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Toolkit for building high-level compound Python widgets using the Tkinter module"
+HOMEPAGE="http://pmw.sourceforge.net/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="py3"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="doc examples test"
+
+DEPEND="!dev-python/pmw:0"
+RDEPEND="${DEPEND}"
+# https://sourceforge.net/p/pmw/bugs/39/
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare() {
+	distutils-r1_python_prepare_all
+	2to3 Pmw
+}
+
+python_test() {
+	VIRTUALX_COMMAND="${PYTHON}"
+	cd "${BUILD_DIR}/lib/Pmw/Pmw_${PV//./_}/" || die
+	cp tests/{flagup.bmp,earthris.gif} . || die
+	for test in tests/*_test.py; do
+		echo "running test "$test
+		PYTHONPATH=tests:../../ virtualmake $test || die
+	done
+}
+
+python_install_all() {
+	local DIR="Pmw/Pmw_${PV//./_}"
+
+	use doc && HTML_DOCS=( "${DIR}"/doc/. )
+	use examples && EXAMPLES=( "${DIR}"/demos/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/protobuf-python/Manifest b/dev-python/protobuf-python/Manifest
index 64297f67a101..38ec0892c797 100644
--- a/dev-python/protobuf-python/Manifest
+++ b/dev-python/protobuf-python/Manifest
@@ -2,8 +2,10 @@ AUX protobuf-python-3.5.2-google.protobuf.pyext._message.MessageMeta.patch 895 B
 DIST protobuf-3.6.1.3.tar.gz 4490599 BLAKE2B 5a058f937330bd562e364a8d86e0b1376fdac9fded0fd23d6914cb59c5c15e8bfc1e203ea36b5a4eece8919708c1a9a6616b0ec2028d6ec339704da53ed81963 SHA512 9eadb46c7daa19e612516958169bc90943b38b429a4b2cf2171b66b57f50a2f8a9b66cbf58bdd44517af414b78e0f3ab2e1361891dc60ecd098185da2638d37e
 DIST protobuf-3.7.1.tar.gz 4795774 BLAKE2B a91155169623ee24ba49e397b151829321c01ff06bb27541e6c02701c37ac96ea9606961291ef0d4616dd6dba045bf7e893ec6288f5809d30cc026b60ae76590 SHA512 7d4cfabd4bd55926336a3baafa0bc1f1f15380b1b2af945f70a2bb3ba24c6ac6567f49c492326d6d1c43a488166bff178f9266377758a05d8541d8b242f4f80f
 DIST protobuf-3.8.0.tar.gz 4934577 BLAKE2B 4b86ab216e8a8b2c99c3620da9417c0562498e9d4dbf4957db186f51c62b0ed73b1322635a076b2d4054e015bdf6c8c50cc7fd0cb78d24a93b29d2a5b48f66fe SHA512 ba27c64e5193cd4a144bf0c9dc0d195fbbe6e580aaca01960362f0f185074588ca40046d3bcea76e1deae7508b722f6c5be484ea957122ae8e98229c7c3a4ad2
+DIST protobuf-3.9.1.tar.gz 4947402 BLAKE2B c1e366438ca619044d84d7a75453c35b48d5f64867b7aaec78c04966d4e62223a8909a28be850156ce3d47f0e7f42e80a231ec5d814d2820e1edfa963d89e177 SHA512 9accb56c1aadef83bf27280e15a99809a3561cbd4b39d6605dec730cc112bf4fd2e9f1ac39127b32a1b87253e712be4b4f12afe4061a8f7be76266b3f4bca314
 EBUILD protobuf-python-3.6.1.3.ebuild 1338 BLAKE2B c2992acc2383bf7ab469f2a538dbd344ecf65d20bec9ebfe1209de791c643bf069c75dfac08e7b8ce1d450b4a468fee47e4903fd2cd8c4df0d4fb8643147986a SHA512 522fd9478da9a732828c8ed4ecfe468ac15218b8527d41e797f792c462987a7e293c56928ab12bddd79002a24772eecfb59f122244e327182f860810cf7fbdc8
 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-3.8.0.ebuild 1530 BLAKE2B c7dfc3e89e04b8b0efc2a5222b7ec6dfbb405005ddb2dcd1b7dc0c3e3e3f1431e08dd69eba662f23af34e3f729ed71dfce4badea9c9c732768241da5e2a49585 SHA512 e512cfddb602dc389a6d7f57ed20976a8d3e6f9f035b0a9e302f0d1a6abb8d341920f5c035dc1399e250df1282bd7aaefc4134871be1abdfa6884bfcbb8b9556
+EBUILD protobuf-python-3.9.1.ebuild 1532 BLAKE2B 1731a0fb3647828d002a6dece70dec5eb0d92e6e467457e7872740bc5a504998358ec9f55e7c31f6d8f805345d5e13db9619894b7d393b7b15cbc0013b5e813e SHA512 f703f0e64b604adaab42298543878ab13b9fdebe64832a17483c6da38c000a696fd1a4e16e464a459d18f82b09f5daf0e6eb5e5b4d89328c396aeb8f35eb2ff4
 EBUILD protobuf-python-9999.ebuild 1471 BLAKE2B 96473eb9817c078af97121297054a8dd253f22b3741a40d7df78d1494e229391111ade9998973a2f3b4e4f045f7f8389c4123e64fc0d764545cae35376ca6324 SHA512 f81f1b8146f9c26a9a6d343d3121e456f4b71dc6c6b42fbf8c73777d8b48f58088d3bb966b47da7fc01576f2a0989bcbddd414c19412060a2df8af1e97155ab0
-MISC metadata.xml 656 BLAKE2B e63db63e247b105b51b506a404d8edc821cc0ccc276a3f813df3b06951184218e736e57b577ad2f64880250c55ef09c50a9fe04428f7cec02fb04293c337175a SHA512 5d747585e025672d423690fa2d8df09380a1714c2e0adad5838a41f099e3984b70c7f80c5873ea296101898cd92dea70edee964bf01b9d86acb9a1d0140169fd
+MISC metadata.xml 539 BLAKE2B 32831dd18b1c8c19a3e5339788b48bcbc6719654148fab93412bb91aa53ccad7b39529bbc2ea78b33b157eeb024e77cfa981088375466273e58b9d043ebdd70b SHA512 c6f28c8549dc8d3552836e81322db479ed4ac7ab5a12232f64d55cd909d8e4face39eed67b3f2c79f01023cfe3d00cf0540493acdb0aac419e6b58abcd430890
diff --git a/dev-python/protobuf-python/metadata.xml b/dev-python/protobuf-python/metadata.xml
index 0b20fcb3732e..fc2ddd9a8987 100644
--- a/dev-python/protobuf-python/metadata.xml
+++ b/dev-python/protobuf-python/metadata.xml
@@ -6,10 +6,6 @@
 		<name>Arfrever Frehtes Taifersar Arahesis</name>
 	</maintainer>
 	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
diff --git a/dev-python/protobuf-python/protobuf-python-3.8.0.ebuild b/dev-python/protobuf-python/protobuf-python-3.8.0.ebuild
index f222111ba2da..1eab5950da37 100644
--- a/dev-python/protobuf-python/protobuf-python-3.8.0.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.8.0.ebuild
@@ -1,8 +1,6 @@
 # Copyright 2008-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# True Authors: Arfrever Frehtes Taifersar Arahesis and others
-
 EAPI="7"
 PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7})
 
@@ -25,7 +23,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0/19"
-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}
@@ -60,5 +58,5 @@ python_test() {
 python_install_all() {
 	distutils-r1_python_install_all
 
-	find "${D}" -name "*.pth" -delete || die
+	find "${D}" -name "*.pth" -type f -delete || die
 }
diff --git a/dev-python/protobuf-python/protobuf-python-3.9.1.ebuild b/dev-python/protobuf-python/protobuf-python-3.9.1.ebuild
new file mode 100644
index 000000000000..634283beb42e
--- /dev/null
+++ b/dev-python/protobuf-python/protobuf-python-3.9.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 2008-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
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
+	EGIT_SUBMODULES=()
+fi
+
+DESCRIPTION="Google's Protocol Buffers - Python bindings"
+HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
+fi
+
+LICENSE="BSD"
+SLOT="0/20"
+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}
+	~dev-libs/protobuf-${PV}
+	dev-python/namespace-google[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${PYTHON_DEPS}
+	~dev-libs/protobuf-${PV}"
+RDEPEND="${BDEPEND}
+	!<dev-libs/protobuf-3[python(-)]"
+
+S="${WORKDIR}/protobuf-${PV}/python"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}"
+fi
+
+python_configure_all() {
+	mydistutilsargs=(--cpp_implementation)
+}
+
+python_compile() {
+	python_is_python3 || local -x CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
+	distutils-r1_python_compile
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	find "${D}" -name "*.pth" -type f -delete || die
+}
diff --git a/dev-python/pure-sasl/Manifest b/dev-python/pure-sasl/Manifest
index 6f9e82567866..e94df6100f73 100644
--- a/dev-python/pure-sasl/Manifest
+++ b/dev-python/pure-sasl/Manifest
@@ -1,3 +1,3 @@
 DIST pure-sasl-0.6.1.tar.gz 11553 BLAKE2B 17a3728e23b04cfcebd967ec4e40ab40ae72ebd18325579dfac52dbeac58ebee6e467f32a8030214cd976b2ae96e446afbc853c3e4233a61fa149d2910b1ecfc SHA512 f0e34fba460b03fb2348871859f79a21ac27df4be8b125a1652891efacd428a560673f42dff0993e87a3d80439f182e3a6e07b7c968cbfa3c86311c1592822a2
-EBUILD pure-sasl-0.6.1.ebuild 742 BLAKE2B 75724320cdb833e5f95b0d3f27133f9083fe36e6a997079d95127beb6ad4905c7e73ac7399d10b6133045dde60214514bd361d382a99474ad4be41109aa9e28a SHA512 583304bc522b7384b64cb3f3ea48225ee3490e370d3494b861c890136531753b5b790dfe17ab7b80e1514996bf8b5416a003b0d7abdc62a5682e29bb07a7f85b
+EBUILD pure-sasl-0.6.1.ebuild 726 BLAKE2B 816ec871c73a63b2304553d939e42c00c27f8cd28bc989453935d6b75f7f1c5ff1aa10f3a777fc09dd65bf3df2cce9c466203adbb2e6208baceccc94f4207b7c SHA512 304ca58b2510606e26ffa814e8ac7cb233e5acd8f9605fbc87ea6e2f474526cf9e284363e46d3176ebee957187620d2d0a84cb0d74af581445de59dfff6ac1bc
 MISC metadata.xml 222 BLAKE2B 627c0e9a843219968eef5f67d4a3656240cc8795a1fe885983efab35f57ec02cff5f28533c665c77e1391de3c7d2e1d7025aff9f82213e38f4c5c0e6b504c11c SHA512 b9b20f913c2b6bc8ec843d5d46a97ca2d847ccadd4dcadf7b68a60535e44b721541c72cc74b17c55fe21161a1dcfbc86a3d08e58659a8c431b574729fe87607d
diff --git a/dev-python/pure-sasl/pure-sasl-0.6.1.ebuild b/dev-python/pure-sasl/pure-sasl-0.6.1.ebuild
index 1aec7ab83c2f..ce2889a576cc 100644
--- a/dev-python/pure-sasl/pure-sasl-0.6.1.ebuild
+++ b/dev-python/pure-sasl/pure-sasl-0.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019 Sony Interactive Entertainment Inc.
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-python/pyamg/Manifest b/dev-python/pyamg/Manifest
index 73bddb9c5c7d..d4bb7e0e32f6 100644
--- a/dev-python/pyamg/Manifest
+++ b/dev-python/pyamg/Manifest
@@ -5,5 +5,6 @@ DIST pyamg-3.2.1.tar.gz 765723 BLAKE2B 72c59c0fe93363f73d8ba4c6297920dd1ca8406b0
 EBUILD pyamg-2.1.0.ebuild 688 BLAKE2B f4fc07c33ad4ead47321333a6b8b1db6862b35c39d90102d28ac51d98ee36ad4bee8ba8a34aae2328284c73015847dcafccd38d8e40cf86a4f9f768b7ee5f7c3 SHA512 fa5d25e562af118578cc8ef1abe0c7fdb6c187cfbb6454e799c7159fb129d6c7435f31da1dd7570915b1b5a29c6733c48e672d901b490c81ff991568dd31c3c4
 EBUILD pyamg-2.2.1.ebuild 719 BLAKE2B ad62b9f85a55df7f7dfb89d3d02c7fff63925716da46d1d357803c35b7046df3bfa9e322c3775ad130f252fe1075410c3c649733e1159ef7ee810c5d6ea95b88 SHA512 c8fda892f1fbfb9cc78506773d1a1154be9873288e28e10cb07db94949d509d85a3526b7f7cf84361be92111d10338269ffd9da94f7836ee6e7c222391d147d6
 EBUILD pyamg-3.0.2.ebuild 672 BLAKE2B 8ba69c9d426713bfe109ba752504e017f0796eebd5e73f99ec845749b6829e496ec4fde01cdfa1d7738010d0fbc72a4862c3248e14d34468d24b31b8d9351956 SHA512 031db8095eaacb0c427917c8151365de15c2443ddc12e8044b0125836bafd1df274987e55f5d1694349dd4c54507cfa79e8dc23984f66c04db315f0884782587
+EBUILD pyamg-3.2.1-r1.ebuild 682 BLAKE2B 52f6c93f0e6dbfa50a4591a95d77be635f23452d74f60b435f758e7c9acc63d4a71b11346f8ae7f68a75179de319d39804026dcdd6392f305816a12a2814ade3 SHA512 077094edd2cd6da83a7e058f97ef50199870506e5ee4b78080b705e79de90aedcc384fc1a85463bbf01fb1a459d53483ee69fb109f787f2089c1bcddae8e67c1
 EBUILD pyamg-3.2.1.ebuild 676 BLAKE2B b44181236368a45abe59d30eceabe7b322464b7d6894b38b31724c75832c83750eb5fa87aa826ff82d7d4b139de63c26e3e04c52c05fdb132a401d3067499f57 SHA512 64ed1cf79410eaa3ceb34cbde84a3b56d1ffb89861e4721b4ac7e041fc1399ae263d4216d0d49928e18ba5c423d4732097cf1df86cfdc4007f26eda2af5fde8e
 MISC metadata.xml 660 BLAKE2B 09f5ba733b9e679cd6435afe0e71a2382498ed2417563031c24dbb9d8630f1ea9ece9d10c2851afb411dec9694b773e495aac10e9cfe4398980f2d0c26efa370 SHA512 9900180bd0de0c9cb26205d2de5674f02405499778124c3fc21a3d3be6e7bd6602f4f619b0b983e95e30ff3f8f37e15ebfc66535db144f92e8f0c6d579e5e6f1
diff --git a/dev-python/pyamg/pyamg-3.2.1-r1.ebuild b/dev-python/pyamg/pyamg-3.2.1-r1.ebuild
new file mode 100644
index 000000000000..67fb63a9951b
--- /dev/null
+++ b/dev-python/pyamg/pyamg-3.2.1-r1.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
+
+DESCRIPTION="Algebraic multigrid solvers in Python"
+HOMEPAGE="https://pyamg.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+
+python_test() {
+	distutils_install_for_testing
+	cd "${T}" || die # need to be away source directory
+	nosetests --verbose pyamg || die
+}
diff --git a/dev-python/pyatspi/Manifest b/dev-python/pyatspi/Manifest
index 812e362fe9ae..f35ff5a14f80 100644
--- a/dev-python/pyatspi/Manifest
+++ b/dev-python/pyatspi/Manifest
@@ -1,4 +1,4 @@
 AUX pyatspi-2.6.0-examples-python3.patch 791 BLAKE2B ad8130ef64605915b3124dd268bb002e8e4a32c7c3e3e7f4445a5ee7e6a899b1caae25e1ecaff417d2d121063361d3dd983df08bafa666ab03aa6746fa21151c SHA512 7171f77080fed4ef235d1d3380821939d5a41e919b8509db8dcbe211d63b7b390e66389152c7275128cc8372c2a7fd1bdfaf179fc93b8fa62ed76a6edffd11ed
 DIST pyatspi-2.30.0.tar.xz 310672 BLAKE2B 76d51e6ce2f39305bcda8f706b5207738d3a2c0fd7480efb77c4dab8baf8ed6eb71263375ff0c16be0087e47f7f6b5eab99c6fc8992b83bdea6e64c92c381043 SHA512 a7af81bb55dff45d1bceced645f6aeb1adc1fa2a2b61fc39d9e97b6659e474636e5ac1af9923588311e651fee57b5e31a62ea5b2977b341eda43a5a736bf27ed
-EBUILD pyatspi-2.30.0.ebuild 1290 BLAKE2B 9cc722c33a681090dcacc79c1b0e7fe834519c5a924b6c159e2d6b2312bc961780280c316d22162d5e3acf5170dbc88caf4cd797247cfbd6cd06ca18d70d8e60 SHA512 6bb8fffa7d5050c3ca605c60414f296c506ebddf4d04ac6f91fe1be205b8f22a4f78b95f99f7f3f8991b2a530ea974912b74c6fff280601e6841c53f9e76ed67
+EBUILD pyatspi-2.30.0.ebuild 1297 BLAKE2B 958e2b72ab234d040d3c945a5b535fb7cba118517ae6636fe10facc73d5cd0939c390dd10e6cd90ecc5b73e28489b3ac7097b68e4751cf9c6ec89e9ef7100c4f SHA512 7140f8455184dcdde5d7899fe0716ca9f444807cb74a1d359c9a39da758f3e415ba31a93560e7852b58761e4811a4787599b1832289b117aee27eba99b4331d4
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-python/pyatspi/pyatspi-2.30.0.ebuild b/dev-python/pyatspi/pyatspi-2.30.0.ebuild
index a7cd3471d98c..5a8d07f7a659 100644
--- a/dev-python/pyatspi/pyatspi-2.30.0.ebuild
+++ b/dev-python/pyatspi/pyatspi-2.30.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"
 # Note: only some of the tests are GPL-licensed, everything else is LGPL
 LICENSE="LGPL-2 GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
 
 IUSE="" # test
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/pycollada/Manifest b/dev-python/pycollada/Manifest
index accfd837708c..3552d722a720 100644
--- a/dev-python/pycollada/Manifest
+++ b/dev-python/pycollada/Manifest
@@ -1,4 +1,3 @@
 DIST pycollada-0.6.tar.gz 3109963 BLAKE2B 92e9b3a28c959700fad4f4af1c6375f47b1a3cabb4ff3b8eec47a5625bd680d7088b7c9677e0d395f3be296d555996e5e5819f11ab82a0fa37b0c6fbec33795f SHA512 043eaafbd97a588897870e89202e281777094e4bf63ea56a979b6f7aef7ad549fc2b71f3b575c0b9c413bc10756ba36e02cc7cbd497a6cbaa51f06e99b34f0cd
 EBUILD pycollada-0.6-r1.ebuild 1367 BLAKE2B e59f3f30f4cf54192109ad6f490753ca86ed6a14bed4754b55f85193374ecb9a586d5b11bb8b502b159cbcae9ac690b766946af71baa9625b865f89a3f5db7c0 SHA512 3e6a2d5d17a692e763d70091756c77e927b73e37fe384df441e8663ef705390760b4d8dcaf4bb95035bee97259916cbce9e9c0379062f2d48fa3b6dcd8eb2fb9
-EBUILD pycollada-0.6.ebuild 1494 BLAKE2B 43e055d11615a8e4fb9e1ae447807daa37e3d6e636f6c4538c43050cba6262004b09ed704aa694b36981c9d214d98d4dae61be83c451044a9c1078a9d3a4eae1 SHA512 9409bd3e77fc969ab7b328d2ab73c1357993dbabe9d66e1693e0a6c3f1a3e8439869e8a6a292212a3a3fd6a4cbd6c6a8d32b924ddbd36debdd5419dab096a637
 MISC metadata.xml 559 BLAKE2B 4a6983c74b48af34e314f348e781cde10d22c7419f11932f40e28d47cdd0bd5b940cbff2431cba17793a813bc3d8a697a7cd3dea4e4d122834ce91fbff79fa53 SHA512 401e7df61bebe47ef2f8de32766df5013994c624285ff5f352195e0b316f2c831ecb43e513efc29b4a5710de6c810b8f80add2b57513d5cd5aa6904aebc0ec7f
diff --git a/dev-python/pycollada/pycollada-0.6.ebuild b/dev-python/pycollada/pycollada-0.6.ebuild
deleted file mode 100644
index 1cd5c01d2d92..000000000000
--- a/dev-python/pycollada/pycollada-0.6.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# 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} )
-PYTHON_MULTIPLE_ABI=1
-
-inherit distutils-r1
-
-DESCRIPTION="Python library for reading and writing COLLADA documents"
-HOMEPAGE="https://pycollada.readthedocs.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples test"
-
-RDEPEND="
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.2[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/python-dateutil[${PYTHON_USEDEP}] )
-"
-
-REQUIRED_USE="${PYTHON_REQ_USE}"
-
-DOCS=( AUTHORS.md CHANGELOG.rst COPYING README.markdown )
-
-src_compile() {
-	distutils-r1_src_compile
-
-	if use doc ; then
-		pushd docs > /dev/null || die
-		emake html
-		popd > /dev/null || die
-	fi
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	einstalldocs
-
-	if use examples ; then
-		insinto /usr/share/${P}/
-		doins -r examples
-	fi
-
-	install_test_data() {
-		insinto $(python_get_sitedir)/collada/tests/
-		doins -r collada/tests/data
-	}
-	python_foreach_impl install_test_data
-}
-
-src_test() {
-	test_collada() {
-		for script in "${S}"/collada/tests/*.py ; do
-			PYTHONPATH="${S}" $EPYTHON "${script}"
-		done
-	}
-	python_foreach_impl test_collada
-}
diff --git a/dev-python/pycryptodome/Manifest b/dev-python/pycryptodome/Manifest
index 65d145032aa2..6b585edd8bf0 100644
--- a/dev-python/pycryptodome/Manifest
+++ b/dev-python/pycryptodome/Manifest
@@ -8,4 +8,4 @@ EBUILD pycryptodome-3.4.7.ebuild 870 BLAKE2B a3412a85ff38d5fcf607c8baec34bdd528b
 EBUILD pycryptodome-3.6.6.ebuild 903 BLAKE2B dfe2d85efb2a051414ec28505c328eaad25e25ac742f20a323d832b112ce618e8ba6b5f05c37dffb8dc8ade97ac180ce904459b3259ab2a1c8088a815460f96b SHA512 e65576817c779755b6d6e9a476fac64dd2150e5d39fdf13b793edb4ff748217670cf6385985f6453d088ce33efa1f3e4e3472079b8c2fe1a58983d53d5910265
 EBUILD pycryptodome-3.7.3.ebuild 913 BLAKE2B 4424d3b87cf05ddac40f79c699a7ddcf4531abbaeefcbf93b810f88e4cbffd1271d46911417f8cffd97ada7019608373a493cd3464e67c0eac53919e368e563b SHA512 ce69deabe6ee9bb66fb74c9ad0f78509cc0a9760dbc0ab434cacfc4a4ad6899f55edfb81cbe0bf148f5f351b6bb6d31746bc5b2c9c8296dfd2edb238a94f976e
 EBUILD pycryptodome-3.8.2.ebuild 913 BLAKE2B 4424d3b87cf05ddac40f79c699a7ddcf4531abbaeefcbf93b810f88e4cbffd1271d46911417f8cffd97ada7019608373a493cd3464e67c0eac53919e368e563b SHA512 ce69deabe6ee9bb66fb74c9ad0f78509cc0a9760dbc0ab434cacfc4a4ad6899f55edfb81cbe0bf148f5f351b6bb6d31746bc5b2c9c8296dfd2edb238a94f976e
-MISC metadata.xml 334 BLAKE2B dd22c5da46085356e8049d290266f66f81a648683dacb4ad33faedb86b890c911047f245eb96b418cbde226b91bd91567036ab31919ae28e488c5eb993418c1b SHA512 f314a41851c5f31d68a7fb93ab304aab44007756472c9f18c746a0b0a7bbf464a9f196559f4ecf6f8b68b265b7ba9ef571398e1893d316b48a0fa435eb7a1b3a
+MISC metadata.xml 335 BLAKE2B 7e5036b03371769db2f3a8d0cb5d5cd9078f16d4dccc3bd012f0d4f96ba960388c3025df93bb165f3cdbe05d73da05537a373e01b799aac2dc59dcd44e6206b5 SHA512 a94a7c0c45ae597e5c4ac672a5e9151851448371ddae0fdbd9967651476681440f2d4a6071e2cd0c4a1553038a92f4e6649f0554b636d58a025366c57c80e899
diff --git a/dev-python/pycryptodome/metadata.xml b/dev-python/pycryptodome/metadata.xml
index dae6a54104b8..265b2611eed7 100644
--- a/dev-python/pycryptodome/metadata.xml
+++ b/dev-python/pycryptodome/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python project</name>
 	</maintainer>
diff --git a/dev-python/pyelftools/Manifest b/dev-python/pyelftools/Manifest
index 613c9640cabf..76feb45b60df 100644
--- a/dev-python/pyelftools/Manifest
+++ b/dev-python/pyelftools/Manifest
@@ -1,3 +1,4 @@
 DIST pyelftools-0.24.tar.gz 411874 BLAKE2B 304721cc440599d6436366c14a17d7e3132464686cdd870257a0180dd5f292a23c50a4e654966552d643875ac2683fda8584684cfeb611a3f22f02f73852a288 SHA512 5169617f9a8446ffc21dfc44ee185a388c8945a0296bdc6752483b0756888dccb10e3ee88e529d101cf31a4595de924b5c95f5459d5ee4448f57c0c4f2c56887
+EBUILD pyelftools-0.24-r1.ebuild 911 BLAKE2B cc788c1e11f053a2d18d2e6fcab92a0b19dee1941306bc1fba74e5c3b021b5517089771909274e4274253cdfa6a54f88b67467355d75570f55c80aa02d1434b8 SHA512 1419c340802f3d47b5cba9b410db2ab3bbf462b381155be3d87c06d81de137563482919679a34a94cbf6fac71a2aedf4db5820165bd14ef794d9926415134c70
 EBUILD pyelftools-0.24.ebuild 896 BLAKE2B b752f1ce23fda2f2598e139c602aaaa274ccee4771bcde48ef471bed7ebf588562b1803415088dc0137fb955d0d49aa9976f66420a463fd99ca0a13bf0d3e374 SHA512 ec95772ce69ea09ba8c921ef2b34002a0104b11c5c31fd90c1a8e84b6d0356193b1a128ce15db50584b86cd91807be2b9f9394edb9218208a8942f50b1805bc9
 MISC metadata.xml 370 BLAKE2B 8dcbbb8d9add514bc0daf421c6739f8ee8426af39a0cf36758c594ee859a1aead4bddcfab3466cb50761ae289f7d58426dacb5a51b745a290530abeb511204eb SHA512 0f00113fb42e48e7b232b8a500ac77958f3ead50ff51d547e015a2c1aa7b87ff7a25495094ba10480176f3653742f18473378fe336f544ec93d645db9057ec20
diff --git a/dev-python/pyelftools/pyelftools-0.24-r1.ebuild b/dev-python/pyelftools/pyelftools-0.24-r1.ebuild
new file mode 100644
index 000000000000..d8bfc6dcef85
--- /dev/null
+++ b/dev-python/pyelftools/pyelftools-0.24-r1.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=( python2_7 python3_{5,6,7} )
+inherit distutils-r1
+
+DESCRIPTION="pure-Python library for analyzing ELF files and DWARF debugging information"
+HOMEPAGE="https://pypi.org/project/pyelftools/ https://github.com/eliben/pyelftools"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="public-domain"
+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"
+IUSE="examples"
+
+python_test() {
+	# readelf_tests often fails due to host `readelf` changing output format
+	local t
+	for t in all_unittests examples_test ; do
+		"${PYTHON}" ./test/run_${t}.py || die "Tests fail with ${EPYTHON}"
+	done
+}
+
+python_install_all() {
+	use examples && dodoc -r examples
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pygit2/Manifest b/dev-python/pygit2/Manifest
index 5a43c97f48ad..5e8041cb1656 100644
--- a/dev-python/pygit2/Manifest
+++ b/dev-python/pygit2/Manifest
@@ -1,5 +1,5 @@
 DIST pygit2-0.26.4.tar.gz 477318 BLAKE2B d17ef799ff3eab3629194fe0fe90dcc335e40509c13f53bc8f8e0b01e93dc838ca474a5e4ef44c9be2eac7d08e98c735820e936cbbcb7f398f76f9732954bc69 SHA512 e459e47bfa8137421625633a731d49882d95a52d4f2d672f2c8efe7cd6cca4b33335ee77777a353b309df4917d9b29b30c1f9a96b7e226e3e7fe0cd34bbefce6
 DIST pygit2-0.28.2.tar.gz 496469 BLAKE2B 1173401d4555f6f40eaf5a27d9c0e83214b66afa609f15cc4d689e8c58cc0ae3865b4e6ebb31808d354ecef56f3a74cc777fe42314ef348c39f1f61d82655bc9 SHA512 3f742cdcc9d603c9cc9ef2e0a545da8bcfb555a0bdeea1c73c53a284b43d40ad6b28c87a029578ad7b1c8f2bf56ecd2859dac8dd836474bfc66223ff4af9e8f0
 EBUILD pygit2-0.26.4.ebuild 621 BLAKE2B 12689ec100e542aa3bb628e1395f1ccd8b3423812985dfe09414c0afd29c69881433355b5a8941bc8124e4ce02ca664084d18fb68cdba44dec0b9ade23356df2 SHA512 c13efaa6f3a1686f2fc6bbbbf0e9a67c004675cd5f07352b0bb2ccdb5875ec1acbe557a28631a2bbd6f8864e41f72f3f80741280bd1e54a07e8942626e2aa0e4
-EBUILD pygit2-0.28.2.ebuild 908 BLAKE2B 1c9e89d18d2a5a61c583bed417c294f4573bb69a52ebc319411d1690bb26423a296bb7e790b4a549464f452216d97f6de91fb4b3bdf8ff0b1b00c8535bce69ce SHA512 45de481b1c50545466ccc866f5e22b0945289d41c54fdeac4a0b8958723d46e0b00571987ea08da36a7fb5f70bcca24793c03fb9f0bdefa2b47caedbf711d416
+EBUILD pygit2-0.28.2.ebuild 907 BLAKE2B c107bfe720ca781711038d307652e29cb0f1246abe96b60fd00764885283240999db89edaec84563fe6059bf615db1fa26d5e952cfbc7c5ee09de974d56a33a3 SHA512 9b1e2f9f0794d1fccd81dd0cb121507c3a116ca1f64f5013f6db029b29c03c001cee6fda11f8c7d899e25ad7da31f4bdb670b505750cf67b2a1e456886fd7d06
 MISC metadata.xml 489 BLAKE2B 3733ff314640ab2cbfa07e0ea67041ddb3635b51d339070abe97c95b5b358851b412cca5d8996dc1f25abb986a03095f19e8a50cbaeab7eb156c6b9107108cf6 SHA512 d20b7ebbdb3ea2ec72c3c5ded9874b7506b3ddabb43dbf329891478fcf5d7c4b9487ab0675d735733f463dd897dd5cdcc28080ad597f4f838bbcaa565c26915e
diff --git a/dev-python/pygit2/pygit2-0.28.2.ebuild b/dev-python/pygit2/pygit2-0.28.2.ebuild
index edce720a1fae..5fc3e9c5bea1 100644
--- a/dev-python/pygit2/pygit2-0.28.2.ebuild
+++ b/dev-python/pygit2/pygit2-0.28.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pyopengl_accelerate/Manifest b/dev-python/pyopengl_accelerate/Manifest
index a4618cfde50c..377f388e5483 100644
--- a/dev-python/pyopengl_accelerate/Manifest
+++ b/dev-python/pyopengl_accelerate/Manifest
@@ -1,3 +1,4 @@
 DIST PyOpenGL-accelerate-3.1.0.tar.gz 323541 BLAKE2B 01a13b0ce6d35896c05f3e5c7b485f20bf9867ebd2c81f1ece50dbfbc1ecfad1c10b35276fa830d932bc7ecbac059fe8376e3789e5c10b678963219a577a993e SHA512 2ba2f56b02a83225e42b80962b5ae6d4077387f88a4261e21c96b0bf66814922eaed8b6065e0127e819bde9d5d2f6b609100e32c589a1c17bdb4fa8b670dca61
+EBUILD pyopengl_accelerate-3.1.0-r1.ebuild 739 BLAKE2B 94f5cd1b6780f4e0b5d2777dd41889087e75e54b8eaeab076334cf53dda22f45aba7ffcdb496b008307b14a85643f1e763f6f7e894d762da4c37f19b18de5246 SHA512 a07cdbeb18a020048fd03ff5f10df31f179ee822c8d42e39fd4737d02557c2dc6ed077c49ddad7694395cbe69096b3d13d9053f519d7b5d4ef23fce9a46b1b87
 EBUILD pyopengl_accelerate-3.1.0.ebuild 628 BLAKE2B 04b426ca29ca5c955b80e5d8b1230389137104dc3fc44c5dee3e39f11e275c5ed9cec92f198ff59d1344a28141b99882eeb1ff71f9dc208dedd8b44ca6dce25a SHA512 cf2e6665c48b4d9805e3ef88617887782380f843470d29ec80a30757d0474125aa87724e6c63fa891b8c2fe68b2e797758e27a652e3acdbedd5655e1661464bd
 MISC metadata.xml 302 BLAKE2B 6554bf56c24bed0cacaf261dc5323e9c84c14e86973aee7cf510973a7e07999f5f0c1c5f595c224dcbb9bcab9d182ab1779afa5b304e116faf240bd9073baa1b SHA512 73ee5965c95e1bf6f45c78ad638b946d36d5a34115aa3307d84e475f5ca86e81a60283d5b50ccad3f32771e94220a06f9b8c85413047560dd99185f2b5ce95ae
diff --git a/dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.0-r1.ebuild b/dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.0-r1.ebuild
new file mode 100644
index 000000000000..e78f3288a426
--- /dev/null
+++ b/dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.0-r1.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=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Accelerate module for PyOpenGL"
+HOMEPAGE="http://pyopengl.sourceforge.net/ https://pypi.org/project/PyOpenGL-accelerate/"
+MY_PN="PyOpenGL-accelerate"
+MY_P="${MY_PN}-${PV}"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="dev-python/pyopengl[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	sed -e 's:>exc_:>curexc_:g' -i src/*.c || die "sed failed" # bug 691520
+	default
+}
diff --git a/dev-python/pypy3-bin/Manifest b/dev-python/pypy3-bin/Manifest
index 7e82c91b987a..1222c93c5987 100644
--- a/dev-python/pypy3-bin/Manifest
+++ b/dev-python/pypy3-bin/Manifest
@@ -6,7 +6,9 @@ DIST pypy3-bin-7.1.1-amd64+bzip2+jit+ncurses.tar.lz 11031375 BLAKE2B e01ac298d3c
 DIST pypy3-bin-7.1.1-amd64+bzip2+ncurses.tar.lz 6915836 BLAKE2B 0f3f2210e7f6e73872d32b2c01a911b52ad2a8c8987034709d9e4c72cfe11e422eea7b6522b19b3717876307d9fbbfbdfcc008dc2e3771dea083eeb61c202e6e SHA512 7fe6a19f56d7cdc142b368154e17af8936b8b730102c4a1c8a6b756a13b643d1375a51f45a0a3d345f7a8a23b75a81d35a6aa810129d231bf2091e156f69a914
 DIST pypy3-bin-7.1.1-x86+bzip2+jit+ncurses+sse2.tar.lz 8540485 BLAKE2B a7de0db24e4bc56d54cbc03d618f8e08932e23a1fe5a1ab227600c244e222a6dae723c72fbd5cdd059c3e3f52bd355c4c9ee18506f6b39961bd1473358d35bd3 SHA512 f3355109bc073e220a33e8763c2d2ccf152d223d3850bb85aac71c19170ce4b118a84f258a829c486209f3c3014264384b158de17c9a0156c24afcf5b130a8e0
 DIST pypy3-bin-7.1.1-x86+bzip2+ncurses+sse2.tar.lz 5523574 BLAKE2B 44f760842b0f232f7f5fb7a2fe3f60ff1f832dec3b0c16d1fd27ab36d09c12d6be8aa6727a880c3400506ea415317ddfb982439c1a581a03909099eeb6ea8cf6 SHA512 df664a7afa5bdd329d19046c81e362782c4f9358add2b7e54100df10a23434b9a341ec504ac1d49b2b017917937ab23ffd3cf723f86b65d7080789f795f5a4d3
+DIST pypy3-bin-7.1.1-x86+bzip2+ncurses.r1.tar.lz 5550959 BLAKE2B 72b1f84f0c70b07bd622b4d9ba67b165ce047037acc9a4fb46427b07db8793610f71dc389fc5cede209663c7d36750faf6247d5b6eb3be006c6cc58e4a94b0eb SHA512 3c522a9cf0e94aa8c14e9982a09231517c2c2b46e73a9c69bc6c43c44afefa3958de8879ac0fff2d43f8a0fc79117bdee645599d8e1d6a0def9806b44a4b1bc9
 DIST pypy3-bin-7.1.1-x86+bzip2+ncurses.tar.lz 5545191 BLAKE2B 2afc40968977cd6956cb305a829811640e8437f0a811435a20ec694181286c94c820fd4148e3b6323a014ff391400d5265a7c1ee8b918c3db91ac02b44f3d585 SHA512 a1dad750491c5f524217986817a046c5c7a97b2b250a1d24b6a077d2d8067e249966cd331a5336fa2960a3d317c1aa83196c3e3b2f4a0734d79fe43cd9b55032
 DIST pypy3.6-v7.1.1-src.tar.bz2 23171982 BLAKE2B be43528bc6f3e02d146016a4969bd8c7a9e880a3bd3b77f441aac6d22ef67700f71e0171ec000066bd2c0bd506db64af69d6b75b59a92222dd0353ee70e6629b SHA512 17e78f9c7080d597a6283d8e8247d1ca78f09a14ff221db8c3d90d255b5befc73102b317ca34a80979e544d5ee72f3e5e649f89d185a085f4cc15012da4d0473
+EBUILD pypy3-bin-7.1.1-r1.ebuild 5726 BLAKE2B 273bc2fc7a031821f7c52a644f5a995751f59d11eb2f61fa3732af9f4f76bcb87ac90c2d1949f8bd089f6f6b25654f3e8d5c4d47f8cd92a1af9eaf734c8b7fd3 SHA512 61cd3ace61262da6b07fdd7a399c0e00c01327ca07bca34faa85e8d59d2af123b11eb1d09e05407a202f9400c6042179574948b5a9ab81ba68c1e2b80a3ad963
 EBUILD pypy3-bin-7.1.1.ebuild 5723 BLAKE2B 5b65d80f0bae857db38ac6ba36f55fdece5c8f833504f4ef896b012434d5469a4228b4b790c4735ecaf66c6d0c733db6321f75814d3dff230bc614241588225a SHA512 d70f254db7483b55ff7addc62bda682cc0b4ddfb526b3bc93442100e2109d028fd0355eff759899b7b9fd3a8aad6ac3b475d23bfbfd68cf98d8aff09f29c719b
 MISC metadata.xml 317 BLAKE2B d7be288f31d09754073e991e0f753e673e47fe1698408d13ce01dd58aa458e9ff9894973b27a293e426c074fbafaf5ca784fdbae0c784c1a5bf5d51bad1abd21 SHA512 65d1795605d0120c94911b2c295d8da13e01f9ac6b0750a7d536be64bf5244e20e2bb7286b33e75346e0dea333dc8970c4dcf0e98842e28f5a202ee2ddbba294
diff --git a/dev-python/pypy3-bin/pypy3-bin-7.1.1-r1.ebuild b/dev-python/pypy3-bin/pypy3-bin-7.1.1-r1.ebuild
new file mode 100644
index 000000000000..453ae142dbd3
--- /dev/null
+++ b/dev-python/pypy3-bin/pypy3-bin-7.1.1-r1.ebuild
@@ -0,0 +1,188 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Test runner needs Python 2.
+PYTHON_COMPAT=( python2_7 pypy )
+inherit pax-utils python-any-r1 unpacker
+
+BINHOST="https://dev.gentoo.org/~mgorny/dist/pypy3-bin/${PV}"
+MY_P=pypy3.6-v${PV}
+
+DESCRIPTION="A fast, compliant alternative implementation of Python 3.6 (binary package)"
+HOMEPAGE="http://pypy.org/"
+SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2
+	amd64? (
+		jit? ( ${BINHOST}/${P}-amd64+bzip2+jit+ncurses.tar.lz )
+		!jit? ( ${BINHOST}/${P}-amd64+bzip2+ncurses.tar.lz )
+	)
+	x86? (
+		cpu_flags_x86_sse2? (
+			jit? ( ${BINHOST}/${P}-x86+bzip2+jit+ncurses+sse2.tar.lz )
+			!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses+sse2.tar.lz )
+		)
+		!cpu_flags_x86_sse2? (
+			!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses.r1.tar.lz )
+		)
+	)"
+
+# Supported variants
+REQUIRED_USE="x86? ( !cpu_flags_x86_sse2? ( !jit ) )"
+
+LICENSE="MIT"
+# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
+SLOT="0/71-py36"
+KEYWORDS="~amd64 ~x86"
+IUSE="gdbm +jit libressl sqlite cpu_flags_x86_sse2 test tk"
+
+RDEPEND="
+	app-arch/bzip2:0/1
+	dev-libs/expat:0/0
+	dev-libs/libffi:0/7
+	sys-devel/gcc:*
+	>=sys-libs/glibc-2.28
+	sys-libs/ncurses:0/6
+	sys-libs/zlib:0/1
+	gdbm? ( sys-libs/gdbm:0= )
+	!libressl? ( dev-libs/openssl:0=[-bindist] )
+	libressl? ( dev-libs/libressl:0= )
+	sqlite? ( dev-db/sqlite:3= )
+	tk? (
+		dev-lang/tk:0=
+		dev-tcltk/tix:0=
+	)
+	!dev-python/pypy3:0"
+DEPEND="${RDEPEND}
+	app-arch/lzip
+	app-arch/xz-utils
+	test? ( ${PYTHON_DEPS} )"
+
+S=${WORKDIR}/${MY_P}-src
+
+QA_PREBUILT="
+	usr/lib/pypy3.6/pypy3-c
+	usr/lib/pypy3.6/libpypy3-c.so"
+
+src_prepare() {
+	eapply "${FILESDIR}/7.0.0-gentoo-path.patch"
+	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
+	eapply "${FILESDIR}"/7.0.0_all_distutils_cxx.patch
+
+	sed -e "s^@EPREFIX@^${EPREFIX}^" \
+		-i lib-python/3/distutils/command/install.py || die
+
+	# apply CPython stdlib patches
+	pushd lib-python/3 > /dev/null || die
+	eapply "${FILESDIR}"/python-3.5-distutils-OO-build.patch
+	popd > /dev/null || die
+
+	eapply_user
+}
+
+src_compile() {
+	# Tadaam! PyPy compiled!
+	mv "${WORKDIR}"/${P}*/{libpypy3-c.so,pypy3-c} . || die
+	mv "${WORKDIR}"/${P}*/include/*.h include/ || die
+	mv pypy/module/cpyext/include/*.h include/ || die
+	mv pypy/module/cpyext/parse/*.h include/ || die
+
+	pax-mark m pypy3-c libpypy3-c.so
+
+	einfo "Generating caches and CFFI modules ..."
+
+	# Generate Grammar and PatternGrammar pickles.
+	./pypy3-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
+		|| die "Generation of Grammar and PatternGrammar pickles failed"
+
+	# Generate cffi modules
+	# Please keep in sync with pypy/tool/build_cffi_imports.py!
+#cffi_build_scripts = {
+#    "sqlite3": "_sqlite3_build.py",
+#    "audioop": "_audioop_build.py",
+#    "tk": "_tkinter/tklib_build.py",
+#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
+#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
+#    "_gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
+#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
+#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
+#    "lzma": "_lzma_build.py",
+#    "_decimal": "_decimal_build.py",
+#    "ssl": "_ssl_build.py",
+#    "_blake2": "_blake2/_blake2_build.py",
+#    "_sha3": "_sha3/_sha3_build.py",
+	cffi_targets=( blake2/_blake2 sha3/_sha3 ssl
+		audioop curses syslog pwdgrp resource lzma decimal )
+	use gdbm && cffi_targets+=( gdbm )
+	use sqlite && cffi_targets+=( sqlite3 )
+	use tk && cffi_targets+=( tkinter/tklib )
+
+	einfo "Please disregard the import errors during CFFI cache generation."
+	einfo "They come from modules not built yet."
+
+	local t
+	# all modules except tkinter output to .
+	# tkinter outputs to the correct dir ...
+	cd lib_pypy || die
+	for t in "${cffi_targets[@]}"; do
+		# tkinter doesn't work via -m
+		../pypy3-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+	done
+
+	# Cleanup temporary objects
+	find -name "_cffi_*.[co]" -delete || die
+	find -type d -empty -delete || die
+}
+
+src_test() {
+	# (unset)
+	local -x PYTHONDONTWRITEBYTECODE=
+
+	# Test runner requires Python 2 too. However, it spawns PyPy3
+	# internally so that we end up testing the correct interpreter.
+	"${PYTHON}" ./pypy/test_all.py --pypy=./pypy3-c -vv lib-python || die
+}
+
+src_install() {
+	local dest=/usr/lib/pypy3.6
+	einfo "Installing PyPy ..."
+	exeinto "${dest}"
+	doexe pypy3-c libpypy3-c.so
+	pax-mark m "${ED%/}${dest}/pypy3-c" "${ED%/}${dest}/libpypy3-c.so"
+	insinto "${dest}"
+	# preserve mtimes to avoid obsoleting caches
+	insopts -p
+	doins -r include lib_pypy lib-python
+	dosym ../lib/pypy3.6/pypy3-c /usr/bin/pypy3
+	dodoc README.rst
+
+	if ! use gdbm; then
+		rm -r "${ED%/}${dest}"/lib_pypy/_gdbm* || die
+	fi
+	if ! use sqlite; then
+		rm -r "${ED%/}${dest}"/lib-python/*3/sqlite3 \
+			"${ED%/}${dest}"/lib_pypy/_sqlite3* \
+			"${ED%/}${dest}"/lib-python/*3/test/test_sqlite.py || die
+	fi
+	if ! use tk; then
+		rm -r "${ED%/}${dest}"/lib-python/*3/{idlelib,tkinter} \
+			"${ED%/}${dest}"/lib_pypy/_tkinter \
+			"${ED%/}${dest}"/lib-python/*3/test/test_{tcl,tk,ttk*}.py || die
+	fi
+
+	einfo "Generating caches and byte-compiling ..."
+
+	local -x PYTHON=${ED%/}${dest}/pypy3-c
+	# we can't use eclass function since PyPy is dumb and always gives
+	# paths relative to the interpreter
+	local PYTHON_SITEDIR=${EPREFIX}/usr/lib/pypy3.6/site-packages
+	python_export pypy3 EPYTHON
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_domodule epython.py
+
+	einfo "Byte-compiling Python standard library..."
+
+	# compile the installed modules
+	python_optimize "${ED%/}${dest}"
+}
diff --git a/dev-python/pypy3/Manifest b/dev-python/pypy3/Manifest
index 0f0d0d42fd53..e7aa3d24ba27 100644
--- a/dev-python/pypy3/Manifest
+++ b/dev-python/pypy3/Manifest
@@ -4,6 +4,6 @@ AUX 7.0.0-gentoo-path.patch 1880 BLAKE2B 060cdfaea2c4b0e607b7f9548a161e0df8d741d
 AUX 7.0.0_all_distutils_cxx.patch 16381 BLAKE2B 776394aa16d35563d56677ed956d107933ce954ae470db55dec44b3f9a054203b93e2d43ae0aee4388b664cb83013a7e67cd787ef8e464dce440ce702624a9d8 SHA512 6fb7b0a0fc9bc552f78460de2ee5867c8a4ca11c4254572ffebae3db92829572091bfe3f46f99c1188a28827bb4ea5bde8b9efbb285cc64608a4f21875d74d14
 AUX python-3.5-distutils-OO-build.patch 3627 BLAKE2B fe4fd23515f0d1cfc236ac3e773b6a70a9b0fbbaff4719c1f1621e21433cfdb1f53b6bf5f348069d7bf03d26bd039f793e4ef2ac4f6271062d83c088ccbab56d SHA512 5e8e4ab7d326386a244df9d0fca5b54e16b5943e35d12ecaf9ea986e79d2d8d8e85585f6286e0fc440dbb7a8c17e2bcf7a11498ff9cc5f523e97d8b353d9a511
 DIST pypy3.6-v7.1.1-src.tar.bz2 23171982 BLAKE2B be43528bc6f3e02d146016a4969bd8c7a9e880a3bd3b77f441aac6d22ef67700f71e0171ec000066bd2c0bd506db64af69d6b75b59a92222dd0353ee70e6629b SHA512 17e78f9c7080d597a6283d8e8247d1ca78f09a14ff221db8c3d90d255b5befc73102b317ca34a80979e544d5ee72f3e5e649f89d185a085f4cc15012da4d0473
-EBUILD pypy3-7.1.1.ebuild 7086 BLAKE2B a185d362ad5041db8492f77d4dfd12aeaa955c2605af0ea63af622033f5aa5c4fe26f163ea90485545fb9f9eee4e14c84f64ece10cc8aa859b839ea9bcbdbe13 SHA512 2ad980acd2913543f7e9dfa83d78a2e266991fcdcfa396258ac7866e594c4622baee2373733d852c4d3af50850895b2856440c618978bfb965c1915a8477cc25
-EBUILD pypy3-9999.ebuild 7136 BLAKE2B 64bf74462e19ed816e362d30bf8e1c3dd75f8a7fcd636cc7980dc46503872c53a63baff10d355159b102ff1d09631672ffc0e30f86d60a1559d6f280bbd7a6e9 SHA512 c63a47bcbfe5f8e42188579b8478ff45231ad7498c0c1ae497b924f387685b99cd04295c022c171f655c44c9698fa61472e553c07fa0bdf3e82566ff0fefa73c
+EBUILD pypy3-7.1.1.ebuild 7530 BLAKE2B 7cce55beece09dff0a3a8c8c985de1044af979d16e33fa000a80e786cccd2e07bfcba6ce1327e302d84e577cb56a001f3b88ceb4d17d8ca2cf4f4cd5f8ef8226 SHA512 04e8fa8450614bba800f310a6480c856335391580580df357fe40ae72fe5c5384fb1d1fc311c63bb61f9c5990c49b3e7cbe4a8a6a41fdd66d8ff611246d8989e
+EBUILD pypy3-9999.ebuild 7580 BLAKE2B 25c1e8ce02965e73b3f2cb57fd67c7be6d11905f17c648ebb4b025f6916bcbea737d38a9bffed535cfae615e6e7fd3b20272e95de1f4dc5d27009be30737450b SHA512 3c0851723c8bd47dce3cfdece5373e36d7b3d80420a7fc078ebd3690750b6b72eb10295d3a255cdb189c6ba62152c1d517dc41aa79a620f8c07da430c8376dff
 MISC metadata.xml 636 BLAKE2B da5771ec2ee59ac934959f6e72c5aee2225ee2d88e2c4c5d6acfae95b9652c973160ed0ea29f0f6143d25a249944925ef157693979871863c04a483da972bd7e SHA512 c52d59231928b12da09c2c7149afbb852ceaf1342a2747d85493c9abc15b8d68fd24495349e583aee5cea18799bd4dada3943bc523a4e18745e2036446cd0841
diff --git a/dev-python/pypy3/pypy3-7.1.1.ebuild b/dev-python/pypy3/pypy3-7.1.1.ebuild
index f0f7cdf74a2a..344f0da4013e 100644
--- a/dev-python/pypy3/pypy3-7.1.1.ebuild
+++ b/dev-python/pypy3/pypy3-7.1.1.ebuild
@@ -17,7 +17,8 @@ LICENSE="MIT"
 # pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
 SLOT="0/71-py36"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 gdbm +jit libressl low-memory ncurses sandbox sqlite tk"
+IUSE="bzip2 cpu_flags_x86_sse2 gdbm +jit libressl low-memory ncurses
+	sandbox sqlite tk"
 
 RDEPEND=">=sys-libs/zlib-1.1.3:0=
 	virtual/libffi:0=
@@ -103,12 +104,32 @@ src_prepare() {
 src_configure() {
 	tc-export CC
 
+	local jit_backend
+	if use jit; then
+		jit_backend='--jit-backend='
+
+		# We only need the explicit sse2 switch for x86.
+		# On other arches we can rely on autodetection which uses
+		# compiler macros. Plus, --jit-backend= doesn't accept all
+		# the modern values...
+
+		if use x86; then
+			if use cpu_flags_x86_sse2; then
+				jit_backend+=x86
+			else
+				jit_backend+=x86-without-sse2
+			fi
+		else
+			jit_backend+=auto
+		fi
+	fi
+
 	local args=(
 		--shared
 		$(usex jit -Ojit -O2)
 		$(usex sandbox --sandbox '')
 
-		--jit-backend=auto
+		${jit_backend}
 
 		pypy/goal/targetpypystandalone
 	)
diff --git a/dev-python/pypy3/pypy3-9999.ebuild b/dev-python/pypy3/pypy3-9999.ebuild
index ca7aae03fe83..d6e6b0856eab 100644
--- a/dev-python/pypy3/pypy3-9999.ebuild
+++ b/dev-python/pypy3/pypy3-9999.ebuild
@@ -20,7 +20,8 @@ LICENSE="MIT"
 # pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
 SLOT="0/71-py36"
 KEYWORDS=""
-IUSE="bzip2 gdbm +jit libressl low-memory ncurses sandbox sqlite tk"
+IUSE="bzip2 cpu_flags_x86_sse2 gdbm +jit libressl low-memory ncurses
+	sandbox sqlite tk"
 
 RDEPEND=">=sys-libs/zlib-1.1.3:0=
 	virtual/libffi:0=
@@ -111,12 +112,32 @@ src_prepare() {
 src_configure() {
 	tc-export CC
 
+	local jit_backend
+	if use jit; then
+		jit_backend='--jit-backend='
+
+		# We only need the explicit sse2 switch for x86.
+		# On other arches we can rely on autodetection which uses
+		# compiler macros. Plus, --jit-backend= doesn't accept all
+		# the modern values...
+
+		if use x86; then
+			if use cpu_flags_x86_sse2; then
+				jit_backend+=x86
+			else
+				jit_backend+=x86-without-sse2
+			fi
+		else
+			jit_backend+=auto
+		fi
+	fi
+
 	local args=(
 		--shared
 		$(usex jit -Ojit -O2)
 		$(usex sandbox --sandbox '')
 
-		--jit-backend=auto
+		${jit_backend}
 
 		pypy/goal/targetpypystandalone
 	)
diff --git a/dev-python/pysmi/Manifest b/dev-python/pysmi/Manifest
index 7e2b825fcc24..7edf8a495bc2 100644
--- a/dev-python/pysmi/Manifest
+++ b/dev-python/pysmi/Manifest
@@ -1,5 +1,7 @@
 DIST pysmi-0.1.3.tar.gz 78325 BLAKE2B 8f82d86e096a47944eccbd4b7ef846f3d9ca155f3f6e0790eecad88cf872c20a725a4071c8c2b9295fc348fa20efbd41ae7d0479cbd4ffe054e9956a6b6784f1 SHA512 d321fbbc68e4b6b2b18de5c1215dc450ad2ba2ea6c70cbeee9d981d2e2106b59582eae42b09da72bc02af789f7f58a6fc97712869b74f0137d8f7fd7238b2211
 DIST pysmi-0.3.1.tar.gz 93003 BLAKE2B 91fa382aa693d8849299baf27a2fe10116441cc0661aa553321d9b5584e64751df547172f185e207a7eb0c6438ded60a0acef5aa51263cc1f29219dd8cdef2fc SHA512 b7ffff85689a1f99c53fdfecaed3d9dc1b5c3685388695e715cde9b42eb8511aac8a47b04dcce243c0fb09a4823a799d80a0033ed576637356b991c71bc660c8
+DIST pysmi-0.3.4.tar.gz 93985 BLAKE2B 71b0ed936c196381f895b4f56e8e2e328ac274b08801a77b404b964201e00f8da2cbce2719414da358a4feb7992a3d04e732942f6e7006a0cceea4496f96b758 SHA512 720c8948a590130583d6ea388f0ade5d3bfe9e845821add7ffbf1b5495b5fe00b768ffb94f67b82465c6d86234f5306c6e1a5c2e49f4825bb9c31a0df629f7bd
 EBUILD pysmi-0.1.3.ebuild 432 BLAKE2B 717d2c04b44830cf575822a0b6caf64c6e5b853278f1b4498e5a8f6b28b0832584aedd6f714dadca6db45e51339699f5a8d0f743220926314812335ebd338b19 SHA512 005989f276862b8f2326dc8046f16c41773115f5d9995f4d70af98068dec8ed9f3908eefa5689bf2923a3bca95c497f0e38e02b63dc27446e4d28be9672babc8
 EBUILD pysmi-0.3.1.ebuild 434 BLAKE2B 4fbcbed85f1a540e0ec7d8bf61124bba7db339d0e254bec6c26ef5a2dbea5daeb0e273267415fcc4dd6078c09df5749d74263aac11548c9b688c52296939ff59 SHA512 d47ce7b8ccb6f0ac1f0c78f67aef400af6e68aa9f5da0aa51d88e14cd66e6cacb5a192054039f836ac8de780dd7a96fbfab8c2f862607a074a4a5fbeffa7947c
+EBUILD pysmi-0.3.4.ebuild 438 BLAKE2B c714947fa8265b16687feac379f560979856078b61ec37fe1d99b6cb3a2dd7ae9f83b2b36ea715de6171e8764f6476e74148d6996872b4b7c9219aecfd8df0ab SHA512 1f1a45389cc118af05ab2cdba64b155ac9492fd8498bf4b607dcc69f621d37d2c7a63500749f8278d03adede7698bc797baa1279df2333fd9c8bb048e25e378e
 MISC metadata.xml 358 BLAKE2B c89fc0ed9212d67a3ac2992ec231ee3a26c473e19e317ab3c0bb1002212838299a55ec6db99950d852c6760941e5c698f04db2213544ce9089303519a38e8c79 SHA512 f7a17e837c410ac604a0e1b4493c7219846a8c8cbcd5b4fb84ffc401b98c8eeacba4731dabad6f61bf1e4f172157c174d6a039725174e2f58b9dfbb89998635d
diff --git a/dev-python/pysmi/pysmi-0.3.4.ebuild b/dev-python/pysmi/pysmi-0.3.4.ebuild
new file mode 100644
index 000000000000..273421218aad
--- /dev/null
+++ b/dev-python/pysmi/pysmi-0.3.4.ebuild
@@ -0,0 +1,18 @@
+# Copyright 2017-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 Lex & Yacc"
+HOMEPAGE="https://github.com/etingof/pysmi"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+RDEPEND="dev-python/ply[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/dev-python/pysnmp/Manifest b/dev-python/pysnmp/Manifest
index 8cd6a40d2ffd..ceefa89d4e2c 100644
--- a/dev-python/pysnmp/Manifest
+++ b/dev-python/pysnmp/Manifest
@@ -1,8 +1,8 @@
+DIST pysnmp-4.4.10.tar.gz 438845 BLAKE2B 2ad444212d202a3e788b1cd2e4e95931ef59e758923ede9b99fe511fac9cd31b8ad02ebbd61fd2df4dec0b9f95eded2753465929aba3b070ca614353eae466d4 SHA512 ed7d705dda376bbf31366653566f1f85ffd71a8253e573ad197a8a073a60ec4fac356b28daf97ff1310121ea3a6b2fee17c843c6ca90d664916fd9095a462207
+DIST pysnmp-4.4.11.tar.gz 441657 BLAKE2B 2a1f14f9205ce34bdbd5cc22e1875e00aa8f34f0a3327aad37d920e3b0c2e4b5c2f0e877b23cf59ec65f803020bcfae0c7162666baa7621be19042506fdbfd26 SHA512 0f61ad0c095398b4b511c854ea7156aae78495f299457b14f4d3b50833670ec77c905e9cf4bdc30c21dd3c3e62d1c3473d7895f0352140af6345b18c1db3e7d8
 DIST pysnmp-4.4.4.tar.gz 436318 BLAKE2B 6e6616a79fc15d457b8da2e2260c65d9d8ef29888c033d80f2f47c8de035d0cff73dc4be1eeced8ef36dac1301b7da0d845837b780815792f545b6ad18d5496e SHA512 960ac73b7356bb236d3853432c094d3aa86a343f5e211065689e6c784293748ec6f2c1c17bf9d96b4cbe2d9d476ebbacbaff4bed7d86370e5ef61e6f03ba8c0e
-DIST pysnmp-4.4.8.tar.gz 435494 BLAKE2B 801d52660af23f9db9fd6e4fbd7b93f06db65d1c4987d44239da0927a116559ba502f295a5ba345529f15a41971a0f407b60266ef0cbcb328476e7e58e3646e0 SHA512 a4b0954a65818e49ce76455ef48c7c363bbc69031b699b303e8e301e7aa5db10ac5042557cc1727e885b200672ba35aef995baadb989cd95aa90e528c7e97e04
-DIST pysnmp-4.4.9.tar.gz 436017 BLAKE2B 4fa4d1cab4e783542164d8bc5313e2b900cad9fec42e3bd6bc37239514d279d849ee857b3c9c01021750773e02ce951da600f5fbf8676efe31c3bdf580b99f12 SHA512 0832abb4134b77d43f6c750ce6c797c976b5fb99ef02602e7aa6034e4524e229eb33ac5d5b086acfb5740893120eb5b17df648dda48decc5d038476270e5fe1e
+EBUILD pysnmp-4.4.10-r1.ebuild 1245 BLAKE2B 0de7581ca20c9c82557cd9c0f155caa3e895fe30e99f463344b81562d06e61d492687b25b740c6e8d91ca8299f11e70208b55d1dbbc3c4cc70a8d2abfd76df7b SHA512 89b3b7fc27ba358efb326be3eb3bee8baf520e87b9306d418a21c8809abdc974ab6556a8cf8c3cc84e247ab39782a963a0ff39520b43a39f4e2c9b1934c79410
+EBUILD pysnmp-4.4.11.ebuild 1245 BLAKE2B 0de7581ca20c9c82557cd9c0f155caa3e895fe30e99f463344b81562d06e61d492687b25b740c6e8d91ca8299f11e70208b55d1dbbc3c4cc70a8d2abfd76df7b SHA512 89b3b7fc27ba358efb326be3eb3bee8baf520e87b9306d418a21c8809abdc974ab6556a8cf8c3cc84e247ab39782a963a0ff39520b43a39f4e2c9b1934c79410
 EBUILD pysnmp-4.4.4.ebuild 1240 BLAKE2B be85d4a952824ba075966ff6ed9e14fc20f8cae7e4b43b19c39cf756d691a549ec4c6592df9fa0a45be3b4eca21b884864e3e5292cea6f18413649c29c713728 SHA512 77abb8f8f35d93ee049533ba6a99726dcef9fc1581618bc8e2809bac1a0b192ee850f3e0cef4cf2583c5fae579bc155818083206d286d3639c6033b445301992
-EBUILD pysnmp-4.4.8.ebuild 1243 BLAKE2B 01f53652eed3e7f566dfbef9c4b7c00890cf2d7014724fadb92dbf57d51bc349879425097bfdd66f4c22283c77d366789e3b8190eed880408297bcc6b4654cb0 SHA512 19781544f3aa9b447ecf5e4ba7792acd40132221ce44c513da584f08ad43da5f8920b3a080e445e793bfb5c5c469e6553cb56d067dadf59907125969ed7d29de
-EBUILD pysnmp-4.4.9.ebuild 1243 BLAKE2B 01f53652eed3e7f566dfbef9c4b7c00890cf2d7014724fadb92dbf57d51bc349879425097bfdd66f4c22283c77d366789e3b8190eed880408297bcc6b4654cb0 SHA512 19781544f3aa9b447ecf5e4ba7792acd40132221ce44c513da584f08ad43da5f8920b3a080e445e793bfb5c5c469e6553cb56d067dadf59907125969ed7d29de
-EBUILD pysnmp-999999.ebuild 1248 BLAKE2B 1623a6f1435b4783840c46107ecdad0ce578702e2702bcafada3cf1fb641fe47ba03c2d8d9ca20932da35317fab7be696a99d087f45a20d8be553694851b690b SHA512 f2e7a4b501f8ed65ca053e83ac37236f0a371e273292c0bccfc75eec6a20d99f6c6beedfe9b24d16cef175959473458b9f81b65baa5d30832262f2cb6d8a8222
+EBUILD pysnmp-999999.ebuild 1250 BLAKE2B ce639aeb9e716e36df068d4de8cd82bb80cfe51a1a2db4e42431553984e487a887ba445685ccde88125ec39cab3afbcbd03c56acd6f264c57609a3f361e953b5 SHA512 81f2955f89550c96004cec610943b20f82bb8b29ef03e3d81f38c73f10b4b96e085c77988ce9dbb00c9e162093a2cff31095b2285afa94f21917c9923f5d2340
 MISC metadata.xml 1567 BLAKE2B bb80fc30033d338354e1b5539aa5afbb23df2ef574a55709f62ef399a67fa7d659fbbad4d3a10120d0a7cf2247e6637127c115deb3741421a73f3222b769d632 SHA512 3ec28aa833cf162493be384e095a4aa440dc9fb19941b5c503d81d1bff83428d5aa8af80dfa24c88055c573c09529c12e3fd4962dba3d171ea8d2e87a7bb7822
diff --git a/dev-python/pysnmp/pysnmp-4.4.9.ebuild b/dev-python/pysnmp/pysnmp-4.4.10-r1.ebuild
index 4d92b68253c5..842fff13fa28 100644
--- a/dev-python/pysnmp/pysnmp-4.4.9.ebuild
+++ b/dev-python/pysnmp/pysnmp-4.4.10-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
 inherit distutils-r1
 
 DESCRIPTION="Python SNMP library"
diff --git a/dev-python/pysnmp/pysnmp-4.4.8.ebuild b/dev-python/pysnmp/pysnmp-4.4.11.ebuild
index 4d92b68253c5..842fff13fa28 100644
--- a/dev-python/pysnmp/pysnmp-4.4.8.ebuild
+++ b/dev-python/pysnmp/pysnmp-4.4.11.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
 inherit distutils-r1
 
 DESCRIPTION="Python SNMP library"
diff --git a/dev-python/pysnmp/pysnmp-999999.ebuild b/dev-python/pysnmp/pysnmp-999999.ebuild
index e8f0a0b95e67..1103f7a03491 100644
--- a/dev-python/pysnmp/pysnmp-999999.ebuild
+++ b/dev-python/pysnmp/pysnmp-999999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
 inherit distutils-r1 git-r3
 
 DESCRIPTION="Python SNMP library"
diff --git a/dev-python/pysolr/Manifest b/dev-python/pysolr/Manifest
index 2f3f6b668373..67e6109dac47 100644
--- a/dev-python/pysolr/Manifest
+++ b/dev-python/pysolr/Manifest
@@ -1,5 +1,8 @@
 DIST pysolr-3.3.2.tar.gz 14193 BLAKE2B 855adfa730a05facdd1a0aab529f7e52a3c052c2b558195616267704691bf91b3b70a123604063c1b818574046cd6d412affc0fe1dc5d43890ea2ca52d8a41e6 SHA512 7252efc42987bdf999d122404e63e6410d2efe7b1a49d378c8ad16c9171d8f26cd5ecd891a8a9daa205333b914ec4f95af105fe1bee25312aa05bb884811aebb
 DIST pysolr-3.6.0.tar.gz 28485 BLAKE2B 3994f1586a16ab8a65013d7412c71581448f15356db077f39b87ba780606d508702e0650b9165b96d2bb2064ba4c03d9dd715bcf1f8e802a18bc19ab3aea69f6 SHA512 15d2599bdfe5b364d0c0497f3125945c8a14a61baca6d32bb775d32fac8a8c2bb9ae46e90e4a08ba144e5f6cc83efba7e456ff7ff617c9af34116432bafbac36
+DIST pysolr-3.8.1.tar.gz 46775 BLAKE2B 978869ec1e65699f61c2c33ebe1448c020aec0dee8e65780727a455e25058be6bb0ab7b5d44559d361df09cf338c0dd8b8db164273dc77da2348b6f5118b9c87 SHA512 34489f32cdcbcb7e8109d6d94339fcb200b1367a188a0b9fedf587a77cd64412570b3a796a4da4e0abe6fa3e443a401c4dc0e4946bdc437dd810fee7eabd54a4
+DIST solr-4.10.4.tgz 150059757 BLAKE2B e0f74016b6a92b4c10538ce816b566c17dbf0f7e68a7f1209bb477a2dcf06153da86bbb86d6ceeabda93d79a8c0595e4c96d873fdca8f0baee5fd58890c84da1 SHA512 f7a83504e0f9a4c81b0acafdf452c0c05fcbdf185375f383450bef4fd478812b5259705b55203460d03da46add12cec2442d399ad3716e4e11c393a9a9a01b03
 EBUILD pysolr-3.3.2.ebuild 562 BLAKE2B caf5672ce09bc449b501cac6a2497a6c842e58a641993d1f5e55c8ac5bd3b5f7b7160bb720bd60b556e492426fedd87f7412ad4e99bb9240548037a87f469ba3 SHA512 55640e69896c1c2cf23700601f044b9ac16c78694cdc32d6645ed4ce205591594fa1d3ba24a888de4078241dd031480e73c61a90293e69c704f7c20ad6f7cf0d
 EBUILD pysolr-3.6.0.ebuild 561 BLAKE2B e8f8b0cea1a2049603f247456d78ff8d5110d3b551ffb2ad75cb4457e87cdbdd99672077dfcefe56cbd53b42262171942ff898c686d577653d00e805e340b559 SHA512 2403e3271358ddf14dfad595e5176194934e30c3fb43bf950ddbaef49e203a0e845481a369194d2fba967f467b29b5d513802944db46603be477286cac74e148
+EBUILD pysolr-3.8.1.ebuild 1386 BLAKE2B 5b3e4494e0fcd481ea4fd4cbcdfee2fb84ac7f0c6d3dca748c5a2f04d1a4bc4e91734171f393dcd8b12fa2baefefa3e2d936ac60d1ab9ccaf7b863679f59e754 SHA512 36e84410e7b7dad5973ce1de1ccbe61754dc405cbedbb25beb8f280587c81a7359ecaa69a84f39e5650487fa8d5ca72cb1faf40cf8206de103e898d2b1ac6686
 MISC metadata.xml 379 BLAKE2B 131131e4eb19987a2344df67b337646ab5102ad822757b77a5531a1111385ea9bfdc7e84b5f3e732c6f9f42763671628421b4ffaf4ea89d52234a294797168c4 SHA512 862fbb61da30df5733458c4a7267a3973bb7763d83ac7b817c42c7edef7dcaea6b1235de8df382c0ae6870ffb330b990b874b6dc169d4407da172959082e6491
diff --git a/dev-python/pysolr/pysolr-3.8.1.ebuild b/dev-python/pysolr/pysolr-3.8.1.ebuild
new file mode 100644
index 000000000000..6f727c05e826
--- /dev/null
+++ b/dev-python/pysolr/pysolr-3.8.1.ebuild
@@ -0,0 +1,59 @@
+# 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} )
+
+inherit distutils-r1
+
+SOLR_PV=4.10.4
+DESCRIPTION="Lightweight python wrapper for Apache Solr"
+HOMEPAGE="https://pypi.org/project/pysolr/ https://github.com/toastdriven/pysolr/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	test? ( https://archive.apache.org/dist/lucene/solr/${SOLR_PV}/solr-${SOLR_PV}.tgz )"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/requests[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/kazoo[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		net-misc/curl
+		virtual/jre:*
+		$(python_gen_cond_dep '
+				dev-python/faulthandler[${PYTHON_USEDEP}]
+				dev-python/mock[${PYTHON_USEDEP}]
+			' -2)
+	)"
+
+src_unpack() {
+	unpack "${P}.tar.gz"
+}
+
+src_prepare() {
+	# utf8 breaks py2.7 for us
+	sed -i -e 's/…/.../' run-tests.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_configure_all() {
+	if use test; then
+		mkdir -p "${HOME}/download-cache" || die
+		cp "${DISTDIR}/solr-${SOLR_PV}.tgz" "${HOME}/download-cache" || die
+	fi
+}
+
+python_test() {
+	"${EPYTHON}" run-tests.py -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/pytest-datafiles/Manifest b/dev-python/pytest-datafiles/Manifest
index 511229b35a69..4807c953f4cc 100644
--- a/dev-python/pytest-datafiles/Manifest
+++ b/dev-python/pytest-datafiles/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-datafiles-2.0.tar.gz 66507 BLAKE2B 7cd2721ae2e447798afe54f858d697321a1bf88f3c307df14186bc71b7a60bdc9fcb2e99a858186ad058c4663eae8b121a5ffa3427e2ab4f76f4b471dcc36234 SHA512 05bb93e973cde8b6030ff4d82f295bdb54a8d0bcec87f0347347baed80c26851a4ea6980621f43d73b7fb843740d58b32aca37de9607117b664ede8928aaa5b6
 EBUILD pytest-datafiles-2.0.ebuild 757 BLAKE2B 0fbf3e300e767e47e319d8b8c7079f05726e28cd4ed1649f8a00536c40cd9a1cd627a47edb438b8f1d420db48d4d32797f0e38ee4039da8a945581fa4a60b99a SHA512 82e665417905227efa420212f43ff0936e4605b25fd7ec74a877122562f456cd40b961236623c1354b1b24b68c8ac5bd98b285d6cccc82029f463ad8ae63eefd
-MISC metadata.xml 396 BLAKE2B 21c4b5d6ad84afc68be054bab12d925572a823fc9f01a02c9736d898ac99071fcaa382ec441e69fe6e332ad6e9614fb51225c4c82ef075d9d52f137fbb3dab39 SHA512 765562303886dfb3732e1df66d9873061014228b9c486a6ea87b6b02dfba839cf13887a359780e211683f2b86fb8d10900bc1a87c47128754aae65784d5b18ad
+MISC metadata.xml 395 BLAKE2B be89156950d62b7a070f0da1f804761f17e108eb07156385262b6c6db6e22f739600910ce3b464dd5abbf6e356c68f606210f78039db5c9508d270cc5fc7ea81 SHA512 0d2214166e6347a79c0f202b1ac3580b12eff1243869b772df988cb1c985d1cfc73975f5b7b6bed7ca32a71a03a771cd03af1002c212d4091e53b2fd1e0fc0bc
diff --git a/dev-python/pytest-datafiles/metadata.xml b/dev-python/pytest-datafiles/metadata.xml
index d72f80cdae98..dd553590ca15 100644
--- a/dev-python/pytest-datafiles/metadata.xml
+++ b/dev-python/pytest-datafiles/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
+	<maintainer type="person">
 		<email>gyakovlev@gentoo.org</email>
 		<name>Georgy Yakovlev</name>
 	</maintainer>
diff --git a/dev-python/python-caja/Manifest b/dev-python/python-caja/Manifest
index ea27f8168b26..8256df31d9ec 100644
--- a/dev-python/python-caja/Manifest
+++ b/dev-python/python-caja/Manifest
@@ -1,3 +1,3 @@
 DIST python-caja-1.22.0.tar.xz 288324 BLAKE2B 11649dc0d201e9bc0063ad8845ccf0ac7b474e87edce1938311723687253c73058f2411170897acf80e4166169ad2675afff171c31808b22269dcdf857954fa1 SHA512 36ac6feec8dbff345d5657d0bc9eceed7a58648c104ce309f20aaff18cedd8822fb8bc0c13662796d15391af72285fa3ae4185043cce9e471f22a2868f37cc2c
-EBUILD python-caja-1.22.0-r1.ebuild 999 BLAKE2B caa4ee4dd9219f17c0d0f3436d78ed62cdf0e077a991e9121b2fb3b184f47a6f4030d92cb94bf283901f8554d9e301858952724fb4b0cc1a0d4f47bde84d0e30 SHA512 be23cd7bf71fd21e8003fdeb27d12b39677032bbd858619b8aac8a1a2227b022c6f1577f007733058f3cbcfad1e456133e925fd4151e379dba9e47499a3cd91b
+EBUILD python-caja-1.22.0-r1.ebuild 1034 BLAKE2B 4ee1a90297ba6a3e91509156facb38cf484cb77d8bc0ca1b112943152595998d0c6d3ab6a06957d50e9584ca34127178348e06e958d55dbbd658ab917a7accd0 SHA512 78132bde6e4d385e4b9a1ac8ad935ebf34af6b85ecb8e04391a3cecbcb20306b175f61d267d0344c4a7de15fdd6a1496646c3ac66c556a8fb561a16395392a94
 MISC metadata.xml 340 BLAKE2B 38e2ec7c21175122fe4d2439ef5b70277caef629d7275055ae44146db7d9def0c2af3f4d190a7a4ac426ff6fe19f9cf5a707abf71dd1fab85ec79e5d81e1f075 SHA512 5892ee1cdadbfd6a93d5bea5a6232ce8351373df7a6037ed605a8d66c3367fb7afb39e1b4b31052a599cb1e7ea155ae818e9f8225c7992a21443131e98621b33
diff --git a/dev-python/python-caja/python-caja-1.22.0-r1.ebuild b/dev-python/python-caja/python-caja-1.22.0-r1.ebuild
index 079f91676488..c0338e9ae4e9 100644
--- a/dev-python/python-caja/python-caja-1.22.0-r1.ebuild
+++ b/dev-python/python-caja/python-caja-1.22.0-r1.ebuild
@@ -15,8 +15,8 @@ fi
 DESCRIPTION="Python bindings for the Caja file manager"
 LICENSE="GPL-2"
 SLOT="0"
-
 IUSE="doc"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
 COMMON_DEPEND="${PYTHON_DEPS}
 	>=dev-libs/glib-2.50:2
diff --git a/dev-python/python-cinderclient/Manifest b/dev-python/python-cinderclient/Manifest
index a24470299dee..cbb418cfaf3a 100644
--- a/dev-python/python-cinderclient/Manifest
+++ b/dev-python/python-cinderclient/Manifest
@@ -1,7 +1,5 @@
 DIST python-cinderclient-4.1.0.tar.gz 288464 BLAKE2B 492baefef164e74eca662cbde31b77ae751730420782b9926d265548d064cef08e993279482c566f1c810a62f6cda657e59680d511e5633a7c17be8dbc6fe7c1 SHA512 e895e90dd12802c5991bd05c825b712b30bded38a5dd0dc8d845949cc7e76440959a426cb680447496cccdbb0d5aa31f3b982838a91c7b36e8e31bbaa3fb7b7a
-DIST python-cinderclient-4.2.0.tar.gz 284743 BLAKE2B 2306cbc80cf47086aa0dd545f73adc54cbc6fe162f972f2c5d610f26ecccbd38b0b6f028b8e1a548b63d6dcdd32b26bf3dfdcd8e9e360db0325b024e3bbe7bb0 SHA512 d61a10719fbcffd6562c9b7802ac26e317878f52f5db8a704ef57c8ed9b883eaa3a961c2f29df5746befb82b1a29714fa75082df2deebc305115e103e49eee91
 DIST python-cinderclient-4.2.1.tar.gz 287696 BLAKE2B b79068acfeafd9e8ab85035fcda1cceaacc68d3a847b4d070fcb16efdf103ad362c21196afc0ea23eba6a9110f5e96d8de8e2446889740c9abccd912a972358d SHA512 e72af1163bbd882354aea3b7ecdc36cad0899589430e31006f9b1f5f1d00866c9c0de631d2a94b83b3dc358039069adefef54231ecb191ad167339ca3a37a588
 EBUILD python-cinderclient-4.1.0.ebuild 1117 BLAKE2B 94787b748dacc36053a90285b42b3a7f3b2c09f7f71d931eb8015dd99db406bf025a9d29141096cdaa8929eba55fafb724989ba948a83ae5fd243948952a67a3 SHA512 edce03675cbf2266dc7ea7136d5951a469b1c0ecfe651fef4b8eba7df96203abe190fa2399fb5c9ef07505e87e14b6591c69ab0f6f00bbf81d962b333496cc60
-EBUILD python-cinderclient-4.2.0.ebuild 1117 BLAKE2B 94787b748dacc36053a90285b42b3a7f3b2c09f7f71d931eb8015dd99db406bf025a9d29141096cdaa8929eba55fafb724989ba948a83ae5fd243948952a67a3 SHA512 edce03675cbf2266dc7ea7136d5951a469b1c0ecfe651fef4b8eba7df96203abe190fa2399fb5c9ef07505e87e14b6591c69ab0f6f00bbf81d962b333496cc60
-EBUILD python-cinderclient-4.2.1.ebuild 1119 BLAKE2B 09eff65811760148a77bd871ab289e8d37bffa8d0e975f280463619d25ac9a4ad9f1b9ba804f0b6be4beb2ecb90c5c9362c64439f6431ac460789c6d3bdfcd2d SHA512 4a8c307edac5c09623c4db0f6e32c980a8120ca1221f4a5ae035a1d45bf25482b74a3895c46a4cbbfa61693a804935a0ceb584947dee3c82b5392a2d31cfcec3
+EBUILD python-cinderclient-4.2.1.ebuild 1117 BLAKE2B 94787b748dacc36053a90285b42b3a7f3b2c09f7f71d931eb8015dd99db406bf025a9d29141096cdaa8929eba55fafb724989ba948a83ae5fd243948952a67a3 SHA512 edce03675cbf2266dc7ea7136d5951a469b1c0ecfe651fef4b8eba7df96203abe190fa2399fb5c9ef07505e87e14b6591c69ab0f6f00bbf81d962b333496cc60
 MISC metadata.xml 625 BLAKE2B a9011769fe7ab23b5b00cdfe6e209e92186abffd4a32e6b21e2741ea8b58848b3aee384d301c3bfeeaaea3632becc5db22afcd8d6b149d17db34198a89e86ca6 SHA512 397ec06d3fb289940f654600dd452f5450ab6a87b4584f5486196a5467b7b5b9251c241c28b92a17b92da9d0a094b1a4d4ec303fe8eb3087c50a560f423bf92a
diff --git a/dev-python/python-cinderclient/python-cinderclient-4.2.0.ebuild b/dev-python/python-cinderclient/python-cinderclient-4.2.0.ebuild
deleted file mode 100644
index 0dee45615822..000000000000
--- a/dev-python/python-cinderclient/python-cinderclient-4.2.0.ebuild
+++ /dev/null
@@ -1,37 +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 client for the OpenStack Cinder API"
-HOMEPAGE="https://launchpad.net/python-cinderclient"
-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=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-3.5.1[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]"
-
-src_prepare() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/python-cinderclient/python-cinderclient-4.2.1.ebuild b/dev-python/python-cinderclient/python-cinderclient-4.2.1.ebuild
index c89d38330451..0dee45615822 100644
--- a/dev-python/python-cinderclient/python-cinderclient-4.2.1.ebuild
+++ b/dev-python/python-cinderclient/python-cinderclient-4.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=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-distutils-extra/Manifest b/dev-python/python-distutils-extra/Manifest
index e24d26db8f28..2e93bdec0130 100644
--- a/dev-python/python-distutils-extra/Manifest
+++ b/dev-python/python-distutils-extra/Manifest
@@ -1,5 +1,5 @@
 DIST python-distutils-extra-2.38.tar.gz 27748 BLAKE2B 5f47e27dc639a6259a812bd618d35c4bc0a39362f3b7bf1a2e35331dfbd06b6b16a3030e125a8f5869770324a8df6eb446a5855639ed1b83379297509ea48891 SHA512 bbaea59a8f251f354e6cf3799b67c12225095cc869c7c4e299e719ad7bcfd1292cff99f95ab25f04fb9c3e2432da5ea614ee76154781388c47960fdf2c90a3d7
 DIST python-distutils-extra-2.39.tar.gz 27389 BLAKE2B 06deca885aa283e0a52e38c89f71637573d45d73dfbace5a06b4bbfa04098a7fa4fde1c2891bde5cc5ed3a3a65e31d243feaa8465a4fddb4623435e7a47c902e SHA512 e3b4d1ed22767fb4c6dbbdccef960865b6fda01d18dc38cb8f9357c09c7eabb78466fce053e407a196eca257d07d57c5c1ef47f358a5979c7f22e4b11775124e
 EBUILD python-distutils-extra-2.38.ebuild 1063 BLAKE2B ed1ba60ec0d9a2a4193550c54597a76e7e9d428670c0018e38bc0dd0ebb24ee5918f5d98d210851c74c7021cb01a3ba6b85390c1504faa2b568e154e5c37c206 SHA512 89eaea3dfadb3e385f17dc05eacf7d36f2766114be278e82a43851a1b313bda100b10dcfb03aeab42c59e8dda546ca45f40f47db4b5f1c24fc1838131416d320
-EBUILD python-distutils-extra-2.39.ebuild 1449 BLAKE2B caced1acb4337e76d4efab77f1520c4a76e82a3f5e181dbaacf6850b20926c4a4cf4371f7fd11e666e75c0643468caf515304faf1fa99c0350824c0c075d37e0 SHA512 811d54b6d2f65fccae6414dec902639fc2ba387587ea1c3e8d5f646d78e3a34130edab56080e5d680681df1570fb462c27765c4eb6421173e943f0fd639600e1
+EBUILD python-distutils-extra-2.39.ebuild 1407 BLAKE2B 4e7bca8828cf129a31ea16e0720528ecf4032e16871a7580d72914fcba0512fd5575ba11cfc1680ef9f8b580d10ddff5f28dc7f3b3dadf3bd584a909d238e876 SHA512 f75cb32a2df779dac30d8de71509323933f011cb3e113eb9b5768f32ce085ef1d96d177a1bd641a0001291406586e31ebe993bb5a150578b481277d442ee869c
 MISC metadata.xml 401 BLAKE2B 6ba770986ed5364c9311bbf2a48957c0ec46f3c16e7718b564865b9ca7459f3c64cbcf6ee04c4b66564429e7f6714b0a128f83f2bd0d33f062b3670210d11858 SHA512 0dfe7658fe14d75a542a901de11983e7e0d8663b158032f5b8a71814c4caa93c14b4bc32e422c49a19550544c1b1fd4075be8a6644f0ea780bb23e1adc65b402
diff --git a/dev-python/python-distutils-extra/python-distutils-extra-2.39.ebuild b/dev-python/python-distutils-extra/python-distutils-extra-2.39.ebuild
index 7fe491633964..599aa3fe2e11 100644
--- a/dev-python/python-distutils-extra/python-distutils-extra-2.39.ebuild
+++ b/dev-python/python-distutils-extra/python-distutils-extra-2.39.ebuild
@@ -19,7 +19,6 @@ IUSE="test"
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
 		dev-python/pytest[${PYTHON_USEDEP}]
 	)
 "
@@ -38,7 +37,7 @@ python_test() {
 	# 5 tests fail with disabled byte-compilation (they rely on exact
 	# output from python).
 	# The other 4 are broken.
-	py.test -k "not (test_pot_manual or test_pot_auto_explicit or \
+	pytest -vv -k "not (test_pot_manual or test_pot_auto_explicit or \
 		test_pot_auto or test_modules or test_packages) and not \
 		(test_desktop or test_po or test_policykit or \
 		test_requires_provides)" test/auto.py || \
diff --git a/dev-python/python-efl/Manifest b/dev-python/python-efl/Manifest
index 23ad2045c2d4..924dab022213 100644
--- a/dev-python/python-efl/Manifest
+++ b/dev-python/python-efl/Manifest
@@ -1,5 +1,5 @@
 DIST python-efl-1.21.0.tar.xz 9544352 BLAKE2B b49fc0e0d795a0334f647f414673fdaf3b086eda35f9e2d0e9e6a03d2cde572e6076eeb62c4f977b770a72e8f14d4ae536f46d0510b8753088d80e2dfc98e43f SHA512 23a8487b660e9885a1d43a4835c560edd8d27eeb9aa44f9e1878ac1d1acf9833fc62c14036fe0fe5e0bd1144cb993b0b67bcf42c78db8505ca1b8aad0715350f
 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.21.0.ebuild 1769 BLAKE2B 0e3641a9fccf4f14f6a0739c2b132252c723ee54bf84345a87672d81c2bd8babf6ded15abe305b4c693c3611a52183937fc33928105e19498c07336ef5391757 SHA512 ab58581235bfe3e3135c36b06253d9eda8b440800112d47e1f2103931031a8eafa5e5503cf4980130c47cbdb49d7b45a2ef51f73cc5389041bdeb29bb7b9b7cf
 EBUILD python-efl-1.22.0.ebuild 1638 BLAKE2B 55f150e9de16b83d09867ee015f24db08f78e967efe177d4756df7b1069e4b5a892da0f3ffe1c0becf21671605dde3dffa767ca908451787eef61bd50f709249 SHA512 0f6214cfd4a15256c8dc1632fe30569f63bafa0294f9028603b16f2f1a776800cd6d51f7a0ec8f9eeb08231fe5d45a8082fdf63553b70dde2b9a1a202a7af908
 MISC metadata.xml 588 BLAKE2B 0d810c31fac4488f392b8d3b57eb830af3b5ce3c970a9087939e35bc33c58d652ad3a6dd1c42c6b2604334b5c098b81465a1dc92e051e9f5b8cf5a047a190ee8 SHA512 9390fbbc9345bd5e580a8a1208d8f2e727dd0d1d562679b5e7b7c3f7a4010ed6154e1c2f9d93502dee73d96cbe28ed771b921f67e4a4921c635ada8056449de6
diff --git a/dev-python/python-efl/python-efl-1.21.0.ebuild b/dev-python/python-efl/python-efl-1.21.0.ebuild
index dcb74fdea987..7a73f36bef29 100644
--- a/dev-python/python-efl/python-efl-1.21.0.ebuild
+++ b/dev-python/python-efl/python-efl-1.21.0.ebuild
@@ -15,6 +15,8 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="doc test"
 
+RESTRICT="!test? ( test )"
+
 RDEPEND="
 	=dev-libs/efl-1.21*
 	dev-python/dbus-python[${PYTHON_USEDEP}]
diff --git a/dev-python/python-lzo/Manifest b/dev-python/python-lzo/Manifest
index 75f0f4689fed..25e84a0bb2b5 100644
--- a/dev-python/python-lzo/Manifest
+++ b/dev-python/python-lzo/Manifest
@@ -4,5 +4,6 @@ DIST python-lzo-1.11.tar.gz 13823 BLAKE2B 4be60c85aae64e8837f7f8ec332c16f8c86d2e
 DIST python-lzo-1.12.tar.gz 14042 BLAKE2B 7375e9b200a17cc1ad2c4dfdbe6491082af8d120b2b659b1e9bbff00eaae568e04dc12e5c13de3a028267a1e8e02bd1522a9335db73fa6a5a4ebc7ca4b341fff SHA512 811bdb282cfaf33427ad641d0342900c5af1f17b7033d76593288c3846b0feefe6ef93253152add97b2d6420f937de2745c8e7508dadf33e72b11545cac3be4d
 EBUILD python-lzo-1.08-r1.ebuild 622 BLAKE2B 58ad08becc27f5f6bab25a9e4beb590b049ffe0a0a0c35315ba665bbb415a9333e22e315cb6a64b9f0c8daa77e6d73acc225d9f028e14cf72deba7b65dbc7bc4 SHA512 908c281da215817826e0b9b2dbbc3b5b24179c504d0ddf2aa5b7b58a766a023a52f713a84f61a387518323658850b061c29a48babcee461624711b8d17c05fc7
 EBUILD python-lzo-1.11.ebuild 719 BLAKE2B 802d5deea015c1eb4d3315dabcd4e7deac9fc2ec1b12fadb1ef87af8607d7dc549de7a79e07f72ab0aaf0011c64c026f88eb5635c0667ac71ef0292c76024d1d SHA512 cba494e54ffa81ff84a70dec1884681613a8d68beb2610717448fafc131cb4f6d932fb7f51a32b9ad3821074c5e10a5104dc877c0dba16f5ab6d922957a2a22b
+EBUILD python-lzo-1.12-r1.ebuild 729 BLAKE2B 7a41e8baf8f5e9528699d0457f4ef534f8d34fd35409c5eb64134df8b3082197426fb55d9a1ae85ae09a21aac757957c8371b74981ba5c6c511667da056cf28c SHA512 d55ba84de79fbe9876c1d59e835813e9c5f35f332fc01100f9347ecf43c9d0271f8192f0cce89981cf3329bdc20857b4de114dee2916173c9c938adca05be83e
 EBUILD python-lzo-1.12.ebuild 723 BLAKE2B 5dead3e85c9811b73e22195f059e4fa55974c7d9087d9d500b27b66df8895714c60e1fd28ba0f426a8b6fce6d40f36daa3fef64671306b25f893ab8cd403112f SHA512 5cbd8918da48ba5c5408771cdb8c2710e73474f03d2990d90e7a572fb824f9e6c9871e8a9de21162d0dc0b3c5924f955e5317db40795d1bb5e7d080e9b2e01cf
 MISC metadata.xml 385 BLAKE2B 4a726b1896f55aa03b8b9a1a1f39107751f372b7bb7b0b9759447a7d42fcc97c142ea6ea3a2de8358d0bc00cb0e73b12c78c0b03e8c52c93092220761b6eecef SHA512 634d30e62ce3a8c09b3de241642e9ce8b059d9d3ff02e6530642dea4b0b4bcc8f108566bdc5ba52f6e63214546e11f734bdc094ef60ad13197b9f74cab71d03c
diff --git a/dev-python/python-lzo/python-lzo-1.12-r1.ebuild b/dev-python/python-lzo/python-lzo-1.12-r1.ebuild
new file mode 100644
index 000000000000..4da9abd075e7
--- /dev/null
+++ b/dev-python/python-lzo/python-lzo-1.12-r1.ebuild
@@ -0,0 +1,35 @@
+# 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 prefix
+
+DESCRIPTION="Python interface to lzo"
+HOMEPAGE="https://github.com/jd-boyd/python-lzo"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	dev-libs/lzo:2"
+
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+src_prepare() {
+	distutils-r1_src_prepare
+	hprefixify setup.py
+}
+
+python_test() {
+	distutils_install_for_testing
+	PYTHONPATH="${TEST_DIR}"/lib nosetests -v || die "tests failed"
+}
diff --git a/dev-python/python-systemd/Manifest b/dev-python/python-systemd/Manifest
index 41fb4b9e5749..d5931868da3d 100644
--- a/dev-python/python-systemd/Manifest
+++ b/dev-python/python-systemd/Manifest
@@ -2,5 +2,5 @@ AUX 233-xfail-bind.patch 1077 BLAKE2B f2fa3f197887d3a14cd7bd2a8bdd33100eb18f4b34
 DIST python-systemd-233.tar.gz 49680 BLAKE2B 7d612022738d3114a39f7ad7f4d7799ac3d027980592a5205247d4c866ac3d9520d63ee02f143e26865f0d83338f30422dd0c2299f575e8b03f3112900e9af73 SHA512 92a6cc7123db586e5ae5fbb56e5065b17be9da47ced9dbc5920d80b7db7f56d15b127e72d30889c5b24b119724a33f68be1ef322529620ed95b0f95707e4c2ab
 DIST python-systemd-234.tar.gz 53900 BLAKE2B 2658ee7083036ed8259e5f4ad0714ea15227ee836ad34c7fbbdb55dd9df48751b8d9998350d789b4f47e78fe7b4a7134e12d637e5a6ebeb29a0b31e5a4575d91 SHA512 164e34ba46827711e9c6ff9ed58b2706d9a22abfc7001de030ed7d463d8ddf783eb5fee93b207c29950a3c566018cc3f1a21a549421cf3e05c1287b433367eb2
 EBUILD python-systemd-233.ebuild 821 BLAKE2B 24faf5079019f64fff7e9c110254b7c8fde43869213ccdfdec26feea99c9d817250b8a0210d1fc31b30595b888183d7c5fa6927fa54f2130d4925f468452a90f SHA512 4322e83de8f7af7dd2a68112680f79601c9f6d0fbbb969964f9159961d23bc0b5321ccd38af7de1628bf5175f86163a4c1d2281e49d0e3c6bd43aa1c15c1974d
-EBUILD python-systemd-234.ebuild 863 BLAKE2B 6b4b008287fc4e16b9786500a447750b73568f9752f3444abf8341dc096ecb53a54bb9110cd715917367c1d916b687962ac5a1a951a0a8ed4f241b575e8f995c SHA512 bcf001df1ef785d13b1d72019c1c7f6015bcff3ff48aa21376d38da3f3371971c0d4f1ac3065e4c8b76a00e46feea449bf2e66a479de907a8f1bd06de53fe2d2
+EBUILD python-systemd-234.ebuild 985 BLAKE2B c27d8ca44e2b41e5acc444f293d901f8531bd6a2301a152acf3b292aff491d3f8ee91cad47ecc60fdda9e27720969a8cc203ed772c513f1279168e995bdf3cbf SHA512 003e81a52a91e4d2a7d300076f5a0dba879363d50246ef43279b21201fae96c7520d7936a5a82359aaf1bcd551d322711db5e7318114e06530201544dbac2ab2
 MISC metadata.xml 306 BLAKE2B 2e77cf6814775cb575c96548a69609034e4d9db62eba44684df463c98fe1b105ae5caffea7e1d05880ad2d8236405b2848fa24bd245e3a8627578d2cb128b055 SHA512 ca004982cde4fe1bcbd821109ec70f464a2014a2c0aa77f9976eedaec78ad68dc8d39e2e2f7023192bf807307e08259548f1ebb298ea7f3654c0b8658fba97f9
diff --git a/dev-python/python-systemd/python-systemd-234.ebuild b/dev-python/python-systemd/python-systemd-234.ebuild
index 978b842ca4bc..14dc2725969d 100644
--- a/dev-python/python-systemd/python-systemd-234.ebuild
+++ b/dev-python/python-systemd/python-systemd-234.ebuild
@@ -27,9 +27,17 @@ RDEPEND="${COMMON_DEPEND}
 "
 
 PATCHES=(
-#	"${FILESDIR}"/233-xfail-bind.patch
 )
 
+python_compile() {
+	if python_is_python3; then
+		# https://bugs.gentoo.org/690316
+		distutils-r1_python_compile -j1
+	else
+		distutils-r1_python_compile
+	fi
+}
+
 python_test() {
 	pushd "${BUILD_DIR}/lib" > /dev/null || die
 	pytest -o cache_dir="${T}" -vv || die
diff --git a/dev-python/pyusb/Manifest b/dev-python/pyusb/Manifest
index fd1f61685f8a..2508843d5819 100644
--- a/dev-python/pyusb/Manifest
+++ b/dev-python/pyusb/Manifest
@@ -1,3 +1,3 @@
 DIST pyusb-1.0.2.tar.gz 68694 BLAKE2B 8910d9d6d7abd8b0dddf725ad9cc745ce5b06f69a4824a86ed9783918d0fc88d438674852288654964c4555d8278f22d3daab679149c64ea8a6fd3dd2f1cf284 SHA512 6a264b796e17612004196a7a526a7c6df99feac9062f8354540221016411a78a65d413731aea2fc1206ed5ea2b84787078898b9ca3754164f1dfe2a9878b75a5
-EBUILD pyusb-1.0.2.ebuild 816 BLAKE2B ffa88a030255812d9650e7138168096c64fac458a59b25d37be84960935f224abd1ecb204ca74dacaa4f04292dd627021ac2cc406e0e4b4323e93e146c4c2810 SHA512 0dc689e9594d924364eb1153f55a1c561049dd119ce9b0a817fb88606e58a4b9dd266ab36e188f1086f02d402d5e4e609b3c894d1abe7ef47a09f3911e23536d
+EBUILD pyusb-1.0.2.ebuild 816 BLAKE2B c94e85a5075755a92e5cdc33378ddbb573955decb4fc9cc99be7749a37fb60149032828f6019c18ecacc0e0edd54df2e0c57d6ba9a9215ee161f37aa6d773d4c SHA512 abe1ff09f1031b7a66c346f38712683b98ff529244092494df0f6698b8de8430c31933996025a00a22acaacf8a98bec99b968d8a122a7542e91fb2e82caa6c29
 MISC metadata.xml 472 BLAKE2B bae31bb84443c5d215f931618d90cabbc11633d90a1dea5e29ade93e42671b4bf1cd037f235e9a58059d2571b0e9b32f0261508108bc6678544dc09f3293b8da SHA512 7db6620b2545b31d9dd3c3844f9d02d0403c266a931935ec8e5728bb936ed3ec1f5ec5fd5d7146668e4e17c9f8f1eb31affaaec90dc93e690864b574a7ddbc4c
diff --git a/dev-python/pyusb/pyusb-1.0.2.ebuild b/dev-python/pyusb/pyusb-1.0.2.ebuild
index bad631b70a9b..61879989a8c5 100644
--- a/dev-python/pyusb/pyusb-1.0.2.ebuild
+++ b/dev-python/pyusb/pyusb-1.0.2.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="USB support for Python"
-HOMEPAGE="https://walac.github.io/pyusb/ https://pypi.org/project/pyusb/"
+HOMEPAGE="https://pyusb.github.io/pyusb/ https://pypi.org/project/pyusb/"
 SRC_URI="https://github.com/walac/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 # pypi releases don't include tests
 #SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
diff --git a/dev-python/pywavelets/Manifest b/dev-python/pywavelets/Manifest
index e1659c70776a..7ae81c321145 100644
--- a/dev-python/pywavelets/Manifest
+++ b/dev-python/pywavelets/Manifest
@@ -1,3 +1,4 @@
 DIST PyWavelets-0.5.2.tar.gz 4430706 BLAKE2B 0a96dde04c0d6b58304b2a6a1331036c33bf89be717127df97ea178d638d193b9ce8994d90e34b969a4a6228e7985c943529fb386a3bc938ce61a78925549bf2 SHA512 6685b348009076b39a46e5a480189c34e5bc791ac110f47a52a8dbe0cbed1f3dcb64402174480d525bcf3776d12185ac89fe36c839727a14ffbad1ed835824ad
+EBUILD pywavelets-0.5.2-r1.ebuild 1115 BLAKE2B 4654bf22c66613d89bdd9be14223fe5e912984a0b9d666ecbc97618fd59afe905c123dc02aeacc43ba31ef66a3fa7107f6559663a2d3b02981c5a69dec594619 SHA512 372fbc158d4317663967bc8ccccbc3a25f3cb07f356465ca6f3bf935cbc313121eac0dcd22a9f55ad6743c46537a0589aa4c5c8198416d3532b5d669d2934b89
 EBUILD pywavelets-0.5.2.ebuild 1113 BLAKE2B 8b80c1cbe20f5f688bb740c498f1bb48c84d65d54a029761dd67c6aaa7810603428fd8c5fe73bd9f591e809bdb4570e923916f516296fcf961cf31501ba7bde5 SHA512 3abe8c72b19564ef8353f52978119663ed2388e32b655de294805ab450b25a99054646adb1ea75700ac8820e15119569dab506652390fba84dea947c94102888
 MISC metadata.xml 814 BLAKE2B bf95f588fd50238b95cebc807140d2fd7b346e474375617b4cdff4f763f896754a106cf2ee29854ed98a8a5caf5a93b8007718580db5addfe6d3a23e392d45c6 SHA512 02937ffa5a37a9ca5e9f3b8bcee990bbb84bf4b41f770f3f02cb0a447429d127f2d1337cfd26c936469858ee01c850db33a65798144fa65102940414df5f24e1
diff --git a/dev-python/pywavelets/pywavelets-0.5.2-r1.ebuild b/dev-python/pywavelets/pywavelets-0.5.2-r1.ebuild
new file mode 100644
index 000000000000..4efbea0aa77b
--- /dev/null
+++ b/dev-python/pywavelets/pywavelets-0.5.2-r1.ebuild
@@ -0,0 +1,52 @@
+# 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
+
+MY_PN="${PN/pyw/PyW}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Discrete Wavelet Transforms in Python"
+HOMEPAGE="https://pywavelets.readthedocs.io/en/latest/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples test"
+
+RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/numpydoc[${PYTHON_USEDEP}] )
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${MY_P}"
+
+python_test() {
+	cd "${BUILD_DIR}"/lib || die
+	nosetests -v .
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	distutils-r1_python_install_all
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins -r demo/*
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-python/rencode/Manifest b/dev-python/rencode/Manifest
index b76bfd401085..d3c6f23fcee4 100644
--- a/dev-python/rencode/Manifest
+++ b/dev-python/rencode/Manifest
@@ -1,3 +1,4 @@
 DIST rencode-1.0.5.tar.gz 24530 BLAKE2B c650bf7befd62c8654bd0496f12f15a242a304ab9333bdf258222dd333081bd23715accdabbc55a271e8e869ca96f6aa0b43b335c6758be5b03073ebc05e3bb6 SHA512 809d7070b746fe77419e7b4d2eed274e1e0b3b4f15bcddb466806478a90f89965b0b456443b390cce6d1ca9df409367f336dd659f4481cd442e3cc459bd63c18
+EBUILD rencode-1.0.5-r1.ebuild 502 BLAKE2B b982c234549526716dd32c3de01bea0fa15794332ae2230b30f1be1ab2fa7b55f290e87e397567dff79571db424add0a06bef40d12aa4722b6c7db38e7786943 SHA512 09a8920962fa0a4c671380de1c020491ba43811819093b74b24f51e9bef636f1791041662fd0758ee52213422fa734fa9e8caaea281682fe4adc1ea94003c864
 EBUILD rencode-1.0.5.ebuild 498 BLAKE2B 192edcc6e87e6254e56b7c070f4ccb9d26989a5b3e19ab580bc7471e53fba909a8ea9f999110fa247acd8e9530e36a16610317e5c53503050f3eed94647cafb5 SHA512 00f3ef1b9de559c722885ad8c673045412fd286d81439e47005ba4c0c2369e6ce9c918a76c0bf42ea2adeb64a1cbd6d0323b0901b423ba6bb3a40c1ec431904b
 MISC metadata.xml 666 BLAKE2B e4047d25b3bebfa106936f105ed4fb8ed1c07aaad32b42f5bb2645388028baf30b8fff228fd32737c2716c5273f6872c5290a6e132b850d4640fb1d44e257683 SHA512 026950a9462b1207463f2bf923c40bbe310c63ecf73676f935c9d392fcb7673b4150de82e7654ea0914c0fdbd6b1a110f00e57fc92b931a98a5e9ab032918971
diff --git a/dev-python/rencode/rencode-1.0.5-r1.ebuild b/dev-python/rencode/rencode-1.0.5-r1.ebuild
new file mode 100644
index 000000000000..eb75b5ce5c83
--- /dev/null
+++ b/dev-python/rencode/rencode-1.0.5-r1.ebuild
@@ -0,0 +1,19 @@
+# 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="similar to bencode from the BitTorrent project"
+HOMEPAGE="https://github.com/aresch/rencode"
+SRC_URI="https://github.com/aresch/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=""
+DEPEND="dev-python/cython[${PYTHON_USEDEP}]"
diff --git a/dev-python/scandir/Manifest b/dev-python/scandir/Manifest
index 9f2c37d44fc0..b29f9ae86b7e 100644
--- a/dev-python/scandir/Manifest
+++ b/dev-python/scandir/Manifest
@@ -1,3 +1,4 @@
 DIST scandir-1.10.0.tar.gz 33311 BLAKE2B 47576618c41a477ff7bab9daecf2e4719ed0c497a25fd68b4bacae073fc418f9fc51503812af726d1d124f07cccfb418ae09c196cf7ce283abf5d3bbc36b7e09 SHA512 42a570320018ffff2172ada67002334446c73c53813b36d63558d3854ded2fac0b266fcaf399cf9a735ceba110636b6901683fb26cde1e286ff476bc37e3d335
+EBUILD scandir-1.10.0-r1.ebuild 678 BLAKE2B 7cc0f7deedc34d0dec064fee74038e5e7fac7d62b4d34b34bbbaf84c4c2fcbf2d38472b3630fd329d6dd8f131445c23b0a68f0ff4bdac394f26650c01cde2511 SHA512 4584a3f83f49efcf655b25decedccdc2f689f9f88008344e149c3c235387c8b2f7fc04338dcd0af71b9d9169f22c203c965036b8510014f3a2eee80dd56da10c
 EBUILD scandir-1.10.0.ebuild 661 BLAKE2B 6f8bb77204dcdaf34324adbcbee83af8247d4a140ebe3dfa05783d63f4dd4adaa74e7126bb94eeabfb49ea06f3d442a76a58bd2e88f9f664ece49e826e9f2d60 SHA512 8429f49140d45e5830e0faee535258db16752dcc896d7d0f2db9e01e8e54780a0ad5f82c2787d987680cc984c109e724ede89ebcf7605273bf6eb68c2c0e6eaf
 MISC metadata.xml 495 BLAKE2B 7137cdfc395a1e80576885adb3c870ba25034a657c342b3819328f276d55ebf6d7756e57644a6ff4d45ca07cdb561078dbb1deb1b993816c7088850dee45c3bb SHA512 e762fa761b5b00288870eac3af8aed0d05efba207d83138adc873da902a7e197b710caeb87a3083e5f23436f4a2c799996fe07201195de065bd430b9c35183ee
diff --git a/dev-python/scandir/scandir-1.10.0-r1.ebuild b/dev-python/scandir/scandir-1.10.0-r1.ebuild
new file mode 100644
index 000000000000..7de4dbb9c460
--- /dev/null
+++ b/dev-python/scandir/scandir-1.10.0-r1.ebuild
@@ -0,0 +1,23 @@
+# 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} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A better directory iterator and faster os.walk()"
+HOMEPAGE="https://github.com/benhoyt/scandir"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	${EPYTHON} test/run_tests.py -v || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 8a1b65d3f8ca..b68984f90991 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -5,6 +5,7 @@ DIST setuptools-40.8.0.zip 845071 BLAKE2B a76b92a7e3a5cd87d74f3ff5f49fe4c6b2a1f0
 DIST setuptools-40.9.0.zip 847572 BLAKE2B 1ef3f05d747a67395f705ad46bf066f400c9a5ad97efe73175e72eb9091c929cb61a526da1206f431a4e054939e0fd2b2a841a892c6cc76a6116cf781112b472 SHA512 2d278ef162139dfb1dd3640154ae3db755ff5c2285810c85b0452d12e3f3cb199e3f1a1ec7cc43a377d42cd4f86e97e2c773d9f0a3bef8dc1acbf31e6f61033f
 DIST setuptools-41.0.0.zip 848208 BLAKE2B 8d92cfb25f4ac1d0fd209b524693d66eca8fbc43b0ae4bf81343dd97820fd3b0572c8994c6ed1ee8c18e86a7eb4a6154dba53d81da081c950fa1ae1b61e023cf SHA512 e0f310368c50d954c8b0499ca2ea0e969e82515d0526b854c47d74cf6bb5af505cc522d926a346ab636163af6a85d1b40658c1701e759fbdf36f817af79ba7b1
 DIST setuptools-41.0.1.zip 849016 BLAKE2B e07d3eb864c96fc797f1ef2f93b2adcdc310a817339b51af1fc1b3b262fe86ad1bf35741fa3485f94d267bcaa55fded92f62754b3bb4544a27e21b507465c269 SHA512 022ac63b27da157ddab5eef34d4452f30b3798c3555779255686ecedcb98d6d60a9ac0b1a077b28426e3306d4ed5e89f1eea2894f9da6def57376596c01595b9
+DIST setuptools-41.1.0.zip 851100 BLAKE2B 1a2dcb1d3f1a34d9a5dab5156b76cddb03da0f3745e57ebdd363cdd23512df0de8f0d3131c930e2b67ae34fc15f75a9c06802826f97508bfb937a9e45ff287f4 SHA512 07e3381fffc7b75051640c07e334794cb008682e05ab8bbd5bb1e9757fd36305997a2974c424fd474411941f5ff014a53ec1edc276543593b238fe1e97d7d106
 EBUILD setuptools-36.7.2.ebuild 1921 BLAKE2B a1cd7bcb5fc4ae19d069e63f56081948d2fde3161354edb7429d43907f33effb8ed04fd91ebc55e443ff44feca82051754ccaeec86fda6a36d05ff9c580dd6c7 SHA512 cd34166c627d64ac0c8f4200ded764737471884e139f7cc48ef05bb35c4af2ac9d0893ae4e9c5b2431f8e5644e253a7ef9bcd185319c1e3941c173ae6295be3f
 EBUILD setuptools-40.6.3.ebuild 2047 BLAKE2B b96175e209a987179bb72e748bc3113fd4ca10bb186f3e684beb2694b84dabdca103dd323bdb64b80c8e707012e48fc092828b94f60e29e97212b0567de65719 SHA512 b37ebd23b91421ac6bbe07ce1e061b098d1d6be9a49145574a974ddb223c01c0077a5bff373b4398bed87d6395e15ca8602356db4bbb25dc351e5e6310db60cf
 EBUILD setuptools-40.7.3.ebuild 1991 BLAKE2B 8091b15d05917a3dd3ae98c808a3968e75acc076708a2b4fe01a4c02192f416df478cc53d5aee4ba0868d464b29596701bb5464a0904ffeb35f43bb98e97515d SHA512 6ae23ba85aef8892dbf73ff2adca2b60dc34efe77f35f65884d34c96d445d2961314071f717f005576a347d6b9eb5721a8604f734d136e0c97f28f48c55f7147
@@ -12,5 +13,6 @@ EBUILD setuptools-40.8.0.ebuild 2018 BLAKE2B c9f297d7d1aab994e2be672b3d9d328f0c2
 EBUILD setuptools-40.9.0.ebuild 2071 BLAKE2B 83464819d7ff0864096ef6ef6f91db2c96682ea07be7c2f89e8a055f5db39ca5071be8dbf830c71bc206c9bc6ed4d08deb39b9b2264eba516c74b97c765aa738 SHA512 715fd7e4b820e407cd75f87089302528a6d321d264eab36c6612aea49ae17c01a11828cd6b11a4f5efa3acae9faeb6c62e079b0eb562f23c270cbf0982d0110a
 EBUILD setuptools-41.0.0.ebuild 2078 BLAKE2B 8b216d3b1ae28253f484bb1e237bca58b0b610d1fcd1c5b699b99437dc912ea3ae2acdb6c108b5f985c3a4edbafc655acae07b74f4c3f08e014305d83e1beb08 SHA512 a38f7b08573f16d9de993602064d6a3243cdabd69f46bdb88c5a183d206aefc05ad02d81407f7df5150f43fdd1211c4108e52acbad43c392011ab06f3e742711
 EBUILD setuptools-41.0.1.ebuild 2085 BLAKE2B 3074d40f314473a5e66211af72fa1778dad45d2aa84aaef70c0d32003f2d6df4bcc45ce80f19c6150effc416cbde43b0f44c621be430eba1d413bb7d05f41603 SHA512 3189de5a115a4395b0e43f5d48800e43f238414cf4ec548940ea6b7419e8efea9e44149993383e793a6a9f2b25abb625d2090b6a384d3b368b14f72b295d5f17
+EBUILD setuptools-41.1.0.ebuild 2085 BLAKE2B 3074d40f314473a5e66211af72fa1778dad45d2aa84aaef70c0d32003f2d6df4bcc45ce80f19c6150effc416cbde43b0f44c621be430eba1d413bb7d05f41603 SHA512 3189de5a115a4395b0e43f5d48800e43f238414cf4ec548940ea6b7419e8efea9e44149993383e793a6a9f2b25abb625d2090b6a384d3b368b14f72b295d5f17
 EBUILD setuptools-9999.ebuild 2025 BLAKE2B 3a683337651c897d6158f6bd9c55b842e5e5d60eb1c9c34c79655ef5b6d105d34151fa0b9ea28de60a19570a40133159881308dca5eed6d4e9b44e836f309da8 SHA512 2f2f47a4209d735d84d949b69b6532d45030f15f983af04d3b3fc332711a57fd0cdbd69236f55a746c311e50a7195867aa6f12c69044a53a4be4528242f52a9c
 MISC metadata.xml 380 BLAKE2B e6c532ce30c0def7dde2f2ca91e1663f290954f1f099fc837247540c31979a215be5550bc42d4d841f62d3a81554ae5377c148ec34dc2e92bbca3daaa1021fb1 SHA512 70bfa11a90dc1bae499e235e01c05ff1b0ed2960062fcef46ed07095b59309c4a0c3adcd47f7b0131ff1035c8e77c5bdf75975ac1eaccaa1a9fbd06a3f868f94
diff --git a/dev-python/setuptools/setuptools-41.1.0.ebuild b/dev-python/setuptools/setuptools-41.1.0.ebuild
new file mode 100644
index 000000000000..913d8b00ffb9
--- /dev/null
+++ b/dev-python/setuptools/setuptools-41.1.0.ebuild
@@ -0,0 +1,73 @@
+# 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} pypy{,3} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/pypa/setuptools.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pip[${PYTHON_USEDEP}]
+		>=dev-python/pytest-3.7.0[${PYTHON_USEDEP}]
+		<dev-python/pytest-4
+		dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
+		dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+		virtual/python-futures[${PYTHON_USEDEP}]
+	)
+"
+PDEPEND="
+	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]"
+
+# Force in-source build because build system modifies sources.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+DOCS=( {CHANGES,README}.rst docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} )
+
+python_prepare_all() {
+	if [[ ${PV} == "9999" ]]; then
+		python_setup
+		${EPYTHON} bootstrap.py || die
+	fi
+
+	# disable tests requiring a network connection
+	rm setuptools/tests/test_packageindex.py || die
+
+	# don't run integration tests
+	rm setuptools/tests/test_integration.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
+	# It tries to sandbox the test in a tempdir
+	HOME="${PWD}" pytest -vv ${PN} || die "Tests failed under ${EPYTHON}"
+}
+
+python_install() {
+	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
+	distutils-r1_python_install
+}
diff --git a/dev-python/sphinx-notfound-page/Manifest b/dev-python/sphinx-notfound-page/Manifest
new file mode 100644
index 000000000000..ad6603c0085d
--- /dev/null
+++ b/dev-python/sphinx-notfound-page/Manifest
@@ -0,0 +1,3 @@
+DIST sphinx-notfound-page-0.4.tar.gz 5685 BLAKE2B 0bfc6cf98e0731a5cc95f1802dad1e7297ed764a626831b970d75d82ec0f7d6edb45c404851ea13bf38decc39aabf0e3dd6b136714a591e8ab595f11e23e67cd SHA512 56e867e6954f26da498b77e8fa43e8d62961ab33ee9c16d2084745dd54a998df51c7d882a47560196135d2fb4d473f7305ef19b31373bc205f8eaf0d3d4946f0
+EBUILD sphinx-notfound-page-0.4.ebuild 524 BLAKE2B a6755c61f8205c4edcd6b32d370c5b54eff5410f73e3ad79aba114249ccd276278d99d639b3c8f68dbbcf7745ef2c65dc10ff26127e02f68e06078088d3effbf SHA512 4382fe457097e1e153bd23d0ea3da3dd71627359b7f0cefa8b99ba6115e61ef729948d5041f1f780cd2b6519f28a53f74e6c81b83a6b7e94931c624be1f654f0
+MISC metadata.xml 440 BLAKE2B 0a08957b47eac83866fdbfd2fc137fa09413c2f6e4cbe961a0c587cb1604951d76061d41acae0a925a9f1775c785e8dc0808255685c14d88b5543e729052aeca SHA512 84b278d6a84dccb896c1e5c10ff1018ec801ea1a36083896f08629db28e82f8b20be2cad95a13b2ad53ba3751c9f6ba0c8a6367ad9baeb2881d22211793c2671
diff --git a/dev-python/sphinx-notfound-page/metadata.xml b/dev-python/sphinx-notfound-page/metadata.xml
new file mode 100644
index 000000000000..7f94ee92d1e7
--- /dev/null
+++ b/dev-python/sphinx-notfound-page/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">
+			Create a custom 404 page with absolute URLs hardcoded.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/sphinx-notfound-page/sphinx-notfound-page-0.4.ebuild b/dev-python/sphinx-notfound-page/sphinx-notfound-page-0.4.ebuild
new file mode 100644
index 000000000000..8c43245b0561
--- /dev/null
+++ b/dev-python/sphinx-notfound-page/sphinx-notfound-page-0.4.ebuild
@@ -0,0 +1,20 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_5 python3_6 python3_7 )
+inherit distutils-r1
+
+DESCRIPTION="Create a custom 404 page with absolute URLs hardcoded."
+HOMEPAGE="https://sphinx-notfound-page.readthedocs.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+BDEPEND=""
diff --git a/dev-python/tagpy/Manifest b/dev-python/tagpy/Manifest
index c46d58157f6c..84cd71182547 100644
--- a/dev-python/tagpy/Manifest
+++ b/dev-python/tagpy/Manifest
@@ -1,7 +1,5 @@
 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
+EBUILD tagpy-2018.1.ebuild 1221 BLAKE2B 8fc91b57b82a33985d65295fcc2dbe87c09ee3b690dd2d23d76de9e25c4fb0e1f6650cef1bdce5d264f14bc3f496e797a705e43782104e9d8ff7d063ea6dd1a1 SHA512 57c5815a3c18e851dedcfef269a08ff81069a055fca79ae480d42345f6cc392afe0ef5bfd7396f612511b305764e90aa78f06d7e5e1f4ac4259d711e3f307d86
 MISC metadata.xml 547 BLAKE2B c5c61e36e108060392467ad7bde0c8869b6df0f55367e528e9165d216f4c9674af13ec580c1b2fe6c231843cddd40b621f816c71e1d718126583085780649d66 SHA512 caf162b52bba166e74c1c1c9a6f157ee44d4b7f829c089dee93b6c84a99c847384ff7cd4f03ce191574e58562fdabe29eb4b00281551227f5d274adc3e7ba2d2
diff --git a/dev-python/tagpy/tagpy-2013.1.ebuild b/dev-python/tagpy/tagpy-2013.1.ebuild
deleted file mode 100644
index 20110e1dddb8..000000000000
--- a/dev-python/tagpy/tagpy-2013.1.ebuild
+++ /dev/null
@@ -1,40 +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} )
-
-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-1.49.0:=[python,threads,${PYTHON_USEDEP}]
-	>=media-libs/taglib-1.7.2"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_configure() {
-	"${PYTHON}" configure.py \
-		--taglib-inc-dir="${EPREFIX}/usr/include/taglib" \
-		--boost-python-libname="boost_python-${EPYTHON#python}"
-}
-
-python_install_all() {
-	if use examples; then
-		docinto examples
-		dodoc -r test/*
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/tagpy/tagpy-2018.1.ebuild b/dev-python/tagpy/tagpy-2018.1.ebuild
index c6309a878ecf..18d27acee100 100644
--- a/dev-python/tagpy/tagpy-2018.1.ebuild
+++ b/dev-python/tagpy/tagpy-2018.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ppc ppc64 ~sparc x86"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/terminaltables/Manifest b/dev-python/terminaltables/Manifest
index d615a09de058..a034316a966d 100644
--- a/dev-python/terminaltables/Manifest
+++ b/dev-python/terminaltables/Manifest
@@ -1,4 +1,4 @@
 DIST terminaltables-3.1.0.tar.gz 278484 BLAKE2B 733bcfcdc51c5e78e85e8f7fc9db00fa96c1ad48f76a9ec48ed546dc0acd62af90f437de346fe05d4cb09151b33ddea2f62beb21b418d7f76d8a719423a5f694 SHA512 dc49458652fff8bc6094d316d84c9b8e9fca1a26e3230c0b668bc03ec8528793f4ef024e8032d4a56fbfabfdfd4a1142870f550f0b373ba6a42dd2e3ead3f501
 EBUILD terminaltables-3.1.0.ebuild 767 BLAKE2B 694c68b9a42456e33312070c0cebb6db396ff1bbf4214341e9b8e5c58642cc058584b1051324354bd67558b6a9ad965bd7c2f1c819f5ef26a4ffc358170e0a53 SHA512 7b18189494ff4683fc7adf179c76164b6e6322718f45cd229faded499885dd68503619bf1c7c4f8b96d6b80033726b3a408317e11cbc9f8b33bbd0ecac24e667
 EBUILD terminaltables-9999.ebuild 747 BLAKE2B b731bf7e2c578d019ade1b5e47968078983ec726193d277a67d6a105845035b4ce19bbdcb10b5c01f4a7befad9c52a3c4ffefdb2855fba95c0fe4cbf5c993046 SHA512 9bb965b1414737bda07ef3f86384a8818830f6229502bce2738dc778f710c990dcde86cab68725dd0eb69b9714fe3b952c2bd2358b98d43d4c782551e95cd1cc
-MISC metadata.xml 412 BLAKE2B 14b2e95e0eec6b668bfb7b0ad0c1b969837c42ba40bf5672089b7e5f409d9d2f512a1161853f7cdfcd7a69f6bc7365eb1d5bd0a4d480e983c47d31141abecf52 SHA512 7c0d6f0e618450e0789e984834352ba353c053f7b2e32be269120628f0688a3a08d7e2ef160244d3c48d98b226e43f5f7e4b13d0541d8a2fef6329bf67f8b4e6
+MISC metadata.xml 413 BLAKE2B 7aef163d29b857e19732c69ff0a5745d511ba8619a9f44f6ab0ecaf5b046a439b109789855cc1ee13ac99b1b3dbff6ba5432ad4bb8d9644cb4aba43aa9a8abe8 SHA512 44b71c2921a4db4517cd9c2d64021f39988a0767dab2020b2c4b6354da7eeb79d783bcbe197109cffd0fed3bc01ca6a1a1d5a4d8793176792e4ef749e59fe975
diff --git a/dev-python/terminaltables/metadata.xml b/dev-python/terminaltables/metadata.xml
index 671aa966e36f..9ffbd4773b9f 100644
--- a/dev-python/terminaltables/metadata.xml
+++ b/dev-python/terminaltables/metadata.xml
@@ -5,7 +5,7 @@
 		<email>grknight@gentoo.org</email>
 		<name>Brian Evans</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
 	<upstream>
diff --git a/dev-python/tqdm/Manifest b/dev-python/tqdm/Manifest
index c29f065b1cb4..bfd33eede150 100644
--- a/dev-python/tqdm/Manifest
+++ b/dev-python/tqdm/Manifest
@@ -1,4 +1,6 @@
 DIST tqdm-4.23.3.tar.gz 75941 BLAKE2B 9e5810765e8f7ea4f54b0f93f453d278d5ad4b1710f1476a6f00ff2e513789585e97dcd5a8331fe69d3593b18affd50bf9bf51cbaed29ecd68d4efad9318aa31 SHA512 40c853b7cf7611ba2ef7652417c0d42ea4392f5ea9cbe319dbb9e3dd063594e5c637fb5d13f77935fb9a034d395b28fa9480fec1c6cca1852644add4ac18cce8
+DIST tqdm-4.33.0.tar.gz 121571 BLAKE2B f4ee73cfa710462e148f6034ac69144d845d216bd97e16a78bc1f1ed5d658b6cd695d07aa1ea6ec93e2e747ab8fc52263a580c01516d1f111dcb5766b019925d SHA512 de86a2dc2c5f887b9671ee01e7c05820375b0ef83dec92f17da4d944dd02cbf96a133fd9d349ba5f9c75af70e7b87110a9a7ad3293c7eb81e49ed6ea288ba73c
 EBUILD tqdm-4.23.3.ebuild 677 BLAKE2B f3f71e02105b6d4c0a6b83721f50f2b70db1a582531bdbbb7785a1187da9692ce089f96d81d71fa909a8b8f16bd939882660583343f9ae613327c223cd48a293 SHA512 c4cdd7e8b753bbf59782fc7a13f626207253d5a486eb22b91a32c9c6a19d4bdb516461d0d8c11b8b35753b1989bacb71372633c7af4cc0d81565ad4b18aadeaa
-EBUILD tqdm-9999.ebuild 444 BLAKE2B 6c576084bce3b189d33a46a1df66bcce98f1046bc0807891edb53ad5abc200b4ea921975c3f7fc53633413ceb0872699054e8dcca02423dd20c7a74ad61b5f2a SHA512 7e56301c0cca9ef88f87d0d39b673d25676e99bc225b5d183ec8eb7b68f2b46121b33ce412fcb0a766b12b5d3dc08d16accfa03945f57d372d27407537a265ef
-MISC metadata.xml 611 BLAKE2B 508436ed86075ea93acdfda799c34f6b05b38ed48c77e5673cbb11d1b424be1a0b98be584ecdf4544848ffd0061dcab39d24bb67d2d0ef631d295d8f91d02cd5 SHA512 62ef0673bcb397648689769eac6e735f5de8a3df69d41e63a04b2e9b79cef3fea64c2183ab9bc83827dd7d1e1f982b0decb17ebaee96bbf4928bd9a545fac29c
+EBUILD tqdm-4.33.0.ebuild 1198 BLAKE2B b924fc5cd5da4cf969f7b677fc983d0bf478324cb519ba7a820c7b94381910fb7d2c3718803f218020ff4357833e3edb8f8b573dabe74d8eea99bc9c3da910d4 SHA512 5e793e6a8c1a348aeb6628dde2990f533dce500e45020e51beb7a3b49e8762e1421d35356a5700022741c5b355c4ae6fa7a99a2ab6c38514565e68f1a25d9af9
+EBUILD tqdm-9999.ebuild 1198 BLAKE2B b924fc5cd5da4cf969f7b677fc983d0bf478324cb519ba7a820c7b94381910fb7d2c3718803f218020ff4357833e3edb8f8b573dabe74d8eea99bc9c3da910d4 SHA512 5e793e6a8c1a348aeb6628dde2990f533dce500e45020e51beb7a3b49e8762e1421d35356a5700022741c5b355c4ae6fa7a99a2ab6c38514565e68f1a25d9af9
+MISC metadata.xml 710 BLAKE2B 9495d9ce29f39e1594574e1ec2986becc8601f2ef1a30b9b13019d5711d0b75e84285e7cc04e2a47b96deee20b6bce8b15cb562e47edfaa77216afbac248e493 SHA512 bd4dd0763d6c332200c07e4c43830839e99b84ed7d2cebf4a2315a2a152ea7a0b2944a2976e8cd6a29d54adc185161380d13e26cfa689ab2bd48ef2f90395c7a
diff --git a/dev-python/tqdm/metadata.xml b/dev-python/tqdm/metadata.xml
index 39c0d0d24421..2f3b93b1ba5d 100644
--- a/dev-python/tqdm/metadata.xml
+++ b/dev-python/tqdm/metadata.xml
@@ -14,6 +14,8 @@
 		any iterator with "tqdm(iterator)", and you're done!
 	</longdescription>
 	<upstream>
+		<remote-id type="pypi">tqdm</remote-id>
 		<remote-id type="github">tqdm/tqdm</remote-id>
+		<bugs-to>https://github.com/tqdm/tqdm/issues</bugs-to>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/tqdm/tqdm-4.33.0.ebuild b/dev-python/tqdm/tqdm-4.33.0.ebuild
new file mode 100644
index 000000000000..9a0b9b8ea059
--- /dev/null
+++ b/dev-python/tqdm/tqdm-4.33.0.ebuild
@@ -0,0 +1,52 @@
+# 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
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/tqdm/tqdm"
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Add a progress meter to your loops in a second"
+HOMEPAGE="https://github.com/tqdm/tqdm"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="examples test"
+
+# Uses pkg_resources
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+
+python_test() {
+	# tests_main.py requires the package to be installed
+	distutils_install_for_testing
+	# Skip unpredictable performance tests
+	nosetests tqdm -v -I 'tests_perf.py' \
+		|| die "tests failed with ${EPYTHON}"
+}
+
+python_install() {
+	doman "${BUILD_DIR}"/lib/tqdm/tqdm.1
+	rm "${BUILD_DIR}"/lib/tqdm/tqdm.1 || die
+	distutils-r1_python_install --skip-build
+}
+
+python_install_all() {
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/tqdm/tqdm-9999.ebuild b/dev-python/tqdm/tqdm-9999.ebuild
index 8e669e8670df..9a0b9b8ea059 100644
--- a/dev-python/tqdm/tqdm-9999.ebuild
+++ b/dev-python/tqdm/tqdm-9999.ebuild
@@ -1,21 +1,52 @@
 # 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} )
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
 
-inherit distutils-r1 git-r3
+inherit distutils-r1
 
-DESCRIPTION="Add a progress meter to your loops in a second."
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/tqdm/tqdm"
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Add a progress meter to your loops in a second"
 HOMEPAGE="https://github.com/tqdm/tqdm"
-SRC_URI=""
-EGIT_REPO_URI="https://github.com/tqdm/tqdm"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS=""
-IUSE=""
+IUSE="examples test"
+
+# Uses pkg_resources
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+
+python_test() {
+	# tests_main.py requires the package to be installed
+	distutils_install_for_testing
+	# Skip unpredictable performance tests
+	nosetests tqdm -v -I 'tests_perf.py' \
+		|| die "tests failed with ${EPYTHON}"
+}
+
+python_install() {
+	doman "${BUILD_DIR}"/lib/tqdm/tqdm.1
+	rm "${BUILD_DIR}"/lib/tqdm/tqdm.1 || die
+	distutils-r1_python_install --skip-build
+}
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
+python_install_all() {
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/transitions/Manifest b/dev-python/transitions/Manifest
new file mode 100644
index 000000000000..c5dd4d6b2a35
--- /dev/null
+++ b/dev-python/transitions/Manifest
@@ -0,0 +1,3 @@
+DIST transitions-0.6.9.tar.gz 1354465 BLAKE2B bb536c1209c08717b29d5d60e4b31253b1f5bc759b7693a3ef82d4894cd55bc8a2dd3417e03ba5232d35de060c73cef664994c44c8f14be9ed0743170e7c1c09 SHA512 8104d98795c4212e40ba8274332e2e87336421e61a4398c58907a675708cddc7d3b77bbcada1e2cc16fd9dd518c94f07c2079cf0507b8647a435435151f5eb51
+EBUILD transitions-0.6.9.ebuild 948 BLAKE2B 093879773c9dac96b5ea38b9e5c3a49bd5379b342aaeef99d3b9332102ba0ef46c062e735d93a603a8c2f8aaee20d53676d95062051e62c3665116f56f33cc62 SHA512 cef0369f3646a65fbd3b35b118bbcc4d915ab4dd5ad059d736e8d2cbf251e6ec68c94297fe958d8b28ee6fd5acee376678d336343164826d823dfabccec7550d
+MISC metadata.xml 807 BLAKE2B 041bfd7046f5826c097703482fa86e2a29f091ce29053b0fd7bffdb4b03ad8f9d339c4a88380cde7bd0e28ff583f07d0100317650e63ed378d3d3fec30b4a3cd SHA512 c9b8379de019e4bb3251e3862d5a4b9bbe2dad4646f5fe0d785b5f3b3983492d5d6ac028d7ee9dff6d1dfa74c08503c4e81092f8200c58f41eb0b46ba0d4cf69
diff --git a/dev-python/transitions/metadata.xml b/dev-python/transitions/metadata.xml
new file mode 100644
index 000000000000..a48ef5d38ade
--- /dev/null
+++ b/dev-python/transitions/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>ck+gentoo@bl4ckb0x.de</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		A lightweight, object-oriented state machine implementation in Python.
+		A state machine is a mathematical model of computation.
+		It is an abstract machine that can be in exactly one of a
+		finite number of states at any given time.
+	</longdescription>
+	<upstream>
+		<bugs-to>https://github.com/pytransitions/transitions/issues</bugs-to>
+		<remote-id type="github">pytransitions/transitions</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/transitions/transitions-0.6.9.ebuild b/dev-python/transitions/transitions-0.6.9.ebuild
new file mode 100644
index 000000000000..65a89daacacf
--- /dev/null
+++ b/dev-python/transitions/transitions-0.6.9.ebuild
@@ -0,0 +1,46 @@
+# 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 lightweight, object-oriented state machine implementation in Python"
+HOMEPAGE="https://github.com/pytransitions/transitions"
+SRC_URI="https://github.com/pytransitions/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/pygraphviz[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+
+DEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/pycodestyle[${PYTHON_USEDEP}]
+		dev-python/dill[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	use examples && dodoc examples/*.ipynb
+}
diff --git a/dev-python/urllib3/Manifest b/dev-python/urllib3/Manifest
index 1ab4731e35d9..a1253832b513 100644
--- a/dev-python/urllib3/Manifest
+++ b/dev-python/urllib3/Manifest
@@ -1,10 +1,3 @@
-AUX urllib3-1.23-tornado5.patch 2878 BLAKE2B 7d64d012de5f0d83043ca5c6262d4e395faa888b582cc2c094c82c90aad3bb7e3e7bf835c002bcc72339974d06b5b211d22571a0470b44e453024626e47ee507 SHA512 c4c1facce9e90a8c8b845e4ca9b5c1b4bd1400fa9b2841172bd8a721ed96fac36cdead6014bf33ec841237f7cd4cb0994283f1a62840e22f829f9f0234d1cfde
-DIST urllib3-1.22.tar.gz 226083 BLAKE2B 6d3067ea1c9c90e2e759e6319115ed3d29ca1e31c4d1721d7e7aeed432ea4df22635d92fdb9ea91a411bbe67c72160abaa19e0d42870be0b0a866c003db6ec62 SHA512 132b69d7f390916bdcde66d46fbf0189d0c1f976f91778dcb0a9ef8174487b7bb4b37b9139e84f7c70234803be95284448aba0b820f3b54530c0c497ca7a1dc9
-DIST urllib3-1.23.tar.gz 228314 BLAKE2B 63cd0ed046ade8b775067df92f3589bdfa21788481292724ec6af85b5789cc990cd267e1a0dfd925529d147441232a89b4f1b23a1276fc7a68a7047cbf2ae8a4 SHA512 6baa76ad3bebc639d7ec0a042d809fba7ef3110de6164a321756389c250e218728d178708611049d91f39d17f24b8b08585edb2f2c260c987bd4c7204e0c0b5f
-DIST urllib3-1.24.1.tar.gz 229688 BLAKE2B ee72e61d417ef266af43b5c4d3eb0b154eac41a392b0a7e9d19523fdb00786b60f8067a8e876c1b7813b127431b1625b1480d9812d623a6d3c540a8ecf646242 SHA512 4c12d08076b0f260727d5aac780f5e9a24e0164755ff05b02a1f5a697876741ff13ba278fdd6e46ef678e8e1146bc39de1fc49ee10ee839229a70540a9424a99
 DIST urllib3-1.24.2.tar.gz 230699 BLAKE2B 9c2f2be8fa743f542493d75072c02423d1bd40189561fa0ea393a8a2515b24da9a2a383aeec35b55bdd2a9954d3d585450d759548358ed91ecfdb9ec03d391b6 SHA512 9939e9e7c4da30b5effb334969cd835c9d0404a136761098203c699570aab02e63fb3f1b4ab680def0bc0906fabe5f0782ab94cf3095ff10ccf9b3c371653cf2
-EBUILD urllib3-1.22.ebuild 1750 BLAKE2B 053a1a4590e26d363c8a7b76fb2bc69f16a2d20e7532e44b5b6f15f0a1cb3e4594318ee1d3cc3f28014fd0f4f077d0a056448e720a6ca0f596412aa411436081 SHA512 a8cbb45a3aefbe76aa0119d2a67aed90ed95769c68e296da7aed7a2d85b53c42c4235c8439608351da6eeb03a2f97c25bd25ce1be78efa1aaf91c4fc4954ba38
-EBUILD urllib3-1.23.ebuild 1906 BLAKE2B d3e2981f3133db3ac25739a5740c278ccd238d6a926265be96da15b200341f50bf138cf685b0d28735bbdc9328d45b237a8a45dde63f920b2075f05db421b6e9 SHA512 a38a14962ac9ffd7e86397545974721aff6c745da4d25ef07a99d0c4effb670b9d95f74b3efbfb8fd7624cc118621d99c26de2d9fec691f8f2d4b6d92221df62
-EBUILD urllib3-1.24.1.ebuild 1819 BLAKE2B b1d16553a388611486ade62774bffbf471eeb3336e4a4c7d42b2e1721239081b2cca61c48eb91291a387d24619763b13bc8ed08faa8461b0e53a4e61309d51ea SHA512 8b7aec6288e77c410e4ce47c983f1033a120610478d4ea95e0f813c314ab8f917211ff77abe419bd9bff21b8c884b86963a17a77aeec407462c66c526b9c9158
-EBUILD urllib3-1.24.2.ebuild 1809 BLAKE2B 763728e9d1428f1bd16436c71d6ce3402d7d1968142296f49959f48679cf1d9f26469824fab17928bf4c908ae507fb1ae1ad22f5615428fb46818ccd7ae61631 SHA512 846efc6c4bd51c063eedf70b3d85a06b81639c45a81a9fed3b3b09b9147a078b1643a3bc9a5cac971e7c6ecdbf0c7dbc7cd45d3ae0e3b8099d06dc7c1ae2ea51
+EBUILD urllib3-1.24.2.ebuild 1808 BLAKE2B 290d6051a180dc5905aeec8da4d7d1f17580d5f7967e8e150c169ce1ffbfcad4b49487479eb1c403d22312ad145bffca58fea43cd365ac158f7ec9c39c808161 SHA512 692efd8d71ad4e1a847ad1f595793fb6de00b74a7678ae1617fcc515e608f5489830683acf1b89cf226304d4e858238b43ef07f1f5f502b19da19b1e1cfcd2b3
 MISC metadata.xml 376 BLAKE2B 2e9ba1b23bd9ab2770d23ce9bdf21f4083f46184c22d1dc0bd449b6605c24a2ef0168e1503327b549ba55e81b7bb52fe5f73fa375f06f3c64fabfac6cf5a9d77 SHA512 97d216a4841d8c78655c923060a0040b75fbb2d19a42e51081fc63a4af80514db5abf09a02706cc52387ab7ac72e964f947f1ded50bcc7f8fae6d022d5353543
diff --git a/dev-python/urllib3/files/urllib3-1.23-tornado5.patch b/dev-python/urllib3/files/urllib3-1.23-tornado5.patch
deleted file mode 100644
index b5224564c56a..000000000000
--- a/dev-python/urllib3/files/urllib3-1.23-tornado5.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From f8c3e96df731eccda202e0dc909f0a51cdc41267 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sat, 14 Jul 2018 12:21:50 +0200
-Subject: [PATCH] dummyserver: Update for tornado-5 API changes
-
-Tornado 5 has apparently removed support for multiple IOLoops,
-and appropriately removed the io_loop parameter to the server class
-in favor of using IOLoop.current().  Update the tests to use the latter.
-The code remains compatible with tornado-4.
----
- dummyserver/server.py   | 9 +++++----
- dummyserver/testcase.py | 4 ++--
- 2 files changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/dummyserver/server.py b/dummyserver/server.py
-index e1745b7..3ba5124 100755
---- a/dummyserver/server.py
-+++ b/dummyserver/server.py
-@@ -226,15 +226,16 @@ def bind_sockets(port, address=None, family=socket.AF_UNSPEC, backlog=128,
- 
- 
- def run_tornado_app(app, io_loop, certs, scheme, host):
-+    assert io_loop == tornado.ioloop.IOLoop.current()
-+
-     # We can't use fromtimestamp(0) because of CPython issue 29097, so we'll
-     # just construct the datetime object directly.
-     app.last_req = datetime(1970, 1, 1)
- 
-     if scheme == 'https':
--        http_server = tornado.httpserver.HTTPServer(app, ssl_options=certs,
--                                                    io_loop=io_loop)
-+        http_server = tornado.httpserver.HTTPServer(app, ssl_options=certs)
-     else:
--        http_server = tornado.httpserver.HTTPServer(app, io_loop=io_loop)
-+        http_server = tornado.httpserver.HTTPServer(app)
- 
-     sockets = bind_sockets(None, address=host)
-     port = sockets[0].getsockname()[1]
-@@ -268,7 +269,7 @@ if __name__ == '__main__':
-     from .testcase import TestingApp
-     host = '127.0.0.1'
- 
--    io_loop = tornado.ioloop.IOLoop()
-+    io_loop = tornado.ioloop.IOLoop.current()
-     app = tornado.web.Application([(r".*", TestingApp)])
-     server, port = run_tornado_app(app, io_loop, None,
-                                    'http', host)
-diff --git a/dummyserver/testcase.py b/dummyserver/testcase.py
-index f73f028..d9ff8cf 100644
---- a/dummyserver/testcase.py
-+++ b/dummyserver/testcase.py
-@@ -124,7 +124,7 @@ class HTTPDummyServerTestCase(unittest.TestCase):
- 
-     @classmethod
-     def _start_server(cls):
--        cls.io_loop = ioloop.IOLoop()
-+        cls.io_loop = ioloop.IOLoop.current()
-         app = web.Application([(r".*", TestingApp)])
-         cls.server, cls.port = run_tornado_app(app, cls.io_loop, cls.certs,
-                                                cls.scheme, cls.host)
-@@ -170,7 +170,7 @@ class HTTPDummyProxyTestCase(unittest.TestCase):
- 
-     @classmethod
-     def setUpClass(cls):
--        cls.io_loop = ioloop.IOLoop()
-+        cls.io_loop = ioloop.IOLoop.current()
- 
-         app = web.Application([(r'.*', TestingApp)])
-         cls.http_server, cls.http_port = run_tornado_app(
--- 
-2.18.0
-
diff --git a/dev-python/urllib3/urllib3-1.22.ebuild b/dev-python/urllib3/urllib3-1.22.ebuild
deleted file mode 100644
index 3536bcedb1ef..000000000000
--- a/dev-python/urllib3/urllib3-1.22.ebuild
+++ /dev/null
@@ -1,63 +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} pypy{,3} )
-PYTHON_REQ_USE="ssl(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more"
-HOMEPAGE="https://github.com/shazow/urllib3"
-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 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-IUSE="doc test"
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}]
-	!~dev-python/PySocks-1.5.7[${PYTHON_USEDEP}]
-	<dev-python/PySocks-2.0[${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.0.0[${PYTHON_USEDEP}]
-	virtual/python-ipaddress[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		>=www-servers/tornado-4.2.1[$(python_gen_usedep 'python*')]
-		>=dev-python/mock-1.3.0[${PYTHON_USEDEP}]
-		>=dev-python/nose-1.3.7[${PYTHON_USEDEP}]
-		>=dev-python/nose-exclude-0.4.1[${PYTHON_USEDEP}]
-	)
-	doc? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-"
-
-# Testsuite written requiring mock to be installed under all Cpythons
-
-python_compile_all() {
-	use doc && emake -C docs SPHINXOPTS= html
-}
-
-python_test() {
-	# FIXME: get tornado ported
-	if [[ ${EPYTHON} == python* ]]; then
-		nosetests -v test || die "Testing failed with ${EPYTHON}"
-	fi
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/urllib3/urllib3-1.23.ebuild b/dev-python/urllib3/urllib3-1.23.ebuild
deleted file mode 100644
index 2d6c96706977..000000000000
--- a/dev-python/urllib3/urllib3-1.23.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} pypy{,3} )
-PYTHON_REQ_USE="ssl(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more"
-HOMEPAGE="https://github.com/shazow/urllib3"
-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 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-#RESTRICT="test"
-
-RDEPEND="
-	>=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}]
-	!~dev-python/PySocks-1.5.7[${PYTHON_USEDEP}]
-	<dev-python/PySocks-2.0[${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.0.0[${PYTHON_USEDEP}]
-	virtual/python-ipaddress[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		>=www-servers/tornado-4.2.1[$(python_gen_usedep 'python*')]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-	doc? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-"
-
-# Testsuite written requiring mock to be installed under all Cpythons
-
-python_prepare_all() {
-	local PATCHES=(
-		# support tornado-5
-		"${FILESDIR}"/urllib3-1.23-tornado5.patch
-	)
-
-	# skip appengine tests
-	rm -r test/appengine || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs SPHINXOPTS= html
-}
-
-python_test() {
-	# FIXME: get tornado ported
-	if [[ ${EPYTHON} == python* ]]; then
-		py.test -v || die "Tests fail with ${EPYTHON}"
-	fi
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/urllib3/urllib3-1.24.1.ebuild b/dev-python/urllib3/urllib3-1.24.1.ebuild
deleted file mode 100644
index 08d3d35b05c9..000000000000
--- a/dev-python/urllib3/urllib3-1.24.1.ebuild
+++ /dev/null
@@ -1,67 +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} pypy{,3} )
-PYTHON_REQ_USE="ssl(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more"
-HOMEPAGE="https://github.com/shazow/urllib3"
-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 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-#RESTRICT="test"
-
-RDEPEND="
-	>=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}]
-	!~dev-python/PySocks-1.5.7[${PYTHON_USEDEP}]
-	<dev-python/PySocks-2.0[${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.0.0[${PYTHON_USEDEP}]
-	virtual/python-ipaddress[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		>=www-servers/tornado-4.2.1[$(python_gen_usedep 'python*')]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-	doc? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-"
-
-# Testsuite written requiring mock to be installed under all Cpythons
-
-python_prepare_all() {
-	# skip appengine tests
-	rm -r test/appengine || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs SPHINXOPTS= html
-}
-
-python_test() {
-	# FIXME: get tornado ported
-	if [[ ${EPYTHON} == python* ]]; then
-		py.test -v || die "Tests fail with ${EPYTHON}"
-	fi
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/urllib3/urllib3-1.24.2.ebuild b/dev-python/urllib3/urllib3-1.24.2.ebuild
index c788f5082aea..30f6adda08ec 100644
--- a/dev-python/urllib3/urllib3-1.24.2.ebuild
+++ b/dev-python/urllib3/urllib3-1.24.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 #RESTRICT="test"
 
diff --git a/dev-python/uvloop/Manifest b/dev-python/uvloop/Manifest
index 0bc3d457787d..7d63a0cd6cb2 100644
--- a/dev-python/uvloop/Manifest
+++ b/dev-python/uvloop/Manifest
@@ -1,5 +1,7 @@
 DIST uvloop-0.12.2.tar.gz 1922375 BLAKE2B 49d17dc0899d59975d02dcc0b56e53e506e83a7f02ba7e9021abf92e8518b9904905c0175c3e2612a10f6f6d7a69505bfb024c00debf01823dcfb597966ab1a9 SHA512 59e34c83946facf70e839831dcd61fb7a8cf22df48d2ede6de84edbd4af5e789b2b404c8b7835e9a8cd7be706ad370bde2a290beab72c5d7411d35d07ee7974c
+DIST uvloop-0.13.0.tar.gz 1989805 BLAKE2B 5e825f54ab925056847b8369dfb4deaf9bc8120f7b9f3a0c58267954cf2d374f7ad91393744b7defaa3ec82f5d476f97a5555bc305d80106c84de71b7cdbc7f0 SHA512 4e24db94d207f23287a28d5b086cbd0a358f2fb3d35b55e9913b7b0867e4253259171f4d23969990b1e041fef0a28e44fcd1737e9be319293d223d987033de98
 DIST uvloop-0.8.1.tar.gz 1719488 BLAKE2B eba6e15c8eb46286b6e8df6043280ec8b423f097fcf2d4d5be657ff18f0fb97ce83e5268a138cf46700f54b7040353b6588dc4b0140e11f38d7da2e26b1ff120 SHA512 45dba019a0dacaae6c2a732c3f321402c19c945b0d9fa35b9cae28f888a54c7d4b322b450c55a6cf21c1aac01dc49b90eccdffbf4cb8c812a5ec8b9e805e01e4
 EBUILD uvloop-0.12.2.ebuild 1187 BLAKE2B 19863628a45b97d7033efb15817b602dd6b83481c03fe3d47765b4027413c1fd2ab326f5f3096449131f684183c0a0ce1dfa73b51541ec3c78c07f279dff4358 SHA512 9dbd7934e45e04f06736994bc4b92ee0d36f8458402764332a22311435cecdbc46e398f7885bb7a933ffcc6502405bcdbe4f4180107857b83c6aafb127b96bb8
+EBUILD uvloop-0.13.0.ebuild 1148 BLAKE2B 89af9ff9acab2d2c2abb5a74b11a522c95bc1becdb1a44079227ab04f1e54eae4a628d0841fadc5aef3a8af33d5aefe4771e2bc58f7a7cdd67aeee1e440dfbda SHA512 309d37b79fefa06aba22b13029e872b6e25853853bcfbe68c5c3b125e77a509ec3502fc5df1ef2b763942309d2319b7880de74f34c89768e213b46e6eaaec1a1
 EBUILD uvloop-0.8.1.ebuild 1011 BLAKE2B 1b346d72198adca94752c7bdc3612b2c29b5607cba21c1eb7dce812939b3cf6c4d4042eccbab0e7a192dd2c6f8f989765b116bd0a71ca50b59c997ada30c4047 SHA512 49e5aefbf9e4084e00a941ed316fe86372ce98ae02ec7c1c09e8d808e9a30e9f84d316bbbfdf8f670dcc3d04a042ca0522d65ab44bd67f6f5e23f3663a227947
-MISC metadata.xml 783 BLAKE2B 2fb3d516b870a609a0e8b4ea47e888313e0e692a3455a7d6e2088dfe0e40b38000e4c0c83a15229993ad596e923f8040a5ba07e15ce4df96ae22d7c22383cac0 SHA512 c8445c26cafefe41be4ca84129f3ddaa53843120009d49a46ae181c105a7d636f59fbbbfeb723c5b4f29855d8520535d5d82cd0038512cf7374412759a1cc4ff
+MISC metadata.xml 544 BLAKE2B e4154e8b5cafb357fd48ff454db34f4f7e8e2c9811222ae19285660f2a237e30bb9558692be2b82572d3108f1252ac483f488274fb88337e4b9ab2d731046a66 SHA512 2c081d40c5477bd63d98ccccc8ce7f73933a01d7ee7f39b332a9a0cc3018cb9765dd81510fa9d27845760bf384ee40d5f699aa1a9df934d595624b1f5bff7518
diff --git a/dev-python/uvloop/metadata.xml b/dev-python/uvloop/metadata.xml
index 605410286c3e..046b9f3e8b97 100644
--- a/dev-python/uvloop/metadata.xml
+++ b/dev-python/uvloop/metadata.xml
@@ -1,14 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>elvis@magic.io</email>
-    <name>Elvis Pranskevichus</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
   <maintainer type="project">
     <email>python@gentoo.org</email>
   </maintainer>
diff --git a/dev-python/uvloop/uvloop-0.13.0.ebuild b/dev-python/uvloop/uvloop-0.13.0.ebuild
new file mode 100644
index 000000000000..1762033eea50
--- /dev/null
+++ b/dev-python/uvloop/uvloop-0.13.0.ebuild
@@ -0,0 +1,54 @@
+# 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
+
+DESCRIPTION="Ultra-fast implementation of asyncio event loop on top of libuv"
+HOMEPAGE="https://github.com/magicstack/uvloop"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="MIT"
+SLOT="0"
+IUSE="doc examples test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=dev-libs/libuv-1.11.0:="
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/alabaster-0.6.2[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	test? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )
+"
+
+python_prepare_all() {
+	cat <<EOF >> setup.cfg || die
+[build_ext]
+use-system-libuv=1
+EOF
+
+	# flake8 only
+	rm tests/test_sourcecode.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && esetup.py build_ext --inplace build_sphinx
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use examples && dodoc -r examples
+	use doc && local HTML_DOCS=( "${BUILD_DIR}/sphinx/html/." )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/virtualenvwrapper/Manifest b/dev-python/virtualenvwrapper/Manifest
index af7eced37a79..ac5adaf2014d 100644
--- a/dev-python/virtualenvwrapper/Manifest
+++ b/dev-python/virtualenvwrapper/Manifest
@@ -1,5 +1,8 @@
 DIST virtualenvwrapper-4.7.1.tar.gz 89930 BLAKE2B 8e101f04e365dbb6244bc787f853dd90b15d7b33a44725ac1e047cfa74845b9fe11ca100c8437536d80943f29be1dbe10920eef2ce9766bd95ec05cd96951eba SHA512 f972179992728b8b600388b34562fa9de355f526e4ee25ea88840700a57f196a60eba91ac3137e7d826925c7a8ade7479af383bcbfb8b9b837d0a374b8b3c4fd
 DIST virtualenvwrapper-4.8.2.tar.gz 91331 BLAKE2B a01a971ccfdf1822d65fe6d2f3ae09fde2646c8a6246f54316afb6e5d5068078e77732fed3a9805371fefeed7a4357c27b52eed24e9bd03492965779d6a50836 SHA512 53d92f653b988873da5a46e316a40ef767d97f75072e311aa4a8ae45c8aabb49569e36cc35597f9bdfc1f883a51eb648d5f01f4ea8b3237fae30a21dca67d7bc
+DIST virtualenvwrapper-4.8.4.tar.gz 334920 BLAKE2B cd790b1e98cca7d09ea9c80df5d52380335d4a0ea4e6d95f7bd48d78583e0d842e1145ea08d8d8c73516adbe8d6c75bd53c17943723f859860a0cad105a2b058 SHA512 461938100061e11af0ee9b17405d991ae34e5ec9c79cc12614962d3178b588a2da710baa15ac626960b09177c1b5b10c7bc590cb4c126ebd2f719d0f1527c9c4
 EBUILD virtualenvwrapper-4.7.1.ebuild 1021 BLAKE2B 7e3cc545d7a42b64d0d1beadde301183f77bd0bf9ee11de271c166d61d8f32585e2ffed474ef5311fc509b06ca72fa935d794d6f142da7d51b454fee3de315b0 SHA512 ab17f961cf97c2e754d1b8a7b4863dbbbe4440009b39c6f04e7034d0cbe805e939b172debb51df6aea019f028a4545bddca789249b38b0ecbc178833c2295a6a
+EBUILD virtualenvwrapper-4.8.2-r1.ebuild 874 BLAKE2B e433509eeb612ca0574fc3a7246974466365db204f37c4ec8ca259ce6debd3c5eafd298ab325884df298a2cffe6b18549d3172a92959b76e95e30413f45dc73d SHA512 3a8565bfb30b6c70c95fdbcaa1c7970722873b8275826598cc40090b4d31b1ff4563afa88a422280e9ca332fb9630b2c4944048765f7bdd3b85a50136b10b6c9
 EBUILD virtualenvwrapper-4.8.2.ebuild 880 BLAKE2B b9b549c3c2e2987a267b01adfc40bc6faeedc361bdac4c069cb315075b4ba1d39c556c181c553229fc097e5e4cf43ac37528a5b64d150dff11715ebaf1be4809 SHA512 41d7f7df4ef57b7527667531d3140c0aacd293869f813344fa0ddf4ee2a5284d67125d2ceefe36cd2eb8ac19b72abb06c0dd22d1f371829593d9f36238fc9445
+EBUILD virtualenvwrapper-4.8.4.ebuild 874 BLAKE2B e433509eeb612ca0574fc3a7246974466365db204f37c4ec8ca259ce6debd3c5eafd298ab325884df298a2cffe6b18549d3172a92959b76e95e30413f45dc73d SHA512 3a8565bfb30b6c70c95fdbcaa1c7970722873b8275826598cc40090b4d31b1ff4563afa88a422280e9ca332fb9630b2c4944048765f7bdd3b85a50136b10b6c9
 MISC metadata.xml 320 BLAKE2B b3b2f48545985da37bc3f4cd0a6f9fb8540a320cb6cc6e0be1cded9fc77862e47f0f30de3dbb683e9d7001cf05e221cb45f922013c155d5bf418d740ad3ef543 SHA512 dd5556b6b8cc96882032b3b00de65e2ca95cc0ee93c00639f1537e4abd31cc14022e2b61cb04f12b53480c273ef9be269128c4b683a9774590b1cdd552582386
diff --git a/dev-python/virtualenvwrapper/virtualenvwrapper-4.8.2-r1.ebuild b/dev-python/virtualenvwrapper/virtualenvwrapper-4.8.2-r1.ebuild
new file mode 100644
index 000000000000..976d371facf7
--- /dev/null
+++ b/dev-python/virtualenvwrapper/virtualenvwrapper-4.8.2-r1.ebuild
@@ -0,0 +1,32 @@
+# 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="Set of extensions to Ian Bicking's virtualenv tool"
+HOMEPAGE="https://bitbucket.org/dhellmann/virtualenvwrapper
+	https://pypi.org/project/virtualenvwrapper/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# testsuite doesn't work out of the box.  Demand of a virtualenv outstrips setup by the eclass
+RESTRICT=test
+
+RDEPEND="
+	dev-python/virtualenv[${PYTHON_USEDEP}]
+	dev-python/stevedore[${PYTHON_USEDEP}]
+	dev-python/virtualenv-clone[${PYTHON_USEDEP}]"
+DEPEND="${DEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/pbr[${PYTHON_USEDEP}]"
+
+python_test() {
+	bash ./tests/run_tests || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/virtualenvwrapper/virtualenvwrapper-4.8.4.ebuild b/dev-python/virtualenvwrapper/virtualenvwrapper-4.8.4.ebuild
new file mode 100644
index 000000000000..976d371facf7
--- /dev/null
+++ b/dev-python/virtualenvwrapper/virtualenvwrapper-4.8.4.ebuild
@@ -0,0 +1,32 @@
+# 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="Set of extensions to Ian Bicking's virtualenv tool"
+HOMEPAGE="https://bitbucket.org/dhellmann/virtualenvwrapper
+	https://pypi.org/project/virtualenvwrapper/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# testsuite doesn't work out of the box.  Demand of a virtualenv outstrips setup by the eclass
+RESTRICT=test
+
+RDEPEND="
+	dev-python/virtualenv[${PYTHON_USEDEP}]
+	dev-python/stevedore[${PYTHON_USEDEP}]
+	dev-python/virtualenv-clone[${PYTHON_USEDEP}]"
+DEPEND="${DEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/pbr[${PYTHON_USEDEP}]"
+
+python_test() {
+	bash ./tests/run_tests || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/zict/Manifest b/dev-python/zict/Manifest
index 51d789242c62..024ed8ef96b8 100644
--- a/dev-python/zict/Manifest
+++ b/dev-python/zict/Manifest
@@ -1,5 +1,7 @@
 DIST zict-0.1.2.tar.gz 10839 BLAKE2B 6256e6202f6cca1db025d21c42b98163ad897ceda6a1b878e75165b358ec0a4b9150f04ecdc05f5408dd74c97212b8301d1f45d91f92dad138789570ffcfa562 SHA512 13fc6647bc1506bc5e8f69d39a07851a06634949ce917f294762ff3143c8a539117f8731b103df2663708fa1e8c968359985d9c4273aa952f500a89019c176e3
 DIST zict-0.1.3.tar.gz 11199 BLAKE2B f91c51888816b3b3693ee272379e36c58141afeba14cf25eff9e1416cd59900ca9ab146d7fe806a22939e97dfb3f1657e443eb1420f4d5170a3723df32c3d73b SHA512 2051ff589f9dfc822ceb6a0adebb62e7b782bd426be5035163e78031814927dca221bfcc27ce47fb3d0287b1ec7e1ff120ccebf150e447df213aaa2136f744a4
+DIST zict-0.1.4.tar.gz 11335 BLAKE2B 30a70f04328762687ea9e6805e540469c26a85898278f2d83e1004d2663cd728a03df68e4900cf22b9d3b3ec6efc44a0fae3e5e0ff631a8bb8cc1d8ac510b8ee SHA512 3381c7fd64a99145f80800772dde381ae16225209aa9300f9d1a2c36b5ac1c4281d4068202e607985666ad44cce7d18317d4d8ca4d3ea4f9a227d4f4180e015c
 EBUILD zict-0.1.2.ebuild 656 BLAKE2B 96eceb9e31a456165283e44119f0142aef66e65b31aa86da2638fc3b02fb44b5c358c55f190da0e782bb1cd43d9f027b3762698fbe68b8b5e7c711dee9502b29 SHA512 b272c603549bb40a54121d67c18c9a2139c5fdd8278d3a8944f0cae71ce6c420296745a217dd02b4cedead03adc728f645bfdcd4226f24cebd22561d43d626f6
 EBUILD zict-0.1.3.ebuild 650 BLAKE2B 88ffeb6d381618ce18343d3660e13726aa7d3ee5968e6ab5f0393f90e3876dd845a9feeb19c76c7991bf248b695365ce9704ca856c441363d39b823d6e799020 SHA512 af3eca5260ef5c92934c99f1f21417ef5b02ef271dc039b26332b8a246515ca7083159c535a1aace3650c8cc49b1e1c9d92579ada619154824fd951c5f0d66f9
+EBUILD zict-0.1.4.ebuild 652 BLAKE2B dab9229d3d47b718ed9ff3aca7389c6a186ff4b7c2abb11892aef08381173031120f14389c9d88877053e484569956dec38e13ce24e089a19f86e46e6fb3ab73 SHA512 c62380ac5211ec05f3bf6dab24cc93e3bf5b6c8edba6a628eeb51b337aa3575ac949535c93e28e74521998ec194bea134cb88e5f4f9a644e983bd90d3bf5a4fe
 MISC metadata.xml 372 BLAKE2B e0704ea4318d17b85ab75fb9818e2ec6993173823f2b0d8fb92413e9ea83095a5ad95c05e69c4f6ae447c9cc2fe7a2735355b311e84b6036780a6b48ae5e7ff4 SHA512 02db2dbf57dc6d87318e8b79fc845f7aff7c6b98d80ea897bf24dca8f762f80581d69fd8990bca0e0d736997a93f2fd5a24fdad481b352e6a907c4b37a983eb0
diff --git a/dev-python/zict/zict-0.1.4.ebuild b/dev-python/zict/zict-0.1.4.ebuild
new file mode 100644
index 000000000000..7c2c1e3d994b
--- /dev/null
+++ b/dev-python/zict/zict-0.1.4.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=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Mutable mapping tools"
+HOMEPAGE="https://github.com/dask/zict/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="dev-python/HeapDict[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/HeapDict[${PYTHON_USEDEP}]
+		dev-python/lmdb[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	py.test || die
+}
diff --git a/dev-python/zipp/Manifest b/dev-python/zipp/Manifest
index c3149f35eadd..b50759cdc25b 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 1101 BLAKE2B a4a00ba10249c7a843ad1efa9fc01fe60115dca806f73067c58097fb08c6b7f84a685e5f4b470a19700d246ddc2eeb55ee8fe4cb908dd619ef57b7963f2cca29 SHA512 8d80a353b269a7a991b522045038ec8fed38294189b7c71b36f6801b0e34d32b427df7c384510ff83b6aa9d1b433f1f474503a2c2a806f7f1c52820ae7629b1b
+EBUILD zipp-0.5.2.ebuild 1107 BLAKE2B c79bf6753de8cfbfaf3ff0e54ced1763d5594915211d2cedb95f3d25c605399ba65f1ce25ea0b9d2816dd71e0ba31d802f978dc3ce12da67c4cb93df91b3db7a SHA512 addadf9afc87bdd8c52c0407e42a4821628170cb1b7b06284ad72f0cf53735f1e48e3460bd2d88550aa241a41735ce75cd4f42eceda0364b8c6cc0a8f1d2b2be
 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 a4274319df41..366b54407418 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="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="doc test"
 
 BDEPEND="
author	V3n3RiX <venerix@redcorelinux.org>	2019-08-18 18:16:17 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-08-18 18:16:17 +0100
commit	fc637fb28da700da71ec2064d65ca5a7a31b9c6c (patch)
tree	326613a08f25851c388715e205576a2e7d25dc4f /dev-python
parent	b24bd25253fe093f722ab576d29fdc41d04cb1ee (diff)