gentoo resync : 24.12.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-12-24 14:11:38 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2018-12-24 14:11:38 +0000
commit: de49812990871e1705b64051c35161d5e6400269 (patch)
tree: 5e1e8fcb0ff4579dbd22a1bfee28a6b97dc8aaeb /dev-python
parent: 536c3711867ec947c1738f2c4b96f22e4863322d (diff)
513 files changed, 3776 insertions, 3989 deletions
diff --git a/dev-python/APScheduler/APScheduler-3.1.0.ebuild b/dev-python/APScheduler/APScheduler-3.1.0.ebuild
deleted file mode 100644
index 5413a75c8508..000000000000
--- a/dev-python/APScheduler/APScheduler-3.1.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="In-process task scheduler with Cron-like capabilities"
-HOMEPAGE="https://github.com/agronholm/apscheduler"
-SRC_URI="mirror://pypi/A/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/tzlocal-1.2[${PYTHON_USEDEP}]
-	virtual/python-funcsigs[${PYTHON_USEDEP}]
-	virtual/python-futures[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-capturelog[${PYTHON_USEDEP}]
-	)"
-
-python_prepare_all() {
-	sed -i -e /setuptools_scm/d setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# 3 known failures due to caplog.set_level not existing
-	py.test || die "Testing failed with ${EPYTHON}"
-}
diff --git a/dev-python/APScheduler/APScheduler-3.2.0.ebuild b/dev-python/APScheduler/APScheduler-3.2.0.ebuild
deleted file mode 100644
index 5413a75c8508..000000000000
--- a/dev-python/APScheduler/APScheduler-3.2.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="In-process task scheduler with Cron-like capabilities"
-HOMEPAGE="https://github.com/agronholm/apscheduler"
-SRC_URI="mirror://pypi/A/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/tzlocal-1.2[${PYTHON_USEDEP}]
-	virtual/python-funcsigs[${PYTHON_USEDEP}]
-	virtual/python-futures[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-capturelog[${PYTHON_USEDEP}]
-	)"
-
-python_prepare_all() {
-	sed -i -e /setuptools_scm/d setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# 3 known failures due to caplog.set_level not existing
-	py.test || die "Testing failed with ${EPYTHON}"
-}
diff --git a/dev-python/APScheduler/APScheduler-3.3.1.ebuild b/dev-python/APScheduler/APScheduler-3.3.1.ebuild
index c4f2cbbc9d71..b6e4912c7f02 100644
--- a/dev-python/APScheduler/APScheduler-3.3.1.ebuild
+++ b/dev-python/APScheduler/APScheduler-3.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,11 +24,43 @@ RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
 DEPEND="${RDEPEND}
 	test? (
 		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-capturelog[${PYTHON_USEDEP}]
 	)"
 
+# Tests that are known to fail (some may be triggered by network-sandbox).
+test_failures=(
+	test_add_class_method_job
+	test_add_instance_method_job
+	test_add_job_conflicting_id
+	test_asyncio_executor_shutdown
+	test_get_all_jobs
+	test_get_next_run_time
+	test_get_pending_jobs
+	test_get_pending_jobs_subsecond_difference
+	test_lookup_job
+	test_lookup_nonexistent_job
+	test_one_job_fails_to_load
+	test_remove_all_jobs
+	test_remove_job
+	test_remove_nonexistent_job
+	test_repr_mongodbjobstore
+	test_repr_redisjobstore
+	test_repr_zookeeperjobstore
+	test_run_coroutine_job
+	test_run_coroutine_job_tornado
+	test_update_job
+	test_update_job_clear_next_runtime
+	test_update_job_next_runtime
+	test_update_job_nonexistent_job
+	test_zookeeper_client_keep_open
+	test_zookeeper_client_ref
+)
+
 python_prepare_all() {
 	sed -i -e /setuptools_scm/d setup.py || die
+	while read -r -d ''; do
+		sed -Ee "s:$(echo "${test_failures[@]}"| sed 's: :|:g'):_\\0:" -i "${REPLY}" || die
+	done < <(grep -rElZ "$(echo "${test_failures[@]}"| sed 's: :|:g')" "${S}")
+
 	distutils-r1_python_prepare_all
 }
 
diff --git a/dev-python/APScheduler/APScheduler-3.5.3.ebuild b/dev-python/APScheduler/APScheduler-3.5.3.ebuild
new file mode 100644
index 000000000000..b43883c56e5a
--- /dev/null
+++ b/dev-python/APScheduler/APScheduler-3.5.3.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="In-process task scheduler with Cron-like capabilities"
+HOMEPAGE="https://github.com/agronholm/apscheduler"
+SRC_URI="mirror://pypi/A/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/tzlocal-1.2[${PYTHON_USEDEP}]
+	virtual/python-funcsigs[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+# Tests that are known to fail (some may be triggered by network-sandbox).
+test_failures=(
+	test_add_class_method_job
+	test_add_instance_method_job
+	test_add_job_conflicting_id
+	test_asyncio_executor_shutdown
+	test_get_all_jobs
+	test_get_next_run_time
+	test_get_pending_jobs
+	test_get_pending_jobs_subsecond_difference
+	test_lookup_job
+	test_lookup_nonexistent_job
+	test_one_job_fails_to_load
+	test_remove_all_jobs
+	test_remove_job
+	test_remove_nonexistent_job
+	test_repr_mongodbjobstore
+	test_repr_redisjobstore
+	test_repr_zookeeperjobstore
+	test_run_coroutine_job
+	test_run_coroutine_job_tornado
+	test_update_job
+	test_update_job_clear_next_runtime
+	test_update_job_next_runtime
+	test_update_job_nonexistent_job
+	test_zookeeper_client_keep_open
+	test_zookeeper_client_ref
+)
+
+python_prepare_all() {
+	sed -i -e /setuptools_scm/d setup.py || die
+	while read -r -d ''; do
+		sed -Ee "s:$(echo "${test_failures[@]}"| sed 's: :|:g'):_\\0:" -i "${REPLY}" || die
+	done < <(grep -rElZ "$(echo "${test_failures[@]}"| sed 's: :|:g')" "${S}")
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	py.test || die "Testing failed with ${EPYTHON}"
+}
diff --git a/dev-python/APScheduler/Manifest b/dev-python/APScheduler/Manifest
index 98880575f36f..200d99ffcd41 100644
--- a/dev-python/APScheduler/Manifest
+++ b/dev-python/APScheduler/Manifest
@@ -1,7 +1,5 @@
-DIST APScheduler-3.1.0.tar.gz 79124 BLAKE2B fefa9e273259eff7f2ce6889064e5fa6333d6eb76ce0fde65a3e3d41a44b81466d9329cee211c8641ee543802b0691bf0a89c55701adb6f6a301c3c28543878c SHA512 8f8b1a997dffd8ebc090113f3edd6ba1c18514e2583e1bca52ed54b28c7965d146e082fa64de968f44b18b39aa5ead7e3114e3e049102aaab35c52245f37497c
-DIST APScheduler-3.2.0.tar.gz 80946 BLAKE2B 4c8e74b35fb0167b8238792c1064e73570d385f9a149ae6c222fda596fdab61d5c1a641e4aae83b799dc4a21df7772538cea15e34d5b229e9ffe96e7e56ac482 SHA512 451e03e01a5b01126c8ab21acb6b053099271056372a5a66cf302a6aac02f5d4d9b033a0551d1029d82dee32b74db01518fc21c8bc718bbd38cf6417f68234e0
 DIST APScheduler-3.3.1.tar.gz 84198 BLAKE2B 8706c68dc2b8097d4656da00b62b298ad2b0cb94079bd32b08c0c3316f8317bf299d513ef120822d40b938aff4c49aaa9a1beef9d91e554f02413407b2848711 SHA512 af861bff47f881200d97551d60a6d3210c9bf864fa83a37da7fbff31d24e9fce5d64d965ffefe6f8678320ad6dcf86dbdc65b611991b14fd8edd18efbf7e6bbd
-EBUILD APScheduler-3.1.0.ebuild 1004 BLAKE2B 2fc441b0c1c1c7342298b983b4dfeda0e3e6969b1431ac9ff2a6ee5ad6d93abc49e1ff91ff260ddcd56bdf75bcf4c8d831a65e1ec6ce7da83c94a91d6c6211e2 SHA512 854a5800224f12e1ed84aaddd9a7c3f2ad67009831b5aa064f7d83da9d4095593b4337b9fb5b1760b12540f4715a779e559cd561e33f1e2ed294f4d5a20da39d
-EBUILD APScheduler-3.2.0.ebuild 1004 BLAKE2B 2fc441b0c1c1c7342298b983b4dfeda0e3e6969b1431ac9ff2a6ee5ad6d93abc49e1ff91ff260ddcd56bdf75bcf4c8d831a65e1ec6ce7da83c94a91d6c6211e2 SHA512 854a5800224f12e1ed84aaddd9a7c3f2ad67009831b5aa064f7d83da9d4095593b4337b9fb5b1760b12540f4715a779e559cd561e33f1e2ed294f4d5a20da39d
-EBUILD APScheduler-3.3.1.ebuild 1008 BLAKE2B 06d01c4caf9f0e717b78e5db0208018b945471d867eeef2fc3389df47080ed794b42905856d78742ff7b9f6de4c6ce165eac15ac6ad709f25cecf2e2f873b4c5 SHA512 3a0db6b5b627db05ccdd3f5ee8c9fafb20a323c81e1defd1c8f675fe6199982ce699314326a078a22e71c749c6bde547c75fbcac7bfdd5dd7e622dc872e63fc8
+DIST APScheduler-3.5.3.tar.gz 95527 BLAKE2B 3d1bb49a497781d017e2fbd47176186f6449650500c57a141a114f6c610081b9d85553793f9c9f00422d3a299c26c292ab667cfe3866c381bcbf39161133b615 SHA512 dd3e98d0f474511851bdc109a1c65f7f97d221f95d086603d12b3f280285460234724369f05816e1754d58d94adadbec0deb8a0fa63fcd6531914d4a1f4fb3fc
+EBUILD APScheduler-3.3.1.ebuild 1921 BLAKE2B cfc62442a7cb41087b85be59cefdca484010a3612c006a63e0fe9665b6a39b3a8487f5f021281e28411cc0042787dd89d05c53b3587d3396d69555607a94367d SHA512 8e0c06b3a765594db9113cb9f1ed4149b8baeab44d1dc3fca975d6e8b145eb1505e87a358e57914c3d29efc81cfa5e16c2ecf2015a03ed81b9f4999bc381c992
+EBUILD APScheduler-3.5.3.ebuild 1864 BLAKE2B 2c5e849cdfff471a3119dc1ac01528777d6c12ef78917f0f05fbcdf0c096dfd30981154ce4840964e4c9fd3cc6fff452a07bc740087b74edf969a9bafeff4152 SHA512 747094045c38d2813a816d9b8e5c045eb53112a8933b8ba2d07d98651be76d2626f1a1b910cd33dd4e425bb78199fdbd45cf512cb6aa10c037d962b163308905
 MISC metadata.xml 353 BLAKE2B e0c141ff0ac5a9f98c3b55871de97976f15324b722420a8def45a053b2fdd0b992c44bd6d1c4824c479700871951423ff13f921043a5dd8770ae73a279deac9b SHA512 48d42b0d3fd5ab07ecbd8554cef11d06bf5d7616e777d6e76103699f305f9aee7bd8618294d5548a62815a621bd4fe6ac4d32c008b79ac7f7334d6a29a261008
diff --git a/dev-python/CoverageTestRunner/Manifest b/dev-python/CoverageTestRunner/Manifest
index e6187c1009ee..d4f33ef9de5c 100644
--- a/dev-python/CoverageTestRunner/Manifest
+++ b/dev-python/CoverageTestRunner/Manifest
@@ -4,4 +4,4 @@ DIST python-coverage-test-runner_1.9.orig.tar.gz 19175 BLAKE2B 993e4ba1daa6863eb
 EBUILD CoverageTestRunner-1.10.ebuild 590 BLAKE2B fac5b3d7acbaddd9fc0526be743f6a53c35a64b644a7c428e9c18a3ab0d24906cee70d4b683ecb9826e9e8a2aa78999c7e0ab7090b0269d18de31955bd999ad0 SHA512 7066d3bdd2f86b0204cfaa1ea5eec6d19941f76c30beaf0dbf8a89357fbd3070772b8bd4bce52b31f36a8c0a30f6ea54aedf272e1f31b0b436be55e470328026
 EBUILD CoverageTestRunner-1.11.ebuild 621 BLAKE2B 9485713c04ff6f5c2001eaf099c7dc45fa41702babb7c2388b16c163cd4a1d4de9f82a548312ddba07c4541e69f16a3bbeb34ea96c246d3af1855c7af24f6437 SHA512 05cda3d36c82e1b73ad1c809e9d18bcee3b57398298c06907e6cb34a76e9aaee9250faf2bff89ab78e9df3a0ff4c45f96ff4a692cb6a50e683873df00f53ae7d
 EBUILD CoverageTestRunner-1.9-r1.ebuild 572 BLAKE2B 4b9d2b1e9c9630d58bead94f7177256533e1091147ff2e5ad7526db74417795f3c605bc09bde2bbeebf41b4843e4aec907c6e686a1d94dec61de75a83b8ca775 SHA512 2bf2a2267483a3f0cbaa41f40fbc58092983833d0cf7a2da23b2417740878ff4bdae7b88c50ff1d87e618b4427ac419801f8bd87be8c3edb7af5449002e313c6
-MISC metadata.xml 250 BLAKE2B fef48a48388f26a915c53bca9aa9cab62fb73ec006736542afb4cbbe0c7b81d23afe2884f52433c7d390fc38ac32f957a6f6efe285ee1cafaed76407a964cf9b SHA512 924271cfb32ceafc4134e19b53fbeed96f2e9056addc3c2cbdec28890254abf5f0714979a3ab698ca046e41ef5c2cca2932350830bd8bd3a8e214d99123c12de
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-python/CoverageTestRunner/metadata.xml b/dev-python/CoverageTestRunner/metadata.xml
index ea6b59e79026..7a38bb900964 100644
--- a/dev-python/CoverageTestRunner/metadata.xml
+++ b/dev-python/CoverageTestRunner/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>mschiff@gentoo.org</email>
-		<name>Marc Schiffbauer</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index f6a2b5849134..a5e097f5db74 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/PyQt5/Manifest b/dev-python/PyQt5/Manifest
index ec4a8591e714..c15fc6bc4b34 100644
--- a/dev-python/PyQt5/Manifest
+++ b/dev-python/PyQt5/Manifest
@@ -3,7 +3,7 @@ AUX PyQt5-5.10.1-timeline.patch 1063 BLAKE2B bcf04d91798b0dc2136ff9c85802abd14d3
 DIST PyQt5_gpl-5.10.1.tar.gz 3110469 BLAKE2B 75e24bd8c0739d47eff6212435aa783eaa302633beb0494f099edc3f8f99600cd03dc3cba5152ed7ae703cfe445ecae06ec5d2281dd7c0640c71db041659bd6f SHA512 04cd0292f7a088f9c0d088d7c73ec96cfc40253f771dfdf194eb92be7635e6fcaf04863fa24215e9c34a096658549bb2feeb8d8fdca1e39ed87f0256ef0f790b
 DIST PyQt5_gpl-5.11.3.tar.gz 3121036 BLAKE2B e7881fea18535ba55c0b6946718fd1eccdc6a4678b869678c9413c500daee0cbfb281116db40a13655c8cb5e778b605f141821e20bf3834f1434908f73fc22bd SHA512 6f4abb1866ce357263c208121607072e127c8853e9c6bf039b034fefdda4c40e38f917c3b313375f0d692d764ecf26ff3a6b12cda2a2eeb5237db8b5e9443548
 DIST PyQt5_gpl-5.9.2.tar.gz 3102848 BLAKE2B b87f25693aa2b20211119f89cf13665bf88f14de8827d43ba757344ab9bdef0b0c197abb8386308c72925da263cabb6efd3f104db8a350c51fca3fba8c7c06b6 SHA512 5af2e65addaed7dd02d8dbf7a7c63767e565fc8edeb7b51e5991a00cda29f75b666529097646e821aaff556f350a929fd451f548bba76e97355b7fe10bd913bc
-EBUILD PyQt5-5.10.1-r1.ebuild 5726 BLAKE2B 2fd96947e8386cd0cb04392bd62644340f5b0345f06decca25e21e2cf194d4a9e42fd3bce5b06c7d3afb1d86a83ca17625a45b8b3d66e41f06a3340b8eeb360b SHA512 ad1a428b6894868156bd36810c5476f68e7d23311cddae2f5b7f47bce7827caf223b6423204b4afa3a697848e6ffba46cee8a45753796550a0b6edab4b23f72c
-EBUILD PyQt5-5.11.3.ebuild 5675 BLAKE2B 0066cee24acae56af544117ff497132171fc6d09e7e30eb3a0236467830864cd7b2514f7c576b9bffe56f10375e29d7c27cf5e129aab89dce4801ba035f8ed30 SHA512 edae44de1577c98ac55639c6da68018c7ffd03fdace48ff44f6ac661cef85ec25acb74d8af128456ca4282d4fdabebc0c2ee6aab81859d3c2918dd7716fa96e4
-EBUILD PyQt5-5.9.2.ebuild 5687 BLAKE2B 42b0f29d9e9652571b29acfdc3ff90fe5bf1f4ff8776855df37faebb92c11c5e6c049fa10d4d8b6dcb323da379dba0a8bbf231f6751a3be715b7384847d2730c SHA512 d71ebc7f8f90b4e80566a31b8eca0a291f51aeef5cc66f8c860581e69ca70131339606f917e9a1f0e99beb5132796721bc9033667c977ca4a92023be5c5bca8c
+EBUILD PyQt5-5.10.1-r1.ebuild 5734 BLAKE2B 4830d56f6c211d23c85b479504d93426382a2bc4531ebd383e9039189c9b894a23ac6c3ed3e6faeaea2eed8fa5da040b282b1661487b852a56e7285b71d1940e SHA512 e6015c904e41fc24508377cf9dd1dd72907d41f239211132805ffbd432b5dba7b1dbeeeab8d3c269e23f3a599a9ab60b1386d60060203f1f7afe4e83d3cfa458
+EBUILD PyQt5-5.11.3.ebuild 5686 BLAKE2B 0934879154a16e7aee58f17376887ca86d1ef535e589275e4f328c4ecbb0f1859f1974cbab9ce95b08c17d42564c6f2aee795c4c2d490fca7468baabac8115e0 SHA512 960d3ec9a7fe42657219d04cddb64be8acefae1dfd6bfb66ace98763b2468d8786446514c41ef918193fe8eea911be1de8e350059d087513bb0159e052301306
+EBUILD PyQt5-5.9.2.ebuild 5662 BLAKE2B 58bc9d3d91e3c7e8c8e49bb4095c37c8428eba4568b9136a16e72c1389dee408ea7a209f795e660200eccf530b7b4f285066d7b92d479cc37946f05b7d3eec85 SHA512 46118296b6ff41478121464896050e58e552f8e8e16de232f44211d86516a111dfd0bf02c10ee92f3dd19e9cea05f43982287b59ca1e16d4ba1125d21ebce010
 MISC metadata.xml 2458 BLAKE2B bbebf12bc59da0f7b6737598e9c683f6ec45872a7207c23fd5b47c73c68a9eeaaf9ac0d4fc18c05d3e79b22e333bbb43d2bb7bd70aaba80288d0fadf1020d8c1 SHA512 8554c97aeb873a2a7e1d50b8aacc3638a87fdc0fdc367d61123b63bd506b1376873d88a967773e8f1050f0e8c35ae180d61c7eb2c213c345e5b17a3c0e4c7df8
diff --git a/dev-python/PyQt5/PyQt5-5.10.1-r1.ebuild b/dev-python/PyQt5/PyQt5-5.10.1-r1.ebuild
index aac34c8a33a8..8b331f240fb1 100644
--- a/dev-python/PyQt5/PyQt5-5.10.1-r1.ebuild
+++ b/dev-python/PyQt5/PyQt5-5.10.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -169,7 +169,7 @@ src_compile() {
 
 src_install() {
 	installation() {
-		local tmp_root=${D%/}/tmp
+		local tmp_root=${D%/}/${PN}_tmp_root
 		emake INSTALL_ROOT="${tmp_root}" install
 
 		local bin_dir=${tmp_root}${EPREFIX}/usr/bin
diff --git a/dev-python/PyQt5/PyQt5-5.11.3.ebuild b/dev-python/PyQt5/PyQt5-5.11.3.ebuild
index 5eedcadd3ead..b072e6d3cd77 100644
--- a/dev-python/PyQt5/PyQt5-5.11.3.ebuild
+++ b/dev-python/PyQt5/PyQt5-5.11.3.ebuild
@@ -163,7 +163,7 @@ src_compile() {
 
 src_install() {
 	installation() {
-		local tmp_root=${D}/tmp
+		local tmp_root=${D}/${PN}_tmp_root
 		# parallel install fails (same issue as qscintilla-python-2.10.8)
 		emake -j1 INSTALL_ROOT="${tmp_root}" install
 
diff --git a/dev-python/PyQt5/PyQt5-5.9.2.ebuild b/dev-python/PyQt5/PyQt5-5.9.2.ebuild
index 1b83fe1a7cd3..2a9f2c434ae8 100644
--- a/dev-python/PyQt5/PyQt5-5.9.2.ebuild
+++ b/dev-python/PyQt5/PyQt5-5.9.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~x86"
 
 # TODO: QtNfc
 IUSE="bluetooth dbus debug declarative designer examples gles2 gui help location
diff --git a/dev-python/PySDL2/Manifest b/dev-python/PySDL2/Manifest
index a0536f624ac2..9b3c83097fde 100644
--- a/dev-python/PySDL2/Manifest
+++ b/dev-python/PySDL2/Manifest
@@ -1,5 +1,5 @@
 AUX PySDL2-0.9.6-0001-test-Always-allow-greater-patch-version-of-SDL2.patch 1812 BLAKE2B 7551d27fe1044d9a7bbe741fd70417f3f180d722915e53ff4374efc5575c70c8171cf4032d26e3b7703eb39e7da4998c6d867447a5338c76897ae84e598192ac SHA512 1a26d4db26b5fbc3c259c110825dbefa272e5c565928d041951438d1ed2012a67b3a06b2158b1c2a7c57685ab6e22363c3841e8bb3bf2e54ea21553b386c89cf
 AUX PySDL2-0.9.6-0002-test-Handle-missing-haptic-support-gracefully.patch 950 BLAKE2B e4baf35535ff37a845ba65127d6e580d2c5086e60df0d03a6939b5fee7dac860475503b01644097d9af2a21209e25258524f0feacd45729574034095615ecaf3 SHA512 50b1785d02290ce9544743cea245e216f8cbbadaf9dfc0c865fadd21e1beea88a64d89a304bcfb72e8b2cc19a961fba3c23de028b7caf7e16739f9665dd9aa1a
 DIST PySDL2-0.9.6.tar.gz 1048158 BLAKE2B 70a450990dd73169489af2d5b218eea0794c9f75948d774680df4b4423855318ddc6d16a0453f62361d4f0b81e872edc067235c4f946476ea8988e16cd0de44c SHA512 676b1b3381b614122442c70fe4cbd7c210ef3d8695c2babd37938e67b5cfeb2f8acbdcb914c5f68aceb549d89f7a77bdc80c7406b340b0e38c22543df8d46739
-EBUILD PySDL2-0.9.6.ebuild 1861 BLAKE2B fe6bcd721710c794428de82b12a7eac27bfa2e4d5998284d6983f8f270ca8cbf2fe10a0db7d0d87dd508ad3c9b9c742dc554def15ac558bd2ac3c1641fab612b SHA512 dfe479437a029a158db556839d9a2fbacc47fc4faf534fdb4ab056cdb0a6c45dc8d7fe4697bc509104b4fa9364aa65b82c3487781a74bcef86f8a423e1246e95
+EBUILD PySDL2-0.9.6.ebuild 1860 BLAKE2B e568af41f2c627f34cb3787ed86443ff08fe0c2e050d9fddce43efaf1e4acbf5e325759754257379e94899818867593ea8014d243677bfe3c5484aefa6912e33 SHA512 5b19b1c0a7f4eff2c7d86cf89bccd8637c1fab944f7ce05731ec4f7cbb83c645925696b7ec10d8998255a1ede310fd7df1645c76e8c0fb1b1e31312422f0edd5
 MISC metadata.xml 451 BLAKE2B 2bc91faee3235d8d971aaba13051362ffe22563c5bc5a33a4dcaa0fa59abb7f238310d271a5311c98d4f69b112f731e11d1c8c49fa1a1d2bed1a5acf36c905f5 SHA512 50ba020088e640ca59a7ab64e30ff760b4708866ebc54b91fa2a12e4408463ebb0b04cfe990113bb7f556cbe8a4fc369fe86e3da4ec5b79a76752868cd08a62c
diff --git a/dev-python/PySDL2/PySDL2-0.9.6.ebuild b/dev-python/PySDL2/PySDL2-0.9.6.ebuild
index 77afc908e4e3..999905f52e5a 100644
--- a/dev-python/PySDL2/PySDL2-0.9.6.ebuild
+++ b/dev-python/PySDL2/PySDL2-0.9.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
 inherit distutils-r1
 
 DESCRIPTION="Python (ctypes) bindings for SDL2 libraries"
diff --git a/dev-python/PySocks/Manifest b/dev-python/PySocks/Manifest
index ccb8cc133e28..e0ff375851d3 100644
--- a/dev-python/PySocks/Manifest
+++ b/dev-python/PySocks/Manifest
@@ -1,5 +1,5 @@
 DIST PySocks-1.6.7.tar.gz 282874 BLAKE2B 9e4ecf57f6cb9b7690ba68e21b3e52a535a08490b78ad5d8bd90384acf26f16e6a08018eaa7e91763b94182119217404b235425fce146af7e989c5e39e5e07dc SHA512 e49ce2f4ce23fd84ce30a62a5585af3c63980db46e7d427571d8fb8f6b85f4b6aeb37066863491496dd322555a5ce261123d613b8e5819dbdcef8a4e17e5dca0
 DIST PySocks-1.6.8.tar.gz 283450 BLAKE2B 72b52fcdb9f3dc3bd71ca75cdbaa159c0b35a81fd4ed9476ab043819dad3efac76615bc751fc6014e1358a13a3a735023bae7f502e2863b5e733982c16758db1 SHA512 9b544cf11464142a5f347cd5688b48422249363a425ccf3887117152f2f1969713674c4bba714242432ae85f3d62e03edeb9cb7b73ebd225ed3b47b3da6896d5
 EBUILD PySocks-1.6.7.ebuild 594 BLAKE2B 661b2dc419e6a329f8d05ef90fd455237dd523a02edbf808ce68bd65fb1be3793351b9e8ef46a4a81e6876ce923d9e5a06f1005e45938dcccff71cf270e955f1 SHA512 e401376bccc8ebf59c6736bd552ad95a6c1e6d21bb6316230432ed79b1cb2016689cad85f45ff83677a653b4bd33528ff21ef0b688da2aed6ec34b92515ee563
-EBUILD PySocks-1.6.8.ebuild 891 BLAKE2B 53563175d2a5238d92bfba2f0d5d3c544f1cc9bb571eb4071cb6f47f61cae67f3efb13abe8eba769347b9faf3bb70da3b2946e65569ab7b1ad5f2ba5327d1a5e SHA512 629e81b6f1f7a1c58df8a7212ad7ea29451e40fc6f6401b709623cecad95f7a50618de0e4ee2651697ca1b4577e4ee27c9a1d502292622fac8d339918a9d8782
+EBUILD PySocks-1.6.8.ebuild 933 BLAKE2B 329561bcdf6a7432d15c642ebe6b6657f5a046fa7b3ca9b4c26e2e8213b87d03e1caeacbb5ef7fac561aa2a81a80a26a8141eceff8f073dbf18cd4763230cd83 SHA512 95c3d9e23654b3c40d89f1358702339ee01d16e13f7fe211e2536c08cfe961eef4f6260b93dd0970b94c5f3a656e866f5aa743377f45ed8cf05e875ab552f70f
 MISC metadata.xml 499 BLAKE2B 6eeb0c4905d8f0d6c2d276b36a74ac9e1aaf3f5066ba79ea3b821fa31440a46c4ba49f88be096850032cf8598f6abee09182d84a35345fa53e1001a05137dbe0 SHA512 ec9cc3e4f9a050f78cb0c073efd3698b47aee2ce14d438163b5037509a5d8076509b4954bec0afc7f1e05bc790f26a6a520bb671b1c8590db966456dcf53b9aa
diff --git a/dev-python/PySocks/PySocks-1.6.8.ebuild b/dev-python/PySocks/PySocks-1.6.8.ebuild
index 5fdcf84da6b6..4ed651376954 100644
--- a/dev-python/PySocks/PySocks-1.6.8.ebuild
+++ b/dev-python/PySocks/PySocks-1.6.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/aiohttp-jinja2/Manifest b/dev-python/aiohttp-jinja2/Manifest
index 7fec1f646610..87d032b8a7d5 100644
--- a/dev-python/aiohttp-jinja2/Manifest
+++ b/dev-python/aiohttp-jinja2/Manifest
@@ -1,3 +1,3 @@
 DIST aiohttp-jinja2-0.15.0.tar.gz 51183 BLAKE2B e19ca813f36ac746a84812ec278a3de43e6e24eaafcf949fd18a32c99f460ded03f4dc97171fe1493174a8e2c51543b8c1afcdec51c4688f4fb0b7781287cc03 SHA512 084714cd2376b93f32cdcebc1971d4aaa704a177524b00f322e0347c15ab8085960a68a3760be056e391410f01b6b637eb59db54fccf54d09ba53a9ea03a01db
-EBUILD aiohttp-jinja2-0.15.0.ebuild 1128 BLAKE2B f0ba27b253c30de124f5e25e8371d3a1471d52998756b2f12db1caa61df0dbf0d6ac993a85f09518db84d61f75433e46fb64b13eb3c73b7b350ec7bda9f631aa SHA512 18ac2ac37ce85b95a25ac06e3cfefc8a2cd808580d49073154592f7740ca45518b3a5ec12070218535f56d0107af501ed829ab9b5b7d8558d6859683b1ca9366
+EBUILD aiohttp-jinja2-0.15.0.ebuild 1070 BLAKE2B 758e4518e353f8bc1fa52a7eef3f7922a2b47e48677743a5d1a9b77b0024b039eef356c881a2dc732afa36884cc8c2699a1f109049e752179b94e2038187514d SHA512 935b1dc2e522706177fb88a337efce44e61bb890d3c975461a46f47e0152e86c68bcbe7346925ce22e7f4cf7ece23335d76c41481c539d4331fcee057c12afef
 MISC metadata.xml 384 BLAKE2B 37044e46bf0ffa1925c6b50e3d2298993ecc3c8f42e18c52bfec22b620dafcabc77cb63f51f98337470f0edeb600c6b96c0b518f012bcfd3147a0f91def9d30f SHA512 fa82c2fd1f793d00baf665208c6321db03f037782c592f84d5efef68c271413ec080cd0322fc308cb4eddbb3e8667b907036eaf4cf8e00a800b9657bd9b366e1
diff --git a/dev-python/aiohttp-jinja2/aiohttp-jinja2-0.15.0.ebuild b/dev-python/aiohttp-jinja2/aiohttp-jinja2-0.15.0.ebuild
index 9e58af359e8c..208e9036e610 100644
--- a/dev-python/aiohttp-jinja2/aiohttp-jinja2-0.15.0.ebuild
+++ b/dev-python/aiohttp-jinja2/aiohttp-jinja2-0.15.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -30,7 +30,6 @@ DEPEND="
 	test? (
 		>=dev-python/pytest-3.2.2[${PYTHON_USEDEP}]
 		>=dev-python/pytest-aiohttp-0.3.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-capturelog-0.7[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/aldryn-bootstrap3/Manifest b/dev-python/aldryn-bootstrap3/Manifest
deleted file mode 100644
index 8c4123726d28..000000000000
--- a/dev-python/aldryn-bootstrap3/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST aldryn-bootstrap3-1.2.2.tar.gz 699492 BLAKE2B 3d1ad92ad95c977d13aaea425a6c1880a8af09086e739b8c2ff7c240bc90af2e96e5bc4d1c3561746938e58a95cae9308f90e571e0b43f31697e143729d558bf SHA512 d99a8b734911e2f1d8c23fae074690687f5f41a9ae179ea93aef38ddb46a6fe97135d76c81159509eb00d6095ef88b870a672eef692ed05f378bd991fe9aca57
-EBUILD aldryn-bootstrap3-1.2.2.ebuild 835 BLAKE2B 28e075bfc7242cbcb0e32e61a4a97af526b2c33811064b2861dcd0a7910c3d828ad97b2c67f58129c4091a671dd471fd7a6f6a24e8c66d4cb702eeaabf6c497b SHA512 eac4c005f813a8043740218018f7161daa3548d87558accf440816f5509251de0b786c02173388ad673454ff03a5cb6efa9f6bb6c16452212d52a75e2cc5c829
-MISC metadata.xml 312 BLAKE2B 87bd5a56630eeb8acda2fff9e6f39d9b513bd27a530489338b59007215669befb9e3a36989c945b3359bf2936c9e799ea515028216a0ca53c176f0ee8b1a7bd0 SHA512 9884d6d44e9edff3a3e9480ef157fe3315eff1c413a2519b12c0b8db1c669ec167f64666ec4fa5dcbcf2760bbba346f09fd88e9ab6b293fa090ec133066866de
diff --git a/dev-python/aldryn-bootstrap3/aldryn-bootstrap3-1.2.2.ebuild b/dev-python/aldryn-bootstrap3/aldryn-bootstrap3-1.2.2.ebuild
deleted file mode 100644
index d6bd9261255e..000000000000
--- a/dev-python/aldryn-bootstrap3/aldryn-bootstrap3-1.2.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="django CMS plugins for bootstrap3 markup"
-HOMEPAGE="https://github.com/aldryn/aldryn-bootstrap3/"
-SRC_URI="https://github.com/aldryn/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/django-cms-3.3.0[${PYTHON_USEDEP}]
-	>=dev-python/django-appconf-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/django-filer-0.9.11[${PYTHON_USEDEP}]
-	>=dev-python/djangocms-attributes-field-0.1.1[${PYTHON_USEDEP}]
-"
-
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-src_prepare() {
-	sed -i 's/find_packages()/find_packages(exclude=["tests"])/g' "${S}/setup.py"
-	eapply_user
-}
diff --git a/dev-python/aldryn-bootstrap3/metadata.xml b/dev-python/aldryn-bootstrap3/metadata.xml
deleted file mode 100644
index 29783cfca9b5..000000000000
--- a/dev-python/aldryn-bootstrap3/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>slis@gentoo.org</email>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">aldryn/aldryn-bootstrap3</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/aldryn-search/Manifest b/dev-python/aldryn-search/Manifest
deleted file mode 100644
index f6522085d225..000000000000
--- a/dev-python/aldryn-search/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST aldryn-search-0.3.0.tar.gz 26548 BLAKE2B 6c26ef8f41648a2336cbddcffc93366853e5c96c0edd01cdc1828c65ce446efbdfeaf35ef1909f0aaab9663fea806b2f8fb07375df53e482ee8c5b75f7746db5 SHA512 ce428ca844798c938964be4412ad87fc9f6c152f4d9bb711e23d0eea4d2c1cb9d2e2e0590648d2f29beb60273562c995f18a5c754107c61db3a19bc139f55c67
-EBUILD aldryn-search-0.3.0.ebuild 882 BLAKE2B 60d2b5d92afb919b21e13caabb06a4758748188352df521460e327bf2cf1c988e164de8ada1abf8b3409c0439649b2384dc0baefb5753c4f031ab8748d3172fa SHA512 9f00e8ebf90b3331882273827f5720d3b7a58ee4491a92af5d86e265371942efd5335b1d1aa557e4a3f5687a171eb87592820485b7942a907f28f5431904f448
-MISC metadata.xml 361 BLAKE2B 88d62dd612b74973b3d472139674b6be9402e197c962f38804915cee8cba834ff9e5491f7d16d9c96bc949cc5f5682c9355869e1ff126e17830a2c0cb0c17668 SHA512 dcb9fb6f30d2cdb87dc6ec0a57640728ad10070a62ec344fc20cf2da4d9c843ce787e32acf0a4bb9547714dbe4b68ca2f9c529e8f852729245acc909fe4ed31a
diff --git a/dev-python/aldryn-search/aldryn-search-0.3.0.ebuild b/dev-python/aldryn-search/aldryn-search-0.3.0.ebuild
deleted file mode 100644
index 3b3667ebca26..000000000000
--- a/dev-python/aldryn-search/aldryn-search-0.3.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="An extension to django CMS to provide multilingual Haystack indexes"
-HOMEPAGE="https://pypi.org/project/aldryn-search/"
-SRC_URI="https://github.com/aldryn/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/lxml[${PYTHON_USEDEP}]
-	>=dev-python/django-1.4[${PYTHON_USEDEP}]
-	dev-python/django-appconf[${PYTHON_USEDEP}]
-	>=dev-python/django-cms-3.0[${PYTHON_USEDEP}]
-	>=dev-python/django-haystack-2.0.0[${PYTHON_USEDEP}]
-	dev-python/django-spurl[${PYTHON_USEDEP}]
-	dev-python/django-standard-form[${PYTHON_USEDEP}]
-	>=dev-python/aldryn-common-1.0.2[${PYTHON_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/aldryn-search/metadata.xml b/dev-python/aldryn-search/metadata.xml
deleted file mode 100644
index 9a396b038d02..000000000000
--- a/dev-python/aldryn-search/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>slis@gentoo.org</email>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">aldryn-search</remote-id>
-    <remote-id type="github">aldryn/aldryn-search</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/apsw/Manifest b/dev-python/apsw/Manifest
index 63aae10eeca4..2f2faf27e91a 100644
--- a/dev-python/apsw/Manifest
+++ b/dev-python/apsw/Manifest
@@ -1,10 +1,6 @@
 AUX apsw-3.6.20.1-fix_tests.patch 340 BLAKE2B c70f404afaed26c92f60690820812fb0ccbe355f43384b4e0a931851c27348b04335aa4c25baf5b2662c85403ad2eb075ce049a724c297a46ea2f796845aebd8 SHA512 386cae12d949a6f4dd55dc7e3e1bc176c43c5001f10acc75261c92fbe14bb09c0e054dfa4087d285496dec4cbd4a9add5733742dbfa82c6e10ee1c8d0f43fb0a
-DIST apsw-3.19.3_p1.zip 678966 BLAKE2B 1726a50024369831fe0ee442676adc4415c7b71e5e12beddd4e09f688aad930bb54664435c569ca728c2dd7b24b4eb46655778c7c35249731f3a83194a40fe6b SHA512 9f9e05c865a19e7b6e6b37e6228027c027ba683be2d5ff7a1767bb3bbeb090bf66879a0eead4fc9e34fc4d84c1edc98137b2839f84ffab9bd36330d05435ab4e
-DIST apsw-3.21.0_p1.zip 680827 BLAKE2B 8fceb2d782f3bbaba28f26904ed11281be7e2be351d78c41d39d2941ad45304bd7e62cfbbc9134e21b1ffad4f7b7d1373a2866d6cbb61345c263502b23fb018a SHA512 c2009d243765532e27220478d1164f97201afbd2b1de1e4090b4f35b63c83d0a82d2bdfe14c6625858867633995d3d8eef91f17ecbbd915f99e5a4a4edfa7b61
-DIST apsw-3.22.0_p1.zip 680988 BLAKE2B eda9b217ee8d23b5fc80e5d240b11493f8ef82208f3b694619ba168f4bd640691cdf253d9315fb0f2d178fcce2bd1ed4028d75488f5fb3c0db95c518fec8f71d SHA512 c82de649a9245283dd0acc37700270c6c4dde1995cdc88bf7afb7cb3913a6f1a4a7a077e80eeb70cccf2fcb058406b610c9f05f478c6dc9ee8f7ff9cde7c7395
 DIST apsw-3.23.1_p1.zip 682088 BLAKE2B 0b1c492c68522f9d3d1c693370b3b1562de0e4521f3a3de0988c40ddcf717f79201555228c16b9b9870db47582bf2b774f7e9ce0ddea4e19c3d132bbf2322551 SHA512 8f3bc9e619ed8671a0804e6d3c9ecf34d452a4e6fe540fb23bfb6ae67578971013300ad6cdffe3be2fc1197c4fd3af096802aef5994cbe53253467133363ac62
-EBUILD apsw-3.19.3_p1.ebuild 1055 BLAKE2B 0051a9e6f3ac8a4e9a082ba67519120ab53b2b436fff94294eaa4aad1316c1a854186c0d36e596e48902a7f5fc84ec986c1761dbe05d2ec5599ef8563bd77b1c SHA512 f8a332998543699139d5ca8357f5cb9c7ea5ea7c07dddb142058a906bb28005f451136cb8c7774bf47ba4bd7c8e76091e35843206f53434632cf0ba275f615ef
-EBUILD apsw-3.21.0_p1.ebuild 1057 BLAKE2B e175826406da5d6fdef7b3122dffff395be9a5aa4c994e21509731e55d0895fac19a462fcaf6ade0815bf939a889c54e478732f3d5854d412e8cde02c87dc16f SHA512 f818ef35546e3d46a2f42f0506cedb4d3aedcdca46a151a56cc8b68ee8958cbfdd82a874c78bb1a8d79db144d85509602009985c2367fcd1df64c2c6cdce2b53
-EBUILD apsw-3.22.0_p1.ebuild 1057 BLAKE2B b5eab2c145a4a5f93ef02e4ec5d466c4489413f9653c1a8e94b4f2af2c01903581b41075d59c5e2d64edbc4292c81ea559bba9f9ea7cb148052fb49bd4a48cfa SHA512 9ec4e8b5c58fc9825a137c15783f230a5cc64373c5cf50d6073435292246fcd09b0243601e06d22efd1af4bdfe1dd032639fe17623899a6425e55352cf050b11
-EBUILD apsw-3.23.1_p1.ebuild 1057 BLAKE2B b5eab2c145a4a5f93ef02e4ec5d466c4489413f9653c1a8e94b4f2af2c01903581b41075d59c5e2d64edbc4292c81ea559bba9f9ea7cb148052fb49bd4a48cfa SHA512 9ec4e8b5c58fc9825a137c15783f230a5cc64373c5cf50d6073435292246fcd09b0243601e06d22efd1af4bdfe1dd032639fe17623899a6425e55352cf050b11
+DIST apsw-3.25.2_p1.zip 682975 BLAKE2B f9f471378cddd7da1c06158b7a041d9377da4d4123846318c0cfc24167734bc1813f667e64c4c6bf643c6a618c9cabf58301dfbaad0998082d764212ea369fff SHA512 073b2fe9170fb00ac6f2ba52eb638d64d79875ba74b09f0307fa2c075e714bb91465fd2edd46341dac5cedc0bee0a1099888b6c1cee706fc04fa6b9ad99c47d7
+EBUILD apsw-3.23.1_p1.ebuild 1055 BLAKE2B 1eb4bd58648a513003eacc4e8536aa6d4d574333875153d5748cc9dc7dc4934ff822b208a480e5070b6cc2dd18bcdb4a110a9978b6e36c20a80f1b3411e0c8d1 SHA512 74669d48fd3005cacb317e4ab06866baa66fefb9e6af86d6db128892ab86b8d443ab7933fdb5a0959d42711ab0877f12f13d09f5f8f928c29bcd60d0679a6488
+EBUILD apsw-3.25.2_p1.ebuild 1058 BLAKE2B 1e7a4a59a85ed32a442cb4693786db1717f341dbe7bab994a82a393057808d0441a565434da6dda29d2767864dc35bf47be24e1c4b6bc5f01bac9739fd38d77a SHA512 d9d1dc1b7f2d17138289109fdefc2cbc0469df3da3461a7521df288ab37253eb88cc10bbde079247505b9f24df12a2af3406fae2150104b6a98c7550e621eca4
 MISC metadata.xml 677 BLAKE2B 8125a6d9906cfa5626bff6182635ac0b6c65d52abfb9011fb486430055b3484855a7529c0b4fe7d3c2bba8646318a8cb01a37e2ac0b63def11abae26bef6882c SHA512 970eb7e730f147bbe24fbe377f6b9a1557f56d536ce462aef5ccba23059295c4c8d88bb384a7b7ec3f401a512e04134ebe19efa03473a90841d7c6246e2eb244
diff --git a/dev-python/apsw/apsw-3.19.3_p1.ebuild b/dev-python/apsw/apsw-3.19.3_p1.ebuild
deleted file mode 100644
index 21e24d9891e4..000000000000
--- a/dev-python/apsw/apsw-3.19.3_p1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit distutils-r1 flag-o-matic
-
-MY_PV=${PV/_p/-r}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="APSW - Another Python SQLite Wrapper"
-HOMEPAGE="https://github.com/rogerbinns/apsw/"
-SRC_URI="https://github.com/rogerbinns/apsw/releases/download/${MY_PV}/${MY_P}.zip -> ${P}.zip"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc64 x86"
-IUSE="doc"
-
-RDEPEND=">=dev-db/sqlite-${PV%_p*}"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=( "${FILESDIR}/${PN}-3.6.20.1-fix_tests.patch" )
-
-python_compile() {
-	python_is_python3 || append-cflags -fno-strict-aliasing
-	distutils-r1_python_compile --enable=load_extension
-}
-
-python_test() {
-	"${PYTHON}" setup.py build_test_extension || die "Building of test loadable extension failed"
-	"${PYTHON}" tests.py -v || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/apsw/apsw-3.21.0_p1.ebuild b/dev-python/apsw/apsw-3.21.0_p1.ebuild
deleted file mode 100644
index f2bb6b9990b9..000000000000
--- a/dev-python/apsw/apsw-3.21.0_p1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit distutils-r1 flag-o-matic
-
-MY_PV=${PV/_p/-r}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="APSW - Another Python SQLite Wrapper"
-HOMEPAGE="https://github.com/rogerbinns/apsw/"
-SRC_URI="https://github.com/rogerbinns/apsw/releases/download/${MY_PV}/${MY_P}.zip -> ${P}.zip"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
-IUSE="doc"
-
-RDEPEND=">=dev-db/sqlite-${PV%_p*}"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=( "${FILESDIR}/${PN}-3.6.20.1-fix_tests.patch" )
-
-python_compile() {
-	python_is_python3 || append-cflags -fno-strict-aliasing
-	distutils-r1_python_compile --enable=load_extension
-}
-
-python_test() {
-	"${PYTHON}" setup.py build_test_extension || die "Building of test loadable extension failed"
-	"${PYTHON}" tests.py -v || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/apsw/apsw-3.23.1_p1.ebuild b/dev-python/apsw/apsw-3.23.1_p1.ebuild
index 2f4ee216ac74..49eb84f374ff 100644
--- a/dev-python/apsw/apsw-3.23.1_p1.ebuild
+++ b/dev-python/apsw/apsw-3.23.1_p1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/rogerbinns/apsw/releases/download/${MY_PV}/${MY_P}.z
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc64 x86"
 IUSE="doc"
 
 RDEPEND=">=dev-db/sqlite-${PV%_p*}"
diff --git a/dev-python/apsw/apsw-3.22.0_p1.ebuild b/dev-python/apsw/apsw-3.25.2_p1.ebuild
index 2f4ee216ac74..081a446bc22a 100644
--- a/dev-python/apsw/apsw-3.22.0_p1.ebuild
+++ b/dev-python/apsw/apsw-3.25.2_p1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/asn1crypto/Manifest b/dev-python/asn1crypto/Manifest
index a2f3e4b811c0..5abcdd36603c 100644
--- a/dev-python/asn1crypto/Manifest
+++ b/dev-python/asn1crypto/Manifest
@@ -1,5 +1,5 @@
 DIST asn1crypto-0.22.0.tar.gz 84508 BLAKE2B 5f21e13e6af0f5edf6f79454654e677182e2ae06a36d3f86a641e76e5043f8818fd17dbce40a8b0c4070a254fdd169a3eada99434f3b9e4097d4c106a774c30c SHA512 fdc98f71ec3b744e69a75909b5b0a8381fb82d448941a6e1059823af47ca107218e1dbe6ff192e2173f11fc2454be1afcd387d801dc8e716451179857d71f8b8
 DIST asn1crypto-0.24.0.gh.tar.gz 641322 BLAKE2B eb30afd0d2579f44ee4f556139357dc7622691bdc2067df913a4412cd3dca8372b85d84e3a3cbef6ba83648bf4ef55d7e8614992e2abb019301c92d24b15a926 SHA512 426cc380903b4dd7aadd7b831e3a11ee3442c961a33b856d4aa8d9060e829f2e0ad905a60c4d6504569718fe2cee01d9be31628c89ef030bc34281e381c898e8
 EBUILD asn1crypto-0.22.0.ebuild 606 BLAKE2B 78d5be009491f3a3f7112237e258231d48cc0e0203276c20fea8f82a84ccdc01fab3beb4a1065a77c59560614a2639fa949211cb0c4a26e301d3a46c81636001 SHA512 8ed3fc7e6615d33588ca1962aecbc0fa8c6b76081f7b8868cc9c834eb01782b9650ded7898b229daed1e989e546df88be9ca68722e5d2353a269cedc789deaae
-EBUILD asn1crypto-0.24.0.ebuild 766 BLAKE2B 712c7a1a5ae76b9dbcaeb4d5b6bcd032917cf57b41c68df1c4e277612fc864c61ee85b8f5bb94082128f190068cf5f49b077d62aa5f291476e7ab5ba88d26d4a SHA512 f9ebd3afdb3ff860004bf8fac34cf36253ea834a11f244dc0bc11e6881fa20fa0c53cf363a83cabf0959a64a0d94dbda04e7fa63348ef6cad3ed5053787a495e
+EBUILD asn1crypto-0.24.0.ebuild 808 BLAKE2B 8d87330b83be97dc80bce708f3244c1b9161a5104a026dc0f245bfc92ad9b0046c0e062816201de13487aa74e94cd506e29da87cbe9f6fc7e49f108b62321e85 SHA512 6e08f5c226b15d2d45c452f72c320423ddbb21b8504c183c41cabf51a1db26c40151f6c6126d36aaa4514f78554dc3b54f824b9030fdab772ff68ec3e50aea52
 MISC metadata.xml 384 BLAKE2B 6dbfdd39bb24b2df61454716e308605ae1d35c3babd01f16556bbbab240e425434315cb2b80a2c3e8e9b18b237899b5fb96566a7ffefde2af3af1dcc2e08362b SHA512 c2806f846608bdd0720b589494e13f57ab2d64026747f2b13f412c9a0e9d2bef6b16fc357e4d16b74ad7a2a2af8daa5e28d0b6bfe4d2141ce68881c724fd24c7
diff --git a/dev-python/asn1crypto/asn1crypto-0.24.0.ebuild b/dev-python/asn1crypto/asn1crypto-0.24.0.ebuild
index a6636497c1fe..8cd070fe4479 100644
--- a/dev-python/asn1crypto/asn1crypto-0.24.0.ebuild
+++ b/dev-python/asn1crypto/asn1crypto-0.24.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/wbond/asn1crypto/archive/${PV}.tar.gz -> ${P}.gh.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc ~x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc ~x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/asynctest/Manifest b/dev-python/asynctest/Manifest
new file mode 100644
index 000000000000..a0b5991b4c88
--- /dev/null
+++ b/dev-python/asynctest/Manifest
@@ -0,0 +1,3 @@
+DIST asynctest-0.12.2.tar.gz 49647 BLAKE2B 40bb5212409b2f0d9efce5c2559ffeea081c41b3f5158874d9a733f6f5dd2e6a2d7acf3eb495d91c1bc94e785dfd67c9bf5d1845e6fe40ad72aa36ea548b15b9 SHA512 e182fcf0c42d726dde810b9e2d50492b9e5ec9209b5419bd5faef28ee475ff04d6c8220bc165ec506eb9fc2dd38e45d7c3f8bc4ba1f0e279e44214e39862fe0f
+EBUILD asynctest-0.12.2.ebuild 784 BLAKE2B 13a30ab81292b415822f52ec6f5095819c879790cf96e1f5341f29451e4fe8e8a55763bf3bea109f5b79d6bda47499bfbe6ca5ec6ac7eba0822e78e074cf94b9 SHA512 58cea502aa6982b4a68aeee4d5693e02e1ce2a2e3a9c1c400ba3d1f68caa45e093f4d398b728f3eebf58a5da5f10fb274eae1a183272044044aa476fa32f1026
+MISC metadata.xml 591 BLAKE2B ae0988f66c0e87680b326bba5e73deb1e1bcd21cb7b2879b1f8959700c1146177444e3e3cb2cd2d0cff7a13027519371f5a888648132e51db19a8a8bf4d05e54 SHA512 a17f936b2c2bbbc060f7eea6c246616fa5aaa535a5483e65f9f02efb508f28f0ab18770a64a61d069e479a14232e2dab37b3b4f60c8e73c088a064a44eb6fa24
diff --git a/dev-python/asynctest/asynctest-0.12.2.ebuild b/dev-python/asynctest/asynctest-0.12.2.ebuild
new file mode 100644
index 000000000000..9ce7712a4051
--- /dev/null
+++ b/dev-python/asynctest/asynctest-0.12.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{4,5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Enhance the standard unittest with features for testing asyncio libraries"
+HOMEPAGE="https://github.com/Martiusweb/asynctest/ https://pypi.org/project/asynctest/"
+SRC_URI="https://github.com/Martiusweb/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+src_prepare() {
+	default
+
+	sed -i "{s/test_events_watched_outside_test_are_ignored/_&/}" "test/test_selector.py" || die "Could not disable the failing test."
+}
+
+python_test() {
+	"${EPYTHON}" -m unittest -v test || die "Testing failed"
+}
diff --git a/dev-python/asynctest/metadata.xml b/dev-python/asynctest/metadata.xml
new file mode 100644
index 000000000000..98bce3b47a08
--- /dev/null
+++ b/dev-python/asynctest/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>oleksandr.trotsenko@gmail.com</email>
+		<name>Oleksandr Trotsenko</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">Martiusweb/asynctest</remote-id>
+		<doc>http://asynctest.readthedocs.org/en/latest/</doc>
+		<bugs-to>https://github.com/Martiusweb/asynctest/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/atomicwrites/Manifest b/dev-python/atomicwrites/Manifest
index 408e23a23082..7156a17bc6d1 100644
--- a/dev-python/atomicwrites/Manifest
+++ b/dev-python/atomicwrites/Manifest
@@ -1,6 +1,6 @@
 DIST atomicwrites-1.1.5.tar.gz 18951 BLAKE2B b0932995aae3ca23c11aace182429f4888819ea542a12b59d5b7ed4621c4759285d0cba306437bd1ce35b1ba32eac8ae6afc6548f2bae61870dbf03927c4fe75 SHA512 4de8ab93dcb226c55e8ae1b0ef883c2e1eeae50ac6596afe036ca51dbf6b094c13dbf2d792972312d4c53551886aaa2713aac54bfab42b85abef4d1146e039ac
 DIST atomicwrites-1.2.1.tar.gz 11660 BLAKE2B 06b4ca25f39be0e7e8d8e8b46749d7dce052f912e82b1ccd39e308c8ed51ab0d4891f00c11d0e52ef50901c01566f20fcf1318cb472c9a1f3a08617fd1b56235 SHA512 4df7ee97e0817a80378b273ced310b8ad88eb6ced93a594a6e3dc38ad1e7208226fde01b6d282f85583c57a50859e82c85bacaae8a7c64fce55e6965f74b12c5
 EBUILD atomicwrites-1.1.5-r2.ebuild 578 BLAKE2B ad9188acc6f21a3352510d2efae465d010e763f21f45d6604979b4a48da0e77817746037f8472bc86bdd034163e0c75da40a56784eb0e979e856b5dc86d8eeb0 SHA512 1af57e581631a2cda8f7ee9de709bbd2abb1475d5f25331d9fa2683e5b75892f897e68f092f96b5ffe522a5d2b1966aca0a81a37fe80c38f08b9599d63d2b715
-EBUILD atomicwrites-1.1.5-r3.ebuild 959 BLAKE2B 3fd41a1bc3fd32c3654e73f9b75d99ca63c98bc41d3de5fc98ba40c03bee51e7dd9b0a72e7a2b6f2dd5880af5a79869aee42799e035645d755e8d0afcaaf8fb2 SHA512 70bd31d5dd33240206ce96eafbef95e2284ec850d4aeac0632350941c82e62ecc9c4d718f30f4d8ec1a2d70c0f2e9642255e1cd39db5d6e1c8d8de7d6a4e6e17
-EBUILD atomicwrites-1.2.1.ebuild 945 BLAKE2B 1686a341278586a5fbebef6b5d9f1c7607a6b55e60fee93d702a8a92ac32af22f83fc2eb0a7d5527ef6f602f26be5a8bfede176bea96ed0f44430b8df0ded9dc SHA512 39d897f6c908237ca75bc591ddef2a663c23750f8787de5a706bfc02e0753b123f32cd89b3e53722783e64f891ca3b4d5b5cf11bae7a0ee954d5a0e64127664a
+EBUILD atomicwrites-1.1.5-r3.ebuild 970 BLAKE2B 56cbc77c8dc32b0cf3c33fab7e9756688084409d1801b352ad4ff9df2b4ed9d49dd5c8212170783ce4b21141ff33bd4e34345726d6f38978a3bd4f8c599c4ae6 SHA512 4a3cc100471225de51e39dfb71c8597b9f86445eefbdd365289f8c8f74f93bd28a83c6f6bdc405adbde63659d893efd63037ddb39102bfd5b0fa8596230d17b8
+EBUILD atomicwrites-1.2.1.ebuild 1008 BLAKE2B ebab5c6fa20d6b453ef5b01c4b9b885f11bc2a7cf9892078b9ded53969e9fd287bc47c63be61dd0a9a175ca11bcd8d4c633859601adb155af733d5a5bf4cf92a SHA512 44573d3cc94242e138d389f7b3bb57e9a56eb851a1215a29c7231870e2a807bda4f2f049025595dbd56dcaa791a51649d386381743f118c99edb41f023b6a51c
 MISC metadata.xml 438 BLAKE2B c2a138ede668039b703fdc3e2ca8e1a7a07546e01540fdc502d79a48a8ddfae8dc7a79ed371373d95054731fcb25af67daf75ef5a1c08fafe9976f7a2c30525d SHA512 f38332e752b8bb660d8d8291b897fc96865a134108198e01df2dc4365c0c6e87c6039a907da38080a4d07d7c57750f8a32c6d6c3653b57f5aa193ca5b5b53449
diff --git a/dev-python/atomicwrites/atomicwrites-1.1.5-r3.ebuild b/dev-python/atomicwrites/atomicwrites-1.1.5-r3.ebuild
index 2fb60c61c275..d95f0a72f497 100644
--- a/dev-python/atomicwrites/atomicwrites-1.1.5-r3.ebuild
+++ b/dev-python/atomicwrites/atomicwrites-1.1.5-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd"
 IUSE="doc test"
 
 DEPEND="
diff --git a/dev-python/atomicwrites/atomicwrites-1.2.1.ebuild b/dev-python/atomicwrites/atomicwrites-1.2.1.ebuild
index edd01805d3d7..07f038d7cc28 100644
--- a/dev-python/atomicwrites/atomicwrites-1.2.1.ebuild
+++ b/dev-python/atomicwrites/atomicwrites-1.2.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86 ~amd64-fbsd"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
 DEPEND="
diff --git a/dev-python/attrs/Manifest b/dev-python/attrs/Manifest
index 5011fa6eed2f..ac733f0666f2 100644
--- a/dev-python/attrs/Manifest
+++ b/dev-python/attrs/Manifest
@@ -2,7 +2,9 @@ AUX test_funcs-too-slow.patch 735 BLAKE2B b0806002c957f951c6c08a9c2caa9331d4524b
 DIST attrs-16.3.0.tar.gz 57512 BLAKE2B e00c825034b21cb4d5a9eb9ca3ffb92193b8d793ebaeb8cb5e69b07c326738da4efd98ebc6e79903017276b6b501c56a8e0b37f6b0d13d8461b8ea4e5cb72b08 SHA512 1a91e6f27ecaf20c409c3abf88ffed5c6cfdbba8cff44637399b713271ff838a054f5859dd29440b2780d81b40673033e3f8e43dd491bece72e0a4f08c4ef688
 DIST attrs-17.4.0.tar.gz 97071 BLAKE2B f755abe89cedbf1ced003087fb106fae7c38dbdf0614ec0c525629ae09b3b790a7e0912da887dad4c5686afe7fb0df8123fea42e08e4e6718cdaf477edafcb2a SHA512 b631cd5af1be7c78175230363a3cf9d37cb0237d87b24f994812b5734985d114708d5bf7ee5d92b8b13c6b8daa313efde4a9f60f0630df0b62bbcf4928a016ff
 DIST attrs-18.1.0.tar.gz 106346 BLAKE2B ae17d5e6cde83e5a652b40facffe3db2ad9d6940ef7e00a10c3d02b6015c23e9e17e125ec16100f1fd5e036c9f4e88cfe01b23b03bacdc36446ec0ef1dcc57a5 SHA512 9aa4421d1c16614cd26089c219f70602fd6baa5fbbf4aa96def189e9a41f8c761d7f522c5e167a63e366cf8b46e87477c345655f09738a14981bb40dbcd12b91
+DIST attrs-18.2.0.tar.gz 116817 BLAKE2B 79d50c9b49956bbc1e04084eed36a5f65f2dda8e954b23f15650cb881d6f77a8325e042c6d1a77dcad43661d4524a4d253d96bd0053464ef03091779636e6d0b SHA512 58c26579d6dfcacbe9e3f770a125861e0625d435f1293eebe0d62efc9b8aa9572be2b312d73037a647163bffb0a13b240fb157aff7ed35196f637ae945d61d22
 EBUILD attrs-16.3.0-r1.ebuild 870 BLAKE2B e7b23da8eb4bf32594bd5bc17924231a4c42a40efc80963522a32361b2315aba095d6058d27351d772a91de029ad61ceff9a3418c4969919abe43264f8053cb9 SHA512 7c346b07cc557a999fc224cab21f3807bc10bb1e8b051eaec7905f4fb95f5c87e71a3081bd2893d8e371c08f43541226810590d5b43f801d1bc69f8f764951fe
 EBUILD attrs-17.4.0.ebuild 885 BLAKE2B d2e70f4ca7c9b7e1f96d671c757ff14b56132f139458996ee473f3271844c2c0c257443ae26d48d600d666de4a35a763d0d92acf67cb0df3c57acd01cd23570a SHA512 28f39a5c0e0caab4603757f7169e0159cd8aae2182b0a8c5b417125a14e28a31e6873076e1e4bd09588f818304faf549a14199e93910da8c3c88967944d77f15
-EBUILD attrs-18.1.0.ebuild 888 BLAKE2B 8cc377f4fbd672a52828c293fc9c5d2afb2674560bd87a99eb3ac3533e9f2e60367b61a6711a8dbd44dcc5423a2b76ec6869bf213e77fc5715b1fe420359c377 SHA512 6024a95222e50e6af69d77178f77318424f2617e3b9a48b236e128b35635e3acefe9785b7011257fba04d46e3b6a861fa7045a1355787e83d81b8625452b70a9
+EBUILD attrs-18.1.0.ebuild 943 BLAKE2B 7effcb9ee8d91b80cb1b93aeae9d5172f7ac99a68c48aef064dbd3f18cd444009594644db3c0580002c674c37672560f145d9d76ef3dda567599b0c06ce4935a SHA512 d435a70b52455fabf7b67ef48351f52c2d3a05e66c6048f4d94ff46868915730474141b89680ab15f4b608fc88f8c7e6d9fb7b1d08cd202f718d38ec69704c99
+EBUILD attrs-18.2.0.ebuild 943 BLAKE2B 7effcb9ee8d91b80cb1b93aeae9d5172f7ac99a68c48aef064dbd3f18cd444009594644db3c0580002c674c37672560f145d9d76ef3dda567599b0c06ce4935a SHA512 d435a70b52455fabf7b67ef48351f52c2d3a05e66c6048f4d94ff46868915730474141b89680ab15f4b608fc88f8c7e6d9fb7b1d08cd202f718d38ec69704c99
 MISC metadata.xml 488 BLAKE2B 808447388863096af88f90f97c58025508d5b4cd1ecd760c59dd8af1fa664e16756029e3d5d6b233578b9c0d7be9c8469761c9a89f222ae9f47556b6ee983fc0 SHA512 d8336a60cb0b2b8d51a9833c0ba3d47acb29ec4942b2f03b750d407bcbb65461d867470226bee962a8e585cfd4ff11bfff67b66ed2270f9efbf35d3c46bbdda1
diff --git a/dev-python/attrs/attrs-18.1.0.ebuild b/dev-python/attrs/attrs-18.1.0.ebuild
index d7b72c150caf..e555a598278c 100644
--- a/dev-python/attrs/attrs-18.1.0.ebuild
+++ b/dev-python/attrs/attrs-18.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/attrs/attrs-18.2.0.ebuild b/dev-python/attrs/attrs-18.2.0.ebuild
new file mode 100644
index 000000000000..e555a598278c
--- /dev/null
+++ b/dev-python/attrs/attrs-18.2.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Attributes without boilerplate"
+HOMEPAGE="
+	https://github.com/hynek/attrs
+	https://attrs.readthedocs.org/
+	https://pypi.org/project/attrs/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+RDEPEND="
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
+
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		$(python_gen_impl_dep sqlite)
+		>=dev-python/hypothesis-3.6.0[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	py.test -v || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/awscli/Manifest b/dev-python/awscli/Manifest
index 497113e98dcc..751931ad0702 100644
--- a/dev-python/awscli/Manifest
+++ b/dev-python/awscli/Manifest
@@ -1,21 +1,9 @@
-DIST awscli-1.10.51.tar.gz 474702 BLAKE2B 891862e2fa9245e3bb1b25b6fc473a75ebdfa037e905e9ca95f280c7cd175f3287b81bec4b16794a7c5ec893aba2aa825f0be3cacac622cb8886dde7291d65f8 SHA512 55b002023f05cd6a1761b87d80a6c68664f91ac9d70724f51dadff053797766a9f407f1c5edff52ddd22c5e537a39a60f03e7c46bc8e5f912e3d39babe57171a
-DIST awscli-1.10.53.tar.gz 474558 BLAKE2B d3a1ff2c24aab0122b29eb67308e79314504d0425b3889af5090c0ae92fe34c362a5359be1249052d4d979f6abc5e3ea3f3f8beb5112950ae32fd49cb1941f6d SHA512 6735055c1b9d79eee9832532dd6a284fe6bdaf08bec10872458d44ce2a549bd0833c1908e1e236282f2b197cc7d4817173c4911e057e301e350fb195f96c1acc
-DIST awscli-1.10.59.tar.gz 484020 BLAKE2B 11d73680f9bd2f3fcd33a7f97267d142283524287373b9bf8e289c7b21ad68875ec3e349f0dc5f1a1421397e430ae2078d292f89fb91a68b21436a9c36c27d57 SHA512 b0329ec01a160527e6eb47bd877f102be4f6f53ca89007e1d6ba5012dc31c8fa907728b151b6daf8ed49d9abac48fa741bb4617d689eeeacf880404fe1b4919a
-DIST awscli-1.11.0.tar.gz 497631 BLAKE2B 98e0e2a903eb9af8236d4c4955ee5c03d165aeebbfbf4cbc13980d59678f15f0f44545d58871554b40d766c4b15f2b5d226aaad56985bfc8517272511cdcab61 SHA512 db695a9b5d052d872f50883dbd716668b95c3ae6aee85b94ba5fb96aabfd8853cf2c6cdff76b7a2d8e7d006ae1dc65353bc6818999bf02c619dd0c4aa4d3dbbe
-DIST awscli-1.11.154.tar.gz 553172 BLAKE2B a9c46453407efa6a2f5170105a24f108bcd696414c68235e55940a50c9ee56d984a0ce49534b70ec7374218aa1dbbf68293214fd0aab6771035113d1c4054ef3 SHA512 cb4d0159c816a3abd750e1531f280aa1145fdac6b3b0106fcc913f1f9ab97ff92b5dc8778af2b15f55f94c7ffd64f5a5f5ec3189a062ea99e5e696d991abd8f1
-DIST awscli-1.11.158.tar.gz 553030 BLAKE2B 9a36fa3fd4fca2df9b561965fff92f2679f8714f7618026900449056e1c91c5e586e89250afabf620516f9690a98860b31370c9ccf9a5a0aede2aff07f5601c7 SHA512 25c9a3636e7a83e0f9e090906354d2f4a8e44bc1de262987eb3f071b303d64056f2b149954097e57678e0a5553a136a1289c81999ea19a757ff3bea15fad215c
-DIST awscli-1.11.81.tar.gz 544970 BLAKE2B 583a821298c416e8cc9dd9af9d55457fb1eb61cd415159aa880df1a78fd777f1b15e11dce3b712401bd9e1ed2e3ddc5ecb44652870a23f0e0c35aa25e7a07c70 SHA512 61b355247d75939d2814ca0594fb1b4498d7a1dc008e27302328c09bbe4ce72a6eddff64712410bd2023663436fd41d405a6a19a1c53c872a0ae6e68a0718175
-DIST awscli-1.14.16.tar.gz 576598 BLAKE2B 708271155f54dbba643385513691a9fc1cf406eae2d87108a0081b46f84914acf79bb398948daa5df02433904d644e6f0e3ac623859b57a270ad8f1e240b0e8c SHA512 6ad7b908cb1b858a7837042322f59a5aaf71c909d87e783e2f07ab0624b2ca9110cf879c292f9a39012f9e5dac95189a7401d319b3f088662d15c827e9396a06
-DIST awscli-1.14.50.tar.gz 587829 BLAKE2B d98f0ea4fe135f6ab5b458d251e763bd2d3c75eaa3edcadf0deaf33350a01e384b7f3a797069d631bcb3338b5a6b77c29d704e4a83946bb65e4c47fa523d8f8f SHA512 c42cfb3ffd75ca4b472b62ecf7917fb204190363b62cbc55c19afe43293258dc762ab3133fea38fd20efc4625db5d97ef274517168e2a2b3cc53d0081b2945aa
-DIST awscli-1.15.10.tar.gz 593929 BLAKE2B 75685f00b8f0fce1f75d5181019da4ea82d13b711fbcdc85cdfcbff2ef61e5e937fd60bd1ac1e25319284738e6567796255b21e3d8b817dd79fe8698011bd9bd SHA512 704210a5af6b1445c9a4ae0332e2928757ecc823f378c84708bc5f8da40fc43457e8f14174d7f7e8834213a2e4f3d95db39dd9697e0539fa508c274d050718c8
-EBUILD awscli-1.10.51.ebuild 670 BLAKE2B c61b730e239828572fb72ac686aa560e41446fadd59233f23c4c24c3445c87b6fd54204d6ceb0e449a0ed8795ccb60aa94dc8da2b87f32a960d3dd102fa33947 SHA512 9957519afd970c1d5e191cf4b08e8e0dd1faf8c8e01797d332ee3ca443949165e879aff004fafe154a0aa574f26e08c224a7397f6d30bece87957f2f355734bf
-EBUILD awscli-1.10.53.ebuild 670 BLAKE2B c61b730e239828572fb72ac686aa560e41446fadd59233f23c4c24c3445c87b6fd54204d6ceb0e449a0ed8795ccb60aa94dc8da2b87f32a960d3dd102fa33947 SHA512 9957519afd970c1d5e191cf4b08e8e0dd1faf8c8e01797d332ee3ca443949165e879aff004fafe154a0aa574f26e08c224a7397f6d30bece87957f2f355734bf
-EBUILD awscli-1.10.59.ebuild 670 BLAKE2B c61b730e239828572fb72ac686aa560e41446fadd59233f23c4c24c3445c87b6fd54204d6ceb0e449a0ed8795ccb60aa94dc8da2b87f32a960d3dd102fa33947 SHA512 9957519afd970c1d5e191cf4b08e8e0dd1faf8c8e01797d332ee3ca443949165e879aff004fafe154a0aa574f26e08c224a7397f6d30bece87957f2f355734bf
-EBUILD awscli-1.11.0.ebuild 678 BLAKE2B 92891bf74d22971b7f9ba65d92203c7aa029a5993b8b1175c4bed7c976dbd2b35cc9bf8d3aa42130ea08db1162aa091a619954c808d101389189424baf4788eb SHA512 6eed3dc74306303259e8d975bdd1cf7cdfb6a959b35d6d45be913b880d2ca84aeb17973803d31b206f114da52c9768051a23b31ee5caf05aef210e8f2b53aa74
-EBUILD awscli-1.11.154.ebuild 723 BLAKE2B 1299ec26f10f9b2557a432ae5fd633e32af36ede6caacf596a5a9d62dbd3e34d266f051cd53f01c8710f5803204040c3d7a618a7c0acea81ef08744ce80f82af SHA512 6dacc1ad347d761d069659140d1345439a9a4cf599b008a50e05f8b33f20cc9d207290ead56e0866fcdef514de8c038b3e8d9d3a15bdcf0cecdb6f6a3b6c9b09
-EBUILD awscli-1.11.158.ebuild 723 BLAKE2B 1299ec26f10f9b2557a432ae5fd633e32af36ede6caacf596a5a9d62dbd3e34d266f051cd53f01c8710f5803204040c3d7a618a7c0acea81ef08744ce80f82af SHA512 6dacc1ad347d761d069659140d1345439a9a4cf599b008a50e05f8b33f20cc9d207290ead56e0866fcdef514de8c038b3e8d9d3a15bdcf0cecdb6f6a3b6c9b09
-EBUILD awscli-1.11.81.ebuild 678 BLAKE2B 92891bf74d22971b7f9ba65d92203c7aa029a5993b8b1175c4bed7c976dbd2b35cc9bf8d3aa42130ea08db1162aa091a619954c808d101389189424baf4788eb SHA512 6eed3dc74306303259e8d975bdd1cf7cdfb6a959b35d6d45be913b880d2ca84aeb17973803d31b206f114da52c9768051a23b31ee5caf05aef210e8f2b53aa74
-EBUILD awscli-1.14.16.ebuild 733 BLAKE2B 4750cd462e2504da6b70b1cae11e0476c2de662ab16c990a7c157185bf1db9752d237e3509e8ed7456325eb60526ebbbef8bbd3e453d07b617d33f76093ea8a7 SHA512 c0e2bbf9633915311e4a155546157a22e11418f8c113fedf9ef9dbcc771ed7797ca4d75bc92a97697bf6d703a4e456e58da3f7bacacf359fa7fbeee73eec4d38
-EBUILD awscli-1.14.50.ebuild 733 BLAKE2B f921b0cb5941b6ab87ba86894bb0adbadf1f914502dc97d1d7e8a6a305b178ffa915d339d6a601a786ebdbfa17df42444e8ceb5ab7c72d4e47d8925f2624a5b4 SHA512 7462ced9e1c2c70198f8eab403c4cd88abf999ea1bacae8fb6291231ef768b17c14c8c783a39cf646f97dcc3933d466c59c163c8139585c5a1e0aede72e5caf5
-EBUILD awscli-1.15.10.ebuild 737 BLAKE2B 8d23ba5753eaf22800ad7859c3c1d62fc8866506b566199a62436c51c11ceee1db8d83a527926a3d7894604a06a836fe709270f7c232c4022a68a771a0e88bc7 SHA512 e006924c8fa8333ed0e6a6561ba373087c3c13631c4b6037da6a2153db04ce704e6f5a52c6e7ad2b2e8d49a6e8c884dd156b9a8b45b6a36e1c56369775456893
+DIST awscli-1.16.59.tar.gz 1147247 BLAKE2B f8571f2397735b4aad17543e25cd2764731b2986f420faccf76dad2bdab912029d7ac592607290bd76fe4c99ef57e168dfbc5a2a92e20927343006f964a4a3a8 SHA512 be7f6dac8d2ed27f53a0f50323d40395c51d7e0ef513e1410bd4ce5fb4affe1033919e01755ba768739e7e327a827d004a8da42353c0be05e90be3e5350399ff
+DIST awscli-1.16.62.tar.gz 1147749 BLAKE2B d0a578478f5aa6e08c8de3c0e5e85b99e09a8519931b35f5fa724f922b35e2981464ba2fc5fc842350dfe1cd5740104ee293caf13b2154c5140caa9f762c976c SHA512 b7b0247c7c28fe3195cb6e2ec81fa15e8d6e9a8120d124d4cc84e827f8f9c904fb7feaa00d28173e0739066eb5ca77fc7f2af8b1f2b083605b23a4cc1c38fd1d
+DIST awscli-1.16.72.tar.gz 1169697 BLAKE2B 3ae37ee02bb821dc5e5578ff9937d6fb313bd369e9f57c276d3e3fb722743b5f07536ed60ffd98ffbb779e0ad3882f9345d0ccbed3572c2e7332c2a339320f49 SHA512 88914546c10e14749b6811a31ff664cd464ab424d2140f1218b03128fb8a7e4fcfb33feaa29cac534ea3902f1d4e0565c7578b61989bb6b8f8edbefa2d992355
+DIST awscli-1.16.81.tar.gz 1171490 BLAKE2B 343e5ba75f8cb3b058e15346627b0d9c5d6e294147843be0608ccd2a92e643d05c5b6995771608af602e565a860d4088e1f7988c567343396054cec813ed660c SHA512 44176ae796972571d07923ba13ac5a245af7b0c74488bd03a6fb5077f204f175f7ddfa9c4d592eb93d3dce14d9406b04c92ec2d1d9ce58c3a092a0b998efd2c7
+EBUILD awscli-1.16.59.ebuild 1024 BLAKE2B bdd6f7f25949aa2366f7e70bded817ec214c77e0863030faa1ac06ab43256964dbfaee886643a48a5ebf522dad2590485946c87ffa2667db51f0cadf4591fd7f SHA512 33570db8155986bf66b8b4ca1505ee2eaca9cb17651ffc91bcdb1e9eb5e0d5b38a723ae7878892d84c3e66c3335c857851dccd9f4f6a359c29792ffe3c944296
+EBUILD awscli-1.16.62.ebuild 1024 BLAKE2B bdd6f7f25949aa2366f7e70bded817ec214c77e0863030faa1ac06ab43256964dbfaee886643a48a5ebf522dad2590485946c87ffa2667db51f0cadf4591fd7f SHA512 33570db8155986bf66b8b4ca1505ee2eaca9cb17651ffc91bcdb1e9eb5e0d5b38a723ae7878892d84c3e66c3335c857851dccd9f4f6a359c29792ffe3c944296
+EBUILD awscli-1.16.72.ebuild 1024 BLAKE2B bdd6f7f25949aa2366f7e70bded817ec214c77e0863030faa1ac06ab43256964dbfaee886643a48a5ebf522dad2590485946c87ffa2667db51f0cadf4591fd7f SHA512 33570db8155986bf66b8b4ca1505ee2eaca9cb17651ffc91bcdb1e9eb5e0d5b38a723ae7878892d84c3e66c3335c857851dccd9f4f6a359c29792ffe3c944296
+EBUILD awscli-1.16.81.ebuild 1024 BLAKE2B bdd6f7f25949aa2366f7e70bded817ec214c77e0863030faa1ac06ab43256964dbfaee886643a48a5ebf522dad2590485946c87ffa2667db51f0cadf4591fd7f SHA512 33570db8155986bf66b8b4ca1505ee2eaca9cb17651ffc91bcdb1e9eb5e0d5b38a723ae7878892d84c3e66c3335c857851dccd9f4f6a359c29792ffe3c944296
 MISC metadata.xml 316 BLAKE2B 29c8ad67f4e7c5db4439aeae00deda8b57bb36bea7bd6490ae60efaa30cd2db1f7b2cff5b21558cdadea05f9caa8a9f4ee580fe2ea80959fe6ef7ef6f740c550 SHA512 86b3359e64e41ac4f2216e5bbcee6468100df3cd6e9c25595527d6819a2c27ce327797163a3a43bab11516a4826cff47825449cb797d7fe845794700a3a2bed0
diff --git a/dev-python/awscli/awscli-1.10.51.ebuild b/dev-python/awscli/awscli-1.10.51.ebuild
deleted file mode 100644
index 12e8e0655ec2..000000000000
--- a/dev-python/awscli/awscli-1.10.51.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit 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"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
-	dev-python/botocore[${PYTHON_USEDEP}]
-	<=dev-python/colorama-0.3.3[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	<=dev-python/rsa-3.5.0[${PYTHON_USEDEP}]
-	dev-python/s3transfer[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	"
diff --git a/dev-python/awscli/awscli-1.10.53.ebuild b/dev-python/awscli/awscli-1.10.53.ebuild
deleted file mode 100644
index 12e8e0655ec2..000000000000
--- a/dev-python/awscli/awscli-1.10.53.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit 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"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
-	dev-python/botocore[${PYTHON_USEDEP}]
-	<=dev-python/colorama-0.3.3[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	<=dev-python/rsa-3.5.0[${PYTHON_USEDEP}]
-	dev-python/s3transfer[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	"
diff --git a/dev-python/awscli/awscli-1.10.59.ebuild b/dev-python/awscli/awscli-1.10.59.ebuild
deleted file mode 100644
index 12e8e0655ec2..000000000000
--- a/dev-python/awscli/awscli-1.10.59.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit 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"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
-	dev-python/botocore[${PYTHON_USEDEP}]
-	<=dev-python/colorama-0.3.3[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	<=dev-python/rsa-3.5.0[${PYTHON_USEDEP}]
-	dev-python/s3transfer[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	"
diff --git a/dev-python/awscli/awscli-1.11.0.ebuild b/dev-python/awscli/awscli-1.11.0.ebuild
deleted file mode 100644
index b63f9201b2f0..000000000000
--- a/dev-python/awscli/awscli-1.11.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit 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"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
-	dev-python/botocore[${PYTHON_USEDEP}]
-	<=dev-python/colorama-0.3.3[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	<=dev-python/rsa-3.5.0[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.1.5[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	"
diff --git a/dev-python/awscli/awscli-1.11.154.ebuild b/dev-python/awscli/awscli-1.11.154.ebuild
deleted file mode 100644
index 9a7d55693c0e..000000000000
--- a/dev-python/awscli/awscli-1.11.154.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit 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"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
-	dev-python/botocore[${PYTHON_USEDEP}]
-	<=dev-python/colorama-0.3.3[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	<=dev-python/rsa-3.5.0[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.1.5[${PYTHON_USEDEP}]
-	<=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
-
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	"
diff --git a/dev-python/awscli/awscli-1.11.158.ebuild b/dev-python/awscli/awscli-1.11.158.ebuild
deleted file mode 100644
index 9a7d55693c0e..000000000000
--- a/dev-python/awscli/awscli-1.11.158.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit 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"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
-	dev-python/botocore[${PYTHON_USEDEP}]
-	<=dev-python/colorama-0.3.3[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	<=dev-python/rsa-3.5.0[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.1.5[${PYTHON_USEDEP}]
-	<=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
-
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	"
diff --git a/dev-python/awscli/awscli-1.11.81.ebuild b/dev-python/awscli/awscli-1.11.81.ebuild
deleted file mode 100644
index b63f9201b2f0..000000000000
--- a/dev-python/awscli/awscli-1.11.81.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit 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"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
-	dev-python/botocore[${PYTHON_USEDEP}]
-	<=dev-python/colorama-0.3.3[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	<=dev-python/rsa-3.5.0[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.1.5[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	"
diff --git a/dev-python/awscli/awscli-1.14.16.ebuild b/dev-python/awscli/awscli-1.14.16.ebuild
deleted file mode 100644
index f83b1d547406..000000000000
--- a/dev-python/awscli/awscli-1.14.16.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit 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"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/botocore-1.8.20[${PYTHON_USEDEP}]
-	<=dev-python/colorama-0.3.3[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	<=dev-python/rsa-3.5.0[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.1.12[${PYTHON_USEDEP}]
-	<=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
-
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	"
diff --git a/dev-python/awscli/awscli-1.14.50.ebuild b/dev-python/awscli/awscli-1.14.50.ebuild
deleted file mode 100644
index 401b5eaad5a9..000000000000
--- a/dev-python/awscli/awscli-1.14.50.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit 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"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/botocore-1.8.20[${PYTHON_USEDEP}]
-	<=dev-python/colorama-0.3.3[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	<=dev-python/rsa-3.5.0[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.1.12[${PYTHON_USEDEP}]
-	<=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
-
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	"
diff --git a/dev-python/awscli/awscli-1.15.10.ebuild b/dev-python/awscli/awscli-1.15.10.ebuild
deleted file mode 100644
index 5fa3211774a8..000000000000
--- a/dev-python/awscli/awscli-1.15.10.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit 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"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/botocore-1.8.20[${PYTHON_USEDEP}]
-	<=dev-python/colorama-0.3.3[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	<=dev-python/rsa-3.5.0[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.1.12[${PYTHON_USEDEP}]
-	<=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
-
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	"
diff --git a/dev-python/awscli/awscli-1.16.59.ebuild b/dev-python/awscli/awscli-1.16.59.ebuild
new file mode 100644
index 000000000000..1a34c9d79e7a
--- /dev/null
+++ b/dev-python/awscli/awscli-1.16.59.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit 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[${PYTHON_USEDEP}]
+	<=dev-python/colorama-0.3.9[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	<=dev-python/rsa-3.5.0[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.1.12[${PYTHON_USEDEP}]
+	<=dev-python/pyyaml-3.13[${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
+}
diff --git a/dev-python/awscli/awscli-1.16.62.ebuild b/dev-python/awscli/awscli-1.16.62.ebuild
new file mode 100644
index 000000000000..1a34c9d79e7a
--- /dev/null
+++ b/dev-python/awscli/awscli-1.16.62.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit 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[${PYTHON_USEDEP}]
+	<=dev-python/colorama-0.3.9[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	<=dev-python/rsa-3.5.0[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.1.12[${PYTHON_USEDEP}]
+	<=dev-python/pyyaml-3.13[${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
+}
diff --git a/dev-python/awscli/awscli-1.16.72.ebuild b/dev-python/awscli/awscli-1.16.72.ebuild
new file mode 100644
index 000000000000..1a34c9d79e7a
--- /dev/null
+++ b/dev-python/awscli/awscli-1.16.72.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit 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[${PYTHON_USEDEP}]
+	<=dev-python/colorama-0.3.9[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	<=dev-python/rsa-3.5.0[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.1.12[${PYTHON_USEDEP}]
+	<=dev-python/pyyaml-3.13[${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
+}
diff --git a/dev-python/awscli/awscli-1.16.81.ebuild b/dev-python/awscli/awscli-1.16.81.ebuild
new file mode 100644
index 000000000000..1a34c9d79e7a
--- /dev/null
+++ b/dev-python/awscli/awscli-1.16.81.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit 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[${PYTHON_USEDEP}]
+	<=dev-python/colorama-0.3.9[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	<=dev-python/rsa-3.5.0[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.1.12[${PYTHON_USEDEP}]
+	<=dev-python/pyyaml-3.13[${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
+}
diff --git a/dev-python/beautifulsoup/Manifest b/dev-python/beautifulsoup/Manifest
index bbd315328ccc..14f1f3f1b074 100644
--- a/dev-python/beautifulsoup/Manifest
+++ b/dev-python/beautifulsoup/Manifest
@@ -2,6 +2,6 @@ DIST BeautifulSoup-3.2.1.tar.gz 31224 BLAKE2B 9361ce6d048d0443c3257d10ec2734c242
 DIST beautifulsoup4-4.5.1.tar.gz 158039 BLAKE2B 5eb99c7efdb13c359385c7c7f3280332ca28cc4b5ff80b90c326d80ef55acef8e98d86691a7b1df420bf68bc65e96ad7d559b461a03f44e494fb4b7789753601 SHA512 d560d7f743507084ec546708d29bb3764512f5b2c380004280dde813350bf48d1697fddce3bd3f95186407bf5142941d7adc7d0de8e7962eb5ca1278dbc7e93f
 DIST beautifulsoup4-4.6.3.tar.gz 167469 BLAKE2B 0bc8f729298a2fd1e8f3cc8a7635587217f9a2e6e2c71709e99c40eedf1ebb4d76cd0d17ec36b99f3ee047193e4d44e31b8d2aa9864c43ce5db380fbdc083f76 SHA512 0cacae77843326ebee87d108b6706a7ca6943684bcccc62554d2ae5d77dfd181c97435ceca9d3e2e51962b024bbe52bc08d7f0dc516311aa87b3a1f87fb4ae23
 EBUILD beautifulsoup-3.2.1-r1.ebuild 858 BLAKE2B d8a3a865e18101053361a4be6d569344484317891f1611d8a3ce2d168a8e4eb0d6b28fb067fb1cb74cc57fa89d99da7c50f6edd37bc120232a51e5962d6eadb9 SHA512 879c787894a065f4150c8b6021ff30f15ee0d273de06c0d151ef84157eee1e5d2ca56df9104ac8a6a44d43cb332d3367cc8f2861b7324d851f0285e1c7e174ad
-EBUILD beautifulsoup-4.5.1.ebuild 1359 BLAKE2B 7629a7dd000b55c72fdf523e361be3756c290a478eda10e20cec96e7725d15082125755ab28fda3c79d1b8f1500f4f6aecb832af93db4077a9ca68eaae37383a SHA512 334927959ed9a41f0bb9b7deea78481504d0051801eab94a66981d3ca3fe5dc69f953dcdb46294a9f68177031b3571b9efed3cf9bff598072d4a1eeb6087bf61
+EBUILD beautifulsoup-4.5.1.ebuild 1355 BLAKE2B 434b71c764b0c74658e07721ea352d3e8d80620e9ebe26d936aee7fae5f1faa70d10152ef34d5ca1d5b10438e74b7f9156a78ea8619505f84e58eef22fade69a SHA512 59b50eb358e862bd8189d3473bfaeb81c9653befcc1bcc5a0d295a5d22f28567a79ddb8249f4238f2e463963b66313c5e8d8b6ba20e781f022b95fb0fd35ee22
 EBUILD beautifulsoup-4.6.3.ebuild 1324 BLAKE2B 34832ce698f74ccd1c331a8c392b165567dd44899991d9799f4b885ba1b177227c8c9f74d19481958965907c40524d11d6cf3407760a7d0f1ff53b7e1dd33f40 SHA512 e2b79e8cc2f0852c93330c20741fc1a6edd447d46c07ee9602c19086636be841a3928db571c8a683719f9f113df2908ec13013aeaa011d68fb5707b9071abff8
 MISC metadata.xml 720 BLAKE2B eb5a827491cd19df36bee9593e3e110a986fceee9f6d62a4de47edfc3daf4e1090062a2a9a4c8bc9cbb4f9b378de0c21126b3229740b7e75fba22643fb28fbcd SHA512 94493d30b0e0e55b94d08f9a56841c54088469a86b706b73e8efe9c0f9a0da598feececd01f5f14d7e28bfe6fea5d7b017fb84a2df680335f519803450c6f578
diff --git a/dev-python/beautifulsoup/beautifulsoup-4.5.1.ebuild b/dev-python/beautifulsoup/beautifulsoup-4.5.1.ebuild
index 84f52ff0e4bd..a41cdad3fda0 100644
--- a/dev-python/beautifulsoup/beautifulsoup-4.5.1.ebuild
+++ b/dev-python/beautifulsoup/beautifulsoup-4.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="4"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 IUSE="doc test"
 
diff --git a/dev-python/bleach/Manifest b/dev-python/bleach/Manifest
index 5399b10d2902..fddf89876182 100644
--- a/dev-python/bleach/Manifest
+++ b/dev-python/bleach/Manifest
@@ -1,7 +1,7 @@
 DIST bleach-1.5.0.tar.gz 36502 BLAKE2B a56eb875a5becd21f7ff71a29db8178a7536a7aadfe81fe178360ba61ba599df9d4d9a782bbf72eb186b61a0b2e3f99058c483cc0d194e735a787319697c7327 SHA512 572a089691af61f096716d96517a96755fe674cc471bdbcff80615ae903eaeff72c47b918ee28a1db60ee5c0253c0c52ba02544f8535ae4f283a3a87a3061124
 DIST bleach-2.1.3.tar.gz 60141 BLAKE2B 5c04269266007e31e1a01540198177afb6b13362b89815073b7cd68668da26725f2631defdb26d124ae6c74743de0d31b2975a0d19f58e032ac2332e3ea46a75 SHA512 ff74fb3646709f20c79ea02e6d0fb93e2f204d3151a05f259b703050c10d410859af76acb470405f6fb7b55c8fb64595e6f0fcf8e9cb8fd3fc3722fa30a47de5
-DIST bleach-3.0.1.tar.gz 165179 BLAKE2B 261ef2692c8c30e1ce387346aee03e45d46e195d45778485371a4e5d5d754c579853b50633fd5a834038c931cb48dc458771e7a44b7e0726015ea5934b2968bf SHA512 c90fee244d10ae66c30c8bff80e096cf508b2413a7ee082cbe2c5e0f1508d078133c2db6cd09f05ce875e867d4c0fab985659e4fe6d7bd9fe6ad4f823af03736
-EBUILD bleach-1.5.0.ebuild 773 BLAKE2B 6afda52e437aa252b31174f09b7a6f61fa95f4b91f96ec364ac9375e26c2aeec5f5df001b92a8ee6c0f7ffc5a62eaf1830e64d216f3660e43661230000d2f770 SHA512 984382fe1f458fac718dde60f3e6089edb2cafa69296b3e21ef9049907da625ac44af15b87c062801a68a5b15a2fc3a989015cb5ad94c2584f2a8783311dba0f
-EBUILD bleach-2.1.3.ebuild 787 BLAKE2B 3d1c4c3224f04d6fcf4b94a0f8f60b27811da97dec8b823625e29064057f971b64f8a1297c1a64a093293f641a515b8980a979b516e82191a68a82482916c13f SHA512 192e6c3c2d5c23aeb1831346a00a65bc3bff60f0d01426653d8785ddfc4c4f4cfd8f2c8d443d631c2d211188e8e07bb957a8024e11e0bfddb4bfda87cf578e82
-EBUILD bleach-3.0.1.ebuild 770 BLAKE2B d409b89d4930f5823d06f62945b33bff6b92e97d68eeee07a7735ba1de80997c6e2425a003a8be398a9bad1b145991c88890fe87edfa232d34ed7ca2cae1db98 SHA512 3e809fc9eb92847ae78a2d60052256fa8a0dff512b2ab3ef75bbded0a953dfb0996c7e21f9f1d114b1bfe801cb5850f6f9148a2d6f4b49e7dc6a6fe45a6810f1
+DIST bleach-3.0.2.tar.gz 165682 BLAKE2B 26dfca08732af9eb11a27e1913ad1ed76454950d902d8f0dfd4a816dfe972d2280a29fcb7ba6c021938863f92d20d6ee3bb5ea64ee0b1f52e62cdbe12aebe009 SHA512 f5a6537c5b048a23b7834f27e30413517f82082f2abc4ad26c16a3aa4486545beec5394d2b759e82022f4cb8915e4034d8cd3383e41a3772a73f3858c283c155
+EBUILD bleach-1.5.0.ebuild 775 BLAKE2B bed91ab21bdf8e1b71222caa391619e46c8f4020af72502ad08a733291ff0be11cc91f40e7461797a9d014c63a7543a3bee72e3616497e9ff243f14490e497ad SHA512 81f7a5f0fdf45d61f4879debe3f3fbdb09d0fd69dc9a40bd672555437a66e1517bf621e7b1d5722337d8a57bc5d318df5603daecdf6eb8454b03e4f35a6b1155
+EBUILD bleach-2.1.3.ebuild 792 BLAKE2B c5ae1e13eb60de6325e0499601ea186247e144e023f0dc42c321a17fb5871b90e79a64c72e0cd21083efb2274bce941d884b8ece553252ab24a68af2422e00bc SHA512 a7897976905624bea8b5b6d55953260b1d57d2cf0b602ff445b884e261ce71942e8681fdfad15eeecf2f74174c30d713621eddae606f338154799cf2721599b1
+EBUILD bleach-3.0.2.ebuild 776 BLAKE2B ad751be4cb06af64969d08cb7bf6111fa87483637731a5d2987ca55f8af701083bf670ecfb2459703ba108c65b4cd367ed7847d5f1cf17e7042f42ec1005af3e SHA512 5a44eb59a6c8c7aa09417622c7d2ae0c2f01e4ac9d6f6f2b0c545cdd2d01d89de8cf6991d3a8d194ccb0badb15c87ab80d1e8dcba6a636e6bfecf530793867ef
 MISC metadata.xml 375 BLAKE2B eb46fe64fd2800b8222ce88a2ef34be12f68a5a014417ebbfcf3466beda9c64f6a6d1ef4431d83b4948c1513de81840d1f5c65961d851213f928fcc6a66045e5 SHA512 9f8329e1fe0a9a7a6268dee15c098bdd7893da00a3c4f4dcab207586dccc5f6b471754be0eacb21fbd7fcce5e3130a631fbf1fe60a27ea525552d7ef2d9c173a
diff --git a/dev-python/bleach/bleach-1.5.0.ebuild b/dev-python/bleach/bleach-1.5.0.ebuild
index 632e3e55c879..fc1dbd3b26d9 100644
--- a/dev-python/bleach/bleach-1.5.0.ebuild
+++ b/dev-python/bleach/bleach-1.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/bleach/bleach-2.1.3.ebuild b/dev-python/bleach/bleach-2.1.3.ebuild
index 23ed3a93ac81..b397e3a658b1 100644
--- a/dev-python/bleach/bleach-2.1.3.ebuild
+++ b/dev-python/bleach/bleach-2.1.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/bleach/bleach-3.0.1.ebuild b/dev-python/bleach/bleach-3.0.2.ebuild
index 71d5a9790dcd..3ae4009d0bb5 100644
--- a/dev-python/bleach/bleach-3.0.1.ebuild
+++ b/dev-python/bleach/bleach-3.0.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 6d9d50b99081..ced2814a25bb 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -3,7 +3,7 @@ DIST boto3-1.7.35.tar.gz 228201 BLAKE2B ae164f4eb8a77d15ea142f0a88422645b306f83c
 DIST boto3-1.9.4.tar.gz 237313 BLAKE2B 20ab73dd02864b455a2bcc567b6303ef8b0503c4dd80efb442bf7ad8167329c938dcd41cbc61d4ab50fd02cbf8758c10aadb9b13d9c795330fe1faf9a1f7352b SHA512 7f0eb3b5537aed598d75a05474439819dee8c0030dd1eb685281e963ec465699ff9120394170f1ac7b53493de9b8702ec789863839eb3710ff3d60e2dfc1f1ac
 EBUILD boto3-1.7.19.ebuild 1227 BLAKE2B 19758ee9b4af55e2ce53fed273ed0e1dbd0982005405a223f29832048dafc2e8e9d85349100ebc2fbf90d0ff76a584bad252677478c0099c9bd38fe15b346005 SHA512 e4566902a5b11b9062dc180081d794cd643468e5d53fef4d9ec2c58edf20d0574fa2f8a9ba0ffe7b61717a3fb978b50127a6cf4ea9dcf5362328545057cbde0a
 EBUILD boto3-1.7.35.ebuild 1229 BLAKE2B 2ebe447e5c8f930c614e9e25d92cb64ec4d955f764087c8e57a954fa5249a4d8eec0e2187a29cd6ab0b0ec6e76812bac00fe4918a6ed8a1c94c0cb5ba643a06a SHA512 3f57b544631b64b391730e140ccfb98ee5721004687dc382bb82d42b490b7bb68b33d69c11c0ba36c1b32f52221a4e625485bb97bc3c596144ea3f35b5e2add0
-EBUILD boto3-1.9.4-r1.ebuild 1238 BLAKE2B 0825f1f43734f041d3021aef6bd0f7d87eeae61e83780fcb73b4c76bd07261093e6784c6f5f38bc439c9d841dcdbfe6af8ce2e35eaf62d0c58e4f57610338e6b SHA512 e42c9722ecb568be46ae76d950ae30e436d9841123b51ecc34dabe79b5a3c57421b6c6cb0e30b9faccf61a83e6d4f82947e5f1e6faa6e9dafcbfe1dc61b156ac
+EBUILD boto3-1.9.4-r1.ebuild 1233 BLAKE2B 7ca57d32e15043db1182069001efd146cf5a1ecbc8e0160d0f1e3ef3b171113a7ec814361c2ea80922d7fb3fcb56803f6a2e69561c5e5b1849d738f323029b1d SHA512 86deefa7d553b50ade8f9097a7d29cde60374be2b43713fdaf1d91c9cd15082f898ecee2954d7455d680bb2b602063579d5ea7dcf07a20ec199717b53cafccca
 EBUILD boto3-1.9.4.ebuild 1228 BLAKE2B de6d5b56edbe0b4c9a8fe6cf28ac04a01c62ac4a60e1182daf7d5a4b3a5d9251952e85ef45d62a4953845219d38253ddb22aa303bb6e26ecaf0af3c258d11705 SHA512 13addc19481acfaf316e1d0f45e92a6077b3c1065e45c6e35889d91995f1b195dc45dc8cc966bdf983968a12994254395b885ac8163aebdbc10c87da41e16d25
 EBUILD boto3-9999.ebuild 1238 BLAKE2B 0825f1f43734f041d3021aef6bd0f7d87eeae61e83780fcb73b4c76bd07261093e6784c6f5f38bc439c9d841dcdbfe6af8ce2e35eaf62d0c58e4f57610338e6b SHA512 e42c9722ecb568be46ae76d950ae30e436d9841123b51ecc34dabe79b5a3c57421b6c6cb0e30b9faccf61a83e6d4f82947e5f1e6faa6e9dafcbfe1dc61b156ac
 MISC metadata.xml 326 BLAKE2B 0ee2d830daa48d21aa34b2bec8f8b9d6ff03edaffc6bf8f5b47c05b5a83aa0947e22651dcf9ef4d8153b3b0f21913069a77bcfb7b25f55a67c147938bfd6c0a5 SHA512 0e38efcdc960343f3b92fdfca7d91719b2b3b66969cd100fd8e0d53eab876e062ffe2cfb370b605881631f1077861cd6e0aa1b103477933bfa949d297193e109
diff --git a/dev-python/boto3/boto3-1.9.4-r1.ebuild b/dev-python/boto3/boto3-1.9.4-r1.ebuild
index c4a2a2204096..17576ce2cd16 100644
--- a/dev-python/boto3/boto3-1.9.4-r1.ebuild
+++ b/dev-python/boto3/boto3-1.9.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 fi
 
 RDEPEND="
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index ba78f6dcfbf6..f19a15d80693 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -4,7 +4,7 @@ DIST botocore-1.10.35.tar.gz 4451806 BLAKE2B 1161e5dc23a2a540b9fa237eb5c3029c682
 DIST botocore-1.12.4.tar.gz 4800384 BLAKE2B 121019d3c33872fdd874ddba36ecc8612a6354068ce7b759cbe7f35a9787e84c34d3a71ef3fdd2d721d3c3973a7600e4398cb7cd2a3ba698464c15137845bdf3 SHA512 8d196984f5623df403a8a23a9b7e7061e59c0ca56103f89d749d6ad7d92168ccae267f85312f2949cee322776d7948f1ecfda3d9d2783e8ba92fde7a178e8cac
 EBUILD botocore-1.10.19.ebuild 1454 BLAKE2B 5db9c134b89b9e494a97a73d615cb49198be13a18f29a016b67ef764887cbe51da8714249e7144eaa7c905edf554de6688f51e723370378c28c5e35b5662b7e3 SHA512 778b1031180cec26b341cf18560d77a816efd5eec0a89552affd3d686d8fd2b0acde1acbc8cba10a50fd4f659df169148c187133e662f5c9ca09684e957f4a21
 EBUILD botocore-1.10.35.ebuild 1456 BLAKE2B 27d13171ffeb862a0412c1d46d25312b7f0eef4525c2caeccbe4f2f5bbc003f99e0caa49adb33b3c35a5f3ece93f8b55d6917c9535be6eece68ee33e389dee79 SHA512 3d97c0cdfa7565e563603568500a14a71f0581b5cc965e9bf83888cd3f34e664c244130866a675a0f26b693923cba7bc6e16025ead0ea3633966c7cd765d1e00
-EBUILD botocore-1.12.4-r1.ebuild 1504 BLAKE2B 7b62171c506bd723e08802eca7dffe53c5998597ba816f3c40bcd5bfa0a25b4d5c018db587e93983277f04e0a1ff733b3be8553d700517dec52753293bfa6b88 SHA512 dfa0ecdce69ab3958a17aafa59d12c0ca67feefe4af29b5baa3cb587f4ab05a460031d77837c43f77e4aa2b7352e61ac0f3e711934811206b274f8d7373c9d90
+EBUILD botocore-1.12.4-r1.ebuild 1499 BLAKE2B e98eb7a5dad4a72079a7cfce071daddfcd9c9d211a2eb95fa53e9ccb912fe1cc46b9da2bc73a2cd6b7c132e883748a160bdf43c954b1817fea6d98b6a2b146a9 SHA512 2d6a8a434e28c0a9c375cf6f3326044cb450bc57149fc53a72a8b9f77dd9ef41aa699f38ac6d7c0f0ad2a2fce8360c1a838851d63ba5200d1247b1d1c747f5f2
 EBUILD botocore-1.12.4.ebuild 1494 BLAKE2B 36263e1b3bc056f6a5fc0034e3373d30920976a8e54113bb6f7b3fdc238f6acd6acb76f4026cd5f8302aa6d4ba50191d72883896282f1a2f0b55312cd389ce4c SHA512 ead62975b9cc2ef72e396994d62eb2a3e1c807d6d6a69b82cd07ea7db6b31bb5e88ea4af1fc9e4306c8f5fe84c2469501cf04e790c85ea5067940715049def57
 EBUILD botocore-9999.ebuild 1504 BLAKE2B 7b62171c506bd723e08802eca7dffe53c5998597ba816f3c40bcd5bfa0a25b4d5c018db587e93983277f04e0a1ff733b3be8553d700517dec52753293bfa6b88 SHA512 dfa0ecdce69ab3958a17aafa59d12c0ca67feefe4af29b5baa3cb587f4ab05a460031d77837c43f77e4aa2b7352e61ac0f3e711934811206b274f8d7373c9d90
 MISC metadata.xml 375 BLAKE2B 562696aff0128b74dc4c2c0767fe03d53ae116cbc4fdb3a8649e36a8c689dcbd2a90bb5f46dcfa6a3cd71c9150f923281100ec098fe2212dfffa96d74e472d3f SHA512 c369567feea497a744245642a9a307b2a2ec06035fffc3b9b72d9f7ee9fe2f342d62cd1d06a668b47ac1b3187fc28845bcf3c220d942cfb2ac89f72809fc4a86
diff --git a/dev-python/botocore/botocore-1.12.4-r1.ebuild b/dev-python/botocore/botocore-1.12.4-r1.ebuild
index 822a910e36e1..7b403f2d5eb5 100644
--- a/dev-python/botocore/botocore-1.12.4-r1.ebuild
+++ b/dev-python/botocore/botocore-1.12.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 fi
 
 RDEPEND="
diff --git a/dev-python/cachetools/Manifest b/dev-python/cachetools/Manifest
index 4a732fec27ea..54ce4f5dcb09 100644
--- a/dev-python/cachetools/Manifest
+++ b/dev-python/cachetools/Manifest
@@ -1,7 +1,5 @@
-DIST cachetools-2.0.1.tar.gz 18790 BLAKE2B 48ce160117086306f5dd7fa7d74b12cd05db76089a1b98e78fa77b81e0f99516523fcef1d43c434137689b45e988ba7471469009049337f8e4a9a8aa6bb2e2b8 SHA512 4caad0676dab2a2ab922138c8305c7e40ac671aaec59ce502428608217976045af7a714c51567ff020987d3bf90f0c9c51645a59bb4f68d377e1f8dbed24bade
 DIST cachetools-2.1.0.tar.gz 20051 BLAKE2B 87c0839352a82fa2e531c6e4fe4da3ea7038ab9f09ce0b537f16deebf63de36a49ffd563790d42a1f07962841cf07431f1287de114f9e8d148c1413eedf1ff42 SHA512 6536afae48bad99465709860fd57c8c66d3b203ecf79a922e117a2c004a33b7ab2ac895f87596cbf4be377f6655d1deddc80b6500daa4d529eef7c1ca0adbd8d
 DIST cachetools-3.0.0.tar.gz 20513 BLAKE2B e6fdfe2aff22a9ae35d19acb7a678410c5c06d3147cfc3d57725d942c3e4ce00d5aa8bfce7f8ee80960751643bc655d5d2226382e82c1c5c1eda746cb34a556a SHA512 7211e4d1525b94f5a74a89571a1a3696719d1cb15246f4b8158408082cc59ef03935ba82ddd78a34dbb31b271c234dab6cd82839c13b23159b80264bd552bc51
-EBUILD cachetools-2.0.1.ebuild 609 BLAKE2B 9b6e8950d51c08909022af77dd281ba52d7aa25e04dbd23c2bdbec2c7aa368cd1cf4849a9ef4c8bfd2e4924c2ba5db71c8a84a745d5a7a1caae4aaede31882c3 SHA512 6a6e620a075c8922e7933195b15c7dc811006b5918fa69cf81d42297091c56b297f7a684d5401b8e9d9c58c958f6096f134956f83ddd58bffde2dd2ebb277ce3
 EBUILD cachetools-2.1.0.ebuild 609 BLAKE2B b33430c1f7562dbef7dcf04fd96b2ef44ad29a0429c5e6b7d3c7225d3c48c464deb0da00806cba7756faa4aaac76de0b9c07adf6f97d8cd8851136ff1ddbee6f SHA512 16c1431358f652a92fe2954bfc69871a5fb5945b4ce58b3f6776be7b622006732bb1cba119e2cb97681f1aff8ea5f99b9ac8a5c2d4773f6413065bc6319a9d47
-EBUILD cachetools-3.0.0.ebuild 608 BLAKE2B 35181eef666be31b8fcb2b1597003ec940bc85b802ef4c01b17375f2cb718cdb6b5cb89157a963475dbf2232796746fc70cd50c89488380d54534cc89fa9b579 SHA512 c6f2868f52088e2d687dbed5af610eb4a2df71b603e27063650eb7dd089dbc3a908495090cce5ea66966afa7538ed9d02cde4fdefde244568a01fb9a13b55e65
+EBUILD cachetools-3.0.0.ebuild 606 BLAKE2B 264140e446bcce64ee64573d0cef8992ccb99db98ccda31be12ee34176d36d47dc3e3102bd01cadcfb3fa4f86b3e9bccbf3f322e17bb43a7c45e3178494b97a0 SHA512 0cf35e2780c2430cdaecf91f24f03f9aacfef994061d8d34e469d8b73ce6937aabc8d48fa86808ae511cef5824ad29052840d6b3ce848076ea385ffb46fe74e0
 MISC metadata.xml 327 BLAKE2B 13db1dbf3081379704678e984732303e85da30996b4ba48e58d3145ffcf3dcebce27b26a140ce121a4303980ce0c41c7b164c9d0e141f4c208d74ce27f262987 SHA512 7eb94b86c09ed93f498beb76dbdf7217a1bcf48ac817c44ae197e20285b18a336f7cae113ab48a52900eb214be133cde6b52760386d10b75ad8810921a127a7c
diff --git a/dev-python/cachetools/cachetools-2.0.1.ebuild b/dev-python/cachetools/cachetools-2.0.1.ebuild
deleted file mode 100644
index 26e716820ade..000000000000
--- a/dev-python/cachetools/cachetools-2.0.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Extensible memoizing collections and decorators"
-HOMEPAGE="https://pypi.org/project/cachetools/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_test() {
-	py.test -v || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/cachetools/cachetools-3.0.0.ebuild b/dev-python/cachetools/cachetools-3.0.0.ebuild
index 6970aafb795e..b28bb5ad3518 100644
--- a/dev-python/cachetools/cachetools-3.0.0.ebuild
+++ b/dev-python/cachetools/cachetools-3.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/catkin_pkg/Manifest b/dev-python/catkin_pkg/Manifest
index 50568d183c02..a93b27cab41b 100644
--- a/dev-python/catkin_pkg/Manifest
+++ b/dev-python/catkin_pkg/Manifest
@@ -4,7 +4,9 @@ AUX infinite_loop3.patch 1236 BLAKE2B f236f05623b5ee4414fe3da7efebf61d62ed8617d4
 AUX ros_packages.patch 622 BLAKE2B d155ddb5cf084b660914028b89f061be243ff15ca934a0513afa10f64ae31adbf25acdb294e6fcff441fe598f2210f31f91733038519ce01765cf51b0cf5ba02 SHA512 6675a4a1396b5f8ad0f62b6a2d1c59511950685c85f820f3b2c34f3c701052e2e678aa9d5c6f6e6dca72ed8b94372cd3f442dd1634c53981166efb8ec1f30164
 DIST catkin_pkg-0.4.7-gh.tar.gz 60765 BLAKE2B 905de7f4f013f8e7d6472b5159cb0e9ac82bb06dfca0308a7a5f8881402a721d987a016f7980f7a435a7122c4771311f82f56f460949370ecd93057ef8a8bb25 SHA512 1e947c09aa4789d414de74bed7b1aa3d5f5d16d22a8a4609f656b47e51b7318fdd21e003f8bf65355728abaf54a016ce2d78b79cc4ab8bd7c3e048b66c0c0f6e
 DIST catkin_pkg-0.4.8-gh.tar.gz 60811 BLAKE2B f7bcdb121844837701e203bfefd3ad9b454362d0d9f5b912a1df542dbb50ea402f1556b4f4031afa13dfdeb852f955d175f80344b773fa959fecf522ceb06fb6 SHA512 b697d177164d681e94f19f7f0ec768cb91ba5bf31cd3dfd41a24bc3347957b30f97bf1cc3e3fadb7c3c4f48a5d0306835a9496a9e4ab7b36784f7bbaf4268b6a
+DIST catkin_pkg-0.4.9-gh.tar.gz 60919 BLAKE2B e7d4987022359fa7306df77ede2e07b2371bfa16b9787e513dd096ffe3988f9b7e6cbf61b96e00992334dadc6052811c20e0b7ea6c9198db332c1eac545c5031 SHA512 53e8440c0768b221526d134c5609c3088dd02e214150253469fe5883665936472486792db2d69c05fd352949f2350bda5960e71cd54e3f1d9164e0915c963295
 EBUILD catkin_pkg-0.4.7.ebuild 1237 BLAKE2B 062a0893ed878654c8add72f78814916e33e4e63cc8e78e17b1b30a6869d228f89d55e654294f0668ba4bc4b485c08987108bdeb4ff99b1a86e413512075e771 SHA512 0a4ad10184b23eb326a78fe8b411cda68ed65aade565832f0ec30d0d1fbfe37e2841430bf71eafab99db059903685fa3876998be7cb98172f62572a9abee552e
 EBUILD catkin_pkg-0.4.8.ebuild 1271 BLAKE2B 0babb723a5bb32a5ef1b5febd3881cd9a25dd5606ecc571453f2ab53a697d8f477b1b56d1ed281169131ade92210b31b51c4cd72ee81e13d0661c9b1fb129aea SHA512 321c96ff1b0d0ff7abb8435fd4b3b98d708ea59f0abeb33513765070a8d16c1c69291833e1452b17c1810a9aa278b237a1cf5d2063394bcd984d8c0f2ad69c45
-EBUILD catkin_pkg-9999.ebuild 1271 BLAKE2B 0babb723a5bb32a5ef1b5febd3881cd9a25dd5606ecc571453f2ab53a697d8f477b1b56d1ed281169131ade92210b31b51c4cd72ee81e13d0661c9b1fb129aea SHA512 321c96ff1b0d0ff7abb8435fd4b3b98d708ea59f0abeb33513765070a8d16c1c69291833e1452b17c1810a9aa278b237a1cf5d2063394bcd984d8c0f2ad69c45
+EBUILD catkin_pkg-0.4.9.ebuild 1238 BLAKE2B 9df803c1a3bd3e05f6cdb400ef295c6da374308f8606d00653a25e4b2c2879e2e88fc29a93b9300cbb5d476d2e24cefcc98a744c897bb73a2faef58a6b227cd2 SHA512 775ddefe47f8a014699133ab6a00cf5dde64e7ebac568148536af5643c23d0da7cb20f39e57fd7b5a970cb8405b8b7ea46f3d4ef3f40335618182a98f73f2fa0
+EBUILD catkin_pkg-9999.ebuild 1238 BLAKE2B 9df803c1a3bd3e05f6cdb400ef295c6da374308f8606d00653a25e4b2c2879e2e88fc29a93b9300cbb5d476d2e24cefcc98a744c897bb73a2faef58a6b227cd2 SHA512 775ddefe47f8a014699133ab6a00cf5dde64e7ebac568148536af5643c23d0da7cb20f39e57fd7b5a970cb8405b8b7ea46f3d4ef3f40335618182a98f73f2fa0
 MISC metadata.xml 343 BLAKE2B 54c183cdd942eaeec77723ae80d09a3cdd6e40270a3974e80a811fb050289e6f86b8d722fcefb1f37f7c2b8ad1ead3e00f04d49c2a029884daa7c2c33869ef87 SHA512 3ca5d78edb7c7dd2283944af93b7a8b6b3bb176ffa9e0df31881c8b5d66a4abc7e080e11f25f285e0b8735b16ed1598cf032a37d62b7fbb0b5adb3296e9b5862
diff --git a/dev-python/catkin_pkg/catkin_pkg-0.4.9.ebuild b/dev-python/catkin_pkg/catkin_pkg-0.4.9.ebuild
new file mode 100644
index 000000000000..241a69760c54
--- /dev/null
+++ b/dev-python/catkin_pkg/catkin_pkg-0.4.9.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/ros-infrastructure/catkin_pkg"
+fi
+
+inherit ${SCM} distutils-r1
+
+DESCRIPTION="Standalone Python library for the catkin package system"
+HOMEPAGE="http://wiki.ros.org/catkin_pkg"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/ros-infrastructure/catkin_pkg/archive/${PV}.tar.gz -> ${P}-gh.tar.gz"
+	KEYWORDS="~amd64 ~arm"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND} ${BDEPEND}
+	test? (
+		dev-python/flake8[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)"
+RDEPEND="${RDEPEND}
+	!<dev-util/catkin-0.7.14"
+PATCHES=(
+	"${FILESDIR}/catkin_prefix2.patch"
+	"${FILESDIR}/ros_packages.patch"
+	"${FILESDIR}/infinite_loop3.patch"
+)
+
+python_test() {
+	nosetests -s --tests test || die
+}
diff --git a/dev-python/catkin_pkg/catkin_pkg-9999.ebuild b/dev-python/catkin_pkg/catkin_pkg-9999.ebuild
index f4dc76b3fa34..241a69760c54 100644
--- a/dev-python/catkin_pkg/catkin_pkg-9999.ebuild
+++ b/dev-python/catkin_pkg/catkin_pkg-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -46,7 +46,6 @@ RDEPEND="${RDEPEND}
 	!<dev-util/catkin-0.7.14"
 PATCHES=(
 	"${FILESDIR}/catkin_prefix2.patch"
-	"${FILESDIR}/argparse.patch"
 	"${FILESDIR}/ros_packages.patch"
 	"${FILESDIR}/infinite_loop3.patch"
 )
diff --git a/dev-python/certifi/Manifest b/dev-python/certifi/Manifest
index 6c9c7d278562..dd7edaf93120 100644
--- a/dev-python/certifi/Manifest
+++ b/dev-python/certifi/Manifest
@@ -1,6 +1,10 @@
 AUX certifi-2018.4.16-use-system-cacerts.patch 340 BLAKE2B 42278c6b40ef6daef71a2ef3da75baf78833906c1cd018757b0b45d8ca623cbb5de15e5d5cfa444eb360738b368ad2111bb5594beaeb910275c65267b7532a34 SHA512 8c0b36be0ce23132fe739be4a173f537f4f8870fe0f5e2c98add13e94c0c23490cd0aac30e289193820790eb8580770e178e32b9f16b28255fd95565d6015faa
+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
+EBUILD certifi-2018.10.15.ebuild 1419 BLAKE2B bc5552dfaecd5b58771e3bf5a60b90e53fb43f42308d92ab4213e7f6cb75d94fadd54075719acb7191f5ddc29cfbd6e0bc9d1c96642cff5259cd0878cacdea15 SHA512 ee97fe12dbb86b670368e2c942036483bb7ca49501accaad6c68284bcc156fd6de77b7e1c114809591d981767b540c113fab41747e43a3f5f72ea510bff02c98
+EBUILD certifi-2018.11.29.ebuild 1419 BLAKE2B bc5552dfaecd5b58771e3bf5a60b90e53fb43f42308d92ab4213e7f6cb75d94fadd54075719acb7191f5ddc29cfbd6e0bc9d1c96642cff5259cd0878cacdea15 SHA512 ee97fe12dbb86b670368e2c942036483bb7ca49501accaad6c68284bcc156fd6de77b7e1c114809591d981767b540c113fab41747e43a3f5f72ea510bff02c98
 EBUILD certifi-2018.4.16.ebuild 1421 BLAKE2B cfbd3cef82853456e77532e59cddc6470e01afb64eed3a7831bc315a0af5394dad581d0f161a5fb1a92845e37e1ef715e568e71fca4990b9c9cd9b8b46761147 SHA512 8833454c9744ce1254134bf2280675203c632c3a002562c4c20d5d774a630f1c63c8ed9563abb8188dfc73c47521fa17370c496093d6c2f19774cb3ca8c1ba1d
 EBUILD certifi-2018.8.24.ebuild 1434 BLAKE2B acd141ad3999e000f89c426adaec0005aca0a1821ac3e2e001f39397b3395a451d43800fe09782f47b669cfb845bac1c2c3aa19825ab02eba12539b43c1f2ea5 SHA512 587c96b2d36b02c69024fcc85b71a240adc63b05bc692edee2d0d25b0f58fdcd7f421173da0c13bde3a90bad70910c64c3dbf1a2b1954bf9c9b0fa52d26857dd
 MISC metadata.xml 320 BLAKE2B ba5c3c1018c5cba293969a523ab6c388f5bc0d0cfdfc69a4b143f1c966aad036df449bb091eacdeae2335a6bdc722da85882caad2a447bf87b600da2ed7c5309 SHA512 0e99564887f0a0b314056b2e1f4b6e3afcaf908de6824a2cc87deab9d1832566e97b8ba88cc7d2bdc5d11e7f1c8532830fc59602efd8c2f1a6061c0ad4853fdd
diff --git a/dev-python/certifi/certifi-2018.10.15.ebuild b/dev-python/certifi/certifi-2018.10.15.ebuild
new file mode 100644
index 000000000000..3bc4e1e9e5dd
--- /dev/null
+++ b/dev-python/certifi/certifi-2018.10.15.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy pypy3 )
+
+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/certifi-2018.11.29.ebuild b/dev-python/certifi/certifi-2018.11.29.ebuild
new file mode 100644
index 000000000000..3bc4e1e9e5dd
--- /dev/null
+++ b/dev-python/certifi/certifi-2018.11.29.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy pypy3 )
+
+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/cffi/Manifest b/dev-python/cffi/Manifest
index 2e377f6c6feb..f3c0822d14dd 100644
--- a/dev-python/cffi/Manifest
+++ b/dev-python/cffi/Manifest
@@ -4,6 +4,6 @@ DIST cffi-1.11.5.tar.gz 438498 BLAKE2B 2e22cf3c2d50d76f8f25b7ac31a77fac8a49e2b2f
 DIST cffi-1.9.1.tar.gz 407108 BLAKE2B f95e99cbb7a10aacb714d6ddbe85755e24d4fbdebb9ada0ab87c95b58aa56b364df612fbdfbf6fcc3a9dfff6e96fe5e979ee37b1c6c9b62b6ba8d3a9565def2f SHA512 6e76f181b6b7b760a14ad70338edd104a8b8e2eac5680e336d3868e0bd031a1665608e29a65dc0c56806afb8a8c03811586f151f3acef11e54e60c1bfcf902e3
 EBUILD cffi-1.11.2.ebuild 1476 BLAKE2B 25125ac60f6f4c5d9ff2ef82ba26e125153898a82f4e3320dd0593fc40c7ac8baac95961cdd8fdf1d905608a94f4d90ea72eaae54cafe27effa3f18234937223 SHA512 2b7462558ee2126c40966b17de05010b66b9b2535fa6e31fdc3f1f55527944529d79c6b7404dddc7cafdbffe3058f43493aee5f0651eda693768989ce27c947f
 EBUILD cffi-1.11.4.ebuild 1477 BLAKE2B 8908398c5a76403e7b7157852374d29f287310b11d5afe6164d540d034b50374f497ff3a86118079ca8987117862789aa9822a517c23d77763ceb6b8cc74de6c SHA512 af4121b4931e23497f2593a1265543f61bff092f56e3296121c3b1d4740f86748e8bf3736d4d9aa371b82eeb775aa377ceb8c9bdd80f5afd00cee92bea42b429
-EBUILD cffi-1.11.5.ebuild 1490 BLAKE2B 1134e18fcef9ff89e10d8d047ac552f5667488b05db5ddbd0e9fc72b4e0b576a773fcdf1c74f2ac1aaf0676a5656a6125ea67b15f59d51026c687516b735e1af SHA512 2def086906b75aea4dd0fbefdb9570ec55d3d67d3b1685123845e7f225dbdc494a147f54b0ee1a489b873b3af0bf64d856593618e7677b3a7a99f69d3eb190c6
+EBUILD cffi-1.11.5.ebuild 1520 BLAKE2B ed422a877aedcb8e4f46b92df0a0b161d20c184191c5d04aaec1c0aa35c6268d73606cefe61b532d6c3ab3aeb7f8c08044c1acb8626a48f9430ebfb86f2b8fb0 SHA512 a25db796de4627c4df52337face49143b0bf31f169d5372090c306bd7ff4c343565c287d4b6153efdd1c821061d62dacda8eabbb063f45b29a2590a12b5b1fb1
 EBUILD cffi-1.9.1.ebuild 1466 BLAKE2B 439b6504bdb7b2b6b84dd5580ec4a155361d453ee5de5133102826ff6ac9b42a169c55e3952677f438b3b3087b2cccf57cee785d357c9f7d706db8d9481994ad SHA512 40d33d6e223d157a7e20f9ea96133fbf1d6d49060d9cb8bdb80188075918e864c64cf34062fca7a8ea909b0a6a65f39b8b1a6b6f1aea0f741d7ca779fd466aa5
 MISC metadata.xml 317 BLAKE2B b6416209bd2358c42c2be3bd228238b401bf126919b6e7371d83d7cec8cb55a40f89db562701cc8f3dfa904e225426881b22ff1d3b72085365b5caf9b8c6a403 SHA512 0744ca7b98b2ebe2985bf2a81a337d09be62cfaa51f8380bac52f8d30941e997f09be20e28caf6967226a71369003cf35977790aba56ed0d469cc490cfa089b6
diff --git a/dev-python/cffi/cffi-1.11.5.ebuild b/dev-python/cffi/cffi-1.11.5.ebuild
index a768eb4a28d7..9cd44285b9ce 100644
--- a/dev-python/cffi/cffi-1.11.5.ebuild
+++ b/dev-python/cffi/cffi-1.11.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-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 ~x86-macos ~sparc-solaris ~x64-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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index 2af44b9fa915..85686353d7b7 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -3,12 +3,12 @@ DIST cfe-4.0.1.src.tar.xz 10933628 BLAKE2B bc1bb8875e83ccecd446a48cfa41f5c98a09d
 DIST cfe-5.0.2.src.tar.xz 11459216 BLAKE2B 80d9b2ab70b00c0dfd5c5386a44e0c15d8252e6175c9da55a0519c4f9b8192e32e215110d7d3808225786e2c7f906f2dfbe11dd09bdf21574e99709ae237ed0b SHA512 9931afceb5569ad6caec85d506180c810f7fea94af8c997143b0a37cbf413fcea0d92520478610627eeee1efb65fde684066ace0dfcbbf7b61ecd709d22dd0b1
 DIST cfe-6.0.1.src.tar.xz 11905772 BLAKE2B abb60e9f9827d1d8a24f0aaf8a1d1e32979293cc401258d230f93290e633645747fd0344af189ac7081b06be2cada503364e1e432b37110ade4b3578e40c7605 SHA512 f64ba9290059f6e36fee41c8f32bf483609d31c291fcd2f77d41fecfdf3c8233a5e23b93a1c73fed03683823bd6e72757ed993dd32527de3d5f2b7a64bb031b9
 DIST cfe-7.0.0.src.tar.xz 12541904 BLAKE2B 92ecfcb37e7efb4f3dde275e7a087a52f1ddc607bee78fd222f87e6391ab7deb9a4e761c05e405126f46170fdff04aeaf9bd1e886a326c92a064ca81be4e6f21 SHA512 17a658032a0160c57d4dc23cb45a1516a897e0e2ba4ebff29472e471feca04c5b68cff351cdf231b42aab0cff587b84fe11b921d1ca7194a90e6485913d62cb7
-DIST cfe-7.0.1rc2.src.tar.xz 12487728 BLAKE2B bba0f7751106ac0438b5db9cbd0e0c5d2f3fe35255eb49cf4ed6a8efbc7e8be3f8263f0d663a739409232e591ab74e7b0abaf4cc1df0d7605db913eac0a085ba SHA512 2e178f1829edd6a7a0f0919358adfe0a88fc8a83b629bf64411cb33181df43b48bf47057b6c3bba95ab939998f7a8db05717bc1e58f175c8dae5df881c88d48f
+DIST cfe-7.0.1.src.tar.xz 12488668 BLAKE2B b80247b5caf81661dfa715d9bf454b8023221bd27ce49b6bd8cd66f40ffe01448e40fb828fbcc64e49f059af7a7c5a95a0737b0b998454ac5c1dd39388150fa6 SHA512 df2f38153ebdc261bcfa6a569567f759bbb1a803192882a9d4eca55a47878166ac9057151a94ad341dc1281136547e4faa783a68070dfde2307b48cacd4b9194
 EBUILD clang-python-4.0.1.ebuild 864 BLAKE2B 40d3452c9f28d5c154a51258a764bc380addf20f8fb71e8f5e3d9a0fb60822d805df009f58f24457b834870a07abe365bcb6d3ed6557713282129992c1ae1d84 SHA512 d2900dfa55a69965e146800f097f8be256d022aca8d85f54db205f75b30cf72015d27c4e8f4981725d50c7a1c2a14c15454f009b2d8a3636103d6d133b0a2324
 EBUILD clang-python-5.0.2.ebuild 1079 BLAKE2B deb802fba226c098e138775a71fb5a492625ddb681b920b4ecc0aec30306087136ea5ab2f8d7bc36cc4c8474f44e67bfd637f90cd78ae7e1c85719f1a14be5aa SHA512 bf34b1c9b9b43fcda7d3a350e8d664355056b634b65f7741538d8f1eabe7556a46063df7340706f4fe2e0708b0cb4a34c85ce609149ab4f15d64478964622176
 EBUILD clang-python-6.0.1.ebuild 1097 BLAKE2B c1af92b85dbe2d5060fea49d3352c8151058b8f86c478c347842a1e46255f313a4ad0985b13543e34bba2214f0b17fde35a449779cccf41367a2b1776b6ed130 SHA512 d88877fc98ee9c631d7139e734a87d0a3f998963951602d5e1717b6158b2caaf79fcac4fa699a35131aa58885c3d01a8eb9106183118fc9a4783164e3be1be49
-EBUILD clang-python-7.0.0.ebuild 1282 BLAKE2B 1388b1521c6e8d965ea35450e8da412ba51dbca8b8a2f49a52abc748bfe124c88dce8608fcc0d82c1837b6cc648c267705242e207d2ef2d7cb5247d1ecda77cf SHA512 fafa8b51a6b8d953c3abdc589f0e03c0455df1a69222312b012076817738b96db4bdf6311b4fa52c9ef0874257c27547da80e5d7c40541ea87241e266ceb3bb5
-EBUILD clang-python-7.0.1_rc2.ebuild 1285 BLAKE2B 85ea303b42fe5dbee5b4494df3277d32e5ae72038e2417b98f4551fa57abf5c03b42f6a8812e43d1ff24cd97c3b4827a1b3785062c4184801f5a8caa86d2442e SHA512 30510dd9c747fe7ae416d3a9929c05d7e09c38a4504aec92d6b2327e4765db900a451aba2df45c9e8852adaa3d6d0555cd6737ef4c6ade95acc23ed402ecbbea
+EBUILD clang-python-7.0.0.ebuild 1284 BLAKE2B 5bbdac385bcce0c2d35b9f1f56e52fb17061189458cfcccb37e5a80c4ca3f5831752a9eb6c7deb921973e59c286cce8f13b98f2904db8bc52902e1165019599e SHA512 4ae815be821b350acef8e82cc6ca0875dd5bdb1bca9ea152d11e8ba0cdfdc352d6b55580277e8671dc62f05e124d083a46afbc1d66245752dd04d3d6c99b8e66
+EBUILD clang-python-7.0.1.ebuild 1103 BLAKE2B 880675335893e206636b121e60d025df935a8ac0c08d77c2b9d399f1152e8067f7fa4a95a06487aa51bc5ca53254ec8d661ebaa68c03286e19f1eaa2f26cb6e8 SHA512 a12d2a01febd8cab4e04350e897aeb59865f2a4a891a7aaddfe38f7bb2556595d6e367a9463bd4478b3aa691e41c031e8323c0bc36130c4d96449c0a84999e5c
 EBUILD clang-python-7.0.9999.ebuild 1059 BLAKE2B 1ab0d9234fbebea281bf2235f870e6cd468063f2ec5c20f7af3b797e6135aa6730ccea8cbde5ae5993394da1563897f5b45adba1d644257f6bc300b6da5500f9 SHA512 23882089855c9485ccf23129542f3b6a5e891776cf422c9b16a0e534e4084f59d5bfe4526d2510cc094ce8cab311ec141dc76ee45cbee7d43665aaef58c9fec2
 EBUILD clang-python-9999.ebuild 1034 BLAKE2B 3a56c0e391daf98889ba3959f8aa5c944c9930ac482c8beca5f814978507f9869a213384224c6965ade96a3f0b17f83aff9924f07d5ad2d03ed7df8660a54df6 SHA512 bff0eee11762f352ab6616086b19506a2ea0530284f50da24538eb8078d2c04af1d1aa2a8616adecb6bdeab8853728b2f4b5c3133fa15810f00a64855182c486
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-python/clang-python/clang-python-7.0.0.ebuild b/dev-python/clang-python/clang-python-7.0.0.ebuild
index 72bb446b4911..331287bbb424 100644
--- a/dev-python/clang-python/clang-python-7.0.0.ebuild
+++ b/dev-python/clang-python/clang-python-7.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz"
 
 LICENSE="UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-fbsd"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-fbsd"
 IUSE="test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/clang-python/clang-python-7.0.1_rc2.ebuild b/dev-python/clang-python/clang-python-7.0.1.ebuild
index 02fc25d374b6..430dad524455 100644
--- a/dev-python/clang-python/clang-python-7.0.1_rc2.ebuild
+++ b/dev-python/clang-python/clang-python-7.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,11 +9,11 @@ inherit python-r1
 MY_P=cfe-${PV/_/}.src
 DESCRIPTION="Python bindings for sys-devel/clang"
 HOMEPAGE="https://llvm.org/"
-SRC_URI="https://prereleases.llvm.org/${PV/_//}/${MY_P}.tar.xz"
+SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz"
 
 LICENSE="UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-fbsd"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-fbsd"
 IUSE="test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
@@ -29,12 +29,6 @@ DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/${MY_P}/bindings/python
 
-PATCHES=(
-	# update completion test results due to completion changes
-	# https://reviews.llvm.org/D50171
-	"${FILESDIR}"/7.0.0/0001-python-tests-Update-test_code_completion.patch
-)
-
 src_unpack() {
 	einfo "Unpacking parts of ${MY_P}.tar.xz ..."
 	tar -xJf "${DISTDIR}/${MY_P}.tar.xz" "${MY_P}/bindings/python" || die
diff --git a/dev-python/cliapp/Manifest b/dev-python/cliapp/Manifest
index ea680cb78bb3..f4a4a2915931 100644
--- a/dev-python/cliapp/Manifest
+++ b/dev-python/cliapp/Manifest
@@ -6,4 +6,4 @@ EBUILD cliapp-1.20140315.ebuild 619 BLAKE2B bb2d6ab798d93d38d31be45d4ba0d5e986a4
 EBUILD cliapp-1.20150305.ebuild 605 BLAKE2B 823c4863996f55a48074590d0c2d910d9255fba57bdc325480d720a0f4e79fa4eb641daa4bcbf6a7ef507aec6fbd1459cfb7ba4d9e672d58ce6d3a625aecb152 SHA512 64d7a3a2f2af67354eab0d78a092e04fb9b7d9640e587d76681578f13d9feab832b567328c30f92ec8653d7d4759cdca37f9c39fa899f130348d28348aab61f3
 EBUILD cliapp-1.20160724-r1.ebuild 732 BLAKE2B 1e5428927cb789cf7bc6b71c89a6e737beb4243d7179ed5f30a945969df818f7eae2e7ae806c4235fde69b1d1ad5732f4f21d8d1565806cb800ba25ad2376427 SHA512 4d2221382e5484e5f65723f05f4081975d603e11d2ac44186bfd800fa160d49c444134cbb7c0781f422006d630685879a58ec0d8e2f206c998e6c831f475783d
 EBUILD cliapp-1.20170823.ebuild 677 BLAKE2B 7df51b212cab73bec4ed27f0b45d2a4b299c131b82699f37db3179ddc5fb6629558df4accbeb1555e635172ece424818d72372dd952c2cc9f9819bd20589d41b SHA512 055f0484ad2e7ba1161fdf9aca3d226ef2e82eadab6bde1cf41e3c6b4fa1de19ced902112afcf708b582967bc782f22598a7a52af2a4aa6fabf051203e8d3e86
-MISC metadata.xml 250 BLAKE2B fef48a48388f26a915c53bca9aa9cab62fb73ec006736542afb4cbbe0c7b81d23afe2884f52433c7d390fc38ac32f957a6f6efe285ee1cafaed76407a964cf9b SHA512 924271cfb32ceafc4134e19b53fbeed96f2e9056addc3c2cbdec28890254abf5f0714979a3ab698ca046e41ef5c2cca2932350830bd8bd3a8e214d99123c12de
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-python/cliapp/metadata.xml b/dev-python/cliapp/metadata.xml
index ea6b59e79026..7a38bb900964 100644
--- a/dev-python/cliapp/metadata.xml
+++ b/dev-python/cliapp/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>mschiff@gentoo.org</email>
-		<name>Marc Schiffbauer</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/dev-python/click/Manifest b/dev-python/click/Manifest
index b8bba1db941f..959ba51ee783 100644
--- a/dev-python/click/Manifest
+++ b/dev-python/click/Manifest
@@ -8,5 +8,5 @@ EBUILD click-5.1.ebuild 1205 BLAKE2B bd6d5fb8ca349249840a8db62756295ce6d79d214d9
 EBUILD click-6.6.ebuild 1192 BLAKE2B 6506d88b1792f1a1f5107537a8ed73c34bb4b8dd87b27036df1fa6945f0359ec3482d4a7f33f2c78f3bc438bd534d4483079d1eacdc274f9f64bcde43ac8e91e SHA512 9523bcfd4ac931ab76891ed4a7409bc1f9df8a78a5f180aa26e47fdbcf23989f5854534c0440ae1aabfa07f0186236001f3a5c40e997d8582283990369d75272
 EBUILD click-6.7-r1.ebuild 1411 BLAKE2B a3a7ddead3e59990b4816ff70a2b21f54f1365ad8894da5577eb312ecf9f2d187ff6184176064d04d19ffcfda50a36dc850b066ba0c9de91d5d42b3378a5203b SHA512 626698fd9c56d08591dee76d8b5f525e16ae8bc708ec460b1a24782ec7e7442b35a1ed1d4f78a6598829e296fb312535715395991a0c9021b76b75343fd29575
 EBUILD click-6.7.ebuild 1299 BLAKE2B b06ef47d14e3fa73a2392febdfce4b1de139a7c26262122bea89e402e0a4c8a8c861a6190ca852e4b721bc97b772a760a5583c91f4625c2bc40ec7ed1989d429 SHA512 347af3d728b0ae9c766880daf863eb2da95d6c94aa71cb93fc3402aa4e77105cee2841d8f1d5c769379c22dc351238f827c36c3728125515a4194adae474bf0f
-EBUILD click-7.0.ebuild 1094 BLAKE2B 7c0103fd985d725e49fb892a6e92f0cc0dcca276c16983e1bc9fe31a28377560558ad7155352b9d0de876e678aa0f39f347108b6566358cb3b8935fb2178f06e SHA512 ffe2119d347ac1d3e2d38e287c272d5e0488f3a58c0cdb1bc4f33f3488ccabc4fd5ae9029ff16620865960781dd4556bafe8b241287718cd95179b72189011d5
+EBUILD click-7.0.ebuild 1099 BLAKE2B f57b6d75aa96047e17450d66326eb9c9c71c00b3a39426abfe7a0d49851f4f6fe130bdf317a9ef37208d70008205e5deb191c38484ff311d8070ebbc10887d4b SHA512 d17d5419cc675aacdd25f8b0a0c351dbb7922a3e55a0f43b6da788ec40a6e715a3795d149dd2defdfbd21a757828c999dbf3c82cafc6db3cfbf3f20630e35468
 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 32536a2732dd..c8abb01039a3 100644
--- a/dev-python/click/click-7.0.ebuild
+++ b/dev-python/click/click-7.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://click.pocoo.org/ https://pypi.org/project/click/"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc64 ~x86"
 IUSE="doc examples test"
 
 DEPEND="
diff --git a/dev-python/colorful/Manifest b/dev-python/colorful/Manifest
index d01c0fc5e87a..9242821eb444 100644
--- a/dev-python/colorful/Manifest
+++ b/dev-python/colorful/Manifest
@@ -1,3 +1,3 @@
 DIST colorful-0.4.1.tar.gz 19696 BLAKE2B 9229200853d3050ebe61817fcfd975444a6568cbd490798c8bb2fdf3bb0286f7263d40942bb5edb28f64c6dd28e7a02cab5939d562bd2b091c05232efc3ac37f SHA512 41ce1c35193ebd8fa22bc06afb5536d02cdfc6bde89068693f6ddd1fec140f8823dafab10cf40496f48cb38ad87f874edd6819446b824028575030160b0adc7c
 EBUILD colorful-0.4.1.ebuild 532 BLAKE2B bd550644a69a0682374ac76e328b7aafc8f890e7ebdfd967210ef9d7b96ce37319c02316bd948557459eba64c313aec4da08f0d26bdd1f6b868a339dd4d5b2e5 SHA512 6aad78daba22dae5a680c7747827b4d15d2ede92db8b6cc1ea4d015fa222c5dd114ba45c6c6247699c791f0ba03a2a9790cb8dbc69de6b449a7d8e4378cc53e5
-MISC metadata.xml 390 BLAKE2B 766bad46b3edb503b2b305d7558986f41b07876921006f85a6f2a1fac657052e87d88e2bb3758bd9d622d5bd055e680bad59fe7d4b2860c158e461d06a7adbe3 SHA512 ed2525c21fafc6b9696931da215b190e227456231890ae6559979fe90e58e13501e2cd57dbaf9820b9426cf6136f15127e81c19389799566f419bfdf77870326
+MISC metadata.xml 414 BLAKE2B c31b4109e46e8ade1be085620f1fd56f1e9f56dea42ede3a4a6c2d78c4ad3064e1b1b461f4f592fea22d43c2cd9ab8d4a77c5c538253fcc2bafee93286e6a270 SHA512 7115621b68130df38d2f5f1a40b4149dad94b96d985ae2d3385e717a163604cad5d38901310b757447912d00efc5c6a24f51729d7396a652bf2d8a97fdb466bb
diff --git a/dev-python/colorful/metadata.xml b/dev-python/colorful/metadata.xml
index cc035fa6a23a..e66c1b63cbb5 100644
--- a/dev-python/colorful/metadata.xml
+++ b/dev-python/colorful/metadata.xml
@@ -2,11 +2,11 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
     <maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python Project</name>
+        <email>python@gentoo.org</email>
+        <name>Python Project</name>
     </maintainer>
     <upstream>
-		<remote-id type="pypi">colorful</remote-id>
-		<remote-id type="github">timofurrer/colorful</remote-id>
+        <remote-id type="pypi">colorful</remote-id>
+        <remote-id type="github">timofurrer/colorful</remote-id>
     </upstream>
 </pkgmetadata>
diff --git a/dev-python/commonmark/Manifest b/dev-python/commonmark/Manifest
index e61584f6f67d..e2439ba8fb49 100644
--- a/dev-python/commonmark/Manifest
+++ b/dev-python/commonmark/Manifest
@@ -3,5 +3,5 @@ DIST CommonMark-0.7.5.tar.gz 88702 BLAKE2B fc80d9e739d27f7e5dbf539b624c2fc2e700e
 DIST commonmark-0.8.1.tar.gz 90795 BLAKE2B 718c2b1af035672d74e2c6b6f89ea0cd23f45d7b0e47b6dadeef742d772f5458e08ec5f69fd4f34df9ab2c491d9d7add4c4acc7018c4048649aa0d8244d7db91 SHA512 dbab51d45c1973a8d0906148d785fb8ddc2b52177dfe0e69fe79bef2a5eb05a5a7ab8693852f4aaa8545af19d741569d04a24f06ea65171e6e80d9f66af47fdf
 EBUILD commonmark-0.5.4.ebuild 816 BLAKE2B 4623bcdc238c125819bf1abdc13d5784fa38002ff745d295b8570008bb265d60f5958de44ec7afa324af5bb3676fae2288881f1592863fb15a5f994916dbec84 SHA512 53d96ed5ab173d09aafc4a5001704f1bd29d5c3b9d20f8df9712a570504ccf24bdc75526c9f1b988bd7d5b46e7bf936838efecbb92d50c6e132ed1b033ce7879
 EBUILD commonmark-0.7.5.ebuild 1072 BLAKE2B 663fb0549b8dc91e3324db235612c655f28d0edcb50a9af1bb5e0bd8ddb34b3772cd0aa1901efe564cb1175f444a1f2a47c1f529f8af84cae8f5da8c21accd4a SHA512 68857c0969b7be6e7ae489cf63abdc77063b5368760b6aca4149733bf69bc2a3507664ad55642bf13203a0a79346f0a2745505d7eca901a8723b11c9a4be6b12
-EBUILD commonmark-0.8.1.ebuild 1014 BLAKE2B 4656a06c0b161b37800d838fd28b54a846b656364b77e7b7cfefb6a746f72bf5b9b67b9b213c53cb1840ac5c103fd8863d7dd9af858183a184efceb5712f461a SHA512 9096bcf7ff24b7212ef458e25f1e13dd5daf61b94a31f7c17a5aa9808c428ff068302e480737bcea90d4991ce417843e6f4b0d262867e20453660b0fa73a8180
+EBUILD commonmark-0.8.1.ebuild 1032 BLAKE2B 4887d7ab1c0c6c02e9f096224750b9f4875ca94fd14c3b1b3b30b86fa9b04f7af9dd85a3c224d66ffd142f834aecd50a5c39a97ce2dcd39c2907ec3ca619fadd SHA512 44681d9a87ce604f94358d03c4db1b9687774653623b9d66e3a50d546cfa512d45748de6652aed76c5568e00cd03778d201be194c701d460aadc0f183ddb495d
 MISC metadata.xml 756 BLAKE2B b169766e4e9850c3586f1359fb0103bfeb27d494c3d20c2a502618a20a397ff9ba7e9f0d13d07829e59c1350e5ced938d58b726704d00d0499b3ac1c614952d6 SHA512 1a28755c041abef9cb797c8d9ea448a62a500a915ae9c4002a22f85886fbae62c2574675926e80e5ffdcacf3a3257fc9065a14d6495574c556288b334274b03c
diff --git a/dev-python/commonmark/commonmark-0.8.1.ebuild b/dev-python/commonmark/commonmark-0.8.1.ebuild
index b14fa147b3e4..0780843de05d 100644
--- a/dev-python/commonmark/commonmark-0.8.1.ebuild
+++ b/dev-python/commonmark/commonmark-0.8.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/croniter/Manifest b/dev-python/croniter/Manifest
index 53ec7f3e6612..0895be5e5356 100644
--- a/dev-python/croniter/Manifest
+++ b/dev-python/croniter/Manifest
@@ -1,7 +1,3 @@
-DIST croniter-0.3.11.tar.gz 13647 BLAKE2B 15ee062565ad6d38735a7010686143ae5b1347d8f06314cae3f956bae7d9859965e257bdc64fcd02251ea116504ba9a24024ac61fe215eaea62c2260eb363143 SHA512 3413df2df1ad19e15a6914b387f841112bb65c87e9c315cb70a7b4b83ba737e17b1663950d4d5a758d231e1ac3a2dfda92814fb4506b0c5291641d64a0a79be1
-DIST croniter-0.3.15.tar.gz 15953 BLAKE2B fed28ffe5d576ef7721517e22815001d8c7193c3ffd71a9f594761a331720c3d1bde04ff8e69dafcd713c0a876ad63f2de6f6e9a1a34efe6a8b82d6c06cbb103 SHA512 88ade63242cc5f0038809c67ba3e5adf36457628eb01f1db8dc99a2d59db8f36b1b0beb9e1ecfa4d8d2bdd1c4f7d9b1cb6d7677851489f64b55ee5fd3fa91304
 DIST croniter-0.3.17.tar.gz 17362 BLAKE2B 59887df1cb1464046612fd87bf82575355361b9baa934817d92ea17ded6a440100015168d7622952a218d96d6f8d3a568ebdcde85f2a7ddbe8a31a44b201b3b6 SHA512 4215fc7461843cc2c62fca05424d5eb7d0c80c21cc1e637f5ce3c4891da458cd609d6ed501fab7fe244bbb234e9834ec8a12b76289eec10808ed6c30c1b4d45a
-EBUILD croniter-0.3.11.ebuild 494 BLAKE2B 308c578651ddc7f8e370a3173d22f54b8f0ba3d85ffcf7248ab19b7df4bd8a8b301830826d1fef732a39e9f0ed028bd6357f2aa2590fc06ecbfb2b29832125e9 SHA512 934e16662709c3e4d9ddc6e13525e43c7bb199b76f148c85ad11ff7881bd701c32234c80696061e104b570a729ffde5d3de6ee098b19af2cc2c3a2a7328f873c
-EBUILD croniter-0.3.15.ebuild 619 BLAKE2B d134b87de5f95b0fe70e5edbee2a2d7675fab16be698d8a6a44cafc30f02dd84aba3d7cd13be736fa34f31fe249cb3b09edbb54d36c13eb83524efcb5ced7493 SHA512 0e01f75d41c7b2413e00f01a55d7decaedb5bb79d51c92f82a0739494793feabc0b8a8910b253a56b6bc492b9206b7776acabf7bfaa8788f8295ad14a8c665ed
-EBUILD croniter-0.3.17.ebuild 671 BLAKE2B 00b27160d256323568e827eb8a2e9759c5d448cc1f1e81497f81d7f005e2a176a882ff9bdefb5fde21430774ee75224f077902a4bf44bac9f36aa1412d0fc1ad SHA512 99a870ea17f0f05e5720c427df1f7338f987020ad10204bb92940d0915c34a3a7bf506555488faec1019b04776e409d1c6d49504f78440fd4a6acf7866368ab0
+EBUILD croniter-0.3.17.ebuild 707 BLAKE2B 855da253dca52fe8a745c11204419c90497a2c02ec58c706b2f751b1a550afb0c4ecdec01fcf85fd74ff3530921446fb346e53278efeab5cdd4e49ec09b3e6e5 SHA512 33f74da50684e7c02e336128a2e11cb17ec62c226798da6f329e927cbca0ba1bed7f54acf4cfdac90bbabbae7d36d67465178be4f08f4a4dd6e45fc345b62958
 MISC metadata.xml 344 BLAKE2B 1e0acd7a1c4fa483433385eb74da9459dc1348f00cc2bde0d8f5b98a0e298f943628252e15d60b1a3c1b2858358ac6a7683394c51f0e06f3467accaab2af6ce7 SHA512 13584ced1986613a6ab7550b050531bb5049b8f0bafc6dd59045620744513d785635aef91f5300cf9eb302b385e6049107691201a866d51061ef2411a24e9a2b
diff --git a/dev-python/croniter/croniter-0.3.11.ebuild b/dev-python/croniter/croniter-0.3.11.ebuild
deleted file mode 100644
index 374afe25e368..000000000000
--- a/dev-python/croniter/croniter-0.3.11.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python module to provide iteration for datetime object"
-HOMEPAGE="https://github.com/kiorky/croniter https://pypi.org/project/croniter/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/croniter/croniter-0.3.15.ebuild b/dev-python/croniter/croniter-0.3.15.ebuild
deleted file mode 100644
index 449501801ad3..000000000000
--- a/dev-python/croniter/croniter-0.3.15.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python module to provide iteration for datetime object"
-HOMEPAGE="https://github.com/kiorky/croniter https://pypi.org/project/croniter/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_test() {
-	py.test -v src/croniter/tests || die "tests failed"
-}
diff --git a/dev-python/croniter/croniter-0.3.17.ebuild b/dev-python/croniter/croniter-0.3.17.ebuild
index 0c79746cfed2..56cd90ac35e8 100644
--- a/dev-python/croniter/croniter-0.3.17.ebuild
+++ b/dev-python/croniter/croniter-0.3.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,10 @@ KEYWORDS="amd64 ~arm64 x86"
 IUSE="test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)"
 RDEPEND="dev-python/python-dateutil[${PYTHON_USEDEP}]"
 python_test() {
 	py.test -v src/croniter/tests || die "tests failed"
diff --git a/dev-python/cryptography-vectors/Manifest b/dev-python/cryptography-vectors/Manifest
index 45e062882076..42582f3459a2 100644
--- a/dev-python/cryptography-vectors/Manifest
+++ b/dev-python/cryptography-vectors/Manifest
@@ -1,7 +1,9 @@
 DIST cryptography_vectors-2.2.2.tar.gz 27270814 BLAKE2B b57cfd402e85e34a1e52d034ef51699ba9ab7381e5baa28f0f062ecc8d6b7b5849ac4d5426c41768e1a4fb9462f84d7e22476ec64dc0bd0142a799caaf95eafb SHA512 bdaf53c8087d6c44fcd3ab54069d1d45b60ee80d98fd813fe180b9e88272203b5dd2abd5fa6dcd3b4ce9ec3215997fd8e99e63309e2f0ac619a6f72d552afff9
 DIST cryptography_vectors-2.3.1.tar.gz 35308320 BLAKE2B 47ec40722ed571f980030a4a8dcd35230a4c2b2c63320537a9b965ae39f4d85eb5528ac3ae017e40c099a1cb083feeaea201a8e2cb2fb5b30ce781f716bbfcb4 SHA512 d607571c6471a1a7aa391c0ae441937b88caec0497daaa539ddc71ba76da7c534f0cf6460fce1124035f9fe10e55c621d799586dedb7f3b5f3589ca6be5cb555
 DIST cryptography_vectors-2.3.tar.gz 35303908 BLAKE2B 694f5a741ddedce2101632dcf165961d4706feaa5c8482235f5afb69f4257bfb4f8a9b8423213661de0da2d56ebf43cc7ba138a4bbf9462f367ebd5adf2620f7 SHA512 7c51b0c29c182c4da3265824a1b6e44c943bd41dfa89199cded963d0182a8ade678a560ec9ea13f6e8918119fcacf1c90d804cc90368e51cc5d430228448231c
+DIST cryptography_vectors-2.4.2.tar.gz 35087269 BLAKE2B 2a8df1e98b6bba127bb8634ed27b43d4d99c77115d0206b4730feeaf6179d31e0b54eb38ad809e828c2ac6db2ecaa5cbc47f6ab2f99a888eb7e738380cc3b8ee SHA512 cddd46916b6e5c9101589e6aaeaae0da61eabce9df21a196e09ed0c12bfa7da6e3afcddbb75c657f3370b2a3bc67ca862b22d6c7750301a867b6b03cb9bc83a3
 EBUILD cryptography-vectors-2.2.2.ebuild 688 BLAKE2B f541d6ae0657e44a47fb274943ee32ff63e56b26eb45fbf37fd725e5166fac8e895f0a07e7519262204f48bbf2f62d2ed282d2269cd9dc26368dc794080d37e5 SHA512 a4fdb4a05c6976fd990715eba29b3bd799645ecd72e73b546ebe57ecf2488e2c62daff9c7ee45774a415e6ce63382b42c4d94973543a993cf188eba1973c0fcd
 EBUILD cryptography-vectors-2.3.1.ebuild 710 BLAKE2B be4192446ba9732cadcf590364efd79e4323cfad01d9293367eeb819cd2fa6f7bb2fa77feca7065d3498891b36d2c53db106e99429f0ab09cfba77d29c80f49a SHA512 e38cfcd1ab2fdf6717627753d6ca9c1761b86e48d7cc9977f06d31c14175885406db6fa5d9cc082bd94eb0b5a5d97d2a08dfb5b83b852c65fa210e50cebb1035
 EBUILD cryptography-vectors-2.3.ebuild 711 BLAKE2B 3882a384c11fd2cf36f4fa4b69ff7bcecbc3ea91451e5f4ec9f6f2b7d0af99829ec2e566301dbd4ac6f9aefd883cd473e35fa9f1bbfcdbe91e045a32265f8b45 SHA512 f1a5b96e1664c4011237e8466a5ba03e7adda8839973a6314ea6274bcccc86ff0da42f58c11eccacd1a49510f9ca68ceef04526ba0abe27b9252ebe29e9a18c0
+EBUILD cryptography-vectors-2.4.2.ebuild 708 BLAKE2B c96063e74394c31038cfc1db33551c55056811f4f5f36a35d5457a6ebb2ba0d292eab68e3a79e2b145ebb1bfb516ec41f220eb3b51133956752d975263699b5a SHA512 78f575fd4718445cf054852d791458746b67cb4f57bed38a5a1cc245199cdeafd301947c115fe93fa5eecdd3c400d4763952fe0287def6e6d609933cf236f5af
 MISC metadata.xml 333 BLAKE2B 31fb9fd463281fce83ac94d33dc69e54eee748ab3a230fa26ef36f29026ce8bcaf821e69994d2d94ed3b69c24b30cc80fa0a67f100cd45327ff1bb36a91c6014 SHA512 d65176e5ea86d82a13687d70fb2f29ca046bd71526752fb3583be9b0507b124363f271d697cfe6724245d6863c5aac36e67b1e50808041c52066d66e1f8b586a
diff --git a/dev-python/cryptography-vectors/cryptography-vectors-2.4.2.ebuild b/dev-python/cryptography-vectors/cryptography-vectors-2.4.2.ebuild
new file mode 100644
index 000000000000..1457460d7c97
--- /dev/null
+++ b/dev-python/cryptography-vectors/cryptography-vectors-2.4.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy pypy3 )
+
+inherit distutils-r1
+
+MY_PN=${PN/-/_}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Test vectors for the cryptography package"
+HOMEPAGE="https://pypi.org/project/cryptography-vectors/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 BSD )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x86-linux ~x64-macos ~x64-solaris"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+S=${WORKDIR}/${MY_P}
diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest
index 9e1a12c60629..93b71414d941 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -4,7 +4,9 @@ AUX cryptography-2.1.4-libressl-2.7-x509_vfy.patch 3419 BLAKE2B 89642459484d4295
 DIST cryptography-2.2.2.tar.gz 443822 BLAKE2B d0fbaad78d172f1ba1bfa6edd64d2d5a0eac0853a564fdbb9830dfedc5c53fe1b28d8c1878be85ce38b8cd90a0c2e40e6a209158693a88a7053a80f0481e6302 SHA512 6c1b19cdb870d65abad42523697e9a0bebc7a0025b34f10c4bdd30c313333efd7c41bcb4237a29b3a1b270e3fbade75ccb35df172b055b7c075d619f4d9424c9
 DIST cryptography-2.3.1.tar.gz 449577 BLAKE2B 66a94f68a6f5c14ff1e3316ea740bda8c34135bc4614a6a36880d4970d54cb72d69374555a6a89dd9a6794e35feed8fc4598ad071cce33b9515da1ada4c38d53 SHA512 384581238b5669dbf31fd1b1385ec2ff9c6d76e2b7612efb15f255e17a11a38474f84668e62ceaa39a146260f46cac743575c0a8ffedc1e40c7b2f90d7cb00b1
 DIST cryptography-2.3.tar.gz 449464 BLAKE2B 7485c745f9c6512a5efce42181970deff19bd4420e91230d84b070cd77450a6805c56a2e37cda73b45c90ed969c8fdbb866a7cc9e53a6828a1ca6e45befd9de8 SHA512 75e14020da500fdbbd578f004b22ef3237844185329adf59288b29f1b3ee9dd2005a2c4a933fe8609a59d168012a9f687bab0f31ab39ed6ca325198aa9295e52
+DIST cryptography-2.4.2.tar.gz 468645 BLAKE2B 80ecde87cf1568239977fbe4f835db98f689a7dc3646d44229b5b33932885c288d4274427f5d04eb74e9e064b01b11b7eac40fc6221ea2241371bca618cc66df SHA512 800735fa86e9ad0f8517328d47e55dc79a2b86d8c7539ee2921c526085782d8dad5559bbee84f7effb42275503fa9a984b099a688c530c92f5672c423c0f1a28
 EBUILD cryptography-2.2.2-r1.ebuild 2212 BLAKE2B aa1f0f4adf0d87aef5cff265df415696247a185a82a4827afc4014b1c3b1a9e62da6169179096f724adaf21aae824a9cce3d31a8ea225bdd2eb815020fe37d61 SHA512 bf1241583761b05298449e603e1755d65944c156bac7ac76f955f90e709ddde24538216995d9272e5cd5b5dc43568fb795d026798cf663f3ef126c0a3310125a
-EBUILD cryptography-2.3.1.ebuild 2159 BLAKE2B 576b8dd817d7a90ffa61fb16d3f647d688e1c3f3f1b60bc27f730c9a3cae762d1b60e4a0ff2e764578fc752d7b1495f9a498bd151227b676f91607500bcee05a SHA512 799c0ac2cc0d17354aca91b2cc92201b8ac4ac64adbbbcec45126a42eca97a750c0678bcecbd24fe77164a5a548d5337c812166238a53459593d1954c7d9f2e6
+EBUILD cryptography-2.3.1.ebuild 2204 BLAKE2B 4cf0c0fb964cf00b57b078c568780e2fd41460c22b878158e9195ffb113f72783e9fa5a88c06c0f2b7f6f185990acc004ba331abaff481bac375cd90a10bfa91 SHA512 9b53819c9827a046b710bd520c45b922913633587db29436bf40eedc5a7c9408dc3ab8f39de34de632503d6955eaa0a2673de67f63ae6fb6a9efa42b211a0b59
 EBUILD cryptography-2.3.ebuild 2162 BLAKE2B b7b99f45e7cae87e2f286e1edc07fd96d79bed983642e2f08500b89ca8f6102596b79a000d1de33316b3ae56e4fab1ebc632db974ba3f4c0a23637e8a53552f5 SHA512 5999a1de82114e5da46ab9bcea4de62e6552c1323e410fe1d829c1ab962153b3b14befc6a60fb6f748c03a4926a332e5e084bea67597503914f0e28283546cc2
+EBUILD cryptography-2.4.2.ebuild 2159 BLAKE2B 576b8dd817d7a90ffa61fb16d3f647d688e1c3f3f1b60bc27f730c9a3cae762d1b60e4a0ff2e764578fc752d7b1495f9a498bd151227b676f91607500bcee05a SHA512 799c0ac2cc0d17354aca91b2cc92201b8ac4ac64adbbbcec45126a42eca97a750c0678bcecbd24fe77164a5a548d5337c812166238a53459593d1954c7d9f2e6
 MISC metadata.xml 384 BLAKE2B 6dbfdd39bb24b2df61454716e308605ae1d35c3babd01f16556bbbab240e425434315cb2b80a2c3e8e9b18b237899b5fb96566a7ffefde2af3af1dcc2e08362b SHA512 c2806f846608bdd0720b589494e13f57ab2d64026747f2b13f412c9a0e9d2bef6b16fc357e4d16b74ad7a2a2af8daa5e28d0b6bfe4d2141ce68881c724fd24c7
diff --git a/dev-python/cryptography/cryptography-2.3.1.ebuild b/dev-python/cryptography/cryptography-2.3.1.ebuild
index 4af6a76f62db..1a58e5692ef8 100644
--- a/dev-python/cryptography/cryptography-2.3.1.ebuild
+++ b/dev-python/cryptography/cryptography-2.3.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="libressl test"
 
 # the openssl 1.0.2l-r1 needs to be updated again :(
diff --git a/dev-python/cryptography/cryptography-2.4.2.ebuild b/dev-python/cryptography/cryptography-2.4.2.ebuild
new file mode 100644
index 000000000000..4af6a76f62db
--- /dev/null
+++ b/dev-python/cryptography/cryptography-2.4.2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy{,3} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Library providing cryptographic recipes and primitives"
+HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.org/project/cryptography/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 BSD )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="libressl test"
+
+# the openssl 1.0.2l-r1 needs to be updated again :(
+# It'd theb be able to go into the || section again
+#=dev-libs/openssl-1.0.2l-r1:0
+# the following is the original section, disallowing bindist entirely
+#!libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-)] )
+RDEPEND="
+	!libressl? (
+		dev-libs/openssl:0= (
+			|| (
+				dev-libs/openssl:0[-bindist(-)]
+				>=dev-libs/openssl-1.0.2o-r6:0
+			)
+		)
+	)
+	libressl? ( dev-libs/libressl:0= )
+	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7 pypy{,3})
+	>=dev-python/idna-2.1[${PYTHON_USEDEP}]
+	>=dev-python/asn1crypto-0.21.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
+	virtual/python-ipaddress[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/cffi-1.7:=[${PYTHON_USEDEP}]' 'python*')
+	$(python_gen_cond_dep '!~dev-python/cffi-1.11.3[${PYTHON_USEDEP}]' 'python*')
+	test? (
+		~dev-python/cryptography-vectors-${PV}[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/iso8601[${PYTHON_USEDEP}]
+		dev-python/pretend[${PYTHON_USEDEP}]
+		dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+		>=dev-python/pytest-2.9.0[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)"
+
+DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst )
+
+PATCHES=(
+)
+
+python_configure_all() {
+	append-cflags $(test-flags-CC -pthread)
+}
+
+python_test() {
+	py.test -v -v -x || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/cython/Manifest b/dev-python/cython/Manifest
index 700901eca5f9..262e780a1883 100644
--- a/dev-python/cython/Manifest
+++ b/dev-python/cython/Manifest
@@ -2,12 +2,14 @@ AUX 0.25.2-test-cpdef_enums-L-suffix.patch 586 BLAKE2B 625addf1285b64abe19329cd4
 AUX 50cython-gentoo.el 388 BLAKE2B 5bc38190b467efa9e7be1a5831022534dbfdc02206fca34f39bb2c897aa50cdebf960589181a9614a50829c380a892a9013e8ec5f538d51f52475cb8d92fdb5b SHA512 dd554d0d6cc220988552b06a20337af20b847e75bee76c90eb92ea979d9c2ae9d64ffa849266ff403d857b3737981de451bf40061bea0533600476bc57661c18
 DIST Cython-0.25.2.tar.gz 1703315 BLAKE2B e458604d0843afa128c6019244220bd6b3dd6653013698aa67ee2f71555f09813a8136ef92d6dc51ca38fe085e7bedc5e01d1a32bbd0885e62bd91c2e482bebd SHA512 1974b9374aeedb030307dc95aa6560ce9d5e1652783cd4552e96ef11663c73dd263e3521b68e7712abbb31628011e2e66320c5ee2577968684e2679eb80726e1
 DIST Cython-0.26.1.tar.gz 1725133 BLAKE2B b2c0433e8154ad76d921677608cae42a793326015ff320d8cd61818e5eb5fb4daf73ad4e72760d84f4cdaa2386b87d719cf9cd41584b781d4e2021e377a58422 SHA512 cdf31afaba78209c37a224345471c5c822b78c6d26c51583c46669b6b2b57b4952b33a839a51d06c3330fdff889345ac611fbaa2b2f17498cb02f3b5675f7948
-DIST Cython-0.28.2.tar.gz 1878797 BLAKE2B f04ae2b39ace94f33341bdc4f5e0871d34523070345340adcbfbfb1629e5bd6e2e6db6a0cf24dc392e245fd3c4ae162eae2e14af1c5dcf20896e5d2983c1ea0a SHA512 7d09d1fdc10f96eb6121657b71e059c38c479b4ca180965a8e5adb89ac0f9be50260ea46197c45e8ddc7c1339b9b88c140dac2c4a7a49e1943fb4bf24a73d082
 DIST Cython-0.28.4.tar.gz 1880943 BLAKE2B a97314147294c95fa0bd6d3fa1a1315d81f8abb46a1f2196009c1ef6f0dd7f47f81a7b31ab81d1fd00e8de37878a18a22d225055181ee74ffe4cc8105d84cd75 SHA512 67d2da2d776fc02193cfe98c8942e93905ec5e30bf4e0f9d5c965d930a034936d4c29c8248fccefff5db6d4dee054ec854994bea63fa3f64ff65df7550997c29
+DIST Cython-0.29.1.tar.gz 2040434 BLAKE2B b6f30f8263d6130efaf9bbbdf0008725161e5182730aa072ab3d16bc830dd2bfdb24fb89c95a113b65efab52ade47572d80d007f900d2ddf5415c69582d618e4 SHA512 f5b97fed6f4f1131cf43504df797d2e87c343f17d49b661747f26040eb171603b29444beb04043b1e61aa347a8a8a2e8d53c2e2c6d8a8108866f153bc7d51b6b
+DIST Cython-0.29.2.tar.gz 2041500 BLAKE2B 9edf4297e55b5de438fb79bdbfb4b1468af8b72e5556b38b9349b84fd9b917a56bc295b11e2c8938984fbd47099d4938450fac225c94687c1b3dab2749f72232 SHA512 d553dbb35b0841ca64d03fae3157e3a46248f16f14a1b75bbae979ca74a5fa89f85fa254a442a34314fe385d0aef7afa8c75b7f82662b37f7eeccd82e1404603
 DIST Cython-0.29.tar.gz 2037177 BLAKE2B 30c08f257caf8f1b8ac2cec7dd0a50250f614397979ddd8920b022ed8f34d38a32d4640b3c1fc8524f16dfbadb31ffdd6d216367bbf0a15b9dd69baa62c8f072 SHA512 f90249c12bb9c1f5b9bcecd66624516d6e255a8d321a5dada2ba4eda360c12623c64b391177e061eac7a37b24ec53f8098fc0e1b46065e69eb0766585f739ab6
 EBUILD cython-0.25.2.ebuild 2140 BLAKE2B 98f31b72d1c298218c5b368a430ed0acd65b69919c833340dea4182abf949dbf3733bb1cd322be2d20fd23daee19ca68db377572e73f6a35e6f1dd16b1b6c821 SHA512 2e21871838aa75a31826ccc93402199427db7681ca3f6de8c44906212e64730d3e9a16fd39fabff97b358281a28a5a743308962f0dbe492c4bc27007e0a8479d
 EBUILD cython-0.26.1.ebuild 2084 BLAKE2B 94de0e3e0c221894148cda42d5a664e4036ecb929308185ae62c2a40e03ceb34d39a738ec22f17e1fe787ef99f4b5bebf33cfc6d6a5abc1064223c90eb3c6a54 SHA512 3cd6fe405a37f5c7174d2067c231dbb3dfeb634c161a90aa3e7b7c5ce2757642c2b71a9a0491b8c2d2c13eddfff6157e7e21b3c0f8ca66d2e509793c354ab10a
-EBUILD cython-0.28.2.ebuild 1963 BLAKE2B ee1c8dce215851a3bb5d104fc500ddf4e871a81fb52cf44471e1fbfc28a0bfcb08f9334cc934c90c99e4c0339e117e5e03b05384870cc05f919aa649bd73e26d SHA512 3047c57f88f5a62e0a8fad38d1cf1a9fdac95cae38c3c2db08c27e157f010b049281a1df118e66758a7e6ac0693ede6055d878268d97a3b7fc2316bcdcbedd35
 EBUILD cython-0.28.4.ebuild 2200 BLAKE2B 44e32fde8923b06bf65875f462de4eca5dc8d175663c0cd005dc3ce150d179bec8e56eef7cef6cd7539ea8b4ee18e853fac5082dccefeed2ff8eee2f9cc31169 SHA512 9065cd45c542e4eaa96cb027fd1940a2ab1abf5af31c4138cc319d74c5c658048fc7d550bd67d026dd6b474e42ab3f6d41e56203ffc921410df745c76e845408
+EBUILD cython-0.29.1.ebuild 2175 BLAKE2B 5733082f054b447a02d1bb08d2db922e412f022026952c015259f80edda0e5b91cfbbd6dc60f6918fe3240933b0ea3e43dd3c643dcc10eb2beecb365b4decfff SHA512 67c591c43fda93dffd4dc15596cda396c2c17494476328d2b72ff6399d6da31f7faa92e55e1268bb9811cfff5c933e6451accc5b344ad2bb6bbc80961b4b047c
+EBUILD cython-0.29.2.ebuild 2175 BLAKE2B 5733082f054b447a02d1bb08d2db922e412f022026952c015259f80edda0e5b91cfbbd6dc60f6918fe3240933b0ea3e43dd3c643dcc10eb2beecb365b4decfff SHA512 67c591c43fda93dffd4dc15596cda396c2c17494476328d2b72ff6399d6da31f7faa92e55e1268bb9811cfff5c933e6451accc5b344ad2bb6bbc80961b4b047c
 EBUILD cython-0.29.ebuild 2175 BLAKE2B 5733082f054b447a02d1bb08d2db922e412f022026952c015259f80edda0e5b91cfbbd6dc60f6918fe3240933b0ea3e43dd3c643dcc10eb2beecb365b4decfff SHA512 67c591c43fda93dffd4dc15596cda396c2c17494476328d2b72ff6399d6da31f7faa92e55e1268bb9811cfff5c933e6451accc5b344ad2bb6bbc80961b4b047c
 MISC metadata.xml 570 BLAKE2B 078d948ba14cbbfb98103ee3746f773c12d35c91e64358950aa0ceb78695e19d8ca4c0c33b388c2c5cd54b83856430a8934d8a40aec74c3aa0d761e0a4a03add SHA512 73c65ef6b088cb50125dd662f263fb1aa1d60c3631aa8453b9ed2ede6bbd839235c6b37c3f8d1a17618c167874d64a3aa6f95c9141c8b6c921eaf4c1c4d68dad
diff --git a/dev-python/cython/cython-0.28.2.ebuild b/dev-python/cython/cython-0.29.1.ebuild
index eecc7a4ba326..930ba91157b7 100644
--- a/dev-python/cython/cython-0.28.2.ebuild
+++ b/dev-python/cython/cython-0.29.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 toolchain-funcs elisp-common
@@ -32,6 +32,14 @@ DEPEND="${RDEPEND}
 SITEFILE=50cython-gentoo.el
 S="${WORKDIR}/${MY_PN}-${PV%_*}"
 
+python_prepare_all() {
+	# tests behavior that is illegal in Python 3.7+
+	# https://github.com/cython/cython/issues/2454
+	sed -i -e '/with_outer_raising/,/return/d' tests/run/generators_py.py || die
+
+	distutils-r1_python_prepare_all
+}
+
 python_compile() {
 	if ! python_is_python3; then
 		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
@@ -47,7 +55,7 @@ python_compile() {
 python_compile_all() {
 	use emacs && elisp-compile Tools/cython-mode.el
 
-	use doc && unset XDG_CONFIG_HOME && emake -C docs html
+	use doc && emake -C docs html
 }
 
 python_test() {
diff --git a/dev-python/cython/cython-0.29.2.ebuild b/dev-python/cython/cython-0.29.2.ebuild
new file mode 100644
index 000000000000..930ba91157b7
--- /dev/null
+++ b/dev-python/cython/cython-0.29.2.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 toolchain-funcs elisp-common
+
+MY_PN="Cython"
+MY_P="${MY_PN}-${PV/_/}"
+
+DESCRIPTION="A Python to C compiler"
+HOMEPAGE="http://cython.org https://pypi.org/project/Cython/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+IUSE="doc emacs test"
+
+RDEPEND="
+	emacs? ( virtual/emacs )
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/numpy[${PYTHON_USEDEP}] )"
+
+SITEFILE=50cython-gentoo.el
+S="${WORKDIR}/${MY_PN}-${PV%_*}"
+
+python_prepare_all() {
+	# tests behavior that is illegal in Python 3.7+
+	# https://github.com/cython/cython/issues/2454
+	sed -i -e '/with_outer_raising/,/return/d' tests/run/generators_py.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	if ! python_is_python3; then
+		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
+		local CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
+	fi
+
+	# Python gets confused when it is in sys.path before build.
+	local -x PYTHONPATH=
+
+	distutils-r1_python_compile
+}
+
+python_compile_all() {
+	use emacs && elisp-compile Tools/cython-mode.el
+
+	use doc && emake -C docs html
+}
+
+python_test() {
+	tc-export CC
+	# https://github.com/cython/cython/issues/1911
+	local -x CFLAGS="${CFLAGS} -fno-strict-overflow"
+	"${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	local DOCS=( CHANGES.rst README.rst ToDo.txt USAGE.txt )
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	distutils-r1_python_install_all
+
+	if use emacs; then
+		elisp-install ${PN} Tools/cython-mode.*
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-python/dbus-python/Manifest b/dev-python/dbus-python/Manifest
index d9156ff96a1e..a2d060f4db3d 100644
--- a/dev-python/dbus-python/Manifest
+++ b/dev-python/dbus-python/Manifest
@@ -6,5 +6,5 @@ EBUILD dbus-python-1.2.0-r1.ebuild 2210 BLAKE2B 0f475f5ebe65b9880a5a9807f01914f3
 EBUILD dbus-python-1.2.4.ebuild 2228 BLAKE2B 16447af268331e0666b0cb10bf0f9137e466f5bcc53cdeebbcc5cf3ac2f7e80996f124ca724cc775482a98ade16e5b85177233402897cbb4f21116e31faeb702 SHA512 ff39e5618cc8a6704c7e393949370a6fef2d6aacc22172410db6976ab76071220a5b16ebeb901be66f604cdc0440bc9ea1982126ae66730853464b46d8bb1f85
 EBUILD dbus-python-1.2.6-r1.ebuild 2354 BLAKE2B a84ae880849eacd33ac774d3aa9f0b99a1a4a827304e806da5d0508f0850abf0eb79e61a8dff2d36a561a3bf09061d660d24ec45aa8e6a3196482a7019bcb765 SHA512 ca739a3a0a63ef25a260eb62adc4efec39181dadaac3a5feb1cb4887f3620ef45bc7175ac3677f3502e7b2ca695bcf2861694acba94784205e2521a751f6d477
 EBUILD dbus-python-1.2.6-r2.ebuild 1895 BLAKE2B b868d0892812a869f10461bc4317af6d32fe910b304b6cb04e1162f167570819224b6fe70de33b238f9c6780f0048016c06a16de8b27602078981f8bb545068c SHA512 fd4e509aeee20ad804bedc0db431acd8db7402ee57afe53d532a55362113258c57f000710478be9aa3205c30c7e53b6fd1596b7c9dffd092a90f3888b0988baa
-EBUILD dbus-python-1.2.8.ebuild 1670 BLAKE2B 524932dddb37cbf70b0d038e86f8ea2df20463f872a3724f06667d7f4331e07445c0ab7f999b2b5013c9f080a508f3f8cece8efe849339bed7a0016fedb11daa SHA512 5a83cfb8d5150c5c90a7faa5f1b03555e1731d72b15fc30b65ada6a7013d0776e8aa8473bdf240b2a56823c1b36e144774c4122b901fecfa7588883fd356b717
+EBUILD dbus-python-1.2.8.ebuild 1677 BLAKE2B 3ca5e38f6ec4132c500fa3c743233b10d1fd2c5d858815c7a04c6dcc05296488c0a6791a4c3205ac2e0092cbbd58860874114951a33a980b717784d4d73415fd SHA512 e70b4e1f38e30653b8426cab004615b8255ce29e6ac11e63fff9ac5d64f665e2c9bbdefeff15c039354ba7fab9ebd0432871fe02b519e66be5063580e3532c7a
 MISC metadata.xml 337 BLAKE2B 96d3f5d7c37edb1a63791e013c39cf5b10c94d621ad851f9975d9d5e36519da135bf963f2a0e38c2c098fa48c2056bf210bdfcebc12bb10a88c9e9f85c55eb2a SHA512 633761250e946af99fcbcbf813b70fa0b1e03a0d89102faa3f324c418f0e749371aa931d253dc5a6f69369c25acc2d50a0f5e2155bd727766bc70f4bc3933d65
diff --git a/dev-python/dbus-python/dbus-python-1.2.8.ebuild b/dev-python/dbus-python/dbus-python-1.2.8.ebuild
index af5f8c3d0532..9db1531cfbed 100644
--- a/dev-python/dbus-python/dbus-python-1.2.8.ebuild
+++ b/dev-python/dbus-python/dbus-python-1.2.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://dbus.freedesktop.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 IUSE="doc examples test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/denonavr/Manifest b/dev-python/denonavr/Manifest
index 90ed05192894..cc9a536d111e 100644
--- a/dev-python/denonavr/Manifest
+++ b/dev-python/denonavr/Manifest
@@ -1,5 +1,5 @@
-DIST denonavr-0.7.5.tar.gz 61972 BLAKE2B 17a6d7079cfea1f349b4ca2eafdfadc7cb1731737c9319d60239710e27608da1bdb0101fb36057a8618ceb0f2573aefc7b14932171e6e5ed2f393dc681f62ea2 SHA512 441b256ad34d7e998381a48d34296404418a8297d24fa7f748540e8daf9b067ca7acef4d04289665204ff1cf63e75333d4d49d173cf0eea42283e6eeedac6de1
 DIST denonavr-0.7.6.tar.gz 62285 BLAKE2B 45004465f1d8c371535c0e64b5d6decb224a80a986a5bfb1a960d320564e28a152a06c3c5375013261110a1d7c23ee301166580614dd1a727dac296c38b38899 SHA512 87c35325e46d8dc3129366dc45632705157e793d3faf4377f884b1d40430047fc2ff2613a975d6223a925c8c83c807454c03331b706a2d06474e649bbdb85c10
-EBUILD denonavr-0.7.5.ebuild 740 BLAKE2B f34d099173d6731367dd853519efd276eda64f70692a703cf08bb12a474427e670d858c4a3e7969cb19706bb9ec9c0a7315d88d43320265b9f667d9c26497d55 SHA512 9fe357f3e60214b998e1a59ef3d1c888be2acfbceef0a42ccf1a9aef8ea09054a30a6f0ab578e20d0389b54dd1fc8de99caafdd6685435689d6e3b911fd4ccf3
+DIST denonavr-0.7.7.tar.gz 62745 BLAKE2B 56e2ab0430a9b1fbc540b24d279bdab24f1bda2121031c48ace92b81b8a28371fe02a34e8f763b87a83325d522526faa577a85239f02d02fa0e86b928b152200 SHA512 4b17d2f663f8fde88bd67d8050e86c7a5adcf1890ce87c630ffa7f0107267b996234e707770ae56bfe9571335b320b70225d697f1cccc72ba29c765a422b0896
 EBUILD denonavr-0.7.6.ebuild 737 BLAKE2B 6bd02890359a2513508e06e324765385552092882605166c28a3c641c2a7f06c253c659559b06ed76e86f01c98649061ca9d8b8dfc05de53bb2fae7dc3138b61 SHA512 e584987d381b2439101ee760da869bc6efb4e1f8ede5f835989792538769f527260b6fd3decaea24c0a7aacb1d9dd693d82738475421ef974920886fc4811274
+EBUILD denonavr-0.7.7.ebuild 743 BLAKE2B 807713a1d064ddee0703c8ac875e1a59f9619f66b03d66d386c2a7239d9c3d1fbf9a412b54fc687b0aa038be82e2320d37e2be8f8267b12aae387bc405ca6150 SHA512 3bf53b49c35f3dff98de41521d0a9646f5cf307b49088af7a17f38138025fb717663b208202a170cb24a7068872872821c3f4e47526f92fd72a41ddf61348bc3
 MISC metadata.xml 448 BLAKE2B abf1f391011c497830fd97efbefd1bf3ee9a92967b962859f9b557427b3dde2fb9da76a5c14c8f33b28ebb0e57a0d4511c4403c6a13270f500389d2dc0aff487 SHA512 017d0cc05c8dd263292a080f39a86b415955081f2c2d06a58ef59f21703748b8e15b54a88a4592f9e378e256d6f5ce60d5317aecd373777fb1e686a8cfcd8031
diff --git a/dev-python/denonavr/denonavr-0.7.5.ebuild b/dev-python/denonavr/denonavr-0.7.7.ebuild
index c6e11aa53683..1426726e1cc6 100644
--- a/dev-python/denonavr/denonavr-0.7.5.ebuild
+++ b/dev-python/denonavr/denonavr-0.7.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{4,5,6,7} )
+PYTHON_COMPAT=( pypy3 python3_{4,5,6,7} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1
diff --git a/dev-python/diskcache/Manifest b/dev-python/diskcache/Manifest
index 38db73412776..93669bbbe7bd 100644
--- a/dev-python/diskcache/Manifest
+++ b/dev-python/diskcache/Manifest
@@ -1,3 +1,5 @@
 DIST diskcache-2.8.3.tar.gz 438587 BLAKE2B 3b7b50fe6cabe8a4eb92b3dd72a2b99d6cedc8b7d055fcdf7b445f016957e6c7692571e9f83aafe36141b69a0e93f638b9e3e2f210bb56e6358260a5ff4130d3 SHA512 d96ac76dfb68cb817febd3f4ed8927a8409c02b13b4112a739528cade40f9a588c732dfc3148392dd12676380c3a2b006ee63b86f30ad70f5d205273003bf23d
+DIST diskcache-3.1.0.tar.gz 489821 BLAKE2B 56b54662f31172f4f746ce885d57a3e9f34af9d7318300fe6906aee1b3373919f6ee33922ab30b7979cc6e271f2f780894438b4114483a7c76f198fb7b2213c1 SHA512 30ea3e6c1ed6430c1a7e3bf022bd9233e89a2486308d1f48f6e2f0b50ccc1ee50dade7c55d98a5611ef384bd193cd28f7e65f5737bae00845b17c159177dd345
 EBUILD diskcache-2.8.3.ebuild 835 BLAKE2B 9a5a25f2dd702b75ea4251d43c345675b835b51dc69037590c6f1b13642af450c1bd9366fb8ce072c5c1b91bea87696ee39533fa875942689b140799ffd2dfef SHA512 6a4cf34d327443a155b22951f975bc9dba34d6c2da5cbc2ac6f620088147ad01fd35136051516d6c11aa1b31e8002ab7fe10e24067c16c6b1520e643ac5590ac
+EBUILD diskcache-3.1.0.ebuild 856 BLAKE2B 54c82092a50818578ed0cf9909f094830406dbc7cc9aaf9b0939fa6d8eb61a02ce4741c4eab84df2d8fde7c556c7e54475b54bba3b304d3a663869ebb4fd372c SHA512 bbf2e1de146a89e62d1fb44655b62755b28ae710b9f80681d0bb1a65f42f1c395c0ddf80aac7a94c83ee56d53267ef45e2582239f7fa55a4ee86e6da6911ff55
 MISC metadata.xml 391 BLAKE2B 74eba8c76944b17dd3b7a446129b9786a56e1afa0a787af75c8e832317b5051afa7e527ac8e7c04a2f9f4c36b0eb3bc72a61655f7de4a5caf9048c50f438d745 SHA512 0d088c14dbbf7c11541b5f47d193280c0f92f8f1b3ec62c8aad49648b3fbcc393ce639b5b9ae18533a4d4b9cb5ad536a5a847b705e2b4bd385d3b90d48f812ec
diff --git a/dev-python/diskcache/diskcache-3.1.0.ebuild b/dev-python/diskcache/diskcache-3.1.0.ebuild
new file mode 100644
index 000000000000..e0c59c1bf649
--- /dev/null
+++ b/dev-python/diskcache/diskcache-3.1.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+HOMEPAGE="http://www.grantjenks.com/docs/diskcache/"
+DESCRIPTION="Disk and file backed cache"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/django[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+"
+
+python_compile_all() {
+	if use doc; then
+		emake -C docs html
+		HTML_DOCS=( docs/_build/html/. )
+	fi
+}
+
+python_test() {
+	nosetests -v || die "failed with ${PYTHON}"
+}
diff --git a/dev-python/django-classy-tags/Manifest b/dev-python/django-classy-tags/Manifest
deleted file mode 100644
index b00a474b9738..000000000000
--- a/dev-python/django-classy-tags/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST django-classy-tags-0.7.2.tar.gz 17630 BLAKE2B a21eeb6c1ddd0097f64e9c3c4e9c52777fc0147ad024a861f4c53c2ffd759f9643b21e8e9e0d1e1093133902233a42ae58551878fea770b85a63a34cba5e4aff SHA512 2a216a3245302dc2176ae1dd4f5557fed6677e7baab9f059daf66270ee9d8a6b26ee270225e84edcbfd893054c15d65a11fac9f1babc18020c6f7a3ad5c25c4d
-DIST django-classy-tags-0.8.0.tar.gz 17911 BLAKE2B dabbf0e88925e30fbdb31ffe0f4812023e0196cfe5ef99e8b0dd6fe9377ab663b64761a8953602ac6891e95a987e61725049fbc54f11eae1d29c25f99214fcc8 SHA512 9e1b32773eb4f73dc08c82038a4b3a46c59a8c1db73d33f4d8738bd91e8a102a552bff39113e9be15d1365967c3dd1bcf2190663d1e11d8d8d71cdb520eab579
-EBUILD django-classy-tags-0.7.2.ebuild 513 BLAKE2B 12eb88e37e3a55a6b47db7a67f2eb017961d07fae9f8a130f2d4b8b06761ad84b116788f4eb232eb1c02f573b8e9b0b89c4ed4da570e2b3f0f1c99dee61634a5 SHA512 8c06e2ec3d365eae2e524866154f0f7495deff1d56f1e364b861923bcb288ac77136f2c27ef2465fd96e1647700d1c0c1eded24ac6db203d47f19f81912edecc
-EBUILD django-classy-tags-0.8.0.ebuild 558 BLAKE2B 06726f0e75058968cb763dacd1b1db2235328aba3ffb9d5966e94feee079065a886af4367e7a60fbd4980744cb25613f3689403bff588dabe13946bd6e0beac0 SHA512 937a382935dcbb878a68189815c1522d0758a4b05a69e5cf55f73b6dd91c2bfdc9efea93b7a75dcc4a269a2050399881940c78839020640d0fd9fc36acc1a3c8
-MISC metadata.xml 369 BLAKE2B 2325d1b47370b0db1743f2273731522aacb1a09fd897f9454bb7bba9d5fdf64ca4d0c20c29b9356439a348bf9492c2353f4897d9d947b4cb84019b55dd39e972 SHA512 e2be2ed5b8d60ae6e40419f4380e46f71440269609f7eadeacbaca9637bee3a493bedb65eede23e8acba811fe5e3280a803f2f934f0e00d8830009ab3bb59394
diff --git a/dev-python/django-classy-tags/django-classy-tags-0.7.2.ebuild b/dev-python/django-classy-tags/django-classy-tags-0.7.2.ebuild
deleted file mode 100644
index 77e7e1be3241..000000000000
--- a/dev-python/django-classy-tags/django-classy-tags-0.7.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit distutils-r1
-
-DESCRIPTION="Class based template tags for Django"
-HOMEPAGE="https://github.com/ojii/django-classy-tags https://pypi.org/project/django-classy-tags/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE=""
-
-RDEPEND=">=dev-python/django-1.6"
-
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools"
diff --git a/dev-python/django-classy-tags/django-classy-tags-0.8.0.ebuild b/dev-python/django-classy-tags/django-classy-tags-0.8.0.ebuild
deleted file mode 100644
index 548da29ce21f..000000000000
--- a/dev-python/django-classy-tags/django-classy-tags-0.8.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_{3,4,5,6}} )
-
-inherit distutils-r1
-
-DESCRIPTION="Class based template tags for Django"
-HOMEPAGE="https://github.com/ojii/django-classy-tags https://pypi.org/project/django-classy-tags/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE=""
-
-RDEPEND=">=dev-python/django-1.6[${PYTHON_USEDEP}]"
-
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/django-classy-tags/metadata.xml b/dev-python/django-classy-tags/metadata.xml
deleted file mode 100644
index 05a535a96d12..000000000000
--- a/dev-python/django-classy-tags/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>slis@gentoo.org</email>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">ojii/django-classy-tags</remote-id>
-    <remote-id type="pypi">django-classy-tags</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/django-cms/Manifest b/dev-python/django-cms/Manifest
deleted file mode 100644
index b6117c7f8ba1..000000000000
--- a/dev-python/django-cms/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST django-cms-3.4.3.tar.gz 5234748 BLAKE2B 331af0ba11b3e8e5379838be71e57cedad624da97d1cc03ec78081ff9644805e1713b5f98655f48541745d08e53e5b2ddc8af5615b7df26bef49e4f3686f6089 SHA512 0c6b418bf025b042cefc4bb89fb663cc419a8e806a3c6e436198b7bb595d8012f79c7f02d08cee891e5e1ef83bd4f52f0e2adcc4ebd1d22325a674cbc7e69be9
-EBUILD django-cms-3.4.3.ebuild 1532 BLAKE2B cd775c9ef59f342300540456556c90804e86e390b396072909c9f0201bb586aa8569a063a961dd7685c56f0723eefc794b3f0e09af6b0d9005e5f4b5c2dc67f3 SHA512 4e8f44faf3fa5a5f915546d1e1caaf7671ad441521ea9b2f95ec7e57fd3bc2488272b518a9f9e2226805164a075fb190a786f64bb3814c2beb95a03aab8dbc8a
-MISC metadata.xml 1105 BLAKE2B 90a394f646c9ec679ccb0cb262838bf0ed8216ae0bb535e7302bf34ad0009b9965d797e46755f061b058075b1a3576cbc09eba8932db2b7cac9c17e647f7e2e2 SHA512 fa258c0a01b621b05084c8da8ffa6be43ad44b511b6a4c62547589b7460d1ae3977da2983ba50bec7e33be456986d51aacadc9f65e4339f13e2b30b1500b6cce
diff --git a/dev-python/django-cms/django-cms-3.4.3.ebuild b/dev-python/django-cms/django-cms-3.4.3.ebuild
deleted file mode 100644
index 3220966dcc95..000000000000
--- a/dev-python/django-cms/django-cms-3.4.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_{3,4,5,6}} )
-
-inherit distutils-r1
-
-DESCRIPTION="A Django application for managing hierarchical pages of content"
-HOMEPAGE="https://www.django-cms.org/"
-SRC_URI="https://github.com/divio/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="+admin-style +ckeditor file flash inherit link picture snippet teaser video"
-REQUIRED_USE="admin-style ckeditor"
-
-RDEPEND="
-	>=dev-python/django-1.8[${PYTHON_USEDEP}]
-	admin-style? ( >=dev-python/djangocms-admin-style-1.0[${PYTHON_USEDEP}] )
-	file? ( dev-python/djangocms-file[${PYTHON_USEDEP}] )
-	flash? ( dev-python/djangocms-flash[${PYTHON_USEDEP}] )
-	inherit? ( dev-python/djangocms-inherit[${PYTHON_USEDEP}] )
-	link? ( dev-python/djangocms-link[${PYTHON_USEDEP}] )
-	picture? ( dev-python/djangocms-picture[${PYTHON_USEDEP}] )
-	snippet? ( dev-python/djangocms-snippet[${PYTHON_USEDEP}] )
-	teaser? ( dev-python/djangocms-teaser[${PYTHON_USEDEP}] )
-	video? ( dev-python/djangocms-video[${PYTHON_USEDEP}] )
-	>=dev-python/django-classy-tags-0.7[${PYTHON_USEDEP}]
-	>=dev-python/django-formtools-1.0[${PYTHON_USEDEP}]
-	>=dev-python/django-sekizai-0.7[${PYTHON_USEDEP}]
-	ckeditor? ( >=dev-python/djangocms-text-ckeditor-3.2.0[${PYTHON_USEDEP}] )
-	>=dev-python/django-treebeard-4.0[${PYTHON_USEDEP}]
-	dev-python/html5lib[${PYTHON_USEDEP}]
-"
-
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/django-cms/metadata.xml b/dev-python/django-cms/metadata.xml
deleted file mode 100644
index e40589909a8a..000000000000
--- a/dev-python/django-cms/metadata.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>slis@gentoo.org</email>
-  </maintainer>
-  <use>
-    <flag name="admin-style">
-      Install plugin customizing admin panel styles
-    </flag>
-    <flag name="ckeditor">
-      Install text-ckeditor plugin for rich text editing
-    </flag>
-    <flag name="file">
-      Install djangocms file plugin
-    </flag>
-    <flag name="flash">
-      Install djangocms flash plugin
-    </flag>
-    <flag name="inherit">
-      Install djangocms inherit plugin
-    </flag>
-    <flag name="link">
-      Install djangocms link plugin
-    </flag>
-    <flag name="picture">
-      Install djangocms picture plugin
-    </flag>
-    <flag name="snippet">
-      Install djangocms snippet plugin
-    </flag>
-    <flag name="teaser">
-      Install djangocms teaser plugin
-    </flag>
-    <flag name="video">
-      Install djangocms video plugin
-    </flag>
-  </use>
-  <upstream>
-    <remote-id type="github">divio/django-cms</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/django-filer/Manifest b/dev-python/django-filer/Manifest
deleted file mode 100644
index 272cb7f0f27e..000000000000
--- a/dev-python/django-filer/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST django-filer-1.2.0.tar.gz 1100877 BLAKE2B 924129e668ae3390e82e12f9d2589b1b199492d9d2995ee566f051b7e57359548bf3fb03d642c70e930f7a8e4f9a4c9a2229f4d6a2da0a6222b029e021691a9c SHA512 b3cf4d028f0e8fb3e8a43d18002e8f8a2659cb57281fbc8c6e2d1ce6cdcfa165f627d0e393f07eb0ce0aec86f7d99aaf6e6a418334faa6695644d8aef65f5993
-DIST django-filer-1.2.7.tar.gz 1269205 BLAKE2B c24b375b965ce31c4456383309521301fe8e55c0dfe29a6c0f79d5b2d359a881e72b11a496671c47ac75afbdb09a2e276da5cea7de4502bc8399de0a99414be9 SHA512 681f31bf7d3c781e7ef0f1833cc666f993403da527ffa8862585b21b8ebef1eacb2c856abfb1b41028a500eb2fb6533a869da3660a4606ba0c435702fdc7ad9e
-EBUILD django-filer-1.2.0.ebuild 605 BLAKE2B 1321d01321f73477162d8fccee5804dfd13c7343013052503626cc86e32ea002695ea5eab65064221461e56f562985dccf214a6a999432225acebbc21c65765a SHA512 21d25b58226901268013d3f2c25f0e74b79d555b859dadda439889a4ca7850a2a05bbd5359a6b871ffa6ff7c650e00ef34538da23ff75943cbd778fdcbe62372
-EBUILD django-filer-1.2.7.ebuild 705 BLAKE2B e60fdd1bd4307d500283a0a6b876724c32566bf8ff6c2925e08eda3f7abeff4a83184864bda56389b9635f07d0475c9f3708038eed705400d798dc54a2f91b98 SHA512 326482b1dd8026b3ec805d6b0313f2cf0364673be3cf082e1a6e516c6c55d0ec3cd3b2a016881f5e866a999536994a91e9cb3e9f5e22fe258afe5ff1a0d299a6
-MISC metadata.xml 298 BLAKE2B a0b3888009d21e04b844016ceb94ae4ed168fa4e3903595067143a6bc6ba8977cfaaf38acd0b4ec0862f9507f5890fdf4a66e26c9b61c108dec3bbd39d529984 SHA512 84755a8d4f4c0a76aa02e3815fd158356757561752bed22c836e7d16cf303683a0ce4f5558e615cb0745e28b5eeefddfd57bbf52b6cb3731becb2a0e6ed83058
diff --git a/dev-python/django-filer/django-filer-1.2.0.ebuild b/dev-python/django-filer/django-filer-1.2.0.ebuild
deleted file mode 100644
index 563448e5214b..000000000000
--- a/dev-python/django-filer/django-filer-1.2.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit distutils-r1
-
-DESCRIPTION="File management application for django that makes handling of files and images"
-HOMEPAGE="https://pypi.org/project/django-filer/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/django-1.5
-	>=dev-python/django_polymorphic-0.2
-	>=dev-python/easy-thumbnails-1.0
-	dev-python/django-mptt
-"
-
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools
-"
diff --git a/dev-python/django-filer/django-filer-1.2.7.ebuild b/dev-python/django-filer/django-filer-1.2.7.ebuild
deleted file mode 100644
index 443dfc1be2ce..000000000000
--- a/dev-python/django-filer/django-filer-1.2.7.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_{6,7},3_{4,5,6}} )
-
-inherit distutils-r1
-
-DESCRIPTION="File management application for django that makes handling of files and images"
-HOMEPAGE="https://pypi.org/project/django-filer/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/django-1.5[${PYTHON_USEDEP}]
-	>=dev-python/django_polymorphic-0.2[${PYTHON_USEDEP}]
-	>=dev-python/easy-thumbnails-1.0[${PYTHON_USEDEP}]
-	dev-python/django-mptt[${PYTHON_USEDEP}]
-"
-
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/django-filer/metadata.xml b/dev-python/django-filer/metadata.xml
deleted file mode 100644
index 108f02cb6d63..000000000000
--- a/dev-python/django-filer/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>slis@gentoo.org</email>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">django-filer</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/django-formtools/Manifest b/dev-python/django-formtools/Manifest
deleted file mode 100644
index 1e012ed6e76d..000000000000
--- a/dev-python/django-formtools/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST django-formtools-1.0.tar.gz 70505 BLAKE2B cb46d7e6be8b79ca6bdc3c8734d8f3fbd67de4b09f9a677d716654e8371b8ab8bdf248293b64b610b1a15b78e3c8bb5fa495d0ff0b00649241bc69e11cb1e406 SHA512 828ea5f5057d7ec72ab6cc6613e8af950f16595115bba658892e15aec39498f6e7c3dcb5c50ac4fc7ef54e12a640ed93e76a968f41bec59388630cdc43c9e3ce
-EBUILD django-formtools-1.0.ebuild 655 BLAKE2B 5b96168dc8791a98bacd1877f7d806391c5603be68495a58c70db150b0e17946a49e5e17d93faed9f6b6c4a095ef7a7157e9552b6e922fe4590fa33ae2e3bf5c SHA512 862cc7252a8a62f35306d1673b179e1be3294b75a3af6a51beeba3ad5c4aceb2b888929471742c70e01c699d654a0bc976f58666f8c1a78bb8582672b59993bd
-MISC metadata.xml 329 BLAKE2B c34c23cad68b8e98aa8f51aa8851f3440c75c480d353b7967372de0f2f5daaa97b85d69a2b4e8e8802dd9cae2440f31ef665d4b0089e5c67dd6aa41375bb3e5e SHA512 fa9ff839567d05492ed9d6e53aa7bf4296c1235c9ebeefd75d3edc8f72353aa3844533b4d887975943ad0195ed5339524e411c04e964f8dd3e6bce07135951bd
diff --git a/dev-python/django-formtools/django-formtools-1.0.ebuild b/dev-python/django-formtools/django-formtools-1.0.ebuild
deleted file mode 100644
index 7f5f839fc723..000000000000
--- a/dev-python/django-formtools/django-formtools-1.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="High-level abstractions for Django forms"
-HOMEPAGE="https://django-formtools.readthedocs.io/en/latest/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="!<dev-python/django-1.8"
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-python/django-1.8[${PYTHON_USEDEP}]
-		dev-python/flake8[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	emake test
-}
diff --git a/dev-python/django-formtools/metadata.xml b/dev-python/django-formtools/metadata.xml
deleted file mode 100644
index cc21245f4343..000000000000
--- a/dev-python/django-formtools/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">django-formtools</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/django-mptt/Manifest b/dev-python/django-mptt/Manifest
deleted file mode 100644
index 614150fa47bf..000000000000
--- a/dev-python/django-mptt/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX exclude_tests.patch 414 BLAKE2B 2cf5924a19b3730fc03c378b340cc9cda8800d3751c467357f859e685f006c8f4d4efc467697a635afa4992bbc059f83ecb96ee8cce3977cfb969649ce857991 SHA512 5f2137f73a4f258a5648a2c858a5180a38ee6094aec0fd815b0158aa38c49ad5a02fede40dd7a98623e44625752e30266346aea2014310ec565f56f8ff1111f3
-DIST django-mptt-0.7.4.tar.gz 133855 BLAKE2B 29aba425c59d7cde4f0e648515afc1950a5fbc375bc761065a7b53400c41b164d8e706992a5d56ebc9121233b3b1994a6bd4b67f96ae468cb0d120c53a1cd1d8 SHA512 596bb1b7f4a99b4b8788b3f4da59850bdaaed4214f877479a89ce9f749f9d217f2ccce488e7f67cd75780ace09d3b73fdca2b0d95a56225d63dfb9e6a1d290b6
-DIST django-mptt-0.8.4.tar.gz 119207 BLAKE2B 6c5b657f4d84980c74e9d369fbdea98d9bd053dcd950b11207eac04b046950647e4209eda2ee0bda8bb9e4a6add8a2ed5aaad061da74276ba6e72ebed026eaf2 SHA512 c3f45813d3dcaf6ce2504941602b1d1fc2a33f13802b34a9c85685dd0e4066a3e8c6fc36be320c472d93efa54a2f10c493b536f45d16a5ab88a08f6baf0513d3
-EBUILD django-mptt-0.7.4.ebuild 490 BLAKE2B 6cd3ef5812f20f6c3e547f0e7731b615530884300465e31ee165ec7883f60c435e0d4aa940512401218ef29a5c33cabd51be1afb8166cc13ab6e15eaef5ac169 SHA512 3e9692b2c86a26a81cb2cd3a9708fe95a37622d144104f99f2272a995d14111877c8d05169a213270f2d46b92576d465f7ff4a0e8fa5504b1f5ed51d38841f77
-EBUILD django-mptt-0.8.4.ebuild 561 BLAKE2B fd85208c7d632464312a65eb0e412af7c21e9c5edafbbe4f1e0634e5b1eaebfce991aa6f33b50ee77a2e4be5e8c6b44d8908d1f65596abf71850486e010a89ff SHA512 51f6309e2e4662cc1979293b4b3968ad2001e8bdb713cc9af1e79587ae98655939536d5a8968cec9c80d3d8cd7ff2c0a5ee97689a3da093300fddcd474d2a251
-MISC metadata.xml 297 BLAKE2B 1b8c0898f14df1f06af387952983276f8ea93f65186bccd6f2ce6b0b8c7ddd1460548c9c5cd803a57735758f4e245efefcb25b9e979ff54fccb3ff3a5049b7a3 SHA512 0cc4cb0f818d2e102e3d36faa3c257b86ac6b235d40ecbf17fa120dff0d57f3dacaf60821e1f0198d069ff14538cee099e96d38b50666fcea5266868bd7a9307
diff --git a/dev-python/django-mptt/django-mptt-0.7.4.ebuild b/dev-python/django-mptt/django-mptt-0.7.4.ebuild
deleted file mode 100644
index 7eb84d48fd50..000000000000
--- a/dev-python/django-mptt/django-mptt-0.7.4.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit distutils-r1
-
-DESCRIPTION="Utilities for implementing Modified Preorder Tree Traversal"
-HOMEPAGE="https://pypi.org/project/django-mptt/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/django-1.4
-"
-
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools
-"
diff --git a/dev-python/django-mptt/django-mptt-0.8.4.ebuild b/dev-python/django-mptt/django-mptt-0.8.4.ebuild
deleted file mode 100644
index f994f75cae8b..000000000000
--- a/dev-python/django-mptt/django-mptt-0.8.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
-
-inherit distutils-r1
-
-DESCRIPTION="Utilities for implementing Modified Preorder Tree Traversal"
-HOMEPAGE="https://pypi.org/project/django-mptt/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="test"
-
-RDEPEND="
-	>=dev-python/django-1.8
-"
-
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools
-"
-
-src_prepare() {
-	epatch "${FILESDIR}/exclude_tests.patch"
-}
diff --git a/dev-python/django-mptt/files/exclude_tests.patch b/dev-python/django-mptt/files/exclude_tests.patch
deleted file mode 100644
index 36b5ad493689..000000000000
--- a/dev-python/django-mptt/files/exclude_tests.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- setup.py.orig	2016-06-27 08:09:57.408674058 +0200
-+++ setup.py	2016-06-27 08:10:31.112007190 +0200
-@@ -12,7 +12,7 @@
-     author_email='craig.ds@gmail.com',
-     url='http://github.com/django-mptt/django-mptt',
-     license='MIT License',
--    packages=find_packages(),
-+    packages=find_packages(exclude=('tests', 'tests.*',)),
-     include_package_data=True,
-     install_requires=(
-         'Django>=1.8',
diff --git a/dev-python/django-mptt/metadata.xml b/dev-python/django-mptt/metadata.xml
deleted file mode 100644
index f11f7a533802..000000000000
--- a/dev-python/django-mptt/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>slis@gentoo.org</email>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">django-mptt</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/django-sekizai/Manifest b/dev-python/django-sekizai/Manifest
deleted file mode 100644
index b9927cc5e6ad..000000000000
--- a/dev-python/django-sekizai/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST django-sekizai-0.10.0.tar.gz 18731 BLAKE2B 03dc4423a1b7d477b5b845dd69ddf1bed2adb23e847cae9224bcc299e5a6b1b60cda43b271754216d044d6e5d9a054ec419b58439ce23aea3be01aa0157c8b14 SHA512 f7e336fce652094394aa3d3f94f53dae0eb80bb3cc7715013f1c8d227b9f36b97746f572a8c5bfe278e41d73783b7a978f86967ec23a7a423f1c014d658347c2
-EBUILD django-sekizai-0.10.0.ebuild 603 BLAKE2B 372dd6677e1188feaaa76d14e196a4a16eb24b26b4a65be750f91b2dafc9b87f7700f22f804d795d230a12678119e88d757514a0a74eae34008e4ae9a93b8fb6 SHA512 36ca9c2c397a40ceb32c8ac4e505ad568731893119f99fe281c6d7a7f081d30e8cb0bdc35301240bb31963bfc373ae7e0c0d5097ffcaee9904bca25e43f8fdae
-MISC metadata.xml 361 BLAKE2B ef3cf30c1c039eff20d15c98b8bab342b5305c83274bb4593c4968e3770105dc1a48c115c47bb2abd706f100b32bf0df020ba303c3651c53606ea49edc92ab07 SHA512 e6d062fe70d05e07e6d13c714abba9a031da50fa8678ec8f44dd3a376665e686a5db9880d4ebbf02e197aa138da043b18bff17f52de9cff83b495d8c59d3dbbf
diff --git a/dev-python/django-sekizai/django-sekizai-0.10.0.ebuild b/dev-python/django-sekizai/django-sekizai-0.10.0.ebuild
deleted file mode 100644
index 487e509d67b8..000000000000
--- a/dev-python/django-sekizai/django-sekizai-0.10.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_{3,4,5,6}} )
-
-inherit distutils-r1
-
-DESCRIPTION="Django Template Blocks with extra functionality"
-HOMEPAGE="https://github.com/ojii/django-sekizai https://pypi.org/project/django-sekizai/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/django-1.6[${PYTHON_USEDEP}]
-	>=dev-python/django-classy-tags-0.3.1
-"
-
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/django-sekizai/metadata.xml b/dev-python/django-sekizai/metadata.xml
deleted file mode 100644
index b54504275860..000000000000
--- a/dev-python/django-sekizai/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>slis@gentoo.org</email>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">ojii/django-sekizai</remote-id>
-    <remote-id type="pypi">django-sekizai</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/django-standard-form/Manifest b/dev-python/django-standard-form/Manifest
deleted file mode 100644
index b1667fccb0c2..000000000000
--- a/dev-python/django-standard-form/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST django-standard-form-1.1.1.tar.gz 7504 BLAKE2B 219cd66a99a1818ead067db67d58830324cb9afb932479b7eb2b41189d6a7bd6ca91f2489fa8aa29d7fa47fee3aa56e3c5d88090559908b4adca93e21f570796 SHA512 284ca81ff34f8e6344163a00043e7c23dcb7b98341b07a3113627bd9a8848e733335a1adb0ae3b458d3e63bf229d301abe36315d30e65ee9edb5472aede1a5c3
-EBUILD django-standard-form-1.1.1.ebuild 587 BLAKE2B 9a1050006ac9b0995063e4a5b4cd10e95b3910ab91a7473108022f1750ac8d6b5b735abc85d1c1e682e5cbf6ec5598419f5f1d5ce0aeb57897737cc6b188b69e SHA512 71d45400c1fbf233bf07d109945ab9d6cea351657a8feaf23f43dae8aea4bf6f4c917bef4e1dd8ba1815bd2348f0ad8deb36d1d43336ffabc0a6df06a374ce65
-MISC metadata.xml 306 BLAKE2B d95559bc58d3e4fc35c0cd647251532ec3d751fedbec55b4a590912e5c4683cd1d08fd88088f1ff8b68b6e3577376e2cd03ecb6d03b3cb248b0fc9a9ce55b34e SHA512 513b47adaa43c183816aeeb150e244d48bd229658b66b5a2cd4848ebaf1bffcf3040ad416064d96153504152261b8aa43322fb3350f1a3a2bc95892f54d21d60
diff --git a/dev-python/django-standard-form/django-standard-form-1.1.1.ebuild b/dev-python/django-standard-form/django-standard-form-1.1.1.ebuild
deleted file mode 100644
index 170d16f3ef73..000000000000
--- a/dev-python/django-standard-form/django-standard-form-1.1.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Quick and simple django templatetags for displaying forms"
-HOMEPAGE="https://pypi.org/project/django-standard-form/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/django-1.3[${PYTHON_USEDEP}]
-	>=dev-python/django-classy-tags-0.3.3[${PYTHON_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/django-standard-form/metadata.xml b/dev-python/django-standard-form/metadata.xml
deleted file mode 100644
index 4543b354f15c..000000000000
--- a/dev-python/django-standard-form/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>slis@gentoo.org</email>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">django-standard-form</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/django-treebeard/Manifest b/dev-python/django-treebeard/Manifest
deleted file mode 100644
index 8e54d0700663..000000000000
--- a/dev-python/django-treebeard/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST django-treebeard-4.1.0.tar.gz 101292 BLAKE2B e186e14856b63e9446103daea9d6ffc3cfd0fc998dd51d172ead6f539bb212643b8135f3f0b8452e59a6c84a0cfb524271574acee11f26a929bbce667e4d22bf SHA512 261f4d91c5fd78b05346ea3a5e384e413b81a0cff5278c5bc4373bba3b7d7734c84a96529013f759a20ee46aa60f699ec552117d258a4da3a1d46aa6c1a1cdd6
-EBUILD django-treebeard-4.1.0.ebuild 576 BLAKE2B a2d560dde593f76238342b0f5a2889f98b8f945380ce6fd28d9ab2ef3bbe0e8a9fcf00445068bcfa6e937d0f44be74d931b21624e430fd4f348b289e28ebfa5b SHA512 e7c4ec2646199bf2f0034dcefafe83a975a1ff3b31076838471e1c26c2d8996ca8df615b075bb5151b194cda7e9ae3d9ed30bcb2bddd3bde14b90ff739a00bed
-MISC metadata.xml 302 BLAKE2B 17342f2ec89883db023d624790fa40eed73fed27cc2e2cb5df10c893193786a80c89e6b411a0a5c858c07dee64aeb5c7e4c08bb53efad3dadc19eb8cb897d3fb SHA512 20137578f1921e8b585fd054c10fcfba1299122221690f62fb548c88e39dc05a0aad3a5dd2e607cbcb760fa755904e6c3bed890c018e1ca4eb743f862d8117de
diff --git a/dev-python/django-treebeard/django-treebeard-4.1.0.ebuild b/dev-python/django-treebeard/django-treebeard-4.1.0.ebuild
deleted file mode 100644
index 10c03106ac0d..000000000000
--- a/dev-python/django-treebeard/django-treebeard-4.1.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Efficient tree implementations for Django 1.6+"
-HOMEPAGE="https://tabo.pe/projects/django-treebeard/ https://pypi.org/project/django-treebeard/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/django-1.6[${PYTHON_USEDEP}]
-"
-
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/django-treebeard/metadata.xml b/dev-python/django-treebeard/metadata.xml
deleted file mode 100644
index da1c33ee9340..000000000000
--- a/dev-python/django-treebeard/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>slis@gentoo.org</email>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">django-treebeard</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index 5a65d33b40b7..e21b6c7cf615 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -1,11 +1,9 @@
 AUX django-1.9-bashcomp.patch 1734 BLAKE2B d65bc505e4096fd8d23619f3d76b76d66fc3e68f408906c30a1a8e97a5ef5c0c9c1b352f8c4f4acd1588c639f7b0a489a53e1dbc9763b395ce2488c463e6d5b4 SHA512 d3caa9b77d6c336e131b706411080aa129df83ac60293a2612eb268d08a6c40096b322715766801e16a641134762174ecefcf2b93698f47b022fc31421597403
 AUX django-2.0.7-bashcomp.patch 1507 BLAKE2B 8aeb494087dbccffc69ad43f370e791d9fbfb1908d45f55d5f8be01ec0f3af6b2aff591da84a06c0858fecd44180579a4647d622ef57d8235ccb4b3b80fd3a2a SHA512 5a3867b8e4f2fafe4c53a741d41e8c6e8e28a55463f7d8007afd669a04daa8b93f911e4ef8d5ad38ba300558f21ac8090b00337d0c0bfb93b2aea73a179334a4
-DIST Django-1.11.16.tar.gz 7852514 BLAKE2B a881caa6c31c80d6b0146cb49a08ba63ebfba21637747328adb8ec3afada2182b72c46576a79cc9e163546e5b980a2be516d842492517319deb0a4f5512ad605 SHA512 bf1329ac364c9037fd6cecd0e8565c8bd8d830343671f9ce5415a10e70da37256667675b3f97e4d2508a8a912fa7a06ca7f585586ac18e6734c939bc41a8b455
+DIST Django-1.11.17.tar.gz 7853439 BLAKE2B f6218ee690e505921d229193540b4166771465213aee3a3b239da6a88c1a7e166d182750192f984be7369e82c3ae172a9d858d7d30e9eb7cff4a467b543372e2 SHA512 ecf798ce8037d79dbbe673ad583e6414c9a24b807442feb967927b78cacb467f7f5c20e938116829d9b0df0563ee110a8d07294fd40b99dbd6356c8bae151bd6
 DIST Django-2.0.9.tar.gz 7992507 BLAKE2B c6f1d79401007d2c83553e885d5e32c7890b3f1ed53c948ea4c55cc2a0272c06d0b7fdafef7be5042ab26b3f8c3ffef64f6f01f49d6e615503f8bfad99b66c3a SHA512 7a766ce0240b19a18dc5a9a4682630c4ce90fa6ed0d02a97303088a990d09e097b609220f4e2806854585724f483cb2ae7e4f29bfd1898f3a0d6e758c2f4ea4a
-DIST Django-2.1.2.tar.gz 8611286 BLAKE2B 5107fd04ee11ae4ded3d8914d840e323e26617b526ab877654de08caa6ce1cb6f053d3afbdbdbda17ab26b1ed1bcb158ef092a63ef14393b87ed98e612cf43aa SHA512 3510f872762e75c7e66987857616d958d15bef91ce2d9e1656abcf4e0221b1c6ff72c59fd29643aa0b0288118db76d58023cffe48f401e7cdcd03d71822a282d
-DIST Django-2.1.3.tar.gz 8611851 BLAKE2B dc0c2bf994ef883d34d66d3d0f4e77d20f5a25671053831e4138e5431ec7ec8c89ba64d7ae4a58e034e01093276cd61a2d833319d28283cbd9ad8d6ae4b9b2d4 SHA512 b83732d8c0230bda0a29db92acd3e4e7531f9adb3a0d10f37c40288c08ccaa5d7d49184bd5ea000b991eaf8a196b317648c200c147a6e8f503ce42189344cee9
-EBUILD django-1.11.16.ebuild 3223 BLAKE2B b5354d00a4818503a709876413d4c7e5c0314d21cf702785538fb94fe8b3e0fb74abaafcbba00f3ddfebe6b533e25d6dc95eb3589c89dca4864127b080a4e8d0 SHA512 b68e22449b008c8ad9f40bdf3d7aab31fa48b533b055bd2c6d59b603b82905e032f44e00eeec7907d6b566aa350efd6a4816504e4ade5f5998a8d6f42304291f
+DIST Django-2.1.4.tar.gz 8611886 BLAKE2B 1deedd3c13c65a7f6ae2262ef1e894046e3151dc7bcd6da274d6e87e60db326cc28a51c62627d00c6feee3807ff8dd13823edf8b4494f0d1499272998f350748 SHA512 a2dc6fb7514f8d79aff98aeb0bd0edb1ede36ed2368e553fded8b58765092d6a2efcf2e9429bb9c7d2c16d466e46a9ff18aaf5911a7dd868f42569c1e82831aa
+EBUILD django-1.11.17.ebuild 3225 BLAKE2B a47970628dd96cb4001881c57f061752f0484cd6c74cb0800c1eb405d09e0d5e723b609fcd32e702a107d2eefc17877f898f3d049b3933384752e37589938311 SHA512 a0b5e1141cc0f66f9936183a03201cb66e5e76899e255a74dd655ff8a1df9a42a17dfcb963ad3326d9398e94462226f0b5c3ac328590784008be39dbf7aa5e7f
 EBUILD django-2.0.9.ebuild 3054 BLAKE2B df9058fcbf257e52709db580b2000fe5189432745582c782574ad562993c2848f33a7d15fcaf79487281509c6c20a1e903acdded0b7bd4e2aef0061759532b46 SHA512 0367e645c71e7dfc51308b3c7a9e4d211f8591bd82557a5fa61715219ab5573e804a046b212d7c89d3848a574823c1de16d7d08bbc77264d4bcfc967ae4e95fc
-EBUILD django-2.1.2.ebuild 2489 BLAKE2B a5fa9e5c8b327c68ec8d5cc2a254e265f0d25ac2e58e5148d6c2e4a4d88c96797afefba176afedf404667ed35cb11f1f7a05b8f0d0c1f918ad5eadb014cd537b SHA512 d31eb055c10c1441be1ac99bc2f29e4e2bbd3340285fea7559e247a0d7ce01d95b38cc2507e956760668a503ebbf9721419c9243cbf5c1d431060acc4f2e2f58
-EBUILD django-2.1.3.ebuild 2491 BLAKE2B 231d4a75de6fa479473deee6a8158117a57c6da608fa4e0d6aced990aacea8e058db901a0dcd246b27485894a2af054015bb885329596987600f9c3a032c0c6e SHA512 ac600d1d5b70822b5a39cbaffe742417cc28afccd9f619d1e2011e4bd86f5c7c1eca1eb977053ad4093db25ab5c189ec4ecf02e09d037bf5ad73d15a7cf19547
+EBUILD django-2.1.4.ebuild 2481 BLAKE2B 12716c330cc37493aa852f18930e7fb825b3c672cb4257d001b2e6886bca863b6fccde4435b86967b0acea56f2a0c9af2c9859677730e4cc017467a91a617e82 SHA512 efc649f1bf67e8376c6cee59b7c4ef16219df9d835e36ee7f070fad5e6502c413b56fbdd1095ae0d702cdad0b93196252e3801ee6d8d57d92698897ada81b7dc
 MISC metadata.xml 488 BLAKE2B b3ffa7cc6bced74a890b71be2bfb3805bb51a523f485079a7da0cb2698f3fa0ee1746922813859ac95df41b3ef3249c413f1692f3635427fa965874287b83d88 SHA512 9091a2e41a992542b38251b12623c0b1ac737cf01a4f46ce63096568bcde4e3d8546705bdb10c14c128b4cb6564e38dbb6d1803611c5197923b847304aa69cdb
diff --git a/dev-python/django/django-1.11.16.ebuild b/dev-python/django/django-1.11.17.ebuild
index 6f859138b197..507ad31d67cd 100644
--- a/dev-python/django/django-1.11.16.ebuild
+++ b/dev-python/django/django-1.11.17.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy )
 PYTHON_REQ_USE='sqlite?,threads(+)'
 WEBAPP_NO_AUTO_INSTALL="yes"
 
diff --git a/dev-python/django/django-2.1.3.ebuild b/dev-python/django/django-2.1.3.ebuild
deleted file mode 100644
index 89d87db8de42..000000000000
--- a/dev-python/django/django-2.1.3.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-PYTHON_REQ_USE='sqlite?,threads(+)'
-
-inherit bash-completion-r1 distutils-r1 eutils
-
-MY_PN="Django"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="High-level Python web framework"
-HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
-SRC_URI="https://www.djangoproject.com/m/releases/$(ver_cut 1-2)/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-# admin fonts: Roboto (media-fonts/roboto)
-LICENSE+=" Apache-2.0"
-# admin icons, jquery, xregexp.js
-LICENSE+=" MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc sqlite test"
-
-RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( >=dev-python/sphinx-1.0.7[${PYTHON_USEDEP}] )
-	test? (
-		$(python_gen_impl_dep sqlite)
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.0.7-bashcomp.patch
-)
-
-python_prepare_all() {
-	# Prevent d'loading in the doc build
-	sed -e '/^    "sphinx.ext.intersphinx",/d' -i docs/conf.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	# Tests have non-standard assumptions about PYTHONPATH,
-	# and don't work with ${BUILD_DIR}/lib.
-	PYTHONPATH=. "${PYTHON}" tests/runtests.py --settings=test_sqlite -v2 \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp extras/django_bash_completion ${PN}-admin
-	bashcomp_alias ${PN}-admin django-admin.py
-
-	if use doc; then
-		rm -fr docs/_build/html/_sources || die
-		local HTML_DOCS=( docs/_build/html/. )
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	elog "Additional Backend support can be enabled via"
-	optfeature "MySQL backend support" dev-python/mysqlclient
-	optfeature "PostgreSQL backend support" dev-python/psycopg:2
-	echo ""
-	elog "Other features can be enhanced by"
-	optfeature "GEO Django" sci-libs/gdal[geos]
-	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
-	optfeature "ImageField Support" dev-python/pillow
-	optfeature "Password encryption" dev-python/bcrypt
-	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
-}
diff --git a/dev-python/django/django-2.1.2.ebuild b/dev-python/django/django-2.1.4.ebuild
index 576b624d32e3..4f8d934327ff 100644
--- a/dev-python/django/django-2.1.2.ebuild
+++ b/dev-python/django/django-2.1.4.ebuild
@@ -27,7 +27,7 @@ IUSE="doc sqlite test"
 RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]"
 BDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( >=dev-python/sphinx-1.0.7[${PYTHON_USEDEP}] )
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 	test? (
 		$(python_gen_impl_dep sqlite)
 		dev-python/docutils[${PYTHON_USEDEP}]
diff --git a/dev-python/djangocms-admin-style/Manifest b/dev-python/djangocms-admin-style/Manifest
deleted file mode 100644
index 36d0e480b28e..000000000000
--- a/dev-python/djangocms-admin-style/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST djangocms-admin-style-1.2.7.tar.gz 304105 BLAKE2B 8a765d3e784a906225e46824a11df81467fbaabea0221cf4f74c9654856e61f4a376320494f2d370fdcd710b0771a50f1ea1107958daf5c33f24675d5dd47424 SHA512 e1476fcd07794f462870aa19e038e9f36f7181648008203b3cffed5fcd09e494397e275c8df49457d8cf742dbd845ba92a1561fc3b6725a5e834c113d5d81c74
-EBUILD djangocms-admin-style-1.2.7.ebuild 499 BLAKE2B bee130a78e816435dcf72ed9acdbafdcc3d980f83c5a603d8e005a53bd01261c3c930cad7db0a4556491ddbe0c943a711c96ff888702e59634feb2386daf1fa5 SHA512 e7357f923b1171f641a440ced3d767e4dc57b66cc6a25ae12736eddef618871777c02ff6060cf265871dfc71eb236ab55553ef7d094493baa590280f27b6a20d
-MISC metadata.xml 307 BLAKE2B 616984419ed1881704fe6c0f9f9c1f6f5b083401a618756c3347f987bd4aa9ec5717563ba235f8c2b71a27d1a02167056b17017aabe68b10dd10a5c44b1adbf4 SHA512 5211b58e7783644fcab006b67fd0eb83f293d2ccb1200193d35948f653388bb6219b69d35c1ec5cb761520d90c244acc0626500288423e8fac7ccd4b66aa3cbd
diff --git a/dev-python/djangocms-admin-style/djangocms-admin-style-1.2.7.ebuild b/dev-python/djangocms-admin-style/djangocms-admin-style-1.2.7.ebuild
deleted file mode 100644
index c7ab2bb43f6f..000000000000
--- a/dev-python/djangocms-admin-style/djangocms-admin-style-1.2.7.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_{3,4,5,6}} )
-
-inherit distutils-r1
-
-DESCRIPTION="Adds pretty CSS styles for the django CMS admin interface."
-HOMEPAGE="https://pypi.org/project/djangocms-admin-style/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/djangocms-admin-style/metadata.xml b/dev-python/djangocms-admin-style/metadata.xml
deleted file mode 100644
index 5c2b06dd4410..000000000000
--- a/dev-python/djangocms-admin-style/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>slis@gentoo.org</email>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">djangocms-admin-style</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/djangocms-file/Manifest b/dev-python/djangocms-file/Manifest
deleted file mode 100644
index a4dd3714dab1..000000000000
--- a/dev-python/djangocms-file/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST djangocms-file-2.0.1.tar.gz 66628 BLAKE2B f894456647e2cbb1f9405864232b59827d72a1e4ed1b23d21630d4028732aca809f8bc5c9a05827f0f4c69d953aa56897085f33512faa4df0a7491565350508e SHA512 9b966955e958ae8c1a9962b65d45cc5a20c943d32bf13be67b443d5d084b6a982ee266e9894f1c1a68afc9a7e6f03acfedc98b6ecdaba050fc024b3e7fcc7921
-EBUILD djangocms-file-2.0.1.ebuild 769 BLAKE2B 6193dfb28f7139e628b86c1730a47ef3c80c55a8829d7fa37ef500a97cf7f3da49629ba701354b9594b5e114d5beb3aa086d0b046e649a1e0f1bfa6abf7dfbda SHA512 095138712cfacc4ff589c9867a5c80c93d92d3759307214be31b2256b10408bfb5e5aa468fdcf410f33bcf39f7203fc0d1c69d650b71afabba15bff347bf8d7a
-MISC metadata.xml 362 BLAKE2B f5e2bd0a22194f0f961054e068ad05ab671d6b0e8e624c0a92a65d60eea08c2727e5a2169617ece11e78ebead2f6fc9aaa758b781fc78b14ec4e149a98134bee SHA512 06d7b7b3dae4e9d1f9cb9d2bddb9b779ebb30ac8a1adaaadfaa466e62d175e1fda4e69be6e6cc5dca8e401cd2b5be199aee00cbdbf36b3d2f2e725588053c5ec
diff --git a/dev-python/djangocms-file/djangocms-file-2.0.1.ebuild b/dev-python/djangocms-file/djangocms-file-2.0.1.ebuild
deleted file mode 100644
index 7e5663eee855..000000000000
--- a/dev-python/djangocms-file/djangocms-file-2.0.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="File plugin for django CMS"
-HOMEPAGE="https://github.com/divio/djangocms-file"
-SRC_URI="https://github.com/divio/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/djangocms-attributes-field-0.1.1[${PYTHON_USEDEP}]
-	>=dev-python/django-filer-1.2.4[${PYTHON_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-PDEPEND=">=dev-python/django-cms-3.2.0[${PYTHON_USEDEP}]"
-
-src_prepare() {
-	sed -i 's/find_packages()/find_packages(exclude=["tests"])/g' "${S}/setup.py"
-	eapply_user
-}
diff --git a/dev-python/djangocms-file/metadata.xml b/dev-python/djangocms-file/metadata.xml
deleted file mode 100644
index 577144f3169c..000000000000
--- a/dev-python/djangocms-file/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>slis@gentoo.org</email>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">djangocms-file</remote-id>
-    <remote-id type="github">divio/djangocms-file</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/djangocms-flash/Manifest b/dev-python/djangocms-flash/Manifest
deleted file mode 100644
index 8d8516a8b5ce..000000000000
--- a/dev-python/djangocms-flash/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST djangocms-flash-0.2.0.tar.gz 22506 BLAKE2B 50401fa9238cdf745fb1801a281f7e3f3ef834f731ca5a6fbfaa7de78c278f6737c9324546681b1c88c41722002d59b01e281e96d008e17fe3e84c0477c4fc39 SHA512 4c1a4a52b930801b84032682f8cbb4a57d72d46ff8118ebc688d9146b0deb4aeb9309a64868554cdfd2ca5a7b70a52223655aad74014f292f7242b9e18afcafc
-DIST djangocms-flash-0.3.0.tar.gz 21797 BLAKE2B 3a51f1fd6a91cb1c96cee5442a09c7f5031c84f51fc95a9f634cc1834510819be819e9cd489b3166129c3ad94ca5b05c4420d9ed5fc962cb9ed309d5bbe2c64d SHA512 a24e6ea9be55cf6f9d9bda6e1e3b3934769c97295d053f792f8374e42023ce72c246a4ee2c06dab8c365c6fc6e6b56d38fdbf520d03e17000f080cf3a68f5c1c
-EBUILD djangocms-flash-0.2.0.ebuild 453 BLAKE2B 152db4a3634e65a1f56ebe8d6406665e78da97196bce8d90947139701f373194bff98ae4469cf3e05cdadaea1ed7ad26b99e79795849e6dade4d61ea77b8d679 SHA512 efdf690214d451138c96ac7753edd7321e98ce9aee47053767c2f1a16bcd14ec14110b71b43dde474dd896e8c852d1c41b7b343e706317331bae1be8a05b98a2
-EBUILD djangocms-flash-0.3.0.ebuild 465 BLAKE2B b94aaedee7daa8b2774184d8402636d4ee119419bab5221eb6a76bde950ff1a26510e7e7ae3e960c92d703f8032ccffa699092176f1e5ab4ba38622c25bd7bda SHA512 49ed10aacf3c0391c94e8bedc8ed4d787ac2b021d97082772f160e59474ceb14aa3f155c65701e60b89e56152275670259e2ecf9d6b02554070ca4dbc8a650b5
-MISC metadata.xml 301 BLAKE2B 721f56a68804fc337f16871ce1e56bd140d665554fded3cc4c25c1d48fda9dd66c5b7f740b1775f3b886f10186ca9ee0b253c3ff0a3b2ca8259fc09eedefa80e SHA512 39f741415521e7c890cfae9c7b88a812226cbdff8cdf8ce143b6bf350b37a4e64b24faf46f65346b0f7633023db0a63d5e8f4dd6a8f41c5c1c162f5fa2f541c9
diff --git a/dev-python/djangocms-flash/djangocms-flash-0.2.0.ebuild b/dev-python/djangocms-flash/djangocms-flash-0.2.0.ebuild
deleted file mode 100644
index 710616145f78..000000000000
--- a/dev-python/djangocms-flash/djangocms-flash-0.2.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit distutils-r1
-
-DESCRIPTION="Flash plugin for django CMS"
-HOMEPAGE="https://pypi.org/project/djangocms-flash/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/djangocms-flash/djangocms-flash-0.3.0.ebuild b/dev-python/djangocms-flash/djangocms-flash-0.3.0.ebuild
deleted file mode 100644
index d75d0fe77ed4..000000000000
--- a/dev-python/djangocms-flash/djangocms-flash-0.3.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_{6,7},3_{3,4,5,6}} )
-
-inherit distutils-r1
-
-DESCRIPTION="Flash plugin for django CMS"
-HOMEPAGE="https://pypi.org/project/djangocms-flash/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/djangocms-flash/metadata.xml b/dev-python/djangocms-flash/metadata.xml
deleted file mode 100644
index 9025089d5480..000000000000
--- a/dev-python/djangocms-flash/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>slis@gentoo.org</email>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">djangocms-flash</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/djangocms-inherit/Manifest b/dev-python/djangocms-inherit/Manifest
deleted file mode 100644
index 915d18c8d88f..000000000000
--- a/dev-python/djangocms-inherit/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST djangocms-inherit-0.2.2.tar.gz 24909 BLAKE2B 608e23ce97e529bad441862266fbd65ed2cb3cf8515c97a91e4bcf30c3bc5c816d40a86db390863805b6d79b2814fdf26a603480196ffd71fff8af1d4402e12f SHA512 f115568789b673a0ff05a3d9fac6ecaf1d7b85bb40fa6265239e0c7d3e68a64c8d163b71f2e75bec9fbb6fc7a70efbd6eb887fe027faf08c79e8052bb19fd466
-EBUILD djangocms-inherit-0.2.2.ebuild 469 BLAKE2B d9cfbd8bb4907535be3e2e84ed43bc2a4cdc520e2c5d058add5e457deaecd1d292c3eb531c9b8c8bbdeaee77b1a984c83ed9218cc2441d08d41179f3bff8e4c1 SHA512 d656bc23b4f4be456b5d1d4da3bc81982101a54829555f7eff1055104cb1991d7b4c4bfa287164e84ac60c8c0e177a890a264323822ecab6eeab730ffd100b88
-MISC metadata.xml 303 BLAKE2B 7b5636ff062b7f6e26b86c19294d5308f1b656c0ed45ed3d34d6dc825b53b6288852f732258740f0372e5afb0f486abd17e0123eb38c9f98242ad82ab5c9400c SHA512 16198140105118ffd8982ecf655385ac129ffd53d1f6cb8a3edd40b1f28af671d35693cea0ff24b49c01ab8ae2dba049b00f8b901d76d34fea9388e217d4232e
diff --git a/dev-python/djangocms-inherit/djangocms-inherit-0.2.2.ebuild b/dev-python/djangocms-inherit/djangocms-inherit-0.2.2.ebuild
deleted file mode 100644
index 7c3589bf217d..000000000000
--- a/dev-python/djangocms-inherit/djangocms-inherit-0.2.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_{6,7},3_{3,4,5,6}} )
-
-inherit distutils-r1
-
-DESCRIPTION="Inherit plugin for django CMS"
-HOMEPAGE="https://pypi.org/project/djangocms-inherit/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/djangocms-inherit/metadata.xml b/dev-python/djangocms-inherit/metadata.xml
deleted file mode 100644
index 0d6e86a08b30..000000000000
--- a/dev-python/djangocms-inherit/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>slis@gentoo.org</email>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">djangocms-inherit</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/djangocms-link/Manifest b/dev-python/djangocms-link/Manifest
deleted file mode 100644
index 1c3a8645b95a..000000000000
--- a/dev-python/djangocms-link/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST djangocms-link-2.1.2.tar.gz 32892 BLAKE2B fc75ddf07aeb91e04df6e47626bdc4ec08a7f67d286e795982f2a03391a5c2630114ad15fa9ac6574cfd27cf9ce0915b1f535debfbd6357ce44dfae2d25a817f SHA512 39c10472a5d21552e63aedbd556890bfd7da22199d1431caa5454f855c78cf02d71f6d9a01b4021cbb495c8369a7a538875630af85b515fcbefe36ddc45ca98a
-EBUILD djangocms-link-2.1.2.ebuild 739 BLAKE2B f4a40b92b0c333d220397602977574bbe18ea9c6208706ccfe04e649b1509580f03c69d3ca55a7b0fc57ecc5bb19fb88ec7a8ec9b085b4bfdab48c5ffb958c99 SHA512 2ad7a9cbbaf0553b621a85889ad3ab25a6c5b1326a88ecfce355f4d6718a4485c17b8c447942423d49f53ee5c853645843884cd041655910bfd44b13b2b795a1
-MISC metadata.xml 300 BLAKE2B eefd4b2bdb6f394e6dbc7fdf9ff9281d7a961f4f5228917935840d101d728fdef55688f497d59b7b972a5d0027e8b498ac90372031cdab1c01ee2dfed5c6a6ce SHA512 44629ac4f9ba23b9c90674bed6999c08aebc7469bb414527aa06bd84fd14c80c9cb7a5bc805fa32a165ea778b3fe8f3248ad508f42a4f0674152020635caaa53
diff --git a/dev-python/djangocms-link/djangocms-link-2.1.2.ebuild b/dev-python/djangocms-link/djangocms-link-2.1.2.ebuild
deleted file mode 100644
index 8f0275e08a1e..000000000000
--- a/dev-python/djangocms-link/djangocms-link-2.1.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Link plugin for django CMS"
-HOMEPAGE="https://pypi.org/project/djangocms-link/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/djangocms-attributes-field-0.1.1[${PYTHON_USEDEP}]
-	dev-python/django-select2[${PYTHON_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-PDEPEND=">=dev-python/django-cms-3.2.0[${PYTHON_USEDEP}]"
-
-src_prepare() {
-	sed -i 's/find_packages()/find_packages(exclude=["tests"])/g' "${S}/setup.py"
-	eapply_user
-}
diff --git a/dev-python/djangocms-link/metadata.xml b/dev-python/djangocms-link/metadata.xml
deleted file mode 100644
index ed2b593b2070..000000000000
--- a/dev-python/djangocms-link/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>slis@gentoo.org</email>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">djangocms-link</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/djangocms-picture/Manifest b/dev-python/djangocms-picture/Manifest
deleted file mode 100644
index e00a7a339ad1..000000000000
--- a/dev-python/djangocms-picture/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST djangocms-picture-2.0.5.tar.gz 32329 BLAKE2B 127103b903e7268e73444d6370fae4aad10ee0a616bff47795acb2ede59fe901c54ed8fd5bac644b2f10061dce1e788dac27670ed954fc66435ee418d9660c49 SHA512 df4ba02d06966d7cee38254baadea5eeb5197557cbda1e8a202e45420881b6216efcc49fa8a6e9f9af30507a93ee2f7110e14e5ae3a645b889c990dfaca3a499
-EBUILD djangocms-picture-2.0.5.ebuild 751 BLAKE2B c0d40e8fa13192c7430a6b409860d2ec584f98298b8ac2a0d02baa6139142581ac71186ed4711951063febf3ffceb0719ea3c8d55ca271026f78bfa297f5270d SHA512 75e1f3fff1405cadeb4c336d75e51ad28d5e9fcce07f93a7b777bfaa410896d273c868f5e21220ca85ce445950a7295be49e90c4f75b93614f0a964f912bf4e0
-MISC metadata.xml 303 BLAKE2B 2eb1269bc65a3446efd89149279039e9c7a6497da0f75fe3b340641d065c4e3911adc7da32904e0f2ccec60a08704672168b8e964b8747b1f6c09135aba95e7d SHA512 8f66c2172d20eaf54fd19875d994e8aa96ef22a83868ade0c53af4789cda3fb5058b12b24932d44120237e5cedafff9e626f4d3b875821fc48f845677879d81f
diff --git a/dev-python/djangocms-picture/djangocms-picture-2.0.5.ebuild b/dev-python/djangocms-picture/djangocms-picture-2.0.5.ebuild
deleted file mode 100644
index 68f8281a4353..000000000000
--- a/dev-python/djangocms-picture/djangocms-picture-2.0.5.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Picture plugin for django CMS"
-HOMEPAGE="https://pypi.org/project/djangocms-picture/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/djangocms-attributes-field-0.1.1[${PYTHON_USEDEP}]
-	>=dev-python/django-filer-1.2.4[${PYTHON_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-PDEPEND=">=dev-python/django-cms-3.2.0[${PYTHON_USEDEP}]"
-
-src_prepare() {
-	sed -i 's/find_packages()/find_packages(exclude=["tests"])/g' "${S}/setup.py"
-	eapply_user
-}
diff --git a/dev-python/djangocms-picture/metadata.xml b/dev-python/djangocms-picture/metadata.xml
deleted file mode 100644
index e76677692df2..000000000000
--- a/dev-python/djangocms-picture/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>slis@gentoo.org</email>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">djangocms-picture</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/djangocms-snippet/Manifest b/dev-python/djangocms-snippet/Manifest
deleted file mode 100644
index f7d986d16cf6..000000000000
--- a/dev-python/djangocms-snippet/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST djangocms-snippet-1.9.1.tar.gz 22643 BLAKE2B 711592564aaf375a2d40f52db61b2fb7bf0d994833921b9fcc13cc81094903d2c754f743f2bf659e8041da9371516e26a707070d1b797e85acbc694235724e15 SHA512 0aba41e926e2220d94266958b255fe1a8b00cb1215bc7678aacd3ad96db8349a1b472c7e9b56eead3a722cd27b953d269717e6de7383c45b5511028dcff6b1bf
-EBUILD djangocms-snippet-1.9.1.ebuild 576 BLAKE2B 3eec98f1f293f13b35bfa10914f98f84710ae0c8cc33d32fca61806cec699b2a81b4c298957823a8d684d051d152f9014556d2f7a43b06b5ad5e8e6b98c66ec0 SHA512 0dd60e78bde889ddcedb792f668d03f0699ac2864eb12b6cba8dc5616db8e73602707435e1f58d55bd75c08c627571da4541f0fc57e9448b34ebf87b11dfae2d
-MISC metadata.xml 303 BLAKE2B 4ef290d75716595e9d1c2c21340d28f61313c87b1f4b2e0871a6b44385c9dc972b299dbcb2dd1a5ece50fdddfce537bdd707901b6adb47d3c5f20bd19dd475cf SHA512 dd9d727aa596ad273efe29c3c5ab4a70969ae5b1286399cfd1c21c6c8ecccd6e9679edac6357a3d25968a76dd44b17b20de6d181cf20225913c2c26cc6bba237
diff --git a/dev-python/djangocms-snippet/djangocms-snippet-1.9.1.ebuild b/dev-python/djangocms-snippet/djangocms-snippet-1.9.1.ebuild
deleted file mode 100644
index aa6ab26c06b4..000000000000
--- a/dev-python/djangocms-snippet/djangocms-snippet-1.9.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python{2_7,3_{3,4,5,6}} )
-
-inherit distutils-r1
-
-DESCRIPTION="Snippet plugin for django CMS"
-HOMEPAGE="https://pypi.org/project/djangocms-snippet/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-src_prepare() {
-	sed -i 's/find_packages()/find_packages(exclude=["tests"])/g' "${S}/setup.py"
-	eapply_user
-}
diff --git a/dev-python/djangocms-snippet/metadata.xml b/dev-python/djangocms-snippet/metadata.xml
deleted file mode 100644
index 81273ddbad3e..000000000000
--- a/dev-python/djangocms-snippet/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>slis@gentoo.org</email>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">djangocms-snippet</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/djangocms-teaser/Manifest b/dev-python/djangocms-teaser/Manifest
deleted file mode 100644
index 8902b626b8cb..000000000000
--- a/dev-python/djangocms-teaser/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST djangocms-teaser-0.1.tar.gz 22600 BLAKE2B b2aaceaa6d0888bc0993de7b772e87d6fad90dc639ab7f2f9366a9b0db350e9a8bd60c5d98b314caecbf4f59fe51e0b7b181ed3cccfb8fc72e34f299b6d70a7f SHA512 5d313d9e6342da0d9148351ae55b60caf02fb26bff6ca459eb1e68072fbdf3d50ce67297e0644d84bd7615abc0ac1e9bc7e6d6a57e01487bd83e527d23a1f4cf
-DIST djangocms-teaser-0.2.0.tar.gz 22315 BLAKE2B db2730843781e73bdca6d0d8333653bacf38ab799e2004152a0075b087be8b510102cbab83c452d76e42876297ccb34c6064288e98d8418eaccc2523c6c96974 SHA512 4895b62048d00c87e57b2ffe8452fa7695bdaa7a37ba56dd952a645ed09b34866c05eb0f59dc2fb56c3cf6323f3f9218dcd934cb78a5a0141f4cfb403dbe1d8a
-EBUILD djangocms-teaser-0.1.ebuild 455 BLAKE2B 4e0705fdc492e39f44968549dbd72266e056025794be29d3957d10471f1f6202ddb7b750884741203567f9144489f27921b0029cfb7f639a10bea5f0dc727e17 SHA512 3a20492fbe33492ae6bf86ce95b873a05cdcf2826d1d163a190a967602111da992acc76814838209a5af0118597e330d97aa91623eb1913319324c65b230b61d
-EBUILD djangocms-teaser-0.2.0.ebuild 467 BLAKE2B da4c3f94661a5a3bbcfbf098f3b10f78bbec361e109986049f77711c5b9701bb1b9f4f4286ccd09483e882f7ca72b2e1723f92552312da25355f5eca22cbe3dd SHA512 f998b87cddac532420ba37ebeddad987ff0182f959876b5804e2773a52c2a578573d22494d4966163d6a07db892f04aae079031ba2c7e042de914127c33c2636
-MISC metadata.xml 302 BLAKE2B 44f17bb6f67aea2d02f76d700e72783d8aa7501f4e0a577cb4f5417643062d3b3eb092d9a5d4c9a87261f9c660429fdc1a775a7b35939f47300b935844ff701c SHA512 5757ade4a981eb73b8ee1ec407e55247d02273d18d65b64816c6815b36d8253014c97eabf327fb3fd26f677d83a9f96e70a98980cc9a27d8729ee948f83ebea0
diff --git a/dev-python/djangocms-teaser/djangocms-teaser-0.1.ebuild b/dev-python/djangocms-teaser/djangocms-teaser-0.1.ebuild
deleted file mode 100644
index 6b42239e1992..000000000000
--- a/dev-python/djangocms-teaser/djangocms-teaser-0.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit distutils-r1
-
-DESCRIPTION="Teaser plugin for django CMS"
-HOMEPAGE="https://pypi.org/project/djangocms-teaser/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/djangocms-teaser/djangocms-teaser-0.2.0.ebuild b/dev-python/djangocms-teaser/djangocms-teaser-0.2.0.ebuild
deleted file mode 100644
index fab35cfc8cfb..000000000000
--- a/dev-python/djangocms-teaser/djangocms-teaser-0.2.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_{6,7},3_{3,4,5,6}} )
-
-inherit distutils-r1
-
-DESCRIPTION="Teaser plugin for django CMS"
-HOMEPAGE="https://pypi.org/project/djangocms-teaser/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/djangocms-teaser/metadata.xml b/dev-python/djangocms-teaser/metadata.xml
deleted file mode 100644
index a134c380d3f7..000000000000
--- a/dev-python/djangocms-teaser/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>slis@gentoo.org</email>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">djangocms-teaser</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/djangocms-text-ckeditor/Manifest b/dev-python/djangocms-text-ckeditor/Manifest
deleted file mode 100644
index 54aed9d98fdc..000000000000
--- a/dev-python/djangocms-text-ckeditor/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST djangocms-text-ckeditor-3.3.1.tar.gz 1611710 BLAKE2B 2fc4fbd190da6af44607b780148c80a97a5525cec0c8695276b376a3bc360f52b45dcc5499315b5434e24f10e66de090fca7ba6961d8ad5e4c1734b097ca352a SHA512 eeadaf5b302669104c054112bfbb0aaa1113e8105202407fc5b39558a83914895576a2610536a2066042ec69eaa812ea9a772091420379cdf96c53464080589a
-DIST djangocms-text-ckeditor-3.5.0.tar.gz 1903581 BLAKE2B a07c8cd09624db6171fbaa8cb0603b37d541adee1267baafb56f647787a34e66e4ae968bfd0d62f110f78d145d014551cd0661a39666986156397a02964a8ff2 SHA512 d861c0a41ea4d0fac7130433961473cd435549a167362b61e644c00bb3c4241847cce503abccef6f1bd2f83451f93a478c44dcd586104ce21559a91d4eb36435
-EBUILD djangocms-text-ckeditor-3.3.1.ebuild 655 BLAKE2B 68441285231ea21e102482febef3ebde920dd3afc8a3518d20159c54737399e53c896d4d4d54513dad85cde485fccaf2bfb1a2ddc5220c3b4e342daea2a2980e SHA512 3441a2c4563a942eab80e8d1923537a98691ee4c2d329fce9fb744cd5ef18e4f802b875bfc5ac65c8eab6eb57903818ce2d4942d36c8975ffa3f41a45cb87035
-EBUILD djangocms-text-ckeditor-3.5.0.ebuild 659 BLAKE2B b20c5b2c115c6aa2d8df1c0da466227359c760d749bb78f614661c634b1fb7b60011a41088162451f650cf4d12d646e7e3bd2f879a83038ed59209a8696937f8 SHA512 b7bdcc40fc6d8941fa111fa142d3c2fe45bdc2f14dc8772bd6412cb774d8b967e8858bb3dc052e03f6f7c906be0d7bd4f50e711f9c40ed8ad439f9f063e26658
-MISC metadata.xml 309 BLAKE2B 32629814a641acffd61ade368c5c72c8e044c3397db8ac83b7ed8666efd14444a6a050097922f7053a9320d277354a9eb75a6d46097a22478b256d0f7ac9ef9f SHA512 feb5455bd3d41bc7f006e28005937c446a4a24f36a49c83a420971aae49fcf4dec63cca8258b6336ca545f5b3374a09453c6cd7eac1ef9547e9c063badcdc3fa
diff --git a/dev-python/djangocms-text-ckeditor/djangocms-text-ckeditor-3.3.1.ebuild b/dev-python/djangocms-text-ckeditor/djangocms-text-ckeditor-3.3.1.ebuild
deleted file mode 100644
index 627206a90429..000000000000
--- a/dev-python/djangocms-text-ckeditor/djangocms-text-ckeditor-3.3.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python{2_7,3_{3,4}} )
-
-inherit distutils-r1
-
-DESCRIPTION="Text Plugin for django CMS with CKEditor support"
-HOMEPAGE="https://pypi.org/project/djangocms-text-ckeditor/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-PDEPEND=">=dev-python/django-cms-3.2.0[${PYTHON_USEDEP}]"
-
-src_prepare() {
-	sed -i 's/find_packages()/find_packages(exclude=["tests"])/g' "${S}/setup.py"
-	eapply_user
-}
diff --git a/dev-python/djangocms-text-ckeditor/djangocms-text-ckeditor-3.5.0.ebuild b/dev-python/djangocms-text-ckeditor/djangocms-text-ckeditor-3.5.0.ebuild
deleted file mode 100644
index bfbfe4a2c59a..000000000000
--- a/dev-python/djangocms-text-ckeditor/djangocms-text-ckeditor-3.5.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python{2_7,3_{3,4,5,6}} )
-
-inherit distutils-r1
-
-DESCRIPTION="Text Plugin for django CMS with CKEditor support"
-HOMEPAGE="https://pypi.org/project/djangocms-text-ckeditor/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-PDEPEND=">=dev-python/django-cms-3.2.0[${PYTHON_USEDEP}]"
-
-src_prepare() {
-	sed -i 's/find_packages()/find_packages(exclude=["tests"])/g' "${S}/setup.py"
-	eapply_user
-}
diff --git a/dev-python/djangocms-text-ckeditor/metadata.xml b/dev-python/djangocms-text-ckeditor/metadata.xml
deleted file mode 100644
index 0f0287d3e83c..000000000000
--- a/dev-python/djangocms-text-ckeditor/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>slis@gentoo.org</email>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">djangocms-text-ckeditor</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/djangocms-video/Manifest b/dev-python/djangocms-video/Manifest
deleted file mode 100644
index 8399263c301d..000000000000
--- a/dev-python/djangocms-video/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST djangocms-video-2.0.2.tar.gz 25416 BLAKE2B 000b5d6bb5ee83690d06f23b689e31dd10e95f1bdd3ed27d62182f2ba9bb02d070808820b55e1d701de0eae1715a118a956278ba0130c93a8fca8f8e00bdd267 SHA512 d2ab6196a02c41f0995c5b4898f357dda215f7307675fe622b90c58cc14f0e3a8fe5a6e8da1df073bd9426d1186ba5f68de747797ac9b66ef98a32d46ba567e0
-EBUILD djangocms-video-2.0.2.ebuild 751 BLAKE2B bbc7ead602cebfa17df0ea565d8d406cde781dea6c63b202210199e7f2557b6d2eca32aca4cd6a827a4a8fe55cd38f2a2869e6214a518677c59a653cf789fdc1 SHA512 38cf551ec8b62d00f20d0bdc3024aae347b230530d469ab04a597443b530878545a7386683b1b493fc560da4707f109f0ee08987fa6b61e8704e119abf4d4d31
-MISC metadata.xml 301 BLAKE2B 3c0880d1eeb7a8b419cc23fec55fe192fdadd9c72f77c85bdbd2ea7e30eed2a64ca6c8ab25fe65066460e376b1041aea871f57699316340fdb32a14f2ad85850 SHA512 8d754aa30f488327636f75e8df23fd094789440f0338ecb01bd8c2f75b62ff58b1d5aa91a3da1c1e145e48dda4bf27e3b2e7d403b629260847fbd9516707a85c
diff --git a/dev-python/djangocms-video/djangocms-video-2.0.2.ebuild b/dev-python/djangocms-video/djangocms-video-2.0.2.ebuild
deleted file mode 100644
index 9b2f84a62c63..000000000000
--- a/dev-python/djangocms-video/djangocms-video-2.0.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Video plugin for django CMS"
-HOMEPAGE="https://pypi.org/project/djangocms-video/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="test"
-
-RDEPEND="
-	>=dev-python/djangocms-attributes-field-0.1.1[${PYTHON_USEDEP}]
-	>=dev-python/django-filer-1.2.4[${PYTHON_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-PDEPEND=">=dev-python/django-cms-3.2.0[${PYTHON_USEDEP}]"
-
-src_prepare() {
-	sed -i 's/find_packages()/find_packages(exclude=["tests"])/g' "${S}/setup.py"
-	eapply_user
-}
diff --git a/dev-python/djangocms-video/metadata.xml b/dev-python/djangocms-video/metadata.xml
deleted file mode 100644
index bd362f2511ef..000000000000
--- a/dev-python/djangocms-video/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>slis@gentoo.org</email>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">djangocms-video</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/docker-py/Manifest b/dev-python/docker-py/Manifest
index ff2bd7382fe9..9e18131ca093 100644
--- a/dev-python/docker-py/Manifest
+++ b/dev-python/docker-py/Manifest
@@ -3,9 +3,11 @@ DIST docker-py-2.7.0.tar.gz 196369 BLAKE2B dd181dbf32f5afda06e748cb49f15d5fc6ff4
 DIST docker-py-3.4.1.tar.gz 207885 BLAKE2B 472f5dde4761b02a2b55c64762a0529dbaecc8aa9f0e24c67770f533341a5ca9c7322bfacba81f99f9305f09d4e5f7d7ccf37201f5e987777c33c6f81552a807 SHA512 447dccb9129d549886882e6cf0a8ac56d91f7ed57b6aa1dca1942c62d70dc78b92184cbdd9ac5f3445be04cfaadf0b4fba191fb70e223e93c6d1cfbfd334a397
 DIST docker-py-3.5.0.tar.gz 209142 BLAKE2B 56e4400e1f67c870274eb2fdaf84edeac966a1486366355f2697f0fc4e5f37c5e4f3f8163e9187219a4fa27cd43be2bc19370a99755fa880c9e089d6af9bcc9e SHA512 c5ebc99df66d49f53c39ff897bd95afcbb92ced3ec6fd61148b6775cddf9e830454b1da5ac79ea0bba76f143f35f29dec66e7db5c6df33ca5157d3fe40cd4e93
 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
 EBUILD docker-py-2.4.2.ebuild 1578 BLAKE2B f09a649f8ef49dbecddfdc8fa74dcb2e03bbb1aa72ec90488ec0da4f5c320c2872dda32838ba237e9c5df52cd8384a51b8f20286929b9a76511a09fdd9de3615 SHA512 98bdc785eac2b65557f3079c51d46d44ac47e1d3007bca99b4fd26d7d03b8e7826fa49646039cf659c75b7c660922af290def904bedc554b485471e78eded83e
 EBUILD docker-py-2.7.0.ebuild 1531 BLAKE2B d2d1ae4449c2379b07a0e3dd6eaee69f303d035a9d1b234359eff53bcd4ad2a40f271aff3e7e13e7e66ad49b8f7d6bd788076ece3896a8b06f5580af1f82554f SHA512 807b2a01920c4efc9ca29699ed05cc4018bc76faa343d729f627886412248e702c48e630a0fcca134f0c3c1a7b7eeb61ef8b132f920bc8260702c2ac40b7aca6
 EBUILD docker-py-3.4.1.ebuild 1401 BLAKE2B 403e424e83ee8234197ba80e26e0efea57c22bbfa8df00e1af89cbee96fa4fb131edd3a45c89192a47c141a52e317a79923c303f8d320362194636f86317fa6e SHA512 cf34bfd3985f0eb4e4c139a2327a306ecc5a2a581206c0f51a62f0c853259b7bb5caba6850c2effd40d9b3ed52682c2f65b6079c86558b9ed4ce1da7ad0f0963
 EBUILD docker-py-3.5.0.ebuild 1401 BLAKE2B 403e424e83ee8234197ba80e26e0efea57c22bbfa8df00e1af89cbee96fa4fb131edd3a45c89192a47c141a52e317a79923c303f8d320362194636f86317fa6e SHA512 cf34bfd3985f0eb4e4c139a2327a306ecc5a2a581206c0f51a62f0c853259b7bb5caba6850c2effd40d9b3ed52682c2f65b6079c86558b9ed4ce1da7ad0f0963
 EBUILD docker-py-3.5.1.ebuild 1398 BLAKE2B 15f94c2229d04c34e23a6087fcee5f8ab777d46e32590ee6b11a8f1e22d81ccabd9ece88c09b491e4c2f3ef63202da3ff9a7f81a895ba424dbbe95f1b2f7f7bd SHA512 577558768c06210caa882ebdc4a26220d01bd33c3b916423c9af6f7d9201fe38a7ad50c1b9317c6aa016a0b31be153a5c36b564b820e18ba905b12af9642133b
+EBUILD docker-py-3.6.0.ebuild 1438 BLAKE2B 1410cc5278d2a0ff27a49d31a393417eb70509e827febc334c8cac9b41c8a4c5e344f6f43bbcccb927f92a11e88751aa2c6b66108529bf40c948110bb402a53e SHA512 61c70bed936327289e6ecd1d43c77c980d3343fee542b9913077264dc8f1dadb0153a50f84e8cfe63571169c910bc621a353f08c6b2c6c1be8d6f34e246cb33c
 MISC metadata.xml 402 BLAKE2B 449733b9057dfcde3dd0ff82df6a9cf870d1138d3c721a39174a71f54a359422cb3411f513f68662b1c840480c4aa253f8fe77a2afe1020e82c4e7c81dc4d691 SHA512 13bee9843188ebf018e25e2a738fd0ecc10ddb3508bbbe3e47048a9ec714196498ea71044a57a20b4c649eacd0672b956d20a3e5487047723cbda9047ca214cd
diff --git a/dev-python/docker-py/docker-py-3.6.0.ebuild b/dev-python/docker-py/docker-py-3.6.0.ebuild
new file mode 100644
index 000000000000..291b541ef7d8
--- /dev/null
+++ b/dev-python/docker-py/docker-py-3.6.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,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' 'python3_4' )
+	$(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/paramiko[${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-pycreds/Manifest b/dev-python/docker-pycreds/Manifest
index 81ae7cb033a2..bbd0443ff868 100644
--- a/dev-python/docker-pycreds/Manifest
+++ b/dev-python/docker-pycreds/Manifest
@@ -1,7 +1,9 @@
 DIST docker-pycreds-0.2.1.tar.gz 7555 BLAKE2B e9934a357cb59d995971f0d3b247e6d84efb9c105cbd71792b536fd98088a6e658361e9621360b79a3a1041cea3f063fb66d58124cca717d003f9253e2c8e908 SHA512 04a2dbd00c4e0a02bee13eaf23255e660b0e8640ef4225eff94e6c2391e5ceaf539b373ef932737dbc8eb4383746b374aca5a018a1f21c1eebb2f53160662338
 DIST docker-pycreds-0.2.3.tar.gz 8220 BLAKE2B db645de930becc3ad6ecb2d6476d36d1845fbaa55b7c6d2d6590e45036713b6e215b189e6ea961c31c0898e8f231943e05abe96a63c15ac43bebf0f7787b954b SHA512 d4199a48a0bda29ac6126ca9a196c0722667a744998b5f81b360066d48f1bd1f9e6e423df2b53e37117316f3dada6fa47e956c6d2c7d90f851d97a434dcb595f
 DIST docker-pycreds-0.3.0.tar.gz 8544 BLAKE2B 88a950d7fa027b221ffd999283cb6ee4b0f23115167f27f163085372abccc4d9d5dfeb03ab5d99449d607dc69212bfeb870130d0f91843cca6b9b338d0f4f9ad SHA512 5fa81b375c3ddb6527f416afb11688cb703f75dbd3b1a9efba0cf85e8b3deb903670c94933777b855d48d607596192c72e4d5be96f91ac8e8334e634abf8d2fa
+DIST docker-pycreds-0.4.0.tar.gz 8754 BLAKE2B 22aba2a2a7c92c4e0fa7fec5df1a17fabd9320440922f542a4e8dabf90ec71b9b8ff744a7ef1d46e7d720862624c721f5d2e4057edb48a85e329665c477b6406 SHA512 ca5f68ef2405cc57c0b54224d4f8199c9a4c9217d78f627bffeb950998b09a69b608d1e365cac6859661346fd078c3d081828bb4ff2e18bf7a9384451ae2225a
 EBUILD docker-pycreds-0.2.1.ebuild 519 BLAKE2B 163669f286f484704e07bb7a8e269fd7b694fa213de07218cc28d53a053c27cfac50fe56dfbe1c2c098ec7f70a8881059e799ef8c9e5109ca358c7143c6bbacf SHA512 501d271e7349a89be824682c648ee49bd60b2415d05907ff27a2039042321a5fe77f38e997907cfdf5a3fb8858c48b521b4ed0eb21b1e1c598068ee8d1510d41
 EBUILD docker-pycreds-0.2.3.ebuild 521 BLAKE2B e2b8e9ea03fb97feeb2533c66c2c549198eb641fe8d6b2360699a263d7afe5184cdbdd091c6ac7b89b9d59b10ee4ed9532257577e31e10ca429c56ccd986e221 SHA512 b633378703c2bdc61e0b3ef5d9995d72be6ce10762269be5065a8af77557236075316304b29fd73af4b07237c7c13b75a255386cdd314d6ed6d6a5920e3f7429
-EBUILD docker-pycreds-0.3.0.ebuild 521 BLAKE2B e2b8e9ea03fb97feeb2533c66c2c549198eb641fe8d6b2360699a263d7afe5184cdbdd091c6ac7b89b9d59b10ee4ed9532257577e31e10ca429c56ccd986e221 SHA512 b633378703c2bdc61e0b3ef5d9995d72be6ce10762269be5065a8af77557236075316304b29fd73af4b07237c7c13b75a255386cdd314d6ed6d6a5920e3f7429
+EBUILD docker-pycreds-0.3.0.ebuild 517 BLAKE2B 6826a94fa7fe4db34c07505e78169c9f70fc70862c8f0f75fc9f6d36f964a84514300dd5495878e003a216a9aafbb58a9624d4b6e5dfe448e036cfaf20367a16 SHA512 69cb9915555ec89e6c16be7ab65943994df8f612a2272e82f865a388266fd9ac70ed6664ebcad64eebeabdff2fd92a113bdcde594a0b580e5cfc31b69e961a93
+EBUILD docker-pycreds-0.4.0.ebuild 518 BLAKE2B 3862a140d928650d30a184217b31c37a4cf29489d1ff56bec9095489f73c9b91b06d4244f01c297691c79aadc6ad8f16186e30f0aa9147d60abe0d381ec413f1 SHA512 c40191163acb44774ea4af800f9c74d45b2b88fbd25681cd89497dc0dfdae78844782fdef37290dabf8225e34ec27bc9d656bfea8f5e441542572b945371b6a7
 MISC metadata.xml 355 BLAKE2B 2bef9deaf5ab89b1e703b43844c6ee639cbc427727587b118688ca5005a9156042eaf455891f3d27fe007793aeed75e8626a66e1b3a42ddc0ccd2f21747797dd SHA512 a980d256f1c5a3a76a486cc97bc9394b02dd5042e001a03b1aa4834b040fa9abe3626549d09f693aade8c269d818c4da056990b88a8f2f43fa0211a8c5cf4dab
diff --git a/dev-python/docker-pycreds/docker-pycreds-0.3.0.ebuild b/dev-python/docker-pycreds/docker-pycreds-0.3.0.ebuild
index cf82e0ccca59..9e9c940c5f66 100644
--- a/dev-python/docker-pycreds/docker-pycreds-0.3.0.ebuild
+++ b/dev-python/docker-pycreds/docker-pycreds-0.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/docker-pycreds/docker-pycreds-0.4.0.ebuild b/dev-python/docker-pycreds/docker-pycreds-0.4.0.ebuild
new file mode 100644
index 000000000000..fe226cc2add5
--- /dev/null
+++ b/dev-python/docker-pycreds/docker-pycreds-0.4.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for the docker credentials store API"
+HOMEPAGE="https://github.com/shin-/dockerpy-creds/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=">=dev-python/six-1.4.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/docopt/Manifest b/dev-python/docopt/Manifest
index e36f64006c30..7d17d24c6adb 100644
--- a/dev-python/docopt/Manifest
+++ b/dev-python/docopt/Manifest
@@ -1,3 +1,3 @@
 DIST docopt-0.6.2.tar.gz 25901 BLAKE2B b44308bb4a6571ddd092de63401d16e31a9d9b93be9b132fb45503eb9d84273d7c1f20bc5b2e3e2d969506fcf760fff142c37197e0b92dc9e7f6f431fb0abcc0 SHA512 af138feccf8c37b374ee44fcda4938a88107d434df13c173214021b1a3348b152a595095a86982b66ac03a11db8e0f1e9e6a3a65c98deea92330311daeb831a3
-EBUILD docopt-0.6.2-r2.ebuild 783 BLAKE2B 1b1a52edde01ad371bf7639a3ca048824594b9dc789ee91adfa06a72711766f4ac264e3be1667f46084abdf4b9b1ad89c0a2dee9b57abbacd90a35dc5d7a58c0 SHA512 a53579ebf10cbf0af0156377c84346efb9a43283977836e38651444daf95ff15455040079750ef11f1d1f34da5c0f38b5c6ed71729ca64c777a33be22f76391b
+EBUILD docopt-0.6.2-r2.ebuild 781 BLAKE2B b935fcfe2a63e30506dbc2b53546b82b782732f1b1f5d5137eaca7530ba0e5a71c9d4a35a2fb0c4c414ec84420e15cc953894bf9b960250097db8274469bc740 SHA512 b7f6c7da122c533a319d3ce084ef15aabf370b67b15cabeb4bb97f8a25ebd2162d03aaa982cb71fdd8e3a6a2b7453262b2ead1f92cc3536a371f9fab2727e82e
 MISC metadata.xml 374 BLAKE2B d1c77e8ce90431f3d8ddfa1adb0b016713e7f3d18feadb25126333973e0cd7341838a2082fbc99f0dfbb23a3d3416887211e3f7ead69eb3c7ec284b23e7a010d SHA512 a54f0d59a3cda28748bc2ec5546b29de60dc4dba144b57014636fef7b20c97d2b7b20f0ea8166cd8c9970b7434e43707359ceb76efb015a8a00d06a0786252b5
diff --git a/dev-python/docopt/docopt-0.6.2-r2.ebuild b/dev-python/docopt/docopt-0.6.2-r2.ebuild
index 92c9b8f77b03..f9d51fef540e 100644
--- a/dev-python/docopt/docopt-0.6.2-r2.ebuild
+++ b/dev-python/docopt/docopt-0.6.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/dominate/Manifest b/dev-python/dominate/Manifest
index 69a887d84ec1..06ca6899c814 100644
--- a/dev-python/dominate/Manifest
+++ b/dev-python/dominate/Manifest
@@ -1,5 +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
 EBUILD dominate-2.3.1.ebuild 606 BLAKE2B e59982d021a5797c993d4ea58bd57c831aca4a9c17901198af5c6477221f06dfe000b69f14f6367380ef95a91ea107318119bc91b122902119e18b904d2a29df SHA512 0319d71125e32159f0672c1c167e4c53f03f2076fab285b68e62a24b78bb93bf2f03e5e3efb8b4f6f65749882508e92cfd22aaddba8032ff953e6e767b1560e4
 EBUILD dominate-2.3.4.ebuild 605 BLAKE2B 48e0b5a55457b2ca26ca15cd356ecd60416abd72bc80f2782699783f2c5e10ed282e13937846a11167259a5320969afa4cb258a3931068a6f7b7d9a678c6652a SHA512 2b8a0b551234934af21f3e312c476c4a50049bbc34c054188140625bd32c440fba48cdb9f3bb012de41dfab001b36fedc01e655356332ed34da0d6bd9a6f7e7d
+EBUILD dominate-2.3.5.ebuild 605 BLAKE2B 48e0b5a55457b2ca26ca15cd356ecd60416abd72bc80f2782699783f2c5e10ed282e13937846a11167259a5320969afa4cb258a3931068a6f7b7d9a678c6652a SHA512 2b8a0b551234934af21f3e312c476c4a50049bbc34c054188140625bd32c440fba48cdb9f3bb012de41dfab001b36fedc01e655356332ed34da0d6bd9a6f7e7d
 MISC metadata.xml 771 BLAKE2B b57440fdd8bad6140d982af019944cc740ba47183908dc2505c1436448e735cd63f537b3ef2158b6014c4dc050128b13881b368ef9ed5e840b37f7e88ac72a25 SHA512 2af8875459291f59c07ece49ac0edeab74408f54031878c1b03581bdbcfcb509caf37ee30d03e2f86f59dd67aba62c54808ca5a6c67037717113c3bfb6f9961e
diff --git a/dev-python/dominate/dominate-2.3.5.ebuild b/dev-python/dominate/dominate-2.3.5.ebuild
new file mode 100644
index 000000000000..078ac80b939c
--- /dev/null
+++ b/dev-python/dominate/dominate-2.3.5.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6,7}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Library for creating and manipulating HTML documents using an elegant DOM API"
+HOMEPAGE="https://github.com/Knio/dominate"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+python_test() {
+	pytest -vv || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/dugong/Manifest b/dev-python/dugong/Manifest
index 6425ce9ea929..5f5a5eafd7de 100644
--- a/dev-python/dugong/Manifest
+++ b/dev-python/dugong/Manifest
@@ -3,5 +3,5 @@ DIST dugong-3.7.2.tar.bz2 206730 BLAKE2B f362208db26582a1d3681900e99b2143c779d4d
 DIST dugong-3.7.3.tar.bz2 206720 BLAKE2B 41dd349336ae37dd290c88233a4a1eed283a774a072396a03b0b97fe3aaca95a4aa90b2951ebc3d59c517221b1b1b77f90d64538f5a17fcc84fa927650af1fdb SHA512 b20b720fa18789ff137524b67dd7339ec3ad532cff164c03c74d38accc72e035d33ebe97df028f75d7d904f3d0d460f99edf7cf45abf9c4849a5a3a05529a7a4
 EBUILD dugong-3.7.1.ebuild 778 BLAKE2B 6009fb01fa66fd5cc61370abba8decddb266daa4cc3b46e3c462bad1ddee1e952a1e7a2465f8b83c543676e184019b113a4c9fed8d8ac2ac0d820ff876422d92 SHA512 be73a4ab89970d3fcfe2b651950eadab8ca3c7fc3652acdad632bb71874cb0faa3f673678c5f6f62a9175a5c73c391635ddadf2082371bc24b4429b09caeec73
 EBUILD dugong-3.7.2.ebuild 780 BLAKE2B 2a3ebb5e5d3d62cb96572e9d8c724158ac9ee282d6202bb81fcb1b32bafbcfdfc7aac28d0a03919a16e20b94e7d30f30b4bdd863bdef950bd5014f52716b165b SHA512 f0c8c62d4e17765bfb6c06a76d6be24b44e9e58c81cf7e222cd76899801f29277013cd81d0f3fec24a92408c3e2e3a3372e021d8ae0256aab704fd2ba07d71b5
-EBUILD dugong-3.7.3.ebuild 780 BLAKE2B 2a3ebb5e5d3d62cb96572e9d8c724158ac9ee282d6202bb81fcb1b32bafbcfdfc7aac28d0a03919a16e20b94e7d30f30b4bdd863bdef950bd5014f52716b165b SHA512 f0c8c62d4e17765bfb6c06a76d6be24b44e9e58c81cf7e222cd76899801f29277013cd81d0f3fec24a92408c3e2e3a3372e021d8ae0256aab704fd2ba07d71b5
-MISC metadata.xml 386 BLAKE2B 8a2dc259255a5fe345b1f1e04b1708bc34f7c31351b01b90a856b93604fef92be88bc75f7120dac1fb4f86f9aace962729a2d91e13094e5ee59b9c464280628f SHA512 9ac2081eb11077d2d9d7318410053fca1855abc8fe288bc18de829c1874e38c649620c56e2a7eb9fe29e41bed8dcb7c3327a2203c60511ab233a58d93f542db2
+EBUILD dugong-3.7.3.ebuild 840 BLAKE2B 5268347313f575dae9d14c7c11fcd78ce890d6ecd3246b58466fe82956b88a456d977f12270affbb1e0b812e5a52307a661fbbcaf419adef1130707f673b53cc SHA512 a43e44dfb77d31ff2d86cf360f9cd564b7cb1ea190b249b7b5ca15523a54b0cb6dae5955015ed6cc5a20e62d756f6f0b47766dd5ebd7d4029043bc2574f8aa41
+MISC metadata.xml 388 BLAKE2B 1453af784bebfeee692394cd0a211776e2379f34e058c7a6182d75a9331a4b7571c5398295f4159fe18e4864d29627aea06e6ea2b74f87140a5767f0ba3e0ed2 SHA512 c900862d3b1ff9e43faecd6144150a49179ff3dfdc83b82861174a233791c6df8e28c619ddf1b15e8ce6e193a9dc124d0860b8638ea57a114a9cb59bf10ef0c3
diff --git a/dev-python/dugong/dugong-3.7.3.ebuild b/dev-python/dugong/dugong-3.7.3.ebuild
index e1144b98f8bd..73cb6393ccbe 100644
--- a/dev-python/dugong/dugong-3.7.3.ebuild
+++ b/dev-python/dugong/dugong-3.7.3.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{4,5,6,7} )
 
 inherit distutils-r1
 
 DESCRIPTION="Python library for communicating with HTTP 1.1 servers"
-HOMEPAGE="https://bitbucket.org/nikratio/python-dugong/"
+HOMEPAGE="https://github.com/python-dugong/python-dugong/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2"
@@ -18,7 +18,10 @@ IUSE="doc examples test"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-catchlog[${PYTHON_USEDEP}]
+		|| (
+			dev-python/pytest-catchlog[${PYTHON_USEDEP}]
+			>=dev-python/pytest-3.3.0[${PYTHON_USEDEP}]
+		)
 	)"
 
 python_test() {
diff --git a/dev-python/dugong/metadata.xml b/dev-python/dugong/metadata.xml
index 2ae422c40102..63b91a9dfd94 100644
--- a/dev-python/dugong/metadata.xml
+++ b/dev-python/dugong/metadata.xml
@@ -7,6 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="pypi">dugong</remote-id>
-    <remote-id type="bitbucket">nikratio/python-dugong</remote-id>
+    <remote-id type="github">python-dugong/python-dugong</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/ebuildtester/Manifest b/dev-python/ebuildtester/Manifest
index ec24e1300487..08ad87fb6f22 100644
--- a/dev-python/ebuildtester/Manifest
+++ b/dev-python/ebuildtester/Manifest
@@ -1,4 +1,4 @@
-AUX ebuildtester.bash-completion 501 BLAKE2B 55a6ddf54f05c2958fad5d3abc6ea1cf65de1320e5cb6aff14eac2755b1fafaff1df6ea5e813135d66f96329c806a3a3db326f3ed988c09973f20297b6dbeacf SHA512 a5fd613548258585fd6ff9905f9fd4f87517d6821f4e5da8443f1f83a666ddcb40d0e09b305505894677c3f9feb1826e8f2e0ddb8af238000e3462d0da236530
+AUX ebuildtester.bash-completion 538 BLAKE2B b56fd67648a73b184c6965c1377066bfded9e3adc795a06e8a753dd27784b9171589119cc8c4e26dd0b03def5c0fb6668f9ef960f7f93da34e33c996373b923f SHA512 21c413a8aa7ddaae5e11c4f279f9c6ffd700e8fc3f64c1df6cd07087d5cd0e6097e193a01bc266ec669dbb3d516e1e6361c3e1461e8ee07ecd7cd4fae05482f5
 DIST ebuildtester-0.1.12.tar.gz 13608 BLAKE2B 4ba39f8317028f906da54aca3a3cab466eeeed9b223a93e56b25dd8212c5266e593dbfdc96f8babfc3569bd9bf676ca255636ca1d285481972a794dd9d8208bf SHA512 62d9245c0e6dc428d3def73266aea83b73659318a5a771062b5dddb634398bab62ae12d8588c247377e84a4ba4088b0ef0cc86ff1d5774a306c43af8eb6fdecb
 DIST ebuildtester-0.1.13.tar.gz 14687 BLAKE2B d88c739707e6bc0dabaf5f03eb94a55c98f73b2dd23f311df6101556899b9ddebc4f9d40715ab9d2c2a01018fa121589e707afc28b59f18378690a9176b48c75 SHA512 88ebe3218d795e395eca2d048f74bbc0bca7c304e3b70d5a04e07256e8d8ae66feadf37d196f46523b9589ec9748aa47f8807e15479b9dd9f42871819f1523f7
 DIST ebuildtester-0.1.14.tar.gz 14601 BLAKE2B ccd2b921524dfb2d6bd1de862292e4f918d14acc806838018f2571a691be5f8226c5666a53e367ca687b3153ac8f568e13b3112a514afccb24c182c96535be81 SHA512 e01a614b00df8e1e5bc5a25e61cb2154c4f39caf2b42b2ba3c8d69341a3f105fa80988f6afff305a96a91d277b6132f00426cac290893d16d2ca2f37f4573011
diff --git a/dev-python/ebuildtester/files/ebuildtester.bash-completion b/dev-python/ebuildtester/files/ebuildtester.bash-completion
index b8e7cd27c393..ca0266720622 100644
--- a/dev-python/ebuildtester/files/ebuildtester.bash-completion
+++ b/dev-python/ebuildtester/files/ebuildtester.bash-completion
@@ -3,7 +3,7 @@ _ebuildtester() {
     COMPREPLY=()
     cur="${COMP_WORDS[COMP_CWORD]}"
     prev="${COMP_WORDS[COMP_CWORD-1]}"
-    opts="--help --portage-dir --atom --threads"
+    opts="--help --portage-dir --overlay-dir --update --atom --threads"
 
     if [[ ${cur} == -* || ${COMP_CWORD} -eq 1 ]] ; then
         COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
@@ -11,7 +11,7 @@ _ebuildtester() {
     fi
 
     case "${prev}" in
-        --portage-dir)
+        --portage-dir|--overlay-dir)
             COMPREPLY=( $(compgen -o dirnames -A directory ${cur}) )
             ;;
     esac
diff --git a/dev-python/elasticsearch-curator/Manifest b/dev-python/elasticsearch-curator/Manifest
index 071f2a101938..cba63741d0d6 100644
--- a/dev-python/elasticsearch-curator/Manifest
+++ b/dev-python/elasticsearch-curator/Manifest
@@ -1,7 +1,10 @@
 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 3229 BLAKE2B b43563ab3e0cde11ce7823a0dfc5ac2dfe6d3ebfe726859734153a63007a872d4b6ca74a8988aeb59cb8e502a8c479b4fb4e212b4eb711ee100f99cd8cb4741d SHA512 35f0749472eb1117d6086b2f0733f4d5c191ecc5e0270ddc6a3b03f9ab1955592d2417b1fbd29f546b231cd718049a782b2ba86aef0869d99d64702e20c5ea5a
 EBUILD elasticsearch-curator-5.5.4-r1.ebuild 3668 BLAKE2B 7837b30184aab7429a5ffbb2ce5c6f44fa8337d40a6bc5f5c9589660931971c30b02d381963be36c096c515187e6225342b048a07aa6473b4770e0b010cb7d32 SHA512 1d34151f0f4829fa7ef28c527ff5c4d3c5d8db5acb45bdc134eedadb21db11be6a46748cdb83617fc19d484519a0e1021a586ff4a14da9efaa244545d70b6498
+EBUILD elasticsearch-curator-5.6.0.ebuild 4555 BLAKE2B 235b7a79ea754df7b64014bd4571f2987dc5e79ce8c1ba4a6ed6462c5cfb76cf1d861f96bf7e721f527b51233466207f1b60e7c5c600b43fbd1ea30870e3ab1e SHA512 dbe5a7122fd8b2f5276892f2da4cd949b810c961d74b3bc245021ac65b9aaccec952ced62eae107d7e3324b43650f0ab4cc41dd761256e6b3498edceeca08c77
 MISC metadata.xml 469 BLAKE2B 7c08e8c5ee97bee865afa27423349bf1998d868fea946d5d61b3eab77094a782d151677bac74f1b8c7ebbc4d88d323c3806251b463627994fcbda2a812524224 SHA512 38e98a77a6da51e077ac9a0dc77059276c58f56f8e26ca45a26df3ec16641dcb46ca9bccf85fd0dc9a358de1ac1424bfffd4cfc3d8213272ec6193663c89860e
diff --git a/dev-python/elasticsearch-curator/elasticsearch-curator-5.6.0.ebuild b/dev-python/elasticsearch-curator/elasticsearch-curator-5.6.0.ebuild
new file mode 100644
index 000000000000..b487b3ea3a55
--- /dev/null
+++ b/dev-python/elasticsearch-curator/elasticsearch-curator-5.6.0.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+MY_PN="curator"
+ES_VERSION="6.4.3"
+
+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-oss-${ES_VERSION}.tar.gz )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# tests fail in chroot
+# https://github.com/elastic/elasticsearch/issues/12018
+RESTRICT="test"
+IUSE="doc test"
+
+RDEPEND="
+	>=dev-python/elasticsearch-py-6.1.0[${PYTHON_USEDEP}]
+	<dev-python/elasticsearch-py-7.0.0[${PYTHON_USEDEP}]
+	>=dev-python/click-6.7[${PYTHON_USEDEP}]
+	<dev-python/click-7.0[${PYTHON_USEDEP}]
+	>=dev-python/certifi-2018.10.15[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.22[${PYTHON_USEDEP}]
+	>=dev-python/voluptuous-0.9.3[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/six-1.11.0[${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
+
+	# requests_aws4auth not in portage
+	sed -e '/boto3/d' \
+		-e '/requests_aws4auth/d' \
+		-i setup.cfg setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	emake -C docs -j1 man $(usex doc html "")
+}
+
+# running tests in non-chroot environments:
+# FEATURES="test -usersandbox" emerge dev-python/elasticsearch-curator
+python_test() {
+	# starts two ES instances (local,remote) and runs the tests
+	# https://github.com/elastic/curator/blob/master/travis-run.sh
+	local ES_INSTANCES="local remote"
+	local ES_PATH="${WORKDIR}/elasticsearch-${ES_VERSION}"
+
+	declare -A ES_PORT
+	ES_PORT[local]=25123
+	ES_PORT[remote]=25124
+
+	local i
+	declare -A ES_CONFIG_DIR ES_CONFIG_PATH ES_INSTANCE ES_LOG ES_PID
+	for i in ${ES_INSTANCES}; do
+		ES_CONFIG_DIR[$i]="${ES_PATH}/$i"
+		ES_CONFIG_PATH[$i]="${ES_CONFIG_DIR[$i]}/elasticsearch.yml"
+		ES_PID[$i]="${ES_PATH}/$i.pid"
+		ES_LOG[$i]="${ES_PATH}/logs/$i.log"
+	done
+
+	# configure ES instances
+	for i in ${ES_INSTANCES}; do
+		mkdir -p "${ES_CONFIG_DIR[$i]}" || die
+		cp ${ES_PATH}/config/{jvm.options,log4j2.properties} "${ES_CONFIG_DIR[$i]}"/ || die
+		echo 'network.host: 127.0.0.1' > "${ES_CONFIG_PATH[$i]}" || die
+		echo "http.port: ${ES_PORT[$i]}" >> "${ES_CONFIG_PATH[$i]}" || die
+		echo "cluster.name: $i" >> "${ES_CONFIG_PATH[$i]}" || die
+		echo 'node.max_local_storage_nodes: 2' >> "${ES_CONFIG_PATH[$i]}" || die
+		echo "discovery.zen.ping.unicast.hosts: [\"127.0.0.1:${ES_PORT[$i]}\"]" >> "${ES_CONFIG_PATH[$i]}" || die
+	done
+
+	echo 'path.repo: /' >> "${ES_CONFIG_PATH[local]}" || die
+	echo "reindex.remote.whitelist: localhost:${ES_PORT[remote]}" >> "${ES_CONFIG_PATH[local]}" || die
+
+	# start ES instances
+	for i in ${ES_INSTANCES}; do
+		ES_PATH_CONF=${ES_CONFIG_DIR[$i]} "${ES_PATH}/bin/elasticsearch" -d -p "${ES_PID[$i]}" || die
+
+		local j
+		local es_started=0
+		for j in {1..20}; do
+			grep -q "started" "${ES_LOG[$i]}" 2> /dev/null
+			if [[ $? -eq 0 ]]; then
+				einfo "Elasticsearch $i started"
+				es_started=1
+				eend 0
+				break
+			elif grep -q 'BindException\[Address already in use\]' "${ES_LOG[$i]}" 2>/dev/null; then
+				eend 1
+				eerror "Elasticsearch $i already running"
+				die "Cannot start Elasticsearch $i for tests"
+			else
+				einfo "Waiting for Elasticsearch $i"
+				eend 1
+				sleep 2
+				continue
+			fi
+		done
+
+		[[ $es_started -eq 0 ]] && die "Elasticsearch failed to start"
+	done
+
+	export TEST_ES_SERVER="localhost:${ES_PORT[local]}"
+	export REMOTE_ES_SERVER="localhost:${ES_PORT[remote]}"
+
+	# run tests
+	esetup.py test || die
+
+	for i in ${ES_INSTANCES}; do
+		pkill -F ${ES_PID[$i]}
+	done
+}
+
+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/enum34/Manifest b/dev-python/enum34/Manifest
index 889aa3ca31ee..f017e4e71a63 100644
--- a/dev-python/enum34/Manifest
+++ b/dev-python/enum34/Manifest
@@ -1,3 +1,3 @@
 DIST enum34-1.1.6.tar.gz 40048 BLAKE2B 3960e78f27f3ebf70e9aac5c4ced87d974cc61e5d9afe5d787188e3e877eece18153036035187e4d7ad63bf2a54c1c393f0f46f5ef7bcc9b67658b4ea441bb7b SHA512 51652525adc37bd1af1d81933f965dba9c508838d9f759c80ca1392991515a29c2c0263264a4e175b37a6ba11dca68c354774e448b19ef1bdba96be5474d93ec
-EBUILD enum34-1.1.6.ebuild 772 BLAKE2B 56fdffbd32ed69389e1e238863fd7906ee722c08741f4346079f23164e7264ad988fad03b8e14c7e342ac1559e5c924e2e9e44cf13316339d2fd0f6d8a6d94e9 SHA512 797e11f6b0aa20bd9fa8224814d985840ed3105ad87a42e688fae79e49b35a372360679939ba7672a10ef93f4e61e10e06c0cba7e27e7259ccd0c78c5c3bd327
+EBUILD enum34-1.1.6.ebuild 814 BLAKE2B dcef3d43f9070371feb1ddeebd0c9fe26ea0d8a148f552945b81a34d4d3fd05e957ea4adc89bf8bf4cf659e2a42f4b23a02b1ad6aed3dfde1113f039fc196ef9 SHA512 c2f289c5a6d1fd50b2018dbb325208f4444fc111006c304b0ecdf57f2e3e005fa4ceed9b960370331948437fcd5b9308c911c4c64b9308466a76ddd43f664860
 MISC metadata.xml 319 BLAKE2B 37b3564999c86bcff651225939b50aaba7aa54775af2bd02f23296204b49dcf8bc0434e48e05d820cda9c127983606ab1ecbec35a16dd7deebc9e32e3ed18422 SHA512 bca4e776e7253b8b88225336218101fe4ca88d41d0e597af7f0ca1129ee4916ee5a05dddc6ca1649b7cc3f62db654c9281b2616e807d6c178260296eebdc245e
diff --git a/dev-python/enum34/enum34-1.1.6.ebuild b/dev-python/enum34/enum34-1.1.6.ebuild
index e8abb317f929..2edcd4a2718f 100644
--- a/dev-python/enum34/enum34-1.1.6.ebuild
+++ b/dev-python/enum34/enum34-1.1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 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"
 IUSE="doc"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/filelock/Manifest b/dev-python/filelock/Manifest
new file mode 100644
index 000000000000..26b6734d414c
--- /dev/null
+++ b/dev-python/filelock/Manifest
@@ -0,0 +1,3 @@
+DIST py-filelock-3.0.10.tar.gz 587469 BLAKE2B 8a116f038f344f282540243a757524bd2e72ab8419a0cbdc35910245b8794cab0f96f93d7d8e3b267018054aa1459892506edc9cbfe1099d141a44be9eaa937a SHA512 1fa4594eaba6689ea61149a60a71e86007297614a1c22dc6c94b4774520d396ff8ad03076dfdbb2ce49d2b6e42c374af065a115c167d81cf6107918abfbe52ef
+EBUILD filelock-3.0.10.ebuild 953 BLAKE2B b5e6770ee192151f14c0ff3f00c72a67743f6d160898fcc605ff10581973eb538707682ce9e208d9519b6b9666005eeaf75dc6f87ef5c9fa44a37b69e928c258 SHA512 9db2862746aa9ec1c4422a03c746c2738620dfdd0525364a75061a59ca8e0d282b89242b919cff1bbadbee1295f733a2242ce8b4d52c3ea8154834cf9b21f43c
+MISC metadata.xml 356 BLAKE2B 795142cf645edcb80e9a087e62fadbab50c5db359946ec290dc0c0b1c4ae12a666a0dbba4b2212a27310339c783f0c13e0a28a42df45a4cc9e781674d9514fc2 SHA512 3617ad60e67b84ce0d36bb1caef8a6b1dfac31d487ead4887b70f575726974b27d73208cc8ca0039a2334c6deb6609cf8ed85c8404c6b3a4efe0ad7bbc69507a
diff --git a/dev-python/filelock/filelock-3.0.10.ebuild b/dev-python/filelock/filelock-3.0.10.ebuild
new file mode 100644
index 000000000000..04e239ae7c4e
--- /dev/null
+++ b/dev-python/filelock/filelock-3.0.10.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy{,3} )
+inherit distutils-r1
+
+MY_P=py-filelock-${PV}
+DESCRIPTION="A platform independent file lock for Python"
+HOMEPAGE="https://github.com/benediktschmitt/py-filelock
+	https://pypi.org/project/filelock/"
+SRC_URI="https://github.com/benediktschmitt/py-filelock/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="Unlicense"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	# test_del is relying on CPython behavior, so it breaks PyPy
+	# (and it's not very valuable anyway)
+	sed -i -e '/test_del/i\ \ \ \ @unittest.skipIf(hasattr(sys, "pypy_version_info"), "del() does not trigger GC on PyPy")' test.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	"${EPYTHON}" test.py -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/pyramid/metadata.xml b/dev-python/filelock/metadata.xml
index 84db2104ecb4..8684444c6ace 100644
--- a/dev-python/pyramid/metadata.xml
+++ b/dev-python/filelock/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dolsen@gentoo.org</email>
-		<name>Brian Dolbec</name>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
 	</maintainer>
 	<upstream>
-		<remote-id type="pypi">pyramid</remote-id>
+		<remote-id type="pypi">filelock</remote-id>
+		<remote-id type="github">benediktschmitt/py-filelock</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/flaky/Manifest b/dev-python/flaky/Manifest
index 092bd73ebcd3..a270e5e42265 100644
--- a/dev-python/flaky/Manifest
+++ b/dev-python/flaky/Manifest
@@ -1,5 +1,5 @@
 DIST flaky-3.1.1.tar.gz 29136 BLAKE2B fe2f47356e0279885cc294f22bc4588b502c7ada1d3f7a3728b1e3127f011f5900187669bb4e0755e706a1bd77e1804c42986a07c6d3dc58fe085967adb6957c SHA512 039ad115a52b8b3a31bba045874e1860f1e04ea9cf878316226fb22af3c715b3893570c2f7380cf8467107f1a83a4ff69d0e9135daeb2dbea4b8f873a192815c
 DIST flaky-3.4.0.tar.gz 29197 BLAKE2B 8f551a414cb06f5259d37785eb769a77105b1039398462288eeaeeb6acea8456c30cc7da6cf515cd99be2adb19a77282d2d0d3abe795761985f45ffd062de508 SHA512 14fda6312e4eb8260a8190204622a7dd274d0c946dda07ec8aa65e8c341f7f4a701c704c807f50eacf77589231b37c3bb06eec18d60a718f24e9b0182f7e8cb5
 EBUILD flaky-3.1.1.ebuild 1388 BLAKE2B 058e0db9e1c5345bff3d535b695ec9c367dadd2cdddfc9e01cf5bc7804c2000f9049e5b88dbc7edce1f3ef29dbd47cb24bd0858d083fded692039df42bc4e26f SHA512 4e788de38ad4cfd9141983e33aa9c0e60aac16958f6f410cdf23afb5bc7838b50b631b8a55a37272381f211782c5084a732db8fdb2155c9cf88d79a2625b4b1c
-EBUILD flaky-3.4.0.ebuild 1412 BLAKE2B 7ef25fda15bbb6a2472b90c8431639ad37b83e20791afe9b4a777d547f4cef9f33f2a93c261dfeb557041e1b68c301b23bc77bcace218c4572ac342a1cb748b0 SHA512 b5e198530ebc39d1f6efe14593ab5d027ff0eccf223e3657e32630a3e35448014ffdeb5162b4b39bc1da18e69e9ff31889384b175a7663be1643e9b30269ed76
+EBUILD flaky-3.4.0.ebuild 1467 BLAKE2B 7f67f007889ef7c559c0fba0256319a79346a8186db576db9eba6ad05f6c5c52b008188245848dcc950f493e96da0acc00fd2c451b73a219c6a25c104945978f SHA512 0fe0a76cdf49f63716f30f6a3bf32f984490ddfe9f8af6ef85fdd6e863df4372024fa5e0715c915cd97e4697a26f5a551361f771e8df3f67c249fe7f5dd6cc68
 MISC metadata.xml 369 BLAKE2B ffa607acfbc98fc2e539492f87b55cedb039b39b3cdb7ce07cf9dcebe1a1559296284b27d06fc6262f362c0ea8577e23f4bef07ffd01a94c4d981fa060384d5a SHA512 da1597d14b2e3f9bc56e48064718a2a52bc1615d982d679d8c971f1fb1b9c25169d5412f99542f808fa42f958e1bb589e7615a13077a7d1b0574acbec1d4b1dd
diff --git a/dev-python/flaky/flaky-3.4.0.ebuild b/dev-python/flaky/flaky-3.4.0.ebuild
index 7f4a1830a440..83d2133da872 100644
--- a/dev-python/flaky/flaky-3.4.0.ebuild
+++ b/dev-python/flaky/flaky-3.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/funcsigs/Manifest b/dev-python/funcsigs/Manifest
index 939425d623e8..9edd53fd28a6 100644
--- a/dev-python/funcsigs/Manifest
+++ b/dev-python/funcsigs/Manifest
@@ -2,5 +2,5 @@ AUX funcsigs-1.0.2-fix-pypy3-tests.patch 3154 BLAKE2B face7accdd8bc2c5d3ab9dbcf9
 DIST funcsigs-0.4.tar.gz 25697 BLAKE2B 0b57ac0ce3aa8ff16724af9be94f297c15c94ed9083e2dd78796f134054db0e5f8213d1671352e0122a90bb2e8da78937c7a44f2e231b64de29afbb0dcf8b6d5 SHA512 64d821e94049ae906b9e5c8a2590f80a7d1d819554258e20f4170207576e5c8f65d32759a3f65bcb05fe721fa502658ff5767cd435932ea926c792c62ebe96d5
 DIST funcsigs-1.0.2.tar.gz 27947 BLAKE2B 3006d46018ae040b930e397c3f11575ae0ef18a8b2c9b6c10075804d83d23bea1fb81179de85180146673e0bd4c775a68c0ff624cdaceb1894efe5b2c8fd753c SHA512 4e583bb7081bb1d6c0fe5a6935ca03032d562b93ef5c11b51a72ce9e7ac12902451cc2233c7e6f70440629d88d8e6e9625965ee408100b80b0024f3a6204afda
 EBUILD funcsigs-0.4.ebuild 645 BLAKE2B 6a24bab1b1d13f1a234e56f8a6ee5e50b418347f6efd3208949f1c9c5aee771028fc1d24df5c31ec9618050bb044a0d1c8e451c6783bdecd9c61bb2d0ec98da7 SHA512 a23d3c084c6d5f9893cecc4e82c2598d4e116cf0763229d75658ef23ab8669d3869d30ff864f53520cbdb22e2359d66b6124aae80cb5458972d40ca117eb0014
-EBUILD funcsigs-1.0.2-r1.ebuild 894 BLAKE2B 33de8c84787434d4fb2facac7e011bffe02ca376843ab035d2fde09d7e0e8cd3293fd44b7c717b06c7a14a81cc15160ff105c2a9477303c991d928c65ae83c08 SHA512 8443c62b805fb03a139c621d6c05fe5ab27634e3408da7568ceb8411cdf0e0f1b130319290eb1924588bb448fa70d7a0cdbb39b9d35331fd9e88c33a1613aa89
+EBUILD funcsigs-1.0.2-r1.ebuild 949 BLAKE2B 6523415ce7449027b83a98d2477054453143518fac88f4abc8f88d5386c96ce90f227fc08dae6100ddf1722b5b5ba9ac6e2db8d356899188a9b34f2646a0e687 SHA512 9c0fdd837c323421c25a3d930fbcee390701616b10cb0f0a8dd301e45ac9d99b82085d0de97583d86de439323cbb5ae6a51a3ad885b03a0e9b99966d6450bf38
 MISC metadata.xml 321 BLAKE2B 8aa6245455756e5d3a197dfb37bb706551ff8ea0c6beb047d0c59c54d2ed74853e6d9857d37a531a5313a7a85a0849f5e0b308a58fa98a3cce6040b5b91a1a80 SHA512 a3df23a85e33881f6ac0da0b0e33fd69de760c79e636574982606964134d303bfa219f429006a54ad71622c05c07b6eb233a1e8918f4703257b0e8c389acb6d8
diff --git a/dev-python/funcsigs/funcsigs-1.0.2-r1.ebuild b/dev-python/funcsigs/funcsigs-1.0.2-r1.ebuild
index 39da5c75617d..b49ffe6c99ab 100644
--- a/dev-python/funcsigs/funcsigs-1.0.2-r1.ebuild
+++ b/dev-python/funcsigs/funcsigs-1.0.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-python/gitlabform/Manifest b/dev-python/gitlabform/Manifest
new file mode 100644
index 000000000000..2c06062e92f3
--- /dev/null
+++ b/dev-python/gitlabform/Manifest
@@ -0,0 +1,3 @@
+DIST gitlabform-1.0.3.tar.gz 19248 BLAKE2B 6ed3c38173e6202b5c76061416e5e4508be91ee8efebbe9af0d3131d3500fdcf79fab5caadca07076cb24a69fe3d5ac796418a31f00dd9b8de2c4de9b2340bd1 SHA512 8e79f584af9c5dadba0c1b92cf44214695f07e8e2e4eb1c81632c2aadfee7849d5e65c8a0f8f358864a34dce4f059570eda378db8700fae2c3b443d1af785c21
+EBUILD gitlabform-1.0.3.ebuild 846 BLAKE2B dd63ba6969847c97c133e15dc42f376598b9f0e7b4a89fbc352054ed608ebaa7492be91032fcadc7be089627c2c0bc688b9b3393863990a4d7cf6111f88d2cf3 SHA512 7bbe48ffc9956dd36c9d37599b253f1f7607bc1345dffe39192c5972dfd0677686bd3cc01fc9a3161a28492d9959cc7b197bb28c7104b276f019b300b1a96096
+MISC metadata.xml 300 BLAKE2B 8f67fcdb13c36ed0169762cba3ac1cb5bd5d090f784f8a535e34f9d62774790dcdecf18f93a70829c6d70ba22b3061e7c9764afe34755474302c0df85eb16cde SHA512 0f23dd252dc9da695e45a9ad35d01029b71d658e9802f46744a65dd21195a95d3af5987721de65f198a8c7c5bbdfcccbd48216c674d25fa24aa581552b426126
diff --git a/dev-python/gitlabform/gitlabform-1.0.3.ebuild b/dev-python/gitlabform/gitlabform-1.0.3.ebuild
new file mode 100644
index 000000000000..a3edec3e8a46
--- /dev/null
+++ b/dev-python/gitlabform/gitlabform-1.0.3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Easy configuration as code tool for GitLab using config in plain YAML"
+HOMEPAGE="https://github.com/egnyte/gitlabform"
+SRC_URI="https://github.com/egnyte/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	sed -i -e "/pypandoc/d" -e "/long_description/d" setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	pytest -vv || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/pygoocanvas/metadata.xml b/dev-python/gitlabform/metadata.xml
index 08a5bd43f9b9..62fff33a16d3 100644
--- a/dev-python/pygoocanvas/metadata.xml
+++ b/dev-python/gitlabform/metadata.xml
@@ -2,11 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-		<email>gnome@gentoo.org</email>
-		<name>Gentoo GNOME Desktop</name>
-	</maintainer>
-<maintainer type="project">
 		<email>python@gentoo.org</email>
-		<name>Python</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">egnyte/gitlabform</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/grpcio-testing/Manifest b/dev-python/grpcio-testing/Manifest
index 110e38b4d3d4..6ce166e3a6bc 100644
--- a/dev-python/grpcio-testing/Manifest
+++ b/dev-python/grpcio-testing/Manifest
@@ -1,5 +1,9 @@
 DIST grpcio-testing-1.16.0.tar.gz 12533 BLAKE2B 98238dc7aee745b210356e999c6048b028ceed8ee2f356557808b4567fc4cf2f90a111e6cce36122cf3294fa5f4b3be1c5ac6659ad6fa97d26e1bfecf4d9b5e6 SHA512 88d33629ccd6c4d4865a9d643c44f074246d01c0c84d57b06bc011e22d4d735261e4a959720512ca03e699a6e1d26eb0c19997a65f52b5cdd199b22072c2d020
 DIST grpcio-testing-1.16.1.tar.gz 12262 BLAKE2B 06790ef800a256fcd3073e32df455f97ff2528a6a10b661527b3a306adad3828e835c903c0fb4abf4e829ccfb4481b5334c87d021fb83d12a0f308dfc09d39da SHA512 2e1026569b694e555cc84bcbf0389e50d35955bade2ca5614289de0994cbf9d128b649ecd1813e45f8ab79ee4efd77382ed669cba5bcfe8317aa9f774e0e54b2
+DIST grpcio-testing-1.17.0.tar.gz 12317 BLAKE2B 47a7e6c9db330e9450119c1d9d118c7b20100292feb0f9d072400a765e89aaa7a14ef82802a35325d92e03c97cc8d6302be824d8f3ac6cf29821aa4c714bb4ca SHA512 585546f3bb78ac5399073426c65053581fff7abafef16e4e5e17afde17ca751702e6d6c1cdfe8aa8075c55291bfbb93630005cdaae5525a14ab915437d6e41f5
+DIST grpcio-testing-1.17.1.tar.gz 12422 BLAKE2B 015a756c04db0d6a67b954c36c7d725a58d1fcbb7529f5ed50dab7c291abd7f0ce0d18e617f496af161356167fb4b448a5cf431a5a0f6346f12a8dee83a4615a SHA512 3b2ef6c2f43fc8aba270bae72de217f063d987940c965ece6bcce1025c0ec9c181e90bb905a0a6ba675ca7f06b8795250c910945173c189486414770bb02b25f
 EBUILD grpcio-testing-1.16.0.ebuild 515 BLAKE2B bc5660b9b881543b45138e3d0803c96bd37787f8defece62ede3bba2d93490ed0e77a9df59d2a881523af96e57cdd72f96be18197c0fc0f026f8806125c15cf4 SHA512 2eb83dd4a73f6f51708bcaddafb702c580d20c674fbccc8c8bc959f7f2b530a67bf4700a4e2545c94ba405f5e0b3a07ffd97a9eedf876988e6c26c14a16f94ea
 EBUILD grpcio-testing-1.16.1.ebuild 522 BLAKE2B 51f1840a6f3dfa39f6c35768c0254967f949be53ff37dd7284cd6fa5f7de3ff95a6719b6faada3d6cf914d4298b63c725c76c666527d2e4301c2e116ca76632a SHA512 5bb33b143942af94a486ab9562889f3e9bad576ed1d137e870fd692665bdf739b56ccf2fb77a84a8dcbddf973b59fcb6cdddcf940ac2a64d9710ed48d1527e4d
+EBUILD grpcio-testing-1.17.0.ebuild 522 BLAKE2B 51f1840a6f3dfa39f6c35768c0254967f949be53ff37dd7284cd6fa5f7de3ff95a6719b6faada3d6cf914d4298b63c725c76c666527d2e4301c2e116ca76632a SHA512 5bb33b143942af94a486ab9562889f3e9bad576ed1d137e870fd692665bdf739b56ccf2fb77a84a8dcbddf973b59fcb6cdddcf940ac2a64d9710ed48d1527e4d
+EBUILD grpcio-testing-1.17.1.ebuild 522 BLAKE2B 51f1840a6f3dfa39f6c35768c0254967f949be53ff37dd7284cd6fa5f7de3ff95a6719b6faada3d6cf914d4298b63c725c76c666527d2e4301c2e116ca76632a SHA512 5bb33b143942af94a486ab9562889f3e9bad576ed1d137e870fd692665bdf739b56ccf2fb77a84a8dcbddf973b59fcb6cdddcf940ac2a64d9710ed48d1527e4d
 MISC metadata.xml 462 BLAKE2B 159e29c960dba2f197de7e1b8eda84162039ecdb35777aeb00314f8af9a7bc0771071e63a1528c922519568594f06971b228036914500d2ce3d33b411ddf0685 SHA512 8326b0e1b98c2921b461ad44663711318f2c48e4e411380de4b4bb26fca11d726d627fe47ccd0d1149348b55aa9391d97d144f654d016a1fccb34791f5850487
diff --git a/dev-python/grpcio-testing/grpcio-testing-1.17.0.ebuild b/dev-python/grpcio-testing/grpcio-testing-1.17.0.ebuild
new file mode 100644
index 000000000000..85f8ae2dfefd
--- /dev/null
+++ b/dev-python/grpcio-testing/grpcio-testing-1.17.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+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 ~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-testing/grpcio-testing-1.17.1.ebuild b/dev-python/grpcio-testing/grpcio-testing-1.17.1.ebuild
new file mode 100644
index 000000000000..85f8ae2dfefd
--- /dev/null
+++ b/dev-python/grpcio-testing/grpcio-testing-1.17.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+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 ~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 73178928faed..236e7c02cd23 100644
--- a/dev-python/grpcio-tools/Manifest
+++ b/dev-python/grpcio-tools/Manifest
@@ -1,5 +1,9 @@
 DIST grpcio-tools-1.16.0.tar.gz 1893006 BLAKE2B 01224d6af05a87e23609d47e5fefeb4784b0ac63cc1198e9f81de03b0b0fed5b2e2d706a486627c1d0e770ba66fe7be00dd98b866fb98e1d14299302a080e3b7 SHA512 86b66242d17d52d08ebb0861d08bcda4dc90fc142d2777bf99d0e4bce72049f88edd5d2ea52c2b33b9a77d94ca8961d877a97ed614766a3061528d41c96e6e96
 DIST grpcio-tools-1.16.1.tar.gz 1887741 BLAKE2B 721746ff5febd743ca56f6e5265fa7066ca1c940ec7b73f2978b2360bc3f4076a72b4bea44fd808e59713d06879beeb43ae38e176ceeee204e0159ef2540324f SHA512 73652b3b317f216a1b3e6d94499888ba9410dcf44ed11771b359fc363eef6878f466385800cfb856fdf956b275a5356f4984e68a16a7ce8b29ea5c278f17d9fc
+DIST grpcio-tools-1.17.0.tar.gz 1902697 BLAKE2B 35aa9134dd9ad929925b32f8c1215564d59cf4cfd81762b59413b9fc25d150956997c0e0edf80b0c7323a830331d1ad5c24a4374c03ae3f682511e3f76a1a8b4 SHA512 49042e085f0f961ad4f0d5c017cb57d6d54b1ba9baf990be09130cf08c67088f528d0c9a761bcfaf36eb14a0e1dceaebda15b03b4f6b519ceb076626c6e0cc4a
+DIST grpcio-tools-1.17.1.tar.gz 1900052 BLAKE2B f84f9b7f52eab6758321d50aeafc25cb31c100ff63176cedac16514d223192d1e38a8903c809f3e89c18485c1ce129ee50e2cd8ec751b98ad4b7ed3f19cb3080 SHA512 50412305314ae5ef284b01b1afa19778233cb97df755a9896c881730da45455c7dd1e82798ba88c63ffe8f478f93f326d06c7a8575d3ea4c4ac3d10467087ef7
 EBUILD grpcio-tools-1.16.0.ebuild 673 BLAKE2B e78528704ddd3ee06b2ba4db44e77aad89d55110078ee6e02d337262e1fc74f59f8eeaa22ef0c9404f7131db8d42491ceb35d9fb7c35ee16bc714724b5ab63f0 SHA512 53072ae2af6fa9e63a827a4e580678ccc7de489d7cded9ba3980440abb8a148d4e55941b295d7b9a5bdba591367956fcf50241467a5f3b54f2c7f86226a43191
 EBUILD grpcio-tools-1.16.1.ebuild 680 BLAKE2B 9123e2777429525db1d75e702d606e8fb514f0ebbef64c249e3e9e3806fd9b434a57eb0f8095f09761b7ee2f2187ecc42fde178655419351a05f4f62383e3f3b SHA512 c6e093fa343fbc8df84193aa860ae33b30d42a3853819bf0b28976cad4b793ca4d1e1968d539b3f36941fab8da9e403b441b750f6b649067b7fe4ba248a4072a
+EBUILD grpcio-tools-1.17.0.ebuild 680 BLAKE2B 9123e2777429525db1d75e702d606e8fb514f0ebbef64c249e3e9e3806fd9b434a57eb0f8095f09761b7ee2f2187ecc42fde178655419351a05f4f62383e3f3b SHA512 c6e093fa343fbc8df84193aa860ae33b30d42a3853819bf0b28976cad4b793ca4d1e1968d539b3f36941fab8da9e403b441b750f6b649067b7fe4ba248a4072a
+EBUILD grpcio-tools-1.17.1.ebuild 680 BLAKE2B 9123e2777429525db1d75e702d606e8fb514f0ebbef64c249e3e9e3806fd9b434a57eb0f8095f09761b7ee2f2187ecc42fde178655419351a05f4f62383e3f3b SHA512 c6e093fa343fbc8df84193aa860ae33b30d42a3853819bf0b28976cad4b793ca4d1e1968d539b3f36941fab8da9e403b441b750f6b649067b7fe4ba248a4072a
 MISC metadata.xml 476 BLAKE2B 62016e9a321f9c5b06d8a473d75b5efca8246df90ef9a67a33c02c416c58a8ee1be875cd54567d55bc9f10ef32082e11c01a9f1550293137aab8942e05dcf744 SHA512 cedbae8a8d9d7c6689c676c433aa6fea3c16d41911e0ee4a30929dbf2adb8ff72a2f0d81f996196a3b4090f8a5103a54eab4c651b359f9487d59955a6861152d
diff --git a/dev-python/grpcio-tools/grpcio-tools-1.17.0.ebuild b/dev-python/grpcio-tools/grpcio-tools-1.17.0.ebuild
new file mode 100644
index 000000000000..e7664411391f
--- /dev/null
+++ b/dev-python/grpcio-tools/grpcio-tools-1.17.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+inherit distutils-r1
+
+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 ~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_compile() {
+	export GRPC_PYTHON_BUILD_WITH_CYTHON=1
+	distutils-r1_python_compile
+}
diff --git a/dev-python/grpcio-tools/grpcio-tools-1.17.1.ebuild b/dev-python/grpcio-tools/grpcio-tools-1.17.1.ebuild
new file mode 100644
index 000000000000..e7664411391f
--- /dev/null
+++ b/dev-python/grpcio-tools/grpcio-tools-1.17.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+inherit distutils-r1
+
+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 ~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_compile() {
+	export GRPC_PYTHON_BUILD_WITH_CYTHON=1
+	distutils-r1_python_compile
+}
diff --git a/dev-python/grpcio/Manifest b/dev-python/grpcio/Manifest
index cf7c75a498f8..b08ed2c36cc1 100644
--- a/dev-python/grpcio/Manifest
+++ b/dev-python/grpcio/Manifest
@@ -1,5 +1,9 @@
 DIST grpcio-1.16.0.tar.gz 14519470 BLAKE2B 872ef15a7994303ce7ac0a573e49c94260eb8480d8ee94e25471ec9395827fafd3f5e3bd6f4793eb15091827e6d780b8dd6d01f38eef85db80fb234a710f370b SHA512 37d5940f1543cebdabf2b1340a042f98e5f321c42d92d05c88631c0eae42d94d3fe86893a21704a22b70c1fbd70bf091c1af2b51cd5c1d316dd8f0a586fb0eb7
 DIST grpcio-1.16.1.tar.gz 14514047 BLAKE2B e4fc7f196f3e377afb0a103aca60337dd63b3b0f84846e7e2a4622a0102d4300782f08367e1429e1fd021dd90b151f17dd927a25a749f35724c7d2a41a6943a6 SHA512 efd7fb36a61e2ee872c0807a8198cabe8f1f9003bd5bce7cd46c75541752c0f745db02bbfe3f37f572531e15df60913f2b08b678545f176fe683f3e64e22124f
+DIST grpcio-1.17.0.tar.gz 14563132 BLAKE2B fd9b4f1f0ce4b42c56edcda35e1865627ded48de74c828020547340cb2417df576705187cb4495668a10b603f13f0b2fdaa030aeccdfa8cd2a6e0b4e7574bcf9 SHA512 2af696639bd995e8df905bdec88f8d4c9d1973282438181474c9662cb9e72916cd5fa843ba61ecb90d834e5d7d70c063c4b81aae889be1bf9d3f0ce804440305
+DIST grpcio-1.17.1.tar.gz 14563233 BLAKE2B 61ccfaa967ee348f02f5a201e4f36f25d4fa09a1af11c6b5a0f345d13bf86f0fb12c3aea125c5bc27925698e0a23a9592806fe5db92fa37360cdcaf88e596189 SHA512 bf8dc6b7ce2f4a0765377fbae085395caef9f0cd0a2b4a779b3bf1667c6aba5fff034168bff9539f96dea76b2c97d7586305715c850d10e54918337458a4ee95
 EBUILD grpcio-1.16.0.ebuild 923 BLAKE2B c1958ba9f6c2071dff53d33799edc6dfca1ea0a493ead17508ca8c3d4863bdaaa6b4ac8954cac203759f2060b7ac5f4e791ce7043e40119dfc82fc9c4847d121 SHA512 3013e475948cbcca3e37c06aa7c06b326574a32cf8231d4785a7bbd66066de336daa23b432eb5dd210b32b8f4786f5b86c50a94df7df8af4a0f3535022ea8677
 EBUILD grpcio-1.16.1.ebuild 923 BLAKE2B c1958ba9f6c2071dff53d33799edc6dfca1ea0a493ead17508ca8c3d4863bdaaa6b4ac8954cac203759f2060b7ac5f4e791ce7043e40119dfc82fc9c4847d121 SHA512 3013e475948cbcca3e37c06aa7c06b326574a32cf8231d4785a7bbd66066de336daa23b432eb5dd210b32b8f4786f5b86c50a94df7df8af4a0f3535022ea8677
+EBUILD grpcio-1.17.0.ebuild 972 BLAKE2B 67f25fa6beb4d2da362b74bd914f692a19b252324065fde5150b74fb150faa11cebcc55fc7dfa241611125d61097dba60f1d9b068c3efb42f13a06d11a675197 SHA512 2542aee7268e2bf44f6133e34538ada3d2b65a0b86d7728bb0b05456ae7df4e95f6c0d1443168fc88d5a717dc5ce4fea4ccb5a841789b52353e9e1a368da937e
+EBUILD grpcio-1.17.1.ebuild 972 BLAKE2B 67f25fa6beb4d2da362b74bd914f692a19b252324065fde5150b74fb150faa11cebcc55fc7dfa241611125d61097dba60f1d9b068c3efb42f13a06d11a675197 SHA512 2542aee7268e2bf44f6133e34538ada3d2b65a0b86d7728bb0b05456ae7df4e95f6c0d1443168fc88d5a717dc5ce4fea4ccb5a841789b52353e9e1a368da937e
 MISC metadata.xml 470 BLAKE2B ad01d702b7a0ffe570bd30f50d47bb4fed725fbdff6f838acc54ac767d0cee88bb28bb0642f804fb04858d36a63f8ff7e110e4ae1dd26b8eb539b0a5c77cf5d0 SHA512 bf26387089977138bcf6be78b469bb412988e96c6bf5b4a9897f452378ce71fab1012a7d9268fb55f2883bc9636b712b59abe5498ffdcf199417d97fb09cd90b
diff --git a/dev-python/grpcio/grpcio-1.17.0.ebuild b/dev-python/grpcio/grpcio-1.17.0.ebuild
new file mode 100644
index 000000000000..ef464d3ecc68
--- /dev/null
+++ b/dev-python/grpcio/grpcio-1.17.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+inherit distutils-r1
+
+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 ~x86"
+
+RDEPEND=">=dev-libs/openssl-1.0.2:0=[-bindist]
+	dev-python/cython[${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}]
+"
+
+python_compile() {
+	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
+	distutils-r1_python_compile
+}
diff --git a/dev-python/grpcio/grpcio-1.17.1.ebuild b/dev-python/grpcio/grpcio-1.17.1.ebuild
new file mode 100644
index 000000000000..ef464d3ecc68
--- /dev/null
+++ b/dev-python/grpcio/grpcio-1.17.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+inherit distutils-r1
+
+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 ~x86"
+
+RDEPEND=">=dev-libs/openssl-1.0.2:0=[-bindist]
+	dev-python/cython[${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}]
+"
+
+python_compile() {
+	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
+	distutils-r1_python_compile
+}
diff --git a/dev-python/html5lib/Manifest b/dev-python/html5lib/Manifest
index d2cf27975160..920ab698347a 100644
--- a/dev-python/html5lib/Manifest
+++ b/dev-python/html5lib/Manifest
@@ -3,5 +3,5 @@ DIST html5lib-0.999999999.tar.gz 245488 BLAKE2B 3d2409f18e7ff6b6882e163b782703a7
 DIST html5lib-1.0.1.tar.gz 252959 BLAKE2B d2a9fa19d6a18b9e0c39f737a22ff4d5a6533734843f787c083f9497fd94788dad0e1e96478fe48b262c208370cf58e91ab94cc06a3e2757a40e936363cd3148 SHA512 35939b4450893864da04e735ee5e0addacf1dd34bae6a6909c76572abf6bfded446a78a713dfde91c1485ba45867d7abeb6a45cf0545c16ea968707be7de5dd2
 EBUILD html5lib-0.9999999.ebuild 1095 BLAKE2B ad1f21c5f04ed8c270fe1fc721a608e76f286029ee088fa5f30b037a06b9bd4f96487d5e1101a4df7e0871725113d4d6c129c9554b56e39efd4923c1bb2be4be SHA512 a556b56261fda05dce6005e0e8fc9fb58fcc3de79ceef34db2ef4209ca1b8294b7dd4aeb8dc055831de9635e452467d0ed27ebccdfc938f83835d4230ef5e0f0
 EBUILD html5lib-0.999999999.ebuild 902 BLAKE2B 0a4eee9541b3e256195d15bd3fb9d39191fd9f8ee755da586e2438f1affa014d1ff9bfa352f90a634f809de038993127917b6b599ddc3e7ca6f96082e321a911 SHA512 4480b232359af5c515bb6e2dc78101438d3cc1595be883fad2b62fd9d94d6ca94fd1d3f465f45a50ea7cf485095d66a02badbf6b47adb28f40186cf2ece916ff
-EBUILD html5lib-1.0.1.ebuild 897 BLAKE2B f31d911dbd792d1bed50757172ea9e19411df5baffb223de911535c5386fbb3016ab7b11a63dfbc5c20d1809ab331f092e3b60d5b0fba8a1eb67b706b8cb43e8 SHA512 775daa661373f30626f27bbe53f4628aefa97f5fff4aec222c5fd228384d38834697bd4cc131ac737be0f15668eb495b901a028e023a13edc5fb5e74f4ee9937
+EBUILD html5lib-1.0.1.ebuild 902 BLAKE2B 0697ac17172f16713333d1b67e058ec6061d1b89847a8fb69d905ca33f2cf830587172431d9df83de696ffa37263efc65d1e2c11ae131be42cdc0d995a2c8e60 SHA512 dbb72e96db6ba05798027858d74dbd5170f46e68973991f06d60146866c3acb92edff8ac3a57a7bbf5033e472c3999fa6b87ca4608041966fab7562e72ec980f
 MISC metadata.xml 589 BLAKE2B d98d80202c045607de5843e34313a06e9493c50bb1154e3f90a7c1c9236de2b4369827d35cb8540125524b54c0453ce56ca7ecf3a359bd9bab6e548ea1377f9f SHA512 b619c0adb0c781b00e656b1027465ec19d1ab7d0792475f197ab4164cb8a1c26563dcf48d147e346637789c8ec1603afaea428357c1022c42e22b85967e1694a
diff --git a/dev-python/html5lib/html5lib-1.0.1.ebuild b/dev-python/html5lib/html5lib-1.0.1.ebuild
index c8f053879452..97a619833363 100644
--- a/dev-python/html5lib/html5lib-1.0.1.ebuild
+++ b/dev-python/html5lib/html5lib-1.0.1.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 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x64-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x64-macos"
 IUSE="test"
 
 RDEPEND=">=dev-python/six-1.9[${PYTHON_USEDEP}]
diff --git a/dev-python/httpretty/Manifest b/dev-python/httpretty/Manifest
index c238547aba4f..0d7981620c39 100644
--- a/dev-python/httpretty/Manifest
+++ b/dev-python/httpretty/Manifest
@@ -1,17 +1,3 @@
-AUX httpretty-0.7.0-deps.patch 2344 BLAKE2B b2f7e8b49f8612dc8ee732529ddafc70adc61d42e84d46165ce8627e4b0ea4324e75433a3b05086d23ac5c981747874beaf8ac0350c42c0a2dd06d73b18c4554 SHA512 d8c06d426966673d178969c8d0edb79e903ba89831a9942ba6788006d62e52a0302f306c40e1d171e39aaef03e75b73606b5a936babe50940b04025e7c46229c
-DIST httpretty-0.7.0.tar.gz 28066 BLAKE2B e4460fb060efd5b2551218a01f52b9dc6250f1ad0582e8c48ebc98fbaaac053ca914620e7a88d4404e8a15106853caae31ee05434f3756f293c1d01db23e5514 SHA512 9adfd906336aa0ac2c21be8b789eb2e57994f4aac719958fc657291d922fe28b1fcc60d9b39e0e616b6d8565adaecb8228df3a9d1428cc189372b1cc700f664e
-DIST httpretty-0.7.1.tar.gz 28394 BLAKE2B 2b98d2b6f9cca35d5396a038c0851cffc6aa45456f6ae3ef082b0fba90c6cd137a2e99534ee836c7c00b5394668a266206df579253a32b4213b8127b58f8d629 SHA512 53b6f063e0e7863fa77aad1eebb0ad3078528bc97d26df80a3c6491c42b9a9008080da35bbb1e9372674c996f25e5109c84b48a2a6d9f0de5b7c53331bdad857
-DIST httpretty-0.8.0.tar.gz 34291 BLAKE2B 71bc13eeb1153f6b7a1c5e60b6cb197a3e6a7d8bf32db047843d17cdd1fe0eff0904f10c4b9424728e12f12a98574de317a6a7db16b1f1e8315642e872187275 SHA512 0c6193c488a27345b3d98cc6a62e8933b67828b7335700367b28cf328ef86ff2342056bada84ca631d6acc5650b7b456e80d85d8099e873f07cd41140c481650
-DIST httpretty-0.8.10.tar.gz 41741 BLAKE2B 2d0648074eea08223fe2191c1f416af7349ab16d1578e4b259d02e163462bb1c2222f122ed532a9d4c8179d332ef29347a8da67765e34a81643f8fa988f095bd SHA512 5bc734a89c45daa746551ef7d150c02bf6d9cddf1bc5426a8800d2241bb5bf8a834d2736fd9a4846ce150747d9c2064686a3ed63e97e5f131778d834956a9107
-DIST httpretty-0.8.12.tar.gz 43396 BLAKE2B ed2b9e7d8b2e7088a613234c8d60edcc5294506c77f16e5821060e3115bc8521f568abba313b359008add09e47e320bfc7178eca86e5e59158d7e303dc6f017d SHA512 1d1cbc2fd56c4aa8c2ba1e5bdb6d56db57a74f73028ebeab141f93d55eaac4a46a19c66148435e45c91d21a561ecaa6100cbe1ac0dbb65b2bdf2c8551b99a523
 DIST httpretty-0.8.14.tar.gz 43574 BLAKE2B 4015bb234c2fe3017a43fff6e3b51a7f015d9d133756d4326750da1ea06ce1910d91d7b47625a08ec85856d156a0d8b3b18706e582578e3d186994b8e4f55c69 SHA512 5adab6450e8360cc21bab4136f64cd11757b9f292c7e27980fe2561f3e705baf4f0211b9e6ff4ec9ba96a788a6c5b5b1d26657972b67423c9c25491927b0884b
-DIST httpretty-0.8.6.tar.gz 40815 BLAKE2B 6964f96fb6de59f2ff9bc5018e6bec15c391454888fb0f42045257bad8fcc96a9cb6e1c4f4347267e85efc96473ede26c37f6680b67bb47a1632e371dcf313de SHA512 bd5d0b1a33b52ae3d0e09673429e771ce582795bf58d38b34d4df39f74b377ec199d720fa061a84b64175b6ba67a91bdb35c242b4fd754627d2744cb8b33b313
-EBUILD httpretty-0.7.0.ebuild 1397 BLAKE2B 37053146f58fd72f676bfd51f9d395fc82774d53c22431d9aaec94bcf180d542759443eb64b72fe3be9106924cce9d9d82bc3cecc7c2ffedfcb2f50f10f62353 SHA512 a99cbc6ed739e133a6d812f267c0aca45c3298ce0aa0a1682cb30d35bd6f3ba83fd49f56b2f4ded0db0ddde56f2b46723647e08fe444098c3affca8f6a3ffbcc
-EBUILD httpretty-0.7.1.ebuild 1268 BLAKE2B cbeec2751366db7c9f22900648d5a06d0f776dbc97478676daac33df7f02b5bca44b6512763ffbd7c040dc65ce3f3228858996ff6742e487ee44cac4f23f1890 SHA512 f5ee3a5cbedd31ada8785bb9cf8763c29537b543819b0f77c99fd324fd0e952a832151b7edf0b53f05da03f736655b8aeff0cfb41e3eca1c9cf46d83e5c72430
-EBUILD httpretty-0.8.0-r1.ebuild 2309 BLAKE2B b10b7c394adb6c2f3a575ca5d73cced907aa3e1fa160b2cdea82db10a5f8f49e76d6cb01916e4dfaee49b6749ab67841eab3237d77aafd52cc508f827313581f SHA512 d36021d2470c4410802341ea39c48ef0c3a75a5d998e597c48374dc992bac07839ce17fd80fdd125a5250f90179928c1595257b2fbf270afca134654ce043311
-EBUILD httpretty-0.8.0.ebuild 1223 BLAKE2B b868e9f107eab4720ddc9b5bf18823691f04c79492cf08534e080553657e6365911efcad3e6f5f506690f9e1bf14bdcb8aac021b802f80b586ff886405b51db7 SHA512 8f3eef3205c7ed4d1165d6c0e389a4c9aad75260330f26828cdb69de83ac4f9db0441a70801b32064c63678ebc1f20aff9863e3714c161a2e7ff5f943d605e91
-EBUILD httpretty-0.8.10.ebuild 2307 BLAKE2B fdceb19536f36f4cd51c923a4b35a6e0905221090faccbd07b95fb54471e7111adbb8e68d45572aee3c7f853959a02eaa1a7c064ce5c5e728ebc563f4869f940 SHA512 ba89125cdbd1c277ae523e6052b9cf4e94cc8c879e755c5d01e30cf074cbe612626b74f07dab7814b0f6bd0f92b625a32526b28e23ecccc05805d3ad1fe94092
-EBUILD httpretty-0.8.12.ebuild 2321 BLAKE2B 48c363fd10a9ad49081276a23490a7869c5b8faa531340af5fa58c9720a9490cd923a71f5a3fa8ac0a4e8f6e635518dbc69c0ddb76d9695f306f2a2c4ac22a53 SHA512 b283fcb17cfc8468035ab28acb5b6cb117634ea14f8557c06f3a0cc6485f87b89f17ca0bae3db6eb019a82583299f2d5c0a65b67e26b9b44964671e25ca36bfe
-EBUILD httpretty-0.8.14.ebuild 2320 BLAKE2B 531224d633c62cf995a3fa3be258b96375287af3544df16bc165d8f29d92c7021ced7e026a0f358900f5450cbad3e6bbb964d998b2bd8ebfee9083b5ab3a8bd7 SHA512 3980892e50376218d848940e22b594146e1d6d2ac46d5131ecb5f39fd42cd6c788d5dcf4fd7274ee9ab3656f35ffc6b1551ad4521313cf7bf46ff929a4cafc68
-EBUILD httpretty-0.8.6.ebuild 2330 BLAKE2B ba780538d7ea4656ad5442ce0466e2dde7d1d86c532169b74f1a86f20cf4258fc141ddfac87e16fb4619352b923f52f77dbe82828a873b142fd6d50e7babde3d SHA512 fb4ea0ef4bddd1fbafde0126f91c8efc4024c267a633f0f378143e93ec3b054f93f65ec689713674351b35b43fd3b26e570d3196023c57a5a142100eed258293
+EBUILD httpretty-0.8.14.ebuild 2235 BLAKE2B cf30913d00e567de74f182924ca2d6c19f05269ea1b7d8e999a8011ef4724074aaca7d1f02d9d8539cf302392f9bb1afe488eea343bb87e013963e17f99e46dd SHA512 39d6cd3880e8e0fc7c6c10bdc950e4fe7303f46665fe22a6a3b71cd380b980aa4725be45d79f6e2535e4814485e0f72549fffd3fb01c744dea13cc1cef799a33
 MISC metadata.xml 393 BLAKE2B 904c5889a4cb7ee65cd6e400dd7484aa3e05ff66f5fe8c4822d13aa67be4573a70dc1188304cc1f93821deb98f41fd84218d7fcac2a7fa5b29346bce51303eab SHA512 79c7b3c101043ed36490f7b543f191d79e8fc3b2d9830ea44999e7e8018e6d1fcbe73915fb2f1adff9e6110404467bb98786aa6091fdf751021a995f0ef6f483
diff --git a/dev-python/httpretty/files/httpretty-0.7.0-deps.patch b/dev-python/httpretty/files/httpretty-0.7.0-deps.patch
deleted file mode 100644
index 26c6ebec4e5e..000000000000
--- a/dev-python/httpretty/files/httpretty-0.7.0-deps.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-rebased from https://github.com/jamielennox/HTTPretty/commit/3a7d5a04b2ed5cebc8e1fc14f706f5da7fc5162f
-diff -ur httpretty-0.7.0.orig/requirements.pip httpretty-0.7.0/requirements.pip
---- requirements.pip	2013-10-02 12:44:47.000000000 +0800
-+++ requirements.pip	2013-12-02 15:37:00.611977792 +0800
-@@ -1,12 +1,9 @@
--argparse==1.2.1
--coverage==3.5.3
--httplib2==0.7.6
--misaka==1.0.2
--mock==1.0.1
--nose==1.2.1
--requests==1.1.0
--steadymark==0.4.5
-+coverage>=3.5
-+httplib2
-+mock>=1.0
-+nose>=1.2
-+requests>=1.1
- sure>=1.2.1
--tornado==2.4
--tox==1.4.2
--urllib3
-\ No newline at end of file
-+tornado>=2.2
-+tox>=1.4.2
-+urllib3
-diff -ur httpretty-0.7.0.orig/setup.cfg httpretty-0.7.0/setup.cfg
---- setup.cfg	2013-10-08 05:42:31.000000000 +0800
-+++ setup.cfg	2013-12-02 15:40:34.331985437 +0800
-@@ -2,4 +2,9 @@
- tag_build = 
- tag_date = 0
- tag_svn_revision = 0
--
-+[nosetests]
-+verbosity=2
-+with-coverage=1
-+cover-erase=1
-+cover-package=httpretty
-+cover-inclusive=1
-diff -ur httpretty-0.7.0.orig/setup.py httpretty-0.7.0/setup.py
---- setup.py	2013-10-08 05:42:31.000000000 +0800
-+++ setup.py	2013-12-02 15:42:26.467989448 +0800
-@@ -50,10 +50,11 @@
-     author_email='gabriel@nacaolivre.org',
-     url='http://github.com/gabrielfalcao/httpretty',
-     zip_safe=False,
--    packages=find_packages(HTTPRETTY_PATH, ('tests')),
-+    packages=find_packages(),
-     tests_require=test_packages(),
-     install_requires=['urllib3'],
-     license='MIT',
-+    test_suite='nose.collector',
-     classifiers=["Intended Audience :: Developers",
-                  "License :: OSI Approved :: MIT License",
-                  "Topic :: Software Development :: Testing"],
-diff -ur httpretty-0.7.0.orig/tests/functional/test_requests.py httpretty-0.7.0/tests/functional/test_requests.py
---- tests/functional/test_requests.py	2013-10-08 05:42:31.000000000 +0800
-+++ tests/functional/test_requests.py	2013-12-02 15:43:48.763992391 +0800
-@@ -698,7 +698,7 @@
-     response['response'].should.have.key("status").being.equal(200)
-     response['response'].should.have.key("body").being.an(unicode)
-     response['response'].should.have.key("headers").being.a(dict)
--    response['response']["headers"].should.have.key("server").being.equal("TornadoServer/2.4")
-+    response['response']["headers"].should.have.key("server").being.equal("TornadoServer")
- 
- 
- def test_playing_calls():
diff --git a/dev-python/httpretty/httpretty-0.7.0.ebuild b/dev-python/httpretty/httpretty-0.7.0.ebuild
deleted file mode 100644
index eec8bd8fc2d1..000000000000
--- a/dev-python/httpretty/httpretty-0.7.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP client mock for Python"
-HOMEPAGE="https://github.com/gabrielfalcao/httpretty"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="dev-python/urllib3[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.5[${PYTHON_USEDEP}]
-		dev-python/httplib2[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		>=dev-python/nose-1.2[${PYTHON_USEDEP}]
-		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
-		>=dev-python/steadymark-0.4.5[${PYTHON_USEDEP}]
-		>=dev-python/sure-1.2.1[${PYTHON_USEDEP}]
-		>=www-servers/tornado-2.2[${PYTHON_USEDEP}]
-		"
-# I believe we don't need unpackaged package markment
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND} )"
-
-PATCHES=( "${FILESDIR}"/${P}-deps.patch )
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-	if ! use test; then
-		rm -rf tests/
-	fi
-}
-
-python_test() {
-	# https://github.com/gabrielfalcao/HTTPretty/issues/125
-	nosetests tests/unit \
-		-e test_recording_calls \
-		-e test_playing_calls \
-		-e test_callback_setting_headers_and_status_response \
-		-e test_streaming_responses \
-		tests/functional || die "Tests failed under ${EPYTHON}"
-	rm -rf tests/ "${BUILD_DIR}"/lib/tests/ || die
-}
diff --git a/dev-python/httpretty/httpretty-0.7.1.ebuild b/dev-python/httpretty/httpretty-0.7.1.ebuild
deleted file mode 100644
index 9913d5128b50..000000000000
--- a/dev-python/httpretty/httpretty-0.7.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP client mock for Python"
-HOMEPAGE="https://github.com/gabrielfalcao/httpretty"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="dev-python/urllib3[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.5[${PYTHON_USEDEP}]
-		dev-python/httplib2[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		>=dev-python/nose-1.2[${PYTHON_USEDEP}]
-		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
-		>=dev-python/steadymark-0.4.5[${PYTHON_USEDEP}]
-		>=dev-python/sure-1.2.1[${PYTHON_USEDEP}]
-		>=www-servers/tornado-2.2[${PYTHON_USEDEP}]
-		"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND} )"
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-	if ! use test; then
-		rm -rf tests/
-	fi
-}
-
-python_test() {
-	# https://github.com/gabrielfalcao/HTTPretty/issues/125
-	nosetests tests/unit \
-		-e test_recording_calls \
-		-e test_playing_calls \
-		-e test_callback_setting_headers_and_status_response \
-		tests/functional || die "Tests failed under ${EPYTHON}"
-	rm -rf tests/ "${BUILD_DIR}"/lib/tests/ || die
-}
diff --git a/dev-python/httpretty/httpretty-0.8.0-r1.ebuild b/dev-python/httpretty/httpretty-0.8.0-r1.ebuild
deleted file mode 100644
index e74338ab415c..000000000000
--- a/dev-python/httpretty/httpretty-0.8.0-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP client mock for Python"
-HOMEPAGE="https://github.com/gabrielfalcao/httpretty"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="dev-python/urllib3[${PYTHON_USEDEP}]
-	"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( >=dev-python/coverage-3.5[${PYTHON_USEDEP}]
-		>=dev-python/nose-1.2[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		dev-python/sure[${PYTHON_USEDEP}]
-		dev-python/httplib2[${PYTHON_USEDEP}]
-		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
-		>=www-servers/tornado-2.2[${PYTHON_USEDEP}]
-		dev-python/ipdb[${PYTHON_USEDEP}] )"
-
-#Required for test phase
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_test() {
-	# https://github.com/gabrielfalcao/HTTPretty/issues/125, still occur
-	# py3.4 hangs on many tests and is deemed underdone
-	# Upstream does not make it clear whether py3.4 is sctually tested and supported.
-	# python2.7 has substantial failure in tests/functional/test_requests.py and is removed.
-	# Some tests excluded attempt connection to the network
-	# On testing in the state below, py2.7 still has a tally of FAILED (failures=5)
-	# that occur within the folder tests/unit which upstream should address.
-	# https://github.com/gabrielfalcao/HTTPretty/issues/236 Bug #532106
-
-	if [[ "${EPYTHON}" == python3.4 ]]; then
-		einfo "python3.4 not adequately supported in testsuite"
-	elif [[ "${EPYTHON}" == python2.7 ]]; then
-	rm -f tests/functional/test_requests.py || die
-		nosetests -e test_recording_calls \
-			-e test_playing_calls \
-			-e test_callback_setting_headers_and_status_response \
-			-e test_httpretty_bypasses_when_disabled \
-			-e test_using_httpretty_with_other_tcp_protocols \
-			tests/unit \
-			tests/functional || die "Tests failed under python2.7"
-	else
-		nosetests -e test_recording_calls \
-			-e test_playing_calls \
-			-e test_callback_setting_headers_and_status_response \
-			-e test_httpretty_bypasses_when_disabled \
-			-e test_using_httpretty_with_other_tcp_protocols \
-			tests/unit \
-			tests/functional || die "Tests failed under python3.3"
-	fi
-
-	rm -rf "${BUILD_DIR}"/../tests/ || die
-}
diff --git a/dev-python/httpretty/httpretty-0.8.0.ebuild b/dev-python/httpretty/httpretty-0.8.0.ebuild
deleted file mode 100644
index 5ed9516eff5b..000000000000
--- a/dev-python/httpretty/httpretty-0.8.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP client mock for Python"
-HOMEPAGE="https://github.com/gabrielfalcao/httpretty"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="amd64 x86"
-IUSE="test"
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="dev-python/urllib3[${PYTHON_USEDEP}]
-		"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( >=dev-python/coverage-3.5[${PYTHON_USEDEP}]
-		>=dev-python/nose-1.2[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		dev-python/sure[${PYTHON_USEDEP}]
-		dev-python/httplib2[${PYTHON_USEDEP}]
-		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
-		>=www-servers/tornado-2.2[${PYTHON_USEDEP}]
-		dev-python/ipdb )"
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-	if ! use test; then
-		rm -rf tests/
-	fi
-}
-
-python_test() {
-	# https://github.com/gabrielfalcao/HTTPretty/issues/125
-	nosetests tests/unit \
-		-e test_recording_calls \
-		-e test_playing_calls \
-		-e test_callback_setting_headers_and_status_response \
-		tests/functional || die "Tests failed under ${EPYTHON}"
-	rm -rf tests/ "${BUILD_DIR}"/lib/tests/ || die
-}
diff --git a/dev-python/httpretty/httpretty-0.8.10.ebuild b/dev-python/httpretty/httpretty-0.8.10.ebuild
deleted file mode 100644
index d8f9443c6f99..000000000000
--- a/dev-python/httpretty/httpretty-0.8.10.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP client mock for Python"
-HOMEPAGE="https://github.com/gabrielfalcao/httpretty"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="amd64 x86"
-IUSE="test"
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="dev-python/urllib3[${PYTHON_USEDEP}]
-	"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( >=dev-python/coverage-3.5[${PYTHON_USEDEP}]
-		>=dev-python/nose-1.2[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		dev-python/sure[${PYTHON_USEDEP}]
-		dev-python/httplib2[${PYTHON_USEDEP}]
-		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
-		>=www-servers/tornado-2.2[${PYTHON_USEDEP}]
-		dev-python/ipdb[${PYTHON_USEDEP}] )"
-
-#Required for test phase
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_test() {
-	# https://github.com/gabrielfalcao/HTTPretty/issues/125, still occur
-	# py3.4 hangs on many tests and is deemed underdone
-	# Upstream does not make it clear whether py3.4 is sctually tested and supported.
-	# python2.7 has substantial failure in tests/functional/test_requests.py and is removed.
-	# Some tests excluded attempt connection to the network
-	# On testing in the state below, py2.7 still has a tally of FAILED (failures=5)
-	# that occur within the folder tests/unit which upstream should address.
-	# https://github.com/gabrielfalcao/HTTPretty/issues/236 Bug #532106
-
-	if [[ "${EPYTHON}" == python3.4 ]]; then
-		einfo "python3.4 not adequately supported in testsuite"
-	elif [[ "${EPYTHON}" == python2.7 ]]; then
-	rm -f tests/functional/test_requests.py || die
-		nosetests -e test_recording_calls \
-			-e test_playing_calls \
-			-e test_callback_setting_headers_and_status_response \
-			-e test_httpretty_bypasses_when_disabled \
-			-e test_using_httpretty_with_other_tcp_protocols \
-			tests/unit \
-			tests/functional || die "Tests failed under python2.7"
-	else
-		nosetests -e test_recording_calls \
-			-e test_playing_calls \
-			-e test_callback_setting_headers_and_status_response \
-			-e test_httpretty_bypasses_when_disabled \
-			-e test_using_httpretty_with_other_tcp_protocols \
-			tests/unit \
-			tests/functional || die "Tests failed under python3.3"
-	fi
-
-	rm -rf "${BUILD_DIR}"/../tests/ || die
-}
diff --git a/dev-python/httpretty/httpretty-0.8.12.ebuild b/dev-python/httpretty/httpretty-0.8.12.ebuild
deleted file mode 100644
index f0dcd0326bbe..000000000000
--- a/dev-python/httpretty/httpretty-0.8.12.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP client mock for Python"
-HOMEPAGE="https://github.com/gabrielfalcao/httpretty"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="dev-python/urllib3[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/coverage-3.5[${PYTHON_USEDEP}]
-		>=dev-python/nose-1.2[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		dev-python/sure[${PYTHON_USEDEP}]
-		dev-python/httplib2[${PYTHON_USEDEP}]
-		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
-		>=www-servers/tornado-2.2[${PYTHON_USEDEP}]
-		dev-python/ipdb[${PYTHON_USEDEP}]
-)"
-
-#Required for test phase
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_test() {
-	# https://github.com/gabrielfalcao/HTTPretty/issues/125, still occur
-	# py3.4 hangs on many tests and is deemed underdone
-	# Upstream does not make it clear whether py3.4 is sctually tested and supported.
-	# python2.7 has substantial failure in tests/functional/test_requests.py and is removed.
-	# Some tests excluded attempt connection to the network
-	# On testing in the state below, py2.7 still has a tally of FAILED (failures=5)
-	# that occur within the folder tests/unit which upstream should address.
-	# https://github.com/gabrielfalcao/HTTPretty/issues/236 Bug #532106
-
-	if [[ "${EPYTHON}" == python3.4 ]]; then
-		einfo "python3.4 not adequately supported in testsuite"
-	elif [[ "${EPYTHON}" == python2.7 ]]; then
-		rm -f tests/functional/test_requests.py || die
-		nosetests -e test_recording_calls \
-			-e test_playing_calls \
-			-e test_callback_setting_headers_and_status_response \
-			-e test_httpretty_bypasses_when_disabled \
-			-e test_using_httpretty_with_other_tcp_protocols \
-			tests/unit \
-			tests/functional || die "Tests failed under python2.7"
-	else
-		nosetests -e test_recording_calls \
-			-e test_playing_calls \
-			-e test_callback_setting_headers_and_status_response \
-			-e test_httpretty_bypasses_when_disabled \
-			-e test_using_httpretty_with_other_tcp_protocols \
-			tests/unit \
-			tests/functional || die "Tests failed under python3.3"
-	fi
-
-	rm -rf "${BUILD_DIR}"/../tests/ || die
-}
diff --git a/dev-python/httpretty/httpretty-0.8.14.ebuild b/dev-python/httpretty/httpretty-0.8.14.ebuild
index 2645a4b1820d..ff621a82378f 100644
--- a/dev-python/httpretty/httpretty-0.8.14.ebuild
+++ b/dev-python/httpretty/httpretty-0.8.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,14 +20,12 @@ RDEPEND="dev-python/urllib3[${PYTHON_USEDEP}]"
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
-		>=dev-python/coverage-3.5[${PYTHON_USEDEP}]
 		>=dev-python/nose-1.2[${PYTHON_USEDEP}]
 		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
 		dev-python/sure[${PYTHON_USEDEP}]
 		dev-python/httplib2[${PYTHON_USEDEP}]
 		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
 		>=www-servers/tornado-2.2[${PYTHON_USEDEP}]
-		dev-python/ipdb[${PYTHON_USEDEP}]
 )"
 
 #Required for test phase
diff --git a/dev-python/httpretty/httpretty-0.8.6.ebuild b/dev-python/httpretty/httpretty-0.8.6.ebuild
deleted file mode 100644
index f49200316958..000000000000
--- a/dev-python/httpretty/httpretty-0.8.6.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP client mock for Python"
-HOMEPAGE="https://github.com/gabrielfalcao/httpretty"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="test"
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="dev-python/urllib3[${PYTHON_USEDEP}]
-	"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( >=dev-python/coverage-3.5[${PYTHON_USEDEP}]
-		>=dev-python/nose-1.2[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		dev-python/sure[${PYTHON_USEDEP}]
-		dev-python/httplib2[${PYTHON_USEDEP}]
-		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
-		>=www-servers/tornado-2.2[${PYTHON_USEDEP}]
-		dev-python/ipdb[${PYTHON_USEDEP}] )"
-
-#Required for test phase
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_test() {
-	# https://github.com/gabrielfalcao/HTTPretty/issues/125, still occur
-	# py3.4 hangs on many tests and is deemed underdone
-	# Upstream does not make it clear whether py3.4 is sctually tested and supported.
-	# python2.7 has substantial failure in tests/functional/test_requests.py and is removed.
-	# Some tests excluded attempt connection to the network
-	# On testing in the state below, py2.7 still has a tally of FAILED (failures=5)
-	# that occur within the folder tests/unit which upstream should address.
-	# https://github.com/gabrielfalcao/HTTPretty/issues/236 Bug #532106
-
-	if [[ "${EPYTHON}" == python3.4 ]]; then
-		einfo "python3.4 not adequately supported in testsuite"
-	elif [[ "${EPYTHON}" == python2.7 ]]; then
-	rm -f tests/functional/test_requests.py || die
-		nosetests -e test_recording_calls \
-			-e test_playing_calls \
-			-e test_callback_setting_headers_and_status_response \
-			-e test_httpretty_bypasses_when_disabled \
-			-e test_using_httpretty_with_other_tcp_protocols \
-			tests/unit \
-			tests/functional || die "Tests failed under python2.7"
-	else
-		nosetests -e test_recording_calls \
-			-e test_playing_calls \
-			-e test_callback_setting_headers_and_status_response \
-			-e test_httpretty_bypasses_when_disabled \
-			-e test_using_httpretty_with_other_tcp_protocols \
-			tests/unit \
-			tests/functional || die "Tests failed under python3.3"
-	fi
-
-	rm -rf "${BUILD_DIR}"/../tests/ || die
-}
diff --git a/dev-python/humanfriendly/Manifest b/dev-python/humanfriendly/Manifest
index 1486abe0a1cf..1fbc6e0bf668 100644
--- a/dev-python/humanfriendly/Manifest
+++ b/dev-python/humanfriendly/Manifest
@@ -1,3 +1,3 @@
-DIST humanfriendly-2.4.tar.gz 51037 BLAKE2B 3775505a8a32c19b921d6f397951dc61da9d5c4d3c8313a519cb350d4dcee09797b4d3412c7084d6a722397e675be345af946e132058e57d77e426d3ca2a3230 SHA512 e35017c6be9d80ac5e3465836aae4f5b1ea4358224e250c7c1b7e3a93c2764832382e0ec24ea54e1d656fd8874c12b23ffc535440870b55a532800c5953cc676
-EBUILD humanfriendly-2.4.ebuild 799 BLAKE2B 5653ffe8d0eabaead6577e217d86d4580ba89df528d83f2f0f500b32a1826d05f65d97a4dc3f9c5bb3a0601e2ba5cff23917a637ab0e50e40bd122d971026624 SHA512 38863a6b458ce5191e6d8e199172d7004a51c42aa240fb5f87d8872f8372a3d9e24358ecc95be4faa7d2d66576e668ec7dc8d31ae39eea30b25cd2f391e1c54f
+DIST humanfriendly-4.17.tar.gz 344455 BLAKE2B 985ae142ea5378fcceb9f5f28773ac4dcaf0ea55ef1a7269fd1840a0b7119b54362aa93c330aa62e5424cc6f329e88717b45255c62b8e1d3f9ff5dd43a3c16c2 SHA512 a5786f28eaa0ff33919d9164ff30037fef5dbf60a31aece7679d1dddf3239f5a0d27209c710053cb0ac6779c1ef39102b1441fc620063283e90ef2ae11f8b621
+EBUILD humanfriendly-4.17.ebuild 903 BLAKE2B 954d82a6f8dfa81e0d4dc33511252fee15674b85a420672087596ef00b202179da09a55f5e1692fe087d106827fdde7ccca2983099a8703c8126a9505bfbde84 SHA512 5aa206fcc9e80d8d28632045cbb7fd5830fb7340a7fbe0ab96eb86e5cbabe791ed6f36552a1e22db3b252d9f43983537ddd416683327f9399daad19ebe68e4a4
 MISC metadata.xml 326 BLAKE2B 5db2fb344393d914a42d1b9b256782d2e8286daa33ff4b8687d23e613ae8d168052dc310cab48ef0c49c524d3b5115d2a17cbede518fe93e944c0067c94f9c7b SHA512 1338df242248b37b4d016d8f9a31ffa004eed60a9122ed9ec8f94103271b3136b698a613c0f7c91411f43d96b136777e0ffe808c250f9ece3d29922312457f47
diff --git a/dev-python/humanfriendly/humanfriendly-2.4.ebuild b/dev-python/humanfriendly/humanfriendly-4.17.ebuild
index f8de554ce4ed..2d7478e5d668 100644
--- a/dev-python/humanfriendly/humanfriendly-2.4.ebuild
+++ b/dev-python/humanfriendly/humanfriendly-4.17.ebuild
@@ -1,16 +1,19 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
 
+MY_PN="python-${PN}"
+MY_P="${MY_PN}-${PV}"
+
 DESCRIPTION="Human friendly output for text interfaces using Python"
 HOMEPAGE="https://pypi.org/project/humanfriendly/ https://humanfriendly.readthedocs.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/xolox/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
@@ -25,9 +28,12 @@ DEPEND="${RDEPEND}
 	test? (
 		>=dev-python/capturer-2.1[${PYTHON_USEDEP}]
 		>=dev-python/coloredlogs-2.0[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
+		>=dev-python/pytest-3.0.7[${PYTHON_USEDEP}]
 	)
 	"
+
+S="${WORKDIR}/${MY_P}"
+
 python_test() {
-	esetup.py test
+	pytest -v || die
 }
diff --git a/dev-python/humanize/Manifest b/dev-python/humanize/Manifest
index 15ce14261430..fb28be0b8aa0 100644
--- a/dev-python/humanize/Manifest
+++ b/dev-python/humanize/Manifest
@@ -1,3 +1,3 @@
 DIST humanize-0.5.1.tar.gz 20507 BLAKE2B 55d7b598b32658b1d4c4741b37b5c33bdc9d63a5a779455e2fb93e1e4c3a0d8fd58e8522ef82734e1ba2b161fd881829373ba3569baffd9ea3271ad7ed3e7568 SHA512 dd7ad7f3c564cc6abcb6b128e50dbea7f19f7f418bfd936aae2472961c53ec71202133c5c2b5b930ef41ef807b51d6ba1210565627ed32c0b41acc0abd32a2d5
-EBUILD humanize-0.5.1.ebuild 868 BLAKE2B 95a694b404260c62b65ca62921fd7bf3a4641ec690a30d630f14677bb1954e66307c07c372c42f850224b5e6da97dc181f357ccd301f4b51bcf7548b458c9986 SHA512 9032dcb3d64ce02322a0b0f4810cd5c392e2aa386099ceb391435b0750275c072987104b1ecaccb032d17f3b8eddfa87d1117b4db645d14526dabb33d8b0275e
+EBUILD humanize-0.5.1.ebuild 863 BLAKE2B 7d5297938ee8fab37870a1bec45d4c10ae7c2fbabf4e6e21ab5ac98faa7a0a2396052a12dd347f0a41ad7b346b866988d640a1adff7988fe459e668e114f70f9 SHA512 faedddc47e9287fb17076e6b7d55a72ffe3fcaa1b649fa657b2493073cc51d8d966a813d723926096fbaad31f07c6ed2c4022e730b46db4e9135f204ad423235
 MISC metadata.xml 436 BLAKE2B 79f8554b22e171509667145d3270ea7068ff215fc9d999f2cf654cf42948ba49f850efcdb19cb2a3fb41347612a4d3f178c529410b42238555b20b652b40900f SHA512 871a75a8295b80f9884f191f2264329be5a2975429e35b1ded2e085771284cfa76e230d2e7784a05524ec51cb809fde24e34d6caea45904f5fed3b388fe855a2
diff --git a/dev-python/humanize/humanize-0.5.1.ebuild b/dev-python/humanize/humanize-0.5.1.ebuild
index a476335fd67a..d978a1d732ac 100644
--- a/dev-python/humanize/humanize-0.5.1.ebuild
+++ b/dev-python/humanize/humanize-0.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/jmoiron/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc test"
 
 BDEPEND="
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 418039c99dfe..c0980d19865b 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -2,7 +2,9 @@ AUX hypothesis-3.74.3-no-werror.patch 646 BLAKE2B d398319202a662d87018d99919ba07
 DIST hypothesis-3.6.0.tar.gz 73586 BLAKE2B b0ec133e8c71f752114211061155c15a7d536e771ba85eab6489440b2063d3083018bf8502d9e9dbc73105ee5f03060e3189e64574a3dfa052b091040e7e7915 SHA512 cb885628e5c38ab9312cfb177ebc3c014617d21031737f5fba343ba485c1b8ff82b1302e7bc1d3e79192bfd8324fd0501498c968f3ac8343829f8965f6354389
 DIST hypothesis-python-3.59.1.tar.gz 500529 BLAKE2B 5c171045e363f2337d7ca30797b9fc7f96430c805dd4b3ec78fe927247d2c2ba4a216789a82f1e956b89d66c5ecdb2050a5f93467f2d557a05d1d48507fc06db SHA512 c3aad4cc54152963806e09af5f351e60e30cd64ad48ba3d922451b10dbb1747ea3e5d432ebc611dcb0646687d7e8755051b967304e74798d091be0b2901c832f
 DIST hypothesis-python-3.74.3.tar.gz 552616 BLAKE2B e19a0991e7ae2fa6208c81d336cc66e3392bb78663f567fe28b570a1463a5359ccf713776f1f9cbd19a27a53b9a71a5be6eedfa05599fa12c047c373aa339592 SHA512 f4927d6e908a9222fa06f82ad6e4cf90c62a0a3d0c7632c17ee57a3705239901fcb5dbbcfca402c153bf2bea9dde0e51c852d2024ed5a236888327963fe13a3e
-EBUILD hypothesis-3.59.1.ebuild 1162 BLAKE2B c9e00f97c46290791969baef01f524fd15e93e8825fae3a7eda7844aac3b56b21c6ac4b4df298f8ecbd48bb2bfddb6ba791049d4f59a75fecb1d59e81c76d99c SHA512 97942ab095c3a853b80f75a0b2759aec58b49337db8d3a89e46cf10cb876016e640b703b16090cd08a034853b17fdd622a17e6c40ab65640f38ea477c4eafc30
+DIST hypothesis-python-3.83.1.tar.gz 564466 BLAKE2B 7b4c00a46b5a547bfc98711b795525c09d91ed41ac2c1dcf9c3c571e32819c77c6f6a4311ff32020a6d8e837dfcd03f7e2d842613148201d476615831483a737 SHA512 d828dbfe8637b6388b8c77af08970c2b45cd8f6960f26b1c54f3fbeba012e225d116802cae70ee28321de9d961397e60a5ff8cbefc02d085b6f6978f6bddf56e
+EBUILD hypothesis-3.59.1.ebuild 1160 BLAKE2B 13fa63fc01c0432759bf651cc09a6e7b61a8272a6d16689e18bac080d229ea3fc5a439f1c135bc7c5bd788e0b410467aee3245b5edf60390e6f8dfd86c785ff4 SHA512 1aa2dbb5d0d9418a9dfd095655a01cd845bd445ee412618655b9fdb2fc897ebdaf5ee30b775811a0368fc34330c4d9919448afb92b13430faa12b4532fa4cb42
 EBUILD hypothesis-3.6.0-r1.ebuild 911 BLAKE2B 4107db5cf3dee7f521f54dbfe0488742ddf21876b88b5b637c361d8808fa09686252e5d464391adb3e2e45737c2e347eb963fc0e49c41a04c0ff84536a131885 SHA512 315866abf6fa890934c3125d86beba7c3bd799f1472c5661725418806f68f20c850b3204b687a03c1887ecdf6a535117446a049509050da5f9d6d93cb0f6cd0b
 EBUILD hypothesis-3.74.3.ebuild 1587 BLAKE2B 054b13c44587d63e9e82aa54832201e8eba16bd0c00c37595636ecc3a119c5ec6e18586d8612344fe7a840abe9e2bbbb9a52c5d8b1eb29da3402afee13c676f5 SHA512 b3d646c35ec68c74dd315df5e1db85c47580aa7370868a1ae8eb5d4015c2c3bbd79216194e6fb0ce265d4f400551804682250bf97f3baf94e9d3feee7ccbfa38
+EBUILD hypothesis-3.83.1.ebuild 1475 BLAKE2B 4b318a70b04fb5178eabe75a5e211405de6ae53238ee46f5f33ec5e074cb452290c941b65a607dd39257e5cdf491ebe72ff21de8ef869cf5063c5effa4df5990 SHA512 99fc201b4255b30085c82ba5c5709aa23c1867f7439236695f4dd960e2a0065dffa6bbf20ce29ffd0608b8ea7bf63a8d23387bfc5fd90b2ad4b65f234f71e2d0
 MISC metadata.xml 379 BLAKE2B 3623a13a813bf71f9474fa018b2f83392ec168193b9853cabcf112267d38e7278e97a415bb8b7e52f9ebb28864b8709a64996dcb0d97e1f03b3ecb31a944d74d SHA512 40bb5c1916d9027ff81cd32073de34753a30d8430f36d0fd16667a111af8fd222379dcd817edd723d362f5ff5578ad7b212f98388c00de6dff1a64bd2c3978b0
diff --git a/dev-python/hypothesis/hypothesis-3.59.1.ebuild b/dev-python/hypothesis/hypothesis-3.59.1.ebuild
index 591c48ee5826..64644cff3375 100644
--- a/dev-python/hypothesis/hypothesis-3.59.1.ebuild
+++ b/dev-python/hypothesis/hypothesis-3.59.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/hypothesis/hypothesis-3.83.1.ebuild b/dev-python/hypothesis/hypothesis-3.83.1.ebuild
new file mode 100644
index 000000000000..5e0c71eda1d2
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-3.83.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy{,3} )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
+SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
+IUSE="test"
+
+CDEPEND="
+	>=dev-python/attrs-16.0.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' 'python2*' pypy)
+"
+RDEPEND="${CDEPEND}"
+DEPEND="${CDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
+
+python_test() {
+	pytest tests/cover/test_testdecorators.py || die "Tests fail with ${EPYTHON}"
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/icalendar/Manifest b/dev-python/icalendar/Manifest
index 5f90d90c711e..71cd9db39c40 100644
--- a/dev-python/icalendar/Manifest
+++ b/dev-python/icalendar/Manifest
@@ -1,6 +1,8 @@
 DIST icalendar-3.11.7.tar.gz 78330 BLAKE2B e6186f58903d835ac3357db959b6fef79aba34bb9b692128b6209b9c8139f7ed2eda81fd5cc54b6f3186d055e611f1489fcb61b1a10f914ee4c79ba8b31bf67a SHA512 445dc7b9c8c7ee2ad3345c5a4e4bca92633cdabae95f3cab63dacf549d48b7578242566d236cac8d5a9df4158387cadc0f09327e1b3e5038d223687365bec884
 DIST icalendar-3.9.2.tar.gz 66283 BLAKE2B 487a8fdf04f028de30003762860640b8983df026aa7a5ba0efe3a57ddd09c51bb406a5e58792203d3a0ee3d44186b0b6dcaa7194fefcfed85c3ab714129f6b4d SHA512 da50bba72f7a114263672ebd45cfcca5f7c2eca48538901f595b26ef18bb21a6290da4392c62cc27d1202083fcab7f5bfe6c9a463df38087de0ef764999f7eb1
+DIST icalendar-4.0.3.tar.gz 77899 BLAKE2B d4043914b85359a8309dd7c8acce55ec5921508319342f2ffb2e16017aa5aa164ef7fdd44aee7820a971516a3e157b5c8ee86732e669c8eac4b5c4bc1767e334 SHA512 2f0ac5a7f36c7d37047ba20bec3f2ca7df51a9e3ec3f29751c71cdd264c01f7e0abd6efc298dac5a7c87911cb4916e56bf77716d6ca05a2d090e26486e6a56be
 EBUILD icalendar-3.11.7-r1.ebuild 1353 BLAKE2B 1b3277b9dd0d3d7e4d60ded59710fda3cc1b6e7bfe9f1e622e2fd7b66faa7a6524156de5db5b3dca8b8829bc763171229eda1b079ccfadda8dd4e117dae1155c SHA512 ab3c8f04bd95afb45bced67600c20deb200030720d6e0b0e5be4d28627c15eb2de3dbcf2a489b881342b1326b7d261e39205b87dbb570fe00c7b65853adbd0b1
 EBUILD icalendar-3.11.7.ebuild 1303 BLAKE2B 8203deac70c7579777dd4a5e5f4663ceeeac4b1fe3d80bd5bac26899a8d1885d501eafc13779b043c07c90547bb2d207ac6bd7833146a9da3ca10b6da6617b9f SHA512 ff99c4500c76d4a2be37507ef3a7c17f976eb5057eda0e53f22dfd97bebff4516be7690349a4d639e0d731d174fa66512010f27384210a6f83d93974630c4fbf
 EBUILD icalendar-3.9.2.ebuild 1301 BLAKE2B e49dd25f50d01ff43cf9b0bdbfbb309111890a88be052c5abc577bd67c257ea43d6e63cf9e73c3315f8b110133e29aa4c68171d854133822d3c70e37d6c71d2b SHA512 b7cb075497bf8282e3b2332a701805b4be1f3881f9ad248f49750606abf04d9167b0326308898ec7332530ede1ab28e463b8bafd444bf68f14fd597af3261219
+EBUILD icalendar-4.0.3.ebuild 1121 BLAKE2B 22863b20843337b7ed68110ca5a26bf7cdd6c4046932eebd4a1fb5b04b1542aae298aac2397b0227a05f1d095bc3b48fdf464fd4e092e4115099b7a304fe7124 SHA512 b45e681004212c3922cc12d0446bca85f80c912cc140868fd881adb44cc140e4c418267de68b04db137727cba1c921ddf4e222d46b5a1606df4559271f4ae841
 MISC metadata.xml 477 BLAKE2B ba3e50265304565f743e67aab83f0c5457a0db7a104ab8a0d7a85f5d610e49b61a3314e4f037c73e4dff469adcb66ea6c0de6a0027c3fb487637edcd74e1f84d SHA512 468420550f8bdacfb0425ea8df443f1e25552f3e2c132869dd12a1cd74cee4b8174c2dfff2023a80d17f570e8c6d0b0163968f603086d8ea30f61a50e174ad22
diff --git a/dev-python/icalendar/icalendar-4.0.3.ebuild b/dev-python/icalendar/icalendar-4.0.3.ebuild
new file mode 100644
index 000000000000..4c60e2e5c4fb
--- /dev/null
+++ b/dev-python/icalendar/icalendar-4.0.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Package used for parsing and generating iCalendar files (RFC 2445)"
+HOMEPAGE="https://github.com/collective/icalendar"
+SRC_URI="mirror://pypi/i/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE="doc test"
+DOCS=( "README.rst" )
+
+RDEPEND="
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+DEPEND="
+	${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	# reset conf.py to not read version from an installed instance
+	sed -e "s:pkg_resources.get_distribution('icalendar').version:'${PV}':" \
+		-i docs/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		emake -C docs html
+		HTML_DOCS=( docs/_build/html/. )
+	fi
+}
+
+python_test() {
+	pytest -vv src/icalendar || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/idna-ssl/Manifest b/dev-python/idna-ssl/Manifest
index a698cbbb04bc..b55e04a4124a 100644
--- a/dev-python/idna-ssl/Manifest
+++ b/dev-python/idna-ssl/Manifest
@@ -1,5 +1,7 @@
 DIST idna-ssl-1.0.1.tar.gz 3385 BLAKE2B a14a73b7aa79022c3831e3c66cfc31fe6f2f64474039712aabc0aac28c5ad9c98ba360bccfcacd5b37085c48c8db1f4184f7406489306dd7b87c1ac9599e8c28 SHA512 57a6891543c561cd96d35f3d01f702e8c54c592f0174f34322fd0794df8a80ad0117b558f2d0078d22cb8e0114aaa9b72c7217c91a40f02475334d7a94429c2e
+DIST idna-ssl-1.1.0.tar.gz 3377 BLAKE2B 4a3baee5c976bdde4092eb3a980e555a72fb74395d3bc673ccd6e986e003b696cabdeb41061ad9b5f8da62074c034e4a07298fa993d5fff185f723ff4cb5f432 SHA512 f9db74cecabbbfddfd1817bbd8434ef2aafeea433c3eefff3f94c7e994da40e3f315fcda527f3a0c3743028f26bbc934f1dd21f94134123c3271975d0527cd35
 DIST idna_ssl-1.0.0.tar.gz 3375 BLAKE2B 28ecee9e271619b7a4f3698aacbdbf0e953ed9b52640818007dc86f34145d8ea000260991d44cfa4cd896b74172b0a32962c3053152558b8d621396df2e248de SHA512 d1f7479cc3edff164bb26deb05af757906ba91241bc668f1b087560087a89f741a0b36e166bfb8142128ceed6008621ab36a2556ed2304ea6374c19982bc663a
 EBUILD idna-ssl-1.0.0.ebuild 595 BLAKE2B ef204ab8de05c5bf7b20c60050cd71bc540432ff6dad53302351019c606f7388aa74081c8180e3b04ab2600a5d08227528f0a91c71ad63e245fea60531b74489 SHA512 5332e62e5d252fcca875a51fb6b907eb780185e7af0911e1077893901a7be5d76c4befdbfcaf83332a87f19952a2794a6343d2cbdb204ca1da3ccf50f66cbaf5
 EBUILD idna-ssl-1.0.1.ebuild 530 BLAKE2B 0c2c36dcd0f24ccbf48346a79dd417f396d36d75b989884f381de58bdebfdd3d00770ba6fa0b1d7c3c4a8c4dfaec2e1a926e782a4bb1b76cca6c31cb496ba809 SHA512 a6f3f990b2673a5637c9e5e820f033c94bdf3ee067badb26bcab1b7da2347ba7052daca8142eb0fa0b94a9982d8bca24409e32f73ea2f88f3b4d36aa420f86f4
+EBUILD idna-ssl-1.1.0.ebuild 529 BLAKE2B 0d747d77dbf694baa7d6c847ae9f6390bb0e9846b7b3b3b713eccb8dc4f2ff0460f4e6bddd76cbcb19ba2c6c620476d1830d4b770a8cd70d84b48f30fb28a56e SHA512 4f46f1fc1348ad42074e41501ab83af4a40eb6906816e21f7cbf6d55bede46928bfadfeebaf13c9c59c4656d1bdb61854018617f6486c142aadbb2f79600fc95
 MISC metadata.xml 368 BLAKE2B b2f78fb9dea9edf6f2b2a7fb72412302b014e8b1b536653ae12fcd2bc8fa94bb253ff780aedcfd32fcddfcc2030b363e12440dfa4efef1a886e99b8b0acd8dba SHA512 531bbcdb7ec492aa4c38f4352cb0a93c618c60d9f8920ff476f6f8b7991744ccba2188a9e441e696a02d1c4ef4ea9af3afeb2c81a0d046e700796ee45b7f3888
diff --git a/dev-python/idna-ssl/idna-ssl-1.1.0.ebuild b/dev-python/idna-ssl/idna-ssl-1.1.0.ebuild
new file mode 100644
index 000000000000..b64ceaa97fb5
--- /dev/null
+++ b/dev-python/idna-ssl/idna-ssl-1.1.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Patch ssl.match_hostname for Unicode(idna) domains support"
+HOMEPAGE="https://github.com/aio-libs/idna-ssl https://pypi.org/project/idna_ssl/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/idna[${PYTHON_USEDEP}]"
diff --git a/dev-python/idna/Manifest b/dev-python/idna/Manifest
index 05653da72dec..f9c5851a98af 100644
--- a/dev-python/idna/Manifest
+++ b/dev-python/idna/Manifest
@@ -1,7 +1,9 @@
 DIST idna-2.5.tar.gz 130211 BLAKE2B 3b00b76f9d86f0961ca4613c4239e39fa19c28f60640d2c9d9b7ea05985f9eceac122bb9e5b30b2f22648506580202a187f95513fe5ab0af6632917335f2eda0 SHA512 29a69ede25a8855135c763da5d20ff81832c710038a38521c127d5b7b24b355c6cfa5e9f9a2a4ef1fa4437537d1d9e4b448357e07b4b5e3724d98fee0a3b7835
 DIST idna-2.6.tar.gz 135992 BLAKE2B 1397c93eae23a9ecbcc001205e83fd684cbdb4f0c916c30b7d80dc7fdd43c588a9a81a620a39108a31707c1aee8c4a315d1988ae5a8cf1f6519bb11bad6dc3a3 SHA512 cb5dbfab44c4d11521c67f9d29391f184d1267a3da6dc89f4ed12c60a7a909d5c7474c3ea2bddd0af7063f4f620e87a8dd586bb07e8b961b30b1dd7c969704c2
 DIST idna-2.7.tar.gz 172698 BLAKE2B d0c92988d78629af3b87b8b4842757395c1f439f25d77614ba05d48e57d7d9a414c5be33e3fcf191f7dc8fea7325c801ff9c6f687204dec3735406f6e2342923 SHA512 34ba985862e386243f43616586e53830177cf4ba0925b6054198dfa63c085ec5c6c5b54c2b3c0989bc768aacceeef76b84471e58a16183b960dc4b8812cd1c61
+DIST idna-2.8.tar.gz 174481 BLAKE2B 68e5dddaae30097522e4e661438d7f89a391c5a0e2f72a99e1da88e0af9380f15958d5315fccb4221e7d44a6390a7b0daa537a4752c26cd915bf2d433a4f7cc4 SHA512 8ca5cfe6350c51250bafdac7c6e4ddd54c4a5d6bf7acbcef896760a759868c8e9df1fdf550121d8512fa3eb316dcf031ec6058e03b4f66eadee21b63e2187d33
 EBUILD idna-2.5.ebuild 603 BLAKE2B 383fd5b4146d19a72a999cab1726c412a072a728ca8151a94a2166705fb3c040c2e5df7afcd3788fc2caef209ac127b61b4ee901959236cd2d69a95faca1fd2a SHA512 a68e990ed5fed97171450408d19bdb0cccc90a58658eff9da40e3e0099716d44d238a22ef4e7ba832a2eb6fa69a7cb65408b09435935c1385cfe854bef95470e
 EBUILD idna-2.6.ebuild 668 BLAKE2B c12ff33bfa42471d9aaf9ebb063b51e47ec5c0d8cd9bcaf18230dd853a52d4f00ea4a2f27b985a84893d86863eb61ee239c32087b5d4de1688d2d7c7dd554c93 SHA512 bc90f9e990b558075d9c77663781d44b9ecd2571747be0b041b0f1b2bb171e8a32d247e8149a83a586f8297f0bbeb9c3f67c13bd6669d615f959a576211a765f
-EBUILD idna-2.7.ebuild 681 BLAKE2B 9e73ef5df6989bcfad803f370e994d5a133b50e6f07259843f23fd3f4db347b5dc8ba144746173bc8c38a7670ee75e7cb3026cc146bc013fa4d7efd63fed96bf SHA512 573029c824eb0414dda282136f54064bf17172e7bcb7ef9732fd44470c79f6757fdd302eda96a9552f9c2b7e95419fb4a7ba4c1233e9af41ef6554feb93b7a28
+EBUILD idna-2.7.ebuild 723 BLAKE2B bb6a5397ef97734e790f721dd1546ffdd4467835442dc5887255624562dbf08f02a735fd9652a2504714d6089597f83c1d149971df9f4c0783ceb39ce46a12ed SHA512 f48bfc245af6640944aedf240eb3a929f77bb701259e35242f75413b73c1502d000be8f4e1eeb66fec69186adc0fbef79f2be6b3da262290f7388435de54e26f
+EBUILD idna-2.8.ebuild 723 BLAKE2B bb6a5397ef97734e790f721dd1546ffdd4467835442dc5887255624562dbf08f02a735fd9652a2504714d6089597f83c1d149971df9f4c0783ceb39ce46a12ed SHA512 f48bfc245af6640944aedf240eb3a929f77bb701259e35242f75413b73c1502d000be8f4e1eeb66fec69186adc0fbef79f2be6b3da262290f7388435de54e26f
 MISC metadata.xml 367 BLAKE2B 363038f61cdb96780faecfb8c92d97d0cea8146d37374a731daa9618150b3f41c0bad724619d7bb353141834df9fcb88f075ece91a742ccca2da1621e5b8e2fc SHA512 50f13044fec18651463e6199826a39c7f28c783e7da389017e2dc2fd6f17b6c93e4e437a1019e0e31605a06a428c31a2fbc12744daa957cefbba2d76b511331e
diff --git a/dev-python/idna/idna-2.7.ebuild b/dev-python/idna/idna-2.7.ebuild
index 6929003e239a..e37a4edb2f59 100644
--- a/dev-python/idna/idna-2.7.ebuild
+++ b/dev-python/idna/idna-2.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/idna/idna-2.8.ebuild b/dev-python/idna/idna-2.8.ebuild
new file mode 100644
index 000000000000..e37a4edb2f59
--- /dev/null
+++ b/dev-python/idna/idna-2.8.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Internationalized Domain Names in Applications (IDNA)"
+HOMEPAGE="https://github.com/kjd/idna https://pypi.org/project/idna/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/ipaddr/Manifest b/dev-python/ipaddr/Manifest
index 4e92a4d9bf00..c8592de0cedd 100644
--- a/dev-python/ipaddr/Manifest
+++ b/dev-python/ipaddr/Manifest
@@ -1,5 +1,5 @@
 DIST ipaddr-2.1.11.tar.gz 29046 BLAKE2B 8196898209d580ce25bc2ccb05b2e772c42c053116749bb5137a87b6648472c4fab522d76405510cb2304859b4179c593b213739e9294a1af1d9894cac7040ab SHA512 a97b0f760f0d7fac549e5edf17b644c966a8858c145b8f9472ddc8bf4805c9d537f6f8755e3716d78b729b87e84149f8b73c7f98c0deee4fbf266ccb7a206bc6
 DIST ipaddr-2.2.0.tar.gz 26266 BLAKE2B f12807beb52c5cb3c7da2afa4b61b264fb58f0100900e5ca062127ce218f9f5710f38ac7c7183a7aa08b77757c39866d169e6e39c3bc5c6c55df003a9b414ec0 SHA512 5adb117c44e6e5dbdb9e96543aa7a34f35b4a4ec9baa163a25448058c34091bf4019d24f0250928291e4d4bc97dcdf75865daef739e2d94f98cc584e6e6c50dd
 EBUILD ipaddr-2.1.11-r1.ebuild 719 BLAKE2B 4726df1755dcb456c729d7fd05fb471b454c691f7519c2c7e4772426e0ce5dacdfef95ffb7d70bcd202a83690847afe87799e95bcbe9d9b8841e7b688eca194c SHA512 f6078fbfb54525f611c718c371a52b7c3c49dc0002851e39a415c02e6a0e33f37614d655dc57c369963eae117e65fbb6a67e86f58648d44935ea1b5329c165db
-EBUILD ipaddr-2.2.0.ebuild 692 BLAKE2B 0a96bfbfc950163bcfe11afa53b8e924f263b478154d9cdfa2e5a70f2cf79f3798ec99fae40d86057cdb24540517d283addd5390843c3fc19bb6e94881a33fe8 SHA512 785eace219ddf6244ed434acbbd6a95929b1249fc630a3cd207882632c8ccd3eb2a9dd4ac825f99b9d22a4a81009c5873895d086bff10e8ac88a28280230cdae
+EBUILD ipaddr-2.2.0.ebuild 693 BLAKE2B 559e1e8e2e8a8d2b6e0203fca3dae35d52099068adc6ccbb66ec86188bdeeb45e69b064db644a9f32c65605f7e200116cc494218ac3af55cebcfcfa012d1ddc2 SHA512 21c40e01096ddc1afa3c63b3c51f60f4fa9c9aaa81dddcbc0631f339e3b9fdb9fb5d598593f5bfef32f22f6e1de0b2df8d8ef49bd5a2ec7e5668abf2aed5f4b2
 MISC metadata.xml 490 BLAKE2B 53a6608c229686c6cc8b3b3c225aaadc4d504781c0ae48db832dff28294101463d3ffa36eb9da1f76c8b419bf422dda668e278eb85e1300e65256ca5aa13f63d SHA512 e1b60dcbd70386a4adc9d65c4e530c38c4477611739baa8c82812ef77373319016d1d41bfe564745b535de6ee5d2ca7665825a455a72ef4403edcb17b26447fe
diff --git a/dev-python/ipaddr/ipaddr-2.2.0.ebuild b/dev-python/ipaddr/ipaddr-2.2.0.ebuild
index ed6a948969e8..beb88e66cad0 100644
--- a/dev-python/ipaddr/ipaddr-2.2.0.ebuild
+++ b/dev-python/ipaddr/ipaddr-2.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} pypy )
 
 inherit distutils-r1
 
diff --git a/dev-python/ipaddress/Manifest b/dev-python/ipaddress/Manifest
index 9bae4b717783..b5d3c149c27b 100644
--- a/dev-python/ipaddress/Manifest
+++ b/dev-python/ipaddress/Manifest
@@ -5,5 +5,5 @@ DIST ipaddress-1.0.22.tar.gz 33051 BLAKE2B ae9145a275d373f07ad3996b9c06007259cde
 EBUILD ipaddress-1.0.14.ebuild 617 BLAKE2B 77e3ecef32c54642bc2e5ffeea21ea424118a86eea0cff1256b2515e7781ce7cb0c619e462753dfc92160b55ae6ddcd30576cdca424176734774e0d20872b8ba SHA512 7b21d5cd33817248dcf66651222695cd198009682bda5ed82c0013593557fa85daf7677218c58c1a635e035f4adec9ee093dfc719389f7aa6d0517156b06f08e
 EBUILD ipaddress-1.0.18.ebuild 656 BLAKE2B 6391c57a20088a880d68452cdb1bdbcd81750328444b6383119f359a92ee3c9855965ed472d939c05772ab0e7599d507565d59b84be4a18f667ab6b74b340975 SHA512 78f7b945c912c19172352c9134f7fa9896e925803a3bd8d0145b51e90bf8a1600ebf8e0bbb9418538968b84f03cc909e58ce28c6787ab24ad5f87203f5145290
 EBUILD ipaddress-1.0.19.ebuild 669 BLAKE2B 5a2533360d461f56ead14f2ebe99684c27c4dbf359bb0fda9d3f3cddf1337b71d132ade9f27406c9243d393e85a0861ff6996fd3bee0e9a8f647d18de68d9d43 SHA512 ec4ee4f51587b10b024e345897f433c225bdf6e2da75a7f8ab63916b2bf02e44eedf9ece7bd4ddf643925aa56a4a5d84deae34ce4d836000e7ed50299277506a
-EBUILD ipaddress-1.0.22.ebuild 704 BLAKE2B fe01239dc321e8794e8aea6483b5f83c9fe05e538cc309c196b87224a75e3eb124e09fca1b69ca04316ad79422016eb412a17a14787433bbd52b10c9d66e8b70 SHA512 1db9041345505d4b511794cac063814856a5d8444580cb32139cbc98e4e6340c6c816ba285a60a7af58cfab4b580e591b971d954ad30da0b95a87cb24d931a7a
+EBUILD ipaddress-1.0.22.ebuild 746 BLAKE2B a244adec0f6d055ae5aafd0abefe3bb27d5fd42b3f0252ade14db9267708b7d02755b5eab105ebf866063170b8c643c583529d1c5a85e418d867e52eaf962fdc SHA512 81b9212c6efc88e70907c615e24f9f207bf0730c65b7d9e4ff66583b82ed672b7e71f23172a06d06498f550c96e30974cc148ec6436c894a1e61a531ce09f110
 MISC metadata.xml 501 BLAKE2B a1528e6bef6960599198e71c0bf4ef65b0feaf042d588e5a29970141703780892f907ac73aa247a94a14d00ac7e42d393ede430c39c9c322cc45403c22844182 SHA512 e3b1bcf46848fc0b6faf58d4b9df44df0d0dfb6649a6c7f3806d1ca148528ddccefb4323ebdb046ff4469c07f081a0ff0ef32d767b37d6539b77c356371ffd12
diff --git a/dev-python/ipaddress/ipaddress-1.0.22.ebuild b/dev-python/ipaddress/ipaddress-1.0.22.ebuild
index c18ba7bde414..cf9925aab3a8 100644
--- a/dev-python/ipaddress/ipaddress-1.0.22.ebuild
+++ b/dev-python/ipaddress/ipaddress-1.0.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="PSF-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index 847b4dd5afbc..7bc5ac95bb11 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -4,5 +4,5 @@ DIST ipython-5.8.0.tar.gz 4977824 BLAKE2B cfa0592e8b71f82d996e6e961c3ac478617132
 DIST ipython-6.1.0.tar.gz 5066094 BLAKE2B 4f68776ba15f50b2f0fcc1503dd5c62ac464d9d0ace0801f572c9cdc1a0ddd7d840369a3df5940551c848376985cc74848002cef53869014adb2fd9714989acd SHA512 6b1d9713b5e8c3870ac8cd8bea9d3a6f0c0302e3983017516128ede9f0baba21372890873df29fbba3f9d2f47ba16bfadb1c611f9de23b71595c0ab8f917695b
 EBUILD ipython-5.4.1-r2.ebuild 3708 BLAKE2B 47ab2288916b066abcd1b2c11360f1764f182cb4462720b033e0c3f06081e8df0f819e01ccaffef729f05f2354b9d2f48c16a1fb2c8ad15be5bae60725ef2be7 SHA512 11f99d893f5bd8082e485e149b1b02266a311bc2526e9db522cb1056731eb49efb88e7f379c526f151c0bece4c0c7b7a8e893fc3c3eb6f3bbd6094d5699d5616
 EBUILD ipython-5.8.0-r1.ebuild 3792 BLAKE2B 42e9d5314694221cdd5aef1ca86bd860799ebd5d87d197631777365f4d87a1925f8a63f7160d40531c2df193935f52a3c7aba2df502687bfd68c1f7c6abcea2a SHA512 41934ced17636c27de6214ef2bfd1797e808135521681ac22617f65468546ee1a20c30a1069037e3af55e7c9de144653a6ce3693c4a973d8a9920919f7cd6670
-EBUILD ipython-6.1.0-r1.ebuild 3396 BLAKE2B fb8641c29897a48e799601cf2509ca182835588de1e693393d7ee0a5063aa6ef717aef163ed23d0fba93d919eddc62526f6ecaabef252598809db0d1ab2a1384 SHA512 2de0470c9547819b58e7fbe5a8e030fe83b7a4c18923a711ffca048f37e9efe09b996d9794503b31cfb6e456e6337deb2dd8c1fe3040cc0d6ddec8541ad6e86a
+EBUILD ipython-6.1.0-r2.ebuild 3441 BLAKE2B ec48de937f75912708d7877f220d9c6644d32741c80187fd2200f2c1279b7102a7fc6c0e5a073e8d31979363e3c1d4a2623dcdd4f8f1df14177a77ca5415bf8a SHA512 54b09e9f252b042998f7fed0579fadb061e815a5b46dcf794b905fb73e6b288d2ed77a8b790bcef2921e77be451018ad3a4b6245cea7b2d377cd3a44b023b1be
 MISC metadata.xml 2857 BLAKE2B 89f6ea04a550e2e590f9e041c435fe578691118e24265d0f3c2465480cb32cbf4f5ca4d6c8fb2a08a665061347e19e361160f73aea080b1f67a4c9c743f6c23c SHA512 6b28c7f0be77e23656df143940074658a71ea872ba12238d3dc206f25662ddd589e3ebee11d5ca06498cfbbc651ae0effc95235feed91e853616706c87ca5bc4
diff --git a/dev-python/ipython/ipython-6.1.0-r1.ebuild b/dev-python/ipython/ipython-6.1.0-r2.ebuild
index d89e54743ec2..cf2d06ab0493 100644
--- a/dev-python/ipython/ipython-6.1.0-r1.ebuild
+++ b/dev-python/ipython/ipython-6.1.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,6 +23,7 @@ CDEPEND="
 	dev-python/pexpect[${PYTHON_USEDEP}]
 	dev-python/pickleshare[${PYTHON_USEDEP}]
 	>=dev-python/prompt_toolkit-1.0.4[${PYTHON_USEDEP}]
+	<dev-python/prompt_toolkit-2[${PYTHON_USEDEP}]
 	dev-python/pygments[${PYTHON_USEDEP}]
 	dev-python/pyparsing[${PYTHON_USEDEP}]
 	dev-python/simplegeneric[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-packaging/Manifest b/dev-python/jaraco-packaging/Manifest
index da9502e0eb2f..abef1856a50c 100644
--- a/dev-python/jaraco-packaging/Manifest
+++ b/dev-python/jaraco-packaging/Manifest
@@ -1,7 +1,9 @@
 DIST jaraco.packaging-4.1.tar.gz 8820 BLAKE2B 43c14e12439d161f9a42005dcaed4d6945fa35ec3498bed81d2e6d10b08b056838dcf92fd6319951dddcfc908c8d33796bd9515aa5e77a04c02298cdcfd240ba SHA512 381ac1ba3a8eeea1235e719d98b61e38399d3fea1310732b0e2f921a3d46544efbb12c23c03bfa3ecfa07697458cb8930ca5156df7b411509c7b1da0b673d7cd
 DIST jaraco.packaging-5.1.1.tar.gz 11056 BLAKE2B 6dcca468be3d960674c7de73af48ef78d96c80896a5f09aa99dad35c7dacb90700ce3cd74f59f4a437e26190091e12fb82f3285f30f99a83550a52424cfdebe9 SHA512 96ab954c7fe23632284c0493f749c5fda1368df0a5b60f5dc852aa4c47dadd1743a26772c783f0ec46109f166c9e26811324e2beeadb3e0cfdf9808091107032
 DIST jaraco.packaging-5.1.tar.gz 10393 BLAKE2B ddef0ea4006b1a114d81238d5182c03cc50186452b326ef9a02f1a2e745bc731fc6969475a306b25a22d6daec5951e8d11cacd61d519e82cb461140e5003813d SHA512 d86cf6fce8037a9a5f2dfe29c7df810376127b3e02d270bfbc11e16bd43c10e0ab76f2739e5cdf904a9e54ca8d7fc3559e51d089ee39b4486c84902b23be530c
+DIST jaraco.packaging-5.2.tar.gz 11573 BLAKE2B a119fe4e4de636ef5483cc8d16ca0076533c1cb86c8ec7061c0800aed84532a8689613401530223c0048ccd31d1ead974cc8ba37161b1e5601eb659453962e17 SHA512 5199caccf11952ac68f42462652730afec1aaa907495d65dcf9eb7d5ebcde3ebc8d1f2bf7d51543a764222f09606247a28bfedd9fa987d39934724bf7001c459
 EBUILD jaraco-packaging-4.1.ebuild 1197 BLAKE2B 61042c2611ad0bd9d2514468653b8bb168023c215d1ca4a19363b8b9fdb54a0fba00bf8d22ed93f791ff3c2ec45bd26f5a7aec88550ee309399dc0c315bf3b26 SHA512 d2b7932112d762cef53e6e89d91dbae5a81fb4f70f53b887082d3464eb1da86c661f774c583ebc592d306d65642e6f67019597a3a23ad7ec4031201eeb1391e5
 EBUILD jaraco-packaging-5.1.1.ebuild 1416 BLAKE2B 79f8de70973943aa46b009dff3f2751bac902da9e9f0c096b83440d565dc931394d7ea83f086c775d95397b5bcb6299272a278fb1823587ec2c3765861d62bb6 SHA512 2ca8b3bc5accca45f20c2d7efc20a304f4c6a3b3e7f59652496b5ef9313e1e3ef240f5410a345752d6a39d8ca54239314b75e9db71749d9af8de39b48c6d8404
 EBUILD jaraco-packaging-5.1.ebuild 1323 BLAKE2B 0802a20fc6bc08e3c0ba667b615f693533f69a78941c90a157b66d5f9bd4581d2d0c2d77f5d79cc6bdaca3f8f822b6be49a6842f0d186522d1207b6cce1d6f0a SHA512 26998bd60f1b8e9ec20b51897e7b3916446f7a493fe36b5b2f8df65f7ae0077ff01e50989eef21e356282bf810c5772e56e725c14076b5040ccf95cf0cc79e47
+EBUILD jaraco-packaging-5.2.ebuild 1419 BLAKE2B 363aec504785cb8e77a56dc4dca728be3eac4867657f11fbd29c9f67a9ef73b3092ebaf383f0b3fc9303870a95d33dcbb35a4aef1e9454c9205916ee5b1c647f SHA512 4c836e5bced7f5591eaef6effe90ba0ac56399b7398650b376eb518878fb8d800866a934137e34cabe9adca1ef5fd8b37b549c8577067ff0c7aca56c0216bf83
 MISC metadata.xml 651 BLAKE2B 145a05709cfd4b85e623982b7defaf588eb0d68ed3fcbb52655a5a8cd10fcb2cfb269b9179e81e5409be0485f4c71565ecbdc4019d9f07f322d2cfbc3731c2d0 SHA512 d8f857056e0a73cb34903a7001cda6f543eeec0182a87ee2bd660631ab9e855d1214166546c179b9711ec8ed9a5063b14d9362001e67203a7132694112ebf086
diff --git a/dev-python/jaraco-packaging/jaraco-packaging-5.2.ebuild b/dev-python/jaraco-packaging/jaraco-packaging-5.2.ebuild
new file mode 100644
index 000000000000..b37b62061864
--- /dev/null
+++ b/dev-python/jaraco-packaging/jaraco-packaging-5.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6,7}} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Tools to supplement packaging Python releases"
+HOMEPAGE="https://github.com/jaraco/jaraco.packaging"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd"
+IUSE="doc test"
+
+RDEPEND="
+	>=dev-python/six-1.4[${PYTHON_USEDEP}]
+	dev-python/namespace-jaraco[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	test? (
+		${RDEPEND}
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_compile_all() {
+	if use doc; then
+		cd docs || die
+		sphinx-build . _build/html || die
+		HTML_DOCS=( docs/_build/html/. )
+	fi
+}
+
+python_test() {
+	# Skip one test which requires network access
+	# Override pytest options to skip flake8
+	PYTHONPATH=. pytest -vv -k "not test_revived_distribution" \
+		--override-ini="addopts=--doctest-modules" \
+		|| die "tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/jenkins-webapi/Manifest b/dev-python/jenkins-webapi/Manifest
deleted file mode 100644
index da35d25d9609..000000000000
--- a/dev-python/jenkins-webapi/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST jenkins-1.596.3.war 68396864 BLAKE2B e391ffd919544f49570ba5bf76d61c91155f193e575b5ff11870153d9bdc3f997560f41de00dda8d1ffec5c5fec544c187442e8a5ff64d249dd8277257339641 SHA512 8652d4d18e3258208fe190c4a6aa5586faa66f690d7d7f7369c5490a587e3ec5e074dc22f2c8caedf5e5335f5b8f511717b2d6eb667a61e9948a703bf80310fe
-DIST jenkins-webapi-0.5.0.tar.gz 78813 BLAKE2B 0d017fd05a60bcc5d1333215e97c2d2ade658384d75a3dbb41c84e286d2b4c86d8383b28ba75e05b7f1ac5d153a46cb3c165cea063993f7aace79566dd25b4d9 SHA512 dde91231e6fe6713eb5953efa038d44a820b51968c2b0591e5dd064c7a35c7dab4d1780370dc97a0a671b3d3cb7d8a48e571c7c0af4f0d5f8a65430c8c074eb3
-EBUILD jenkins-webapi-0.5.0.ebuild 1561 BLAKE2B 0e6d68b7abcfe2f10ea49ff4c9acc6ecb1e05d9106095a3031ddbfb9ae33991a4354c6a2d5aca3ffd95db75dc819731134e0300b0b12c7699b5f7defdcb9749e SHA512 0f161b5bee11e27c546248db1ac75ad4d0abf687e6446764a65b049179c90d71c74e2a2f4b6098eee8749ee78f87a29cb6edc10ea929fd5f215ada77f120bc6f
-MISC metadata.xml 254 BLAKE2B 05f96be874d2a68967067703e58712096952aa8dca36bce98d4149440712ee7901eaa71761dcfead7fec125b4133098da92854d91531925e7a205fca0bfef368 SHA512 2e112d5670c712a9738320e0505f1758f82d57ddcb2bc71e3ad22ee08ef52538f150c316571e59cc3a86f3647cf3ebefe715762c79048e9a2ea56e1a6245ee77
diff --git a/dev-python/jenkins-webapi/jenkins-webapi-0.5.0.ebuild b/dev-python/jenkins-webapi/jenkins-webapi-0.5.0.ebuild
deleted file mode 100644
index b918a072d7ea..000000000000
--- a/dev-python/jenkins-webapi/jenkins-webapi-0.5.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
-
-inherit distutils-r1
-
-JENKINS_VERSION="1.596.3"
-
-DESCRIPTION="Module for interacting with the Jenkins CI server"
-HOMEPAGE="https://github.com/gvalkov/jenkins-webapi"
-SRC_URI="https://github.com/gvalkov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	test? ( http://mirrors.jenkins-ci.org/war-stable/${JENKINS_VERSION}/jenkins.war -> jenkins-${JENKINS_VERSION}.war )"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-RDEPEND=">=dev-python/requests-2.7.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		net-analyzer/netcat
-		net-misc/curl
-		app-arch/unzip
-		>=virtual/jre-1.7.0
-		>=dev-python/pytest-2.6.3[${PYTHON_USEDEP}]
-		>=dev-python/termcolor-1.1.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-cov-1.8.0[${PYTHON_USEDEP}]
-		>=dev-python/httmock-1.2.2[${PYTHON_USEDEP}] )
-	doc? (
-		>=dev-python/sphinx-1.2.3[${PYTHON_USEDEP}]
-		>=dev-python/alabaster-0.6.1[${PYTHON_USEDEP}] )"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-
-	if use test; then
-		# tests fail with jenkins 1.6x
-		# https://github.com/gvalkov/jenkins-webapi/issues/14
-		mkdir -p "${P}/tests/tmp/latest"
-		cp "${DISTDIR}/jenkins-${JENKINS_VERSION}.war" "${P}/tests/tmp/latest/jenkins.war"
-	fi
-}
-
-python_test() {
-	emake test
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/jenkins-webapi/metadata.xml b/dev-python/jenkins-webapi/metadata.xml
deleted file mode 100644
index 773d698964bf..000000000000
--- a/dev-python/jenkins-webapi/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">gvalkov/jenkins-webapi</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/jinja/Manifest b/dev-python/jinja/Manifest
index 27d6f6013ca0..3afbcdb9c01e 100644
--- a/dev-python/jinja/Manifest
+++ b/dev-python/jinja/Manifest
@@ -1,5 +1,5 @@
 DIST jinja-2.10.tar.gz 267508 BLAKE2B 3872a073bd3954a079aee74fb2f23815f75559a88a8ab6d849cc9855e158d096a1ac62c219ae7f48a54d082c3073e83749c8536439248c80494e882f6a18995f SHA512 bdfd3c4d01b39827c128cbd7f6ebc0ad1434748be41c5037ba1b23156eea1d28f805ffe2a051b4e9b5b38938615c35c8876095b0bf0bed2c139cf5ea49ae2420
 DIST jinja-2.9.5.tar.gz 486763 BLAKE2B 680b8d58056b180295b52998a573da2fe86ac8b117a942e647626aef16d42c7af89a0ba7f5ab098fcdb29bd18940e316144fea1882e15d71f67bda945b4a6ab8 SHA512 15c1b79981c4d6fcbb7fa947fe0fd7e43973433c03d6549a84deec8ad70881f7fd0d3a35160bf6371361994f838da7eb478c577de2612e004679ae51bd97b121
-EBUILD jinja-2.10.ebuild 1650 BLAKE2B a1c96a2a7535c2a1bd2efcab34bb21da44f1d131c3792d093ed5079b6477c117b93a8ef9ce302836e4850fb4b83b81155c6439dbedd5eae5199a742c794f86bb SHA512 4d86856ed1576736b96e04897e7480a424156bd41255c254f3743162146532a399375bc8ec65273466f0495ddf5f2f048f14c2044c0fb901f8d38b84533e3b89
+EBUILD jinja-2.10.ebuild 1646 BLAKE2B 97fda25c291e3519340f0e9c8e2e775b41996b46d6cf5d36e89a71b3cbefe55b005e04e237335c225d3a909d1cf675d5f7c667a0c39d5798befb7e8d7e2a1624 SHA512 9dd8c3037ab33b00acd7b985f7912a66f82acbcf2950ae0e3a60219fbe2de2555897556bee9851bb5d904ba9133e6354e150df23c2619872908fda7f6ff02858
 EBUILD jinja-2.9.5.ebuild 1740 BLAKE2B d08759cb68d6a1b856138fd0c881c055ed54bb81d69e9e8ea478123fbe691b1e34051a4de95ba96381858f9a550ffa2c635d8f4f79ce7347bc319829bf656ba2 SHA512 94aa068503ab5f0fe4841da24888b1e8cd48b456a72c95a6f9cc61b40991801f24212ade37842366d7b4bfde7676af332c84549e2cad9fc82cc729a8ef18a97a
 MISC metadata.xml 374 BLAKE2B 7d6caffa81473cac206ff3ad29cc5be6ebc22d82bd3a7eb0befec7cd65a859aa9208851237c629d0c019307986eafda5a93d2977d62f847d68dfe5d415139daf SHA512 5c3b1f608d45786b27c3bf31f04816f6a85e2cfaa44eec5a9aa21029a2e8ab26264e87f9a6faa4c44a44d718aa8186110fb4d0878655dd76d880a7173b6e5d59
diff --git a/dev-python/jinja/jinja-2.10.ebuild b/dev-python/jinja/jinja-2.10.ebuild
index 7de9a1e577a9..39c94ee41efa 100644
--- a/dev-python/jinja/jinja-2.10.ebuild
+++ b/dev-python/jinja/jinja-2.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/pallets/jinja/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/jmespath/Manifest b/dev-python/jmespath/Manifest
index c2bde38a9055..32e2be48d2ec 100644
--- a/dev-python/jmespath/Manifest
+++ b/dev-python/jmespath/Manifest
@@ -1,4 +1,4 @@
 DIST jmespath-0.9.3.tar.gz 22967 BLAKE2B c640b0fb29863e833adf200f2d3e364e65ff782f0f6046cf53463194cb8a69289e0146fc519c0e4d73a0606821f6d43d943e820b429b6fb53de06546688b39f7 SHA512 eeab444df7a29c0bc64bd8064c942a5b02772d39d6d262dbef1d43ebaf7e4eb97c34fb1df3a47c6da011a632ec5f9b1ffe62ac51929e8d412368b907ebbb85a7
-EBUILD jmespath-0.9.3-r1.ebuild 602 BLAKE2B 4cb4153f6b214a90a3e92a54360f360a4f3debd4913e90497e1552b70761d0a303bbee3508a4d58e828e8e9cd03f9f3f3a6b7cbb9857f0e2a4d8fa2e8faeb8dd SHA512 89841f7901fc387c9a49e2da359c180f7707beaaa9317848327da828be0c017af346a62f480907d0850460a234d5a86e986366e0b6fb6b0fb147e177be0f34e9
+EBUILD jmespath-0.9.3-r1.ebuild 597 BLAKE2B 92f2f0cfe715dac2eadead47fd00822914d63a0c5b4ff035b36b91663e20e2a29a461cca807aa1357daf2b889d91bcc6158fc26248f841c07fc990d49030de5b SHA512 0f180b87baba1159397b02fd5c2758dcac16d9b0c397fc514a295b725090d1d0b0f30413825f2143a9e1e0d3ba91463ab4407a48ee6b85001dd5850fff0cd0ec
 EBUILD jmespath-0.9.3.ebuild 596 BLAKE2B cfa95a354190528f74adfa490ca5a83f2fda452735e965058bb2f96f7de853b25ec02aa9b0e33899454cf0dc0c60d6687fbd165319725d066ccbffe9c0242485 SHA512 c8228ef016a6515e9b8c140b9132a5ef662911b766c55b2ecceca6b225b162fd041338547ee7391e0f90e014a6cd99c8f6774f155908cb742fb9ee6b5eb6f1de
 MISC metadata.xml 570 BLAKE2B a6d5d0e838a59de2031b7df52ac683dbc5a7d692ed96a6334bafc5e76d0018f32990913a49539e7d093f195f548ef4ab55e8cdc93c1fa1779d87140336e40a8e SHA512 dc7e96be59813dd79d3492c619d3080c0858711b948843a12a2b9043b853b99885b780b130425ed0f437d2f51139e0024c3f37623cc7c4794e86568995bea36b
diff --git a/dev-python/jmespath/jmespath-0.9.3-r1.ebuild b/dev-python/jmespath/jmespath-0.9.3-r1.ebuild
index 252f4e77c079..1f69d522981a 100644
--- a/dev-python/jmespath/jmespath-0.9.3-r1.ebuild
+++ b/dev-python/jmespath/jmespath-0.9.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-python/larch/Manifest b/dev-python/larch/Manifest
index 4bfc576e8de2..bbeebcb4b0a2 100644
--- a/dev-python/larch/Manifest
+++ b/dev-python/larch/Manifest
@@ -2,4 +2,4 @@ DIST python-larch_1.20130808.orig.tar.gz 88271 BLAKE2B 0a797c05ce5e177af608720a6
 DIST python-larch_1.20131130.orig.tar.gz 86509 BLAKE2B f964bf4af316e010cc40513e3a767ee7d0f058ec78bfa417931ae0087e0b8d0e0c577bd99b5edfedce560fc3d21747a81e75dc1ed3527f9b054d3e8e55df7f38 SHA512 e661fa29043a5254eb3615f0eb54f6afbaf59020607bb72f621083e9f6acfbe92b1c978ce2be73336d8984a4a64ce6d0153556f0af0ca63ad53aff40f785d052
 EBUILD larch-1.20130808.ebuild 670 BLAKE2B 616e307de7755446f6c5050ca43109910cf1128441e09dc94d765d39f2c959cd1ed3e932971a7a996a056a02f6b0663c99e1aa7d862efaebac8153c922015362 SHA512 3fe27d8f94fe95e777a10ef2ff23b58865b5ce367b471b7a26b586af605a853120c81c2a368abe8ae5c9c226923d90ddde204d55d780123f2bb67b9e10f8bd40
 EBUILD larch-1.20131130.ebuild 670 BLAKE2B 616e307de7755446f6c5050ca43109910cf1128441e09dc94d765d39f2c959cd1ed3e932971a7a996a056a02f6b0663c99e1aa7d862efaebac8153c922015362 SHA512 3fe27d8f94fe95e777a10ef2ff23b58865b5ce367b471b7a26b586af605a853120c81c2a368abe8ae5c9c226923d90ddde204d55d780123f2bb67b9e10f8bd40
-MISC metadata.xml 250 BLAKE2B fef48a48388f26a915c53bca9aa9cab62fb73ec006736542afb4cbbe0c7b81d23afe2884f52433c7d390fc38ac32f957a6f6efe285ee1cafaed76407a964cf9b SHA512 924271cfb32ceafc4134e19b53fbeed96f2e9056addc3c2cbdec28890254abf5f0714979a3ab698ca046e41ef5c2cca2932350830bd8bd3a8e214d99123c12de
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-python/larch/metadata.xml b/dev-python/larch/metadata.xml
index ea6b59e79026..7a38bb900964 100644
--- a/dev-python/larch/metadata.xml
+++ b/dev-python/larch/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>mschiff@gentoo.org</email>
-		<name>Marc Schiffbauer</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/dev-python/libvirt-python/Manifest b/dev-python/libvirt-python/Manifest
index d23edd962e17..9277887b6e82 100644
--- a/dev-python/libvirt-python/Manifest
+++ b/dev-python/libvirt-python/Manifest
@@ -1,6 +1,6 @@
 DIST libvirt-python-4.5.0.tar.gz 190016 BLAKE2B ba3aa68b2de6179cfddaff54bf96fa876959d97e72245ccdad8f9f681641166f5827d5244ae4c18b7a7b90a3201b3a797d30c2436a6ab5fcdbcfd56462348ba4 SHA512 14572225c2f5233aa8cb7257cff94d38effc4d988aac36108ca510dcd442d8c5194d6b25bddb2603bb1e1bc4dcb284f103899ce81063dc6a7994d78beea355ac
 DIST libvirt-python-4.9.0.tar.gz 191922 BLAKE2B 272f0827faa7083e4896b34cea81554505e38733313df556d608fbf0e2ab935088ec5d57e9678c7679e172ff99a619939abe8cbd828b49655de70daf11d20efe SHA512 7d1345693c87f11be9dc751212820f4c4a519a467703f0ea2fcafd0e66d39941686cf7c84c2c68e8639889da1bfbc9176a72cf1059c87d76a49b2c74a7b05c0e
 EBUILD libvirt-python-4.5.0.ebuild 982 BLAKE2B 4becbf00df8460246d3e933df6b701c95a616ac6f26878acd29200e5d12101fa94edf59ccfd9847d2ee03e94aacc1df78cfcf2da66973021a181962c885a84fb SHA512 c1c53e1a5d7fe3e71a7d5f99d943c1da3e118151fe158ecd0c50f8f0d40a9ddad370759cd65bd32453d0ba2d4a2f31b7b4a25718f530e784e56b39919345f574
-EBUILD libvirt-python-4.9.0.ebuild 972 BLAKE2B 277c4eab93dd6b60050d60cf500521d620a7fe8ccd24e872c6ac4de94d842b26c569e81ea3d9cb33fee3bdf351640f682a877d2a47998d0c7e7509570bf19e6e SHA512 7cf7d70ea6717282c09f8ecbd267c22bfe0c07b1d649f39b13903ceb3f527ed2763faad494d4276ccaa4c4a34bfaeb0e3974f325118fb1b45a498769b62363f9
-EBUILD libvirt-python-9999.ebuild 975 BLAKE2B 0f1b8f5fdc1b5b0746a183be50785ff9fae9ff8490a0c5320f30c9f964c764ed224e01fdb57badab4e46ad562d57a8571c79f5fc0d7aa6700921dd4c996571a5 SHA512 9312e564ad65170fdc81d786291c18c8f5f773ecdc734ba40dce5f0d0e4dd8e69f342933ed7b879efe865e1cc52bfd37555dea082643ed50f8a5fc268d908f34
+EBUILD libvirt-python-4.9.0.ebuild 976 BLAKE2B a427ecbeaff49398f9e9ac09674e881c143bd5e966b6b90d0d998c70dcffbf64419d651556e954694fca4807e42e7b1f84ab34f91d9618a93e1c6d106c65cd3d SHA512 6d7e5753d16cb3402475086d4ce4ce5d95984c2cdef6444d6ed1662fe6c24950826daf892e5360e0bd208ae1c3457b7986b51ebb877a401897e7e032e1f5ca27
+EBUILD libvirt-python-9999.ebuild 976 BLAKE2B a427ecbeaff49398f9e9ac09674e881c143bd5e966b6b90d0d998c70dcffbf64419d651556e954694fca4807e42e7b1f84ab34f91d9618a93e1c6d106c65cd3d SHA512 6d7e5753d16cb3402475086d4ce4ce5d95984c2cdef6444d6ed1662fe6c24950826daf892e5360e0bd208ae1c3457b7986b51ebb877a401897e7e032e1f5ca27
 MISC metadata.xml 518 BLAKE2B ac9993d622790a5cec52f737de0494b7ac6a5a6e17e66ccad8e4862257ba8926d688fa4b6e68cd96ea5a4f2d35825204219fd79bc5917d05a6f39787f80bc1df SHA512 243b815c70c65046d672bc2b4a05d67f61c6e70dc6677ef7e8b76783979d801793f8d864a33ed9c64072c4fa30786d4455c82c82fa37933dac0b0efac2264083
diff --git a/dev-python/libvirt-python/libvirt-python-4.9.0.ebuild b/dev-python/libvirt-python/libvirt-python-4.9.0.ebuild
index 968deb8ce73c..c2b3ec1b2d9b 100644
--- a/dev-python/libvirt-python/libvirt-python-4.9.0.ebuild
+++ b/dev-python/libvirt-python/libvirt-python-4.9.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
 
 MY_P="${P/_rc/-rc}"
 
diff --git a/dev-python/libvirt-python/libvirt-python-9999.ebuild b/dev-python/libvirt-python/libvirt-python-9999.ebuild
index 42d117b59bcb..c2b3ec1b2d9b 100644
--- a/dev-python/libvirt-python/libvirt-python-9999.ebuild
+++ b/dev-python/libvirt-python/libvirt-python-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
 
 MY_P="${P/_rc/-rc}"
 
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index e50ec6d3afce..daa025098d10 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -3,13 +3,13 @@ DIST llvm-4.0.1.src.tar.xz 21065652 BLAKE2B 6327eed2d1feb108440f22d2581d1ff86c10
 DIST llvm-5.0.2.src.tar.xz 23451868 BLAKE2B b7082be2e4ad557b29b9f6869811f262adcf5c73d552faf91b339bede75cf5eab58afefa12fa779a38be71fe2b8f4ea297c3213ee4e8370cc01972c59249d91c SHA512 3588be5ed969c3f7f6f16f56a12a6af2814d3d3c960d4a36ffebb0446cc75f19220bccee7fc605f9b01f5d5c188a905a046193cc12dec42dd5922048b5c27fe1
 DIST llvm-6.0.1.src.tar.xz 25306628 BLAKE2B 60232d4d22f8096b565cc8d81fea0639f24f14e8fc4f66ade69fa15479181f07f655f26dff3fa24bf105762b495da316c5c9352db234bd0af6b9c3fff6d4d881 SHA512 cbbb00eb99cfeb4aff623ee1a5ba075e7b5a76fc00c5f9f539ff28c108598f5708a0369d5bd92683def5a20c2fe60cab7827b42d628dbfcc79b57e0e91b84dd9
 DIST llvm-7.0.0.src.tar.xz 28324368 BLAKE2B 10168ff9be8f68536db3b2263c85c1c98213ef03dc542b83628ff176542452582bc496bab236fdf40d4a6463a33f04b27f1458c072ad8b66b641f8df8d494046 SHA512 bdc9b851c158b17e1bbeb7ac5ae49821bfb1251a3826fe8a3932cd1a43f9fb0d620c3de67150c1d9297bf0b86fa917e75978da29c3f751b277866dc90395abec
-DIST llvm-7.0.1rc2.src.tar.xz 28304444 BLAKE2B 245e45f77a2ec2d94b237d1015ccc1e409f0dc149dba3192c15293bc2d45ec40989081a930a5e55a4b0ebf906397c62afd910bc25c5c1eef7ea5e310d4172acb SHA512 cfc4d1926bae75f6f22350273ab76811f0b78ddad81717c9201d7814ebe7b902c5a9c6caa0232e2bdc14e819b008f914d055b23723e0ec4a5309809dc06c6bf4
+DIST llvm-7.0.1.src.tar.xz 28311056 BLAKE2B 737aa6144a415e41a4ff2c8bd5a727d6f14d7b1810c62cbefa5a25fe642c98cddf8a28e35c7e9783373aa3b96f5c0943229e229ad1b43e56e9ed6db0f27ab128 SHA512 ac43a3cb71a53deb55e3693653847cf20bf6f5d9056f224e6956c96d63bc59ebee9404f088eec9cabe65337b4607a905ef931354b373cf64e0004c6905a6b5df
 EBUILD lit-3.9.0.ebuild 790 BLAKE2B 13015298e24920449372388bc9a0fe5b5c705b49bbc50cc6114c8b18f9861acca1d394d08de4ee87db70ee9d363309a3cf8f3ac1bbff865a0c6c6f5c14aaac6b SHA512 57854f8499794d42e9c312b006f54454bbac7679c166c603872ebffe01c47411bff083f7fce0eb817151056ecdd72562224e383de96bdd5c46487f895e33a6e2
 EBUILD lit-4.0.1.ebuild 811 BLAKE2B 6a11590228ab794a2da32f75b8d72edd64a6a394640230a0d524b5784b21caf710fe6085fc913f48671e1812365d9665ae2dca3dca8697636b5149f69f6163a1 SHA512 583bb3c1a0fc61aa0e8fe1ba2beea9c4910f7af699b782b038ecce78e509cc2ffd219f8b63b8c83edd475eeee54c46c4cca4dbe602c6e833859fd784649d0820
 EBUILD lit-5.0.2.ebuild 904 BLAKE2B 74ccf4ce59c6aba63fec1f0dfed1e49bf751abf8cf61626f95534f46ecaece80b793481d7cf8115193007c9c13139018f28b6e4c86566d8481614229a84be5c6 SHA512 13a3ea3609045b3cba077e931b5ae52837c4510640bd5b6df7df6819166e069f3d4eef85ecd5dc1043868d7889539383f64c9f0655de0d88129e6b0d7a4f8986
 EBUILD lit-6.0.1.ebuild 1014 BLAKE2B 549c00ba1da9265ef26ea04d574d139f1fbab99f79ed60f270ff960f940df4507376fe31d48776241ecf4a4cb84f134abec61c000a27756ba057083527cd6607 SHA512 729a2b96a49758b18e59ec9df38ddff9890953283185cbae0abeef1cf4f11c2680485f26ffa70a85b326a389a3230e459700366b06f6bcee5a4be9854afeef62
 EBUILD lit-7.0.0.ebuild 1020 BLAKE2B 7a15942d41e7ef2bc5a739d12a8dba1c1a2788c900638950469b47ad44b324f15b5495a87e55b8d3567c072ad3af4575ff3a89d7ac8a59c377ec839c28ac83b1 SHA512 c4a0838f38dbe922eb10bb6d06a3ab4513d70c50bcd49d066cbde006a7228a9b896029560f76e15ddd2bff6a88c01c2934c6e70f6da0746fa2e1c83f2474669b
-EBUILD lit-7.0.1_rc2.ebuild 1023 BLAKE2B 0f0bc45bdad2c4328ec57aa73a6500ff8a6dc772c35af082500080249a90d385ff42d504b3adf6a7d69afe68434b5acb955540694b2e528ad6f1bb2f5d3b0f57 SHA512 c1c14d0771f718f2650c06e87927194fa2210ce94d5e091a1d206d6044861b9ac5db1e8bd92ffaa71fe63dfb932bb4e81f3cbc5211df6084d448fd121fafb2c1
+EBUILD lit-7.0.1.ebuild 1017 BLAKE2B f901810a470fdf95f71bb19e6be4a1321e7abe84054bb529541750dea272ffb33c4eda1e131d2b9984225f25d28036876b56d8bb0c9a76a623f7d678098b4932 SHA512 ddb2c555b404d838b4717506a3bdbd40fe5a8d1490175ff65c12601ab1805882b48eb585a1ea1ed761638469145d1e5ecd0696bb01c4ff3d83c5e817a99d5c9f
 EBUILD lit-7.0.9999.ebuild 963 BLAKE2B afea4754348b5b93f93ef1723974f218ccf92bcceb342ba5f453e8d82399358689b4bb30d04e65e63de761ccc92bd2c776d6233c618a12abaf4fda1a770974ff SHA512 dab5c3d116a590f677a9d3773d5652e7a676d26a4477ed10a4f8248f93297881ec1bd9cd6fbca6c06546d0926bdd5aedc9f478736550114bdb777c61ccaf5bca
 EBUILD lit-9999.ebuild 938 BLAKE2B fb5fe20c62d06e44e847f6e9f16429e9814d2872281295eb12ea25baf2448be889ec3bac37ec4350971b44c6785aafe9795fd68cbfda1b2cb299f41f28a254fd SHA512 a21a7a2935e8d8c82f319bf65e1b01e135448c2d342baea28b05451f4f9de938b52d3a8e63d544ec35cf4e7ae7bc9bf432eea3f4a44d044631c9ae7ea6fbfdcf
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-python/lit/lit-7.0.1_rc2.ebuild b/dev-python/lit/lit-7.0.1.ebuild
index 439337c6f5e5..d1946f24e20c 100644
--- a/dev-python/lit/lit-7.0.1_rc2.ebuild
+++ b/dev-python/lit/lit-7.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit distutils-r1 multiprocessing
 MY_P=llvm-${PV/_/}.src
 DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
 HOMEPAGE="https://llvm.org/"
-SRC_URI="https://prereleases.llvm.org/${PV/_//}/${MY_P}.tar.xz"
+SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz"
 
 LICENSE="UoI-NCSA"
 SLOT="0"
diff --git a/dev-python/llfuse/Manifest b/dev-python/llfuse/Manifest
index 1618f781749c..e4aaa8b1d9df 100644
--- a/dev-python/llfuse/Manifest
+++ b/dev-python/llfuse/Manifest
@@ -1,6 +1,9 @@
 AUX llfuse-1.3-cflags.patch 752 BLAKE2B aff689d4ddd5b5e5cc977595891c68b4e4b5876d0faf5cd243be942961abec618f861d835fa501585c04902a4be1491854d8a80c32442b4125cfdf8c29984444 SHA512 e0751e90fa89fe7fff6844b5be3cd8b55cbe4c62fb3341643a9049ff54c2e8bccc439ce444822b9d0858c83a3cd12dbede5253f9a9e6544ef26747a19f8f233a
+AUX llfuse-1.3.5-cflags.patch 662 BLAKE2B 39e0c35ffbb62b4a6b7b7c5592da8c87554ea733d07d879e6f58dd62003f30812cb4320e41484797cae4f113d271dc8c8625fe847270cae7e35085c2ae67a357 SHA512 f66c13ddee81acc63cb65c09f2836c9a2409f24bebc5b7e3b5fea3f7e626aa52e5d19798ef5ab281d0dd31c3efbc4378003bd93461cfda36fcc726fc871aadf4
 DIST llfuse-1.3.2.tar.bz2 348035 BLAKE2B d3a3219c8d7462f448486488971842362b6ade8fcf6804d725db30b0e91d3f240ec9443705cb67caf3e6beae8a174f323465695dddd132210e3606aef6dd861d SHA512 f065818134b12dd128574836bc7d339404d9b7d9236b535da709378e9206b17cb2accd97fc0b658f39a93efe126a7c3064f7901468231f63f8398a3e053498cf
 DIST llfuse-1.3.4.tar.bz2 364400 BLAKE2B 726a42381b84fc57e3e54d519bc1a105056cc8cf5d1c586ea12b1798db493254df7088f1060ffda0d89887c2b7db2046825e4f044953153e7978891f72032457 SHA512 6bda4534f660c42e6740093be0a2c308367f5915a0144d44c390b4f6b197efafb48bc28f7f8d1735defe470e37637bd6688690e26ec3d0c01cb7c197e443f6e6
+DIST llfuse-1.3.5.tar.bz2 362266 BLAKE2B 561439e193470c047aa32b5b4ffd189beca2496b0141d9f0b0d4b494ee135025b174744ac3c90a0e5e8a17cc98f4ab2e8b4a9069f7d73e01a369f5013d036144 SHA512 d45c5fe7e81fd561e016fe99cc7bbac0cf6243e1517e992fe5b302b641aa93c8f95779cb7a4add7a7479f1ed6ca35e0fcf1e4da0fc46ee5d819b46511927613c
 EBUILD llfuse-1.3.2.ebuild 1031 BLAKE2B 0e6725a78cfbf939654bbb986ab2537d2d06fdbac00f205fb1095f82515c2fc0c05d5f8c04394ba39c4af7f8ed9a36c0a5fc5e6ac76ab00eea55bcfea7dd7e2b SHA512 6344c4a14c45c177a44ad5c3a48aec2a7c206d774e3b4008f25dba53678e9bc708e9edff2ab3b9aac8d070db9441d1d5cee5d730655a9842b42ca99b9aac00c7
 EBUILD llfuse-1.3.4.ebuild 986 BLAKE2B 500242c0ab46b5565498b0325c37a1790e61af47e3b6aabb57ff3039699abdbe3161c058c7c6ff80a710381f8a93bb5f8736291b36ffe3a105fdcc49227898d6 SHA512 be44aef73335b5caec9ef0386358c2e0e3593c3d65afc44bb78b7a6ff3912ff0893e8cd9a7905e41b8f22577c9eb2971a9633dd42a17312c16e0c7ef52d85dcb
-MISC metadata.xml 309 BLAKE2B 35b86dac2f17820c91bccad58f8c0caa57d8b8ec9b549cca330ec285271cd8cbcae173b7d68fdfc7eb7b99f051eadd37b5ed1053f20e57021e6a51ad460f867a SHA512 31061d2419abdc0ded07625ee0a21bc77162b15db90e2559ab9ce71e8a3aed1c866de5aebd8b1b24f566b79a85a45bec4c941542d268daf9df65bdb711d59342
+EBUILD llfuse-1.3.5.ebuild 984 BLAKE2B e08aef560ac42436094c14aedb2d306b24d6bebbc94d8c1365babfd26dcf98c59b8c9cd21d5dbe87061047bb9f13c82be202b9001e5dbd7b42078335826c8d96 SHA512 a5f2ff73445eb31bfb4380d0ffaa1866ca448e15d877467d7c44f4b622f1aaf927600d33714fd8e97a4645b900e428eb85849169d66cfa05a42c7d7f940bde71
+MISC metadata.xml 376 BLAKE2B 1af93242bcb6260813d1bfd9ea8705cd5aad5bd6832dc99d49b1ad3cff9ab85c59fa7e2fd713f3a30055d8e5a1c507b12a3cb8324c661062490eab6fb04f280d SHA512 f3283b1b857582140d4bda3c2456889e23e7c82d8a95efd9d9dabc18c49c4c37f160ffe082932eecc738d7b045f4c6607b09a89f0e8c414e0329834fd7588fbe
diff --git a/dev-python/llfuse/files/llfuse-1.3.5-cflags.patch b/dev-python/llfuse/files/llfuse-1.3.5-cflags.patch
new file mode 100644
index 000000000000..43490cf5f4db
--- /dev/null
+++ b/dev-python/llfuse/files/llfuse-1.3.5-cflags.patch
@@ -0,0 +1,15 @@
+Build fails under pypy(3) when enabling these flags.
+
+--- llfuse-1.3.5/setup.py
++++ llfuse-1.3.5/setup.py
+@@ -74,8 +74,8 @@
+         long_desc = fh.read()
+ 
+     compile_args = pkg_config('fuse', cflags=True, ldflags=False, min_ver='2.8.0')
+-    compile_args += ['-DFUSE_USE_VERSION=29', '-Wall', '-Wextra', '-Wconversion',
+-                     '-Wsign-compare', '-DLLFUSE_VERSION="%s"' % LLFUSE_VERSION]
++    compile_args += ['-DFUSE_USE_VERSION=29', '-Wall', '-Wextra',
++                     '-DLLFUSE_VERSION="%s"' % LLFUSE_VERSION]
+ 
+     # We may have unused functions if we compile for older FUSE versions
+     compile_args.append('-Wno-unused-function')
diff --git a/dev-python/llfuse/llfuse-1.3.5.ebuild b/dev-python/llfuse/llfuse-1.3.5.ebuild
new file mode 100644
index 000000000000..34f4566ce6d9
--- /dev/null
+++ b/dev-python/llfuse/llfuse-1.3.5.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for the low-level FUSE API"
+HOMEPAGE="https://github.com/python-llfuse/python-llfuse/ https://pypi.org/project/llfuse/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples test"
+
+RDEPEND=">=sys-fs/fuse-2.8.0:0
+	$(python_gen_cond_dep 'dev-python/contextlib2[${PYTHON_USEDEP}]' python2_7 pypy)
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	sys-apps/attr
+	virtual/pkgconfig
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=( "${FILESDIR}"/${P}-cflags.patch )
+
+python_test() {
+	py.test -v || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/html/. )
+	use examples && dodoc -r examples
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/llfuse/metadata.xml b/dev-python/llfuse/metadata.xml
index 9460e17f2acd..2ff4c6f13a04 100644
--- a/dev-python/llfuse/metadata.xml
+++ b/dev-python/llfuse/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">llfuse</remote-id>
+		<remote-id type="github">python-llfuse/python-llfuse</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/llvmlite/Manifest b/dev-python/llvmlite/Manifest
index a13adc7153ab..6d3476e59c1b 100644
--- a/dev-python/llvmlite/Manifest
+++ b/dev-python/llvmlite/Manifest
@@ -3,8 +3,10 @@ DIST llvmlite-0.20.0.tar.gz 96753 BLAKE2B ec9cfa554f44162c0d6e755628603c9afd8564
 DIST llvmlite-0.22.0.gh.tar.gz 156077 BLAKE2B 1b95a0636807fcf38955b32bd5c7c19784df2cc6708f23624c047f0e9caf4eb2fc26c7a1cb778d7cc7e42b8aeaee1ed43c92bcdaf7eb2e798c25f692b96b786a SHA512 633ec4d294dc246ebff5c7931e9bea86efa28323242411f3f54bc34c99085ebaef477b5bfd8224080790a12b188308ff9662c284b360e1a2939f4fe9b84a9458
 DIST llvmlite-0.24.0.gh.tar.gz 169577 BLAKE2B 7fedf8b9ec49f537db27a77c5880fb3bb41d126c615e73a4fd503ff781dcd4745c4f708cccd31d9b5544609ab7821e8ef1299856ef13ec3912ad2341af12a3ce SHA512 14b8918f9f58a88596607e697212aa516a99c65f71257d22f09e6b735f517a38f11142a63bf2e8f117c6ceff97153a5e686fa322d62abd14000db7e9ae136900
 DIST llvmlite-0.25.0.gh.tar.gz 173304 BLAKE2B 1376dee4b81343d22f218b0bc1c31f6dbd5eb1d8e4788a504626c1a653aa92500ab0685117c0d73c2a561e957dd930e411b4b128a85c9fddc712cee102690521 SHA512 a72b49db7720fa8a76647f9ad875b8e43e8738127a27fcb2646e28a543fb4e334ed690965e0c973e9d50b05fcbe4b9466f87c82936b3d49e61f774d0c7fd827e
+DIST llvmlite-0.26.0.gh.tar.gz 175536 BLAKE2B 6736e94c13974bb79bcda08ef58dd6d1e67d07a0173b5f2ab1b2fcf9a6e72b2a0b8737da5598023fa0c6db85cfd84f2d429f6077e1342a15b500376addd03c69 SHA512 e6bf76b209f44624fe21551971d422bbee6a6dcdfbd2c42607904be32db1b94cfcb185e70198fced5deadd938208d66d94eed4cea31726ae7f4779d58b57eb48
 EBUILD llvmlite-0.20.0.ebuild 1286 BLAKE2B ba74befabce5dbf8a93148349e230788702f1372788f99f388c827700a2209c77b7a0ff80a0c728da14f11e6170658b0d87b6ed5ce28a1500c33f8a42adc8af5 SHA512 afeeea625207aaa2ed0a60ac07fb8546e513c21bd8f864d5b0e29570016b5a7431b21d4ba4beb23822cc6be38bce5d5c34604e544b900edba1b6b1cf57f7d600
 EBUILD llvmlite-0.22.0.ebuild 1360 BLAKE2B 267e9ef9f11755fee54add20f9dcea37d9fc3b3379452fb8dc7a79175c6c17a2e138746c4383abd364e76f41c9cf3a2a1648a1e9647ee3a1e56b1c34552f1af9 SHA512 dba7536de56e1e34999c65045d1262eeff964b618653c17b12824e24a3bbe149b602ba4a6dbe442caffe6f671aee0a804fa160c21cc90beef4fdb911af5b20d3
 EBUILD llvmlite-0.24.0.ebuild 1373 BLAKE2B c9a3d565bf96d46f014d930e75367de160b262c7ef0ed628f67ecf20952e4de30a7cd107701697317f3f8c8eab391d19c3e586f18b7657d6a075a0be36e186e9 SHA512 1a3b72daca787f501e37489c6d207c53179314bf3aa71a9c3b6c895ba3f08ac603ffffc23847ff5e6644d162b126e08520a55c05d1375cbf1387905db1bc75bc
 EBUILD llvmlite-0.25.0.ebuild 1510 BLAKE2B 49bc0513608d6e5013d5f69371d304454084807d88461d39f764f017388444a28258fba85e901bd346a7a6852416cd4674ad574009d55a55c44e4a579cdc0dcf SHA512 0431ff3344cd210661445ff2a910fe5cea5cddfd22ddfea15180b62e8e1c41cd48e801cab9c173d59e6989dc5f9c624daf57b93bae736e628f2c771979c5739f
+EBUILD llvmlite-0.26.0.ebuild 1510 BLAKE2B 49bc0513608d6e5013d5f69371d304454084807d88461d39f764f017388444a28258fba85e901bd346a7a6852416cd4674ad574009d55a55c44e4a579cdc0dcf SHA512 0431ff3344cd210661445ff2a910fe5cea5cddfd22ddfea15180b62e8e1c41cd48e801cab9c173d59e6989dc5f9c624daf57b93bae736e628f2c771979c5739f
 MISC metadata.xml 792 BLAKE2B 8247c0ac546df47bc70b8e525d776dd391fa553d75d7bb0507986ac2f7efe1d023db7259f8938c13b383ef719a10acb3e1357bca4dc398a42b68ba756c0c351a SHA512 8dab7bc4b6d33f9a3c458dde08e07fe22680238185e8f144ada7ce7374ecb3fbd38149f67d2a11cba7a816384c556edf618e45ec331e6054b97aee60c529a35a
diff --git a/dev-python/llvmlite/llvmlite-0.26.0.ebuild b/dev-python/llvmlite/llvmlite-0.26.0.ebuild
new file mode 100644
index 000000000000..64fcac011116
--- /dev/null
+++ b/dev-python/llvmlite/llvmlite-0.26.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
+
+inherit distutils-r1 llvm
+
+DESCRIPTION="Python wrapper around the llvm C++ library"
+HOMEPAGE="http://llvmlite.pydata.org/"
+SRC_URI="https://github.com/numba/llvmlite/archive/v${PV/_/}.tar.gz -> ${P/_/}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples"
+
+LLVM_MAX_SLOT=6
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	>=sys-devel/llvm-6.0.0-r1:${LLVM_MAX_SLOT}
+	sys-libs/zlib:0=
+	virtual/python-enum34[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+S=${WORKDIR}/${P/_/}
+
+PATCHES=(
+	"${FILESDIR}"/llvmlite-0.15.0-use-system-six.patch
+)
+
+python_configure_all() {
+	# upstream's build system is just horrible, and they ignored the PR
+	# fixing it, so let's build the shared lib properly using implicit
+	# make rules
+
+	export LDLIBS=$(llvm-config --libs all)
+	export CXXFLAGS="$(llvm-config --cxxflags) -fPIC ${CXXFLAGS}"
+	export LDFLAGS="$(llvm-config --ldflags) ${LDFLAGS}"
+
+	local files=( ffi/*.cpp )
+	emake -f - <<EOF
+ffi/libllvmlite.so: ${files[*]/.cpp/.o}
+	\$(CXX) -shared \$(CXXFLAGS) \$(LDFLAGS) -o \$@ \$^ \$(LDLIBS)
+EOF
+}
+
+python_test() {
+	"${EPYTHON}" runtests.py -v || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-python/lxml/Manifest b/dev-python/lxml/Manifest
index 30d0138935f1..78cc3664dd6f 100644
--- a/dev-python/lxml/Manifest
+++ b/dev-python/lxml/Manifest
@@ -3,5 +3,5 @@ AUX lxml-3.6.4-fix-test_xmlschema.patch 1483 BLAKE2B 95c7610f2626471ca7694699346
 DIST lxml-4.1.1.tar.gz 2380804 BLAKE2B 4d3c4ef0472c7af7bb4185142a8274b596dd55a908d41f5295d0a78031a7efb3aef8893ca739f8db0675e44d4b0c346746a2758d31a54825c06a153203599ab9 SHA512 9542e5206f9b2f9e072c52ef8e6cf44d1aaae8ae3e7ca7e820c1fac12e716503308ccb3cebc52155b4c93799f3ebca247781fc491524d004378bd26f5cddb9d1
 DIST lxml-4.2.5.tar.gz 4414081 BLAKE2B c1c75a0a0c33011e2becb729de2c15dd786dd12bddeba4f2f26032d0d17104f258b471f5f961cbf96340df66cbce3e874d7a16c59731af280a309132b669d1b9 SHA512 4cf336d3e1471e8a26492760a143881517d12eb1c2dad82f8786540471bfabd68f8c795d97b7362166418c2be3c7996816638fdbd5a594536b9981478b90fdfe
 EBUILD lxml-4.1.1.ebuild 2255 BLAKE2B ac130330e175fc5639729716306218108619bf2e681e4f9338f08fee19a8687c76918a6cedfb967ba5279db1dd351b882c61a8785595e857eecfac7d4130211f SHA512 d46331d190b2a450a25f8049513b4eb949cefc664a432be3dbb3e9d1760706ce18ad3d6f59b858211be96cd022c1c31d5f434db5f34b8f20206403e41e2fbe1e
-EBUILD lxml-4.2.5.ebuild 2364 BLAKE2B 8fae54eb97ba2efb50a61c03ee24e07ddd769b4da75cd20f4febb2fa96ba656f621f726160281c45ffecd121c8970ef33c73e1468a48b0dd23fca0f1d199cbd6 SHA512 d5b1b56c8547e6cfdebc2dd3a9eed1528561d93ae0dcf37da0ccc86afad00a2d2149b201f865ba2ae1a5da2c607749fa5446ad1c594ad233a68c811f55278511
+EBUILD lxml-4.2.5.ebuild 2353 BLAKE2B 5ac6a995b3fed4b292a529f8d112f6c212dbdf4d5aba3c7c6d05da720c1b79a78919e9f3919e793440b280df4f5947dcf00d88946152da1b681466ad6bc803fc SHA512 96c71b0b55be968fe85765f9043e44bb517e4cd7e420e45dbb3fbd269cdf390fb60ec588873498d63bb07977206534c6d9bb2b787e68955f7da6b6469391642f
 MISC metadata.xml 317 BLAKE2B ba93bbba5105423b6640b86b29f2a54ff50c9daf42424915cfe25049e983ca03c6f2fc066d4e27fe42292e8290b7091bc00d5a40f49d368a3dd6acce42c4504e SHA512 900609bfd7cd032821afb5d1f6e5c25287178f06a49e59431a710d4e76187a2b41a4a0da383d257777a2120b60f15620da37c70d145eca4a84aa30a08b824fae
diff --git a/dev-python/lxml/lxml-4.2.5.ebuild b/dev-python/lxml/lxml-4.2.5.ebuild
index 4d4460e6ae4c..83887cb6fdc8 100644
--- a/dev-python/lxml/lxml-4.2.5.ebuild
+++ b/dev-python/lxml/lxml-4.2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD ElementTree GPL-2 PSF-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~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.
diff --git a/dev-python/m2crypto/Manifest b/dev-python/m2crypto/Manifest
index c5f4e37a8933..95b21b621e2e 100644
--- a/dev-python/m2crypto/Manifest
+++ b/dev-python/m2crypto/Manifest
@@ -1,7 +1,9 @@
 AUX m2crypto-libressl-version-check.patch 5125 BLAKE2B 969595234bc845f5a5c31f0fbe8bfb69f9eb41dd99f4053757ddcb0fcbd3a9a6e3b725dc1eb3d73108a69c496cbfc66bd52a3eefe0763e27e2f7b82b9f8c9a38 SHA512 36fc26175591bd731de80bea08887d76d3cedd2049d17c838001eb75bea2762d5b93eaa6fe7aa45d3d156dc93ddfd73c1a58a548d6325408960e08dc54bf233a
 DIST M2Crypto-0.24.0.tar.gz 184457 BLAKE2B 15a11dc1b13359041875e8321d0159a1a393b7f85dfbd38d650721d8a2eaed2cc2199859c3e1e3c890033711e0b137f4c78b90f04681ff44a3356558b9f55aea SHA512 c23ae0f8ac790d4ef108a217a44e994341f6bbe4e12a7fef2518d8def82331246a145e19a2504b82b790a3ad4b467d2facc8a73bb7f1190b56441d8482c66aca
 DIST M2Crypto-0.27.0.tar.gz 1119288 BLAKE2B 90e227aef9a5b4c7f5ab9bd62fbe506ea0931a6c338c530adbeb1a8303a31cc7755d13003532fe0ee4005f1997db23bed2d03cd54224dc7d89a6f23882197800 SHA512 df0f6b16f7d00a19fafbb5da5a3ececff6b4627accd00ca65e0d6f9e752a97f41016d0072c8e681475fe1d87c89b7474067068c0bfce6c68a30baddeb31bfac2
+DIST M2Crypto-0.31.0.tar.gz 1292016 BLAKE2B 3f1e0e8f686719ff87fa3a51cdc287be989fa1554866582deb1968fd04605270e14cbfd280f64211c043c5d8cb77a09e6a8cec6824ab15416ab94366aa73d2a3 SHA512 9f3e2afda4b8ac14aa64a1534e446eb6895ec7182ce5b7ded8008178e01139d383561a87f8c9fb5fe4b9c257ba5c6b93339955eb9e2f7417cd3f4832c35c4598
 EBUILD m2crypto-0.24.0.ebuild 935 BLAKE2B d15257bc6f02af9dce4514f19e7b2e1ba29eb3e1091acb8f03caf2db32164fc87548f5b55e37e8d616b1fb3ddd19a43cd899aa248ef9300a910af644ab6b2e4b SHA512 39c75d9af3ed016a8c3e363350a4f37ef7c31b8867684f66189652127494f4a53aea5edf451005a3c6b901241797556ab237521f80f6ca9860b6b2a4a97b7dcf
 EBUILD m2crypto-0.27.0-r2.ebuild 1361 BLAKE2B 85800c96f50f5f080eee9aa96523dae8f6ace906568b6fbfb1d04bfceedce813bd24eb315364909c0bdae164a4856e369fa64dd4b01f2f2e65eda6e5696b0833 SHA512 777df5b5eddf9cf1e4db99c680b3bf08a3a99c3100b701dc41b1c7943fdc8f6da5b212a9668ae3e3cf820c39cab24b5e034d8546c0a360351a51cefc1b841320
 EBUILD m2crypto-0.27.0.ebuild 1298 BLAKE2B 97104e95a890d7dd30a9ccbbe4328e09e3d99ab86736aa68dbafb3e2334174e9f2a64964351f7cee426b2433bb008b5bd816a454c30714aafc9ef0d8bbd8cb6a SHA512 a4ed82f6f69fa6edb4ac6449c4472f76c7ffd438711376cfe616b0cb0b3a06639d7f1ea31dfbdceef8d17847982997b0ed722df3d53193ad2471553b2bb3bb7a
+EBUILD m2crypto-0.31.0.ebuild 1307 BLAKE2B fc5e832da62001b9af77ef32dc118c820ee640318609a9564f718dea97a50ada617a879f8daa11b40b85ced1da100487528261ab26ac2bac906603c4f5b1166d SHA512 cf86160885ac3f6bc37209895c608c3832ce03e6f65916fd40162a7ae9b48d612f4df4b8f42ab17aa247040785108df2a9c1e422b8f8443ba4fda86ea2d339cc
 MISC metadata.xml 380 BLAKE2B 99a1c8e8202bed7c6d0ff8cdff3f17b664791405b082be2b7d72b3fe2b77bf89c886666d9bdce6a96c540b9518042b9d49b9af926ca10ab4c5b3b416182de01c SHA512 f2e3b4228c45471f0132b3bb412f017f4006eb82bd63e187db3efdfd3f412c1db19bdb79d37630bb059f75ef69f110687b8924d22c2aef0101cb40eb3486f1e6
diff --git a/dev-python/m2crypto/m2crypto-0.31.0.ebuild b/dev-python/m2crypto/m2crypto-0.31.0.ebuild
new file mode 100644
index 000000000000..89114bf03d7f
--- /dev/null
+++ b/dev-python/m2crypto/m2crypto-0.31.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4..7})
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+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="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+
+# NOTE: Apparently nobody cares about libressl support, dropping support
+# IUSE="libressl"
+
+RDEPEND="
+	dev-libs/openssl:0=[-bindist(-)]
+	virtual/python-typing[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	>=dev-lang/swig-2.0.9
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+# Tests access network, and fail randomly. Bug #431458.
+RESTRICT=test
+
+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
+	# TODO: Fix cross-compiles
+	local -x SWIG_FEATURES=
+	case ${ABI} in
+		x32) SWIG_FEATURES="-D__ILP32__" ;;
+	esac
+	distutils-r1_python_compile --openssl="${EPREFIX}"/usr
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/markups/Manifest b/dev-python/markups/Manifest
index cfb0ee52c78b..65db7f322eba 100644
--- a/dev-python/markups/Manifest
+++ b/dev-python/markups/Manifest
@@ -1,3 +1,5 @@
 DIST Markups-2.0.0.tar.gz 16772 BLAKE2B 88091cbdb6dc5c7289561e4ff8d585335f13ece27ff62951d7356bb89b35e09b8eeafb960583f9dd5faa5fbe9cdb6961523a5314bca8c78e2f0f80514f28595a SHA512 8ccd348efea68678bfb7f47bd13da2729f95a5b5a8d44f11239dbb86b8224867cb1197e46d875ab9a0ba914be004bdc9aa6848b1e6549dc53b12e06040faaaae
+DIST Markups-3.0.0.tar.gz 16966 BLAKE2B 9245b1b0056bda9538fabf8540ddc41f2861a41c2ea42f29da195393bb85a63af1273109cb8f3d15ee4b257774512e3002d95948bab4a4493d89e18d687f19ce SHA512 3dfb97f29e801fa296e7ea22f2693d05fe9a9bfdf6c9b560cf6a44d04abfb6c2ac0717093732b6fbd9ea052ab9f8d054b3aae10a0c16516af3815ca1d720aef5
 EBUILD markups-2.0.0.ebuild 662 BLAKE2B d600b61e9a18586cc212dca8f715c76a67a2dd310a0c5c8936bcd0f6d6743a8d51c509e94350ed442f86131fae67af78399301e0b70518983fd3e16fa4593335 SHA512 cc613808883d44de04bc99d5765d9d58015ff4fd381e99eb7b288b8a81630d298241a7a217e6d25fe1dd40f9fd1a7b482ce1010a3a0690e06253585badf0e5e2
-MISC metadata.xml 386 BLAKE2B 97330ae5dbda375442d15b60796eac606016d0c4b9f2d4f5acaf689e3b675336a302d0bdf795b538ff0f3f8577914a8cff32e624c2c2c07f10237f9292f9ac6c SHA512 3b8b537f5f944976cb1190822427b4c82af3fae92ad3b6a3505a2327a4da78c5eb0133adf6a0e4470ee27affb6787d1aa3a4443f7eec79a5e16a3684d01a6c3a
+EBUILD markups-3.0.0.ebuild 884 BLAKE2B 802bad9955ec4610dfce0c892ce6cbe0f5ab0282b48b431453ff368952fce695d8414d6da164a4fb898ad628342f75ddc2e92d27529492772ec95c9277746f53 SHA512 a84829eddbade22a537bf41e3527eb8b92580cbb4db926cfe1bfa4651aa4e2efbe6e767610e54438a43cea4518095e1fd6c3a892db40ef18d37e791b96b12744
+MISC metadata.xml 625 BLAKE2B e700717385a02ed240f11bbbebfabf215d6bbff574ea2876035e300111490f0f477be1cab1224157413eba57f6ed4f84a166c2c241110b35db284c07818d64f7 SHA512 acf3002c22de1375c1a03e0a84765e52cca93b4ad1c6a57ee7f73e7e1616551dc3d6f61dcd1a8d9f31671d6779e19ec19041691bbb7eec6eecc0b66a280de9c5
diff --git a/dev-python/markups/markups-3.0.0.ebuild b/dev-python/markups/markups-3.0.0.ebuild
new file mode 100644
index 000000000000..47dd66e39bd0
--- /dev/null
+++ b/dev-python/markups/markups-3.0.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy )
+
+inherit distutils-r1
+
+MY_PN="Markups"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="A wrapper around various text markups"
+HOMEPAGE="
+	https://pymarkups.readthedocs.io/en/latest/
+	https://github.com/retext-project/pymarkups
+	https://pypi.org/project/Markups/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+S="${WORKDIR}/${MY_P}"
+
+RDEPEND="
+	dev-python/markdown[${PYTHON_USEDEP}]
+	dev-python/python-markdown-math[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		app-text/pytextile[${PYTHON_USEDEP}]
+		dev-python/docutils[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	${EPYTHON} -m unittest discover -s tests -v || die
+}
diff --git a/dev-python/markups/metadata.xml b/dev-python/markups/metadata.xml
index f3a0a5c01d35..a3992b86df2a 100644
--- a/dev-python/markups/metadata.xml
+++ b/dev-python/markups/metadata.xml
@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+  <maintainer type="person">
+    <email>holgersson@posteo.de</email>
+    <name>Nils Freydank</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>
diff --git a/dev-python/mccabe/Manifest b/dev-python/mccabe/Manifest
index 9ec41a053b97..cc63c3d192e5 100644
--- a/dev-python/mccabe/Manifest
+++ b/dev-python/mccabe/Manifest
@@ -1,5 +1,5 @@
 DIST mccabe-0.2.1.tar.gz 5031 BLAKE2B 6f52106337ed534933de0c98fc103cfe209bddb30623a3b710681f4f0615a964c4d0472d4dc56f1ea4e60dda695eee540f9f9b441111808684f09fc8207b69d0 SHA512 7155e52063e786c140c541f1410d0c319387b4b5f24ec3c60ba3d5a963a92d0ee545254559941ac0dbe961f46750c0e61271fbe82653c6b1465c0a13b31ec325
 DIST mccabe-0.6.1.tar.gz 8612 BLAKE2B 6828dfd852cf9b47de10bd889dd4c32dc1ee95910fbd27e0921cd7d9975a0831b1c2763eda5b2d77d7e4b44b5a9d0e89f0818cab71de655954cc87cacfe8d382 SHA512 d8fc251a29790887c14c5932c5172b4cd578cd37ccf14cb96e80f0b97f27023427ea032d14e1e2a99d72627b055eb285f60db69e679ecd79d90a34b0255703d8
-EBUILD mccabe-0.2.1.ebuild 553 BLAKE2B ab9defb8f678c26edfe4abedd8cad4b6603d6fb40ae874c267d24e4f550e7fe8276604996f40cc7b62faf65bf1e8186a2d37425ce3e65e0d5f65a514f299d562 SHA512 5ac2247052ee959a29a582884d4d8d10df032925ed6eeaf0c950081dbf05e091975952fb2394e6abb7e0f5f3ed93b4201bc90029e8c84aa34165bda8bfeefda5
-EBUILD mccabe-0.6.1.ebuild 882 BLAKE2B 7eb22af00a590330a3031394382693e917709633ebe4ed5d9bbdb7c857472fd7e6da9eb9e6d01a2325f5897869bac69918cc2864325fb1701c918dd4134491c5 SHA512 3799b98043bd91276e73f0e33d35969d7281557ac0110c52441ff694165ec6169c9c58a87d885bc2efde687321579a0c5f0d83fac4830150f58cf85b2281c1e6
+EBUILD mccabe-0.2.1.ebuild 555 BLAKE2B f147db69dd5c55397dbb7048f8da70c7a1a123e61561f76481d38e9640a8c88fe5f16a2202635d3e9b9e3269c8f5107147f1f08be6a34be6f821d0563a1177f5 SHA512 01b50a88ad0e946783fa9ec1bb541f602a81da4951b689eab4f7581c7914e9d59cbf0c26bb6df6a8bcdca7fbf8fcf33d1638771baafe6b526fc8697c8e30aeab
+EBUILD mccabe-0.6.1.ebuild 887 BLAKE2B b5a622e129858488c551930f9ca759de6e7b43cd532b31e79c3517f952eaf9e3d0b27fdb88ffa81b2bddb228290fb6729ef6369e89802bb3b7f1e77d85ad7951 SHA512 8bf4174aa76de75d34b31cc94df0fed185769dcc52ce8654dbb83e7ef36da05edff40bbf67ed606f129bf647b1a33a98b43f97bae7bd9dd9cd4b6e1de3e33782
 MISC metadata.xml 373 BLAKE2B 0a0d03ce9752401f11326bd24a760ee9f18b792e6d6cb6f229513eff68f35acc943dde6b9b842a508e7bd7344c13e1b8d74b38ef1ef1401823ee106573502412 SHA512 9672aa38d9c5e31835bd0b7b1d3463f2e625ff71b4ee79d39b939cbae4df67241ba64f17cfa928aeb6fbcd0bc787c076dc078b56c92bcc1a46ea26f873472fc1
diff --git a/dev-python/mccabe/mccabe-0.2.1.ebuild b/dev-python/mccabe/mccabe-0.2.1.ebuild
index 113112563276..e4540b3038f8 100644
--- a/dev-python/mccabe/mccabe-0.2.1.ebuild
+++ b/dev-python/mccabe/mccabe-0.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ DESCRIPTION="A plugin for flake8"
 HOMEPAGE="https://github.com/flintwork/mccabe"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86"
 IUSE=""
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/mccabe/mccabe-0.6.1.ebuild b/dev-python/mccabe/mccabe-0.6.1.ebuild
index b49e728c2bac..a6f9f1da559a 100644
--- a/dev-python/mccabe/mccabe-0.6.1.ebuild
+++ b/dev-python/mccabe/mccabe-0.6.1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="flake8 plugin: McCabe complexity checker"
 HOMEPAGE="https://github.com/PyCQA/mccabe"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/more-itertools/Manifest b/dev-python/more-itertools/Manifest
index a3406f36d5f0..d5266bff8e9a 100644
--- a/dev-python/more-itertools/Manifest
+++ b/dev-python/more-itertools/Manifest
@@ -2,6 +2,6 @@ DIST more-itertools-3.0.0.tar.gz 37622 BLAKE2B dd1806f4359406ac0a57a8eefe8d6c310
 DIST more-itertools-4.2.0.tar.gz 56871 BLAKE2B 48cdba3eebea94483c5cfd9530d4bd2cacd02e893b87482a01ff1fdf10336f3c2a40d32fbb935d38320c9c47a1fd1942a48ea12ff07ae56793ecc5870fef2452 SHA512 7e205a575fb1d17ed3be9225c5c60139db41cc4b866f6d6732c955536b1d606bb7ccd92ad77e41159965abbddec3a85761d3649c28f06d52afa8476160d70e77
 DIST more-itertools-4.3.0.tar.gz 63266 BLAKE2B fcad717550931f267594f0e338def6e8d6119f28452ed8654b9e3ca073c4219f78d58d691855c4f6b4817afbe94d176077c342fe9b57ae522bc113049da97b57 SHA512 5fee3d99fd796b0f0f6b5aa99a8db22e219d3dced71fef6f4b16286fe67061dce280389b3638c55c6e5f6c828ef1286cee845d76a6861d2af66d90e995d5aa4e
 EBUILD more-itertools-3.0.0.ebuild 943 BLAKE2B fee0e2ba67b0b5ae02665f090be10fe7f9a1610c72857b4ea56b44b4709e0af7f93ebb48b9d12279e9e9e77825868e4338d7e6724095ccdab7d17e49e88a3fd0 SHA512 7e3546efeadde855f65e9aa5b751e0186ee33125544d8a0683ebe5e3997bb00f1e150d35df184019e2df26230cb4b50562bd2b10d2d6745e202ab70957913167
-EBUILD more-itertools-4.2.0-r1.ebuild 1055 BLAKE2B 567d1228b00e311e9f0c94633b8a0ef771d3a0a2a27c65f9c4441640dba76dc42c497976612b9690b8ccd67383125257a106b0fd9a6471bf6606a2516343e95f SHA512 ce7348d9ffb14cf68b1c360f20d2fe89fc95995f96a5e24be54b7b171d45ed86b98b363f8e8785d3d358ea3d7075e81c6d9541020dd1d7b143c5aea186829bf0
-EBUILD more-itertools-4.3.0.ebuild 915 BLAKE2B f6ccf7a011620e0fa00eb4bf6cfe657f66724fb19364866f6b10cb663b816ea3487fb768a1d6a4bf4d8be39c53dadf89a31e53402a26f1cde99d1e4e39221721 SHA512 f0ad666b48c265864284b1fd124e3218f0eb18ecda86286f36685ff9027e8b638650332788219f026ae4e9d54131a46941dcc0e0d475273031d51b7b4940ae10
+EBUILD more-itertools-4.2.0-r1.ebuild 1061 BLAKE2B 94303d961f1f221f8ff88068c44afba8975a6617f3fad1818c2ee55b57e068c21ba262eb2514d1653700af3c94b08123614bd7f093ca0c3f47a93f1bfb83cee5 SHA512 4f9480146b12903aeebeb619cc7b1d5de767f749717906f605aa52f750d66d0482e109fc0594ca704e9ea7d51be50ee111c24f979bd282b6afee4c861760534e
+EBUILD more-itertools-4.3.0.ebuild 973 BLAKE2B d23fe81c2d9f94021bafc39fbc82751cb1e5af4b913ea05b83eb93da66a3c65b6d7090d046c08f6d3f1ce00f96dd17e017a0d5c3fd1b314fd58dda8f10076505 SHA512 dbc0f68bda24d67d0ccdb8080c1c4d49769171ecc2759648075967a5dcee83a45d9c48a65c34804f6858dfd0032c64e7b4b61ef294cca0091ce5f49bf85245b2
 MISC metadata.xml 451 BLAKE2B 22dc3c0fcc0e1061f4060b8456e7f8686f40d100af79b6bef394eb1e9111aaa9b7b5762c94bb3b27464739328388dd56f02cb9813860acf23067148f03ef2f66 SHA512 4a22e7394227ddac2669e188e6b77170d41c30054a388def0a4d8ff2ff27de676949f4b8932d8d1adeca6c8570be3733da9983e173dc620298ed0bf3ea365ddf
diff --git a/dev-python/more-itertools/more-itertools-4.2.0-r1.ebuild b/dev-python/more-itertools/more-itertools-4.2.0-r1.ebuild
index 1ed28b384772..089b14979d23 100644
--- a/dev-python/more-itertools/more-itertools-4.2.0-r1.ebuild
+++ b/dev-python/more-itertools/more-itertools-4.2.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-fbsd"
 IUSE="doc test"
 
 RDEPEND="<dev-python/six-2.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/more-itertools/more-itertools-4.3.0.ebuild b/dev-python/more-itertools/more-itertools-4.3.0.ebuild
index 0b78adf9d36a..4528d7a54516 100644
--- a/dev-python/more-itertools/more-itertools-4.3.0.ebuild
+++ b/dev-python/more-itertools/more-itertools-4.3.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
 RDEPEND="<dev-python/six-2.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/mpmath/Manifest b/dev-python/mpmath/Manifest
index 11ad3efbcef7..86fbc08ef54b 100644
--- a/dev-python/mpmath/Manifest
+++ b/dev-python/mpmath/Manifest
@@ -1,5 +1,7 @@
 AUX mpmath-1.0.0.patch 422 BLAKE2B b79a223fb3d6c712a11e225c4f617d68cfda595ad314fb33ba02333eedcf39909f9bf76c98f004619f62cfb4516172615b8e79017362807980b1c61724423543 SHA512 a5c7c8816d7e4ba2dc481480a887d94ca158fee804a01e86f91fcea037372217ed8b029f85f6a0c15558b44aaf56f6fadf36b4f7476713a04a66f18b6f1ab997
-AUX mpmath.patch 434 BLAKE2B 1d7c2a6d8d99efc75fd4e6ab5900ee88c8b75a809a8776c3dd9fd390200e5d184423625f8a9549345892ae985e4237727d39d821ecb2503d29a2d78b6417f967 SHA512 2ffc7ffa375f5c25d044974a8b1fac145a00d9b1f190d12e1ade6cadad44dae11098617de5ee0a523931f046b4cd0e785552a3de6f66f438052955b6987bda39
+AUX mpmath-1.1.0.patch 422 BLAKE2B b79a223fb3d6c712a11e225c4f617d68cfda595ad314fb33ba02333eedcf39909f9bf76c98f004619f62cfb4516172615b8e79017362807980b1c61724423543 SHA512 a5c7c8816d7e4ba2dc481480a887d94ca158fee804a01e86f91fcea037372217ed8b029f85f6a0c15558b44aaf56f6fadf36b4f7476713a04a66f18b6f1ab997
 DIST mpmath-1.0.0.tar.gz 511349 BLAKE2B 62c6275f76c412043cdafef51815e4b5d055a63ca36f3f63b33957351b19e03419ca27f7d59641c580cf8e47c1ca45240b68b3040e2749b3de679eb45b15a28e SHA512 b225f237008e1cfee52b2f0dca0dce1445b932b6eaef92879d7feca30d728e3f88810bfa80882ad8776ba846a636807e59bebe0b9f690cd878c089e9418bd8b7
+DIST mpmath-1.1.0.tar.gz 2136921 BLAKE2B 8c3a5f39b48015aab1147aaf77ee7523dbffd7f34911ff2158d7b8bf1612e64f91d157494c5199b22090e986aba02044d610171bb92a2b230cdfbe025652e340 SHA512 628b6c61015825516d983bfcc54fc3a2793f3d9d2b93ba9c5a487a340ddf13eb4e83f17fa35692b22dd8a200a8da3a65ed88091d75abb4c48c9c4e4f2c686bcc
 EBUILD mpmath-1.0.0.ebuild 949 BLAKE2B 754a1b4fe71fd30363daa59304106e4887f7fbb8567872d2eff73bd3651516d9b74f664014521580f2696a717e9472301321114ff60d5f4e80032834fed6cfd0 SHA512 1f66dacb4c67b2a132a45727bc2df816760537f69fb3acd109f601c3e0108d793c237546dec4f9bcd26e87b2a2e2817b72436941c473438670491d79482ff08f
+EBUILD mpmath-1.1.0.ebuild 967 BLAKE2B 75f22f52e39bb7e0240e94011f4f66b4fa3aedc2ab0089447cd79c9a90ff973e5dd12735d8d254868776f0deaf0b712627cfd9e808cf394714b7c379d558d17c SHA512 bd56c669183d9c3f4126e238f88e764950361b9c4ad6233da4c7fb42dc1a7d0d2dc75ffb5b663de86320927ad159cbb73af95cdf16a7a1c2cf2d109f3b2d11d2
 MISC metadata.xml 650 BLAKE2B 520b0399fbbae4307a4b3979202b4d5c8d1b06f739e0c0460a9a0be63b78152b50ab3f7fdc9b46623cf7afaeabbc57cd35f3865462f3b16ce2beeb0b8f8659a5 SHA512 0f999aeb354c73658f916cb8d3a80dcd216f50f77839c0c854e9235566cb197a7d047ad51045996fc0b9e1c47f55e934be9dd52597fee16fcce6360bfcbe8f08
diff --git a/dev-python/mpmath/files/mpmath-1.1.0.patch b/dev-python/mpmath/files/mpmath-1.1.0.patch
new file mode 100644
index 000000000000..3a88f38c9927
--- /dev/null
+++ b/dev-python/mpmath/files/mpmath-1.1.0.patch
@@ -0,0 +1,9 @@
+diff -r -U1 mpmath-1.0.0.orig/setup.py mpmath-1.0.0/setup.py
+--- mpmath-1.0.0.orig/setup.py	2017-09-27 21:42:12.000000000 +0700
++++ mpmath-1.0.0/setup.py	2017-10-02 20:36:02.919554100 +0700
+@@ -15,4 +15,3 @@
+                 'mpmath.functions',
+-                'mpmath.matrices',
+-                'mpmath.tests'],
++                'mpmath.matrices'],
+       classifiers=['Topic :: Scientific/Engineering :: Mathematics']
diff --git a/dev-python/mpmath/files/mpmath.patch b/dev-python/mpmath/files/mpmath.patch
deleted file mode 100644
index 3040216e56cc..000000000000
--- a/dev-python/mpmath/files/mpmath.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -r -U1 mpmath-all-0.17.orig/setup.py mpmath-all-0.17/setup.py
---- mpmath-all-0.17.orig/setup.py	2011-02-02 03:17:50.000000000 +0600
-+++ mpmath-all-0.17/setup.py	2011-02-13 01:18:00.000000000 +0600
-@@ -15,4 +15,3 @@
-                 'mpmath/functions',
--                'mpmath/matrices',
--                'mpmath/tests'],
-+                'mpmath/matrices'],
-       classifiers=['Topic :: Scientific/Engineering :: Mathematics']
diff --git a/dev-python/mpmath/mpmath-1.1.0.ebuild b/dev-python/mpmath/mpmath-1.1.0.ebuild
new file mode 100644
index 000000000000..08a77279f3ea
--- /dev/null
+++ b/dev-python/mpmath/mpmath-1.1.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Python library for arbitrary-precision floating-point arithmetic"
+HOMEPAGE="http://mpmath.org/"
+SRC_URI="https://github.com/fredrik-johansson/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+IUSE="gmp matplotlib test"
+
+RDEPEND="
+	gmp? ( dev-python/gmpy )
+	matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}/${P}.patch"
+		)
+
+	# this test requires X
+	rm ${PN}/tests/test_visualization.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	pushd ${PN}/tests >/dev/null
+	${EPYTHON} runtests.py -local
+	popd >/dev/null
+}
diff --git a/dev-python/multidict/Manifest b/dev-python/multidict/Manifest
index 1a76347dbf27..71216f3e9bc5 100644
--- a/dev-python/multidict/Manifest
+++ b/dev-python/multidict/Manifest
@@ -7,6 +7,7 @@ DIST multidict-2.1.5.tar.gz 28497 BLAKE2B 301248a428f3be7740dd04ccc8ae5e92d97173
 DIST multidict-3.3.2.tar.gz 40083 BLAKE2B 6622efd489d4f0046200b6b28a158306cff7a3e463688c512827b599500956793ac27f6ee839e076a921b84665bc932274a5ebf4c37e273fc02916dc9be1eed7 SHA512 d44c8b00ab7823b8840665aa1462ed547aea48874a408b2af8f1cb455727896cd77ef2201e8f234bcb3f2781599ffe931a5884fc55fc1f7286da29185c4d88fc
 DIST multidict-4.1.0.tar.gz 43492 BLAKE2B 4d53a12896f070fd029816742ccff11a12636164e51215bb22b368da10d555d52a9ab7d5dc4632baec9ebc628ca4f846ad7fb2ad0bb044f033fd7e567cda0da8 SHA512 8972ca48146b40fd88f5b0675ed6d45e6887c31fc1d5962203f0fa77a369ef11b0d7739593f5691ae1fd2bbef989940983ddcf0c09acfc5a65b39b6b336571f9
 DIST multidict-4.3.1.tar.gz 45342 BLAKE2B 12a0a8f0785c30e393d996c506a69d6ba03227e47040d46859e1289b47ce23b49a9bed48c3cb0b26f3bf4051cce3963d020a92ed28373038fb79b2204c13d380 SHA512 1b475836c776ddddfdc4f14882df41f9956ab06afac7b640e3f5ae3c50717f2b07267acbae2fa3e94cf8c5650273d4d7ce44329c0febea95046ee27d98db9288
+DIST multidict-4.5.2.tar.gz 56753 BLAKE2B 01db2ea847e5ef2fbd4eab89c8a6070f3febcb0046be7344469a7e8e6de6a3c2b2af49069e64953dfcac0044d581c6af09eee70eba78dda8cfa9e0d11d3f1947 SHA512 ec66cf3c57e3386e07e45641536a6eeb94e9707d8a0d3b485d22b8687f20282c9115d533c7b0e9fb6dba28b923cf68dd8cdda08c75e78ca4eca2f0c3ec23c58f
 EBUILD multidict-1.3.0_alpha1.ebuild 869 BLAKE2B ef434a9ed5b6fe0d1df6c7e306a16a62484a5eec99d0da3da0f82de0de81b1a31edd36463e3862bcb50e38e5ccd1baf3c0be67844e010ffb4181dc710d53665c SHA512 b558ad47531db3d3497adaba4f0fe7b620ef481cbaf44f94d17f23118fcd9a363945c7ea7b98340d9bef387e8720fc43697b34b2c140a13c6c0c806ed252d4d4
 EBUILD multidict-2.0.1.ebuild 878 BLAKE2B 9e37896184224fe2b95daad32e7171c832630a39841207a3971abf1031166d7b68c377ea12c78b45d9f7c6a406eb6b2c3b3e0456e8bc434c20d29f7a35e12fc7 SHA512 564b1022e58f1c404f53942fd2e11f0628849a4841670bf486bcbaabe36b07ca55182925c0958d9f889cc11743778b09995fe730b86d28b48564d4faad982672
 EBUILD multidict-2.1.0.ebuild 878 BLAKE2B 9e37896184224fe2b95daad32e7171c832630a39841207a3971abf1031166d7b68c377ea12c78b45d9f7c6a406eb6b2c3b3e0456e8bc434c20d29f7a35e12fc7 SHA512 564b1022e58f1c404f53942fd2e11f0628849a4841670bf486bcbaabe36b07ca55182925c0958d9f889cc11743778b09995fe730b86d28b48564d4faad982672
@@ -16,4 +17,5 @@ EBUILD multidict-2.1.5.ebuild 1049 BLAKE2B c4fb30f7accc1ce25b45f3cc8cfdc6d6bac79
 EBUILD multidict-3.3.2.ebuild 857 BLAKE2B 936db37745d3f4c12a7cfcc4c3b5da68885c52ee88d974cb14e443dd3386dceca6906a66296cfb0be9b6cb004a3cce1eb68614e188c9ffe7560afc0ebc970da0 SHA512 6fd7be5f8772ff2d1a17a25dc38dd161dfe791b36ed19fcfdcebff48960145ddc0d6b6a5d52936e9bd99803725d944d70b9ddf6073e78c46ad84486684b47dbb
 EBUILD multidict-4.1.0.ebuild 1060 BLAKE2B 02260e64b12ff33e543331f6839c7ac4604049617ea9d8fd5c939e319dcf27ce28103b6c528343adafc9d38a58c127943ecbbb481558584b3089779afba24119 SHA512 c02423e3a9a94d0d3413b9f261db7fae888f50ad9befb2ecf2851b24930fae5bd5af7a74402cfbb2f37ed7ef91b07b2d1d6541e5615a52182211d5bc07466862
 EBUILD multidict-4.3.1.ebuild 1062 BLAKE2B 6389ba660f6c1cf57efcfa8ae4fc838fae11618238d95ce9457ceacbae31ded545305793508c8fad00168b956a36dc595c33372fa5de74782afbe9c98fa57e82 SHA512 b0dbae21b6849da1db86d9175dfe2774d2340ed0561f001b20c56fed00941bb556f7a9d1d431fd7bc5991b8e9338a6c9dc4b28dc36786252509950ef17437f5d
+EBUILD multidict-4.5.2.ebuild 1064 BLAKE2B a351d48743f170ebcc6033bd7643e0fdeafc611a6fcd775874918cdcfe0d2a2db5c592d2ee909d1a4e5bb5169b3a229ac3a82f0d8b47835277001d9eab40d772 SHA512 52148b528ede462c62a57dda94f565200ff7c76a9369c0176bb30273655e12b2bd45d597915e7bc02f701892b2439a0b651904979b84f26d2d1811510c390afe
 MISC metadata.xml 428 BLAKE2B 3f7c1f816583b35bd0150ae21c61142bbb7ac5b216edb5011bc032410e408f2566801db025c8f6274dafbfc555b0b32aaca2708684a3601ffe8d371b23e0d556 SHA512 edb199503c42c55b838b5338656b41e760c90ec3e81114106dd352e2c3886f0161a0c6ef258c5c0a0728d2420bde5d26dea41b25b030eb947dbacd702cb2b594
diff --git a/dev-python/multidict/multidict-4.5.2.ebuild b/dev-python/multidict/multidict-4.5.2.ebuild
new file mode 100644
index 000000000000..a2f8fb69a3f1
--- /dev/null
+++ b/dev-python/multidict/multidict-4.5.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="multidict implementation"
+HOMEPAGE="https://github.com/aio-libs/multidict/"
+SRC_URI="https://github.com/aio-libs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+RDEPEND=""
+
+python_prepare_all() {
+	# don't use pytest-runner for tests
+	sed -i "s|'pytest-runner'||" setup.py || die
+
+	# don't enable coverage or other pytest settings
+	rm pytest.ini || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	py.test -v tests || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/mysql-python/Manifest b/dev-python/mysql-python/Manifest
index 340e5d735c76..27bbbdaf4754 100644
--- a/dev-python/mysql-python/Manifest
+++ b/dev-python/mysql-python/Manifest
@@ -1,6 +1,6 @@
 DIST MySQL-python-1.2.3.tar.gz 70305 BLAKE2B 8a365732556646c535bd9cfac69c759e561f1e15f4b25ef863ed60b64f8953af0e3633dfe00085d9a69025cdbc755afab62fc3af5d785d1dc0f67795d5748f75 SHA512 8c1c88ccf833744ac1f78673cb306cafe7f9bfc85ab2ce6dee1024b86571c17f006e3ab8452dba3527976f39aca64757b2d961c30ef4ac61c9a27e60a5f1abf5
 DIST MySQL-python-1.2.5.zip 108935 BLAKE2B c4d5d4bc814c05604c4acf673ba4f4040dac2653e65173f672a42de4f2877583c79553533040c5502f99b57b71868031daeea7b637a4bea189fb20eea6a6ecc2 SHA512 37521c6fd855c4cde495cc8ec085aca79c2d441a6e3710759385bf2e2c17f43d3311cf1166663892829d2e3999c419443c358c7031cdda225ac44611ced188d0
 EBUILD mysql-python-1.2.3-r1.ebuild 847 BLAKE2B 7d3813a9bce6da048889a9a781a009c7156faae8b78de54b0f820341700f927f7507d48733de499fa0bf09aadc5e4ad51001caab76a56766966b6eb9b882e929 SHA512 2593fdc227841b7d35b76fd7418a7e71cccaf113a0a458f9313be0ffbc8020d1e5cd3f0cf47ee27ad1210f4493d8d777cb2181977bbf7d757b1b20d5b1a51fbd
-EBUILD mysql-python-1.2.5-r1.ebuild 1124 BLAKE2B 12f6090f00f1d7b1894d26d2265c9c9ea0b2882b259643ddab0451cfd2675e86f60c91d55ffe90ab70ee0e2efab65fa1f6546c6119066ebc72d2ad9a3f336ba9 SHA512 9ae40999076a2b54b74b00adc7d203af5ad2d5c10c4c1ed814135f10c3d63fa9d3682c0e4c288f14fa9b385b67045c1e74c2d3100ba5b047ae7f9900feda859d
+EBUILD mysql-python-1.2.5-r1.ebuild 1120 BLAKE2B cf6f49c6f3384dd8c6788bb71869a360b57cfadfe3ba9479cff9c83a73b02adbca643750b2c92ddb1f83d0422fef5e5853bb27c203d3425ab366abd8bc30983c SHA512 e23b2c5a7202ce3edde36ff5c07fb872a8f85820de10b914ef94be53c80058e3c3e8584d07292f9b933f82f96a798910e0ec79dda2741547e158f299ee2fc53b
 EBUILD mysql-python-1.2.5-r2.ebuild 1165 BLAKE2B 3f8e0274ffe1300e72a3acc880817d29ac30bd8a524244f2c530ae441e4d4426b7c1365decc6e244a3ffeb23667c35b27ab214296f24bc3da0ea10400190b0de SHA512 d6be08aee4082b904a4f3aee82846016481c82bc298baa5b3c4bb485561e195fdaf0e07421a849127b49bb98f40573755fb85f89ba4e70bafa41aa3e5fbf4f08
 MISC metadata.xml 384 BLAKE2B 3cfa19a657e3c9f4ffe875d44e01b6ddb72913d6d189a40cb9b3fb7ae6e076deb7f667ba24911ff4627125059dbec21b4fdc6deac20b71dd72de0b500689804a SHA512 df7d59db502cd6ed66cd936708f82efc5e22633508ee367c331d1f66298f806eb3d9a17dc8919c450afe3bebe30fa38e356d3feea2e87c82eea03db54c6e7ee9
diff --git a/dev-python/mysql-python/mysql-python-1.2.5-r1.ebuild b/dev-python/mysql-python/mysql-python-1.2.5-r1.ebuild
index 809eaa37f000..4ff23902dfcd 100644
--- a/dev-python/mysql-python/mysql-python-1.2.5-r1.ebuild
+++ b/dev-python/mysql-python/mysql-python-1.2.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc"
 
 RDEPEND="virtual/mysql"
diff --git a/dev-python/mysqlclient/Manifest b/dev-python/mysqlclient/Manifest
index 95b93b629fdb..57c8a8ebe443 100644
--- a/dev-python/mysqlclient/Manifest
+++ b/dev-python/mysqlclient/Manifest
@@ -1,5 +1,7 @@
 DIST mysqlclient-1.3.12.tar.gz 89793 BLAKE2B 7dbd582b72b27a71a4fa7a6fd9f051eee7f1d820d447cd5463d4060725f3f779e5bb91500aeaf9d11460f0d72c76732fc610dbd1555c6eb5a0ba55ca3e870c03 SHA512 fa267ad14ee98cd994c0c80b8a84b592e71f80008348d67a9c970c84930504a02034e4cd2903f0acc7dce416c485d5629be6e6e9dc52de1774dec7345d5d64ee
 DIST mysqlclient-1.3.13.tar.gz 90368 BLAKE2B 34e6aad0d53f93017120334b09b901530a84cc5a5dd806381dcc3f12742764bda6f42699fef226b22274efd8f61304af0d1366abdf44607cd9827e9718ecc285 SHA512 e8e385490bfb2d926a94695089c9532981d1e3fcf1fb89a4dbabe98f0bbb25beed1cce8004b71a11fdf0161824e86826565cdb1ba5f2162450847b6b467f362e
+DIST mysqlclient-1.3.14.tar.gz 91391 BLAKE2B 06a781f21f608246ec2da8a591d7bf5e430d96bc4069e589d6466a2deb4e53ab8a51db0015e4db73a748d6cbdba9c8c550e888e415cf9390afe5f0d7f0620156 SHA512 2623130f67b989f981bec37d19fffd400ba1b144657ff25575d055d19297d0f94c0a70eac980d90a76ef2b0455a56ca033ad92bc54c9456b2c57d5a84475ae50
 EBUILD mysqlclient-1.3.12.ebuild 833 BLAKE2B ee12396fa34929fca62f8fe1d02529290e92e7e5c0ab7b9e78ced3880c5c60a159a2c2e758b57939acc1b20f9b7c08e817892fbd325d5a3eb2ec78e26fec46e4 SHA512 3356f451c6da3cbea73616333ee40756068f9d5eb310f152ee4f17f5939d24c0f30ab6ef1042744204b51ee4be5b2cab0a3485eaf1b50bc4589ca8eae0bb84bf
 EBUILD mysqlclient-1.3.13.ebuild 832 BLAKE2B 2db089a19b09d41d950d4b083a740a177fa256fdc5b7d6b34bb71e1c8c4201ad6afc23f56fc5027a8dee8b9460780d478e1153c2b97cfa0af36900d3ecd3319d SHA512 834a8db1152aeebfcffa0bc71b0da3add6eae1f60661396768a2938b6829ec7f7e650d213b43ce4162bb4140326f2e98399bbb1d648d729fcc624ceacc429cb5
+EBUILD mysqlclient-1.3.14.ebuild 834 BLAKE2B 6afa9194eae36397406181bc83203fef7a24d4dabaa31b12977fa4df17b64752a3d3aedbba4625c8102186cc9be06bc0f67749193f456760b4c870ede08f2926 SHA512 eaa182e6d070f73b246989836c80a312d1c393cfd40fed1d17cfb581b1b443ddf874a79bf26432231e3ead14a4e239f42b09ad2f5e293eb025dd1236604d95fa
 MISC metadata.xml 513 BLAKE2B a65aef9c59557dd33af579ee376553bd46fbd53158d0a02585b2403d6ee45acb281599ec593d5d75d69cc8bafd509a0851ab25764b5a79f3501a7cdad91faa40 SHA512 4a2756c3bde70c4fc73ba347e9648b356983662146cce5c1161f5d0c8333f795bc27d0aebe6019dcfe6402a51611dddfd87609c329a3c2fa6aa20808cee46b38
diff --git a/dev-python/mysqlclient/mysqlclient-1.3.14.ebuild b/dev-python/mysqlclient/mysqlclient-1.3.14.ebuild
new file mode 100644
index 000000000000..fbc34295c8e5
--- /dev/null
+++ b/dev-python/mysqlclient/mysqlclient-1.3.14.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Fork of MySQL-python"
+HOMEPAGE="https://pypi.org/project/mysqlclient/ https://github.com/PyMySQL/mysqlclient-python"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+RDEPEND="
+	!dev-python/mysql-python
+	virtual/mysql"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+DOCS=( README.md doc/{FAQ,MySQLdb}.rst )
+
+python_compile_all() {
+	use doc && sphinx-build -b html doc doc/_build/
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/nautilus-python/Manifest b/dev-python/nautilus-python/Manifest
index 5b54f07f0a48..f2c26ead09e2 100644
--- a/dev-python/nautilus-python/Manifest
+++ b/dev-python/nautilus-python/Manifest
@@ -1,3 +1,5 @@
 DIST nautilus-python-1.1.tar.xz 239392 BLAKE2B a2baef3cb4d96d97b4b3e9b7644388c8778e1579ee0b32ff2a60baae45baa2d60dbcc61108fc3fe9e8a7193cf4c6ad82f8ffc2f175419e0937bacecc98551c51 SHA512 e721f46414a3efa4b5f5ec3f56cc00a308ec010a7a0612cef975d6f436494701f8bdbed39bdb5186c8013a582c7e63288a1c60adc4b8967c9ec69d6301a50fef
+DIST nautilus-python-1.2.2.tar.xz 269220 BLAKE2B 9f2b5acc20727acf4464297bc008e8be0bb45ed418601e3658405e90eb3d56306f9aece402948491d5423d58cd261cee5cacbd39dd185957c4d72c90f877842e SHA512 541ab9e6ac15b06994cf475237e5588d21f4b9f71bb562f4bd9d976f79849a29912080de0b16c14406b052bec15c2c754381bf36e15b340d1f8e76c83a2464bc
 EBUILD nautilus-python-1.1-r2.ebuild 1256 BLAKE2B 85b87fecbbed7bf55cf7c8d53e2a8d5267037495698ef45646d43edf6658d2f71a1ae1c71c66860c0d36f49ba47a39248c6f6a9f8a272e048414d5a1ac08b642 SHA512 40b29c0099b7d5d5d6730918ef263e522cd503ea7e77111a80361cb496b74a65a1bdbb5fb879beb85c3806a0e8ec4a1aeb77ea3fc3bbd2344ce5292eb4fa8448
+EBUILD nautilus-python-1.2.2.ebuild 912 BLAKE2B 7dac3951975adb80f95ec62d4fa086f1fc3067d2409aaae25ffea5f2627d7b2324b2e90d80ae4b54fedd6b567308d508f22d739076467d12377cef2e1c85add0 SHA512 9f7e4c4cad425ee3c67f5c467994b63744739b4275cfd285367826854895b90111236db10a36f30050e60ebc03e207876f470af6b301f31ceb8d354bb722f4f5
 MISC metadata.xml 256 BLAKE2B 328c05c417050a2312f4b9e62188c1bcf9a694a2136c4c9ed8f31e818c968398458459bc87784157677f0da7a648f5d07c2246563cb5ef534fd9d97232dee982 SHA512 efe3e668ae6d6c6e11e5783c9133fbc6378a4cf21d502aaf7ada64dec0418f457480754a907ac037bb9f7acc008410c6c2f9db57322b9b44256aec74b14ef63c
diff --git a/dev-python/nautilus-python/nautilus-python-1.2.2.ebuild b/dev-python/nautilus-python/nautilus-python-1.2.2.ebuild
new file mode 100644
index 000000000000..291a0ebb6d43
--- /dev/null
+++ b/dev-python/nautilus-python/nautilus-python-1.2.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome2 python-single-r1
+
+DESCRIPTION="Python bindings for the Nautilus file manager"
+HOMEPAGE="https://projects.gnome.org/nautilus-python/"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Require pygobject:3 and USE=introspection on nautilus for sanity,
+# because no (user) plugins could work without them; configure itself
+# requires pygobject:3 or :2 and >=nautilus-2.32
+RDEPEND="
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	>=gnome-base/nautilus-3[introspection]
+	${PYTHON_DEPS}
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.14
+	virtual/pkgconfig
+"
+
+src_install() {
+	gnome2_src_install
+	# Directory for systemwide extensions
+	keepdir /usr/share/nautilus-python/extensions
+}
diff --git a/dev-python/neovim-python-client/Manifest b/dev-python/neovim-python-client/Manifest
index f3743502b1a4..8d524133cf1a 100644
--- a/dev-python/neovim-python-client/Manifest
+++ b/dev-python/neovim-python-client/Manifest
@@ -1,9 +1,5 @@
-DIST neovim-python-client-0.1.13.tar.gz 41413 BLAKE2B 819c3e7763cfb357d45130928dab23ad149a5f9d8efb0df8699a805bc394662447837ad3edc869705a95d74a37f2eec4f155212da918ac779d389c150a0d7189 SHA512 ecef42601632551c98f8de019bfdf4dbff3ce1f0e1b6943b78a506b710e5810f6a7e611adc09435992b97288ff365a416870a74202a5c68236b5daeb51d15c8b
-DIST neovim-python-client-0.2.1.tar.gz 41971 BLAKE2B 9ebff937e08963cb8c764c4dcfcef8b6e28e8d0219635f9602ccc77b0bf4412a797de71fbf149bcaafe85bd1122a0d3cec1d8bfa81217c8c2d5a89bc1772c572 SHA512 710be7f5355077fa1eae256c541a06d475902492a19638c5786e25aafb9181f40afcc8df70aca0da15a569a9d6b095ab7bd8008e4f947725cf081954fb7c042e
-DIST neovim-python-client-0.2.4.tar.gz 47216 BLAKE2B 029bc18936fcd23518ee0b80e5396b2ad9477a4395c27ca5d7e30f897599b47d68529cfe0febafae321a2dc9bb8dfd7cdcdde97225e166bae0565bd301598a4b SHA512 38dcd146060d1942d5ab58ab036f39667b908719b1fc48f79c0bd2b82cf458c3ef6750ccf6d0e4b5bdb71b42a9e5666c008f03a46b07801f2ea8435dec8c716a
 DIST neovim-python-client-0.2.6.tar.gz 50170 BLAKE2B d241ae0019bb8a4f08abf11866d7c964425d96756452e7bafb95fbce1795657c6911cf6bb706f5efa46ac3f5bd2c4af23ade9b9677d8f1f94905d72a39ddfde5 SHA512 a493c1e6be6a196d35e69e6b6b6a7752e939a254ed423079468c0e13ce40c2646ee8d65482648ea37a9d9c53b4f2c50cdd5e6c8dc130e63a7e40f424c4f4a9c0
-EBUILD neovim-python-client-0.1.13.ebuild 877 BLAKE2B 1e30bb66d30a8d733bdc6708c65357f8711cbc9a176fc7c1a0f568ea43962e97311aa18e527bff268d7335de77938d1ddf1c95c8f7b10caa3023bac03b95776f SHA512 c627687a3faf385941d038c4f8424ebd12d59e1cdd9568912151bb51b3d46315dc3a9acf3905a17a6b90ab144dee439354a9a37cfe0f3ab3dfcf1b3c2ff60142
-EBUILD neovim-python-client-0.2.1-r1.ebuild 801 BLAKE2B 7c12157d4057993215cadbc12798cc67029b0740076892053de16feed7221ef62cd29f460be4314383b597f74ddb53679bc59898a289ff7f44ae3fab175dff12 SHA512 d28b9551284ffa8598b046cfa6cb87d30a18843861b7fec91d3b505fd0c7de9c98652dedf66fc2f8b796c091f42230378166a7d779d83cf44984d5ddc1726e93
-EBUILD neovim-python-client-0.2.4.ebuild 801 BLAKE2B 7c12157d4057993215cadbc12798cc67029b0740076892053de16feed7221ef62cd29f460be4314383b597f74ddb53679bc59898a289ff7f44ae3fab175dff12 SHA512 d28b9551284ffa8598b046cfa6cb87d30a18843861b7fec91d3b505fd0c7de9c98652dedf66fc2f8b796c091f42230378166a7d779d83cf44984d5ddc1726e93
+DIST neovim-python-client-0.3.1.tar.gz 51626 BLAKE2B 80e68d02d41c7891fb88e9386866f87a1c78acc9e279de4ce4c7022333f8da3b68ffe7c598c84ff9c6386458639b6ffb4aecbfe72288866dc147ffc6197e94e2 SHA512 9c1599aabce9f0e1133364f8e91dd1b57cee107a11d400f530218ec7ad157c2f58134c1e7e8fc27649b4d8953e27c51bf6e4f0e7565d8c3dab94788759eea229
 EBUILD neovim-python-client-0.2.6.ebuild 801 BLAKE2B 7c12157d4057993215cadbc12798cc67029b0740076892053de16feed7221ef62cd29f460be4314383b597f74ddb53679bc59898a289ff7f44ae3fab175dff12 SHA512 d28b9551284ffa8598b046cfa6cb87d30a18843861b7fec91d3b505fd0c7de9c98652dedf66fc2f8b796c091f42230378166a7d779d83cf44984d5ddc1726e93
+EBUILD neovim-python-client-0.3.1.ebuild 777 BLAKE2B 5b54d636bf4f1ce02f25afa3267e37b813adc057513b78bf886ad4a432f6621e86639205a82e68883ef58d665233ee84ed2b5557ee6e01f2bd76e162fe39401a SHA512 87e726b122b349c19dee6c138e33a2a01638f3981d5ccca2607bea8c445a615aba751f2e9c17822c77087d3413a4eaf07e8a02f92c44601e0e3bec002da16bf4
 MISC metadata.xml 451 BLAKE2B c2317fb2bf039a77c223c958dd1238ed934621c556c9c8f565bca643a73e79bd036b71bf104146e810300bcfc755328365982d44fc4b4c46676e64d8720ae64c SHA512 cf9f4169ee1ea2adc6f88b17461202cfe120c20a5367ccc0da4099b8792841d13057d8c133c85179b1c5b00ad4bc9954a0e9202b3810a6342f8e052ffa3dc2f1
diff --git a/dev-python/neovim-python-client/neovim-python-client-0.1.13.ebuild b/dev-python/neovim-python-client/neovim-python-client-0.1.13.ebuild
deleted file mode 100644
index 996030447e49..000000000000
--- a/dev-python/neovim-python-client/neovim-python-client-0.1.13.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
-inherit distutils-r1
-
-DESCRIPTION="Python client for Neovim"
-HOMEPAGE="https://github.com/neovim/python-client"
-SRC_URI="https://github.com/neovim/python-client/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-COMMON_DEPEND="
-	<dev-python/msgpack-0.5.2:0[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-0.4.0:0[${PYTHON_USEDEP}]
-	virtual/python-greenlet[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/trollius[${PYTHON_USEDEP}]' python2_7)"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	>=app-editors/neovim-0.1.6"
-
-DEPEND="
-	${COMMON_DEPEND}
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/python-client-${PV}"
-
-python_test() {
-	nosetests -d -v || die
-}
diff --git a/dev-python/neovim-python-client/neovim-python-client-0.2.4.ebuild b/dev-python/neovim-python-client/neovim-python-client-0.2.4.ebuild
deleted file mode 100644
index fba1505898d1..000000000000
--- a/dev-python/neovim-python-client/neovim-python-client-0.2.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
-inherit distutils-r1
-
-DESCRIPTION="Python client for Neovim"
-HOMEPAGE="https://github.com/neovim/python-client"
-SRC_URI="https://github.com/neovim/python-client/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	>=dev-python/msgpack-0.5.2[${PYTHON_USEDEP}]
-	virtual/python-greenlet[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/trollius[${PYTHON_USEDEP}]' python2_7)"
-
-RDEPEND="
-	${DEPEND}
-	>=app-editors/neovim-0.2.1"
-
-S="${WORKDIR}/python-client-${PV}"
-
-python_prepare_all() {
-	# allow useage of renamed msgpack
-	sed -i '/^msgpack/d' setup.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/neovim-python-client/neovim-python-client-0.2.1-r1.ebuild b/dev-python/neovim-python-client/neovim-python-client-0.3.1.ebuild
index fba1505898d1..751a436d4fda 100644
--- a/dev-python/neovim-python-client/neovim-python-client-0.2.1-r1.ebuild
+++ b/dev-python/neovim-python-client/neovim-python-client-0.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,8 +7,8 @@ PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
 inherit distutils-r1
 
 DESCRIPTION="Python client for Neovim"
-HOMEPAGE="https://github.com/neovim/python-client"
-SRC_URI="https://github.com/neovim/python-client/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/neovim/pynvim"
+SRC_URI="https://github.com/neovim/pynvim/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -23,7 +23,7 @@ RDEPEND="
 	${DEPEND}
 	>=app-editors/neovim-0.2.1"
 
-S="${WORKDIR}/python-client-${PV}"
+S="${WORKDIR}/pynvim-${PV}"
 
 python_prepare_all() {
 	# allow useage of renamed msgpack
diff --git a/dev-python/netifaces/Manifest b/dev-python/netifaces/Manifest
index 7396eb9aaf91..3798216daad7 100644
--- a/dev-python/netifaces/Manifest
+++ b/dev-python/netifaces/Manifest
@@ -1,6 +1,6 @@
 AUX netifaces-0.10.4-remove-osx-fix.patch 353 BLAKE2B 49b66642156ada3e01e7a7fa28b6e12a36b5bacd38676972b1685a2c2710bcdb531849d3c27ce5279feafa1048d060eb227a79ddd5569c5d48accba600f32e69 SHA512 0c47d026e1be42fdae860aade01762d0c7e27083fbe17dbed76526e72852f0444e56617431d081de9e4e86c7ce65293d83e704e56a3219face4d07106730255c
 DIST netifaces-0.10.6.tar.gz 25166 BLAKE2B ada66ee2c0a20570d97a9375ce6212c9e7a8765d338b70aceb768912a340dadbf93311aa5cc5a23dd3953f98787be41457c60ffd0f8726cfd4955545709019e1 SHA512 2c892062286007a8330c2cddc148ea21d1fd24aec32b5f25b8fe905933c651f8c532596f523f0bb7edb3a143e9a491ec49d60f75efad4407273ac2647b579b1e
 DIST netifaces-0.10.7.tar.gz 29330 BLAKE2B b93b48242781e6fc0006dc653c180daabda46036149ed5f023481ccc85d65be03f1a1862ebde2e0285573bf347302e50958c35ce54b633d427a49fe95b151d53 SHA512 d97433345a29ae540e40d5fe9e50c10e8b30197bb0b798f55c82236f20dc6f463604ed202b361cdfcb5e0c95998c87acc781a808c0198ec0479089e13a7fdbed
-EBUILD netifaces-0.10.6.ebuild 647 BLAKE2B 425f45ffb9d83644a43be7f6f83fe3af718913e89dcee82e457c56d17307ab8ded6b93e4f8f3368a7bca54683d159644812f844cce9794ea557452549de95137 SHA512 a124e042414ca29985acafba59597a13019e34ec00437727979c99dc98a2fa3a216ce391ed2e9d5d0d7f22227d7bee62615e7200de603aa3641a1c469d8b473e
-EBUILD netifaces-0.10.7.ebuild 631 BLAKE2B fdf7b926d177360a00aa5fb5f86c7ed46ace02b6337aefc48c492b77c6b8b0f7ed67630c1fb8507fce0b14be466dabeefe9bbe95c9ed585217240cc8f91afadd SHA512 d249543fb6ced203a437507cc984bf67a91e0036f89b1593029423a86304e2c9d0829d298ff57320c3b36a4f95c9d2e8414c0e3ad57bf57311fe66804841d8d3
-MISC metadata.xml 495 BLAKE2B 75476318ae214d37c760fe93ac092f830c2ab1141f06508e1794be65e1d9731c4e23337507f1a29e1b84e87396f797d58a864c9e8bfdb9635004d92d743020cf SHA512 6a1388bdf9efd868c781dd76b855b14a88b010c4d2d95f98e2ea6d88aff34259f314e23a2130de4675e470d3b5bebf46e4f68bdc2152a8e62fa17e48cad95225
+EBUILD netifaces-0.10.6.ebuild 642 BLAKE2B ca32c3637ccb5065d35d1c8f16d41d831bf4b9202c3d2120eea9cfb82295f3a4a29f0c0805dabed446672517d2b55acebcaa93a1f0f0531e63593d1e31c783a9 SHA512 406a76367f3be77edc03b30c6a587ba76625a3dd4239dc9db2cf18c75b3a28e9f4d4c57334a6b0c2a7f132f2e5a7f66f119858491a5315bbab0e08ef36b9fbe1
+EBUILD netifaces-0.10.7.ebuild 624 BLAKE2B 194da5efa02d62b1c657233502eca4a9f9f62b8ae0a2a8a2200ab97d544682bec2067a997fc0c91f0ec9186971f493e23dd00a862e9f947a46c4f53e8c0d8273 SHA512 5c3f2a5db30e32a71423c721a700366781b4f6f1cdaad88d4083f6abaf2bc97a570cb6c6f7c39c3122f735afff9f86ca5075c615d87e264c071025bfaad4356f
+MISC metadata.xml 513 BLAKE2B 2668fe590efd338d410c10a71076e5de04297b18f998b07dbb88a3df99e1c4e66ed92f97fcf6d06b2496bfec3ec308d3812f08b1640b73f1d2221beb669ad3d6 SHA512 88793ae0c8b539b78d70e1af3a18e65b7702e3663d950a9ea1ce7528ed3300ea0b4c69c5a48a652fac4c2a32ede679062dc929c165035a3cd4dec13513669691
diff --git a/dev-python/netifaces/metadata.xml b/dev-python/netifaces/metadata.xml
index c535d0e3657c..e1a6f820cade 100644
--- a/dev-python/netifaces/metadata.xml
+++ b/dev-python/netifaces/metadata.xml
@@ -1,10 +1,6 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>xmw@gentoo.org</email>
-    <name>Michael Weber</name>
-  </maintainer>
   <maintainer type="project">
     <email>python@gentoo.org</email>
     <name>Python</name>
@@ -12,5 +8,7 @@
   <upstream>
     <remote-id type="pypi">netifaces</remote-id>
     <remote-id type="bitbucket">al45tair/netifaces</remote-id>
+    <remote-id type="github">al45tair/netifaces</remote-id>
+    <bugs-to>https://github.com/al45tair/netifaces/issues</bugs-to>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/netifaces/netifaces-0.10.6.ebuild b/dev-python/netifaces/netifaces-0.10.6.ebuild
index 55b258e54888..9569bc1f5847 100644
--- a/dev-python/netifaces/netifaces-0.10.6.ebuild
+++ b/dev-python/netifaces/netifaces-0.10.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,8 @@ DESCRIPTION="Portable network interface information"
 HOMEPAGE="
 	https://pypi.org/project/netifaces/
 	https://alastairs-place.net/projects/netifaces/
-	https://bitbucket.org/al45tair/netifaces"
+	https://github.com/al45tair/netifaces
+"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/netifaces/netifaces-0.10.7.ebuild b/dev-python/netifaces/netifaces-0.10.7.ebuild
index 63e0e5e7d0f1..86c834e4f2bc 100644
--- a/dev-python/netifaces/netifaces-0.10.7.ebuild
+++ b/dev-python/netifaces/netifaces-0.10.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6,7}} )
 
 inherit distutils-r1
 
@@ -11,7 +11,8 @@ DESCRIPTION="Portable network interface information"
 HOMEPAGE="
 	https://pypi.org/project/netifaces/
 	https://alastairs-place.net/projects/netifaces/
-	https://bitbucket.org/al45tair/netifaces"
+	https://github.com/al45tair/netifaces
+"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/notebook/Manifest b/dev-python/notebook/Manifest
index aa218ef520ac..3c7b29a318c5 100644
--- a/dev-python/notebook/Manifest
+++ b/dev-python/notebook/Manifest
@@ -7,5 +7,5 @@ DIST notebook-5.2.1.tar.gz 12458130 BLAKE2B f10a91fd79064fb09889c4ee30a84a0b3432
 DIST notebook-5.7.0.tar.gz 13394162 BLAKE2B b74be075ec97896d8ace2ce9f45d4759aee3dba1a7515a412daa8fda4606198d1487e6760ed01d8a2726ac3bf334f2335f40bf8938e8ae1ca23c9cbb5a52eded SHA512 bc5ff0316b0f89ae2c8b8bc271a8824848e2a3d93420e895557229663c889916aa98e4d1503957abbd38ca61a1b3f9d421946d6c98e36f1153b1833f473330b1
 EBUILD notebook-5.0.0.ebuild 2271 BLAKE2B 3454254a51dd97b18559593c8c8c6da2c9132d8a9d3189c9b69a1cde5d376106ec43b434baecd79dec98c39fb9eab4b49bdd78fdc777cc08510e65ccac34f182 SHA512 7151e9322267c0514b0795da224d57fb4689a3beba5c3073b4a0968aaafe0b83935122d6c154933c5cb3e6ad045eda702d2ef1345346a6a07b3aa59bbeb9d504
 EBUILD notebook-5.2.1.ebuild 2652 BLAKE2B 5076fbe22b1ab7b0100842c4a7b8ef1b072923f6d961c916973bc00671af35a2923d152e363d5cf62acefd511914ca338f87ca036d1eea3d06c6788db34c4df5 SHA512 85cafa203f79831b8f5f86b1106778152580af0ac15bfca8f09fadc09b10be3c13226e224f04eb070480d537060d60f0b92e2de217b5cf7fb8b8b3b4d967823b
-EBUILD notebook-5.7.0.ebuild 2716 BLAKE2B 74ca5385c60773a6b1720eb854c8e29bd3c3c3bd52162a662f7c38f07446c253547a935a327b8cfd211e8cc02b94c07b5a7d14cf733d9575d884a74f9f432372 SHA512 7e90fafc6cd5db2dcc248befa14d793ce2ab927133179379feaa808e38d8cd36c20db8f9b76eefe36c9e2b5480149adb8e8b7a3aac96233852627ba309336d90
+EBUILD notebook-5.7.0.ebuild 2757 BLAKE2B f80fcb72fe0d59cbb63e1f90f98d40475914feee2aba240275f9cfa90e9af2359fb75ec16d4113fda142d2bb0d104220a86ee652235e6316d1382346e2ded48e SHA512 1fe0db8b849b550c5f01b8411f5b05aafcac9929d92c655f82c2adb995d6c528a8981c60c3a3eea340a728e7dceac61f0182ebc85984d16e92612308dc4c18c9
 MISC metadata.xml 472 BLAKE2B c68faaf3f609c2fc884c61f1fd1e0296460316ddd6da67aae1492a850a9128654d6f903f9337d92f9f0bfb78b00b94191c99a26dffec92279e79ddfc9ab39fd1 SHA512 23588835d3a40661f3a59b92a9ccfb9e40777f14ff03b6f9c403eb9eee5560e0a805c6a76cd8ae2fb11eeba39b264fa0fedf44cc4fd2231318fe1cefe2c27846
diff --git a/dev-python/notebook/notebook-5.7.0.ebuild b/dev-python/notebook/notebook-5.7.0.ebuild
index 039e056f3a3b..4c76d3957178 100644
--- a/dev-python/notebook/notebook-5.7.0.ebuild
+++ b/dev-python/notebook/notebook-5.7.0.ebuild
@@ -19,11 +19,12 @@ IUSE="doc test"
 RDEPEND="
 	>=dev-libs/mathjax-2.4
 	dev-python/jinja[${PYTHON_USEDEP}]
-	>=dev-python/terminado-0.3.3[${PYTHON_USEDEP}]
+	>=dev-python/terminado-0.8.1[${PYTHON_USEDEP}]
 	>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
 	dev-python/ipython_genutils[${PYTHON_USEDEP}]
 	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
 	>=dev-python/jupyter_core-4.4.0[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
 	dev-python/jupyter_client[${PYTHON_USEDEP}]
 	dev-python/nbformat[${PYTHON_USEDEP}]
 	>=dev-python/nbconvert-4.2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/notify2/Manifest b/dev-python/notify2/Manifest
index dc9ef039ef36..065bf970e780 100644
--- a/dev-python/notify2/Manifest
+++ b/dev-python/notify2/Manifest
@@ -1,3 +1,3 @@
 DIST notify2-0.3.tar.gz 8798 BLAKE2B 57e1eeaa96b9e5354991db36440abfbf80471887c094e41dd6ccff72f1b1b35524bebf83b44afa455c64cdc3fb7b0ef66d2517ca499340a3d001e796828ff9b6 SHA512 3290a5ff291d5500bcf631094fcf10302b234353eb8c26b91e7cd264238443866aadc15224d51eb6608e16b7ffbc9316d4bc551e5ad9de2a48b12a31b195739f
-EBUILD notify2-0.3.ebuild 655 BLAKE2B cb702004604502914589f845d24652f6bd627c45283a2b79a28d40dee4efaeb8c4ba427fcd5123a00fe25fc3995b136a642f8e582ff909870e93ae2204bc4c3c SHA512 3a15e082adf783afa7f14d83f4698617232379f15e486f955cfd36917cbbdc71a5e3828ae5573f30b941b62605789e178c42c2bcd58c4fd8b97b55a28afba296
+EBUILD notify2-0.3.ebuild 667 BLAKE2B d5a97d8118abe1bcebf5a41b3a741fc983dbf76acbd289c4c4ddba33fd11dc0047455cd7e522bfc076363cf29270173342830bfe88b33cbaa113c2df7daed823 SHA512 3b30f6bddb5c7e01f1b5f3232b037e83eea0fcc31fef80a159d774ac4595f171f93ede635627cc9e1d7e02195ce5b0641fbbe0eb54e8c593bbd7868d93503eb2
 MISC metadata.xml 465 BLAKE2B 477ef3b148c7916372b0c12fc450dc9bacb59c609a3e3e005be6f8d5a268661405744c16180b336e34f4782f7e3a38ba17e63747d46199d0eb161e23d8415eaa SHA512 8024b5c580d09b74bf6a258dad507bec09d0c7bbbd10861bc2f866dd71acd7a858e7175dcb1d670cfdbade64da3f607667434a8587de6ceaeee7da028ce332ba
diff --git a/dev-python/notify2/notify2-0.3.ebuild b/dev-python/notify2/notify2-0.3.ebuild
index 60cbba01f397..3708324aeb0d 100644
--- a/dev-python/notify2/notify2-0.3.ebuild
+++ b/dev-python/notify2/notify2-0.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE="examples"
 
 RDEPEND="dev-python/dbus-python[${PYTHON_USEDEP}]"
diff --git a/dev-python/numexpr/Manifest b/dev-python/numexpr/Manifest
index a1b5243218d1..213ef19e86d8 100644
--- a/dev-python/numexpr/Manifest
+++ b/dev-python/numexpr/Manifest
@@ -1,5 +1,7 @@
 DIST numexpr-2.6.1.tar.gz 90819 BLAKE2B 833402388e184bd38c449bcda866f68858f486d5cf30aec29dc5e9827a34a40cb166128a8fb217f0ed1614e0b759cf2164e31cb2a16198ea3e6a216c9fe01853 SHA512 07c88b1788ecad2c59260e7a6a15dfc21d486462a8866091d157286e5ce3b5b77f5fdab401fd30e2a5e4880398af53641d557003497c7d3658421bfcff38c31c
 DIST numexpr-2.6.2.tar.gz 90970 BLAKE2B 85034d7d36bd921df289f817451e7b30071b9d448dc050e4f25afd13315921e3c10d61a41983cf106606e4efd91504e94ca7d8f01d80b230a9f717f41eb687ee SHA512 730e19e61987ecb00bfc3a65db043c88a1311046f2ea5f0a48c93d6a8d7576dbaa166b0b9b0f547e344b21b5c269be1b5aa2097e88aaac55219884c7ece55261
+DIST numexpr-2.6.8.tar.gz 94517 BLAKE2B b41593183d69cd98f81107da5abc3eb59b35c6e61c0dde213c9a201c2776e4684d8af4b1a88c59ca464a7755941de9baf2157af64e8662c4219ae8ece635aefb SHA512 e610a2e3891f12b3a9fd7acb14a0362e0f03084035aa274827ec5e7d2584f2c599493afaf406d8720d915c7ed834dca11b1fbf28c0645077eb63223a2bf52cf9
 EBUILD numexpr-2.6.1.ebuild 1385 BLAKE2B 1331948ae46b9d20c3122e5d779bc00db85bd11dfca73f63ca80d1fdf27f43c6fe2297dc0556d0bc0b0275516052608f07ebd6f323b95e89c40ae8781f63078d SHA512 dba9ff2f89c309efd420ef478a1fb8bd75036eeeb66d758c008ca5e8dc33d43f95886fb8883feeec7861108b8173f54b764852f1c5993e19f30d8cff9213e50a
-EBUILD numexpr-2.6.2.ebuild 1387 BLAKE2B 96400c41fd73d431b291d351bf6c57a711534ea5d0df22d091a5a4e5d19da1700e46c28c0c8a47f3dc1d6109cc6472384100c1e18b771ec5798f90392560c9a9 SHA512 52618df3453f10c49578df1a8a341978d4908c366f7af3975e8af85086d8f668ec42952fcab02b5e2166cff6020178fc015a0cb3038545979318014206d78471
+EBUILD numexpr-2.6.2.ebuild 1386 BLAKE2B 2f3ce14437912a42c9ad770eda3f731f087e6eef4b6ede44a043bc9021ed04357550c25cd2bfd4f330e3ffbade391b8cacbc66516cbbd89a8d084b7c47cd70ae SHA512 4abad8046ecb5c969258e37b7884c990ea5e833250e377c9a35d493a85315eefef50d2feddd236161ad8c5142d04480509b3651356be3d881422e9bbff53b064
+EBUILD numexpr-2.6.8.ebuild 1391 BLAKE2B 73455ad788ed96ea7c45b16e376ed02441de7792dc591299055039d898ced8f753f3c71d444fc0efe5981f2e0ec78111acf73acbf723486a31de9ca7d768692b SHA512 292a38a5fc4092f6e1ee62006dbe7a36c44eacb4f2932c1d97a5adf7112e4d72c93e5c29fd1610bdab5cdf64ba5ce274c27c76793499327e35f1a8ab88680578
 MISC metadata.xml 1086 BLAKE2B 5ead7194bab4b637946cc095ba6ae07eb461a20d4f8621f8be75c916e8d414a309b1679b928389e9e61f2ff4795a8f149b9a402f12bc21965d25df1251f6c4e3 SHA512 9867fb98eae499a7c149e61f37a08a27167d076cec8c85392c4a6db4bb8c44314f28771db8c35d1dc1f9ac1c8af21841503e12b0f0c3c39ae6be336a72096824
diff --git a/dev-python/numexpr/numexpr-2.6.2.ebuild b/dev-python/numexpr/numexpr-2.6.2.ebuild
index 03821ec488ab..93836f5e9c2b 100644
--- a/dev-python/numexpr/numexpr-2.6.2.ebuild
+++ b/dev-python/numexpr/numexpr-2.6.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 flag-o-matic
diff --git a/dev-python/numexpr/numexpr-2.6.8.ebuild b/dev-python/numexpr/numexpr-2.6.8.ebuild
new file mode 100644
index 000000000000..0e6532a4ac0b
--- /dev/null
+++ b/dev-python/numexpr/numexpr-2.6.8.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Fast numerical array expression evaluator for Python and NumPy"
+HOMEPAGE="https://github.com/pydata/numexpr"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="mkl"
+
+RDEPEND="
+	>=dev-python/numpy-1.6[${PYTHON_USEDEP}]
+	mkl? ( sci-libs/mkl )"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	# TODO: mkl can be used but it fails for me
+	# only works with mkl in tree. newer mkl will use pkgconfig
+	if use mkl; then
+		use amd64 && local ext="_lp64"
+		cat > site.cfg <<- _EOF_ || die
+			[mkl]
+			library_dirs = ${MKLROOT}/lib/em64t
+			include_dirs = ${MKLROOT}/include
+			mkl_libs = mkl_solver${ext}, mkl_intel${ext}, \
+			mkl_intel_thread, mkl_core, iomp5
+		_EOF_
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	if ! python_is_python3; then
+		local -x CFLAGS="${CFLAGS}"
+		append-cflags -fno-strict-aliasing
+	fi
+
+	distutils-r1_python_compile
+}
+
+python_test() {
+	pushd "${BUILD_DIR}"/lib >/dev/null || die
+	"${EPYTHON}" \
+		-c "import sys;import numexpr;sys.exit(0 if numexpr.test() else 1)" \
+		|| die
+	pushd >/dev/null || die
+}
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 4c17e7536bca..87b87ad13a6a 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -26,7 +26,7 @@ DIST numpy-user-1.8.1.pdf 408305 BLAKE2B 2956e42ebad45b021f72c7e71d357d953ea8a26
 DIST numpy-user-1.9.1.pdf 418111 BLAKE2B 683ed35ca9e123387a08a88047ad0cfd8bf3698efee7c17c3b57941f57f86297798787f13b142a1bf806f775e70bc116109decb281ab82959c08932c06aa1f3d SHA512 724302468a8e93daf70d379bb1ee7369953e297c40ea260f080b7aca3c9c81e619a81705bdfb2ea214da5b5325ec2b48e953eceeaa1d60c07593b00c35989f45
 EBUILD numpy-1.10.4.ebuild 4094 BLAKE2B a20c04c9445b3b13d30706b2fa26633541722175c4f2797777cd90c5c5d1a7af5079009bbdee026b0b437e6e82ece7efa60f16d59a09e7c39b2139162c76bd86 SHA512 f0817e879689c05b76cfb921db376828227f947fec740126e59969bf75933d5b0bd969f5dd836c7060a4bcf079ab7174db33e0388629d8f323585d7e31ce9d18
 EBUILD numpy-1.13.3.ebuild 4646 BLAKE2B 717d5acd1683ef3f5d7ea07475b7d3a5555991aa2240c5cade1170f01092e12e315ba99d408f2f04e8e998d5c0820bbc2034ef177375d729d19280e6940c6f66 SHA512 2eccdcda9e51aeda860a1cc02538708709687a202a8d0ed9cba6ab6fa45ce80153b118bda265944235040027d7b15f36c281d130e2e6a59a66d9ecec046240b8
-EBUILD numpy-1.14.5.ebuild 4071 BLAKE2B 303579c8b76d6626701648c43f8d1dd7c25ca621bb97e54469b90d3db0cb98b1147506263483f26a986fe2a16b0cb857f5ac1afb0e004c5a557b539088b35c8c SHA512 78b87cf953148872700ec419ebaf233c6c92de386900a9c0c7bed5aba3ea2620e65d1eecb119ebea858a62286de8f06a1caa1612e48cff6d62498cd8f90a35a9
+EBUILD numpy-1.14.5.ebuild 4065 BLAKE2B 42f9c13392d122e0aa3fa01d2a55d370b4d37a1f932cb860b1f9d81c551632f3778a4ab94fa911f7a9db6a9686d1541d54f450cd9e78fc9168b2cb00bf9c15a2 SHA512 915326a6ccbf196e98e3061a4abc8817246cd6b46cdeaafb7d93dc577358da626334563398def155de38fd090a75c3c9e4b45753c231851ffe6774755e5e74d5
 EBUILD numpy-1.8.2.ebuild 3945 BLAKE2B dd27488a9771219b8df7c8546067ec710168d39a7675c963846197aac6959907d402269efdee44d9e2a42edcfe6a3f27e9e360604df77d620f8f39f96427201e SHA512 3086b989bd9ac6f8b07839afaabcd8f683888ac5f0b2e1fdeb951ac49c79af4585be7984775af8d3a03b89957792ffeb065b54c624d00050bb389aac67f0fed6
 EBUILD numpy-1.9.2.ebuild 3958 BLAKE2B e05e749e5f0c4b3f0346cf0dc78531421ab081bcea12ecef30219d0504a77c0f99ccacfaf355bbf008c2af07434d7989e4b2c4417e91ad48e70407535a23a1be SHA512 04f442c6a363caad3313418f681e264a7e680c19d235aa132b27f2d0caac8495bcda7c75ea9904ad0096e844beda1ccb15dd2f4562e632a1576918279569cfe4
 EBUILD numpy-9999.ebuild 3355 BLAKE2B 09f61bae65c20b5736f5375c2ce6c04670f43f953b820ce30c329c8053f1b151490c53d00209fb84b2167ff11d3b2901dcbf5780ea1d057787f0218f8a9a322e SHA512 9ec2ffc43301df0664b7448ea3d094c8fa6fd587c087c95e0ad91f9cda780ff605653ff6e003234d8e4091ed30973ba13265dab882d1f4e854090958c2ff35ba
diff --git a/dev-python/numpy/numpy-1.14.5.ebuild b/dev-python/numpy/numpy-1.14.5.ebuild
index 1b047af16592..17335bd9732c 100644
--- a/dev-python/numpy/numpy-1.14.5.ebuild
+++ b/dev-python/numpy/numpy-1.14.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,7 +24,7 @@ SRC_URI="
 	)"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc lapack test"
 
 RDEPEND="lapack? ( virtual/cblas virtual/lapack )"
diff --git a/dev-python/olefile/Manifest b/dev-python/olefile/Manifest
index 1ccca39d818f..a62bed491440 100644
--- a/dev-python/olefile/Manifest
+++ b/dev-python/olefile/Manifest
@@ -1,5 +1,5 @@
 DIST olefile-0.44.tar.gz 57903 BLAKE2B 2df4078c147ff737b845fe4ca57b6520c39776efe6bac399b0b8acb4ca62f946a653f85ad0511f5fa42d8b544d539474d226fe144bc2604737f3b16e5edd5ff2 SHA512 92b6ad1bced5b2c8e5332a01e5a2e59527ec2303046d0babd665b0f02fe56966574eff56619de168c50f1ea40df2e61ce589ee61b634222146d049b129514c65
 DIST olefile-0.46.tar.gz 97587 BLAKE2B e6dbadda6f18ec287f5b1b59ab4b92ceee25b4ca47499ed31a03992ae4e3a7269ba0c641f631c4beafdfe43eccab4881d06f7ba372ec47b376b5eb3ed788f45d SHA512 e70975cdda11004ab331908085e0cbd9cf3e44f49fa1453a7af5373bfed0a98729bb7600fee7a1042be6c40c58649f3650972d9e4520bbab218cf715f6264f98
-EBUILD olefile-0.44.ebuild 667 BLAKE2B ab27843fb2c01c63473b9ad347295899740feae07dcdf4d43ccbf6d065d7b21dae68e193c4edec13866f8cb097caadfffdf783b3105a8abd27766fcf56a92d2c SHA512 708f9ed2e39c038345e6826789a4db271f6d4fdd6ca564322a2621494723f23a8ce07f738ba7dabf53b57535e2d27d4c42d55ad6123eeb10d91bc883e7e80ea4
+EBUILD olefile-0.44.ebuild 666 BLAKE2B 22e1d3e48c2e32856670b4005e832ada93c22edebc771737f042108a89a74858d6734875cc18614a90ad5e7eada094946a81309885dd915aeb90b06567b92343 SHA512 681f945ddd7d47279b5bf46f0a31f6de084cd24a73453005b9ee7860c4b4d75ba6397ceaa29ad422f49ffb56f76ca3b0a659ce672482cc7a1fde2be3159af2ba
 EBUILD olefile-0.46.ebuild 673 BLAKE2B 7079b5ba6ab8da7f06e11931fd8693abed7b0897f6654f5ac57045c6e4453953086f88f3af144b5b7d2316bdbc41f57ab140dd58406cbc1c2f1a7c87545f2789 SHA512 1e338ae9e07b7a640bf848a0a7b3836715738d5edec752c8cc424ab12fa379b860f9f5a08bb82ced903f1792b2c166d0801b8187be8075cfe47822ef4769bef0
 MISC metadata.xml 383 BLAKE2B 45351ea99d7f164ee4e5ad18fd067d96c23fd2b6496b7ab979242cd12261fa167afc521b684b424754b8888f1a843bd42c9d15f87fd4a3c7af60148174ce27fd SHA512 9f6c8f0826a156a2b56d449ed0fd175a22e410f288194da6dfbb2b4ced638410211cd1020e26c3cafeb60aa70a99fe961a7188347118be42f9ef37a8f833f69f
diff --git a/dev-python/olefile/olefile-0.44.ebuild b/dev-python/olefile/olefile-0.44.ebuild
index e98d48d5c1f4..a9ecde3a2efa 100644
--- a/dev-python/olefile/olefile-0.44.ebuild
+++ b/dev-python/olefile/olefile-0.44.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/decalage2/${PN}/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 RDEPEND=""
diff --git a/dev-python/oslo-config/Manifest b/dev-python/oslo-config/Manifest
index 2dfa4d8b51e0..b2c8d2bd9cd2 100644
--- a/dev-python/oslo-config/Manifest
+++ b/dev-python/oslo-config/Manifest
@@ -1,5 +1,3 @@
-DIST oslo-config-5.2.0.tar.gz 130627 BLAKE2B 7d5e78a7486ea5b24d9eaa488c70c3222da137d230912551e98fdd4a433b3979c2d8841aa4cff3d763ca356ea1f80f2cba13716569ee41e8ff7c4e6511a3d91e SHA512 fa3323926f7f7b1a79e4823dfc102027cb466728500980d9f079c2098c93006b4fdeebb2f09bda41512dc854f5dfe080b727fa2d63910e6fc609d69fab87596c
-DIST oslo-config-6.4.0.tar.gz 145057 BLAKE2B 0f4533f7551cc6ba4fe2c452376f4480fce21e44403dbbf29350277cb78d809e5e3152074c667034420c9d1706f6aeb940d62d04f626538c17dc9435613a91d5 SHA512 d3cd60a1432932e43ec45e05950cfecc75ca3a73c5cc3d8b427b44a8de9e1c3e45ba79cdcda5bbdc1d72f8eb1d2e5cd2bfb9c0ce6c10b66e935541c487878639
-EBUILD oslo-config-5.2.0.ebuild 2059 BLAKE2B 903926387ee247a3803ced58b569125876424f90990b28837e46cb970c795f7e3811940e34da3c80934c725fd64d5cb7a8bb4d7baae68ff9907c627158955d6e SHA512 558446547c9442ff2d42eb63ce2c69a10a8f54e30b1f4da36ea45bb20ff5b2b82361ec243d6393f2967c61f0a97a7e82e9eefc1db492d90e7c0ee0d5bad8add5
-EBUILD oslo-config-6.4.0.ebuild 2282 BLAKE2B e33a1ebfff7725b79c5e87b393fac9f4661cc81ab265eb91241a37fdf7c992df69c821d8cc668744e4e6694bef226517ef7bc4c002492ed645adad5c1495f885 SHA512 f7e94ac8b0063ecc03c094fffa34b7a8885cdf1798eaed2b17ef4d3c2b67f16e675d77bc318319917bcb913d5000244d19f86550b7cf409e3b595131bbeccb0a
+DIST oslo-config-6.4.1.tar.gz 144762 BLAKE2B 467e139767b6afd82e1c0d39841765c93e4c23b208e676bfd4c64512a71f6c432a1431d5bf902d268152fa3011e864173f6a766bca560efaadce7a713fa919b7 SHA512 97a47931fe98c6a19ecfe38fa8aae50e91e955db879b96988560db16c0ec775ce294cf0c9b45e62aa7dea67ec43cbfebf4a77e168f0c348bb03066c832dc40a3
+EBUILD oslo-config-6.4.1.ebuild 2279 BLAKE2B 841e848211d94b18d1075a0143165c419e1322c7ce6bdcee1cd88321e776a6fb7bd5663e761cf14916e6ff3ab92a9541550012124c41f6585dda579839e1d3f6 SHA512 e864c3cd59d922259eea554a6cf0cf691fa23f2e81f1fd31f953377b48556c99177585a92661c139f6d53df33a3ea6a3c72f329645d11fe15efda14af039e29e
 MISC metadata.xml 670 BLAKE2B 5e3551e2fb4d57226dd82ad46f361f624d1b05ccdeffc1ce86a90692a385841ed26739a3ab01e72284fd6dc47a2607ee1bf30548a2b754944a9b975629fef261 SHA512 c09cd1761655f29d25e689ec95939fa59f4fb9a3fbd48509c0a65d2d289e073b3c60faa838e4075efafe32b2caf2b7fc3ae46af556cd50f66c37ac5ed8a1d52c
diff --git a/dev-python/oslo-config/oslo-config-5.2.0.ebuild b/dev-python/oslo-config/oslo-config-5.2.0.ebuild
deleted file mode 100644
index 66895c8aa974..000000000000
--- a/dev-python/oslo-config/oslo-config-5.2.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1 vcs-snapshot
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="Oslo Configuration API"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-CDEPEND=">=dev-python/pbr-1.3[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
-		>=dev-python/reno-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
-		>=dev-python/openstackdocstheme-1.17.0[${PYTHON_USEDEP}]
-		>=dev-python/reno-2.5.0[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/rfc3986-0.3.1[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	use doc && esetup.py build_sphinx
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	rm -rf .testrepository || die "could not remove '.testrepository' under ${EPTYHON}"
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/oslo-config/oslo-config-6.4.0.ebuild b/dev-python/oslo-config/oslo-config-6.4.1.ebuild
index 7f1e6536fadb..76848c885ed3 100644
--- a/dev-python/oslo-config/oslo-config-6.4.0.ebuild
+++ b/dev-python/oslo-config/oslo-config-6.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/dev-python/ovs/Manifest b/dev-python/ovs/Manifest
index 79a92eead53f..715eb3cc7165 100644
--- a/dev-python/ovs/Manifest
+++ b/dev-python/ovs/Manifest
@@ -1,7 +1,9 @@
+DIST ovs-2.10.0.tar.gz 98548 BLAKE2B 9ab3ea02dbfab1622106ead1e19a96b279d73ee758fbdcfadcb50526b8652a80443c817513b0df92b78a6e788d7215386f18c5e9e59d71536cf481eac8b3a264 SHA512 9b7de41aceb2f3c08df765b97c5149cd66579f361b427b3bb6c24ab20cf922de688a82a99b1d98778311f15b37c73be2769a95b01c96db4fed122e272aab2adf
 DIST ovs-2.7.0.tar.gz 73714 BLAKE2B 3edb76be6ddb20243b6d85c7bc67024c274f625c2f18cd4dd2fdbfa94b01d241edc4d83ce380aaa4374a75f4b392d36b79bd5fb81c8522be88dad4c277858be4 SHA512 6732721f494b0de24dd6b79ca12d45d7e2da8598906384c6fcc4cc0de4dadb87a822c5e0aa4c07065138a0837a850e7d07ae50e6dea9e0752beba667bf154e22
 DIST ovs-2.7.2.tar.gz 74222 BLAKE2B ecf1cfa9cde4824ba927f4fed610ca11129d221f4ecb2c0f0fc701f0fe2a9b86fdc67332b0e0270b0eb1047aeb49fd41d153a212416754180a35dd916cef59e4 SHA512 568f256a2ad204d5b4a237f1f52c903a1041bb03e30b56e390ea4995c646b49225f69eb5804faf996a9db56916398597100a16ff86bd6798d01ee427073c89ac
 DIST ovs-2.8.1.tar.gz 74483 BLAKE2B a90904e645316b625c7fddcc323270bbb6246d59432392bfbcb05ed0ae258f1fcc0afe7a3716dad519d47725a3f765c99c59dcffc30bc5343de59ccf523cfa76 SHA512 b7133f5c2ae00d508d77122952584cba840d4a22231d1a42105ba2918cf598b12b58c47408c17405bb3c9aa90d24a3d0a9257299626704e367badc982aba62ee
 DIST ovs-2.9.2.tar.gz 77160 BLAKE2B 09304ebb6bdf22a2f62d7e89b159a99d861d4121fa52972ca6bd9d9667564e485a454d99aabb243556f2ba1db7fca8c635c9a4f237aee9ac8830c9b19a51039a SHA512 aa5e5ebf633b36074278dc7fd67da05be71b5fcb139955a8398e40bd3dfe51654b016ef144477b818e5682c5612a16550487a89aa76cb41ee75509d62319a66b
+EBUILD ovs-2.10.0.ebuild 451 BLAKE2B 5b67f63d21f80712b8db966cafc52d0bed00ac8c6399b24dfd337a061786714a06f13d9831cc11d8ea02ca4ad716c0308195b16f83b9c3488bd3e32877980d04 SHA512 9d496a996ba5e38ec80041adda5267c5c4c53c92c814714fcb30171b36f9cd602b044679a8c1c1d7ce280e8e400e382d384ad5ae454c65d406f514e801deeea5
 EBUILD ovs-2.7.0.ebuild 489 BLAKE2B 1bec44d0fb204f45809b07343580d142f8422247e282c82c4b70691b59e71adffae4d5b186317b7c36ddb048c099e3d8deb0f5b95e9728853d8d8e9440ca4400 SHA512 0769f6252859597aa3e1cbfe7b7d2383e1ef4afb7ade578616e9ac75d62d1b8cf06828d59ddfaf45e04edbaa39a94c17fb8264445b480dfd0a33b16b1b4d082d
 EBUILD ovs-2.7.2.ebuild 453 BLAKE2B fa54632b02000c4767af927feb7fbddee37df1fb092717285b91358992ad1fd65b353790e5292c8ed2e2a6a77000bacca6add7ba57cec609ca136c9016211327 SHA512 ac768ef799df68fdc6660202244b9f5b7a92d869391013203fc8aa77671a7d6c3d8046a36eba53cb8cd6cdfc88f2efda2b59192411814fc7e3cdfa4b6a7d7d21
 EBUILD ovs-2.8.1.ebuild 452 BLAKE2B 8beef88461ed5e70b18542657dfbf1fca1022e2e07f217e1658427be5a20fbc6931dd140f58fdefc29114e6e796f852e57f5a41a444e912b0a8c205d0c4cdf14 SHA512 b2e73d5536d89021c5edf87d8b8dba1396325627f2be96fced8effcaaad95e2227953217dcdd0918032ba57d7734a2cd857a7d9901fe94e8eaeca6e64208d0f3
diff --git a/dev-python/ovs/ovs-2.10.0.ebuild b/dev-python/ovs/ovs-2.10.0.ebuild
new file mode 100644
index 000000000000..14b22828b0d9
--- /dev/null
+++ b/dev-python/ovs/ovs-2.10.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="OVS bindings for python."
+HOMEPAGE="https://github.com/openvswitch/ovs/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/owslib/Manifest b/dev-python/owslib/Manifest
index 273694bb374d..6b4e9441b2ae 100644
--- a/dev-python/owslib/Manifest
+++ b/dev-python/owslib/Manifest
@@ -1,4 +1,3 @@
 DIST owslib-0.16.0.tar.gz 658145 BLAKE2B 8e32de48192579f10515771c1682b1d1319deb8195ff9c0f9168ea82bb30bbc8bcf7c457c794a79b1121d40f3f544624f0a9789b0f6f36632c6457f396fa78c9 SHA512 a468352dfdb62bea1e6189efcc198237cb909051e51782abb15093e328ca7d3d379e88d0466e42c39ce9bc201a3be828a779193666bf9befe8d501355aaddbf4
-EBUILD owslib-0.16.0-r1.ebuild 1062 BLAKE2B bf8027b8f6b73976e165df589c27e724ab49cad8a1c69141529f1aa3d1ad10bc20ce573f59281b249faef57f2c6334ef717e384dbd7f0522ec9ccfab4c880c8f SHA512 93b6dc28857d0095333e407e8bf6d9b5833b74e1f4cc0240d3e9b3461716a1346c14a566b45484cbe9033a43de53984e17d6f72f4e73ebd01c25b8721f769330
-EBUILD owslib-0.16.0.ebuild 1058 BLAKE2B 63067f83f7f20608bd06184d24f42c87738e80d2834f09ab1cbfca4e52d7d52ebc5499e0addb2a2de1bfdc2d2f266b133d82ec24c08d7a58ef2cdc390dcdb5e1 SHA512 b11b20e77ce631fd523ec6c191b210d42ab1ad53c6ff852c2e9daa8510828dcb399928d0dd5d9bf3a39aa6aa22fb111fb6523d4786592f83a5d314bcf3850a91
+EBUILD owslib-0.16.0-r1.ebuild 982 BLAKE2B adf494c1fd7c61a8f524647466874942f0675bbe8d5fe2841bf771d8e731d363e7f05bb022a129d105970f144edbf97924b57d3e5445cce3d6c2d84fc3687c58 SHA512 559e8ee627cc9baf02c25bb46fad1247c75d041833de2e219c031cbc0b1073f141898edce419c3564fe827664f3d601aab1c3d8e60e8036ca0c86cfd6d8e7584
 MISC metadata.xml 451 BLAKE2B 82a1e52487ebd5bc2a728a26c46f8e26a15d5736da20a50fd8be71fcddc088dacfbe178ca2cdb9841418723175c0631455393e5735b78767e58287c1542991dc SHA512 7c41ce77f3d6126a0fc61c39c953f044f94c39738b4fff7c7c38a9da9c972f16957c44d60df9de59d1c03e3c5384582efa3986e7ac31e546e28fb8ad5b1673f2
diff --git a/dev-python/owslib/owslib-0.16.0-r1.ebuild b/dev-python/owslib/owslib-0.16.0-r1.ebuild
index fb3bf6e9f92f..1c79db9c3740 100644
--- a/dev-python/owslib/owslib-0.16.0-r1.ebuild
+++ b/dev-python/owslib/owslib-0.16.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -30,8 +30,6 @@ DEPEND="
 	test? (
 		dev-python/pillow[${PYTHON_USEDEP}]
 		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-		dev-python/tox[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/owslib/owslib-0.16.0.ebuild b/dev-python/owslib/owslib-0.16.0.ebuild
deleted file mode 100644
index 9da0c2f1927b..000000000000
--- a/dev-python/owslib/owslib-0.16.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_5 )
-inherit distutils-r1
-
-DESCRIPTION="Library for client programming with Open Geospatial Consortium web service"
-HOMEPAGE="https://geopython.github.io/OWSLib"
-SRC_URI="https://github.com/geopython/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-RDEPEND="
-	dev-python/pyproj[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	|| (
-		dev-python/elementtree[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-		dev-python/tox[${PYTHON_USEDEP}]
-	)
-"
-
-RESTRICT="test" # tests require WAN access
-
-S="${WORKDIR}/OWSLib-${PV}"
-
-python_test() {
-	"${EPYTHON}" "${S}/setup.py" test || die
-}
diff --git a/dev-python/pallets-sphinx-themes/Manifest b/dev-python/pallets-sphinx-themes/Manifest
index 503965dbef19..a2dff6632531 100644
--- a/dev-python/pallets-sphinx-themes/Manifest
+++ b/dev-python/pallets-sphinx-themes/Manifest
@@ -1,3 +1,3 @@
 DIST pallets-sphinx-themes-1.1.2.tar.gz 17054 BLAKE2B 2c106be4a8ba68c6c270035ad6764bf87c65a20ca3515991f6287e3bd6a280d3ad0df121c6bad995fe8964425bee4c6ec4d229eef15489c3ae4e4e98eebe4d22 SHA512 0537f1e24b22612720909f1e19f2893b35622411d72298a407cb19318eaf33a0f7c97ee6f69874a172c135b65c9c16726115c1decd6d7a3d6cbda3e1dbdb50fb
-EBUILD pallets-sphinx-themes-1.1.2.ebuild 624 BLAKE2B e2b83e834630450d2ae48090a469a9c5275868d6af673424f007a150f4c26f5ca00fb6f65d9cfd97deef18eb9879cf02d9056abcf8c864eb93b9acc6e55f0473 SHA512 159c580001a33ef6ab4f4357eea457871b8cf0e8afde77b28fee2a9fd9b328b2c888195184e9d0beb5d910955fdb8ffbf84b625743f00b0243b1f852ea336cd3
+EBUILD pallets-sphinx-themes-1.1.2.ebuild 629 BLAKE2B b9feb9194e33bb22e9d9a3d702c52e84aed9637cb7b544ef44cf9ed37647d0995458c00890d8f9b46963e95525562ee5e171bf14e2855fe0a96f3afa49c274e2 SHA512 18dcb324dadc53182a0d6f87edddc8d5e8d86fa869da830d6d061125b94c31828f605cfe6540765dce43f054f322ec0fd30a621bd0f6318cd7be1a4a62a68aa9
 MISC metadata.xml 324 BLAKE2B 270575fc533cde85d524756cbbe22ce43375a25f5d2b83ec37423b8af4a54fea9c679ebb66433a3c3ee090150201551c8804ff86fefe12636a6e0a83da25f417 SHA512 dd0d1c39fbfdcae041c6cccee7855d5fb6eac3037be3ac79cae0d36122f3ff75ed86c7ad63aee8a5fcebd936cfd2a03bfde52cc009655aebb1f25db77a18e698
diff --git a/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-1.1.2.ebuild b/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-1.1.2.ebuild
index 2315b9311175..17d0fb32dc57 100644
--- a/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-1.1.2.ebuild
+++ b/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-1.1.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/pallets/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc64 ~x86"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="dev-python/jinja[${PYTHON_USEDEP}]
diff --git a/dev-python/paramiko/Manifest b/dev-python/paramiko/Manifest
index 134038f1fb3a..10664aa76fea 100644
--- a/dev-python/paramiko/Manifest
+++ b/dev-python/paramiko/Manifest
@@ -1,6 +1,4 @@
 AUX paramiko-2.4.2-disable-server.patch 1596 BLAKE2B 7e2ef1e216f34086c06d985556dde82eccfc08b835a9b336f1e54e81ddf32567872daec9dadc728bfaab8e3c4728439d704d51f9b1df5e04a64b5064f6d79bf5 SHA512 5e2f9285ffa3ece551ce929c6d50691761da6269e906355bbf79b0664a764083f7d55a9e347e2ed236a4c9a7f934d489315b68ebea984694ee9d1714416d34fd
-DIST paramiko-2.4.1.tar.gz 285151 BLAKE2B 767c4ad11da77c5c6796165057715f318cab417c5bae72cd97b51af94ecbf233316fd4286e35b2f855027e05bcf195c869b45a87f66954bee3bb98ae9d0ef1a9 SHA512 5a580d25e7911937f228ef4a2b89b5a1efd771f576c6c68cf1c36e1abbc38adbc6ad5dc91400de7112238fcf7803f5f26c13fe10be4af8a2a86af9398da7a8de
 DIST paramiko-2.4.2.tar.gz 289126 BLAKE2B 767f81a09b32762241eed6661e520e3b3a96acfe8e6e638ea7ae180a8b6866f8f4adeae0a0146d46ecbfccbe71334c5f5c14e2d049744258ca4808ac21365185 SHA512 894c2ebfcfb35a84fe74670d0eb67022a49b7bf165f31acd929045c17509d8a2be111e8319f20513b5034efd033edc6432b2ca2e7027dc7e3c6703166a96790f
-EBUILD paramiko-2.4.1.ebuild 1517 BLAKE2B 5fb5c4471ea52209dc32829aa4d1b45730de33d73f07a8d3cfdf04d51e782353b054c7ac8bca5bb20f411c5b374d69e6299b06d4f2b58ea864472419d0b844e3 SHA512 d8dae1a8b0e0fb2accc0eb83fb7371c5faabfab31362c0b171d6e98f46803167593978b18e0455c480bccc55c8bc80f729312c873bab18d7b09f67cf50064078
-EBUILD paramiko-2.4.2.ebuild 1672 BLAKE2B 0cf3b93c6ccbd9dc188e0e42fbcf2d810ded48b26cb3399dea710d2307a6bf278c96495ab14b0f83553e916c36727f768443e49cc8bd15fd351c1097bc757c91 SHA512 507a9f2d5b0b166523b23e1ae4881f984d69587c4cdca8611e325cc29fc89bad9ed2094f9eadeb11898811b57bb14928912da527947e94dab12b0c637e775239
+EBUILD paramiko-2.4.2.ebuild 1663 BLAKE2B 806a9257b30d9819589133eadad7f7b406a692e0d70a7b1b0cfd11a49191f08aad4c108a883d9df13bcd8d770bcba6b1d3ace1f86bdeb53f5d290c3a9409be7e SHA512 d33ba4ea54b516121dfbd9a0758eb87c7933e95f93f8ab72b12571ab603556672d8c90edf9f769b507455febd9e4ef1ea22215362b99f76d02f98c9d393695d2
 MISC metadata.xml 1306 BLAKE2B 5bf88516d7d34aa0018b00250edddcc3d7044605e59fd9c799775043f2984a071f743994712cbdc009893a01ee9cbd60df85dcd7f644f7dd33e05a426b06391b SHA512 30bbefd00271e8a61c886e638f30aae8aa751dea4ed0e023e50e31d28d528a203c36e80c8a142573a4b39c958be84eca5c7c19986c2eaa86575ad9b3779ef0d1
diff --git a/dev-python/paramiko/paramiko-2.4.1.ebuild b/dev-python/paramiko/paramiko-2.4.1.ebuild
deleted file mode 100644
index b7ad77c8a4e4..000000000000
--- a/dev-python/paramiko/paramiko-2.4.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="SSH2 protocol library"
-HOMEPAGE="http://www.paramiko.org/ https://github.com/paramiko/paramiko/ https://pypi.org/project/paramiko/"
-# pypi tarballs are missing test data
-#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
-IUSE="doc examples test"
-
-RDEPEND="
-	>=dev-python/bcrypt-3.1.3[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.5[${PYTHON_USEDEP}]
-	>=dev-python/pynacl-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-relaxed[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	py.test -v || die "Tests fail with ${EPYTHON}"
-}
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx -s sites/docs
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
-
-	distutils-r1_python_install_all
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins demos/*
-	fi
-}
diff --git a/dev-python/paramiko/paramiko-2.4.2.ebuild b/dev-python/paramiko/paramiko-2.4.2.ebuild
index 42cc0978f990..bc1a9f8ab292 100644
--- a/dev-python/paramiko/paramiko-2.4.2.ebuild
+++ b/dev-python/paramiko/paramiko-2.4.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
 IUSE="doc examples server test"
 
 RDEPEND="
diff --git a/dev-python/passlib/Manifest b/dev-python/passlib/Manifest
index 3367f239f1a1..d5c9bac981e5 100644
--- a/dev-python/passlib/Manifest
+++ b/dev-python/passlib/Manifest
@@ -1,3 +1,3 @@
 DIST passlib-1.7.1.tar.gz 645724 BLAKE2B f34e3bbc5a61ff71cc989fa26edb9f992909bfdcc6ca1b094ebc02fc9942eb1db1ea18fc3dd5bb7d9fcecf6b4bd82e93aba07c7ce63ec85452b5d7117a6e1968 SHA512 3d5f069cd4e44e5e87cdabc46845acbdd6c1eeedb7ce1f611aebee87b0f7af19009b6a47a10ec555fd84260b9f5c933c6429e325d30326de3869f05031674168
-EBUILD passlib-1.7.1-r1.ebuild 927 BLAKE2B f31f1bddcfffcc23ae1eba1e5062d9481c7cdeaff57fdd3079aefade3dc0d437f0856cf5ae22bd8015ea11b2b6a3432fbc98bd7e91b78529e6e073bec0e4432d SHA512 be289d67b85730f7902ed7e6c4df05aeacad9d7962c5e29a0500baa7b11ce4b2310cb47793a723e8c5bad9d1200e446e4941b23bb8bf1ca0cce85b69bd4c53d0
+EBUILD passlib-1.7.1-r1.ebuild 928 BLAKE2B df5f83aa888825cffbfaf878c10d351676b99ff31071740fb0ab03566048118449545964e56d7f632a93e67c2fe27d71e2cf8de29fcc1dd124b1648990f9a294 SHA512 c1fe6db6f0ac1bae2c940c6ae5937917d62a464795dc5a415d0726d3f96c5c0eecd427b5d44c896cae78bb81e9e75311e876c08bb62c445808ebc46ed2f9ccec
 MISC metadata.xml 913 BLAKE2B e5e596a7d8039ea24c92c7cc33702c8adbfec59171a6dfb6ddf83beb213d5a29ca0c2c12b3f7d59f7dd5e5234984bdcdeae0f9dc859faa2bb23f2c3ac072b322 SHA512 942c129b6e9213511959c07967ca77c8888571b8e8ddda7e57da964f4dbb58f55ff10f90d1322d3a95752f00f1439bfb29604600e7a3b926660513d52a6c8b1c
diff --git a/dev-python/passlib/passlib-1.7.1-r1.ebuild b/dev-python/passlib/passlib-1.7.1-r1.ebuild
index 8cb5fa14d8b7..02b2002989a9 100644
--- a/dev-python/passlib/passlib-1.7.1-r1.ebuild
+++ b/dev-python/passlib/passlib-1.7.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} pypy )
 
 inherit distutils-r1
 
diff --git a/dev-python/pathlib2/Manifest b/dev-python/pathlib2/Manifest
index f78c2c008739..de8021894fb9 100644
--- a/dev-python/pathlib2/Manifest
+++ b/dev-python/pathlib2/Manifest
@@ -1,5 +1,5 @@
 DIST pathlib2-2.3.0.tar.gz 34291 BLAKE2B ef1768f8a9cc9b28f85ef84c0dfdbfce0b0087c1ffb6718e2b13eb007ea3e0ab0eebe946a1bcc2683fed7db46867f415ad2b52abedcdc87fb67bd45d5998aea5 SHA512 715fbd981d42767862dcaf2cc0fee31b9ec5050915ef7d909d14587609a7a5939e32b39736b586a890e7625443bb163832896fcf138b5c2863c451b71c36a124
 DIST pathlib2-2.3.2.tar.gz 33764 BLAKE2B c652069d60f489e482c6d75c0a201c5ac67c6b18b4acd6c8b00f7f12832f7165a45293d93ca7f6c45f1451c842e59931b6b8c45608de1bac91ad822cc3536105 SHA512 46ba0cc8b26006bc4cb914118b7c453dc49cc8a80147ea7a4b3d5a17e97d5538c5d73a3029bd7e5b59f42f256baba30ea273382e57468df1a459ac6f7c237ddc
 EBUILD pathlib2-2.3.0.ebuild 1060 BLAKE2B 936400ce062dae53fed477ce5f201b60e2bc255bed945a8e3bdb9f56d8a91a4e7fc7a53ba8a391ec9e294bdfd3f22732a05e8fdcb937e693ceffcafd53b264e4 SHA512 7d39226f0942a6e513d7053ce397b4e67e73f82621e356a83ca0234906bd93ca82e058ba4d72acdb8abb1b12db29a97ccecf47eda96e8d942ec9e9cd1dfc2fe2
-EBUILD pathlib2-2.3.2.ebuild 874 BLAKE2B 8b9ce8fca6733f947615718a22f3ae2c7a9450d1967e0ae47cad4ff40454b37de0a260a95c7f4cd90d1935d7853ad9641d3e4e5efea5a4d04575315b90e0b9bd SHA512 af3e41db0c3f823b2416eb15f74e7478a42b81d5aaf64a081e65b979b9c5eaa5099f95a7fed887fb2e612e658ba11a607b8427cfdbdeb2208a096ce6769712d8
+EBUILD pathlib2-2.3.2.ebuild 938 BLAKE2B 2c607ddb67c9a13cd95b6a6455479a19a392b79c1a001c535d4bc125121b21776e972c678284a3eeedd6d6db147272c47d5dabb7f70fb3dbc6ce22de216d0488 SHA512 8c13ba04c64c3878cec91a4920b8a53556d8b7c87158bcd2000e871495a91b1e67448fdc051824b7add0796e12a582d13601e104949de66682308b0ac39f6286
 MISC metadata.xml 439 BLAKE2B a6ff80028323e5e3a48832388ab9d88a6633815784b079543d2fae49a43a5c6aa25ac15453f4d564e570558fb62ce387cd5b3450d552c009e153002e5b43398b SHA512 e1912b7e9c099ac259aed03a38b7bdf27bc817e188901d79b89500bf1d2ddca1881ff55f06310758f6cf6d0fe581cf5ac28f14f64972060fa1d620699cfcbaca
diff --git a/dev-python/pathlib2/pathlib2-2.3.2.ebuild b/dev-python/pathlib2/pathlib2-2.3.2.ebuild
index a4433b82f97b..c54d4a498d3c 100644
--- a/dev-python/pathlib2/pathlib2-2.3.2.ebuild
+++ b/dev-python/pathlib2/pathlib2-2.3.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 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index 212eeba33a28..b53a2a37fa57 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -4,6 +4,6 @@ DIST Pillow-3.4.2.zip 11042238 BLAKE2B 334af6eeadb3203b51572eca6ad9c196f3eeac14d
 DIST Pillow-5.2.0.tar.gz 14499068 BLAKE2B 7111eb8e2911cc197b66bbc06a13459484e2c4a1f5037e4bcf702ea350763b2b758cbeef9749aeb29f1ab64d33081131f7e46a3fbb33fee48e70660f8f75eddb SHA512 2f19512d0573bd4696a5b4d54ff21473492f92705d33bd0994ccd085028d209bfb0031e2b95947c1e8fc9d0b0956cdf1f705c1fbaff39390791cac1708bff22c
 DIST Pillow-5.3.0.tar.gz 15553718 BLAKE2B df93d136fb5a5ea3021a757edea5dfa7b3fc1f7a71b0f64f1d1d11b95a5dafffad98d3f7b28d5e7c07b1c93d154c9c73a688f37771587c91fb7bfb6956079375 SHA512 0596207069a87a645f7694b19ea5100d753dbb7553148fa5982b073e4e1163b5bd83ddf8b1c783a90a0b718576f08d3f15352f2742d46a425cf639de2409c4ab
 EBUILD pillow-3.4.2-r1.ebuild 2498 BLAKE2B b91e53211dfde64340575814d273d6d7afff29ae15689d4f98d411cbfa50b48594b79c0e5faa692c7630dda7955f6cddb3918227c4eaec293e065d28dc98e9e9 SHA512 37f491ebc17403dedeb9a48444ce49c5851a0d6b6a9fc24ba3bd81377133e6671df7b03fa7126d53b366ddd18e2952a445e7ca7b94a93f71743e769a5b1a30c9
-EBUILD pillow-5.2.0.ebuild 2721 BLAKE2B f4c532446efa2fbaaae11744bcabef21cc192a207d0dc849b2a5bcb03713b8d9b9780d576ea05a738da71ca8bef00c8703a90aa8cfa091d0f3dd1f685445d566 SHA512 58cbb107071732acfe26a2bb797748fd6e5557148cc52ce6f0b4186b0ed98c70feada43924a73928417a9a4a6fbf5792120ab136213df32da2900ec69292c05f
+EBUILD pillow-5.2.0.ebuild 2720 BLAKE2B ee848a4cfcfc58f3d58c12c94ade4f07e4f11de712dc48ff7b7a1bbc64d9fb757c5bd8af36444353f2a8aa6b8927d8fe9d0f1d08d59dad2abd6a2ed1e50a192d SHA512 3d9829a9111a6f4aa81032e09358312386920c10b2f1e71b4e0fdafaa8f376b917013e52e2303f5b01f19c3da0da06844fce40cb9b4d9a54fd9444c2e8e94cfb
 EBUILD pillow-5.3.0.ebuild 2331 BLAKE2B d453688d152bd345242abd0bc55f51e35ebf8be5fc623cb121287b4ade989021deb10c226a77cfb4dea439df040d1befff2ef176d2ab3511485630d42d640cea SHA512 2799810b31ebf952d513221f81e169b797d774944a539f4a52104e855f3ec9714f7fc1004f6c080664ee26aa0e19ccfb4d459d9277e3bcf172e0936a12613df5
 MISC metadata.xml 590 BLAKE2B 085c6481058e0ccc50934eaef9ee5fe97666c067f847eef8f569af8d5f4f41fe5934d77cdcb0679f24a4ba411bf1885e03c74f365919080e86a4f8a434d2da8a SHA512 13e51fa5ba4ce8e0ed0f81b0a1d16ba8be875a24c9e93dcc87f08724a151c90ff40c8a9e09ee69143dc4400f067a7de90324ddd5a90c8d33b1d818a716194e9a
diff --git a/dev-python/pillow/pillow-5.2.0.ebuild b/dev-python/pillow/pillow-5.2.0.ebuild
index 3ca056dab0f6..5099bb0a2777 100644
--- a/dev-python/pillow/pillow-5.2.0.ebuild
+++ b/dev-python/pillow/pillow-5.2.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ppc ppc64 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/pluggy/Manifest b/dev-python/pluggy/Manifest
index 7f69f5fdcf14..613af7e3bbf2 100644
--- a/dev-python/pluggy/Manifest
+++ b/dev-python/pluggy/Manifest
@@ -3,5 +3,5 @@ DIST pluggy-0.6.0.tar.gz 19678 BLAKE2B 79db59c5f0ce0dd157630d039ec50643f615789b6
 DIST pluggy-0.7.1.tar.gz 47784 BLAKE2B 49eb28779717ead8963e14101cdfb830feeecff756a59f080e79e70465d48dbbc6e6100305e8b32031cefb0ba06bb10494f29bc8ddd38d4296016ecebaafccc1 SHA512 e19f6c1b3f2e711df1c8b075a2b802751afd218f1b692f08b2434c01d71c402331ff8c937550fbdfece2098f6d6856422d485f193e188916b365ded2e4087697
 EBUILD pluggy-0.5.2.ebuild 745 BLAKE2B aa43219d6e90d1705dbdcbd11b7ee7a2a1c186ed08d4832b9f9fc041e74c5bcae34d30c83584e77c020aa50db404788eb1f36c091f24573ecc45eb47ddcff162 SHA512 bd9af6d41e67f3c15204c41b4ec9bdad66a820bd463dfb28cfd6a96d47530f8bd942e31f707b56781e2da61643a9067b3463ef347ed78a1a35f3daa6cd8af651
 EBUILD pluggy-0.6.0.ebuild 764 BLAKE2B 065f0c1910c845e4de6bcf9460002a7472d0c9d5942ed24401f4f598663226a6a9eacabcd9fdec926a1d3ce467885628779acd78bad6c8367db75f7d690125f0 SHA512 c24f563a5ccee000a379c767f4e58e670c2d41ab6c0585eebebfd80cce9f93a2e51fcc2a4e17ddf0c63b3e74d392202996b0516b1c501a653d8afdbfc77a44fb
-EBUILD pluggy-0.7.1.ebuild 797 BLAKE2B 9f9a2561bc5a7f6f4425b9262f02b727d760086bce146e1b81075a786b0b4ac0418805ed04f0a25d710bc49e0e33d99718c73dcb939cd41f9c6a14015f1e6da1 SHA512 36a32144d03a855899ebf4fb81600ae716266d11edcdf8fc21d507fd4661468137c61bbce1e8051edd076b0ca6662f15ec6ba6614a45d105b9e5264bc759b0bf
+EBUILD pluggy-0.7.1.ebuild 852 BLAKE2B 6007995faaf971c727f0eaae8a3416fbcd7e68e513c884a326520d6ec9aef8d702a4dbd036fcc4fe8f570fe7ec508b2fb1e28ab0d379f1eda0e70e4318f72712 SHA512 099886b56cb7cabf9fe13738005bc74d3a88f9497c0c97bbdbf2aa6b25f03e28ab5eae07b576cbef8fccfa4e429ce6d6082a9a70b38fbb43c4a0d00e959b89af
 MISC metadata.xml 444 BLAKE2B 9b0b62a0670449bdfade395d9766e192088182f724deebd2a2ace8800ac5c0ff6f37da7174186434f727aa3bee08b9416e6dafae443cd01e01baaae741c899cb SHA512 2ecb5fb612627c44f3499080fcde9241daf2f25a974a8e24fe8190b7d5f8baa6a457b7a902e788f98fe9ed1fdb2cd0f46770337e8f836e430b0aa6f0d323ad50
diff --git a/dev-python/pluggy/pluggy-0.7.1.ebuild b/dev-python/pluggy/pluggy-0.7.1.ebuild
index 06c83013c2f3..2ccc546cb187 100644
--- a/dev-python/pluggy/pluggy-0.7.1.ebuild
+++ b/dev-python/pluggy/pluggy-0.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P: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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/ply/Manifest b/dev-python/ply/Manifest
index dd18ae68586c..1d8854172ca1 100644
--- a/dev-python/ply/Manifest
+++ b/dev-python/ply/Manifest
@@ -5,7 +5,7 @@ DIST ply-3.11.tar.gz 159130 BLAKE2B 58c50b9dad445ad83a64aaa8174ed4602b36f5c8df33
 DIST ply-3.6.tar.gz 281690 BLAKE2B 1a8e9e925c1a70832e3312208470a3bc4831b7ba18a0c2eb3a8b31fc9a850ae192809b9dec098f8479f2060e63ae781063b362227db2c6080aad85a2fb8648a2 SHA512 1a408d7cd4cdc9d747154623672e6baaf37ad2190cb9d6d6a7c1e1cc3cb40f15547734441b8fc99ecd67d7804d767576bdf0ed219cc669bf3d0df37498c55c55
 DIST ply-3.9.tar.gz 150750 BLAKE2B cb32c3837f2b4bd33ef2074dcb3f1421a54e820faf0e65def16f4c354643dc3e467f7c482dfc5b7f62cfb367945632e346b6e02e16cc79a91bb6f9241e315eb1 SHA512 c3beca6f70e9fdfd11f9fc7beb18efb03f0b32be3cdc949e96c4df3d060e7e9da3ee42d1f58f7a9225d333cb7864a4253fd3a9b75c496364276fe9969ebd7641
 EBUILD ply-3.10.ebuild 1143 BLAKE2B 8338bef39aa812414d6a9405735716c4719d0e2bda61a9b15d30beeddfbc2f51c5d22fc8e7ee5fc3b12177008e8d4536ff3c042b6042cc2b21c7155407fe90c6 SHA512 3df256e8a340609e7c326ca85ac96bb034ba1ae6f27313a6fac05270395cfe29fe9776072e3ae22f0781d73ef6c8bb76f88050920bf6e7b7752fd9e6fcfa6ca8
-EBUILD ply-3.11.ebuild 1145 BLAKE2B 9eadf44e588ac5cae21519c598f80ebf63bba0d4b5091749a21050180d6ab6094586c8e875171bfbe8ce60506790e906da4d019a741ae220a9245a283e628b74 SHA512 1ef9d5ffa2c259836d3725762af2e9f8c5f1969eb80dd3569cba0d98d4cf9214d37c765f43fc72cee3651f30a5095fc973d166163427b1b21c350b8e7e9e238d
+EBUILD ply-3.11.ebuild 1172 BLAKE2B 584d2de9dfab304f54da33d16332f8998e0f6dc42e7283cac89c940e84992d3c2d7a00df9e4c354eeeaf8cd535b45cfe9fb734a655f43ce4f2d834af04491a20 SHA512 28316cacce8d5f1182276b11b02605485432a706bf49f59d70b6ce12f3805a0a4de1b9de8fada702e27a4dd2db4a22b12656ed69afb49075a3e401cae33d0510
 EBUILD ply-3.6-r1.ebuild 1144 BLAKE2B d84fdd2687434f3d7ab84b680b2fd798327165612453568344d734a879a625b10fdd2c4c7e5387a0b274176e2056a5e1444cbf420e3920daf0edea396b7a3cf4 SHA512 24730bb33a83ebc834096c680f55590ce65fd8d6f2e9b699703ae03787d44efc8592f60608e8b393115ffd72f0eb826cb6be8c3127680e46a847ca4d4e40fef7
 EBUILD ply-3.9.ebuild 1109 BLAKE2B 2b977f3c9439f4de810c2e57bc18e6dece21bbef2d436bc7df420fa94a447f1d1feec0e7ca96660aca8420b77c362cecf34ee96736d0131233d0fb0cb374d414 SHA512 4bb9afbca93e4fc1ea9bc14d67c0c0a3eb2d9e5a71f110fe8242968a71ef8de93712c89afe59dce7eedab1a651c99268d2eafcef1b65675f5a420942501b9844
 MISC metadata.xml 1418 BLAKE2B df2c9fa5b1d9a0b7779fd72b390d4509f83e1ca4c49f3d64dd2c0b440d2f583c0b936535eb2c15bf323e649cacb4f1bd72bea797bd51afaf611fd8fa6490ae78 SHA512 92a5a470227858726239f537b3d8559e29d589a8aca0f1d43b8a1ee3ec00470117efb45275b5bfc0ab6d0678863db50aadd36aec326978e7a3e858c0b0be41dc
diff --git a/dev-python/ply/ply-3.11.ebuild b/dev-python/ply/ply-3.11.ebuild
index de6fe89f4dd9..3f953ee9f6ae 100644
--- a/dev-python/ply/ply-3.11.ebuild
+++ b/dev-python/ply/ply-3.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-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 ~x86-macos ~sparc-solaris ~x64-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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples"
 
 RDEPEND=""
diff --git a/dev-python/pocketlint/Manifest b/dev-python/pocketlint/Manifest
index 5309e1a55b56..11794cc337c2 100644
--- a/dev-python/pocketlint/Manifest
+++ b/dev-python/pocketlint/Manifest
@@ -1,9 +1,7 @@
-DIST pocketlint-0.15.tar.gz 22334 BLAKE2B f07d41d212192281008173f6314c4868ef993dd7c8220d21e2d45d461cdb5377c61acbd8d5bf7f915928fd007e844cd50f8b5ae9b87d1a6d7eaea97f0529b1b0 SHA512 0d3e3061635c8d88f4e31aa11f3cbb85a1d9acd3064c17b7bd3c50eb90f824f17a903c55bace8033bdecd626d792ffee091b8b5719b2993f475a4321f033c66b
-DIST pocketlint-0.16.tar.gz 22573 BLAKE2B ccf502116d1020f6bde8c0915cd83d88ac5c78c207feeb184ab4f244b23b771b4384fce69d6d562e84bf6ea2ce2a0a0ea6f65be6dfbf9ec26ae6132a86e1116f SHA512 3c7dc76a07e7654ab7bd6bf32b68d296830cab9d6e5c17dcbb5df6af0bdbecd4e86eeff70ea7e857951c9d2f35988263e86a2a559de2cca67c668a864aef431b
 DIST pocketlint-0.17.tar.gz 22612 BLAKE2B 3245f80c486a4d16389262d5795be32b784af1b99dadc26009d0cff250e8dab9f6ac4ce9ac7e37466bcb01fb3b697740e14a0d391bcc3abcc4186d72d7243c84 SHA512 7d564aca89fd479d2dc773db2723567cfff42cceacdc5a55a87c65d6b80691e6254750c52043e3bebf55488335795b541d5a838eb592747db628af567e24dc43
 DIST pocketlint-0.18.tar.gz 22848 BLAKE2B a5a9abc3543026b1cffa66dcf6204342c5d1ee20219423174daf725688a381a5d58a403b963e95bd6eede629824ccb72bd93161def56778fcaca9ea115e2b6a5 SHA512 02453af8465598053b9591a95d9e62d2cb8e2a218e04ec6903ed166959b7e1eebb5d226b9eeed77c7b94a254808124ec9d2078e102a0bbe9487e0f328a2d3e86
-EBUILD pocketlint-0.15.ebuild 483 BLAKE2B e1275965b450636bbee4414361331eb92e0460b7e207ee50ef242dd8f48c051b002ca22585e3639a57b3add690dfd3e7327a33a79eb2ec681f5b5a4139b6a475 SHA512 8eb83de3bfb057d21ef54fafb82eba92b3c23b37eb115dd844500557f368ee8bb62df0ed541b6284451772aa29e49a56e95925799478e9b7e431231d4c79dd19
-EBUILD pocketlint-0.16.ebuild 490 BLAKE2B 264e5c85b0706695fcd7b23c7c33edb1498ade0dadb70fbed1232d04670f64a3d5036db3367e82f724e572c2c422330e3abe3694beadff76d2db27a104e47540 SHA512 5f3c54df0ff04a6a116aba00d7593088a248c2f8e6cc105af2e316a75f3753d866984db0ce2bb94f0fbb808c4624a8c72fc7f859e220b6cae5c5499c5229c906
-EBUILD pocketlint-0.17.ebuild 483 BLAKE2B 85524ef1753ce1d9797f00efdd51a28a5b3adfb736e88f158dcf62b9b4c4c0db9edeb29de2dd8f5e6cde8d140390b5b9ea7f3dd609840285079b40be95fb6371 SHA512 aeab739eae7f5fbe7929aa78aa93949e10a8b438014e9c0f412df0a8e20345bfe5fd280548259baebb5ad282534e6fd08c6ab85291669e192d41b3e0da9ad8f4
+DIST pocketlint-0.19.tar.gz 23118 BLAKE2B 2e622ba1de20d2043d55261b79b8f78b2c5bbebb2d739da2766b56fc379a6433c56f7184d832356fefbb231fb271782d4a884739b55ab52ffd64ef3efc5c2ea4 SHA512 409ebe916b1c83e128ebb1cd12b7f1d695a999d8ada1555cf6710acbfbde241535f2a929d06ebddfffed66ea7db9f20ca6606e9dd9f1505914ae3c6480cdfb52
+EBUILD pocketlint-0.17.ebuild 482 BLAKE2B 96ba3ab5580281a685dcfddfbabe328dd73f98a1d25861f94531ac99bc0e3e51d4205bee42310c5b6e0ba588936798dd2362d468a6c2998fcd644713e8d549e2 SHA512 ce5352733361cf5d0b0b018a34e20fa09356d3a6c720392ad6bd777a9e9bdabd3dbb6a4959cb3286512132879f2f8bf4e97a5321fa70f3b8704a10dbbafba5a9
 EBUILD pocketlint-0.18.ebuild 489 BLAKE2B a67e8b0a84e9b00694516d2e1258053936faa0a68e67a380e8abae68a3cd028abc31c512063952df43b9c328b70bcc718e98700b52042e3d2597831005084093 SHA512 b006f2bb67cac803b24c12814c49e675e462953200361cbfd8ca522ace6908d18d3808eec8fab5a3627854496cb1ee8d4378d675b7390c2c131e8d451390f08a
+EBUILD pocketlint-0.19.ebuild 489 BLAKE2B a67e8b0a84e9b00694516d2e1258053936faa0a68e67a380e8abae68a3cd028abc31c512063952df43b9c328b70bcc718e98700b52042e3d2597831005084093 SHA512 b006f2bb67cac803b24c12814c49e675e462953200361cbfd8ca522ace6908d18d3808eec8fab5a3627854496cb1ee8d4378d675b7390c2c131e8d451390f08a
 MISC metadata.xml 348 BLAKE2B 832ec69373391ee6c884d446b58ccfb07de61b7519b34be09e3e592ea061c0cf0a10203a5c69bd05e2400366891fc9c74a7b1d74f4a7f268839aeaeb5781602b SHA512 925fd532aab036f7bb18011abfdf98daae08e648aa8b64853d721396dedc431254f54ae2168e5572e2e1f101c6e5ffde2b08a26e423407d84e0e849bd7d4d38e
diff --git a/dev-python/pocketlint/pocketlint-0.15.ebuild b/dev-python/pocketlint/pocketlint-0.15.ebuild
deleted file mode 100644
index 468ab2a6a801..000000000000
--- a/dev-python/pocketlint/pocketlint-0.15.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Shared code for running pylint against rhinstaller projects"
-HOMEPAGE="https://github.com/rhinstaller/pocketlint"
-SRC_URI="https://github.com/rhinstaller/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sparc x86"
-IUSE=""
diff --git a/dev-python/pocketlint/pocketlint-0.17.ebuild b/dev-python/pocketlint/pocketlint-0.17.ebuild
index 175c417072d3..ab45840ab5db 100644
--- a/dev-python/pocketlint/pocketlint-0.17.ebuild
+++ b/dev-python/pocketlint/pocketlint-0.17.ebuild
@@ -13,5 +13,5 @@ SRC_URI="https://github.com/rhinstaller/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE=""
diff --git a/dev-python/pocketlint/pocketlint-0.16.ebuild b/dev-python/pocketlint/pocketlint-0.19.ebuild
index 27afa96d721d..4c9d535328e8 100644
--- a/dev-python/pocketlint/pocketlint-0.16.ebuild
+++ b/dev-python/pocketlint/pocketlint-0.19.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{4,5,6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pretend/Manifest b/dev-python/pretend/Manifest
index 604181a4d8e4..28277e757a6d 100644
--- a/dev-python/pretend/Manifest
+++ b/dev-python/pretend/Manifest
@@ -3,5 +3,5 @@ DIST pretend-1.0.8.tar.gz 4848 BLAKE2B 396fae55208e39eadceaff92890b48d63b79a24e0
 DIST pretend-1.0.9.tar.gz 5656 BLAKE2B 1a8e280fbbf147f502f1148b9e3685630e0f5cd270dc8b6fa8fbbd8177aaa08efe401a6684b669a976d828e7fcdd48d686170bfa3cd3d8a857b78af473a5b6f8 SHA512 976e3272557aecfb11e4147a868ea96e23546e277d57d726f41b945103bef3451039716e6bbc5082d691fa1fd331c06b3d0f8b254deb0510948153571326eaf0
 EBUILD pretend-1.0.8-r1.ebuild 773 BLAKE2B 9b677206b525abafbda87c878856b3f5e5c8f557a80b51f87e142dbab614e07a4ec79cd71f80d0a5a124f90fd91c3ca54392ddf69b0c1b6212c6b842b6452fab SHA512 0becbdb8dc5d907a0f66b7cb035497ef3983eaaa35284b67e58f158496643f7c5f78b3ebdfd6b314cf5e5d8b115e6a2718ed257a5ab3ebdf71b91f0f5737bddf
 EBUILD pretend-1.0.8.ebuild 642 BLAKE2B 971870cd43562d42ed3d02eb28dff49c46662b89b051c1ed27d44ee27aae03ac2c4ea0cb2aca6dc6d1563dd86aa0541b6faa18130f011fe4447b324601d39183 SHA512 27819bd897f9134c3dee0c8622aa5387bf4a0eec2432993ef82fa582022593c686217e365bddc83e4eccc2b086dc3ea983dee80ddab576f2019c91aef0193d74
-EBUILD pretend-1.0.9.ebuild 776 BLAKE2B b5e64c1351aae6086c6e31baf29bfee7a53b310e577489c898c1a4ea71f3a681c6ed08da62a5538eeed29afd3183d9fb12ad066985e8c7e1c15007a60e7a9e2d SHA512 dc76721b265201997c43852e51b0fccb564a7075ea4941a2115a2017ecebdf1c7c60d45e426e2a68fb5c2c7461c23894fb0055bc42ba3bb679fb7b6305bb4c17
+EBUILD pretend-1.0.9.ebuild 803 BLAKE2B 21f01f386d3d7144b9fbb1c64ac3321efccf57c26962993100b90ac3c987b364d68f90dfe7e4871a4accd16a051f152285f6efe122d8cfee3b90ad512f6e01e7 SHA512 832145f6df5ad3184a3bff1aaeec2564728fdc9f79a8c6c452677c0c1c4ad2bc30c50c41a7acf9ce39d0f9f9224abea638583f274d6d55027a2d244cc46bd06f
 MISC metadata.xml 374 BLAKE2B 4f62dba0b0933a47aec8c86fffefdb9a50d31fd76424e268adbb0f7f6902556366e9b71fbf2ec2b652e8114f310f15060de015f753aedea9ac727ce9a884e1ab SHA512 8241b20ba14badb91e36edb5070339dfcea6902e0f192dd1bc066698cc9c87370fbe0f16f61173e207766b84a65193f12ca3d9e1a16f467411762fbe52cc906d
diff --git a/dev-python/pretend/pretend-1.0.9.ebuild b/dev-python/pretend/pretend-1.0.9.ebuild
index 84719ff95e54..a2c3b75b0c81 100644
--- a/dev-python/pretend/pretend-1.0.9.ebuild
+++ b/dev-python/pretend/pretend-1.0.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/alex/pretend/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-python/prometheus_client/Manifest b/dev-python/prometheus_client/Manifest
index 193c5c50517c..72aa01b09294 100644
--- a/dev-python/prometheus_client/Manifest
+++ b/dev-python/prometheus_client/Manifest
@@ -1,9 +1,5 @@
-DIST prometheus_client-0.2.0.tar.gz 41574 BLAKE2B c8e0288f37d1d3e6548283105dd6ba1e4cae5a6f1846c776538de1a68a2eebe6387f8212631c07f2c37839204262d0f555f1a5edb624c0d7418753123c296ca4 SHA512 7336d8294ef91dfebe91f325a882105cdaf947de212bff651d1c3ebfc139d9045b7f637ea44b18e921a9f2ad9af554aee28587e57b1202b5a30c49b1a765ba4c
-DIST prometheus_client-0.3.0.tar.gz 42186 BLAKE2B 14b116d89493d6c6f04a598accaf5203e30358e93ab666a3025f4436df8dda22265cf86920b149d345aec74870e416360862f64dac9a34b5e8ceccd61b4100a2 SHA512 fa16108428a8531977c3f56fbe564a965c91048d08035d046de6d80f61744f678872d9f4f4108970a047aa6e3ca1b7aa892015a71f49d146cc0a5a8c7a7eba3b
-DIST prometheus_client-0.3.1.tar.gz 43185 BLAKE2B 07c69ca13f45c502870dd1eb5934413d71b5e53a5fde7c565414b570a20de183ae1bdda11a34e1c84b874cb5b8491128ff47046632913aaae1c865b0868142aa SHA512 939a985bcf6b377d353871333634ab1641f50288c531ab70b3e5e5466362c02012ae6cf0adf889dac96a89fc5ce29462aa62e651ce21c15d40647d6465baab1a
 DIST prometheus_client-0.4.2.tar.gz 57664 BLAKE2B e98e5c91db13a9f06c2df532e7742545a14cb223e04eba27accc3bdcaf2df949eed2a778194b38e1b4b93908de1636a3cc92a18950db54b5b8f0aceda2d4d2cf SHA512 5e0fee9f9fb4376dcf2959e8285b57a9156d3cf8b9d9118c7b95d2ff63f4dd925bc8cea817bf2fc1ba660e6f5c6dd8f4cf494125cf2a3673443abe0f3a4657c4
-EBUILD prometheus_client-0.2.0.ebuild 724 BLAKE2B 4de9631ca46dfb6f763afcef99a5734a0c9bbe40e82a16cc50b513412ef51a00c8cce7f1d6876446b9669bd70fe317242ecf7027a18ac99172207c0cdf3d6528 SHA512 a7226c94e5a27173a648d682e92bbb8573ae408bbf43aeb3b2178a137e49bba1c4c7c8f143bd54016fc193efa80bbb3c56eff87dee71d9bd15e57bb658664d3f
-EBUILD prometheus_client-0.3.0.ebuild 725 BLAKE2B 0b5fac1df62e3fa4421edc507493b7486f56691af8e4c80c34fe3e7ca0577a71a018bbbaae44f0fb94dc2fbda67175177b352c5bda5a0acab4c0034797f32daf SHA512 e9c96e827a9ce8b60d4c16727848864bae9681a4328fe6d7c409bf53ac4581e1e5d47b6c19e9e911f6943a1bc0648a38ae0a15ef40d81bbdf653a8cfc10dae84
-EBUILD prometheus_client-0.3.1.ebuild 725 BLAKE2B 0b5fac1df62e3fa4421edc507493b7486f56691af8e4c80c34fe3e7ca0577a71a018bbbaae44f0fb94dc2fbda67175177b352c5bda5a0acab4c0034797f32daf SHA512 e9c96e827a9ce8b60d4c16727848864bae9681a4328fe6d7c409bf53ac4581e1e5d47b6c19e9e911f6943a1bc0648a38ae0a15ef40d81bbdf653a8cfc10dae84
-EBUILD prometheus_client-0.4.2.ebuild 725 BLAKE2B 29305836b8eea06402d0c329c52c3937ba893716f3b64051a6ffad93c5cc9fdaff2ba1233afb6b7a8f5eebaf23f965d0df6e98ce9fca028fb5f6582b5f171367 SHA512 b2fb021ac64e31548c243125392a433a7c0957b406172bc906c5c552172530d848a09ae747f52b8a710035824dd4fb8196214f859e8f94ea0813108c7d7bc525
+DIST prometheus_client-0.5.0.tar.gz 60184 BLAKE2B cc44537b051c053860520d412664d57aaa6d35dd491409de0da72b9859743cc355d67eb260c2381347ad3313df9efa498535ff130df317b103d8c815f34f28eb SHA512 6e6e6c0f859b7b9d593e1059b71fde8eed15ccd95e54c245b4e0e8edb748a4761f0929f2d6c06f1c4656eb81f26959c5cec6a58f4d725a587b433ffbb4582127
+EBUILD prometheus_client-0.4.2.ebuild 724 BLAKE2B e7339701fee2567e11e3522ee028161f7f3269c74f163a0c3454a615120b1ea1f5f11f0aac1fdfdc155ceb59d63cf67b899db26c0af9c3c26fe72211932f9c2c SHA512 47866b4d3111ee4207683d0558f0e1b904e8e579df9709f97c5d0adec02c933313bbf022007723b15b4363ca3284eaf4152899a8240f8b614c70e93f2194abfa
+EBUILD prometheus_client-0.5.0.ebuild 725 BLAKE2B 29305836b8eea06402d0c329c52c3937ba893716f3b64051a6ffad93c5cc9fdaff2ba1233afb6b7a8f5eebaf23f965d0df6e98ce9fca028fb5f6582b5f171367 SHA512 b2fb021ac64e31548c243125392a433a7c0957b406172bc906c5c552172530d848a09ae747f52b8a710035824dd4fb8196214f859e8f94ea0813108c7d7bc525
 MISC metadata.xml 451 BLAKE2B 1596b7eb0ca176a5a00d44356c15f35268c3170f90bd13ffaceae39f56511c33f78724ab2cf3748efc1b3b10c71a1d1361ced3192c4c71a6dab5f616fea3051f SHA512 fec61f65143e869244b519455a7214884de5e72c75cf7e500e5aa156c41eb1e644ece46c402cb4722ec294e876078f9332654901b06f2a6f5ab8449f0181532f
diff --git a/dev-python/prometheus_client/prometheus_client-0.2.0.ebuild b/dev-python/prometheus_client/prometheus_client-0.2.0.ebuild
deleted file mode 100644
index 23d531c51c0e..000000000000
--- a/dev-python/prometheus_client/prometheus_client-0.2.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-inherit distutils-r1
-
-DESCRIPTION="Python client for the Prometheus monitoring system"
-HOMEPAGE="https://pypi.org/project/prometheus_client/"
-SRC_URI="https://github.com/prometheus/client_python/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="test"
-
-S=${WORKDIR}/client_python-${PV}
-
-RDEPEND="|| ( dev-python/twisted[${PYTHON_USEDEP}] dev-python/twisted-web[${PYTHON_USEDEP}] )"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_test() {
-	pytest || die
-}
diff --git a/dev-python/prometheus_client/prometheus_client-0.3.0.ebuild b/dev-python/prometheus_client/prometheus_client-0.3.0.ebuild
deleted file mode 100644
index a86c3230d43f..000000000000
--- a/dev-python/prometheus_client/prometheus_client-0.3.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-inherit distutils-r1
-
-DESCRIPTION="Python client for the Prometheus monitoring system"
-HOMEPAGE="https://pypi.org/project/prometheus_client/"
-SRC_URI="https://github.com/prometheus/client_python/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-S=${WORKDIR}/client_python-${PV}
-
-RDEPEND="|| ( dev-python/twisted[${PYTHON_USEDEP}] dev-python/twisted-web[${PYTHON_USEDEP}] )"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_test() {
-	pytest || die
-}
diff --git a/dev-python/prometheus_client/prometheus_client-0.4.2.ebuild b/dev-python/prometheus_client/prometheus_client-0.4.2.ebuild
index b11eea0b1bae..4cf107dceed0 100644
--- a/dev-python/prometheus_client/prometheus_client-0.4.2.ebuild
+++ b/dev-python/prometheus_client/prometheus_client-0.4.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/prometheus/client_python/archive/v${PV}.tar.gz -> ${
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="test"
 
 S=${WORKDIR}/client_python-${PV}
diff --git a/dev-python/prometheus_client/prometheus_client-0.3.1.ebuild b/dev-python/prometheus_client/prometheus_client-0.5.0.ebuild
index a86c3230d43f..b11eea0b1bae 100644
--- a/dev-python/prometheus_client/prometheus_client-0.3.1.ebuild
+++ b/dev-python/prometheus_client/prometheus_client-0.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,5 +23,5 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 		dev-python/pytest[${PYTHON_USEDEP}] )"
 
 python_test() {
-	pytest || die
+	pytest -v || die
 }
diff --git a/dev-python/prometheus_flask_exporter/Manifest b/dev-python/prometheus_flask_exporter/Manifest
new file mode 100644
index 000000000000..07ea480eef75
--- /dev/null
+++ b/dev-python/prometheus_flask_exporter/Manifest
@@ -0,0 +1,5 @@
+DIST prometheus_flask_exporter-0.4.1.tar.gz 169196 BLAKE2B f88212acf6a1e64207001a620bf562e121f681fec972d1d97ddffa2b8cd2f9c9af4b4da377234f6b98731702d964dd14835377e805e9d72855f463907aaaed9c SHA512 98819d09f66a7fb272ce298fadb77848de2591a42dccc29cbf1cf69b423093789ef5708f7082d54d11ce2bf2e092d84a52c22b916af0081c64fc4838e7f5e374
+DIST prometheus_flask_exporter-0.5.1.tar.gz 171616 BLAKE2B 49c95ec09f72c2c6dd61b01e55ebb70c19aee6cb782bb1a3b7a7dc28bc5a1d119af15e4740051627a06dfbead578acb1743adf7b40278faed21ff7b5717ca190 SHA512 444ccff5e7430a673c662c60c4588a949e12929ca49065d076ad28fca14f4fe945e8ad68aef5bf297f69892463c92a41fb3309e487a1c856897fa0132c69298d
+EBUILD prometheus_flask_exporter-0.4.1.ebuild 778 BLAKE2B d52d71c414fcafbfac03940a9689f7277bae8783fea339fe92611a4f4630080a663d6a41b3e6486e4b2b6133d9238ebad2ac6d8e04997e1da50cd5206a039f9f SHA512 c9e135d898f720d6ea1858926ebc4e47db137d926bc8b87414a8af507a54184d68433eb3f0caf53e46ef7f3dc8b81557b43141279585f935cbda1f113bfccef7
+EBUILD prometheus_flask_exporter-0.5.1.ebuild 778 BLAKE2B d52d71c414fcafbfac03940a9689f7277bae8783fea339fe92611a4f4630080a663d6a41b3e6486e4b2b6133d9238ebad2ac6d8e04997e1da50cd5206a039f9f SHA512 c9e135d898f720d6ea1858926ebc4e47db137d926bc8b87414a8af507a54184d68433eb3f0caf53e46ef7f3dc8b81557b43141279585f935cbda1f113bfccef7
+MISC metadata.xml 379 BLAKE2B fa5becfbac6899fcca5123454185c7449de058974619b27d388d40a2954d1000b35474637751b379131b0564f444443647eebd24b8f2328c8689690b5f806e7c SHA512 75692a0ca25d143cd7c969ef35444c62c8694c52a4ab615ee0473d385a51817f152212a29a2e802beadf4d1ad66f699223f50ba50e58d40159f1e2f51af15bfb
diff --git a/dev-python/prometheus_flask_exporter/metadata.xml b/dev-python/prometheus_flask_exporter/metadata.xml
new file mode 100644
index 000000000000..3ae570e4b069
--- /dev/null
+++ b/dev-python/prometheus_flask_exporter/metadata.xml
@@ -0,0 +1,11 @@
+<?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>
+	<upstream>
+		<remote-id type="pypi">prometheus-flask-exporter</remote-id>
+		<remote-id type="github">rycus86/prometheus_flask_exporter</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/prometheus_flask_exporter/prometheus_flask_exporter-0.4.1.ebuild b/dev-python/prometheus_flask_exporter/prometheus_flask_exporter-0.4.1.ebuild
new file mode 100644
index 000000000000..2340577e370c
--- /dev/null
+++ b/dev-python/prometheus_flask_exporter/prometheus_flask_exporter-0.4.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Provides HTTP request metrics to export into Prometheus"
+HOMEPAGE="https://pypi.python.org/pypi/prometheus-flask-exporter https://github.com/rycus86/prometheus_flask_exporter"
+SRC_URI="https://github.com/rycus86/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/prometheus_client[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	pytest -vv || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/prometheus_flask_exporter/prometheus_flask_exporter-0.5.1.ebuild b/dev-python/prometheus_flask_exporter/prometheus_flask_exporter-0.5.1.ebuild
new file mode 100644
index 000000000000..2340577e370c
--- /dev/null
+++ b/dev-python/prometheus_flask_exporter/prometheus_flask_exporter-0.5.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Provides HTTP request metrics to export into Prometheus"
+HOMEPAGE="https://pypi.python.org/pypi/prometheus-flask-exporter https://github.com/rycus86/prometheus_flask_exporter"
+SRC_URI="https://github.com/rycus86/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/prometheus_client[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	pytest -vv || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/protobuf-python/Manifest b/dev-python/protobuf-python/Manifest
index 5eff7736dece..67b40ca9ae66 100644
--- a/dev-python/protobuf-python/Manifest
+++ b/dev-python/protobuf-python/Manifest
@@ -3,9 +3,15 @@ AUX protobuf-python-3.6.1-python-3.7.patch 2737 BLAKE2B 46feb8144761db8a089ad2e3
 DIST protobuf-3.5.1.1.tar.gz 4584489 BLAKE2B 995ee2f06a6358e9935b488269ee50f0dccede417c1757828b0108fbe8c67034301f3a9cb87517430acd9838ae71bb677f4edd8b59b2418f99c15d8ea3d33591 SHA512 f25ecf772facc8efd196b7c06012ce9ec24152b2c0cde38ed2e29ecded8f534221b008e649f4cbd991436ad3436130cd2e31d51e75019d08240d518111fb4496
 DIST protobuf-3.5.2.tar.gz 4584659 BLAKE2B f582212169d802a5844574eb900c9f8cbb343b7e73f2074e5ff0bfc544ebd13f4bc2b78271fb70f4465d78fdc39972ed68339f453c0d3ffe98d8564fbf520544 SHA512 09d10cf0c07a0ba249428bbf20f5dbed840965fa06b3c09682f286a4dee9d84bb96f3b5b50e993d48ef1f20440531255ce7d0e60a648bf3fe536a5f2b0b74181
 DIST protobuf-3.6.0.1.tar.gz 4483964 BLAKE2B 8afc1e4f4a6eba0eb453fa7cbee8e8ab4986ab9dda39a0005de9d07ec4bd4fd27a5af4ab359b139b4117a5da580be6da3387295266625ee8cc7ec9421c5c0235 SHA512 63cd799d5d6edbb05a87bc07992271c5bdb9595366d698b4dc5476cc89dc278d1c43186b9e56340958aefea2ce23e15a9c3a550158414add868b56e789ceafe4
+DIST protobuf-3.6.1.1.tar.gz 4489116 BLAKE2B 4ed5da3dcb56245b3ce2f979142d5e77837e8e1fbc2f0af27be48664b8b7dfa2ec44382cf75678d226dd665c289f81d95bf04c5f2795fcdd759aa8ec630dba1f SHA512 df59ed966047471d7296883a4500d657eee5e7d8713dd7e44f3f2e0b8c4400e85cb511b316f2fa8518620f1074fd0cad8ee9538c063ac371d6b59358de81ee88
+DIST protobuf-3.6.1.2.tar.gz 4490331 BLAKE2B be5fac5a38369b21941c3c615a97cf35d05a24ee03536b6ea6c1c797a82a0a7f8ecc3630b62af7728f063c850c4faac8ae670171a18bacd44e2a2fb38b2e6fce SHA512 557ffb1216f663df94a16cd8e51e20acf42378913d656f56402c6653cb58ce6a83f77a6050bd846460c7dcac59bb41ad03ac003b0b06250df6a97fd17f8a2c7c
+DIST protobuf-3.6.1.3.tar.gz 4490599 BLAKE2B 5a058f937330bd562e364a8d86e0b1376fdac9fded0fd23d6914cb59c5c15e8bfc1e203ea36b5a4eece8919708c1a9a6616b0ec2028d6ec339704da53ed81963 SHA512 9eadb46c7daa19e612516958169bc90943b38b429a4b2cf2171b66b57f50a2f8a9b66cbf58bdd44517af414b78e0f3ab2e1361891dc60ecd098185da2638d37e
 DIST protobuf-3.6.1.tar.gz 4485582 BLAKE2B 546c49759df784018459809b9db692c5c94aef5d717183af5cd9edd96b4c658e759f23950cdcd5dddceaaad06ea1de2a2357b9fa8c496ed5d538fc5920174da0 SHA512 1bc175d24b49de1b1e41eaf39598194e583afffb924c86c8d2e569d935af21874be76b2cbd4d9655a1d38bac3d4cd811de88bc2c72d81bad79115e69e5b0d839
 EBUILD protobuf-python-3.5.1.1.ebuild 1247 BLAKE2B f7566fc24019d971eb0895f5f5dab2f86688e868d86fea4acb211d5d5f48b843b995dbae96c1eba17044db12c83b50ea402b546351a991960f383f79cc4a1153 SHA512 6d96b5827e4a569d60506570bcfa38796b7e240c85db8aaae215f79841968d13df63eebfed451f1aea8f9412267ea491eca64b776034044a64711951deb4b390
 EBUILD protobuf-python-3.5.2-r1.ebuild 1333 BLAKE2B 9c4dc72f815cd109bf397f4c5ac251f54c53d410682e94369b3a2ab62d084bdf6d1a8627c11096dbedcea565d157d96d428f447035766105b7affa1bc5e23a46 SHA512 b84fca10588e8faac8c4bc95e50d7a39a67e919e0c4a28c751f8dba9a7b421435a0b2df77d5989862d4d63441a4625af3b75b6ef59814f3d41d5da2906ea6eb4
 EBUILD protobuf-python-3.6.0.1.ebuild 1345 BLAKE2B 33781333a986e3212e68b01b0858eaf1c814559ddcc32793ef525199cfc4166de4238b1f488a3db6a4c3766d2873f0fd38a1e4ea6e602d25c3b790e616059ad2 SHA512 ccc326eccb38f08ef9f7f314ce0ab62cc6e00019a1869e7f9bc65fcf68bea23ccbc9adfec838f2bbef5daead1811a607903272e367900dfd0cb99c4024e53281
-EBUILD protobuf-python-3.6.1.ebuild 1398 BLAKE2B 3f0c8016a5b96a0c33b4dea9d5e63207ad53b2b813c68c7301821406e5d70395eb58d7616d21b3de8568413fe8dae21ba47b064f07e8ff2d15058a2f3a8b12b8 SHA512 16b281fe310af2fbd702b3c61ffd3c53ff673221b0bda8d07ca1ad7dc96cf1f4b49a6a6715753e1ae03a5f789ab5ac25134658a2bbf7e8f360ec2358a79482d4
+EBUILD protobuf-python-3.6.1.1.ebuild 1404 BLAKE2B eef41482d661ba0138c8f018d4f7842c2e3af4d6828eb5d2bdff239d1f4a6c0059ee0fc389ee7b31b0d111afbb9772e5f3e88a990545d480780018e4e7530d48 SHA512 4634e1f3d5245f074072060b49138317bba1921d6bd3605cd2cb28cecde99a4eb200da73a7d0045693551863b5265761ffeea825c5475028530fd9db95e02f79
+EBUILD protobuf-python-3.6.1.2.ebuild 1349 BLAKE2B 9b958bd64c4fe14ba9966fc05aac9febf4d10a24e0961df49309bbf9c92fb763a2a0d56ca57e965793f40c8058e7ac8697157e67563af0544666044bc31dce9d SHA512 d1bae7a3ea3b4571d06d4071e2179a2dc47ab32c9d2f24c6abbd029d4b83c5eb310f7b5c7da19b12c71beb9f63f667d0fb078634a9264b28e696e4e90c4ced56
+EBUILD protobuf-python-3.6.1.3.ebuild 1349 BLAKE2B 9b958bd64c4fe14ba9966fc05aac9febf4d10a24e0961df49309bbf9c92fb763a2a0d56ca57e965793f40c8058e7ac8697157e67563af0544666044bc31dce9d SHA512 d1bae7a3ea3b4571d06d4071e2179a2dc47ab32c9d2f24c6abbd029d4b83c5eb310f7b5c7da19b12c71beb9f63f667d0fb078634a9264b28e696e4e90c4ced56
+EBUILD protobuf-python-3.6.1.ebuild 1397 BLAKE2B b620084c9edb501efde568755fa561c14a50485c628228dbf8541e9302471c6acafa77e69f9c7e12e8bb3d00e3f93eb0ab8a23bad7dbae9546ae22676cdad5b9 SHA512 958f35f2291a205375f2b4070efa392b9c632b3cee158f3dbb677dfcffdca540052714a221fb17e0ba6201a2e78b1242278c69fe32b5cd38bd7a2dcd8c3cda97
 MISC metadata.xml 656 BLAKE2B e63db63e247b105b51b506a404d8edc821cc0ccc276a3f813df3b06951184218e736e57b577ad2f64880250c55ef09c50a9fe04428f7cec02fb04293c337175a SHA512 5d747585e025672d423690fa2d8df09380a1714c2e0adad5838a41f099e3984b70c7f80c5873ea296101898cd92dea70edee964bf01b9d86acb9a1d0140169fd
diff --git a/dev-python/protobuf-python/protobuf-python-3.6.1.1.ebuild b/dev-python/protobuf-python/protobuf-python-3.6.1.1.ebuild
new file mode 100644
index 000000000000..519a54dffe30
--- /dev/null
+++ b/dev-python/protobuf-python/protobuf-python-3.6.1.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 2008-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6,3_7})
+
+inherit distutils-r1
+
+DESCRIPTION="Google's Protocol Buffers - Python bindings"
+HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
+SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/17"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE=""
+
+DEPEND="${PYTHON_DEPS}
+	~dev-libs/protobuf-${PV}
+	dev-python/namespace-google[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	!<dev-libs/protobuf-3[python(-)]"
+
+S="${WORKDIR}/protobuf-${PV}/python"
+
+python_prepare_all() {
+	eapply -p2 "${FILESDIR}/${PN}-3.5.2-google.protobuf.pyext._message.MessageMeta.patch"
+	eapply -p2 "${FILESDIR}/${PN}-3.6.1-python-3.7.patch"
+	distutils-r1_python_prepare_all
+}
+
+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" -delete || die
+}
diff --git a/dev-python/protobuf-python/protobuf-python-3.6.1.2.ebuild b/dev-python/protobuf-python/protobuf-python-3.6.1.2.ebuild
new file mode 100644
index 000000000000..e6f11fbf5349
--- /dev/null
+++ b/dev-python/protobuf-python/protobuf-python-3.6.1.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 2008-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6,3_7})
+
+inherit distutils-r1
+
+DESCRIPTION="Google's Protocol Buffers - Python bindings"
+HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
+SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/17"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE=""
+
+DEPEND="${PYTHON_DEPS}
+	~dev-libs/protobuf-${PV}
+	dev-python/namespace-google[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	!<dev-libs/protobuf-3[python(-)]"
+
+S="${WORKDIR}/protobuf-${PV}/python"
+
+python_prepare_all() {
+	eapply -p2 "${FILESDIR}/${PN}-3.5.2-google.protobuf.pyext._message.MessageMeta.patch"
+	distutils-r1_python_prepare_all
+}
+
+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" -delete || die
+}
diff --git a/dev-python/protobuf-python/protobuf-python-3.6.1.3.ebuild b/dev-python/protobuf-python/protobuf-python-3.6.1.3.ebuild
new file mode 100644
index 000000000000..e6f11fbf5349
--- /dev/null
+++ b/dev-python/protobuf-python/protobuf-python-3.6.1.3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 2008-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6,3_7})
+
+inherit distutils-r1
+
+DESCRIPTION="Google's Protocol Buffers - Python bindings"
+HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
+SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/17"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE=""
+
+DEPEND="${PYTHON_DEPS}
+	~dev-libs/protobuf-${PV}
+	dev-python/namespace-google[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	!<dev-libs/protobuf-3[python(-)]"
+
+S="${WORKDIR}/protobuf-${PV}/python"
+
+python_prepare_all() {
+	eapply -p2 "${FILESDIR}/${PN}-3.5.2-google.protobuf.pyext._message.MessageMeta.patch"
+	distutils-r1_python_prepare_all
+}
+
+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" -delete || die
+}
diff --git a/dev-python/protobuf-python/protobuf-python-3.6.1.ebuild b/dev-python/protobuf-python/protobuf-python-3.6.1.ebuild
index abf9aeda24b9..0bc1554dbcba 100644
--- a/dev-python/protobuf-python/protobuf-python-3.6.1.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.6.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> pr
 
 LICENSE="BSD"
 SLOT="0/17"
-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=""
 
 DEPEND="${PYTHON_DEPS}
diff --git a/dev-python/prov/Manifest b/dev-python/prov/Manifest
index 1efc0b6a070d..fcb9aea2c7ad 100644
--- a/dev-python/prov/Manifest
+++ b/dev-python/prov/Manifest
@@ -1,5 +1,7 @@
 DIST prov-1.5.0.tar.gz 125045 BLAKE2B c378c665b78f4b91b612e954e51b517a6c2e293297afea7482fd4fc7362e7f1255e3b4b6ebc18232bf2014f86f2f491c12e781d7b7553d18b724f72e077d95c5 SHA512 d08b924385f587814f6094679649e746bc687e136ddebe1194c5d97921a081b960a5531f13cb8f83d167dbd1cf7114d2e55478431feaf52e547db24a181a2ad2
 DIST prov-1.5.1.tar.gz 123725 BLAKE2B 80816d7a78c881e48b89adf0fe2b9579fb3bb5ebca55220ae449dca422c069cd6c469a547d025600944fedccb82c20e4a7571f336592c3f5ff5b5a0bd0835c1c SHA512 71ff149f7a015a36299413b7fc98e0965684aaa0ece86ff865be1c1ef404a3b24489144d9f8299dd48c2f13b377d16679b26fe93e3463455192a054897af52f7
+DIST prov-1.5.3.tar.gz 121405 BLAKE2B d3c854b9631e68ff8d71e90992c6238ff3a5a0053efe2970a95e3f4584e12637774ef23f3d00c2c3594ff250175cc706f1d5f4d04abd6b24cbb920f588fd6716 SHA512 b205b978320c032c07e96f75a6c6edd4f046e4e219a41234c3fa12dbfa5514d16d56bba602617b95417918ee457c6a7f82dc228066f8a21edd28730fd20494ba
 EBUILD prov-1.5.0.ebuild 945 BLAKE2B 57cd6b6592e62309070fd8910fef43104bfc04a623d66d1b526915e00e8eff13e88ee8d72f8fa05452b86430eb0d4d80fd621f9955fdb4fbf35e7a38a1e3710f SHA512 5dbb62473e47090e1503d33dfda7bd230445dc9852ba2ef1f98386409daa860f29c64535a404b5b5318d0eb1fab76da971ad0290217e478a8217923262ffcbda
 EBUILD prov-1.5.1.ebuild 761 BLAKE2B 625a0a54c01d2c907c9abaf7a44cb12c350822c47d9668462ca588e837a0465b69c32de82688bf0539fea6b6a2550f10d719eb6a2f4fbfd8fbcc82e1b948f896 SHA512 b9d68a06924f7ab80350844e6198325683461177aead73c288c1befc91341c4ebf3ae89438bae2d201d4159bcb873695a818a9bb9be6fef040e881e29be8ff01
+EBUILD prov-1.5.3.ebuild 758 BLAKE2B de56703d91026c4f4e08447f8268b7aaee043d3a96d5f75f5b44e4a658f04041e2c8afc6eff6dc1e66ec2b157ee9993cc32ef6c79e101628e10a6464e390ff32 SHA512 92da2e3d497d95dd83c61770926dbc370e5d0c704efe4666d85b854b628bcbe64a6c85ed10eb0729cbecd0ab74923a49553f99d74521305f58272c3e67981b65
 MISC metadata.xml 632 BLAKE2B a13213d0c3f132bada05993e9e392a744c33a178f576d712d8d2ec081283543519871182ca53b7c43d7dc10d95f22b76e56946afb73ff77c84ae96be75692c03 SHA512 ecc45c96e15df53bf48de473c0553b3fad1ca42b89b3f1f9059f49f5877e7f3dfdcb725c25b54fb64db910acb657c88cbead3a36ed60be4e4f8068ecafbd52a7
diff --git a/dev-python/prov/prov-1.5.3.ebuild b/dev-python/prov/prov-1.5.3.ebuild
new file mode 100644
index 000000000000..043a46a4d2e8
--- /dev/null
+++ b/dev-python/prov/prov-1.5.3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="W3C provenance data dodel library"
+HOMEPAGE="https://pypi.org/project/prov/"
+SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/pydot[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	>=dev-python/networkx-1.10[${PYTHON_USEDEP}]
+	dev-python/rdflib[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10[${PYTHON_USEDEP}]
+"
+DEPEND="
+	test? ( ${RDEPEND} )
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+python_test() {
+	${EPYTHON} -m unittest discover || die
+}
diff --git a/dev-python/psutil/Manifest b/dev-python/psutil/Manifest
index 76dbd8eea955..ab6cc5f56190 100644
--- a/dev-python/psutil/Manifest
+++ b/dev-python/psutil/Manifest
@@ -2,6 +2,6 @@ DIST psutil-5.4.1.tar.gz 408489 BLAKE2B 867dd9b535134ff2ef5960f774891eb4743afc58
 DIST psutil-5.4.3.tar.gz 412550 BLAKE2B c12a8418e7a7573d23a2599c6a4df9a3aa3bbe6b9cbef9e0f48b0379944e2aa06ed498adfddc30e8d9ba8e02a08f79d4867dc1e313a62040ad3550d69d62664f SHA512 f2a0f3089c3436df52d509576795e1de14c4127918fbe63b8f116f7c097ba4d67e3b55a8da167a88c6ffd340bb443109d4887c03371810997ced4478b295f960
 DIST psutil-5.4.7.tar.gz 420300 BLAKE2B e096997d22577f90cd6fc6019f2bde8855abda0eb67b496dfb8cc8dbce769e0c7da66524ac6d0c059e7a2d074a1675187af3177d904feab5a76b9b8a72c63853 SHA512 553c6de601d4c4d0c6a9dccc3eb8a449f1b3a18cd71648395ea3b43da3c92aef1565f6ce763872855d68b3de190dbd04c7f5be5ed4a79b0167d737c1825c0e2c
 EBUILD psutil-5.4.1.ebuild 785 BLAKE2B cde5934a3398e2fccbc88f3001d7506a4ed0e6065c92a6d9dae96c54f6e27f93d455725504cec0a9f062f83f5e4d345873616588e5a3291dbf0f03b1fa13c154 SHA512 19a1193a10f25eb496e70d04f187d27af5260f7ca40316b1318c88133cd43bc05ccdacf45e424c167ae0fcb3543402ba15dd7a586444c62b1277e894e1925b7c
-EBUILD psutil-5.4.3.ebuild 803 BLAKE2B d92861fa2dc7a0ffc2a6c0e8b44ecbc127442f23270ed45960518ca7685daba50e8becc3e82c9917c011ab6d97bc0a95e837670017c3053d4daa68035870f941 SHA512 4ce30f78e60eff643b612747a65c7d5664249659286fcb27ecfc62e761781d8db747a739ed0ce32e28f05c63328e5ef3d969c4c15e0a91ecf5bd011426d1f789
-EBUILD psutil-5.4.7.ebuild 909 BLAKE2B 5d085cf199dc202cd0668f7404c8647c01284b0d20f7545d7dc199caa313381bc66d014db22c7a153ab5c5d5cf535e939b2b31e82f8a26c8a6f26489c422063a SHA512 56ccca156f10670de43c5c20969c4ca8078bc9313a807752faf244c2d9ad58c7f01119bec94b4f32f3ccc9314d6f54196e11e69dacb94df229868353b62fd05e
+EBUILD psutil-5.4.3.ebuild 804 BLAKE2B 06d1cf8df49604b223464f3caf62a74f507841219da4a41d5af24d5706a26fe7cb507cb9ec54b08e734df916f29734de21b07d92eb7131907dfbce131e11f6da SHA512 886c24ac8a0ea53c096f09050d0e390fb88fe6687e98b0a91bbd795b9f5dd1ecc707a8316ffc5c903dafbb876f546fac71c995621430f3637a60dbbaf22cb78e
+EBUILD psutil-5.4.7.ebuild 912 BLAKE2B be8379bec2e2984efbc9d5e0a40eea1209a89aa60802c070336c59c6f4f5d3f6c2f53ce9df54a730848d394797152600288a582e017924fe9f2c0f9e3c67b890 SHA512 14457bc0841f227f69740a26f0530b2e3e26bc7224a91739264d634fe6c5eaa80798a399fc42c32f7f733fe1b122707b15099bb0f1b4b7360ec78c008281164c
 MISC metadata.xml 377 BLAKE2B 0e671ef95025f24d295ceb5c5295544f4d68bf94459537537e229efd273bbac058b385fa94f1fa1191f23785d2572a5960d84a1d3ece41f10316b38101cb26d0 SHA512 a28e7a1e32a0b2750a4f0956d2252c73d20b4aa9817aac2e776365febd7d03de88e88508aabdfc29ae15d8bf7ebf1ed662c000e2ca8c79e3d50a3362ce1c2d2d
diff --git a/dev-python/psutil/psutil-5.4.3.ebuild b/dev-python/psutil/psutil-5.4.3.ebuild
index 110d80992963..ddd20191796b 100644
--- a/dev-python/psutil/psutil-5.4.3.ebuild
+++ b/dev-python/psutil/psutil-5.4.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 ia64 ~ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ia64 ~ppc ppc64 s390 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-python/psutil/psutil-5.4.7.ebuild b/dev-python/psutil/psutil-5.4.7.ebuild
index 71eb3eb3dc9d..039f78170ff9 100644
--- a/dev-python/psutil/psutil-5.4.7.ebuild
+++ b/dev-python/psutil/psutil-5.4.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-python/py/Manifest b/dev-python/py/Manifest
index f3418ddeba2f..fc11689df24b 100644
--- a/dev-python/py/Manifest
+++ b/dev-python/py/Manifest
@@ -9,5 +9,5 @@ EBUILD py-1.4.30.ebuild 1274 BLAKE2B d1caf17f0e92b002bc8626b9aef00a0b6e60c9172b6
 EBUILD py-1.4.34.ebuild 1342 BLAKE2B a10c42e96d96e05c966e438d4c34d1ee1958e4f1480762b4046a56da6838a11787b6600198967adadafd0a88d1d7cf5d07b8d42a38741320ac074b9c4a3dbafa SHA512 2ec30f5f6b4db6abedd335511154dde8f57a3530628bf515e18c0e9f12e0de91cd2efab6a6a25065c4694e649c6551d38df00e7fa1f4f510952533bc6c6ad4ac
 EBUILD py-1.5.2.ebuild 1347 BLAKE2B 1ae248e72c3a599004712f0dc6f91553d5fd22b9d0e62f79459a2dd0ca557fd1aef853c7c3c56f10cfe5761e6d9d99bff9a00d4983e125f34f96cb7394311dff SHA512 be0354d8358ed8f05725c475426c9c94772e089d293c88c541b8403c754a9b8942b189b5b51836711a8ef235fab79e38103bb61b422fb4d000ee5f41f9c18df7
 EBUILD py-1.5.3.ebuild 1356 BLAKE2B 3c8ec2d4c181f2a09e56e3bb2d31a95b79bf2ecfb7f173ea20627224b4409175ecaaace93e9d126083e83a1136e32cf74d9774682e012296dcc19b4884b71f42 SHA512 9ee8c305b5b36781d2ac28456cc7cc24949ace90901cac9b04b087c78a414db662b623a16c9893f70ce9553a91560d01a52b6fd11f9f0ac11fd29bf5dc4fae79
-EBUILD py-1.5.4.ebuild 1354 BLAKE2B e97000a799b483fd915e9a24ff74917af7735a1cd5f841bd68038e89fcb34fdda89b29dad14a75caeb91dca2c2491271a62a905a3f5d8447e06eeeb6f6d1dca5 SHA512 90ee99ddb0af5d3684d8fff2343e020204689b963ac08980ce37a0413fd20ec883e13b2b8bfedd894b33a27d3cc5f53443cabff13dbdfe3dc6f36be9aac3071b
+EBUILD py-1.5.4.ebuild 1409 BLAKE2B b9cfb79270483f0a8b226a92056603876811d871fbe86f213409068dca7ee72e6612b949b0535f248571fd529018bca2c5ac3b3133344a75e6aa3b25ce34f3d0 SHA512 2d73c87c5a248f4bd54c4b8fb5be0cde735e5d6f6bdfe7bd85f7472937b0e3016df9f0d867c52b855c0dde56e678f3fb3ba3b3f076d603bbbbc0856fbf7d35f0
 MISC metadata.xml 315 BLAKE2B 3154c92be7826e4b562d5172b792f652ede8fff96b3fd3abebea5d6107eca432718bd0c8be7934a9f90a34891ce6e9b74d02c82881976cc86ed9635a0457b2da SHA512 e2ede56189d791c18b64d1db6615249e6ae5a3afd31f17b9ae6d23e9123d4c68a22bc61b7935deb284d2fa7e6732679e2286a271854dc818e7f651e9daa54fbe
diff --git a/dev-python/py/py-1.5.4.ebuild b/dev-python/py/py-1.5.4.ebuild
index 5ec92f2ee304..7c66f0c5e3c8 100644
--- a/dev-python/py/py-1.5.4.ebuild
+++ b/dev-python/py/py-1.5.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
 RDEPEND=""
diff --git a/dev-python/pyClamd/Manifest b/dev-python/pyClamd/Manifest
index 3e5c91afe5d7..7da559dcebd3 100644
--- a/dev-python/pyClamd/Manifest
+++ b/dev-python/pyClamd/Manifest
@@ -2,4 +2,4 @@ DIST pyClamd-0.3.17.tar.gz 10737 BLAKE2B a190809b8f652fdff6c55c73a9431fa509219b9
 DIST pyClamd-0.4.0.tar.gz 11177 BLAKE2B cb69c9e1fec936d416a18658a2c3e9df4dc4684cf56c19e8a02ad9929b4c86d9985395c38a8f88f7053f81fe08fa3574c6a206bcc519a9494c2a61caf6b995b1 SHA512 b96e26729e0fe2600572534c0fa22a01238761589f1771e72a054dde9c1b8f122493c83ca04cffda167f7a0e44fbf309bdf76b8fe1de499ec50d56c677923bd4
 EBUILD pyClamd-0.3.17.ebuild 559 BLAKE2B 75f4e36fd9cd1a2fa48ec3562608f67926bd145a28cc3f16cf19ebd9ff6507597ed94b3ca32fc136a1788f45b1d29af13f90356e7623c94689fff194ecccfc9d SHA512 0b2ecb5064241fd07bc3b1e823fee447fe9b6a149129772843d3c7c7ae3a4bf5d22e0d0e29d4427d2d99569873d3f30096382e1f30b41ae960648aa625e28fac
 EBUILD pyClamd-0.4.0.ebuild 567 BLAKE2B 1dc635779338a0a9944f660a2a57424ceac209b9f1931e255366a1aecddd0293221d251d193b6fec8fc31465c87a6c67b0e1d76d1819d230c0941437ee001d8a SHA512 57cc8e1bfc193effe94335de13a39323596c9d901db4df7aa0ce3215ff1795b91d05aac8ce1c234e93d0b25673c206828d85345ff5fdb38919415b5bd3e26d20
-MISC metadata.xml 323 BLAKE2B 58103aaf74f241ee493b79225d841b88792d770a484885fa5eba23b8d07d5039d92d1691b2c8914964ec11a055d7ea5150a9b6f2685b9008f6ed7a3f62e638d1 SHA512 d415502fcadfae02999e34a1eb5d526e1e344ee55182ea0790556432df8a63dea1f71a0ebbe47575eafa205dd287e1d2d032de58f87cca6d1fde56154762dc61
+MISC metadata.xml 242 BLAKE2B 82b0c4b81d4877679e44b5aefee7502536dfc2f09c11b90ee94b332413ea15acc368e0294b0893139a0d25b74526cd4e279fb85029d0a3724fc4b227ddfd08a1 SHA512 871f2d7617caa792bb0f60c4a4c1fcf9a70b6853d3add35ac1d67f260068ce6429a9ff8039230b26c4de20b8f5df80d66a807999130f38701f723e227f19d7a4
diff --git a/dev-python/pyClamd/metadata.xml b/dev-python/pyClamd/metadata.xml
index ddd3880bfccf..bfc26d648e7c 100644
--- a/dev-python/pyClamd/metadata.xml
+++ b/dev-python/pyClamd/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>xmw@gentoo.org</email>
-    <name>Michael Weber</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="pypi">pyClamd</remote-id>
   </upstream>
diff --git a/dev-python/pyTenable/Manifest b/dev-python/pyTenable/Manifest
index 3243813653a5..bf569bdfce4c 100644
--- a/dev-python/pyTenable/Manifest
+++ b/dev-python/pyTenable/Manifest
@@ -1,5 +1,3 @@
-DIST pyTenable-0.2.2.tar.gz 53904 BLAKE2B 2a7c747b89900ccc6181627e8d0efbbf0f6081ba67b14366dea5aec8f60c95fa9496b5caed2f619210c573455c3af6148f9cbf686738bf9a03d14913e82cd41a SHA512 231e0e0f7f29607bbcb57e2f6e064aee87e2229e9465be52e0f3010ec8beda9795f658a2f6d4a6fe2eee6e7ab446a4ecb5c93264291b92f306271d705560baa9
-DIST pyTenable-0.3.0.tar.gz 62847 BLAKE2B 61e7fda6437b020f207eeff3f2ed772647dd2c1dbfe848b921c966fdce5a4486a1ede8819ed6f7235e46464cebb06691daffd48a0d84a0db0dae041532f4311e SHA512 6e0d93d49358fb32ce3606968eb0a40be2089b22bf9778e2fcc9cf1f4e668d0b5d2c4e216773ab68bf4121bbf461df0141b3403864654c455a84d79c723a4018
-EBUILD pyTenable-0.2.2.ebuild 680 BLAKE2B fb3aae727d73671d32c0aa448e9c543a7c78f8be8467cf3ee8b3bfdce83832ab4c55689d81705eae76e3ab323fa3f4747bd5fe9e258f75863d5f10edb60ec93b SHA512 098c0f083fcd64fb8bbb21698f5ce064fa32a7a02438ae651f870ac5bb37df64befc09fd1abdd9a3d93c476d2550211cb885a0e287c72b73186fe10218f1d991
-EBUILD pyTenable-0.3.0.ebuild 680 BLAKE2B fb3aae727d73671d32c0aa448e9c543a7c78f8be8467cf3ee8b3bfdce83832ab4c55689d81705eae76e3ab323fa3f4747bd5fe9e258f75863d5f10edb60ec93b SHA512 098c0f083fcd64fb8bbb21698f5ce064fa32a7a02438ae651f870ac5bb37df64befc09fd1abdd9a3d93c476d2550211cb885a0e287c72b73186fe10218f1d991
+DIST pyTenable-0.3.7.tar.gz 76638 BLAKE2B 8ff586e4a77bc4005769e6565622756b798398aac9e8e2335653c1ccc5f9c0525ab9e1261b939c848126b1fa71dcca8ea7887d82972f1d881c7b21e5f61de0b5 SHA512 c1f5d7a916cc79a754160fd056b661bad15ec60d64ab08b91345c2646f0e8047ba629d73b39a4d70d87ad7b1c624d55744cbbe0eb78f6e9df32e50a5c85c38b4
+EBUILD pyTenable-0.3.7.ebuild 680 BLAKE2B fb3aae727d73671d32c0aa448e9c543a7c78f8be8467cf3ee8b3bfdce83832ab4c55689d81705eae76e3ab323fa3f4747bd5fe9e258f75863d5f10edb60ec93b SHA512 098c0f083fcd64fb8bbb21698f5ce064fa32a7a02438ae651f870ac5bb37df64befc09fd1abdd9a3d93c476d2550211cb885a0e287c72b73186fe10218f1d991
 MISC metadata.xml 529 BLAKE2B eccd96c558e42e1d453f21c6ce85fdda19c47a9bebd5803cc1f789f311726ff02a41d6da592ad1202a6c970413745a5e272dafa7efb6c2abdbe5361c0d7544b0 SHA512 9c8094a71191ceda8919499eca6c8cebcbb3db0bc668b5d2cc414b1ed0798ad1431fa9e102358deee6eeadd5a11c610d2bd90ade8ace0d4451b4d87ac66a5ae1
diff --git a/dev-python/pyTenable/pyTenable-0.3.0.ebuild b/dev-python/pyTenable/pyTenable-0.3.0.ebuild
deleted file mode 100644
index 4e6bd10348c9..000000000000
--- a/dev-python/pyTenable/pyTenable-0.3.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2018 Sony Interactive Entertainment Inc.
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
-
-inherit distutils-r1
-
-DESCRIPTION="Tenable API Library for Tenable.io and SecurityCenter"
-HOMEPAGE="https://github.com/tenable/pyTenable"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.19[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-# requires networking and API endpoint
-RESTRICT="test"
diff --git a/dev-python/pyTenable/pyTenable-0.2.2.ebuild b/dev-python/pyTenable/pyTenable-0.3.7.ebuild
index 4e6bd10348c9..4e6bd10348c9 100644
--- a/dev-python/pyTenable/pyTenable-0.2.2.ebuild
+++ b/dev-python/pyTenable/pyTenable-0.3.7.ebuild
diff --git a/dev-python/pycairo/Manifest b/dev-python/pycairo/Manifest
index b9f915b53617..f6c105eee24b 100644
--- a/dev-python/pycairo/Manifest
+++ b/dev-python/pycairo/Manifest
@@ -2,5 +2,5 @@ AUX pycairo-1.17.0-pkgconfigdir.patch 2465 BLAKE2B ea288bb36d4096586d2384b3d25b9
 DIST pycairo-1.16.3.tar.gz 188610 BLAKE2B 71034891bae636e23379a3fdc49c9163cff61183fe46c4027bbad3206e72255e60081dbc3cb02808d5c3840b618f6c12f8106ca5a08ddb226a65917ba2da390c SHA512 d60978f85eb0430f2038b0e7d0bce23602e8c180a7611eea424fd8bc3cdd8ce249af364abd0e77ab3b7ab439761721cba5c2398f51af2a89add3fb7fda8aa5db
 DIST pycairo-1.17.0.tar.gz 192182 BLAKE2B b7a4db8258b03b89878fca6b5e27bb9037b74b1792ded23edfe38a0aa5e9ba5003bbac2c8623a6ace8033960c3199b307dcb689650e21ba2df0d81a36a71b6cf SHA512 c073f04d92c9a577f7dcea8d46335751ebd896a65e682e99e4453877d8ba2cadad4437f4ceb1ce8c05eb87d5757a2bd78ac2549e63e38720f4c9276e6f70bdd5
 EBUILD pycairo-1.16.3-r1.ebuild 1095 BLAKE2B 20def77c3a3e045e0032facc0398ffa8ff74c5720a2c4b94f766a94bab62d3ded5bfa38635f3d95f864f38f235b942522bae3a4b2e7ae554a937f47bb96303dd SHA512 cc782cf27262f03e466e714aa232b5525ecf8e38e282890df3cb83ee9f18ccf28c4bb4a04cefdc78436d5b8c0a8d1cec6508bde5c966fb01db8dbf066ec39dd0
-EBUILD pycairo-1.17.0-r1.ebuild 1279 BLAKE2B e3a7357b55481d7dc425848534e21474f3ae4ab14b7ad8bf2f807aa003298114bcc3d7eb8ff04e53c46dd2fc37315b4994084834aabdf6cd2aecc864e3a61bbe SHA512 f22e7853603300728d09ef47be0ba24ebc785c897e61261061c98d6940d714907f12d87b05357d073564160785cfe92f71b3964afb32ad8165914760894825ab
+EBUILD pycairo-1.17.0-r1.ebuild 1286 BLAKE2B 1ec0917486b18a01aa7e9b9e05c72796d6397bff8cb11b9f2e4d91a5e63898788c09f68f246cd28cf0cee006dd86db33b4e56adc8bc1a5c4316ea2e5381a0a42 SHA512 bc7869cfcc2ccbdedd8d90b81c0845441bf44c1c539ccaffdc35f5ec1a1ee8885907d7f500c3dc33b74f34afc850ba2191047e4f7c8d9d2180281ef90012396b
 MISC metadata.xml 246 BLAKE2B 3a28b3bb42a0352827a446ea608867a7782fe682458527ef441a528a22c9f951dc203639934a69ffb520f63aadce3037df28bf8c5304b3a5921b336142f9f246 SHA512 3245fb694492b2f698fb63aac02e66fb8a94fe35eabda45df4790bec043a1ea552e112315334001902f070093bb73e7b741aa3004757404aed97ebdb86cc9fbc
diff --git a/dev-python/pycairo/pycairo-1.17.0-r1.ebuild b/dev-python/pycairo/pycairo-1.17.0-r1.ebuild
index 3b7e663eaa0d..c9670e1932fa 100644
--- a/dev-python/pycairo/pycairo-1.17.0-r1.ebuild
+++ b/dev-python/pycairo/pycairo-1.17.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/pygobject/${PN}/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc examples test"
 
 RDEPEND="
@@ -42,7 +42,7 @@ python_test() {
 
 python_install() {
 	distutils-r1_python_install \
-		install_pkgconfig --pkgconfigdir="/usr/$(get_libdir)/pkgconfig"
+		install_pkgconfig --pkgconfigdir="${EPREFIX}/usr/$(get_libdir)/pkgconfig"
 }
 
 python_install_all() {
diff --git a/dev-python/pycollada/Manifest b/dev-python/pycollada/Manifest
index b2ad4c7b4187..9e230c13f84e 100644
--- a/dev-python/pycollada/Manifest
+++ b/dev-python/pycollada/Manifest
@@ -1,3 +1,3 @@
 DIST pycollada-0.4.tar.gz 519732 BLAKE2B 9fd9b7ca369943cb6b2d9960b343ed39a9e578bb2e94c06d5e7c027a814220b13ff66d6137371edab150befd4b4301e9cf5420385f7dd3ad72dc11a38c38afa9 SHA512 6e9569b858f2014aa08764d0bf328c8317b94edc91e99c2a7c97bf2355983555ea103012d6e6f197862cb3df113ca9263de18fc47edb3c60e74fa8e58b5ca8b0
 EBUILD pycollada-0.4.ebuild 1263 BLAKE2B 5ec572af9cf78ad57a863e26f0f5e60cfb84db0404b284efc45ba85c03fae3f896840a82bcd3a8e3e25c1e2e939c93847b33c9675f08a14e9876e1c4ddab29d1 SHA512 f220da283c4bfca03b0c22c14f9a7a9693e8f50dd271392252f435cbf4e8eb3a813d7928807e57a3c572912cda156c7e27b18d4e1e5f7c335b9a392baddf1834
-MISC metadata.xml 327 BLAKE2B f1ea87e797a3f8379e6f5cc0b84b7fff48f28b56b71ba4b17fa1a12cc8148dd2a09176ae5fb1f727f1cb0a260cb395f184c2a1bb4109f5450e8bc77124531f12 SHA512 a413c6d76aa3a80cf2f32c4cc75760c0574019eff6d381c1f46aefe4bc7924e59f28d593691b2ac7bb0a7afa7fcdb11a264f3bbc600bfab61148634282307886
+MISC metadata.xml 251 BLAKE2B cea71533e30ad9cfece67021a64454deb43a56280867dada5dd9dfc1921df33b525bda1dbb32dcdb8eff3935b85f98c5974e3cad6c587c7576dbc4af8b128b66 SHA512 5c5d1ad16a16916ba20267d817f8bd98f9064e21945a31650e9dd9d5db58084f534c3ac082904b01986e4f5afd212925391a13b6377ba81e38dae269dc79b7d4
diff --git a/dev-python/pycollada/metadata.xml b/dev-python/pycollada/metadata.xml
index 9438ce631d39..bf9cf589620c 100644
--- a/dev-python/pycollada/metadata.xml
+++ b/dev-python/pycollada/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@gentoo.org</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">pycollada/pycollada</remote-id>
 	</upstream>
diff --git a/dev-python/pycparser/Manifest b/dev-python/pycparser/Manifest
index dc46ede422ff..1b37db96a65e 100644
--- a/dev-python/pycparser/Manifest
+++ b/dev-python/pycparser/Manifest
@@ -1,8 +1,8 @@
 AUX pycparser-2.18-OO.patch 2224 BLAKE2B 38955919380a0ec7dbaacde434a327b9842be0285f830b7b7de67d00b7fee27f2b15d56e0a90ba777b799f00cb54f59abd3985a8cdceeda9e16e324699427b0f SHA512 b9568bc4fb06015497f8fd7c56ee4312c07d0d7621a84aa946254ebd4e80da8fe4c94c13065780666a44e5d8d3bb72271e9703c7c5af39325f2b699c250bf71b
 DIST pycparser-2.14.tar.gz 223295 BLAKE2B 13dd4e36d7239db4fd6dfb77f08088bdbffa897ab75d748da5bd7297fe0a7dd751ba7153f8bf15f93494e347c653d1ebc7250907d2ccc555e785830e731e93dc SHA512 d5b9ab434a8944898ac23a4f51189db77b02b993bf3e3ca018852b117fc0eb43e460b156beaa5c1d631ad71c81e1649113e9fff7e33506b1e7d4de24d8b464c6
-DIST pycparser-2.17.tar.gz 231163 BLAKE2B b264fbdf235f63559c96d103ca42fd0faf2c5e125420e75503e7dc2cc6e86a23347b9070a33b1e28721b919d89d0281b69b04c2761b180fa535c748933392172 SHA512 c9caaa8d256748e0623d077b11931abb38d19367136c70a835f7587e1f7ceb64f3acb7a983dcb68bedd2cf187517762a5753844e8ed58d1d9ed6f364c55839b4
 DIST pycparser-2.18.tar.gz 245897 BLAKE2B 2f47263c73763f9d76edcb0d90aacd2e6cf0a68ed2e8c5825a0788a5ccb6574167220a5bb7605b2c11dda8956ce8fb1ad28eeb8e91fed7aa0282191b11478b63 SHA512 4754e4e7556d21da328bf7dbabf72f940c9b18f1457260d48208033b05e576919f45ab399e86ea49e82120116980d7d6f53e8b959d21b7b03a3b5bbea3672f13
+DIST pycparser-2.19.tar.gz 158295 BLAKE2B 8836914e7549517f0c23a1c75457beefd013161f19c51a9f2a236ebd69466edd11235bf0a3f59c5cbece9e9e287eeb24b707bfa5afc30fcb079d134dcd4d9a80 SHA512 7f830e1c9066ee2d297a55e2bf6db4bf6447b6d9da0145d11a88c3bb98505755fb7986eafa6e06ae0b7680838f5e5d6a6d188245ca5ad45c2a727587bac93ab5
 EBUILD pycparser-2.14.ebuild 933 BLAKE2B d8d4b0647e4418b862c156d09fda502480147bc080b85ec45aec4e13e816b79b0868dafab2eccf4c31eb1a18bfcf5f0da67fc7504b647f0761a1c132959659dd SHA512 ba616d6faf9e158c3df3754dfad56cc596f56613cd44f05f9da7b8779b7a8508956852729ad586d47ff33ed77d38eef030ded8be6affa9179ccd080a17cdc9d7
-EBUILD pycparser-2.17.ebuild 1262 BLAKE2B 6ed786693227a34be8c60abbd17d6c6b7c95c539e5d1d4161fd3b5d53b20fb8c7e5a50237afafb33a0305e1f7048d1a69a209300ee44978bdcdf80c4d16b2de8 SHA512 2308dc89f2e277ba7195b892258ba82075365caa7f774f92ed89ab78152b856a83c6d17c473a1162a1d48312164dfdaac7afa1e1f4a47e3ce03bc9e87914e80f
-EBUILD pycparser-2.18-r1.ebuild 1523 BLAKE2B c2430ab4e04b77d6e6de031d94ee01f67367b59901da669ee223e9da1680aea3b15522f6e8260503ada6d304cef6d6b4cd16ae9faf143ec78f5c9988e7e2d9ff SHA512 2f138b6f0d539a0b313ca1885e72c03f4bc72931e3529e86b3d0b21ea313b12e569c9be3b4bb8f75891518bb488ad036dee56abc4d69972177c4b3d74c1fc8f1
+EBUILD pycparser-2.18-r1.ebuild 1550 BLAKE2B 9e2616fa365a0ec718bfee4afc05b80439f597a85878aa12d566f8283b8bb763002e5f7ee98e5382ae46acb49cdcf218ade52ad7578733bf55bb5bcf6fbfe292 SHA512 38d69df12d87298cac52cf534c911655bbe257d7fea59f7163063481ef5c2fc7fcd097562e9e89d588ea687cd25119da31f6ef003047d3390536a55fbffd9ad7
+EBUILD pycparser-2.19.ebuild 1498 BLAKE2B d5183a8d59e1259a0284a2700f3c2997a7c83fd55ae41f25a7239768ec75f5a04e2533c1f078c485f9565baa95e985db57742f9b89bf634cff60444d73df598c SHA512 652d15c836991130eb6fb3f8b709fbd91fe1d38437dcbd70ee95e95ed25bba9216693508b70e5dad832f31e584cce6d96a0703bfea7d06c84723b4b3539745d2
 MISC metadata.xml 380 BLAKE2B b013fa2cb5c61b39b122c1c051ce40a8c002d4d4c6995ab78e0f3a35cec07d2f81cb5b05326ddac9c2526eb3ebcf90bc2660f588c4ebe5bacbd1a861fcf91985 SHA512 98ca8c63733123ae6a1d1c8b338d5f98a679b8f84b1e0abed8dc7fefa5549735a7f4de9a5851a26507a6169336fa46689616e46a49df0e9a52f6efb669eac865
diff --git a/dev-python/pycparser/pycparser-2.17.ebuild b/dev-python/pycparser/pycparser-2.17.ebuild
deleted file mode 100644
index ba18c49470cd..000000000000
--- a/dev-python/pycparser/pycparser-2.17.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="C parser and AST generator written in Python"
-HOMEPAGE="https://github.com/eliben/pycparser"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="test"
-
-RDEPEND="dev-python/ply[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-pkg_pretend() {
-	if has_version "=dev-python/pycparser-2.16"; then
-		eerror "You have a broken version of dev-python/pycparser installed."
-		eerror "Please remove the broken version before continuing."
-		eerror "eg. emerge --unmerge =dev-python/pycparser-2.16"
-		die "Broken dev-python/pycparser"
-	fi
-}
-
-python_compile() {
-	distutils-r1_python_compile
-	pushd "${BUILD_DIR}/lib/pycparser" > /dev/null || die
-	"${PYTHON}" _build_tables.py || die
-	popd > /dev/null || die
-}
-
-python_test() {
-	nosetests || die
-}
diff --git a/dev-python/pycparser/pycparser-2.18-r1.ebuild b/dev-python/pycparser/pycparser-2.18-r1.ebuild
index 84a6436fe58e..1c9fd1b22957 100644
--- a/dev-python/pycparser/pycparser-2.18-r1.ebuild
+++ b/dev-python/pycparser/pycparser-2.18-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="dev-python/ply:=[${PYTHON_USEDEP}]"
diff --git a/dev-python/pycparser/pycparser-2.19.ebuild b/dev-python/pycparser/pycparser-2.19.ebuild
new file mode 100644
index 000000000000..238e14f63875
--- /dev/null
+++ b/dev-python/pycparser/pycparser-2.19.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="C parser and AST generator written in Python"
+HOMEPAGE="https://github.com/eliben/pycparser"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+RDEPEND="dev-python/ply:=[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	# remove the original files to guarantee their regen
+	rm pycparser/{c_ast,lextab,yacctab}.py || die
+
+	# kill sys.path manipulations to force the tests to use built files
+	sed -i -e '/sys\.path/d' tests/*.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	distutils-r1_python_compile
+
+	# note: tables built by py3.5+ are incompatible with older versions
+	# because of 100 group limit of 're' module -- just generate them
+	# separately optimized for each target instead
+	pushd "${BUILD_DIR}"/lib/pycparser > /dev/null || die
+	"${PYTHON}" _build_tables.py || die
+	popd > /dev/null || die
+}
+
+python_test() {
+	# change workdir to avoid '.' import
+	nosetests -v -w tests || die
+}
diff --git a/dev-python/pycryptodome/Manifest b/dev-python/pycryptodome/Manifest
index 73635d3218c0..e18e19e1f406 100644
--- a/dev-python/pycryptodome/Manifest
+++ b/dev-python/pycryptodome/Manifest
@@ -3,5 +3,5 @@ DIST pycryptodome-3.4.7.tar.gz 6483140 BLAKE2B 02368e2af0a12686cf2e635cca8e2c279
 DIST pycryptodome-3.6.6.tar.gz 7137656 BLAKE2B 72a3dffa22ca4a90a6515ce0bb6939d4c11aab31793ca330523feb08f6529cbfdf3dee01b1caa4577caed1818c0227961e7f25d855b2dcfb09757beb3e0790b4 SHA512 ce03d9940c23ce59e19bcd795c300dbddeddd49756a4bfcc6933da66dfb8b7bedb8d6eaa2b01727c53e72c8e84dfcab2961d1580a188afa9c9451bd2099bdc61
 EBUILD pycryptodome-3.4.6.ebuild 813 BLAKE2B 9bcc6e760294c9490cae798015a72991d2bd39a03bae1e434ee72d82ffa77a8f5288fb711bb75b60cef4cd6c0d39224ee37decab7ea8e96235a45d1ca4055f3c SHA512 e6f54194e8da50181526bbf473f217be46c752b5be3cfc89067bcd2700eb99b0b2a2aaa88300cebe90da69c85e137ab637b7043539ae493d132aae5833e06e78
 EBUILD pycryptodome-3.4.7.ebuild 875 BLAKE2B 217bf82415263f799645a93984b525333798082cbca642260b31ce6ca60c2e16d7a2eaf786fce49d8c605828b1f4c71a09e61b17080aaa8e080bee0465c25097 SHA512 faaac2ec5382a1021dd427092146456e5ed45cba08e3ade94293de8fa44b3665ad2cb91be7ff8934378fd0df3bd930b2c6c2486eb9ac898d40786c5e3783eb0c
-EBUILD pycryptodome-3.6.6.ebuild 918 BLAKE2B 8e8738c09835e83d6da57c46b33256f2882123f5873864e39bbe6db981101bbc1874cf27313f74d4efd3dc02218312cdc54319bc3bb153dff0aa19e306f43ac0 SHA512 d742c1c1e7970b8ddb35c7636cdd2cad9beaee0af5180aa8d7d5136485ac56408901b99b37e1ccb43785735d98ce6f18de23f808a2912bbddc747cf6802d4a5e
+EBUILD pycryptodome-3.6.6.ebuild 906 BLAKE2B d38a2b6d2411087cfd639080e46ce912ac55d9f509308a603d607ca47de09fc693a1bb52b6106309538d5ff31f162c18535636cf034ad398263d39652ea01f0d SHA512 9486672950a8284ea1c5ea4c134880a7a3708a261e5875f6b99a50d9a3a80aacbfb2b280257d9a1d401263c70babe12c28717fb40f121c5afb84f030397b864d
 MISC metadata.xml 334 BLAKE2B dd22c5da46085356e8049d290266f66f81a648683dacb4ad33faedb86b890c911047f245eb96b418cbde226b91bd91567036ab31919ae28e488c5eb993418c1b SHA512 f314a41851c5f31d68a7fb93ab304aab44007756472c9f18c746a0b0a7bbf464a9f196559f4ecf6f8b68b265b7ba9ef571398e1893d316b48a0fa435eb7a1b3a
diff --git a/dev-python/pycryptodome/pycryptodome-3.6.6.ebuild b/dev-python/pycryptodome/pycryptodome-3.6.6.ebuild
index b41051157c7c..09af73905e8d 100644
--- a/dev-python/pycryptodome/pycryptodome-3.6.6.ebuild
+++ b/dev-python/pycryptodome/pycryptodome-3.6.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2 Unlicense"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="dev-libs/gmp:0
diff --git a/dev-python/pyftpdlib/Manifest b/dev-python/pyftpdlib/Manifest
index 5c126b99dff1..dc9e8db5eaa1 100644
--- a/dev-python/pyftpdlib/Manifest
+++ b/dev-python/pyftpdlib/Manifest
@@ -3,5 +3,5 @@ DIST pyftpdlib-1.5.3.tar.gz 183189 BLAKE2B dd563f59ff21b2059e1c6d6ac6015561d5e0d
 DIST pyftpdlib-1.5.4.tar.gz 184986 BLAKE2B 6973b1f7e0fc0c89eb5d79e082690a706b56553ad4b2ece68a8216bb99c185d770475e349402ec71baf1bb06e5ecca5be2a3c52512f0d8283c4cc249bc28a949 SHA512 6eb308021dad28c1c51a88b366947a71b7bc1802571dc14cedf3a264bd0cb8504ef990d7e3110d10709f971d4d5b0001bee859b58fb4d02a1b0d46532acc9295
 EBUILD pyftpdlib-1.5.1.ebuild 1298 BLAKE2B 2b6ff8c9de74fc7e94720c6deecc32ac2303674f80230b7b2823f43c84755153f69d6c3254264a5b1f41ead167227b71fabca1341549765b045679686d9df1f8 SHA512 5c44d3dcb62a9b72e4773bb5eef46b69576924367db85de5a73977f187d0cf5c8023c0756b913dcc238d6e3ba16f62a06355fd74463bfbe716a900aa3eb86468
 EBUILD pyftpdlib-1.5.3.ebuild 1556 BLAKE2B 06acd30f37ed3409d5919bdb11cd0b85a38714ccc2c1cf87ec9af1565f848a80f7fe0bba91529b0719a19303073c75fd855e48e66ba46bc8eb704599225f9cd1 SHA512 dcc8187355c079c8d6f6e9ba485b2b07a4f1f0e0f6ff8bb22e0932d953b55b7c01f2dfde5f815dc868fe8e826c163a72d2c300d9cbb0c1aa48b39cc175a399d2
-EBUILD pyftpdlib-1.5.4.ebuild 2535 BLAKE2B 8e3a98907e1804a0c375dae0f7e14506a96b4e53e70c6fe593d123b1c9621ce5500401c3c4bc731d1cefb56391ed58cfbd4e931191fced6e26c87a9d8b549a92 SHA512 88ea8052ba73bba8b4368d7c050d285f8baa69a2fbfc4117033f5707ca64cb22e1879efd7ce3ff7934cb597e7d55ee1d50fd3f19030b448125c977bfb1fec7fb
+EBUILD pyftpdlib-1.5.4.ebuild 2534 BLAKE2B c9a4c4af1f93785f783aac18c7aa6ebbc5863b4abbe73b598b10e445071c5e06f28e6a3acdd950238cb1014fabc5fe8f8c9250018bc978412843bfd5ce337601 SHA512 bd4c8b4ed194bde8aea8252adfb1c713832e307776e7ccdc08ac5af825d0083e3862f5c30d4a19854bf83364389ff4a06f3cc85cb00f7c9714be39831b2d7489
 MISC metadata.xml 438 BLAKE2B 0e0860eb9d885ec9b432b504bef6a9394cf4a2d6d99751c80fec8441d8910f8a17364e5f32782638ac689abf5cdd3ebcb5fa20e7da3d612a5e8844e8c8a34d76 SHA512 a748827370b53c94fed352cd6bbd7468a22c7ca2f15c4601c98a2689e3a7e652ed28434bcd125fe0f3018d5508600df03130c18d7d67834b28ac0c3480b16345
diff --git a/dev-python/pyftpdlib/pyftpdlib-1.5.4.ebuild b/dev-python/pyftpdlib/pyftpdlib-1.5.4.ebuild
index d5f27bb0cb00..a570f1156c63 100644
--- a/dev-python/pyftpdlib/pyftpdlib-1.5.4.ebuild
+++ b/dev-python/pyftpdlib/pyftpdlib-1.5.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
 IUSE="doc examples ssl test"
 
 RDEPEND="
diff --git a/dev-python/pygments/Manifest b/dev-python/pygments/Manifest
index efc4fb506694..c460f71d859d 100644
--- a/dev-python/pygments/Manifest
+++ b/dev-python/pygments/Manifest
@@ -1,6 +1,8 @@
 AUX pygments-2.2.0-pep479.patch 1669 BLAKE2B c39e582d85d5903831749ccf563b13a88f623ebe7279205465bba16640fb85df1d1f9d15020d7e19b9d0ca8fb409426dbcfec4729e8d1b16d90e9c075f674c25 SHA512 e6195c6f0c0fb0ba725621ad564e85e69db31a3e2e903279512d0af06db32d7fee1284ddd0db00c80312c29a19f345325a7353bc5fc2e1f0bc64f8c32f71d918
 AUX pygments-2.2.0-sphinx17.patch 645 BLAKE2B 07601a0e952d6e5f978d111a273bfe8c6fa6489e23acad4f61beb535e37aff1e3182a5317ab4e424a1b632924bb3c1b3562aefda17b638aa5a367d861f164c64 SHA512 937ce1168ab488387918220995f1f32e4664a505af3b6610143af15b6cfd3bab1d1fa4a0dc54c59db2ce0775edcc762f70ff948f8bd4e3bbeceb14774d30f287
 DIST Pygments-2.2.0.tar.gz 2113944 BLAKE2B 58d5f2fa0e6d97f5b7d7a17314b82ef219f23b72f8da49b4f8ce9b892d54ffbc1b490e87e87efe8d727dab297f775d0d8abfc4a31a734c5a7f8df885e5eda82f SHA512 cc0a4f73e19fa6cbf46314de2e809460c807c631e39ba05cbe5edb5f40db1a687aafcd9715585a0ed45f791710eb6038305e273f282f8682df76f30e63710b29
+DIST Pygments-2.3.1.tar.gz 3124216 BLAKE2B 99a5f96a2d2f9deb1a6b6ad94a21ab7f517cde47b1e91b67ce594732004cf99db51b1240e0270473f87f5d8a435172545b9fa3449a2ddc113faf5aaef6c34f73 SHA512 2c36cb42f8dd62e04b7664b5e87f951a8428ccbb6dbe5b5b43d8c7e6923ada0ab55a231bb8e9ed79eb5a85344ed64d3acc8e7bc991ab1f49c58eb612b8002c1e
 EBUILD pygments-2.2.0-r1.ebuild 1619 BLAKE2B 0ce67e1c2184243e27e0af9500334a8bbc672a5820d1095c45a18759009c39611de47900787455889e70bedc2d77aff36d75ea0f27ec9680559c3c004c8f0e74 SHA512 eed66e18d882fdb5ee5120d825e4dea785bd1bdcdce6da2b9a4c6031366bc5279c37cb882337f0c1a8ea7cb7bc8f1813f8ad62baba14b3694061d5c59d3ed401
 EBUILD pygments-2.2.0.ebuild 1773 BLAKE2B 4994e4e0f2e0f98e2900ce3d2e39f9b14f82d1b357fa4a530f59ffc4b73d744288d3d7a55cacbfb58248f5fe754d0840b0bc82c2ab6138bfa540c78383cbca6a SHA512 58ed43530ae8ce8da04a04a7d38a09b1ec43fb0237eef446a6050ab480a584ae0c4805fab8dbe24694469372426358c434941117a0eed33d49e773b306161e5d
+EBUILD pygments-2.3.1.ebuild 1437 BLAKE2B 0841c758f4df7614e7ac616bb490bc953444098957a347da7cfd5d99717ef1fe33a2f2112ccfca7666ee2e67f3ccc1850e47b76cc2e1e307582385149cdc7913 SHA512 0ecc078426fc5f24a2302239e23fea8c9ef2a1dc66317717cd7204ef5f1634c0e32f816f08605577c4fdf9ba6c1272e89d85380b5a105997ae414b13cf1cc573
 MISC metadata.xml 542 BLAKE2B 88e44c4b6f29e096e67521c621724d1a5415d089f73612fb8d02ee714a4af1e8080cf98542d7f0c9b1331d919bbeba31b1fa8269a28cc1be841af069a497d889 SHA512 f15732bb743ed5ad4049036c7b87118c89be09e260ae483b4c7e25155a31c0ab8844f8a1050386a0ee81d2b1e55d240f90cab3e28749b8f943baf64ec176814b
diff --git a/dev-python/pygments/pygments-2.3.1.ebuild b/dev-python/pygments/pygments-2.3.1.ebuild
new file mode 100644
index 000000000000..7d246ca5ef77
--- /dev/null
+++ b/dev-python/pygments/pygments-2.3.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy pypy3 )
+
+inherit distutils-r1 bash-completion-r1
+
+MY_PN="Pygments"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Pygments is a syntax highlighting package written in Python"
+HOMEPAGE="http://pygments.org/ https://pypi.org/project/Pygments/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc test"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		virtual/ttf-fonts
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	cp -r -l tests "${BUILD_DIR}"/ || die
+	# With pypy3 there is 1 error out of 1556 tests when run as is and
+	# (SKIP=8, errors=1, failures=1) when run with 2to3; meh
+	nosetests --verbosity=3 -w "${BUILD_DIR}"/tests \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+
+	distutils-r1_python_install_all
+	newbashcomp external/pygments.bashcomp pygmentize
+}
diff --git a/dev-python/pygobject/Manifest b/dev-python/pygobject/Manifest
index 55d5a2ad11f3..6cbe20d10a15 100644
--- a/dev-python/pygobject/Manifest
+++ b/dev-python/pygobject/Manifest
@@ -15,5 +15,6 @@ EBUILD pygobject-2.28.6-r55.ebuild 3541 BLAKE2B 7d20bfad727c2f1e56b28a2d01ac354c
 EBUILD pygobject-3.22.0.ebuild 2940 BLAKE2B 3a5281e9483d976dec0854b885695e6b612782a4f0c1766ce416b0d1ea8d0c27b00853e71d9ae87c7c96d4ee82f94e3d9c657932f1f87231b3768f5a1c9e28f9 SHA512 999d60141ed662a29b0a8f28c57b4bf3e2dbb2770cb82d573553ab18cc7e45587989b99d740bcba4908724f9c2095fc8665b3a24c1bc1185a20b334cb431bf48
 EBUILD pygobject-3.24.1-r1.ebuild 3196 BLAKE2B 187c3a69ac96ced30663fb25db5fdf85ecdf4ca0b52a6c5d8f7a18658ae682ebf685b3aeba79e2ef6521d1aa884ce08dbef617149ce66171939a1c53e45cee12 SHA512 89aa2f4264c9494441288e8be4757bdcc93c8056782af1bca77b4083ee11806a41f0600c398159d49df3ff889c7a50a8e5310727098ce0c4a2590ec59ed99bcc
 EBUILD pygobject-3.24.1.ebuild 3130 BLAKE2B 9c911260ffb68368a769c15bb64fc13e7c668797496742f2a5083f30f0733257cc2f5aa163a65dc1e6cc4302400b72d49a2ea8893111784823ba70a3b4087313 SHA512 0e4a7dec040586acf2163fdf8a9c5c3814679978c92da8cf6984ab37c2c5810743d18eac0d6589edbdc86afcddfd63aff47c4b718c8fd18fadd60d7626c16bed
-EBUILD pygobject-3.28.3.ebuild 2731 BLAKE2B f6a57080bad07296dcd0c112f4eed7b662b558d97c82861c62de9e14e4463b0eec4568f480514cfd4f725693a789837eeeb8451652977d6f90b96cfdf3a7ff89 SHA512 9b9b18498bd2ea8823b449b8650dcb1ae0bb755e3ab59be0d7b88c8b5c6f6653fb80cae8826356c9d6d70ae5394deee17f5240e606a14d7c877c37c21a643aa5
-MISC metadata.xml 353 BLAKE2B 20a18942138d7ceab468b01a639f92248bf94f0e6a015a0c6c34872cf60ab56ef91d9b36eebc74b3d3133ecbc6cfbf2aedbc24369165d0fe9a4e832394beb022 SHA512 abcb7bb015ebb246584f60f388837ed0638040f730111831b52716cbc5a9c4ab0c422397702e1d87e56b2947108d5cfa5aeac7489bcd6f89db480c68c572bcdc
+EBUILD pygobject-3.28.3-r1.ebuild 2810 BLAKE2B 6f26b9498fef402192c97b90a5e6116800952029cfa1935d4b7dc62ef7338d925d4b53de17f891dd9e1dc792bf4cc60c0c1d14ddd05c4e755d8ea87437ab5f3f SHA512 b91c5bc78371ebffa96889507012238d33983c65f5d874cdca43a176fd3c70c826d601cee4d6b7ccf293fbad3a95db94c3f5f733db51e96933a4ea56660a9854
+EBUILD pygobject-3.28.3.ebuild 2787 BLAKE2B b329ec23d35c653ac71c70930d1605acf7b04e870000e19be41abc1ec0b89829d5be7e44704f3b55fd19ba62fb0fb42f98eb0ae850c9f33868c3d7fb0cb47d85 SHA512 cd6892a6e7192a021097904e97335acdbccf73b652645c04c930ceafe1886ff2f1e2cc8137308ae0b0305645a7c3560ec2d386ce8262505fd7ae21e7af1c5e47
+MISC metadata.xml 1220 BLAKE2B 4f2d4f1091eef503e2ca7457418888071d70509e346ded7c5e77839c8e5e6dd1c27957e6645a7f32bc7ba0810aff8a55874e7225f7a9e7674e4c1bfccee2ce1d SHA512 991d11e7aba9fc7d6ccd6971a150d50ebcd397968a9a2c2c901093f598acfa70eb8719a3a590c10433147fde97603012862fe1fc613f766ccaa2a159705a6ae6
diff --git a/dev-python/pygobject/metadata.xml b/dev-python/pygobject/metadata.xml
index 08a5bd43f9b9..a958cbef81b9 100644
--- a/dev-python/pygobject/metadata.xml
+++ b/dev-python/pygobject/metadata.xml
@@ -5,8 +5,22 @@
 		<email>gnome@gentoo.org</email>
 		<name>Gentoo GNOME Desktop</name>
 	</maintainer>
-<maintainer type="project">
+	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<longdescription lang="en">
+		GObject is a object system used by GTK+, GStreamer and other libraries.
+		PyGObject provides a convenient wrapper for use in Python programs when
+		accessing GObject libraries. Like the GObject library itself PyGObject
+		is licensed under the GNU LGPL, so is suitable for use in both free
+		software and proprietary applications. It is already in use in many
+		applications ranging from small single purpose scripts up to large full
+		featured applications. PyGObject now dynamically accesses any GObject
+		libraries that uses GObject Introspection. It replaces the need for
+		separate modules such as PyGTK, GIO and python-gnome to build a full
+		GNOME 3.0 application. Once new functionality is added to gobject
+		library it is instantly available as a Python API without the need for
+		intermediate Python glue.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-python/pygobject/pygobject-3.28.3-r1.ebuild b/dev-python/pygobject/pygobject-3.28.3-r1.ebuild
new file mode 100644
index 000000000000..821b3393db02
--- /dev/null
+++ b/dev-python/pygobject/pygobject-3.28.3-r1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+
+inherit eutils gnome2 python-r1 virtualx
+
+DESCRIPTION="GLib's GObject library bindings for Python"
+HOMEPAGE="https://wiki.gnome.org/Projects/PyGObject"
+
+LICENSE="LGPL-2.1+"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="+cairo examples test"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	test? ( cairo )
+"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=dev-libs/glib-2.38:2
+	>=dev-libs/gobject-introspection-1.46.0:=
+	virtual/libffi:=
+	cairo? (
+		>=dev-python/pycairo-1.11.1[${PYTHON_USEDEP}]
+		x11-libs/cairo )
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	cairo? ( x11-libs/cairo[glib] )
+	test? (
+		dev-libs/atk[introspection]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		media-fonts/font-cursor-misc
+		media-fonts/font-misc-misc
+		x11-libs/cairo[glib]
+		x11-libs/gdk-pixbuf:2[introspection,jpeg]
+		x11-libs/gtk+:3[introspection]
+		x11-libs/pango[introspection]
+		python_targets_python2_7? ( dev-python/pyflakes[$(python_gen_usedep python2_7)] ) )
+"
+# autoconf-archive required by eautoreconf
+
+# We now disable introspection support in slot 2 per upstream recommendation
+# (see https://bugzilla.gnome.org/show_bug.cgi?id=642048#c9); however,
+# older versions of slot 2 installed their own site-packages/gi, and
+# slot 3 will collide with them.
+RDEPEND="${COMMON_DEPEND}
+	!<dev-python/pygtk-2.13
+	!<dev-python/pygobject-2.28.6-r50:2[introspection]
+"
+
+src_prepare() {
+	gnome2_src_prepare
+	python_copy_sources
+}
+
+src_configure() {
+	# Hard-enable libffi support since both gobject-introspection and
+	# glib-2.29.x rdepend on it anyway
+	# docs disabled by upstream default since they are very out of date
+	configuring() {
+		gnome2_src_configure \
+			$(use_enable cairo)
+
+		# Pyflakes tests work only in python2, bug #516744
+		if use test && [[ ${EPYTHON} != python2.7 ]]; then
+			sed -e 's/if type pyflakes/if false/' \
+				-i Makefile || die "sed failed"
+		fi
+	}
+
+	python_foreach_impl run_in_build_dir configuring
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir gnome2_src_compile
+}
+
+src_test() {
+	local -x GIO_USE_VFS="local" # prevents odd issues with deleting ${T}/.gvfs
+	local -x GIO_USE_VOLUME_MONITOR="unix" # prevent udisks-related failures in chroots, bug #449484
+	local -x SKIP_PEP8="yes"
+
+	testing() {
+		local -x XDG_CACHE_HOME="${T}/${EPYTHON}"
+		emake -C "${BUILD_DIR}" check || die "emake check failed"
+	}
+	virtx python_foreach_impl testing
+}
+
+src_install() {
+	python_foreach_impl run_in_build_dir gnome2_src_install
+
+	use examples && dodoc -r examples
+}
diff --git a/dev-python/pygobject/pygobject-3.28.3.ebuild b/dev-python/pygobject/pygobject-3.28.3.ebuild
index 59a56b471d05..0f2cc5f94693 100644
--- a/dev-python/pygobject/pygobject-3.28.3.ebuild
+++ b/dev-python/pygobject/pygobject-3.28.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/PyGObject"
 
 LICENSE="LGPL-2.1+"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cairo examples test"
 
 REQUIRED_USE="
@@ -33,6 +33,7 @@ DEPEND="${COMMON_DEPEND}
 	cairo? ( x11-libs/cairo[glib] )
 	test? (
 		dev-libs/atk[introspection]
+		dev-python/pytest[${PYTHON_USEDEP}]
 		media-fonts/font-cursor-misc
 		media-fonts/font-misc-misc
 		x11-libs/cairo[glib]
@@ -86,7 +87,7 @@ src_test() {
 
 	testing() {
 		local -x XDG_CACHE_HOME="${T}/${EPYTHON}"
-		emake -C "${BUILD_DIR}" check
+		emake -C "${BUILD_DIR}" check || die "emake check failed"
 	}
 	virtx python_foreach_impl testing
 }
diff --git a/dev-python/pygoocanvas/Manifest b/dev-python/pygoocanvas/Manifest
deleted file mode 100644
index 09ea01e4726c..000000000000
--- a/dev-python/pygoocanvas/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pygoocanvas-0.14.1.tar.bz2 331136 BLAKE2B 52e764884d41371fa2482a8e932198a89d0563af0a1e946a69e1fbf4dc4bc2ee84e9be7c7e38144b341aeccdafeadfdda3f5fbb41874e1559f611bee7a789e4d SHA512 cd8175eb51358236b6488d01706d719abfdd0f3d00568e7563b2a1d7edc01f3d77b1ef23b7c062ab4a78d46d5f542c483fc883a81d2f31ce9be2b6a7385c2d22
-EBUILD pygoocanvas-0.14.1-r1.ebuild 1533 BLAKE2B fa3442de5894e7c588c16a73d55fbf6407e203be4dde7cb7becb43d9765c80405a781c2973fd7c428d4991d6148d63d2bf413d6735af2c58eb181959f0152436 SHA512 d2bdf4f0bdd579a643f2deb42a7a8f75536217caf77b35892f4e88401cd35badd318a4f0f5bd8c300f2e0df9bc1cd0df8d464d0b97ee0c7004350d18cc5e5ec0
-MISC metadata.xml 353 BLAKE2B 20a18942138d7ceab468b01a639f92248bf94f0e6a015a0c6c34872cf60ab56ef91d9b36eebc74b3d3133ecbc6cfbf2aedbc24369165d0fe9a4e832394beb022 SHA512 abcb7bb015ebb246584f60f388837ed0638040f730111831b52716cbc5a9c4ab0c422397702e1d87e56b2947108d5cfa5aeac7489bcd6f89db480c68c572bcdc
diff --git a/dev-python/pygoocanvas/pygoocanvas-0.14.1-r1.ebuild b/dev-python/pygoocanvas/pygoocanvas-0.14.1-r1.ebuild
deleted file mode 100644
index 6f7b0f599aa2..000000000000
--- a/dev-python/pygoocanvas/pygoocanvas-0.14.1-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-GNOME_TARBALL_SUFFIX="bz2"
-PYTHON_COMPAT=(python2_7 )
-
-inherit gnome2 python-r1
-
-DESCRIPTION="GooCanvas python bindings"
-HOMEPAGE="https://wiki.gnome.org/Projects/PyGoocanvas"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86"
-IUSE="doc examples"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-python/pygobject-2.11.3:2[${PYTHON_USEDEP}]
-	>=dev-python/pygtk-2.10.4:2[${PYTHON_USEDEP}]
-	>=dev-python/pycairo-1.8.4[${PYTHON_USEDEP}]
-	>=x11-libs/goocanvas-0.14:0
-"
-DEPEND="${RDEPEND}
-	doc? ( >=dev-util/gtk-doc-1.4 )
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	prepare_binding() {
-		mkdir -p "${BUILD_DIR}" || die
-	}
-	python_foreach_impl prepare_binding
-}
-
-src_configure() {
-	# docs installs gtk-doc and xsltproc is not actually used
-	configure_binding() {
-		ECONF_SOURCE="${S}" gnome2_src_configure \
-			$(use_enable doc docs) \
-			XSLTPROC=$(type -P true)
-	}
-	python_foreach_impl run_in_build_dir configure_binding
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir gnome2_src_compile
-}
-
-src_test() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	python_foreach_impl run_in_build_dir gnome2_src_install
-
-	dodoc AUTHORS ChangeLog* NEWS
-
-	if use examples; then
-		rm demo/Makefile* || die
-		cp -R demo "${D}"/usr/share/doc/${PF} || die
-	fi
-}
-
-run_in_build_dir() {
-	pushd "${BUILD_DIR}" > /dev/null || die
-	"$@"
-	popd > /dev/null
-}
diff --git a/dev-python/pyhamcrest/Manifest b/dev-python/pyhamcrest/Manifest
index b6787daf8393..86cacec5b413 100644
--- a/dev-python/pyhamcrest/Manifest
+++ b/dev-python/pyhamcrest/Manifest
@@ -1,5 +1,5 @@
 DIST PyHamcrest-1.9.0.gh.tar.gz 57650 BLAKE2B c497688f03ec3b072d8ab076fc096a442d5cbbd94493eae57779879ccb6f281477aeeb7f7a67e539442010e60194f9f04a6deddd1d2267e9743742b45433f124 SHA512 3a878637ed5138365416c170871a63640f089047b723c7ec8db893dd716c0b1cdad16a98584700405693b954af7d4868a8543d1a3fc58ded22b493c8c61661b4
 DIST PyHamcrest-1.9.0.tar.gz 376623 BLAKE2B 808c74aa4dff89467c126cbc0e18029a9504cb27bbf03662a90666f85c76d7d7617260f50d35acde3a8e9e437b846589423cbb3697f8ceb86d0b5b838c586ebd SHA512 3b8393d0079b619b208ec7f06ed5133c4ff9d9dba050f818adf56347fc2225fd1c85d60f3dc262b7b9722061f0b8e4966180b6b96245a371e578d0d51633b4b0
-EBUILD pyhamcrest-1.9.0-r1.ebuild 1305 BLAKE2B f0e3442a34033acc4269fd99f31c30970562a1be310ddeec79100b3b98e02201034c5007a14cf933c62402491bc7b52e70f86bd6f1a1d3dbfb304796ae00d6e6 SHA512 951545d5bba89d4a64620bc06346427643575ca0985d48d5594343be19e2383bb3bb391b3ffd303b39cf96128428ec19dbfb9d74a7fecfac93c05df3fc011b22
+EBUILD pyhamcrest-1.9.0-r1.ebuild 1307 BLAKE2B 7e568f0b5a42d88b10922fcd5055067dae98139216accc5113b7788d890b08517abba9bd2c79c81aa4918e57696f5c359eca834db7dd6bd6a138eaa7672443e8 SHA512 21a14c5c4b9ab28cd4e0dfc6e6f5eb721ddedaf8251a55bae720edf8a6bf43c0d8c02fa3c62cc77a842a037a1d689c4136c739052c5f9ab5487334251fad8e4a
 EBUILD pyhamcrest-1.9.0.ebuild 1227 BLAKE2B 173ad0e42c44e083043203c40435865697bf5222e7bd4fe907db296fbea627aa06de8a99dd8842f259073ecedbd902a4bc7c9eaf7b74540e1afe53d85832612d SHA512 4bca028ef12f224a122978f6ca9ed259306b7817f5f6182cd462d366b944458bf2657ff7a25f2993582d69cd9e5780004b65702062c2f6cbe429f6c39eefb81d
 MISC metadata.xml 271 BLAKE2B c9035b9fb7a0fca1355aeda317feceecac5790bb6723360063b236d6633a040a594eea8f304c3b5bc8e918b1781f0e5e887ec15225d51a021592391195b7e8ff SHA512 89f447b79dadbb441c4c51527f486fcf7110b67c0a86c9fe6413c563463be57089faa1ddb36701080c368ff0a8442532bc774602e0120cd5466a4d7fb6bb6e0d
diff --git a/dev-python/pyhamcrest/pyhamcrest-1.9.0-r1.ebuild b/dev-python/pyhamcrest/pyhamcrest-1.9.0-r1.ebuild
index 772b9f693b9e..c376b449460c 100644
--- a/dev-python/pyhamcrest/pyhamcrest-1.9.0-r1.ebuild
+++ b/dev-python/pyhamcrest/pyhamcrest-1.9.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/hamcrest/PyHamcrest/archive/V${PV}.tar.gz -> ${MY_PN
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~amd64-fbsd"
+KEYWORDS="~amd64 ~arm ~amd64-fbsd"
 IUSE="doc examples test"
 
 RDEPEND=">=dev-python/six-1.4[${PYTHON_USEDEP}]"
diff --git a/dev-python/pyldap/Manifest b/dev-python/pyldap/Manifest
index 90a5fe99233c..a1ee5459ce2d 100644
--- a/dev-python/pyldap/Manifest
+++ b/dev-python/pyldap/Manifest
@@ -1,3 +1,3 @@
 DIST pyldap-2.4.37.tar.gz 303732 BLAKE2B a3b54b172701c2e52a9bd54745d442634b8df2f4aab134d37bf5dbc383498fbec876e12c1c703db6caeac0ce3b4bccd974b0680356e5996e327c8ac2ce52ac4c SHA512 da66669bf9eecebc8ba05ee313453b151a01147bc44c60da4936b80777ec3b69551f77be0e6f3c260dba771920d50fa6f54f1892eb0283761beed1ee8c6d83c2
 EBUILD pyldap-2.4.37.ebuild 2337 BLAKE2B f72cdcae117c80a6dd819004bbd4dd363a2600e6005d23a696837d44f72aa429a475ea649a940e2bc8a918195b47dbc922b0e187b74cad86d8a9dd0580229743 SHA512 ce89ee48d7ce81bac12c5263ad407c560b681189c66ff0c95543041a1da549fc68f237df9ac35018674bc1a72e00bee6c5bbb75c19a12bf1cca8a68eb5cc9b26
-MISC metadata.xml 529 BLAKE2B 728228ca81c7f5cadb6d98316d4bfbfacdbc4dd85c452d458fa7a939562c9739f3db02c676b09851b97fdb415a0d5273986d1a518c76edef5ab14a6c1fce0694 SHA512 47560d8da0a2c956d1004cb8dff9371937980c013ccb23038faeb421d859b6fa943cd17c751a277afe6df22b8342550b06a4504a52bfc4b24881d7fa05eedb99
+MISC metadata.xml 367 BLAKE2B 4628dd26b49a9b739fd8eba8ead6ab2d6a019d21de4180d6b718dbbd919d0ba2020d3cc3b3ea75aecf856d994f61876aa2bab5ce126ffdc4f370d4b38637398c SHA512 8f9645c0a00f73a99d54682f17b0a1c0e462d89164ec9975c6b912ebdceaa07139d37ef68b89c4428792b2034ee6bc36df87cd91674d8c31b1f8571d81534258
diff --git a/dev-python/pyldap/metadata.xml b/dev-python/pyldap/metadata.xml
index 6879e4d2de95..618e58e65d8a 100644
--- a/dev-python/pyldap/metadata.xml
+++ b/dev-python/pyldap/metadata.xml
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@gentoo.org</email>
-		<name>Michael Weber</name>
-		<description>Upstream of the python3 port</description>
-	</maintainer>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
diff --git a/dev-python/pynacl/Manifest b/dev-python/pynacl/Manifest
index ab07da7388e2..496c64c119fa 100644
--- a/dev-python/pynacl/Manifest
+++ b/dev-python/pynacl/Manifest
@@ -3,5 +3,5 @@ DIST pynacl-1.2.0.tar.gz 3301645 BLAKE2B 7309409d7913bf1dee690a6fba5dd490de7a5cd
 DIST pynacl-1.2.1.tar.gz 3302051 BLAKE2B 96278368427c2b5f1d9508a5d9a36853a9c50390ee3ada20d6344e4f7f67fb3f1285c45794b863f129b48feff8a5a3d4a20796f69e832cec2aef26f27961d925 SHA512 15a3a84fed4d002072c185ca346c708ed0fb397ca3a8d0144caced635cc2e00e19603767cf9fcedc571cb4bf32c546141094ce44536dd117c3775efb2fc589b9
 EBUILD pynacl-1.1.2.ebuild 865 BLAKE2B 7f1f6c7a037719c5e94cd46eaf9c32c2949b64f3371af5a2254da8dacdd0633bfb5d0a8fe0f8f131214499d186510f48c89ffd6c9c395ea839d47825477409cc SHA512 57a53e92e4d562a826f8dafbc9691f92beca1aa6c112eec0519dafd46efb51962c0214b7733240aef2657f612d2fd3cd1129fc0c3efc7fb82838e06f4822d523
 EBUILD pynacl-1.2.0.ebuild 861 BLAKE2B 50369302f5b01db8e932ae94c6e41fce814b3c446910fde9aed2ba92e067d10e642cbddfe2e55b79311308b5dc71f98123a5e5926de18a2336b1632226b786cb SHA512 65695f94648eaafb6c163f3f10e221a0c7e1523dba6a15ca831f2387952d13a7b17327840ea2af7283b9ce1d13b2bd9512e72b1bc942d4885b93061c4f204d32
-EBUILD pynacl-1.2.1.ebuild 997 BLAKE2B b822a825777de270c614f7471e0f7b2537bbaa015f4538d05a0bce46df1e3944f579f54757248b28b44da02ced4b8c2d940465b0fe4789c19eb6f033b122cc4f SHA512 507fc63e985327227c0a53200eef0e1c6150c7706de6731792a52cff7525fd5d1aaf90011c6f2b2e428b9ffb8c68db853c65472769a5f15b88116e003738ae30
+EBUILD pynacl-1.2.1.ebuild 1002 BLAKE2B 2a910ae88b47dc07ae005ab37f57b76ac102a84db9397c4bd8035bed3bce9c71c7944db0651f46b170c1be4a64e6aed381a7bb07bd233ba09427acd9ca0aa284 SHA512 896ff776353d7212454d3b31402f2288ff12fd6c6c86ec3b12dda2b741bb431599d3e7a36de11b3bb0090b2f6af7607d8bf56a99eca3e591cfb63478be7ebfbf
 MISC metadata.xml 831 BLAKE2B 39b921264053f9a7f18d9313daf7f3ef6e560eae777917098d8df976e3b9aede850f5073c190a9668440a487f7ac8fe2b6c1535271bb028596da0f3657ee0292 SHA512 8ae9c64a9477e03a593f40e4b5e3fe42adf2e80ab071b63be273c4cb548fef79f5e80ffcdb88786a6703dd28b8254ddd53428854419b669ca71322f7be775e27
diff --git a/dev-python/pynacl/pynacl-1.2.1.ebuild b/dev-python/pynacl/pynacl-1.2.1.ebuild
index 7fadfbf0c8fd..2dd9543d87d9 100644
--- a/dev-python/pynacl/pynacl-1.2.1.ebuild
+++ b/dev-python/pynacl/pynacl-1.2.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pyca/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~s390 x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-fbsd"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pyopengl_accelerate/Manifest b/dev-python/pyopengl_accelerate/Manifest
index 1047ee59d412..61c693d197a6 100644
--- a/dev-python/pyopengl_accelerate/Manifest
+++ b/dev-python/pyopengl_accelerate/Manifest
@@ -1,3 +1,3 @@
 DIST PyOpenGL-accelerate-3.1.0.tar.gz 323541 BLAKE2B 01a13b0ce6d35896c05f3e5c7b485f20bf9867ebd2c81f1ece50dbfbc1ecfad1c10b35276fa830d932bc7ecbac059fe8376e3789e5c10b678963219a577a993e SHA512 2ba2f56b02a83225e42b80962b5ae6d4077387f88a4261e21c96b0bf66814922eaed8b6065e0127e819bde9d5d2f6b609100e32c589a1c17bdb4fa8b670dca61
 EBUILD pyopengl_accelerate-3.1.0.ebuild 635 BLAKE2B 0f6f827a1ad3bfaab575959ec9c980637f88932ab1eae5aefa742dafd9685a79669d0770d6a654c78a83a1c5f6bfb87963d22e8807ed617d3608441cef9c7e12 SHA512 519e9fea4598fdb5cbb6c923ec5b0562254a983cffbe8b626ceee03434bf8045b592bcea716d0f6ab971473ceb440953fb3e11103f27ebc45e54c70be0942f06
-MISC metadata.xml 378 BLAKE2B 59a0acf524b2561ff53915351f91ad5f6ddb6e64dedf80495c33813bba95bef6b7bc280c0041f8550156100381e4dacfafea855949fca345218da78f7f0e271b SHA512 0561616de8ec3ed44c6d2f60df4536d0fb0b8ada06c941b8cf718f865417d1afa8e18b18963a0da2c180e709e161725d48d6373e6baae299a5d0be2f2124a604
+MISC metadata.xml 302 BLAKE2B 6554bf56c24bed0cacaf261dc5323e9c84c14e86973aee7cf510973a7e07999f5f0c1c5f595c224dcbb9bcab9d182ab1779afa5b304e116faf240bd9073baa1b SHA512 73ee5965c95e1bf6f45c78ad638b946d36d5a34115aa3307d84e475f5ca86e81a60283d5b50ccad3f32771e94220a06f9b8c85413047560dd99185f2b5ce95ae
diff --git a/dev-python/pyopengl_accelerate/metadata.xml b/dev-python/pyopengl_accelerate/metadata.xml
index 73bae7cf75a7..d6b7485e028b 100644
--- a/dev-python/pyopengl_accelerate/metadata.xml
+++ b/dev-python/pyopengl_accelerate/metadata.xml
@@ -1,10 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@gentoo.org</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="pypi">PyOpenGL-accelerate</remote-id>
 		<remote-id type="sourceforge">pyopengl</remote-id>
diff --git a/dev-python/pyopenssl/Manifest b/dev-python/pyopenssl/Manifest
index 7ebf6168adef..59327bb9729a 100644
--- a/dev-python/pyopenssl/Manifest
+++ b/dev-python/pyopenssl/Manifest
@@ -1,3 +1,3 @@
 DIST pyOpenSSL-17.5.0.tar.gz 170870 BLAKE2B e8b8986a7c5475ac3898df4877a8be86db359af79e1718bad85149440cff543c501ee23eb369270d2c539a9e3f4e13165ea87b858ef6916ee79ca6e49f6e5370 SHA512 f194662b5842f1e3a4fcb910b9f2e6482d1dcdf834f306acc3dd6d9723f65038f7bff550248fa6268d90c839c9d9e8248bb6c7d399495fe6aed25291b93ece86
-EBUILD pyopenssl-17.5.0.ebuild 1670 BLAKE2B f7fa0d89dcc9f7c8f2b657e57d93cd82273cd0a652847ae17c70d2714cc2f17e6a5df3ccfdc5c3222e5750c417418a919f3c96004387698f72b91071b325e01f SHA512 b3cd21ef300e6d9c7cb61b3a956bb86842ca97a525a328ff8ae5c99b7105e26291d813d7ad381fd43a6fb34ed4eabc60afc29e54caf85e5bedb0fab7ea727e12
+EBUILD pyopenssl-17.5.0.ebuild 1712 BLAKE2B 62870546779662329060ce67ac451909b54191bc844054dd9c9a7e29a5bd77b95164bf894fc657a3f8a765ef29c03f4a6f79fad0076d1d94138dcbb67b7aa8ba SHA512 cea3a766cfcc93739fa2344e870978615bf34aa31d5cca1c043d7ff64817509f2fd88b149a673df832653bd7f2839f68f7028ba48f5e5136233c6c963064cbf1
 MISC metadata.xml 418 BLAKE2B 69f135bab3b0cffa47cc8e807e1f537f7fa0bd599bf3309ab92ddf41f894c21ab0e3f793ea4caa65d272043d2dc0352fc54c7160b31fccabbeb165775a895d97 SHA512 5cd4b0381e79245626500a2a38b9f7bedcc8e4742445ac16f12a96133f1291ec49592f2259294f153d5f1b27969cd6f7f364d49f32d0793b12b2ad38b824f441
diff --git a/dev-python/pyopenssl/pyopenssl-17.5.0.ebuild b/dev-python/pyopenssl/pyopenssl-17.5.0.ebuild
index dc7acd5a6cbb..0ee563cafbdd 100644
--- a/dev-python/pyopenssl/pyopenssl-17.5.0.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-17.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,7 +21,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples test"
 
 RDEPEND="
diff --git a/dev-python/pypax/Manifest b/dev-python/pypax/Manifest
index 336c65de5508..779e043000da 100644
--- a/dev-python/pypax/Manifest
+++ b/dev-python/pypax/Manifest
@@ -1,4 +1,8 @@
 DIST elfix-0.9.2.tar.gz 398758 BLAKE2B 22f8d9e85be2ae9bd906dfa6a1d8b7614f017686b4563ef7e97898a112a56cff59a8cb906ec957b7a111a5c9251a3de6b13dfb66ef9f732099ac610928d5321e SHA512 a7be30722abe7249ec42024d33b2bda00524cfb85da66b4511c5056efbdbfae1d3c2b42048bcf4d5cb7c0ae675f763b74a834d93a25b541ebac42fddcd2c6cf9
+DIST elfix-0.9.3.tar.gz 399533 BLAKE2B 7ff2099218de3352079564971cd2e3851a95820552b9057387b78945fb1a23d7b670591b174dc974ca2b0dcf3948546578a210687cbb16625dc5d638abf83169 SHA512 3395ce2e6d5e9fc9bdd93b58751cea33b5fb8e25e0a390e6261de6804cc54d4e1f91b4b5843fc45c9178d86d23e9932bf9d0f133a6d086607bf52ce16c65fd0d
+DIST elfix-0.9.4.tar.gz 399606 BLAKE2B 51b8b2f1c3cce306c7bc0716ad351bbf446a369a353bcd1b5faa41984dec37e08dbeeea87fa2425820af9f76d36209554b8e602338d01d0ad50e6d95e6079529 SHA512 f705f63b0ca57077f56e519a22ccaeb2e07f57c5269a6e498571a1799286f12098ccc9a92d2126b51b498447a098b0ce22d54c0d97c8c98d25426fe1e00c6e07
 EBUILD pypax-0.9.2.ebuild 1096 BLAKE2B 3f378b21f4904575718268ee1336a5e269d48271c56a8cf3fae220ef53f7cc4231f0cdec6d6de3843637c91bc5e2a2de70d0653cd932ed768dadde43743bbef1 SHA512 487e76b4882e97c3417be3262b85f962c1dbb98ca69bc16bc834dd8385b6c5d387fc3c8ef4f12eef6387559ddd340f05b2bc7ba736f9a8dc98621ec0e475b29b
+EBUILD pypax-0.9.3.ebuild 1097 BLAKE2B ea723d95468421f152fe436789ea38600ec69a9d146a62c75a318f137da956d226f3b82c7c704eae1a9ff65ee36559edd0f7dc9302e39c24b51ecdec8cb11c89 SHA512 c373be1aba00f0c3e4e4936ff7a4543458a61244fbaa6c1653a0a2173c430e9697c6c872aeb4a73a0cbf0cf296b080060374fd55f9193f429c5311d27ca9231c
+EBUILD pypax-0.9.4.ebuild 1097 BLAKE2B 2f1a9047087b25c2ff41d669cc7f618b6bd462876ccbfc1f70a7f84ccecf78783389048a93991356abb57338cefabd59e0f133f8556ab6a976df55428b14cb62 SHA512 a954ef75619bac0fbb33a19804a485bcce371726cb52c9fe3541b7b8105362f30f49d7a361d0b5b4b226b13b3fb4d65d2bb4948f1684b33a04b8e0fe79cc5b8d
 EBUILD pypax-9999.ebuild 1105 BLAKE2B 753a9202476893a19f00da53816499a9912e5bce24fad99f02bd89edafcc0df241b5f1836aa5aff3005194a74d99782df099facbc0717f6839219bfdbb5ba49f SHA512 08070f4304df5b8b1e90b4d95c3a9870e084cb88488d39ebe58aaff725ccf7ac5c1d8914803a44a8386a3fab1008138ab1a8bfab9f2e519360a54a4c388b5881
 MISC metadata.xml 597 BLAKE2B e154315aac17c35f33adc8dd7e33a6427029a34629979d2a7cfa6f373a56a9dbb6add22bfb359ba4126a29b172557393b96cea123224551d88894e5c5f637bbf SHA512 d5820da1b741114d7ecaf7cb7f0b6f1c08d675e53992c8fbf87f562c3b949ff7336e093a3a502202e671be299310c14a2a38b8d54d3485e0d9064964eb1ed87b
diff --git a/dev-python/pypax/pypax-0.9.3.ebuild b/dev-python/pypax/pypax-0.9.3.ebuild
new file mode 100644
index 000000000000..1c9cc20d064f
--- /dev/null
+++ b/dev-python/pypax/pypax-0.9.3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+if [[ ${PV} == *9999* ]] ; then
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/elfix.git"
+	inherit git-r3
+else
+	SRC_URI="https://dev.gentoo.org/~blueness/elfix/elfix-${PV}.tar.gz"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
+	S="${WORKDIR}/elfix-${PV}"
+fi
+
+DESCRIPTION="Python module to get or set either PT_PAX and/or XATTR_PAX flags"
+HOMEPAGE="https://dev.gentoo.org/~blueness/elfix/
+	https://www.gentoo.org/proj/en/hardened/pax-quickstart.xml"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="+ptpax +xtpax"
+
+REQUIRED_USE="|| ( ptpax xtpax )"
+
+RDEPEND="
+	ptpax? ( dev-libs/elfutils )
+	xtpax? ( sys-apps/attr )"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${RDEPEND}"
+
+src_compile() {
+	cd scripts || die
+	unset PTPAX
+	unset XTPAX
+	use ptpax && export PTPAX="yes"
+	use xtpax && export XTPAX="yes"
+	distutils-r1_src_compile
+}
+
+src_install() {
+	cd scripts || die
+	distutils-r1_src_install
+}
diff --git a/dev-python/pypax/pypax-0.9.4.ebuild b/dev-python/pypax/pypax-0.9.4.ebuild
new file mode 100644
index 000000000000..8d7d4a2e0446
--- /dev/null
+++ b/dev-python/pypax/pypax-0.9.4.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+if [[ ${PV} == *9999* ]] ; then
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/elfix.git"
+	inherit git-r3
+else
+	SRC_URI="https://dev.gentoo.org/~blueness/elfix/elfix-${PV}.tar.gz"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 sparc x86"
+	S="${WORKDIR}/elfix-${PV}"
+fi
+
+DESCRIPTION="Python module to get or set either PT_PAX and/or XATTR_PAX flags"
+HOMEPAGE="https://dev.gentoo.org/~blueness/elfix/
+	https://www.gentoo.org/proj/en/hardened/pax-quickstart.xml"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="+ptpax +xtpax"
+
+REQUIRED_USE="|| ( ptpax xtpax )"
+
+RDEPEND="
+	ptpax? ( dev-libs/elfutils )
+	xtpax? ( sys-apps/attr )"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${RDEPEND}"
+
+src_compile() {
+	cd scripts || die
+	unset PTPAX
+	unset XTPAX
+	use ptpax && export PTPAX="yes"
+	use xtpax && export XTPAX="yes"
+	distutils-r1_src_compile
+}
+
+src_install() {
+	cd scripts || die
+	distutils-r1_src_install
+}
diff --git a/dev-python/pyramid/Manifest b/dev-python/pyramid/Manifest
deleted file mode 100644
index 2482ca0b5b04..000000000000
--- a/dev-python/pyramid/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pyramid-1.5.8.tar.gz 2546802 BLAKE2B 71e19b01a5ebdd671ee12c9c71b5dc557b12db76db94ad238e9695e93cd3ecd53c83fbc6c143d298601ff328d353dea8c6eb557dd1edff80f02941cf75f19f19 SHA512 725f472245c03a50463d9e8946dbc71063ef46d58df8a41804d1c68bb0abe796f7fcd36f7c1708f8597a980f8cb308fbeec0bbad3f82c0e7d3eb449f6719fe16
-EBUILD pyramid-1.5.8.ebuild 1046 BLAKE2B 462a94fb82a10ff34a47b554615807405d49df9b6dcffa15ed7299eda629c9a15f0713884992db92a0a92ddcbd717871b17d69712dafd97f8a883114bd0a1c21 SHA512 b347754ff8a10225d99dcd6fb84f3ac70f2c4daf8bbdf922b6ac532bb06e50e2c21d3e88f5a8547e3583c3212aeedadf8c59779064d0300fc364d61622694035
-MISC metadata.xml 315 BLAKE2B 7ffe33e4d46d0f1465b42460863f184f2ca970f513c41c1701906736e400b9738d3ce6c1f650d4a4f70fa468bb295a5607c0b41e1c57b5f946ad0622f8f7d640 SHA512 323e7b8030f4bcae3a113e45f215d8c3386bb8f56214217c00198257ef1ff95455d93646a26a8253057a86afa688a61bb9c9c97e42b3fe7ee2c1553591b45936
diff --git a/dev-python/pyramid/pyramid-1.5.8.ebuild b/dev-python/pyramid/pyramid-1.5.8.ebuild
deleted file mode 100644
index 0b72ea6d7c2d..000000000000
--- a/dev-python/pyramid/pyramid-1.5.8.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
-
-inherit distutils-r1
-
-DESCRIPTION="A small open source Python web framework"
-HOMEPAGE="http://www.pylonsproject.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="repoze"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/chameleon[${PYTHON_USEDEP}]
-	dev-python/mako[${PYTHON_USEDEP}]
-	dev-python/webob[${PYTHON_USEDEP}]
-	dev-python/repoze-lru[${PYTHON_USEDEP}]
-	dev-python/mako[${PYTHON_USEDEP}]
-	dev-python/zope-deprecation[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]
-	dev-python/translationstring[${PYTHON_USEDEP}]
-	dev-python/pastedeploy[${PYTHON_USEDEP}]
-	dev-python/venusian[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/webtest[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep \
-			'dev-python/zope-component[${PYTHON_USEDEP}]' \
-			'python2*' pypy)
-	)"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/pysaml2/Manifest b/dev-python/pysaml2/Manifest
index 25a344ae1bfe..930c4e19688b 100644
--- a/dev-python/pysaml2/Manifest
+++ b/dev-python/pysaml2/Manifest
@@ -1,9 +1,7 @@
 AUX pysaml-4.0.2_CVE-2017-1000433.patch 1245 BLAKE2B ef0d8c68cadb6c53810e9b3d083a9de895fe70762a4dfe88140558d3b03848615319a08e777f488ce81f227994b7621039e0354967461fd403880e44eda19264 SHA512 be699d09afefeb9034c46a5d8cb0a86ef2d7bb5ae0dfbe708b6746a43236eaa21903fe6e6590247722f8fb68632f850d018143f19a4b8b5b67609219f37e4249
 AUX xxe-4.0.2.patch 10657 BLAKE2B 6ecb7b265c55ee9cffda2a9acc0358dc092eec1d8040415665d22104bc8ca1d54473c471c542ae74cda68fe1a62ec3d1ecab0c29f4a017e24d895da1f66bbb4c SHA512 5c18a3c850526e6fd0410d0526bbf385d3383978b944de80da781301114f6a9081d2a3c662f45990fbd7ed88f971382b1ce30d974e4e76e19c11d6aa74d010d1
 DIST pysaml2-4.0.2.tar.gz 13657558 BLAKE2B 35cb9dff897caf9f7fc39a70466dabce88098b6bbe0337a2ae47c733e4fd5de3bd80ddf73f27b6ff67e6f571b1f647d9856bbed58c8b19fe6547a35254dc2019 SHA512 debe23c2b193ca9f937bdb4fc9e8f308fa012c18e50e40183f7e531434af52b6e4d36608be3e9b0321190930cdfd9eb24555ed1805083e32db8de0f57e5afb14
-DIST pysaml2-4.5.0.tar.gz 20030696 BLAKE2B 547465c2c4191a26de6bf1bab55bd9c36ed7e477c620a4155b7a463c98dbf314a8067d45263055a05ec8ed696177fcbd1443dd856113871f2941b572b9df0628 SHA512 163dfc2acfa0f242bc97d3ec334aec98e993ef9265b2240223205e496f86df5518ca613620b371eabcca0c4070a0bf7bb72a2216f517e19e3b2ff0f20e30a0c7
 DIST pysaml2-4.6.3.tar.gz 316979 BLAKE2B cf393075903269ce93dd219bd23479949ce8e39383d8150f8ee30185733569fe79c7421b87b3439b95e707f17d5f513abfa2610be76441b8f18d8f75a5a9fdd3 SHA512 259f7395afad44caac32453a03bbdaf8c464adeeb856b78786b665281dbe75b37e8054efaf945a7d10333c0b09d9f516d606e95b157aed34c1cd0821b7255b9d
 EBUILD pysaml2-4.0.2-r3.ebuild 1078 BLAKE2B d3d045eff390a651e64c6354601ab63d566c0344ab07c7b014e04244f4029891455a721baaddd67b1eb9b5cd7c6fba6f2529e7e85a5ef8c94745aed33ed5a7cf SHA512 61e90dbbcc1cc55a32f285257a776504f1125d0b1b6ff5dc78ffefbbb68eab9e29c8485dd4a0da26df19a79ada63dde78f35250f7126db6a2eb2d3c2df0026d5
-EBUILD pysaml2-4.5.0.ebuild 833 BLAKE2B abab89c3f6d390488b1f63c53a59713cad3e6fdf93d8879767584c89690f25644260634e3c28de495f7ad1cc92341e1ba0a171627c73be9c926cc2f2eda14ade SHA512 c80b60d24d487de2bfd2b65843a497e05a025fb5ed924883482280caf7d7585cb862839008e2cff8853992f211bba2f99bb133f9c79a77f0442d47faae5789f0
-EBUILD pysaml2-4.6.3.ebuild 831 BLAKE2B b6c2b5a650a518e29f5a265cfe1cc5bbd75534cdcf4651c943c091e5212bdd15680c56031100d5e341dc9f01a0f5f6c4e1b55869e7fb5e64762d42f0bce3460e SHA512 8983d9caf23e4459d2a811c3e1cc0e5fbff3b5a4ca84cfb417cf3235b1bd6c287580679a50f02c8a4d1cdd2fe495ea35260418864d65d1cb19e503fd61a7a326
+EBUILD pysaml2-4.6.3.ebuild 829 BLAKE2B c3cc03f6d7fdbd0631d6d6b1742158227554d500c0eb4efd734c742dc8aae6e3665cdb71d9358fb7a55a56eeae0a88d437dbdd2ddbf4032dd55828dd17da75bc SHA512 d35b54e1d560ee54cc6ec97ee3c3823a7499d318b9e27b4177901440750e147dc0a00e8088104b7d57d5e5e2775968ea5866efc24d112629a694dfafebcd3cd0
 MISC metadata.xml 606 BLAKE2B 5262e7d7a6f2ff32547ab8570f3aace4dfc3af9d667fdaac6ba2eba77ffd562524a136154eb7b96d4f1f7dfb316b72ee7a0311efa46153afff150c3956151b32 SHA512 7b4facbe3e25898488fffb7b39f9ff7eedd12492f668fa294952711efb3ca9549f2653ab6bc2a948286deff5f45116b0b8bd9a5fc796e99413acc9334eade348
diff --git a/dev-python/pysaml2/pysaml2-4.5.0.ebuild b/dev-python/pysaml2/pysaml2-4.5.0.ebuild
deleted file mode 100644
index 1f49c06382aa..000000000000
--- a/dev-python/pysaml2/pysaml2-4.5.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python implementation of SAML Version 2 to be used in a WSGI environment"
-HOMEPAGE="https://github.com/rohe/pysaml2"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-PATCHES=(
-
-)
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/defusedxml[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/pysaml2/pysaml2-4.6.3.ebuild b/dev-python/pysaml2/pysaml2-4.6.3.ebuild
index 3733d423cc4f..c4b4968ff421 100644
--- a/dev-python/pysaml2/pysaml2-4.6.3.ebuild
+++ b/dev-python/pysaml2/pysaml2-4.6.3.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=""
 
 PATCHES=(
diff --git a/dev-python/pysendfile/Manifest b/dev-python/pysendfile/Manifest
index 5f62db3ce618..b0ad0e09200c 100644
--- a/dev-python/pysendfile/Manifest
+++ b/dev-python/pysendfile/Manifest
@@ -1,4 +1,4 @@
 DIST pysendfile-2.0.1.tar.gz 19315 BLAKE2B ac5776069de0228d5103053e82786b499478dc3cad57b1f74ede3b8b8724abb780c5b51cf8578ebece7a12ce269b7a9b5bc72f08409077bbce2d4daf63046119 SHA512 d6ee08eb251fac30c90a9ee829fd992f3620697eef2893ced5a2c6273486c3c5fd35c70962585a8d747d578817391f91c929bfeeba8c4485d52a15748229ca9c
 EBUILD pysendfile-2.0.1-r1.ebuild 592 BLAKE2B b0d05af459b4fcafbc41868b19f709df8934191b4e26689669f446c2035a3aa5c316d6f53a0d7bfaa44ffe18260b60eba01ce4247c3f064294e1529e26cb45cf SHA512 40df0045746fe5671631ae47da43e849068daa5cdf83aa4e2e5a590f9a822cdc428cba202041d5a9c2f1a2cf31e794e604c13adebf50b4dc9eafae202707e31b
-EBUILD pysendfile-2.0.1.ebuild 578 BLAKE2B 3a86ed2b905b2882e2dc79416656d9fb07edfefd5c0ebfdcc7b7de20840ba1fce111dac24dd784a2ababa0d805db2fa94e38053936076fa954af9c8911b1bab4 SHA512 f93c141225232c6e721e49434fdf833100ba979146356c6d628418b907b454db8b0c1b2fdd92e8cc8c9ac9d6b275fe3bc7cb07be7d9bdbe9450e14eff77b79e5
+EBUILD pysendfile-2.0.1.ebuild 574 BLAKE2B c2538ede583e0144e35c9c3f37e13343e1008cb2651e5a2b9131dc983dc70234f5e2e6dc6df0ba56f2cb82892cc76d200915a378952a35fda9a54b5197d1c883 SHA512 dc9fc71cee936ec4ece4e410d78bb7ab9615b5ddd7d47b0df66543f85083f05ded4a77e2b18cd7ea63dbd93f3e31bf5ba2786540e6551ea71e38708085373423
 MISC metadata.xml 461 BLAKE2B 30a174cb9b4196658e94e080e4aad73dbfd3f28bc9c5e0d966672b1d811a6d85cdabf97faa07c89a4a868f2494c46da07f6601c0f08a292f1cd00df3b95e42ae SHA512 1b76475c93a4462264ff4ee5f9b1b3da11fe666f80fbd47322e64f981d3c2ee4d7817fe3d3ef151b991f04fd9353d0b6dda9fe80f732409415fb6d7b0146e17f
diff --git a/dev-python/pysendfile/pysendfile-2.0.1.ebuild b/dev-python/pysendfile/pysendfile-2.0.1.ebuild
index 303ee3a80802..18ae397f9250 100644
--- a/dev-python/pysendfile/pysendfile-2.0.1.ebuild
+++ b/dev-python/pysendfile/pysendfile-2.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ DESCRIPTION="A python interface to the sendfile(2) system call"
 HOMEPAGE="https://github.com/giampaolo/pysendfile"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/pytables/Manifest b/dev-python/pytables/Manifest
index 626256991b4c..fde961becb55 100644
--- a/dev-python/pytables/Manifest
+++ b/dev-python/pytables/Manifest
@@ -1,5 +1,7 @@
 DIST tables-3.3.0.tar.gz 7004337 BLAKE2B 7ca95e65920c3bc16b5bac8c3bf92f2fa9c498eedfc981ee9e27c77f30f31bd527f15b37d8ffcc03bb2dbede170cce1a1ab7fc54de5ffebfafa4e41f69bbc46b SHA512 e19445f0f5f2530d49ce55f258931babb7b05df2366637ddbc306323a1f75b7f7dcf91d70a8cc1f41b182d4cdd9c83872873168592bdcce7bd5acae9f3274f36
 DIST tables-3.4.2.tar.gz 7593471 BLAKE2B 1a011a2a910a25d4e7cad68b5a1a267482f5ed958aa824dfba5a6c902200c56253c7d5609cd674dfcb288f6ebf2ecb76f4324e53b852f70d0cfc60d6b222510a SHA512 8c3bb9113e5082f8b44866b04728a04dae37fbd576c3259309fc305fd4cc0c4f74925557e74f6bd1bd1fc5150d8091648139c4c702e5ed9f53e0ace11c2ac58b
+DIST tables-3.4.4.tar.gz 4626053 BLAKE2B cca4f87aa62db16bb47e131bf670e1013d363dea9c807f399688e184610f682c49b00b686d8e28a03caf94a98e51b11bf646df66f4e3db66f481751f096906f8 SHA512 2d0cdd36a6f14702f424773b64187d1980d73a72525ead43b272776bb32b2ebc4c6ea0b7e3343c8600d7f62c42d008b5e835439af30e76ea11c7504666631ddf
 EBUILD pytables-3.3.0.ebuild 1576 BLAKE2B 284a5c4a14d6705f464ae82943e15ffd2abfae5a607651c0e4fcfe2d4bede9b4e672636a8e92b849b2fc69777b8e395b7f3f3d163b13fe1ebf57b6b2c4e5df6b SHA512 245b0b83df781420beb759ffcd1e66106739e4a56fdc524f1f9ddb0a65c5c91442b17775e123ec474f55a5ad7d6b26993dc4453c2afb8522507f0ec2f66997f6
-EBUILD pytables-3.4.2.ebuild 1645 BLAKE2B 9259dab0ffc95b4ad11a395562bbc5439621d22d389dad3aedbc6da9351bb6f4b6104aed86b82657728d738b9bf52526bb0c63aad24baf1724bc4eb05427355a SHA512 c6d226ba1c1233e6ab02268109fdb363d43e23df114dc9fec407770fd01026f5964c16f29d5e024ec3de371c32af8622f30d460eade6b7e47ffd033f809ea545
+EBUILD pytables-3.4.2.ebuild 1699 BLAKE2B f9ec49367b093596e1938c64b5f9d225ac4905ff26e6392fc4f4a8bcd9944cf170fc5a149cceb3f33d947460363b63ca959e2034ee417097a329876f97b373f0 SHA512 8d437757049016b98bdd8e67c296ec1e5aa484012f50338e9d4e1416f9cc51a3a9631b15bfa7b5f1931d24a03f40a6eec4c4dca2a2d49764a406fcc14003653f
+EBUILD pytables-3.4.4.ebuild 1700 BLAKE2B 7124df86eabd1f75b4873c94f9c76c985c8a5617338a3db4bbb1fd045fd359b9ed75c00bfa526b26bd1f3670bd75649349145b8281ab0d4cfc6f2611d11241a4 SHA512 28de9973eb58780e66aa9766d641b8b15b39c1ce3eaf71775fbfba9a6b6283f1e9a52a98e29238badd7fae701c91723a0f6006d45c1efefb2d9698f33e1d1a4b
 MISC metadata.xml 894 BLAKE2B 279b64a5124a6471b3ea6ed8d2f82b8d62e5d8bc809168fb2ae1c3bfd8cfa07428c2ff7f07deb5042a6ccb5ba7af43bc45d0db82b9cfc79fa5d19c090d0500a3 SHA512 88dd752e6014f6f133b5df7db6c2aafce0b9da8cdbc057493916dbfbe1da4bf52e0ed43d570d68035fc8f12302794a381a54f5b07b9726b52601724163bc672c
diff --git a/dev-python/pytables/pytables-3.4.2.ebuild b/dev-python/pytables/pytables-3.4.2.ebuild
index 02d1be95e967..71c6708813ca 100644
--- a/dev-python/pytables/pytables-3.4.2.ebuild
+++ b/dev-python/pytables/pytables-3.4.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 MY_PN=tables
@@ -45,6 +45,7 @@ python_prepare_all() {
 	sed -e "s:/usr:${EPREFIX}/usr:g" \
 		-i setup.py || die
 	rm -r c-blosc/{blosc,internal-complibs} || die
+	sed -i -e '/_version/ s/\\s\*/\\s\+/' setup.py || die
 	distutils-r1_python_prepare_all
 }
 
diff --git a/dev-python/pytables/pytables-3.4.4.ebuild b/dev-python/pytables/pytables-3.4.4.ebuild
new file mode 100644
index 000000000000..9995427aed4c
--- /dev/null
+++ b/dev-python/pytables/pytables-3.4.4.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+PYTHON_REQ_USE="threads(+)"
+
+MY_PN=tables
+MY_P=${MY_PN}-${PV}
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Hierarchical datasets for Python"
+HOMEPAGE="https://www.pytables.org/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+LICENSE="BSD"
+IUSE="doc examples"
+
+RDEPEND="
+	app-arch/bzip2:0=
+	app-arch/lz4:0=
+	>=app-arch/zstd-1.0.0:=
+	>=dev-libs/c-blosc-1.11.1:0=
+	dev-libs/lzo:2=
+	>=dev-python/numpy-1.8.1[${PYTHON_USEDEP}]
+	>=dev-python/numexpr-2.5.2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	>=sci-libs/hdf5-1.8.15:0=
+"
+DEPEND="${RDEPEND}
+	>=dev-python/cython-0.21[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( RELEASE_NOTES.txt THANKS )
+
+python_prepare_all() {
+	export HDF5_DIR="${EPREFIX}"/usr
+	rm tables/*.c || die
+	sed -e "s:/usr:${EPREFIX}/usr:g" \
+		-i setup.py || die
+	rm -r c-blosc/{blosc,internal-complibs} || die
+	sed -i -e '/_version/ s/\\s\*/\\s\+/' setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	if ! python_is_python3; then
+		local -x CFLAGS="${CFLAGS}"
+		append-cflags -fno-strict-aliasing
+	fi
+	distutils-r1_python_compile
+}
+
+python_test() {
+	cd "${BUILD_DIR}"/lib* || die
+	${EPYTHON} tables/tests/test_all.py || die
+}
+
+python_install_all() {
+	if use doc; then
+		HTML_DOCS=( doc/html/. )
+		DOCS+=( doc/scripts )
+	fi
+	distutils-r1_python_install_all
+
+	if use examples; then
+		dodoc -r examples
+		dodoc -r contrib
+		docompress -x /usr/share/doc/${PF}/examples
+		docompress -x /usr/share/doc/${PF}/contrib
+	fi
+}
diff --git a/dev-python/pytest-cov/Manifest b/dev-python/pytest-cov/Manifest
index 06e017b1f47d..1043ced51c7c 100644
--- a/dev-python/pytest-cov/Manifest
+++ b/dev-python/pytest-cov/Manifest
@@ -1,8 +1,8 @@
 AUX fix-for-deprecation-warnings.patch 678 BLAKE2B cbf75e452f1cb5225d23d29c8105fc46c03d66b65ad359e84d63780fdff36342b50a5465c4ebcfe1a94d277301de49e5f4822856411e54d939d85d7043a1f094 SHA512 3f20f6ef0514d676259e6bfd5c10c1877c4237a4a87161352adeda355dac693a6a43b8be3b29848feca433a9ead3e96967d8e255b62e3b60d816127eb17c4cae
 DIST pytest-cov-2.3.1.tar.gz 35378 BLAKE2B 758846db0b06ef9534823d3458ad6211b0cfc14b551a6e1737573a5c1c5bb59c23b26d3448ff8a67d65a4293ce75dd8c79d4916d3d9a7db5021db6b907152230 SHA512 79770beb53fbb43b5d68311c2efd0accbfd890ab6dad299da8c1c0b3d26b54d984807313b1507900cda7004bfb50fedc0bd4341cfcfce47849a4f24fc8184f11
 DIST pytest-cov-2.5.1.tar.gz 36201 BLAKE2B ba07d751c7635ee01262a6f2eeffb27393d58afadb625b220237ff9d014ecdda0f18c0b5fd7bdec66fa4a948f2bb70a715af6dc76664e9c573ad56520c8dee1e SHA512 868131d6ea6dd28deec6d653dec23ceb7d3adccfa2c6bcc0a3126bbb11e924e71f200676461b2202f274ce6e14d1799feb0917e3081817d9e8583271c18a43de
-EBUILD pytest-cov-2.3.1.ebuild 1540 BLAKE2B 867cd8e71809be5676ccc8e9d5fc700c9a19eeb38827b659d23ffd9b23a9294e926e8a184bbe4649929ac561a8cf6f81582aa17ea2e57e9e57ac17f1e79df2ed SHA512 ab86d0f5bbe3fb3730335c2f45dc2cdc038e134e9ef17e8fc8c6346ed9d1efc3c4e46ce34d6c24c7e825c722a7847f1996ce57eda9b72a7838f9e9462d97a9e6
-EBUILD pytest-cov-2.5.1-r1.ebuild 1531 BLAKE2B ee39c41850bb4770fbd4c9782ccd20de882ccc2613b31b863a2a9f565227d22648f688b5f4d790926ca213a4fab4110f0bf4e463eb1a950819768a1c848af4ea SHA512 b9aaa24c249b712fa80cc34bbb380ef5909189d6a66145b1fd9f0260b5323bfe4487b81e3d23345e748443c91081dd05a3a00a9a77633c08263cc4e811eeaccf
-EBUILD pytest-cov-2.5.1-r2.ebuild 1533 BLAKE2B 7b7ec65ae91e9ee425975deb9cbc9c61dc430a045264d5ade13f89c87b539f773d76d61340786c467fcb6f470a8677af09178dc3d113497449a1f2aeec918ebe SHA512 dece63461328b15a9e18a986053408ee62d14c9ca938a7bf1881c13db3950e12d5a82611b9514dd268a07a5d8b1b20a6d6a696e1c24f6f9081a25af1c7a784c8
-EBUILD pytest-cov-2.5.1.ebuild 1506 BLAKE2B 57ef01d9e0c9012ca9e00918817c5782775cebd54684fdeaca16bca47439dd1c90ae85828f83b6fefe36295d536ffb6118b140e465dfea52cfc9314677486788 SHA512 2b6b0feeff3186a901c44a759731f18c8edb6aa7e202ce7fe68d620b5decdb82722d5df6806bf9f1681226dd18d6ae9c494d600c8fbd3a15042d3a57ef5ba997
+EBUILD pytest-cov-2.3.1.ebuild 1488 BLAKE2B 8b64bf914227876cce3a0fad5d35be27933957bf0666fbc61f8a1d12fb04d6450c9b026158880b19b816b5c098f5485098dd04de812312d3b6bf798c9ecdec17 SHA512 c699d519d7732630a1816011ec02f8828457dce64be7bc6983a5d5e7a6de77b6e94719155fc19b03c93887c290740f9ac9bbf011d6b52246d0408cfe67cc3b0e
+EBUILD pytest-cov-2.5.1-r1.ebuild 1479 BLAKE2B 2fc222b784d637120b2fd6643202a10478762fa2b34b5d60a2dbfce0b56e2fbbb8e1715dd76495c97ce79e68d23ec54701530f022cacb9e0e6727fafe16f31c0 SHA512 e6494d1110ce8908b95371cda1adb3bb887fd5265f7adb8b0f9e3a234fbd654fae36a793f8d0e274730c4c6be68519d0f571eca2da496fff3ecf5aae9df3f97e
+EBUILD pytest-cov-2.5.1-r2.ebuild 1484 BLAKE2B 4af790131980134ff2ba436b9121989bf84fe1784dfe0b0a87ac0b21b16e3299c77f6fbef049e2c4ac907f2347b64444fdfd93d02bd77c336f01f6f167400331 SHA512 3cf324e7a71d3897deae0d4d1bafad2c9ca31ba9e6bbe26e3efd8d9e00ff61a9ed760306401610a5e5b953774dc0ecc85d6f89c8bfca5e1892551d604d8dbc98
+EBUILD pytest-cov-2.5.1.ebuild 1454 BLAKE2B d1495d046178052686c462a110404302bd2dd3fc8410a19e53962fc6485225bb7dda3eec4f08e02d49183cf63eec2063b839bf809578d4cde0274ffbbf031f54 SHA512 6a3755154542c9a0071a15a3d2dca307fe9a4ab4c24124fb24e0d5a602f9246121ff6a57b703efb48380d02b5a09b5134510d636f1f1df1b5445d32257b703cc
 MISC metadata.xml 460 BLAKE2B acedcc7748c95511d1ebe201052b50e43569250e41f8d08d8eceb3f8c8b10924d64e74f6ff6453896f9fceff2a939f42d21d3013b9a486b007bb922dfd285ac9 SHA512 5600a6e66b683a30d6252699a28fecf727bdbbad6ef40cec0fabb89f5afd3a0cf1e2b8e2b80ffa6cc144ac03f5e7066117d72fc968492bd3b1d6c89a8b035228
diff --git a/dev-python/pytest-cov/pytest-cov-2.3.1.ebuild b/dev-python/pytest-cov/pytest-cov-2.3.1.ebuild
index 9aef7a752f58..f57ab12f3964 100644
--- a/dev-python/pytest-cov/pytest-cov-2.3.1.ebuild
+++ b/dev-python/pytest-cov/pytest-cov-2.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -36,7 +36,6 @@ DEPEND="
 			dev-python/pytest-cache[${PYTHON_USEDEP}]
 		)
 		=dev-python/pytest-xdist-1.15.0[${PYTHON_USEDEP}]
-		dev-python/pytest-capturelog[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/pytest-cov/pytest-cov-2.5.1-r1.ebuild b/dev-python/pytest-cov/pytest-cov-2.5.1-r1.ebuild
index fb708afded41..e0c277e0bfcd 100644
--- a/dev-python/pytest-cov/pytest-cov-2.5.1-r1.ebuild
+++ b/dev-python/pytest-cov/pytest-cov-2.5.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -37,7 +37,6 @@ DEPEND="
 			dev-python/pytest-cache[${PYTHON_USEDEP}]
 		)
 		=dev-python/pytest-xdist-1.15.0[${PYTHON_USEDEP}]
-		dev-python/pytest-capturelog[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/pytest-cov/pytest-cov-2.5.1-r2.ebuild b/dev-python/pytest-cov/pytest-cov-2.5.1-r2.ebuild
index 98fb738ccee1..ee73b89744d9 100644
--- a/dev-python/pytest-cov/pytest-cov-2.5.1-r2.ebuild
+++ b/dev-python/pytest-cov/pytest-cov-2.5.1-r2.ebuild
@@ -37,7 +37,6 @@ DEPEND="
 			dev-python/pytest-cache[${PYTHON_USEDEP}]
 		)
 		>=dev-python/pytest-xdist-1.15.0[${PYTHON_USEDEP}]
-		dev-python/pytest-capturelog[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/pytest-cov/pytest-cov-2.5.1.ebuild b/dev-python/pytest-cov/pytest-cov-2.5.1.ebuild
index d769afe6c08e..d64465eebd71 100644
--- a/dev-python/pytest-cov/pytest-cov-2.5.1.ebuild
+++ b/dev-python/pytest-cov/pytest-cov-2.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -36,7 +36,6 @@ DEPEND="
 			dev-python/pytest-cache[${PYTHON_USEDEP}]
 		)
 		=dev-python/pytest-xdist-1.15.0[${PYTHON_USEDEP}]
-		dev-python/pytest-capturelog[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/pytest-mock/Manifest b/dev-python/pytest-mock/Manifest
index 6b361363ff47..2b6377312a7c 100644
--- a/dev-python/pytest-mock/Manifest
+++ b/dev-python/pytest-mock/Manifest
@@ -1,7 +1,7 @@
 DIST pytest-mock-1.10.0.tar.gz 20754 BLAKE2B db60bfe6ee9d6d0a6ee4f0df7f5efa6ef05f5e2360945aa86ff6de02fc6a01f1e6715cbb61ced0c1e737c300965835fb08727b926852c5b71c0cc3d56c1171f1 SHA512 b8afba13da3e598b6493459298e395c0ecc06538733916659191bd5c5c22f40b0e296853ad940c16a6d492fcf46b2daf490ee589661d391e2c7cd1deb84da756
 DIST pytest-mock-1.6.0.tar.gz 17780 BLAKE2B 4fbc0cbd951668eb2ce427496c54e958591fe368bd42544eb1d0379adcb3d0e10b223ab044956e4003aac88665b3132dcb9d167442d6d85a5be79edea36881ca SHA512 c3b897be9156d57d7012e95b620c543500b849d7076224e3328d3783311210c57141dfb82c01bb98e5e419125dce0f68f6631bd610f4909f5ac1798458a7949f
 DIST pytest-mock-1.6.3.tar.gz 18482 BLAKE2B 1c0d366e5afd1b247ff454716b6d96d9d68846adfff81adc0ea079a72d3e7710fd9385122723cfee69965588235ec2deb1e0b52328ace5c967652c93b404cea3 SHA512 6857f373728d3f2c6b152d4f89da3590e2e74795695dc9f4f3704a4e0250e49d705ce0de4121a801ac35c83217678a95a5023338124293ca74db406941f5072a
-EBUILD pytest-mock-1.10.0.ebuild 1041 BLAKE2B 25bacee77a68d7ee5d4a5796ef3a947a7ce7d2cc19cf2fd2ebcc00dc92104dad75589521d4f410b1f6be699040155e6ae785395daa1ae72f9293f4d8c0f807dd SHA512 c4a5118558659a62fd7e99e3262669361c2edfc34dc5568673654442ae1992fac5fe76f565aaedde9aedf78816ede0db83f2dbd0806ef712f3912a84b38f4254
-EBUILD pytest-mock-1.6.0.ebuild 1082 BLAKE2B 490ac538bd264201bf4348ce8825773069354fdc3ab26d6207f1e7ce8a0a0f92d1774101d062796d9078039cc792885edd244137928ca6fc78489e605949ec43 SHA512 b693822c82e774068a10164eb560f0e6f2b4d1e0817afb594a8402934afa91a4cdb483d3c7109290ca7ba2e0e8465362d946584493e841729401e6f650c7891b
-EBUILD pytest-mock-1.6.3.ebuild 1035 BLAKE2B b131ad6a83ca92eb5b27e09f9fbb5875ef31f55d3c36aca27c8b4106b0ab8dee99b847316a94b8f9a75879dc4952685823c0ef1ec65e43295970011792112cc6 SHA512 d44cb185efb1ebf8535080c4ae3b819b71ab91584dfc5b6991bbcd9b470e9c55e45f3406e4a24310a1c838be6572bcdef6b818cc6c4eff45be6ba338d8ceca85
+EBUILD pytest-mock-1.10.0.ebuild 1043 BLAKE2B 61e30f70128fbd14e484823814e60413baf44c8d4e3e48d2be1a5d640c72199a1d2c5578cdef9b097efa18d1dc10ce642615f57ceee32c138e389b28e4dde6d1 SHA512 85db09453398fdb64c4205ea52f411634785fa1741763b5896de199f93c02f92c4787cb9f4ad7d896d2b4250b906a5a3fd7db51374ca09123a0645ac8493466f
+EBUILD pytest-mock-1.6.0.ebuild 1084 BLAKE2B bec8d4ea680db36cfc84747e495cbe72ab29dcfe59d9fbba0255fddd993b2bd1fc096bb1e0dfa8c5a3d0a84af7c30f6a3ea2fef13f37f3c99a4df53844185eeb SHA512 1d177ed2bc845b7dc9806b2c2e7028a6225f4fa4ae6a1d6e09b1081a068e8cfa06f31dd723fef4e4f85925818c89c9eaa78c27c699629e1bd28200c018117ae9
+EBUILD pytest-mock-1.6.3.ebuild 1037 BLAKE2B 62b295089473cda2d16e3fc4ec7fdd2b883197251e431e06649accb7b2be71636f192ab8a661376ae5f4284ccd3f061e49ecdcab51945ee7ef9af540ea9477c3 SHA512 7048e15c77f47c44f85a005d0901dd225f6dba220b3fa72f27bcdebfb3b9ad317615d4a333e9045c44b2d31317cc7a60548f63f2a8995a1f50b27021cf7c8ac1
 MISC metadata.xml 433 BLAKE2B 78d844dea9620760c0766eda59e09f93248fba58778f26fb4dd53e864ece455ede7299db90bec0fe11fdf64b762e2c660c260ce10e3758bb8e25024b1bf2877f SHA512 16324c7a2ce4e3e7261b9be389d646ba8e797719b6dd6782fd66311aefa262e338bac99c09a9399d55b362b941cecfc8039fa14e53b79e214359ba6d294c9529
diff --git a/dev-python/pytest-mock/pytest-mock-1.10.0.ebuild b/dev-python/pytest-mock/pytest-mock-1.10.0.ebuild
index bdb589e5ef45..d3b147d41a8b 100644
--- a/dev-python/pytest-mock/pytest-mock-1.10.0.ebuild
+++ b/dev-python/pytest-mock/pytest-mock-1.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-mock/pytest-mock-1.6.0.ebuild b/dev-python/pytest-mock/pytest-mock-1.6.0.ebuild
index bcf8353206bd..af5a54090bd9 100644
--- a/dev-python/pytest-mock/pytest-mock-1.6.0.ebuild
+++ b/dev-python/pytest-mock/pytest-mock-1.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-mock/pytest-mock-1.6.3.ebuild b/dev-python/pytest-mock/pytest-mock-1.6.3.ebuild
index 9d4c6a64c17b..8eef9f69c7af 100644
--- a/dev-python/pytest-mock/pytest-mock-1.6.3.ebuild
+++ b/dev-python/pytest-mock/pytest-mock-1.6.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-shutil/Manifest b/dev-python/pytest-shutil/Manifest
index 23c1949cafb2..60d6069e64cd 100644
--- a/dev-python/pytest-shutil/Manifest
+++ b/dev-python/pytest-shutil/Manifest
@@ -1,7 +1,7 @@
 DIST pytest-shutil-1.2.11.tar.gz 18310 BLAKE2B a85f50a8a0e98de6dd71af0b27f76181b1ff80b518877155122998c3f8992c2749ebcc837d630dc19d60d988410eba8dc77b1be7faff7cf27003ebbba9194bcc SHA512 2a998218bb997a6ceb277965e2f150b2d7722ba518f579154f804568f552e2c41ced9a491c1745382dc119d0b92f3ea993ae77a61851809aae59a1e17501bde8
 DIST pytest-shutil-1.2.4.tar.gz 16327 BLAKE2B eb5bb96c78be5b91de29f6c30634cb56a69e30b5ebee9b43a0e970691a7094dfefb83ea741650e0732ff60b9d08cc8ad94d80bb95f1222ba8670402c1fb1d5ab SHA512 9ec6baa3cf53bb80103b1dfbf6c26794090c26dd74b29cd19e76b1037c6939538c7b05ea16368a76cce6969216c291e27b00833a990268239bfd2222f69ddfb4
 DIST pytest-shutil-1.2.8.tar.gz 17051 BLAKE2B 9006ccd51bce6e5035ed93a330e460666bd0782fe56ef400f66de174914aa89b49d6684d1a3a2d2d69b308c4d8466db83eb0865ad20649106dac735b9d1e6772 SHA512 de73b2c350709e356810f58d2a8a4c7668144701639c45a0690081e707e7147762f650af2e9f826429d0488655dae0e3366611da5e8e3ecd0c6382e215170b2d
-EBUILD pytest-shutil-1.2.11.ebuild 1031 BLAKE2B 77e6d679db275d70b16b56e8d709a44f5b805733a26ad037c50f8154dbac159177faf7fc855dc89e15b1240f0523a8d6d2c175661f8a03fef7ab794d6956a74e SHA512 195e526028d00a7ab2c69ff5eca7efca29262f319b5f172f922c64a7edefefb63fe7ee8425b646e7d5c8c49fe3f6b1eba263ca130a8a57a873ef842f0f6d9efa
+EBUILD pytest-shutil-1.2.11.ebuild 1033 BLAKE2B 0fb6bb52cea08f7d56f3e048512b40f36143e54f1b02fc7d49fb5dca916f1002f1c1e58dc20a7e2ff27693ea8dde1e360d306b8c65c39157e3e8de99ad1307df SHA512 b02f98eb3fd3d35b312d15f91641a5590b5776e0136e82c4c48ac24f6f4d7fdc28157380f1fea3f7cd7ecf19cce70f528330b516e622def82d034c4ed6f75188
 EBUILD pytest-shutil-1.2.4.ebuild 869 BLAKE2B f6771062db81adfe92c4136be4701ab7cee4ab1d532f30529c5eaad26a260b0f8eb31cfc18aa82f9295556c7414bbb770553bc92dae8947567c127a4b4e42d94 SHA512 32ab5e8737b27f70f7b3e38a4d86061c55c637799b7f9910234f89d21b9a688e42e77bb4a51a008abe84abde8c2dbb60fcf89e1a3f3c06615d46a27461540bf2
 EBUILD pytest-shutil-1.2.8.ebuild 869 BLAKE2B f6771062db81adfe92c4136be4701ab7cee4ab1d532f30529c5eaad26a260b0f8eb31cfc18aa82f9295556c7414bbb770553bc92dae8947567c127a4b4e42d94 SHA512 32ab5e8737b27f70f7b3e38a4d86061c55c637799b7f9910234f89d21b9a688e42e77bb4a51a008abe84abde8c2dbb60fcf89e1a3f3c06615d46a27461540bf2
 MISC metadata.xml 682 BLAKE2B 97ec2b3653d0946043034e72566860dc77fd2f063ea2242dabcbca2ae6f1c3b4052c2f0c24b9f981fde07c00b35da0f1ed7322964dfd3b9f4f7d3645de9a6ac1 SHA512 34b80ff399184f3335a694bd0ed0d073450a498b355749271b0d8e9c92673134d908c822be6684773a175bc3650dfa894bcaa73e47da70e92d503f602d515d19
diff --git a/dev-python/pytest-shutil/pytest-shutil-1.2.11.ebuild b/dev-python/pytest-shutil/pytest-shutil-1.2.11.ebuild
index 19306f8a7121..b3d6006a5f97 100644
--- a/dev-python/pytest-shutil/pytest-shutil-1.2.11.ebuild
+++ b/dev-python/pytest-shutil/pytest-shutil-1.2.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index 85aaf8847e92..729abfbe1b6a 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -1,11 +1,15 @@
 AUX pytest-3.4.2-pypy-syntaxerror-offset.patch 996 BLAKE2B ff6d362d20f6432f73956e1aee4c2bc596e3d8e3347da3624dfd3cbfdd1eabd8872058737e8f9b558f3570878756c7b87a65514956b1e81235c2727e8ff2fc63 SHA512 4a28ddc07389aac79e46528e85229aba126a89c27b7bec73b406766be49f5c8be9bdc2cb3158bfb475b4d6371e2f33960e1ed154e3b9eda15aeb8b151f3d2148
 AUX pytest-3.6.3-pypy-syntaxerror-offset.patch 1055 BLAKE2B 8a92e1300052ed7f178252489d4b687d9d58d5fa9067a1f17a20ddbd698843a5614e7dd729670920a447e189b0e40ed2ae26fd13ad7d9cfebc59889c8cc50d87 SHA512 fa2600e320a74eca59004953aea0ac7607e6b7fcbcb702a5ac709dfcf73d036f47c5a79b01e56061ed6776ccaddd7a261162848218969fd1b462c5e1dd615ad3
+DIST pytest-3.10.1.tar.gz 892420 BLAKE2B 38849ae69bf4380bc1a99aa105cac04be078da4460373dfc16fa555238b2830fa2f5ae6c19de8aa2af9ac18d87c5d2705d62f7b2e67e4a62d843f6a28bbd76fd SHA512 30ff79c0fdcbeef68e1191ff400a20428e391717f06957f554b694b94baaaa565dca01346fe989c3e443c4402f3b2bdbd5564f6303a4447f933fb54cba45628f
 DIST pytest-3.2.2.tar.gz 786396 BLAKE2B e669da930890e902b0323ec3a6685080ddd889e74655f7b4cb08ec421651f987597021a31471aab5a32d637b99620ce7792cbdf8f85561db3bb10ff06a446ba1 SHA512 6df3a50e7d1efeaf7a283920b16d1daf800798f422bc851b0aacd2bbd5cb0a88c95f9057fae49943b9dfe6527ed552cdf8d983b944ab91d0af252ee4f6eb82db
 DIST pytest-3.4.2.tar.gz 812719 BLAKE2B 96623d6cdea4bd79778175c18c949938505f1862010f700f9a8cb85f445910381af391a5b69e664fbbfc254bf46502c798c72026772070236a0a3bca7aeeb3d6 SHA512 787065ab76d4482799bb2da9f024c9c383e68cc1cc01f3b80f6ed9444ca6383d20953615696ed4dd01668777b094cf5002b23c4ce51828879dcf8ebf2170c71b
 DIST pytest-3.6.3.tar.gz 830949 BLAKE2B 4c0df5d157b8bb0ac6261a793aac2a8074c869b1a7cbda3eda600c79648b3722eaf2a57514c1fece60e0aac324b8ed09e8e889dda268619204e9e1f1637e1c9b SHA512 e18d8e972cb1b05b037b9441eea5981ce036d8e2c2bab80f6e50f283df9bd08740296133990424cf78449f6d3d2fbd1d59709770aa972af99fe061583f2d79a7
 DIST pytest-3.8.2.tar.gz 869668 BLAKE2B 91d75481e4ef36ab06654b340751a33a96b9f6187cdfc65694973e2d4d7ddc5806fe673c87f0aa442c6c657a953b36c22d288eee8f61cc002be4be803bc98111 SHA512 5420de07ff741f64bcb7fce7bf3b5097cf63be2539c2e694c168bd824ba468ca87cb17be801b72b972ab417da98d1b5473f319afd642bf5c6c0270e3a697d016
+DIST pytest-4.0.2.tar.gz 904958 BLAKE2B ea245fab1363350d6e9aa0eab4aa5cd732561c6f4192e90f2fdc68b1a31941b91bde23b9840c3df7804a4712b8d26bd3b65d2789988e2994ad7c61a272184804 SHA512 6c77024cdd0a14ad417d7acece89e6b06530ceec1d6950a7cae265bddff44182d1839ced59c34ed9add8eb55214d69f01bd77499b8d3b483ada5ba47bca28802
+EBUILD pytest-3.10.1.ebuild 2190 BLAKE2B 51f2eae063abe8a901283deb9914a18258efa71084ab117bade90c9a945e203346ae2863571f5e786ab49450d9d171fd6d6a9ba3df2a0e3d23700548c010e73e SHA512 c422d28c466fd0771c70d33be2984b5e1c4c1e9142a341ab4207b62d52d98fa308ba28872685ff0b6a5cdb889745960b60a960ab4a527bad8fc8c8cba7f46487
 EBUILD pytest-3.2.2.ebuild 2113 BLAKE2B 1789686fa508f9629adc37e7fcd26e8a4426214b6335922927bcd8bb37c336792b564ce505c122a729edfaa53af604e4fd1be31f45c5251f0008e14c8cefb06c SHA512 1384082815df0f30e50881c89d81822575509f1333c2d3713b69ff7e3a9113c1a70fa5220d0e10bae0b5f17d844a14501e59af8c944ca4006dfeb9cd0e8616b1
 EBUILD pytest-3.4.2.ebuild 2509 BLAKE2B 23b2f34e9f2923a0eb143a341f4dff40e88d4ff1bf52cd7637d9354192ebadb58c39050feb00911993f0067d60571598864e5a85644b0adb33cab722594f9ebc SHA512 1958df6b0567c547bf70789836e12929caf3e1f17ac16ebad88aac081dce949888a08efceaba04649feb8098d4373548a5d4de511a8b94d6f50eebbd1d5d7b64
 EBUILD pytest-3.6.3.ebuild 2423 BLAKE2B 0440c961c535989ba617678c98e34986f856eb04069095f27c8cb6a0d4e4ec85cb32364e2ecad52f8f3b89e41f78a88b02eb9606f9bfe48c94c2e48644410652 SHA512 bf354801416969801698e10dd53c8c9d67d3c4947c072b9e5d99dd762de5214040fad2d150f603ce8e7b9ccec092786133de5dcd697ce60a99e8e79d1adfdfca
-EBUILD pytest-3.8.2.ebuild 2476 BLAKE2B c8b739374b066a518e0cf7dec00f0ce71ef9e706040d0477d5bc573d60c2bcdaa6f816de1f8867468de86b8aad32830ad9b8afe7ecfea649e85b5532593bfd08 SHA512 b336db17d2ec6738031700ca1855c2dce583b9a31d9c0d3e0a8080cf368cf7a5608b782cf799bb59c1c0c55c55345cef53cc964c8bf89437fe476dbd0503f2d0
+EBUILD pytest-3.8.2.ebuild 2534 BLAKE2B 8efa6c48c3c959ba5930070a2fe0308b1225bb9b1fe14c2f8ce026c7de5ad27e9a2f2ecaf44a9e5daaa718d1d7620a0b374e4addc47e95b35022921d792b3356 SHA512 754577850c79bc0e4e484d1c19fc96e380700d0b07fc2a2e79cb2fdc9b6db51181ad3a918102a7a2198d130d08e6bc7fe3104cc7048376813e14c0f4563edede
+EBUILD pytest-4.0.2.ebuild 2190 BLAKE2B 51f2eae063abe8a901283deb9914a18258efa71084ab117bade90c9a945e203346ae2863571f5e786ab49450d9d171fd6d6a9ba3df2a0e3d23700548c010e73e SHA512 c422d28c466fd0771c70d33be2984b5e1c4c1e9142a341ab4207b62d52d98fa308ba28872685ff0b6a5cdb889745960b60a960ab4a527bad8fc8c8cba7f46487
 MISC metadata.xml 309 BLAKE2B f29391c5f96f44f6329d3665346a5d46ecb4a86d103ae8008769af86126756e76bfa89cfe462e9c219e5f70b64013f662d020c7a2f6015d8cadd0eb25a7614eb SHA512 ba53c13ac716488e3e5dadf5dcfcb697dc9bb13f89e9d0fb98b9a5a6e36cafeeb64d1348008f42497117bf46fb6f3bc288c10a68c4d5ab53c9c02a3ae61b594f
diff --git a/dev-python/pytest/pytest-3.10.1.ebuild b/dev-python/pytest/pytest-3.10.1.ebuild
new file mode 100644
index 000000000000..7419f06cfccb
--- /dev/null
+++ b/dev-python/pytest/pytest-3.10.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Simple powerful testing with Python"
+HOMEPAGE="http://pytest.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+# When bumping, please check setup.py for the proper py version
+PY_VER="1.5.0"
+
+# pathlib2 has been added to stdlib before py3.6, but pytest needs __fspath__
+# support, which only came in py3.6.
+RDEPEND="
+	>=dev-python/atomicwrites-1.0[${PYTHON_USEDEP}]
+	>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]
+	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' python2_7 python3_{4,5} )
+	>=dev-python/pluggy-0.7[${PYTHON_USEDEP}]
+	>=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-40[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	virtual/python-funcsigs[${PYTHON_USEDEP}]"
+
+# flake & pytest-capturelog cause a number of tests to fail
+DEPEND="${RDEPEND}
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/hypothesis-3.56[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' -2)
+		dev-python/requests[${PYTHON_USEDEP}]
+		!!dev-python/flaky
+		!!dev-python/pytest-capturelog
+	)"
+
+python_prepare_all() {
+	grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency"
+
+	# Something in the ebuild environment causes this to hang/error.
+	# https://bugs.gentoo.org/598442
+	rm testing/test_pdb.py || die
+
+	# those tests appear to hang with python3.5+;  TODO: investigate why
+	sed -i -e 's:test_runtest_location_shown_before_test_starts:_&:' \
+		testing/test_terminal.py || die
+	sed -i -e 's:test_trial_pdb:_&:' testing/test_unittest.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	"${PYTHON}" "${BUILD_DIR}"/lib/pytest.py --lsof -rfsxX \
+		-vv testing || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/pytest/pytest-3.8.2.ebuild b/dev-python/pytest/pytest-3.8.2.ebuild
index 611ffc2ea856..dca19e60080c 100644
--- a/dev-python/pytest/pytest-3.8.2.ebuild
+++ b/dev-python/pytest/pytest-3.8.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 ~hppa ~ia64 ~mips ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc64 ~sparc ~x86 ~amd64-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 # doc apparently requires sphinxcontrib_trio, not yet packaged
 IUSE="test" # doc
 
diff --git a/dev-python/pytest/pytest-4.0.2.ebuild b/dev-python/pytest/pytest-4.0.2.ebuild
new file mode 100644
index 000000000000..7419f06cfccb
--- /dev/null
+++ b/dev-python/pytest/pytest-4.0.2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Simple powerful testing with Python"
+HOMEPAGE="http://pytest.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+# When bumping, please check setup.py for the proper py version
+PY_VER="1.5.0"
+
+# pathlib2 has been added to stdlib before py3.6, but pytest needs __fspath__
+# support, which only came in py3.6.
+RDEPEND="
+	>=dev-python/atomicwrites-1.0[${PYTHON_USEDEP}]
+	>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]
+	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' python2_7 python3_{4,5} )
+	>=dev-python/pluggy-0.7[${PYTHON_USEDEP}]
+	>=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-40[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	virtual/python-funcsigs[${PYTHON_USEDEP}]"
+
+# flake & pytest-capturelog cause a number of tests to fail
+DEPEND="${RDEPEND}
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/hypothesis-3.56[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' -2)
+		dev-python/requests[${PYTHON_USEDEP}]
+		!!dev-python/flaky
+		!!dev-python/pytest-capturelog
+	)"
+
+python_prepare_all() {
+	grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency"
+
+	# Something in the ebuild environment causes this to hang/error.
+	# https://bugs.gentoo.org/598442
+	rm testing/test_pdb.py || die
+
+	# those tests appear to hang with python3.5+;  TODO: investigate why
+	sed -i -e 's:test_runtest_location_shown_before_test_starts:_&:' \
+		testing/test_terminal.py || die
+	sed -i -e 's:test_trial_pdb:_&:' testing/test_unittest.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	"${PYTHON}" "${BUILD_DIR}"/lib/pytest.py --lsof -rfsxX \
+		-vv testing || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/python-glanceclient/Manifest b/dev-python/python-glanceclient/Manifest
index 3031b75ccc9d..8f832e3fb7f6 100644
--- a/dev-python/python-glanceclient/Manifest
+++ b/dev-python/python-glanceclient/Manifest
@@ -1,9 +1,5 @@
-DIST python-glanceclient-2.10.0.tar.gz 180299 BLAKE2B 0d97626361ad7fc2c688f5da6af6d49bf6e078f715560b4ac93725f8ea6df895e7eed0e44bf69399c973978af22ebaef3d371ae19026cff7fb2bd896c8be30d2 SHA512 9132493559d7a7b6de62e5ec1bdcd7a2dcf408c00bb0cfaccb6e11829975d468bfe68feabd71fdf8cc0d28a2c5c549945816aa14c9469314ffafd3d39b9c2da6
-DIST python-glanceclient-2.12.1.tar.gz 182868 BLAKE2B eec3751fc3ba9d820a92329bb5fe793a7173ab97fa4c17c2ec5c7ae87bf625dd4ef6bb3d0502c16847cdfc0a0c722b9043c4b11256563c593ced5a5b4f32f242 SHA512 080db737a3ac1e46cbad9c3da19b6383841a20210b2db7bcdf192db71ac530df13bf9dd9b5e8f5edda94170e26618a85afbcece5eb5147c5eb35fe8feb72bbb1
 DIST python-glanceclient-2.13.0.tar.gz 185962 BLAKE2B a0e1453124c199855a16843aac4155627f6e8070a5c5acb947e10147492d8f12514085d28cb060cf5f8577a60ab14c79104d1453947e71c2cd03f9c54d3e008c SHA512 e8a1551bc427c07e12bc869ee09cf5e11916c7ebbb09b924d765f682010d19c4467f3dc71b1839287dc83eb15841b05598e893cc718dfd6a4882340aa7a10c76
-DIST python-glanceclient-2.8.0.tar.gz 177172 BLAKE2B 0772b7e2b788b63bb590c8354dbad2c4e0bbd731f790f36916aeb154a44474f979961195d307e45149bccd2a58e1df72c48aa0593d6972c606b393f1202ee440 SHA512 257eaf1d548a3a6277b9c80e8b23b9ae4231586307c43a064754c227f3e3c872451ec0469aca931638ea0f7c9920892878c677b144dc72bad215c38d375a63d3
-EBUILD python-glanceclient-2.10.0.ebuild 2441 BLAKE2B 42a7436e9cc23de10ea276ee0c46ad4c8f86a767a5f8e406a57b444cfbf4e3019afdec95a4f154265adecac0b33bf6f142d15897a83e297fb853ab555ea6cb37 SHA512 b1cfb4b3ecb7f4baf5cc355a20e1417eb82e1f742f9d88ef908f816e53f34e8a88a5c75ddbdd8bd1116b9dd1cb7b45a2ea9bfa5e4e53f218f3cd8c3ef9559404
-EBUILD python-glanceclient-2.12.1.ebuild 2487 BLAKE2B 5e2987e3061e344429586ae70d4be1ec6365446ecc6e29bac474e9ec9e6696728cf5ad1bfa044cf60169ff8d18c93a5a13e1da63ac38bf8c24d94fdf7e617ac2 SHA512 9a758fbf78826f6cbfa1657695ee568d5073f3947bef1f705bba69f8f2f5a271212a7b02245f1f27027dbe68242c09e29fea25e8c99a588d65f68982213ffaf1
-EBUILD python-glanceclient-2.13.0.ebuild 2486 BLAKE2B 027e2d68e5760f7fef0e0ee3ed2dda74b469b07f7488b841458d631a822f8acdf147689a3c02431e867286305d16f569210945a5abfdea3813cdc4bfa6e8d4a3 SHA512 c094392ec23b511024280fe11d5a5a6738ee3aaa7625533c9be3015e236346b864e8756ec97fbfeb40d95123116f9bdc80855719501c95e5118f7d10bd6165e3
-EBUILD python-glanceclient-2.8.0.ebuild 2612 BLAKE2B 844e6ab91a070f9d20fd4418be7b63776eedc900c568ccf89f7c78f52f03fe6675e06249dc0eba5f56fcd70402d133192f77da1bc65ed1f71603852565b8f3b1 SHA512 ff395ab1c060e51278a7e5b6cb283827776a7a7d3e008d1fc0932412f05df0373f6d3f0bceec56e0d1e55d93d5256e59e6da6a15171b6f45bfc394a8a6f7abd0
+DIST python-glanceclient-2.13.1.tar.gz 187298 BLAKE2B e2fa34ea7840404e183fbb77592f656b296d54942581b2e1dda71285f791cf7f7d5b3b6ef2da28deb4e314f1d35395548e923f548854b7ad3ef4aa50ad000d62 SHA512 deb8454aea8b2c231604663fac2f6515e3cd6e86dc1cf3cd2174ba2e35f9d605bf162f5a089d80f52da11f97c540f5c160b96864b85d7535463ec170cba81689
+EBUILD python-glanceclient-2.13.0.ebuild 2484 BLAKE2B 11f52463f58d6722a349752ccea9607ec32298321578263799cf31d37f631e81bffa79d337fda38a8ee030033f7220fc17e6972975da3bdfe1b7b0bd00a62a97 SHA512 1de7499043022c97095739eaeadb6879dcee93b9814326470b083fcac62e1e854115b32c82aab556058513bbea03ece46be4b1ca34038e963bfb513425cc0d7a
+EBUILD python-glanceclient-2.13.1.ebuild 2486 BLAKE2B 027e2d68e5760f7fef0e0ee3ed2dda74b469b07f7488b841458d631a822f8acdf147689a3c02431e867286305d16f569210945a5abfdea3813cdc4bfa6e8d4a3 SHA512 c094392ec23b511024280fe11d5a5a6738ee3aaa7625533c9be3015e236346b864e8756ec97fbfeb40d95123116f9bdc80855719501c95e5118f7d10bd6165e3
 MISC metadata.xml 632 BLAKE2B 69885578505253d6ec3d0245779a89ebe5c75ab8a8e9fecbf95c29d4aa17ba6864e69c1806a01cde0e92080a86ccbae146bdb2c003f50fd3dfd32b6d2186536f SHA512 d807a9aadecb131f92d6a476a8bc0b0293d46c6ac761a2d1ddb596ac219c6c8ac349402e3f56d150e78ad81c5d2838a33b3d35222a18f9a416f969f6d6208d8f
diff --git a/dev-python/python-glanceclient/python-glanceclient-2.10.0.ebuild b/dev-python/python-glanceclient/python-glanceclient-2.10.0.ebuild
deleted file mode 100644
index ad9d27f9c42a..000000000000
--- a/dev-python/python-glanceclient/python-glanceclient-2.10.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Glance API"
-HOMEPAGE="https://github.com/openstack/python-glanceclient"
-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="doc test"
-REQUIRED_USE="test? ( doc )"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/ordereddict-1.1[$(python_gen_usedep 'python2_7')]
-		>=dev-python/os-client-config-1.28.0[${PYTHON_USEDEP}]
-		>=dev-python/openstackdocstheme-1.18.1[${PYTHON_USEDEP}]
-		>=dev-python/reno-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.1.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/openstackdocstheme-1.18.1[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.6.6[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.3.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/warlock-1.2.0[${PYTHON_USEDEP}]
-	<dev-python/warlock-2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/wrapt-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-16.2.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -e 's:intersphinx_mapping:_&:' -i doc/source/conf.py || die
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	testr init
-	testr run || die "testsuite failed under python2.7"
-	flake8 tests && einfo "run flake8 over tests folder passed" || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-glanceclient/python-glanceclient-2.13.0.ebuild b/dev-python/python-glanceclient/python-glanceclient-2.13.0.ebuild
index 0fec31bc89fe..8317126df93c 100644
--- a/dev-python/python-glanceclient/python-glanceclient-2.13.0.ebuild
+++ b/dev-python/python-glanceclient/python-glanceclient-2.13.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 REQUIRED_USE="test? ( doc )"
 
diff --git a/dev-python/python-glanceclient/python-glanceclient-2.12.1.ebuild b/dev-python/python-glanceclient/python-glanceclient-2.13.1.ebuild
index d6bfed0203ea..0fec31bc89fe 100644
--- a/dev-python/python-glanceclient/python-glanceclient-2.12.1.ebuild
+++ b/dev-python/python-glanceclient/python-glanceclient-2.13.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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="doc test"
 REQUIRED_USE="test? ( doc )"
 
diff --git a/dev-python/python-glanceclient/python-glanceclient-2.8.0.ebuild b/dev-python/python-glanceclient/python-glanceclient-2.8.0.ebuild
deleted file mode 100644
index d7d4ae555ce9..000000000000
--- a/dev-python/python-glanceclient/python-glanceclient-2.8.0.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Glance API"
-HOMEPAGE="https://github.com/openstack/python-glanceclient"
-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="doc test"
-REQUIRED_USE="test? ( doc )"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		dev-python/ordereddict[$(python_gen_usedep 'python2_7')]
-		>=dev-python/os-client-config-1.28.0[${PYTHON_USEDEP}]
-		>=dev-python/openstackdocstheme-1.11.0[${PYTHON_USEDEP}]
-		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
-		!~dev-python/reno-2.3.1[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.0.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/openstackdocstheme-1.11.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.0.1[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/warlock-1.0.1[${PYTHON_USEDEP}]
-	!~dev-python/warlock-1.3.0[${PYTHON_USEDEP}]
-	<dev-python/warlock-2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
-	>=dev-python/wrapt-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -e 's:intersphinx_mapping:_&:' -i doc/source/conf.py || die
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	testr init
-	testr run || die "testsuite failed under python2.7"
-	flake8 tests && einfo "run flake8 over tests folder passed" || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-iptables/Manifest b/dev-python/python-iptables/Manifest
index 8307a6d7a55e..22becd18037d 100644
--- a/dev-python/python-iptables/Manifest
+++ b/dev-python/python-iptables/Manifest
@@ -1,3 +1,5 @@
 DIST python-iptables-0.12.0.tar.gz 40831 BLAKE2B ea53605a5dd581cad7e05059c1534376a53b3b3da89b8c172cbb38ae7482ca3972fdf786badf3328960847c12c96ce32278657c32c857a1682650621a3add47a SHA512 bf79288fac53542e523c8ed0e4e0711792cf524100e39f57f10d3581d1b958712875a765f690b3d5ec6e28af9de48d2f3dd0a787c7037ebfc6f8bf87b5e321b2
+DIST python-iptables-0.13.0.tar.gz 83456 BLAKE2B 9c8da40437d408c6bb49e700b8d1663e7fdb0a1001b15409cf4c8b9edf612f75eb546207bc86d0535f8fb3744e42244f3e067dff80037c5a3eadc028ec8024f3 SHA512 1693924b8ee79b3b0929b57e86908282d53d28044b063d7bd169a6e9c1b45b5b6b4a79e54d024beedbfd6e42f88417eb2d0312bf90895702a3b8bfe2c2eb22b2
 EBUILD python-iptables-0.12.0.ebuild 930 BLAKE2B fd4701dfbab5e7348088e3a686c02bcfac8fb809d9270568a839fc0dc6147665345433799352e2ec8b48bb686c6293241c520433f3c4977116c9adbc9276ff16 SHA512 0658bda1fa29b4f61af9ea99c4624d8afd2a9cd6c20767b90bc897628a74110a3d366e92c2582d8f4fa7909a59294ff4ffbc25bf92baee11ba0a37992914926c
+EBUILD python-iptables-0.13.0.ebuild 929 BLAKE2B 6a5bfe9194093d0eae04df964915e4ebc21c3450a88ce0ea593b470eed2884b48f3492175c3f5d831e78554c6ad3b9c44c0f0547e882cc46a0a63c6336d2c35d SHA512 3694563703716dd3dada70226a1c82fca83f05fbb04cf30ce07350e8b3d71ec03f3893b97b99f3dd8ad411a45e5f1b5b85f04a31461d38c40ca413c40817dece
 MISC metadata.xml 1340 BLAKE2B d7f6bd56d29a11e19dc402343c03007866bfa0e33415317d866bdc9e7b76bd2cc35238270db24299cb31986166044f5bbc84d90efa37e9fad36fe8b16ffc3e03 SHA512 90c875cee0c4ea9e2f34d509152cdd4d83a41010b8a858515fa3bc766bb0ba11e047957f4c005fdaf2e49b088df78cb3b4414a5ecfdb1b6ded550eb6c9dd01d9
diff --git a/dev-python/python-iptables/python-iptables-0.13.0.ebuild b/dev-python/python-iptables/python-iptables-0.13.0.ebuild
new file mode 100644
index 000000000000..bfdad554d969
--- /dev/null
+++ b/dev-python/python-iptables/python-iptables-0.13.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for iptables"
+HOMEPAGE="https://github.com/ldx/python-iptables"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND="net-firewall/iptables"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+# tests manipulate live iptables rules, so disable them by default
+
+python_prepare_all() {
+	# Prevent un-needed d'loading during doc build
+	sed -e "s/, 'sphinx.ext.intersphinx'//" -i doc/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+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
+}
diff --git a/dev-python/python-ldap/Manifest b/dev-python/python-ldap/Manifest
index 4b6d8cc108d3..4dd9348581bd 100644
--- a/dev-python/python-ldap/Manifest
+++ b/dev-python/python-ldap/Manifest
@@ -3,6 +3,6 @@ DIST python-ldap-2.4.32.tar.gz 126025 BLAKE2B 2e16942680cc037c1251f500855c10de8d
 DIST python-ldap-3.1.0.tar.gz 366019 BLAKE2B 19e95ee096f40cc195257f82ccb5f882cc521561b14e77469be91e013d6b566102c6b426463e68353a3140fc96ebc622deed94929a3aa81cc14cb072440efe44 SHA512 71948cbae1c9a47f9e68fb8c6d65d91a2992261dd9aa535a0453f5733be1c2a25be1dda3c84abc6bdebab92150c89cc8caa757454331a0303de4fa46788b414a
 EBUILD python-ldap-2.4.19-r1.ebuild 2449 BLAKE2B e437b242e5305d3c29607d43f19fa757636bc317aac8e84c890b4c270d7596bc6996690afd0313e6e58629168821993ac58db3714bd54c5c8ba04be425491e30 SHA512 55c4ac061238dbe84adf20306ce43a67f88095d3c74fd3ab8c0c0ffe8a556b31c8f530b2806aa0f031accff334f68e8333ce213fbc2de7749389de2d27622615
 EBUILD python-ldap-2.4.32.ebuild 2237 BLAKE2B 3e1c72a5d80eea98345d60800c20403ff2802011b3a5309766aab9b569ae88400d3432641f39ba0a33cb1fa51353e646c155f7789f0cfc782e57bdb74c4e2114 SHA512 3af8086172a8fb7664ea098a7b3e5e12196a37bc79ef55e209044bef44fde61c776a7e7252dde7e010972a8ad2706b5ad7b5576d0733b62b1d12a8d31fffaa40
-EBUILD python-ldap-3.1.0.ebuild 2266 BLAKE2B 274cf8adc7b776bb11fa254510540a37a36e9b6f219fbdcdc699be3fb0cda4e8b3255a9e5c49b489a90e73a16c5ef7602d8331a8b33ed406058f899e4b7bfba7 SHA512 5a936098e8772ba7cafa88f818348190b088f4ad92780cd2b2ec518ed3471faf4aabe560ee90ac1eae15e99159607e83c3aace8faa3f2db74e604ec05b469be7
+EBUILD python-ldap-3.1.0.ebuild 2268 BLAKE2B b334344bad9003fae0932ffacc09f7cee77a5fe75f33bfbe0edffb5b91716103339d40d69a7520335c045b62b3b096f79a08d7bddbc396f18c9f52886bdc3afa SHA512 47057939a03265338c9c3eb242ad4ac567cbd1c649f6ae6a3d52481ec5191cd498b1381d1b732f722ce11691da7a9fdcb202fecf8d8b83d8dc7f1fc6c3b095cd
 EBUILD python-ldap-9999.ebuild 2266 BLAKE2B 274cf8adc7b776bb11fa254510540a37a36e9b6f219fbdcdc699be3fb0cda4e8b3255a9e5c49b489a90e73a16c5ef7602d8331a8b33ed406058f899e4b7bfba7 SHA512 5a936098e8772ba7cafa88f818348190b088f4ad92780cd2b2ec518ed3471faf4aabe560ee90ac1eae15e99159607e83c3aace8faa3f2db74e604ec05b469be7
-MISC metadata.xml 552 BLAKE2B 48eaba17dbf8ee407801e6f4950874227ba39d4a3339021095d1c75383573a57489f932c06b7a494b257f437b776c2558bd18616bf410749d37b245edff0447f SHA512 baf67ec7b506fbb2b2ca508c51a559c8c177836af54f57187d9dd88bd3754e1e6ea626be779579fb125eecd8d07c267c7bfacfc1b587805079ac71bd22959605
+MISC metadata.xml 448 BLAKE2B 4d845f5269cc16dc38e4516d15b3bd66e8eb793fa8d43cca45ef4e04784231757cab47386d43f9361de45889abe21557696d28936b1fd76cead93775393a60e6 SHA512 806ea3543e12f0b571212695f4d9e9e008493550b29b480fc022b55ce2ee1fe561e9eb3a81e887457b7c1cb98fb2c6d46f38890513cee9f4808351821b4f01c6
diff --git a/dev-python/python-ldap/metadata.xml b/dev-python/python-ldap/metadata.xml
index 1a5aee08dfb4..87424d50628a 100644
--- a/dev-python/python-ldap/metadata.xml
+++ b/dev-python/python-ldap/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="person">
-		<email>xmw@gentoo.org</email>
-		<name>Michael Weber</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
diff --git a/dev-python/python-ldap/python-ldap-3.1.0.ebuild b/dev-python/python-ldap/python-ldap-3.1.0.ebuild
index 6fda62951210..edd48eb5f1a9 100644
--- a/dev-python/python-ldap/python-ldap-3.1.0.ebuild
+++ b/dev-python/python-ldap/python-ldap-3.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-solaris"
 fi
 
 LICENSE="PSF-2"
diff --git a/dev-python/python-linux-procfs/Manifest b/dev-python/python-linux-procfs/Manifest
index b5ce9619bf77..b27face54c05 100644
--- a/dev-python/python-linux-procfs/Manifest
+++ b/dev-python/python-linux-procfs/Manifest
@@ -1,4 +1,4 @@
 DIST python-linux-procfs-0.4.6.tar.xz 52640 BLAKE2B 99da58f6b4e127b24acce2cb37b86c7e8aba4d85c8911be96dc54bf18499b6783af5434e93e85a82ccabe7903ae8884e41b7f74a4bad5ab472556bea78c0db25 SHA512 81dc936c76c2b3272dde85148bfa929e13531c43f7aa61da3def7546fd8c2a257b130f8ae100f1d53936d3dfaebb1ef5b52c022d146f3ed7ef00359a24d05b89
 EBUILD python-linux-procfs-0.4.6.ebuild 533 BLAKE2B 3b43a169e46a7376fd9becf63989561fea907c628fdbd785098b87e08c15ab3440f5bb8e0c348b56fcfd2c3a130b9ae10bc831298e5b03932628e64e0c50270b SHA512 09afc67c4bac441a62525d19b64e9226631f168faa946af88513a8a7506355061ac3aeb3cfdb025eb16ad469730b8cff5f209b8d93e10542db75d06a8a29bafd
 EBUILD python-linux-procfs-9999.ebuild 570 BLAKE2B d7fff04fb39ac6ee9679823687e0ddcaea0dac0a540333ef03f539986ca28bb44eaf790ab6cc4cdce1edb83f317b1a5459af1745b06febc4c834fd847b3caef7 SHA512 b6e14a493522aec504bbc8869c7725394140a89a18311b20093fe1c66527ce59e39188201ab82fdf7bdbbe281b045cd8d4bd2ee01f13c3a75100e2dd7a6da552
-MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-python/python-linux-procfs/metadata.xml b/dev-python/python-linux-procfs/metadata.xml
index a535b8852829..6f49eba8f496 100644
--- a/dev-python/python-linux-procfs/metadata.xml
+++ b/dev-python/python-linux-procfs/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@gentoo.org</email>
-<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/dev-python/python-ly/Manifest b/dev-python/python-ly/Manifest
index 59d6c62d8685..43ab0e799ec9 100644
--- a/dev-python/python-ly/Manifest
+++ b/dev-python/python-ly/Manifest
@@ -1,5 +1,3 @@
-DIST python-ly-0.9.4.tar.gz 175768 BLAKE2B 29a0d55b94f7fa3c62cd1e32297d212fc66b5cb97f20fbee3cb2cc39739f66fe85ad98cd167d2c6d54a445312984ee171cc7169e678177a700a6bdef4f0e6739 SHA512 0d94001d6e4d4eb750a974a67cdce1d3b2f09f693b74cb18fa9dc20dac986373380a58e138ab1f7a427bcc3d2de6343e664a6d58ce8bb23b3804fef68a8a9069
 DIST python-ly-0.9.5.tar.gz 174780 BLAKE2B 9cac626f5f363a3239e0c60772db864ae5764a9c3556a484182f18a407b3171d796ddb3549debbb4ce91129b9956a224870ba4b63d8e98228905de3ae4abc3d9 SHA512 f43aa4fce0af970dd64b0cfb75caef57749048d4eb088de6e08e820935c359203de9e99134a0248f7dc26067d0e4eaf2b373a5a2b746e09dea7997437f99812b
-EBUILD python-ly-0.9.4.ebuild 424 BLAKE2B d9345fe0c4d83f2755553d92f5e364f30cda2183ec034bd6eb1d8be1b0f846fb2b5658f11bcb1a454a6847e537cdce169aac5bb3b8784d444411fba2549e0453 SHA512 0a75509957c1f77f18f6e14bf4b76294466b917ede122cbaacab56d8180b8d84c38ab9d8cb228d42451ec1d8e66610fea1b7eb8a24820c69130c8d54a7437f02
-EBUILD python-ly-0.9.5.ebuild 428 BLAKE2B b067cc7cfdd9a2d5ea251d5438340e334b29af19106c7fd531bb3fe7e3910aaa53f05a9c7b12a9fdb06da5398f12c4aa2ce3cd79ec36207b35d955cc0dc82a10 SHA512 5c1c55b54d47a21a386c33df4204b808826cb3818a88b63ea0b3562e0bc9071714967a09d42a35176c36ef1903c79698129ef42c54dbb4d2b8e64a9fe87b24c3
+EBUILD python-ly-0.9.5.ebuild 423 BLAKE2B 3bf3313c02f50a1bd09986d302174340667c27ed42ef2f64b625e8ff24bff4273218bb2274aa6c24a676600c7b7813d37af7a715006a299f32ef2255396b839e SHA512 9670926611bb7e9e729d334f28678072de72bd30812820cac69c16e97b28ed7bbe395fb3fb31786ee088a4c0555d6921b9f36171397dce7d82028aa584f7c201
 MISC metadata.xml 513 BLAKE2B 3e8c2bdaff60901f36e35d28e065f802890107ef53fe2f933fd4ec847ff8f76dbc65146fb9c8e78fa935ffd5163cb4f599a57085fc49ebb2ae6686ce7520d686 SHA512 f90695e7f138a3c7a5397f0fe7170fd1ceac05245e70d922074c3b34b0ca426a12286a8451e02138be035f5fa94bdd9254e8e6f64c1464f52bdf4ec398403cbb
diff --git a/dev-python/python-ly/python-ly-0.9.4.ebuild b/dev-python/python-ly/python-ly-0.9.4.ebuild
deleted file mode 100644
index 0c61c6370a7c..000000000000
--- a/dev-python/python-ly/python-ly-0.9.4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Tool and library for manipulating LilyPond files"
-HOMEPAGE="https://github.com/wbsoft/python-ly https://pypi.org/project/python-ly/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
diff --git a/dev-python/python-ly/python-ly-0.9.5.ebuild b/dev-python/python-ly/python-ly-0.9.5.ebuild
index 6bdab043c960..00fc51564e34 100644
--- a/dev-python/python-ly/python-ly-0.9.5.ebuild
+++ b/dev-python/python-ly/python-ly-0.9.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,4 +12,4 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/dev-python/python-openstackclient/Manifest b/dev-python/python-openstackclient/Manifest
index 426b5291024c..a535bcaa9bd6 100644
--- a/dev-python/python-openstackclient/Manifest
+++ b/dev-python/python-openstackclient/Manifest
@@ -1,5 +1,5 @@
-DIST python-openstackclient-3.14.2.tar.gz 668307 BLAKE2B 32bcd033f856e29d5ce7c190025b15017427f2ffa0fd5d311ddf57567184ae7565c50f618346476afdc8802a6d50d3578338e436a28e18494351b982b5b803d9 SHA512 118053f339577832b2c7bd9e62da67ad631ce2ca514009e767538be99d14580f066e6efdac8a93ad4df8cee1d19c41ecfa5fc7b2b9ca3fe0f1d664abedf39a42
-DIST python-openstackclient-3.16.1.tar.gz 693759 BLAKE2B fe4cea827eb88ef2aee105c6fcfaa282a57579a78c894c783330ce1515877f803215c937789e161de32836476bbe30052cec1fbc2dd7d5df2a817f24a0cbd7fe SHA512 e51806cc0bb2caa88090f518b592695d14190b2e14c0e647b69b977b30f288a8038be87aafee8332fe1ec707dc4598db7661668f0eb863f6c43c2f1d11e75d26
-EBUILD python-openstackclient-3.14.2.ebuild 1294 BLAKE2B 81ba4defc8ad8c7af27d81aa9358e64b8aefa40e80480ea9122209fe9287fbab890cb5db71383748c4b24c4fc046fed4e77b5621592f09398869201e935da027 SHA512 2ef2bbb1ec2e62b9c7569179d87cdc0dd41f5d2550d2c0d3eae1fa3fac20fbee017d0f9b244be065478bf864e4f1f6d8d92087658bb5ca31f4de1eb0b463e54f
-EBUILD python-openstackclient-3.16.1.ebuild 1296 BLAKE2B 56a1f92e6aee31df89614e38286728f0b818adcbe2a13a7102ded71f4a3ea427a184102b2a9207b712aac206bd0564980fc116374ed2cd2380f5849563c2d347 SHA512 9f9e87150a57efccdb990509fc895d1dee38daf16ba38b2c2f999e9688dd0d3e98af754018308728e39f436f2ebc2cc97399f3a7eb14868b9030e7a20c3ced20
+DIST python-openstackclient-3.14.3.tar.gz 670217 BLAKE2B 1b9b9f2a1ae4f4fda943cd0ead35de27446e6b6e616f196094f6a6870c657e0569ceea904ff31cef26d6af35186e5a8a5a64724156a0a82001543c34410fc7a2 SHA512 b3f81272fca1e47f241d95901081f711633ac984377e1ae8c5ff32b1fb256a1e409a404c92a8d933425ec98eb15594667556b3e97c4ba7398ea83becc5cff893
+DIST python-openstackclient-3.16.2.tar.gz 697555 BLAKE2B 11a911d8b11912d70c5e05df51b1d405c4e6a36b20378e89c8bda26dc7802d33fb4ca6b4e9a16b92bd6d0c33dc681b7540fc9af84742d42f69dd17d568558ceb SHA512 4966dc35e80c8b477629bd06c8f25c14ec32240669469c1b61b971654b0a62a43f5da7601343c40362b19f91c3c5a1e45b34c0c7c94da89e1503247d5dd80b56
+EBUILD python-openstackclient-3.14.3.ebuild 1291 BLAKE2B 62da6bdc39e256ea9dca8a71647e743c980cc8de49eb18e8332d887b0aed54362e24b85a644336e0ab49aad6d0d853706048066806228249043ec55e274823c4 SHA512 7ae7151d21bf88b8156bc0d403bbfd1d4d3a6f8778e6ab964475262b917fa347b666ef62e2d447762ce0a1cacb62f151112fb399d98e967626e4c6581b02db1f
+EBUILD python-openstackclient-3.16.2.ebuild 1293 BLAKE2B bec6392dc315f5d1868300f0841ac99b4d578610244eb1b5f58975e11ccf1e775e6c22744ef7084df430d6526f0a961314fda37033435f7099b863cb282f50b3 SHA512 9873eeeeb62b347cf6fbf807961f0ee020b5cacd3d66cf4a8f80d5fe1213d813fa490ec6beb8dc9c8d5f3e1ebeff2339b5737825a212a19efe9346b9ca235afc
 MISC metadata.xml 632 BLAKE2B 4e989558d44ee733b380fae3f269ec9ca0c511caa1fd8259cac90dd3ded82f4137444f32801efd2440da95b98c2864509c5068432de830591ccaed2072029c91 SHA512 c37cb6d5ee55b8f7184a2db66dab3e6fbc3627b1869487e9d4e00928cdf1dbfb5d3d28a2d7f72290503b10b393a193a9849c497df6438ce230e418b68fd3ca4c
diff --git a/dev-python/python-openstackclient/python-openstackclient-3.14.2.ebuild b/dev-python/python-openstackclient/python-openstackclient-3.14.3.ebuild
index 93414f0da349..e2774d4b1f37 100644
--- a/dev-python/python-openstackclient/python-openstackclient-3.14.2.ebuild
+++ b/dev-python/python-openstackclient/python-openstackclient-3.14.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/dev-python/python-openstackclient/python-openstackclient-3.16.1.ebuild b/dev-python/python-openstackclient/python-openstackclient-3.16.2.ebuild
index 9b6ab365734f..d8057f62dba1 100644
--- a/dev-python/python-openstackclient/python-openstackclient-3.16.1.ebuild
+++ b/dev-python/python-openstackclient/python-openstackclient-3.16.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/dev-python/python-sqlparse/Manifest b/dev-python/python-sqlparse/Manifest
index 39d2c805d61b..bdbf1ed6694b 100644
--- a/dev-python/python-sqlparse/Manifest
+++ b/dev-python/python-sqlparse/Manifest
@@ -1,5 +1,5 @@
 DIST sqlparse-0.2.3.tar.gz 60742 BLAKE2B 38d3f17d196d3a1d50ea75810b5bd3a890c6f4b12195621d571d62b8c40e2e2d13034deddd95288df37a15daba28153a5ca9221b78bfff1c0e3bc37eddca2dba SHA512 ec654e680f8ce423a89da92c4c74f85e652bebb19e9a40ab0b8067f61803897e49e1e6f8dd1ab454b1ed130974d76b4f973c799264fd4bf8a87f034ba9c44835
 DIST sqlparse-0.2.4.tar.gz 61614 BLAKE2B 2462fa5d77ca2c3028aa3539bedc3cb2d7abd35db3c736ffd8abad8626a33174787f0079453ec646739749c8860fce0f1c7d815e6a8485c24b851a40b5bf3b87 SHA512 abea0f084778976f2d1086006eaa88e1fc1d2580654d063b35557a44d9d9727b410a022e8ea06ae3b265f2829d49c48d347dddc61f2e56be9c3d6207104712b2
-EBUILD python-sqlparse-0.2.3.ebuild 1331 BLAKE2B b2ecb2330cf5b911037b1e6a8c8f01c53d27b927135069e7a3c8d30933811cea92b7003212eff8a334f489bd938933e41940b57ad7152a9c8d6339bb7f5479f3 SHA512 b451f3f61c3831333c59238fa1bad6c03ce9baecf430030b3f55a31939842823b2a30b2004e15935b29621db70f4b20d41754d1e5230f7eb207ec765fc78b921
-EBUILD python-sqlparse-0.2.4.ebuild 1331 BLAKE2B b2ecb2330cf5b911037b1e6a8c8f01c53d27b927135069e7a3c8d30933811cea92b7003212eff8a334f489bd938933e41940b57ad7152a9c8d6339bb7f5479f3 SHA512 b451f3f61c3831333c59238fa1bad6c03ce9baecf430030b3f55a31939842823b2a30b2004e15935b29621db70f4b20d41754d1e5230f7eb207ec765fc78b921
+EBUILD python-sqlparse-0.2.3.ebuild 1333 BLAKE2B d44fccde2d40af01692fc1d83156c879f7a51934754d79a53c81cd713dac9551f8e7ac367ad638265d2c2f7cb37bf8949e6794ad3a4c2a3943029935f65a0223 SHA512 144b388deaae1ba6dbd1481ca964c2c58531adc8c1f6b55d730fe071b1a7b4c229ab0edb244394554786928c0d2efe4c40c3bcf087212d88f26f443ad6b1c56a
+EBUILD python-sqlparse-0.2.4.ebuild 1333 BLAKE2B d44fccde2d40af01692fc1d83156c879f7a51934754d79a53c81cd713dac9551f8e7ac367ad638265d2c2f7cb37bf8949e6794ad3a4c2a3943029935f65a0223 SHA512 144b388deaae1ba6dbd1481ca964c2c58531adc8c1f6b55d730fe071b1a7b4c229ab0edb244394554786928c0d2efe4c40c3bcf087212d88f26f443ad6b1c56a
 MISC metadata.xml 453 BLAKE2B 2b04f47b565bbce71b1ddf27bedcd903f123751e7524ca62ea280b96788dbd14ae18513fda8eaf563d927c09dff7094b6a5c0d651c0530f2d3e07ee1d092c946 SHA512 5bb3c69c2dd5bc8ad2bc8c4a174be8627ed54ba0055bc153d36733f964ee289d71d0b392ec63127482a87f5f56fee9cf2900a2830a0ffbb733b1119be4abc0d3
diff --git a/dev-python/python-sqlparse/python-sqlparse-0.2.3.ebuild b/dev-python/python-sqlparse/python-sqlparse-0.2.3.ebuild
index c29badf7f599..6e152fc0b25f 100644
--- a/dev-python/python-sqlparse/python-sqlparse-0.2.3.ebuild
+++ b/dev-python/python-sqlparse/python-sqlparse-0.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/andialbrecht/sqlparse"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 LICENSE="BSD-2"
 IUSE="doc test"
 
diff --git a/dev-python/python-sqlparse/python-sqlparse-0.2.4.ebuild b/dev-python/python-sqlparse/python-sqlparse-0.2.4.ebuild
index c29badf7f599..6e152fc0b25f 100644
--- a/dev-python/python-sqlparse/python-sqlparse-0.2.4.ebuild
+++ b/dev-python/python-sqlparse/python-sqlparse-0.2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/andialbrecht/sqlparse"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 LICENSE="BSD-2"
 IUSE="doc test"
 
diff --git a/dev-python/pytoml/Manifest b/dev-python/pytoml/Manifest
index 30bc814faaf2..ae70e904fd37 100644
--- a/dev-python/pytoml/Manifest
+++ b/dev-python/pytoml/Manifest
@@ -1,6 +1,9 @@
 DIST pytoml-0.1.14.tar.gz 7679 BLAKE2B 071ea5f91f9bfb07b55ce08a5d055b9ecb5425534380f16074452dab9a740aceabc7cb50c290cad388e1ce3854b561572577c50f4fe1ac47b7baca8f7233cd6e SHA512 1a608dfa563ebf979bd72b7fad755d3c02afbda6cff99a0ed9a36ca8eecaaea5f89b7b39ff1f5204dd7302e8957c8304dbc4c221e56589c7654edc0fe93f3178
 DIST pytoml-0.1.18.tar.gz 8110 BLAKE2B b3c68b20abc919b1c2f9849f8f754d1e9e2df1832a573a8b660d665dc05d0ce1f7501ef898b96e56e1136b19953386fb0386c4551b5e25c5c5f3cce16ee6a702 SHA512 659fcb9ad14e11dc5f6dc8a9a74e8d88b1b712f889e4ca35a014b4743950e81aa468eef536e159ae26b9fceeea8c2da5f6b0c5db083f467a929b3308daa3bf2f
+DIST pytoml-0.1.20.tar.gz 8529 BLAKE2B ebd2ea0ec2ca3477371622a003b6a84d3b108c0a36b76e2fb656a8cc59406c39d0158986aef5aafb39036624871f3185041a1314866f17fda1d28cd8e7cde802 SHA512 9b913219e65e2329302455a1457a39cf5eb37e04c03025dfdbb81db4ffe60b547fb7e64fc961608004900365ccfddb4225042105fa2db8bd2e393fa2797fc24f
+DIST toml-test-b212790a6b7367489f389411bda009e5ff765f20.tar.gz 19525 BLAKE2B 4a0a90406c4388a4834f33b637569d156b1ed6b0006b77b44dfcc6968349b745217ce40405aad5680a690bb9c5ffb2dfd7e716ecf214a7354e7727a212914a72 SHA512 94dc6ddadac2c75095b1a9ef7c4f68e38908bfadba53203b75c29c7aa8d3c387c1f05cf9915c2c63eeee869f4290cdcef4b8768cb36dcd4031168b5af549bb54
 DIST toml-test-fa9501a192b7c46b82059caddaef978e3de883dc.tar.gz 16627 BLAKE2B 8cfa6fbee59f6482e22a03034ea0c37751fce337b7b7f652d959365c05201826344c1096f0a696aa84c0cd2f79fa3df6dbac73c1bf32f86d5e84db77a46c3fc6 SHA512 fea37ebf547633016a83c8e59e7d01a8df2e2795fdb8954246d10e4763675474e112fc52adfed38d3d8ce25bb5a60ef820f798aec2477b0fb7755f1cd6a66a98
 EBUILD pytoml-0.1.14.ebuild 761 BLAKE2B 2ad1fc738d3424daf9b89bd3c15461a13cdb3dedfc85e07b5dca7e7caac513417830fa78890f8a3a34b004ec043d318431112f27d4e5637b7344e9a1e5ecce39 SHA512 f2d2b977649851808b3929aff22580e8108ad1d46e903b272e8a09976066585a3990b673a20462a42bbbc9785a02d64df121256f4ed258a8ccb22620767abff0
 EBUILD pytoml-0.1.18.ebuild 761 BLAKE2B 1b8d6f0ab900f22d993de61e22797643eadb982375b63961204a7820ebb9806b57c751c6f33e86911a43e4f53845507f0d14c417c21ad5d5e34f74370fb049ef SHA512 e0ba829c35672311ff6927db417b003878c6887210bf485fda8eed54d7176c5c82dd8fd9db6b35b7361d4c5754e301cba18a2a3124ba493db8aaa70ccc41d2f9
+EBUILD pytoml-0.1.20.ebuild 758 BLAKE2B e4d3895883f2affcfa380c1e54586d02b980c96f75138a856835b1c2cee5a6e4d6343db4f71ab40c557a9396beba9ac4824a6d156e76be4ca8ec1190a20deb38 SHA512 c8610fadbc029c7aa1f5442e07422fc72cdd57dd3ba25638c229d37093231311e36e2d40f632749f7b67adb7e700c1ba91108f22453136e1f20acf6a19863966
 MISC metadata.xml 362 BLAKE2B fade23ceaa3b73c711e020a55500ce06c2b948a3dbafc1d39900c813a19716a8c3688ee1c83e500427b361559b6cec31f354a33f8ee72669ddb1e46ab6ffe45d SHA512 6122e392ec59d0c033d04e9b5855c28f81993755a1be2b688608a4efecbb6fd3f61fb5a6d41b3af294b1c0beacfd8edec39a454ff2a34ed0db088399301bdc0a
diff --git a/dev-python/pytoml/pytoml-0.1.20.ebuild b/dev-python/pytoml/pytoml-0.1.20.ebuild
new file mode 100644
index 000000000000..7c1a378738d4
--- /dev/null
+++ b/dev-python/pytoml/pytoml-0.1.20.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 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
+
+TOML_TEST_COMMIT="b212790a6b7367489f389411bda009e5ff765f20"
+
+DESCRIPTION="A TOML-0.4.0 parser/writer for Python"
+HOMEPAGE="https://github.com/avakar/pytoml"
+SRC_URI="https://github.com/avakar/pytoml/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	test? ( https://github.com/avakar/toml-test/archive/${TOML_TEST_COMMIT}.tar.gz -> toml-test-${TOML_TEST_COMMIT}.tar.gz )"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	cp -R ../toml-test-${TOML_TEST_COMMIT}/* test/toml-test/ || die
+	${EPYTHON} test/test.py || die
+}
diff --git a/dev-python/qscintilla-python/Manifest b/dev-python/qscintilla-python/Manifest
index 05cd8824fb47..467aac676d66 100644
--- a/dev-python/qscintilla-python/Manifest
+++ b/dev-python/qscintilla-python/Manifest
@@ -1,7 +1,5 @@
 DIST QScintilla_gpl-2.10.4.tar.gz 2721322 BLAKE2B df50dd0a34db96dd57147ddc399d4a30751b1bb4922dc1b8b3c3c1989e810937dc8345f92128e8a606b1edc04fde4b930a424ab8344818c9899c8fe496793a77 SHA512 dee6684f68173784d098931554c839a30e129b89f980cd9704f818c44eb7023199bd3682e4b342091fa3e0ce577ec576d34046477bdd1d7fc58ca5dd2ba947a3
-DIST QScintilla_gpl-2.10.7.tar.gz 2734778 BLAKE2B 9fea764828e1c95ce842b06b06c45398b52669c0823a660bcd45a4af4a33a4a5b75b6349f84dc844e18d394c301bbb66f3485abd9f56a5c056d2b507b67a0148 SHA512 d5489a308da265f09c305128d9984b195c90003e52a55f5342c8ea50090392619425a0fc3df692aae0d09467d5b0b496b548eb31ff93cba97c9f4f406500007c
 DIST QScintilla_gpl-2.10.8.tar.gz 2736054 BLAKE2B 4bc7a2bc1974f8e10a96b7716a8e35d4854e9eeb8040734f99b796bddd9679ee2539f6517743689f9d7deff9ce523cdbb2f77ccd65eaadfc947dcc7a1337d918 SHA512 c0a216737dbda6bc390225196b37a43e4884c9cd67e6e81fc1b1b952683fe88dbfe7caf3c66d94a378f37502e1f08cbdf788426248e73f5f66ec65982b7652b5
 EBUILD qscintilla-python-2.10.4.ebuild 1528 BLAKE2B 45e4c6320d385e1653b710bfff8e085db962365615f5fdd297fa1fde160e8467b47bf5e4fef379094fe2515f885581393c7b6945795e7928e56061e68f2c4601 SHA512 47d56ca71160e66b44e6dd4ffc37cd368b97e1216703fddc30a2628dd03ca89a0507376bf9c566fd71b13f074093ef8c38501827d3cfbf947d042c05e4faa4ed
-EBUILD qscintilla-python-2.10.7.ebuild 1536 BLAKE2B f2c117e60e445d0697e41a7a526065e15dc64ade059b8d21f535f11d889d089428f50ac4358c585cded52c4e9a9ccf1525e9d79558ad4d5463d268cb84e2c865 SHA512 4851048fbc6b630f53c43b9ae4eced755d33068585e0f01ba6daed5cc7c6746ee8432394c58ef0872efc42f29f6a0f35c9349a5baa8204367886345c11d546e1
 EBUILD qscintilla-python-2.10.8.ebuild 1555 BLAKE2B 2175851a7f982fa4895bf71ed9680b02a214bf22fa8a2d0b1d0ed2059a9a42f8813ef321b29bc2762cc436a0c5cba7f94a99897cbf60f1494f23f4fe2b484d15 SHA512 0d754ec573d6e689d4bbb8c036444b5cc66c3f906f1e1cc7849763f154c0e668c4725707fecec29cd7cd1d4422dcca1bce287cd33d818f4ef298ff9acb2b05c5
 MISC metadata.xml 666 BLAKE2B ca3cfedb72c4bc624270f669034a78c1fd41ed48a261b6d2fd84ee9994d130d1b558578925028eed57a85db021f3cfe4b70e51eeb9a42f4f71392994f7bade82 SHA512 f78ce18443d32b17307e96f8177bc5fb46f5b9f6b4d797e79dcacb6eb76bba578f7d666469576bd5e326717bcd9167fe34a5e1bd1ead5679619816ef8f0363da
diff --git a/dev-python/qscintilla-python/qscintilla-python-2.10.7.ebuild b/dev-python/qscintilla-python/qscintilla-python-2.10.7.ebuild
deleted file mode 100644
index fd7315c51ce1..000000000000
--- a/dev-python/qscintilla-python/qscintilla-python-2.10.7.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
-inherit python-r1 qmake-utils
-
-MY_P=QScintilla_gpl-${PV/_pre/.dev}
-
-DESCRIPTION="Python bindings for QScintilla"
-HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/intro"
-SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="debug"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
-	${PYTHON_DEPS}
-	>=dev-python/sip-4.19:=[${PYTHON_USEDEP}]
-	dev-python/PyQt5[gui,printsupport,widgets,${PYTHON_USEDEP}]
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtwidgets:5
-	~x11-libs/qscintilla-${PV}:=
-"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}/Python
-
-src_prepare() {
-	default
-	python_copy_sources
-}
-
-src_configure() {
-	configuration() {
-		local myconf=(
-			"${PYTHON}"
-			configure.py
-			--pyqt=PyQt5
-			--qmake="$(qt5_get_bindir)"/qmake
-			--sip-incdir="$(python_get_includedir)"
-			$(usex debug '--debug --trace' '')
-			--verbose
-			--no-dist-info # bug 664690, fixed in 2.10.8
-		)
-		echo "${myconf[@]}"
-		"${myconf[@]}" || die
-
-		# Run eqmake to respect toolchain, build flags, and prevent stripping
-		eqmake5 -recursive
-	}
-	python_foreach_impl run_in_build_dir configuration
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	installation() {
-		emake INSTALL_ROOT="${D}" install
-		python_optimize
-	}
-	python_foreach_impl run_in_build_dir installation
-}
diff --git a/dev-python/recommonmark/Manifest b/dev-python/recommonmark/Manifest
index 3e70340f7bb2..b3a084a9b62d 100644
--- a/dev-python/recommonmark/Manifest
+++ b/dev-python/recommonmark/Manifest
@@ -3,5 +3,5 @@ DIST recommonmark-33b5c2a4ec50d18d3f659aa119d3bd11452327da.tar.gz 22085 BLAKE2B
 DIST recommonmark-fdeeda5f6fe3ed8905deb7a067cc5951a477d091.tar.gz 22249 BLAKE2B 7466fc1448b54c2fd6969fa06e10c11e7bf1f2d772d96d749de9023d60570387a5472c74d660e8bd0722d294dd2ac1dec8d7d6fc49b281eea14b1f9ce423cf94 SHA512 67fa0b13d49d1f6b08e2fa28cf127c6dadb6454329a35e1e1217ff3bc93aff1a1a040740478cfdcab1b72acd939e0a81d7d8638e7ecdcc76e2791ddc33b8f0ac
 EBUILD recommonmark-0.4.0.ebuild 551 BLAKE2B 555de72463a0749dc830a6726750f8697e9e8bbb87adca2cb9c6877964107ede4628fc0fc04943cb47326a49f6c94c680bfc5be7b5863125d959cd85a37d9537 SHA512 65c1bcd475acae52ed68c897c5c6ef0daf9c054591c4e48ed5377474673e8ff3b7ec64354899f495ca2e1532e2007efb571f88e246208f1b30b583cbe329d20d
 EBUILD recommonmark-0.5.0_pre20180907.ebuild 989 BLAKE2B 3984d521869c36ffd02144177c6fc4f2763bbe37731ab38e3c02cbd938d5e29d5febf8b9379f96736cbc72c4f40c5cd07d9e079c5c734818d21be9ee2aada269 SHA512 eb0092326e1c3f7759703b65147d683dcf09b1526701d8a677c4c8744d4f1804cf36fa58b569fb4e54561c0a060323cdb363db6f09a0b2327686ed90f9e6deb6
-EBUILD recommonmark-0.5.0_pre20181012.ebuild 951 BLAKE2B 234dfa4fb06101d36d9789c760cba88112df7f98fc549a29ca6176a3ca09f993e7c47e975b420211f7785e90a1157709603bfb31220ec3f8dfb12ca34086921b SHA512 60e20db8891932f7db14f9eadfa52c61768c91563fac3f4ee5a97e163e37e123febd7e0018be2498d9c047d101b03d5ff7b201c9b8eee7489a7ad4d104b0ad93
+EBUILD recommonmark-0.5.0_pre20181012.ebuild 969 BLAKE2B 113d5c5c27dc8a6e349a11246a7b8621edebad7adaaada82bd1bedf1f3b782e2d5bfa419a3521896acf7ffcb7379c9aeb0dd74379be95cd2974fdd3ef0370e12 SHA512 a6f153dd59c98418ff73c0a8a75c8e545b36d6d6744faea3ca03d835d704433c781a495ecfd3c5283af659074af888a9807c3d86384db1c57beb884aa6ed558b
 MISC metadata.xml 519 BLAKE2B 8ea8a1e90a05ccb7f78d0de5213fb0ab447a8e8d9ebef7011eb4cb237c909d8bac77319282a76e3db32f58ec0dc6d76f6dfbe3c29c4c71c7f93398d91afffc0c SHA512 83dde1b703e097ce74627ad0139fe6cb97de26cd080bf0b191effe61ff8bd6593bf02a98be1e27ee142520142adebb48c4cb13066cb8d2109ecd642785b78c9e
diff --git a/dev-python/recommonmark/recommonmark-0.5.0_pre20181012.ebuild b/dev-python/recommonmark/recommonmark-0.5.0_pre20181012.ebuild
index b371916faf99..34e5ee21b129 100644
--- a/dev-python/recommonmark/recommonmark-0.5.0_pre20181012.ebuild
+++ b/dev-python/recommonmark/recommonmark-0.5.0_pre20181012.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/rtfd/recommonmark/archive/${EGIT_COMMIT}.tar.gz -> $
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/rencode/Manifest b/dev-python/rencode/Manifest
index 598415d185c6..3f61962e39ab 100644
--- a/dev-python/rencode/Manifest
+++ b/dev-python/rencode/Manifest
@@ -1,3 +1,3 @@
 DIST rencode-1.0.5.tar.gz 24530 BLAKE2B c650bf7befd62c8654bd0496f12f15a242a304ab9333bdf258222dd333081bd23715accdabbc55a271e8e869ca96f6aa0b43b335c6758be5b03073ebc05e3bb6 SHA512 809d7070b746fe77419e7b4d2eed274e1e0b3b4f15bcddb466806478a90f89965b0b456443b390cce6d1ca9df409367f336dd659f4481cd442e3cc459bd63c18
 EBUILD rencode-1.0.5.ebuild 503 BLAKE2B 2a89ff2246cb4aad23d24dead9889046873ecf0dc83ded4a0a45025483d7cc03d73b5892b0b1a12356f8fcb40a8c4541004ad0cc3d8f69fda8a4b25a17565ad0 SHA512 b014416c319505c5917931674e5b1f3c4a85c2ef04774d0f18d58a9ce8affa8dc344f25c017a3421206d94fa29f905de7193c40df0690be8f6c226c56765b03f
-MISC metadata.xml 742 BLAKE2B 586d8b5ae1524486d425e22af2ee13eab5e67bc200b3b5cd68a2222f5255d01a8f8c363b8fc0fa0cefe9a79958458a8445b55d97cf24f7f149850d06b0281e8d SHA512 0ad2d0d2f08aedc1628d7055ab79a9f29371e8f15efc1627e1dfdc158f3e82557ef1b755b02504c868ef042baeb865aa49860cbeb9c4bceed358531fbff58eee
+MISC metadata.xml 666 BLAKE2B e4047d25b3bebfa106936f105ed4fb8ed1c07aaad32b42f5bb2645388028baf30b8fff228fd32737c2716c5273f6872c5290a6e132b850d4640fb1d44e257683 SHA512 026950a9462b1207463f2bf923c40bbe310c63ecf73676f935c9d392fcb7673b4150de82e7654ea0914c0fdbd6b1a110f00e57fc92b931a98a5e9ab032918971
diff --git a/dev-python/rencode/metadata.xml b/dev-python/rencode/metadata.xml
index 5c16d3beac02..3ca1128740cf 100644
--- a/dev-python/rencode/metadata.xml
+++ b/dev-python/rencode/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@gentoo.org</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 The rencode module is similar to bencode from the BitTorrent project. For
 complex, heterogeneous data structures with many small elements, r-encodings
diff --git a/dev-python/requests/Manifest b/dev-python/requests/Manifest
index 280a4ea24a25..4e740bc8c1e7 100644
--- a/dev-python/requests/Manifest
+++ b/dev-python/requests/Manifest
@@ -8,10 +8,12 @@ DIST requests-2.14.2.tar.gz 521027 BLAKE2B c8f691b126876e069556542dbfc86a6aa6452
 DIST requests-2.18.2.tar.gz 125381 BLAKE2B f55bee7558424662ff5d577eefc89cdbdec3a209667bd174a3ec73554bab20582867139ce69ed5b996ecfb297cc251d41294188e21bd24d2241a0ad0432582f2 SHA512 b78660e5370f9acc458159edda385fbcbbb33b0703fa2c83400f3c08fe05253f357175e2ad76c5bff4bd942ab18da5df344473e9b5a924d7457596c0ff9bfbc6
 DIST requests-2.18.4.tar.gz 126224 BLAKE2B 98ab1fe39832673ea7900029da275e031fc85811d6ddb0f37609ec50b18e17d8a04b6cef397bc626ba13da32e16ffa961626879106941d327694d8763dc1efb6 SHA512 5c59bed82ac1094194f04a973b299f7d783264d372abd7a5229295bccc6b2f7a9f082ee4b0dff348e9c22cf68ddbd7cb67f60fd0b7d9eda41c02e40d075e9472
 DIST requests-2.19.1.tar.gz 131068 BLAKE2B 54ffdfd7b2c6f504071c8b55d9672dcffafd31de90cb85d354bc17d7fa19807927b46977b22a407654cdb48d7293e1b0222771d4369e148e4d6410719ba820e3 SHA512 deef2662227497b472f6e7eb7f0ee468c772069fc66552f71d80e5a12af62a187f8bc6a8a78531915e824c7f277d0db61c1534c89d13d473f68504f0bd6edf47
+DIST requests-2.21.0.tar.gz 111528 BLAKE2B 7b40f9f572a8efde41c177fb5d1e1eaf29ca60cad0661fa28ac0085f3700348380d619f68c0082f24044d1af82b16d6b1e7d5dd2c2a2329f85fcee7141b1fbf6 SHA512 385e1d80993a21c09e7c4682500ca8c24155962ba41ecd8e73612722b2ff6618b736e827fc48ad1683b0d2bc7a420cfe680f5107860aca52656ef777f1d60104
 EBUILD requests-2.11.1.ebuild 1426 BLAKE2B 77495db00c84d561f8977682cd76dc8aa47d46d3c7f30e5da10152cedaf70818570f5b54ab8d19d7390eeebaf6a00a59dbd0613d9a07d8afce8228f0a5d803ca SHA512 9ac00c3ac17f0d732584d4ddf935d61994715984456e7ec7ffcc0f5be16d7245871676cc5d2fa703dc831fab9194ff8c7bbeaa75ba32c6fd517f9c183231d70c
 EBUILD requests-2.12.5.ebuild 1475 BLAKE2B 5617a514692bd66533127dbfd47d37e5fc209d69d4429ca7557b5a3a49b4be63e36384d83c4daef2e4890d9ddbe2b11fad58e70b4ad095b2b3f95b6a0a6f8204 SHA512 8228a5867b5bf1588b84786c54d5319fed8c18be4b42e4d4a2c9a3466acc77d9fcbd4555c570c78c340d27d91ca2915c750d0bf8c25ae41d670955eb60508d83
 EBUILD requests-2.14.2.ebuild 1448 BLAKE2B 0dc3294238a801d2dd7d46abecc6a75983bbfcd60773615c61230b95e4e451d518bf2fff0d65b91cf0585588169524138e1e5b88239d68b33e4a8836dfb7bd9b SHA512 60cd358cd4be16b2e4a05c8bb29ed3f744832c783f864dab82ec83e2f44dd06d78db0b4af47d9da50b9b5ed5d3ac4b828d8f423fb007131dd7994f943f0f46b0
 EBUILD requests-2.18.2-r2.ebuild 1350 BLAKE2B 4ad48f663937b14e616ce3925c9d088b8c5666da8c977f6ac134d701029d7682bf4cb009f4da8c2f6d0d52bc34db0e3d85d21a3e3dd233b3e1d3a637d4501927 SHA512 8519166f7c084749fefd781612992847dbc0cb727b85167b1e745bfd5ee39e41c33a2a30c79bb22f57ca465895ecb5284add682aa0a268fbe4fe136f089088fd
 EBUILD requests-2.18.4-r1.ebuild 1410 BLAKE2B fcb5b635943e9a458e75a7fbb67c20eaf25eb2b26b5ab184b5d9ef928e5ee4b99b1e968fbcd6cc1597b0ca5ba9153e75ca0e1e42560ea42251b10e223ee10273 SHA512 87896952b23e4c151a00f5e636a1260dce944b1a67b00a7cf8bc285869608e399eb3a4aad842a79f44ceb5aa095f3cab26679dfec66efca99963a78347dba1e4
 EBUILD requests-2.19.1-r1.ebuild 1425 BLAKE2B 04be7607fd99a9ba3e7597432ae81fb67cce32567706edd2abd7995ce45b2677b8c054e9fb466782052c05418938ce8419b2ceb751aba880322907363bb8d44b SHA512 48d9e316bb6ac62ac98e047bf896e577dcb90bd66db48b0aa9aee0e5bd30873aa0589a29732ea1e9a462b5a6d705ffaf1c74e32b198ffbffa1e37aeab13bc665
+EBUILD requests-2.21.0-r1.ebuild 1465 BLAKE2B 5e8fcc3e5634a0e9f60358f8cbce3d887d7a55707cdc9c5be87adc4d47ee1d813b167c41b652fae56312612330e71eac8cb71c8fdbf30523906aee39e2a916ce SHA512 34f6edb1e629b279f7b9847ea199b5212418a8139f21ccd1a45bf92d0f3b2aa6a32ed44458166bb9b2214cf07a7d60a3c2057cb7abd5d95a39732be06d7d070e
 MISC metadata.xml 674 BLAKE2B 8670395eb334921eeaa21367eaf1c7d3770c11a166dc680bcb9b99a05da91d797baec8ef3c0596c40143f732e427c322a75ea75da1a2e7d99e56426be077b35e SHA512 7aa5c27d949a076b09b4c2b9e905124047d9ececc40d9c3fd225c6405aa084db96cab585956db9885b115cd24c6c153ae853187872e77e7d44ae5790c323bac9
diff --git a/dev-python/requests/requests-2.21.0-r1.ebuild b/dev-python/requests/requests-2.21.0-r1.ebuild
new file mode 100644
index 000000000000..ff17bcee2afc
--- /dev/null
+++ b/dev-python/requests/requests-2.21.0-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy{,3} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP library for human beings"
+HOMEPAGE="http://python-requests.org/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+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 ~x86-macos ~x64-solaris"
+IUSE="socks5 +ssl"
+
+RDEPEND="
+	>=dev-python/certifi-2017.4.17[${PYTHON_USEDEP}]
+	>=dev-python/chardet-3.0.2[${PYTHON_USEDEP}]
+	<dev-python/chardet-3.1.0[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
+	<dev-python/idna-2.9[${PYTHON_USEDEP}]
+	<dev-python/urllib3-1.25[${PYTHON_USEDEP}]
+	socks5? ( >=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}] )
+	ssl? (
+		>=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
+		>=dev-python/pyopenssl-0.14[$(python_gen_usedep 'python*' pypy)]
+	)
+"
+
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+# tests connect to various remote sites
+RESTRICT="test"
+
+#DEPEND+="
+#	test? (
+#		dev-python/pytest[${PYTHON_USEDEP}]
+#		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
+#		dev-python/pytest-mock[${PYTHON_USEDEP}]
+#		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+#		>=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}]
+#	)
+#"
+
+python_test() {
+	py.test || die
+}
diff --git a/dev-python/rfc3987/Manifest b/dev-python/rfc3987/Manifest
index 416ae5535a3c..37728fc83b9f 100644
--- a/dev-python/rfc3987/Manifest
+++ b/dev-python/rfc3987/Manifest
@@ -1,3 +1,3 @@
 DIST rfc3987-1.3.7.tar.gz 20701 BLAKE2B 234f3dc60d83e5615ae9fbbc14d063f9a993a532f5e7042144a8f5e995d44a27d88c284f7e12ff1f3f92d2440333438b3e1a0804ab43ca229305ce20ec4cb4f2 SHA512 c5fa8eb36358f7f42d12adc305031bfff7bd77e83316ad4458ed07acc6094c7d9109b95848b9296dcbc6677ce34aa59b1be8fd57dfcdc6be47eb92aeda51c518
-EBUILD rfc3987-1.3.7.ebuild 793 BLAKE2B 8890f2ea4a28da08ce7deb5e8157a6a073596a0e1011103b908c2d3255240cd23ff5e02c0cc656f13ac4c5f240e8f2215c053b4ab21683971e7508b972865d6e SHA512 26446e29f66c6202a0a7124f2cb7994a35f7d9f0d95b94a531893b8877eb645e88a9bf2e3dcefc0098e24cd89ebdfc81ce31e15f2f5cde1c764fd8cf362285d3
+EBUILD rfc3987-1.3.7.ebuild 789 BLAKE2B 9605f6c0d582efab70d22495d49c5a44b2ed84491020a1a89b552717961af9fd211c95f686626e0cf2f2b92628b4c35f14333d316f56048d7d6bf22e9ba9b819 SHA512 2577bf9cdce3a2538e4fbf73007f7c5d04f53e9c3f97e4a8c97083e8349fb906dd411f2880f5e1402833bface2043dc97c6d88caf8a90f53e52e3f087eef13fe
 MISC metadata.xml 571 BLAKE2B c366d3c4f3cb52d43bf469e77610cb6cfdd57b82ef0f46e8f1dbc739637bae6805edf5086deb4779738be7d29c4c73f7d658050112e9f5be62debc22a735f61c SHA512 2ced33f8245fc320ca1795072d9e63b5cc910b90f368306112316dcb444ee24f292e39ff76dfb027edcaf2c7a6dbfa636414ab8f9cfe777b0a2aeed17143e8c0
diff --git a/dev-python/rfc3987/rfc3987-1.3.7.ebuild b/dev-python/rfc3987/rfc3987-1.3.7.ebuild
index 73b26df62213..0e2c7550e8db 100644
--- a/dev-python/rfc3987/rfc3987-1.3.7.ebuild
+++ b/dev-python/rfc3987/rfc3987-1.3.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="$(python_gen_cond_dep \
diff --git a/dev-python/s3transfer/Manifest b/dev-python/s3transfer/Manifest
index 1948e5149a10..b68ece96f457 100644
--- a/dev-python/s3transfer/Manifest
+++ b/dev-python/s3transfer/Manifest
@@ -2,6 +2,6 @@ AUX s3transfer-0.1.13-tests.patch 753 BLAKE2B 7b168d35c9287eade9b9e1ca0393c625f7
 DIST s3transfer-0.1.11.tar.gz 95555 BLAKE2B 404a058ad371161d2f7d44b3fdf835b6641e6f299ec3660b322afcbd0036860a658e641479f0214b67b6e96d1b652d2b2fd888bc84473e8827f907bdcc5c6477 SHA512 83b85dadb696df9dfcd28719ccadba8aa0e8f36b0fe4ce4f61dfe00460617bae74307cbe6ba924a8de86fe527e18a34d66acb72f7a3d9001e670d76dfc8b60a2
 DIST s3transfer-0.1.13.tar.gz 103335 BLAKE2B bbc6e76647a9b531f0ef70912ddd17a186a5bbe4ecc9ed21de4674cdc20d39150be3212065bcdf6145c0721644c59d157fd528b79039bb091d750f28085bb476 SHA512 90aca5cacefa19cb8cb21b7b82c5f3383bc0478503557de9c2277db2f39d98f6e11ad74bf56ec84a1fc8c4a920337b0bcb34bfcf509a49f347144b7f13afb37c
 EBUILD s3transfer-0.1.11.ebuild 1028 BLAKE2B b17a39966352d5f81aa26bade63947f94c79c6b01dbc26a56c8a9cf8ffe508f9ad399ad3c9b6186879a354bf6484af3b73b67a31a81d552760f6ede192da636c SHA512 2a9ad77eb825d0851ad68e02c70f4873925379c1cb91b7fa7faffc8315fe67fc3c47c32d5c696724dc012500a12edf774a4a13ada56579d39bea4c72ac517418
-EBUILD s3transfer-0.1.13-r1.ebuild 959 BLAKE2B 64555af65d463e3ecb67859a7358d2ae34d95ade9fc8d1bbd7a1be505dfd561a070d5dc8986a0be43804b0c1561b55045979865fc1d50246c37e6efa3574188d SHA512 58a82be1c848a0daa383a37c2e0a826d387c2b10209e6903cc8c178ed130f686bcb4c5da24065d2ced8470c28f93e7a8c63af6899b9563765d4d2ccc95269deb
+EBUILD s3transfer-0.1.13-r1.ebuild 954 BLAKE2B eb675e75b181a4fc8508fef4344395b413c8e628af57cc312f0506255d496e5d33556e79c905e0278448409ba75157397b9dc4c19749113da658dca2cd7ebf54 SHA512 5271d309ab5c39581e7562c389a5ef3d94a6452b0e6a643011c9d5b64bceb565b6ab692a456da9ae2347438b5181ac395ee96385aa587424dafe47d8e0ae7f14
 EBUILD s3transfer-0.1.13.ebuild 893 BLAKE2B d6fd015623b4463fb75ef84d7ee476d4efdadb85cae04bce9aba3343c4649d6b94dec8c9098b6e50743c8461b673e93f945d3a28c36f115ea0196433a1de46b6 SHA512 a22263f3eb37dc8d067585c48202bf36335b4cd0f42d288e1c456a22c5f51846813f38fc8944ba3679eab784acc30d880b2e678ea50f1da30a2552f07af2dbaa
 MISC metadata.xml 379 BLAKE2B 71ab13315921746f0b71ac09c3f7a5e4e182e4efc0dda7f0e9cd6fe2948f52eddde9b9fe7c117ced64f4e3f6646a2d15a1fd3630ab814b067a10dadd11448def SHA512 452e566006f5a6ec91765cdeb4fe75edbf890f3a8e495bca7d1db859a882109eecb252dca18f1d1e4dc970c62c7810b5e51cf1b5ab61553c76d4dc04e38bc5ee
diff --git a/dev-python/s3transfer/s3transfer-0.1.13-r1.ebuild b/dev-python/s3transfer/s3transfer-0.1.13-r1.ebuild
index 11c8e4c80eea..bec4f472e686 100644
--- a/dev-python/s3transfer/s3transfer-0.1.13-r1.ebuild
+++ b/dev-python/s3transfer/s3transfer-0.1.13-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 CDEPEND="
diff --git a/dev-python/scandir/Manifest b/dev-python/scandir/Manifest
index 4a40e45dfcf3..3f790020c9b1 100644
--- a/dev-python/scandir/Manifest
+++ b/dev-python/scandir/Manifest
@@ -3,5 +3,5 @@ DIST scandir-1.8.tar.gz 33065 BLAKE2B 020789b939f347de49dba6eb35cf53733a34b283a4
 DIST scandir-1.9.0.tar.gz 33315 BLAKE2B 70c0cb0819f205b3cee37f471f84be2bddb565cd7341e5a28b9f1263f3176450cd5f2edacd63130e4f3f38940d0d3e1a01239f4729ac05e5cf5fd0005e712f8d SHA512 41dacf42734ac9a53bb5bd5d783023236d68bb4883c853fb2ee34224206c577a4a277d4a8cf8f9be6fd5a8b59d9b4fe4568a0c815a62ec84ce99ded933961ec3
 EBUILD scandir-1.7.ebuild 565 BLAKE2B 9d08fb18c8277903a9d1f2e38a2d5da42c095ff3c9c4e9919fd23c408d64156651188feed20df5cc03569419e8c1372f0e3653fac168e5b3de85ab0cb572ce28 SHA512 f46a08f4858fdabcdf8b0221b956aa589bffe1c0c82d16540ca1efccb4dd2925abbb3ef57a5a5a53f551023cca7abb8d17d3b630a1c61d1467de0b1cb7cdd528
 EBUILD scandir-1.8.ebuild 571 BLAKE2B 528c6b3487876b93305bcb3fd631ac0bf7cc469b35b72c5b74865a1b6faf5c4aa65f0cda1e422bb94ef6a8cc90081ea969d63720bece9fbb1b1b9d882df7b8d3 SHA512 86ce0e8898cd439682ac0e2eba784c50eea56cb9ea5266b6243dca2ec3b7ccea00abed36813d8f50e508872d7bbf721fa97771dbcae33a16d68877b6c570cae4
-EBUILD scandir-1.9.0.ebuild 600 BLAKE2B bd07966a5d7103532086474a51d7b85cac11550a31950159560b9d20c1c5820b3d02c3d6c8d8669dffdd98618783269b7c88e959cd4c8e4be1ea4d94d7c8ba23 SHA512 0be510ad9d8a21c4c3697d9d701aa4ad11d2ec3459382b643a829dbd6e73883e9853ff1975841b245d70592d8d15b373e71b3245a365bc4589a2c5fda276136f
+EBUILD scandir-1.9.0.ebuild 664 BLAKE2B 3cf8a2dc1560edc2ec13e1fd560f9176d5169b877c0b8b32b93aa2a9805c5426ef179a319badbf5bc74bf5d325ae8e3c7ace3e0a92db546320384416eaa1045a SHA512 e38faecdd58a0c5f9f31b9573119c72b76b13eaba84804cc7d86df82370105767db1cf322ee85a1d68e9a6ba481b6fc3fc810199528c2ada1f28f220fb4a7435
 MISC metadata.xml 495 BLAKE2B 7137cdfc395a1e80576885adb3c870ba25034a657c342b3819328f276d55ebf6d7756e57644a6ff4d45ca07cdb561078dbb1deb1b993816c7088850dee45c3bb SHA512 e762fa761b5b00288870eac3af8aed0d05efba207d83138adc873da902a7e197b710caeb87a3083e5f23436f4a2c799996fe07201195de065bd430b9c35183ee
diff --git a/dev-python/scandir/scandir-1.9.0.ebuild b/dev-python/scandir/scandir-1.9.0.ebuild
index 2673beb0e51a..de883e3763da 100644
--- a/dev-python/scandir/scandir-1.9.0.ebuild
+++ b/dev-python/scandir/scandir-1.9.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/scrypt/Manifest b/dev-python/scrypt/Manifest
index d1b23d42c7e1..7e12f89491b7 100644
--- a/dev-python/scrypt/Manifest
+++ b/dev-python/scrypt/Manifest
@@ -1,5 +1,5 @@
 DIST scrypt-0.8.0.tar.gz 39042 BLAKE2B 305973f0093fd3f9f132c448a5155c58f7306df31912c909401cccb224b89a7458fa72a4f659c37bfb81f31daae92797624fbabf7de723bf2869eb92af333853 SHA512 2619b6af84b1bb5b9586af3a0a903baf606985357ff7db34612b032aba65e002998a727882657f19bff6c7a987125d9b2d8daebbe0ba3717f3dfa6650975e52b
 DIST scrypt-0.8.6.tar.gz 52986 BLAKE2B dbf9f28e03dbe8f37696c6d227dfc719d3952d3182ddba49fd6c2aaf34e53db4a84a412ccec1ac8c83abaa5c12c6d6bb36107cf90a60a5776b1a9f596d1f85f3 SHA512 f0f3bd61a5fcb55a1d6af5b7062202446c2c0595e88617f1e53c4ded6a9b1ab857fda9e8d153c0b3bbceee49a818dd428776522c6b0919b15096fd230b13ef60
 EBUILD scrypt-0.8.0.ebuild 613 BLAKE2B 3238d5824f5faac5741abcfc88d3b04e7a35e8f9ec3211a16af24b5bd03b2d1d59d9ae9949b7a7314ab53792a5a898acb9dcc67c125884003b61d7b78c9e90d8 SHA512 94827254f58aa4649b01ff46a8ee2266e7bc462324b06a06627e8cfa68cd317d939ad2a173a5f98faa151fc5dad2f418a3ef3376c84ad3c2953e2ba465685501
-EBUILD scrypt-0.8.6.ebuild 553 BLAKE2B ed66ad16c07f6fa054c1c224a702e256e1097734c1561d7523e215bc7a6fee34be029a1d0ec217125d5f67e4560a352bc1945b40f7447bc3d13a953c8bc8c473 SHA512 70718f0674da03f7c323b4039798b57b0af5400b8a15665449a3ce166470d3ecd4f2855bd2229158b911ab4c37e04a67575bcd7524c6dc172527438c64259d8c
+EBUILD scrypt-0.8.6.ebuild 554 BLAKE2B 705aeed736588543d8428a6412d8995183f56eff73e760810f1ce28652ad56543027abec01d46a87262af7e22857d7c9eefb856e2dc71f0a2676dc2e1a0e2b50 SHA512 2e6a0d0796a2a6bc1a79ce80c715b5434a750cc447b07b84880ed29a0f495280fcb9030f39549aed13128bb93dd66bbaac28f5590aa00adbfa66ee6f4ddd2ca2
 MISC metadata.xml 586 BLAKE2B a5f49db551f2768d1474c483127fb555d0015d59896d3016c4036cf19d719c4f996c31f2f3bea9bf92c0e4d8d21979dfeb917974727944c16eab40a3bd15e82f SHA512 67277df1509df252e7366080edf19500697aad8ffe6192839f61fea76391803525ca05c377e8d1f1b67d606e47fc7047b4714f55a2cc9166642329a4af4cb92c
diff --git a/dev-python/scrypt/scrypt-0.8.6.ebuild b/dev-python/scrypt/scrypt-0.8.6.ebuild
index 97ae828ae6b8..aa80ad170313 100644
--- a/dev-python/scrypt/scrypt-0.8.6.ebuild
+++ b/dev-python/scrypt/scrypt-0.8.6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} pypy )
 
 inherit distutils-r1
 
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 3f7d530b32c0..6e703e6485a3 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,14 +1,8 @@
-DIST setuptools-34.0.2.zip 617839 BLAKE2B c06ef384a42430ec8f4d956723d21f70fdcf993e41fb6d6e8b4fd18a7f12eeb957f9aef3e8b81e59f006452bd7dc8f59d6c5dec07ca099156f93fa74b5f4d152 SHA512 8ff6475620fc18e5992900dffd50158bfea980d3e7f2c7c98e8c99180b2f11b3f81c13a60f93516da580def2543a786940cc164dcdc36802d9657c48e45d9266
-DIST setuptools-36.0.1.zip 711296 BLAKE2B c58a4efd8d3a2d574ff6ba5cd01a196fc7ad61a238119ac95714239965875d91e4613d08439c63ab3b9a0794b04ead5c6e8de09839e0306e4d29f47c2c7a7c58 SHA512 cbcd2591d0d8a7591c5d9a1d4173814afa0b984af29f2e34d26a37c357474b043f371978ac224cea12f50834d91babd9f14b137488c4edcd62594e91aff903d8
 DIST setuptools-36.7.2.zip 726758 BLAKE2B 8821d3142f2149fbdea4d231052c3990fa7a14c57c421309683c6a65102ce4911850acd5d492087aa0f14a0026da732e47eb9bf971030443fc1b57f9f909aaaa SHA512 746dce135dbacb65565787a20a2611388605e2371c94f0f8803e7712e515e69c270751d16a21f381bf6e8ddc0a1b39494db7d0c67bb32e6230a90c5d517e78f9
-DIST setuptools-38.5.1.zip 737995 BLAKE2B 9772d39928c6633ca529292d646c1c8e96a5a77ed06545af950cc249922837c13722d97de702c1e104581d56e1f808ec3d077041212517f5a51b23aa2e95e734 SHA512 bd04186a6e73cf24440e82aee10fff09889cab53e2e2fbf178bdb1360accf4f787abf8d8421d5e0fcb41005254c091f62d714e8b317ecf68911e2eed87b9fcc4
-DIST setuptools-38.6.1.zip 738985 BLAKE2B 73e5258b9fe2587b5662e80267e59bbc23484815d997a808c83e030e2dffa9a499fa1bed7e9e127cf3b92cb09451e70e590dd2e71135941124fe9d3383f7dc24 SHA512 38685b97a7c4cdfb67846f910afce5faf60ef1519ccb70acdfd2da83ddbfe1a56b5b03e0b8ce5dbc80dcec14847f716d7b23777e2be0ea7e6afd6da3b645b3ef
-DIST setuptools-40.0.0.zip 849857 BLAKE2B 6ce687904e0c6ef6cd55557ce848583e1645b6c5cfa80b005b25c20e52fc6985be673f2a77a9f79a3a5effc8e581492429bbf73074525827f539a411c6751373 SHA512 c90d136831af822a7f42bbd7eca4c1f4dd73d14f87182aa1251e70610db877b26bcda8fd0a10f5db0fcd84f9098a35b79a130b3142ade9d0081a538778ae53b7
-EBUILD setuptools-34.0.2-r1.ebuild 2012 BLAKE2B d45bbba230b2be0c02916044f2f8ddf8925da58799b22d24545cd93781a9b1aba159f094a84a066e284d6c76121b6bf823699a1bfb83af76e5da88b8ee1f5ba1 SHA512 29aa424836d4d1b1124618777f88a78ee081bc7f28f08ed2e6616002d716e278e470237b3ff0d37bfd6186b3bca3b0c329ff903e5327c35e209a8a0cd57fa06a
-EBUILD setuptools-36.0.1.ebuild 1876 BLAKE2B 1e6a2d79424f02be4ef12177430f18d58907d70731f4ec9fb66178e3f9fbe910269a4d4d7454dc2f1c3f49a7b8ba4e809f14f6b1fc6caa0f04c53335fa6d43e3 SHA512 1c2baffe9503586479167eae06e26eb11143b2f649e9e174ddf2ce3bff6bcf10b790dd3fc6a09cdffb59ab5f396c53b183ea4fe2d1952d53d587cddd356bf78c
-EBUILD setuptools-36.7.2.ebuild 1868 BLAKE2B f8361288674316f54cd585e17f95d0de8f234e9972f5acd0c90577f4e9db75b6dd0060b1784606690adea38d9f0875969ac34953730e45d1ae9b479f34a73773 SHA512 0fd94afe8e16ce92fa4582b202aefbc903092491652f231f9b8ca7a36eeadb21d7d183802bf76ab3cfee30892eaa757630e5fbfe4d9e05845afa9d1bcf8eed18
-EBUILD setuptools-38.5.1.ebuild 1893 BLAKE2B 18d3856d1e16abde3eb23375af872cc964bddbd3158cc665be9daca3821cf3f60b044d954a51e7268e6f83cb49b892020724e09073fb47ce2b6ac80f3874b31f SHA512 19073095b6c7b23f274a78c589403d60e768e5f72ec01217b66eb2fcae068acec6b4612ea3f079acc020f8ee0a83e9ca5d03dab781508db40d423ef0aa5e1f7f
-EBUILD setuptools-38.6.1.ebuild 1893 BLAKE2B 18d3856d1e16abde3eb23375af872cc964bddbd3158cc665be9daca3821cf3f60b044d954a51e7268e6f83cb49b892020724e09073fb47ce2b6ac80f3874b31f SHA512 19073095b6c7b23f274a78c589403d60e768e5f72ec01217b66eb2fcae068acec6b4612ea3f079acc020f8ee0a83e9ca5d03dab781508db40d423ef0aa5e1f7f
-EBUILD setuptools-40.0.0.ebuild 1895 BLAKE2B e35457ba8381ebba333b4210ebdbf8cbb39c2c16bffcfccee70db6ab27241dd0f42aa98d94472089f86eb517932422fedc053e5b97f6b2d16f0023a8bc922236 SHA512 23d1aeb1be3481995e86dc89a1b29544c2754a87e2e0c978c3d7b295688bef8ebebe7642c6f2e6cb4f99eb605e9c799f8af09fe84fe27e505dc9e5e880fec3ee
+DIST setuptools-40.6.2.zip 839184 BLAKE2B bc17aeaf7710742b70735f4bd0df2f4d8546eebaae000270b21ce605c83966998a2f51658d243838286f3101d7497c761535a9ffed003ae5e00c81bca8b70ad9 SHA512 3f1aa20e905deb22dda366f479f87cd772238d07e869fdc4f65a7926373414a77b7ddbfd78fd9825154409b3c01d787830354d206a45cdfca879bf35d3b83e03
+DIST setuptools-40.6.3.zip 839328 BLAKE2B ddc87213439ce2ad96ba54218bd5b3e41a7c31d670bddb9e4ea058b8ee7dffbe6fcb0e5fd24baf3fb38f5e824fde36aa8dc1e09d7ac37f9375ee351406389cd6 SHA512 6c628b8fc67645bca96ddcd016ec9a685e91690bf98dff077e842cfbd0d8d24de76ac51b3ff238d31551a48819d8f694fee6e9bb422ca954e54c22b4bda0038c
+EBUILD setuptools-36.7.2.ebuild 1923 BLAKE2B b7f55129aaef27eee778fdfb97ef06f6f70e558402fe503dd73c7a23502e6454f8c1f0e8182770d9c3334ebe3c1a21eb19e3ee8a0bc26ed99a819e7484b040ef SHA512 98b9465fb954575ed3a4a0b3b5be1c8a4c30d60112d4d222e95786a5a221a5a13799c4055bf7cd074476bd7d65ee7cd5c9a4fcad2a571ba83583e67751bb8376
+EBUILD setuptools-40.6.2.ebuild 1950 BLAKE2B fcf2e368e93d1b07ea3fad99cafb3a609b4ff866b7db92ca875bf94e27cf74153245285ac67265f2e31d8c9295eb0c5f95b94414e88e4bfd34ed6f77b9af162d SHA512 6f1e2d72e9fab011dae6d9a5c75286d56252438be1f3e6dc9d09d57e4c7c447ec21551a71cecf3483d29afebf7e130c7afb725b408cb8499bbd92bc232918649
+EBUILD setuptools-40.6.3.ebuild 1986 BLAKE2B fec6315b06258a39ac5b7ae57c3e91f1fb7bb7f7163fb5882629d55758c105419ecc7afc869efdb5462113f201f1d8daf8712df8f98d6d030e41206e8950f3f1 SHA512 3a87ed512e8df25a9ba779cb6417b8ee8e5f311d816e39a164b189e9d05b410cabbaab0b96ae5f62b9f73a2ca2aff100e712e4a23e7baff2751557a9f498c5da
 EBUILD setuptools-9999.ebuild 1827 BLAKE2B 7b9ecf3287c8896addeaa7b6dce9843ad7ef4df490cb152457213fe82c82955bc7048c32618490ba0532f8d5ca1229444cf333216bc5284c4229aabc93a7a7a5 SHA512 cd1d8b0c15dbea82e728fefd7cf75bc604fd8201e1874c0ddfb8b4e144ca670c86a2ccbef8c455a40faffbb4809179791038af289eacb0cd4823e25d6ce030ea
 MISC metadata.xml 380 BLAKE2B e6c532ce30c0def7dde2f2ca91e1663f290954f1f099fc837247540c31979a215be5550bc42d4d841f62d3a81554ae5377c148ec34dc2e92bbca3daaa1021fb1 SHA512 70bfa11a90dc1bae499e235e01c05ff1b0ed2960062fcef46ed07095b59309c4a0c3adcd47f7b0131ff1035c8e77c5bdf75975ac1eaccaa1a9fbd06a3f868f94
diff --git a/dev-python/setuptools/setuptools-34.0.2-r1.ebuild b/dev-python/setuptools/setuptools-34.0.2-r1.ebuild
deleted file mode 100644
index 8e8af7fd82f7..000000000000
--- a/dev-python/setuptools/setuptools-34.0.2-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-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 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"
-fi
-
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test"
-
-RDEPEND="
-	>=dev-python/packaging-16.8[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/appdirs-1.4.0-r1[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	test? (
-		dev-python/pip[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-		dev-python/mock[${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}" py.test --verbose ${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/setuptools/setuptools-36.0.1.ebuild b/dev-python/setuptools/setuptools-36.0.1.ebuild
deleted file mode 100644
index ec10905036e0..000000000000
--- a/dev-python/setuptools/setuptools-36.0.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-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 ~ppc ~ppc64 ~s390 ~sh ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test"
-
-RDEPEND="
-"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	test? (
-		dev-python/pip[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-		>=dev-python/backports-unittest-mock-1.2[${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}" py.test --verbose ${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/setuptools/setuptools-36.7.2.ebuild b/dev-python/setuptools/setuptools-36.7.2.ebuild
index 3e2e9d1b1980..349277ef7e82 100644
--- a/dev-python/setuptools/setuptools-36.7.2.ebuild
+++ b/dev-python/setuptools/setuptools-36.7.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]]; then
 	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 s390 sh sparc x86"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Collection of extensions to Distutils"
diff --git a/dev-python/setuptools/setuptools-38.6.1.ebuild b/dev-python/setuptools/setuptools-38.6.1.ebuild
deleted file mode 100644
index 60944fe53622..000000000000
--- a/dev-python/setuptools/setuptools-38.6.1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} 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 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
-fi
-
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test"
-
-RDEPEND="
-"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	test? (
-		dev-python/pip[${PYTHON_USEDEP}]
-		>=dev-python/pytest-3.1.0[${PYTHON_USEDEP}]
-		dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
-		dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
-		>=dev-python/backports-unittest-mock-1.2[${PYTHON_USEDEP}]
-		dev-python/wheel[${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}" py.test --verbose ${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/setuptools/setuptools-40.0.0.ebuild b/dev-python/setuptools/setuptools-40.6.2.ebuild
index 25ed8958758d..0f231c9d846b 100644
--- a/dev-python/setuptools/setuptools-40.0.0.ebuild
+++ b/dev-python/setuptools/setuptools-40.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]]; then
 	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 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Collection of extensions to Distutils"
diff --git a/dev-python/setuptools/setuptools-38.5.1.ebuild b/dev-python/setuptools/setuptools-40.6.3.ebuild
index 60944fe53622..cabfeeca68d7 100644
--- a/dev-python/setuptools/setuptools-38.5.1.ebuild
+++ b/dev-python/setuptools/setuptools-40.6.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy{,3} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]]; then
 	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 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Collection of extensions to Distutils"
diff --git a/dev-python/six/Manifest b/dev-python/six/Manifest
index a983e59f505b..c00472d584fe 100644
--- a/dev-python/six/Manifest
+++ b/dev-python/six/Manifest
@@ -2,6 +2,8 @@ AUX 1.10.0-no-setuptools.patch 545 BLAKE2B e884088c94e36283ce3e9a8df716cf25b040d
 AUX 1.9.0-mapping.patch 561 BLAKE2B 281a893fa6d0d589eb768c595e8931e4d743be9bc7eb288d87628f6a38c14a220f965430c0a480aecf0652c09155359aff9dff11449e2de3c55d7ef00f2527d3 SHA512 92d5bb1643264a04d5faf36bed16379e8844648a31739921bd97e2dd88e34a9b302c37a12a15a64aceb3d26c53f7cdbcbde2ce8d289a7a43f692af47bf05f58c
 DIST six-1.10.0.tar.gz 29630 BLAKE2B 1f380dbc7a9e746b4a7909de54a58a008a73d7b6c582611b2481475d5d9971c936b1742ea0821c65150694914af72f43155caa54616268735a4bd2447d5b4ba4 SHA512 9a53b7bc8f7e8b358c930eaecf91cc5639176a699830153f586780c3e6d637f1bd31349a69c383574f99da19cb3a36524e7733a318f3572b27aefb69c6409c2e
 DIST six-1.11.0.tar.gz 29860 BLAKE2B de4886ad9af7aa906f9eac213544c99323d74c1988d9abff96ce6fc3eea4464e577511f7c52328cbd9e6989db2128fa8d1ee57f9ce7bfc36b83ff655691b46c9 SHA512 33f246a2e987141e17e5edad9d3537cf3aba0cbdd0bc2a907ea52ce0d674b1474f29c3dd5cc26605fd960396054b189ca5f501708333cad234c223131483fe24
+DIST six-1.12.0.tar.gz 32725 BLAKE2B f40621076a7bb2b3b86d9f6ee49056a598e4853c6150952902053b8cfde86e562a7656b6ca3c3108f407d392cf7c1164a61b36142efd565eda909b8733c0bedb SHA512 937728372edf1e0ac13bbd706723d0de35e015c30d0ae41f789c5ed2e3669bb0db70cdc6e036ec2d437a6c4aa0d5d1e727b6d09ac34cca7e4e92e5d3b4775151
 EBUILD six-1.10.0.ebuild 1817 BLAKE2B cf11b48d603e01500cb2147756d7197bd5fad06de42ed91c0ecbb967f36f22fcf0e9d9d33a552dce6e0cd05cf0634d266c41aebd4cd4bfec6acc9960401d0729 SHA512 4a33dd217477d6c2a5488970cad9481c929fa4996d386d203caf3a3abb7e545a90f9df13e068a96d9040cc3d65c4305eff5f52bb51cc4743bbc1791500968a73
 EBUILD six-1.11.0.ebuild 1081 BLAKE2B 8d9c1cb48fd3121c9de1d8a24f78906353791ca235b23b703304cf824ed10c162d2e7fc2e5a99705f65ef6faeccd4b2b47d6c5446bb845734d78bf7601d3618c SHA512 c79cc674deff03aaafc12d6933888b599e06dbde98bde748a94f3485fdbfe6085e73ce3b6e2927d0fce6c3bbac3fe912f5960277a19c6e6051059dc83c7341ee
+EBUILD six-1.12.0.ebuild 1091 BLAKE2B 4ecaca36faece6e4211bf63a9c8503e4c42628653220c209f769d23e1a06c8e1c16956c80df67afbb836b14299172efdae6fefbd82b66ae13c719b9ee1295e3c SHA512 274e76177da80e5dfbc1e620d8e670ee9cc65a2ff004f256784796e845911f72933e83b51106aab642acd014724dae1946fd21e8077c1996aef3670694494037
 MISC metadata.xml 371 BLAKE2B 475b717d4c4bced0454ee0244b5d30f178098ff45b2fc7d168b41f446c4e8f3f2dc022ccadb953d6f4e905f95e38769657d42fb4d80157c816d6e7b5eddb33c2 SHA512 8171125815ab60f7c9a2756367ee6532fd862c5f411ff828b6555e4e21e6d43672f2c764f92134f6625abb161380bdbb739af259ba88c974cf3583f35af76a91
diff --git a/dev-python/six/six-1.12.0.ebuild b/dev-python/six/six-1.12.0.ebuild
new file mode 100644
index 000000000000..7cab04112473
--- /dev/null
+++ b/dev-python/six/six-1.12.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python 2 and 3 compatibility library"
+HOMEPAGE="https://github.com/benjaminp/six https://pypi.org/project/six/"
+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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx )
+	test? ( >=dev-python/pytest-2.2.0[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}"/1.9.0-mapping.patch
+)
+
+python_compile_all() {
+	use doc && emake -C documentation html
+}
+
+python_test() {
+	pytest -vv || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( documentation/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/sphinxcontrib-websupport/Manifest b/dev-python/sphinxcontrib-websupport/Manifest
index 1e9f7d3682cb..a028dbf820fb 100644
--- a/dev-python/sphinxcontrib-websupport/Manifest
+++ b/dev-python/sphinxcontrib-websupport/Manifest
@@ -1,5 +1,5 @@
 DIST sphinxcontrib-websupport-1.0.1.tar.gz 590480 BLAKE2B 1be40595094233ca2ddb1a367039320fe6655b1a6bbf251d7722b60efe0d0cfbe1cdb38455f47f4fb6810500e0e4923f5a9a74df4f79d1544261c4706a59e8fb SHA512 67807b2505e063639163b020f0e62469b0c2838c303516cce9a8d90181cc7b8a10d76532adb1267556d40f95966efc20ec9f8ee1a6731056bda827a6f97f40ec
 DIST sphinxcontrib-websupport-1.1.0.tar.gz 587947 BLAKE2B fafaa56071245c8934e27c6d2d7752745b2a8047c8a30d52e513fff7f952086a1b9082aa15e15ef232d69ef0c0d5d117f8a8c97fcdf9cd90c89d53238d7f322e SHA512 adbd7db06150a4424a881a22442c2535ed823c7adcc295ef9c3af5ae38d823349830a114e8a7af2138498d0e68b37189707c1bb5a28b45c76031bcf94210fb89
 EBUILD sphinxcontrib-websupport-1.0.1-r1.ebuild 1161 BLAKE2B 6841ef437c0e54f5c01ef473178aa3e6af58c331d97343461e9ce5a8f52c2accaf9fca06154232a8d36db404b474b4de2cc2cafe0e0f9417c46a1799d1438d22 SHA512 92ed109f52211a8f0127ca1b82448b49221102a364d601ff31194c8b277ff0b85d7eb59034d74239f351ab16e5fe10e5022564e4608ccafb5b34165ebc49ed02
-EBUILD sphinxcontrib-websupport-1.1.0.ebuild 1167 BLAKE2B 544d34d18d1d074e60adbf614beeeced16ea2e8bd1427462e6cf0630a39b6ce5fe9bbb8fa4ed7766e32ab69b739687fc54ee5e58b794f5f2231e8d5c31e1fd9e SHA512 6d7bc98fdfca0294b18d9445ec91d3873c1d85106f9ccc8ab9da5e181dfe4ed90b3738ea5ca61aec54b3a3de974bfe0387c2e2f321d8f4611cb52c072f0e4d55
+EBUILD sphinxcontrib-websupport-1.1.0.ebuild 1164 BLAKE2B 55e24ed1028e22fe461cf33993bf9bc9621728f31473c0e87b08208753446d352038c4be69981c3714ea9fcd8df712b89d94d87071164499308a03fddaf911a8 SHA512 a5158d9b2b303ed3ecaeb7b7aed85c7675b8bf20cd8db9a6531bfdb3998918519953bb7c88a7c70cdfd6f896eb475a37f14fe095cf68a96c685d9019eeff2c5f
 MISC metadata.xml 588 BLAKE2B a7a777dd8df5b09707041ace4566bf80cee826c98aedc1e13b7dd48ddce2201aeaa79f2091ac549a66da2a04449f3ba69c243c8b1a44e0f0b661240b7dc2fbe6 SHA512 eeab14e556d91f99f5bff45a490eaecf47bcab9e295c992b817c94359fe87483947f43986bdf4633257b1ff69ffffd7b2f250e411e728f68b39a65f5b53a29bf
diff --git a/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.1.0.ebuild b/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.1.0.ebuild
index a37ac0142cab..57b7020a21cc 100644
--- a/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.1.0.ebuild
+++ b/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/sqlalchemy-migrate/Manifest b/dev-python/sqlalchemy-migrate/Manifest
index 5faa54c41925..0d6cbb7be883 100644
--- a/dev-python/sqlalchemy-migrate/Manifest
+++ b/dev-python/sqlalchemy-migrate/Manifest
@@ -2,7 +2,7 @@ AUX sqlalchemy-migrate-0.11-disable-sphinx-exts.patch 550 BLAKE2B e422e483ad5da3
 DIST sqlalchemy-migrate-0.11.0.tar.gz 128299 BLAKE2B 1b13890aa38861cbcb6ff57b1169114183d17931890036fa3aa06a66c9f3e5b5cb5c84d752e6a1dc7058fbb9c6581b33a27f74800ab325801e2c318664cfdeb0 SHA512 5ce76f221cab54ca7436f30a907db4a17e7e338af2cc2d324f06e73bfeda99569584227f925f8a078d01c17761878b865af665a9eb7c1de306cbc0f9b8d7a451
 DIST sqlalchemy-migrate-0.7.2.tar.gz 105862 BLAKE2B decba0b4007143c2e98ad0b36880bd92ad6f771cf6b08ce4472cd2c0361658f449cfecdac2c8d5b12b1df8a00940dbdf714ee7d82cd9fb7f429187ec899eb19a SHA512 31c56da755ccccdc0aa5eacddcb097a4bd6431ab72a5b964689b0943b50ae4b23e034ae84d8dad4707d4cf9bea5b538e015ff755318685cc17dd82497a4cb4a9
 DIST sqlalchemy-migrate-0.9.2.tar.gz 124175 BLAKE2B 9c4edbec78074ffcc4be800c952b7c38a919ffd4dd829da34c5f4b3b3b06d8b31bb703e71dd43555bfd68cb7e82bcfbb632a362f9382fa61890a27b1f18c0c22 SHA512 25b218ae97e9a99ad126e4185621bff04da2e9d47d2e47620965974a0b865a9dad161c4d284aaf316f01f0241743d11dd6578942ad6673f2843476fbeaaa4688
-EBUILD sqlalchemy-migrate-0.11.0-r1.ebuild 1454 BLAKE2B 4ceaf2bb95ead06c0a8b75a81040541eaf66e8a46f3ba51e2b597db77057ef5774627777fbb98d5b1efa2c6d8349b91c62d3edc531f68569f97687f002dca0b2 SHA512 d6a835895eaf28a5615c8309c7712cc73b134ec4beebb3adbbab6e6145a45654479859e84c6f2e158f371c1365ba6117c70623b871235320f1d17bf9f76aa549
+EBUILD sqlalchemy-migrate-0.11.0-r1.ebuild 1448 BLAKE2B 40d19bb35a473ebc3eb4a5b668ed9a29d126b1688844d0302660636ce9c0a540d88daba78d1b9d365cf5c8d327933343d1f4bb39e8905fc3b95cb5522ed7e594 SHA512 3187257b5c4eb19666e4b97f235ef73ba5ca458fdd117365c892a8fc46f72e35eb832b05e062c93730c80200552319994bd817f5824d5b8da1eaead549af8cba
 EBUILD sqlalchemy-migrate-0.11.0.ebuild 1644 BLAKE2B 01ba49c80842ca24afb1bb0d72788f0bd6bac0e3dffa6c3b314a2a9e1d70d1e6ec4fdddf3e0f93f10e0ac53a9030a785f947fe2c45abdcf82bb73d22c912aebd SHA512 544ca0e697f2c3c115441be3913ac08c87e123d2a806c8773ec3cda8748230e4fea15e0e4526337195edb9b4c65102537ebaecf115d3217193188e9e99d85d8e
 EBUILD sqlalchemy-migrate-0.7.2-r1.ebuild 703 BLAKE2B 7e9385f0fb1dc023875e821e8a80bc4c64986e5077959a85c6f564a60509275d75418549f94b7187337a5661bb4d45dfbe2395916cc267c8c7529117eb2f32bc SHA512 34de48bf99f44bc001afc6dccec0fd01832ac3f8175e518a6ff6c370f48b8803e337dd5d1dc3cd4c8159702b2dc6300a58b99d255cd1d2d0c664782f8366bd13
 EBUILD sqlalchemy-migrate-0.9.2.ebuild 845 BLAKE2B 95799089253a2bb9403b41c1955aa285f007d771505115af6fb15f7111dd8977de5d4d87782418c7f0a0b8037df1615e90fd1358704115a9b90f954f3de20448 SHA512 889dd37145600cd04e5f701bb88c15e80fd6bed35bfd43a0ec8351798028968c0ddfe13e2a1f8128c9b4840afc2aed7bd023496e6a60d3bc3fa68a036bbf56f1
diff --git a/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.11.0-r1.ebuild b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.11.0-r1.ebuild
index daaf70a34f98..d3843d79505b 100644
--- a/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.11.0-r1.ebuild
+++ b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.11.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="doc"
 
 CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/ssl-fetch/Manifest b/dev-python/ssl-fetch/Manifest
index 10be977ef6f6..da00eba9b18b 100644
--- a/dev-python/ssl-fetch/Manifest
+++ b/dev-python/ssl-fetch/Manifest
@@ -5,6 +5,6 @@ DIST ssl-fetch-0.4.tar.gz 11663 BLAKE2B c75173f40367d1e84a0ed3e13dbc7e6b8270302b
 EBUILD ssl-fetch-0.2.1.ebuild 1181 BLAKE2B 64fdd2755532608d17873c8c5e774e86b790ae1e337481580d1c4b40270df5188f8e2eb9f5040b51b1ae68cf8228c0e59ed5074475ad7aa2240e70264f1a134d SHA512 fa3f64ff663d2cc7d1edf714fafc12855401e8000f7405d97d8fcdfca9073bd0a54a09325dee8ba89eec83509e46511049d027645629bac75162bde2734ef6bf
 EBUILD ssl-fetch-0.2.ebuild 1130 BLAKE2B ebf55893a26cddeb72a5566303a5c52d6e94fe69513d7b064852fad495722684d08cb4db312f3eb9984c5565399811d0f42bfa86ff90b1f046be5aa1dba78e7c SHA512 b174e825fc3e56bad1c08b002ae9cce5d568584da3bd52f0e60626fbeca59afa4f2c67ac33309bee3402b720a703b2728eabdc5c2d92895e189238b3c83a5e41
 EBUILD ssl-fetch-0.3.ebuild 1182 BLAKE2B 63d77a2c422793de379d74478d033d22e3a13c830202b077dd9a1189199d4b0d547e39d0f464119244b9fffc9f5cf7ce24c20aefd5c02d2a90803a76fadfd799 SHA512 422d9cbb9cab997f57af8fbdc782f83f3431f37d697919c3576ecc5f39768914bec0f1ad32f7747ef61c32d26bbe6143a9a20dd3181c6bd2f9a26b80ea060341
-EBUILD ssl-fetch-0.4.ebuild 1216 BLAKE2B 4779f1397923d52ff3ae06655d6f8ac68b8aa7761b10fcf954654fb63ed30121d914cd788a5ab93f9333041290e6ccb03235fa91749a39417b6efa9afb344910 SHA512 f5090f842bcba3490bf22614e76177ebf4cb51f57bbdeec517b58ad2bfc4fb8a3f48e8ce00370d73a9f39edd249f24f1692e4bd5b4c09dabe3b68fcd5c3534b3
-EBUILD ssl-fetch-9999.ebuild 1086 BLAKE2B d89a6cc170ce68d6011d14499ba6d2d8198636371cb82e0495023b761ed27f3e815ee4addaa46c7898418f2cca5e557fc9dc38eceb872f49280cb9ea9695a30e SHA512 76e9c815fbb3a91ec6d7be94d6642b5913ce3132f741ab1536d8c8ffbbd96f76956af8749115da0750992434e606db4720fe51c8bae293920c3a06caa4bb046b
+EBUILD ssl-fetch-0.4.ebuild 1215 BLAKE2B 791e64edbdcf1608fc2937dcb379788676b7a4bdd9341497c3d902ab6b29459b0fbfc39ffb325c3c1a39a2c21289e17d0bd336fd2ee04ea9b3e364ba9047d820 SHA512 7d7b16d4f9970eeca3429f680fa41d237e8375d7b8cb4a54e9bb5c6c1b1166bfb56bfe2014deb662da0db08000054ebb6c6f1bc09d129a17fb6f269bf58f48fc
+EBUILD ssl-fetch-9999.ebuild 1085 BLAKE2B f8b71b375666201ef67022f4cf95393716636689c7abc6a36491e0b6139f7847805b81662aa454715527fc6208eaa42bda273bc23686845a60cec772fd44ae1e SHA512 e8a61ec87987deda4f42935702eb1471c954af1437430c108451739c4401494d229b33e08d27af8a79d92914ff42f628ef4f16778b5352c461bb79c271a19aab
 MISC metadata.xml 585 BLAKE2B 660e38c7d1e6eb94fd0d517ccb3cdf563f0bf62e2b427368932a76fee743def08d377db47f8f3c7269a9f8bc89a72d4bbd7ed1280453e505a5365a4e1e541fce SHA512 e654050b05973990c8ff763039fd131a2f08916f81caf09d36cb5baa8fc91c4b15522319e22ffc689ce52a0d0c8fb63af5bacd894d9904e993242b3a8d653ae5
diff --git a/dev-python/ssl-fetch/ssl-fetch-0.4.ebuild b/dev-python/ssl-fetch/ssl-fetch-0.4.ebuild
index c951dc93b14d..a7fc32de6985 100644
--- a/dev-python/ssl-fetch/ssl-fetch-0.4.ebuild
+++ b/dev-python/ssl-fetch/ssl-fetch-0.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy )
 
 inherit distutils-r1
 
diff --git a/dev-python/ssl-fetch/ssl-fetch-9999.ebuild b/dev-python/ssl-fetch/ssl-fetch-9999.ebuild
index e9649601bc6e..b7eb08d79d19 100644
--- a/dev-python/ssl-fetch/ssl-fetch-9999.ebuild
+++ b/dev-python/ssl-fetch/ssl-fetch-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy )
 
 EGIT_BRANCH="master"
 
diff --git a/dev-python/tappy/Manifest b/dev-python/tappy/Manifest
index df624456aadd..3bce6506fb30 100644
--- a/dev-python/tappy/Manifest
+++ b/dev-python/tappy/Manifest
@@ -1,3 +1,3 @@
 DIST tap.py-2.4.tar.gz 145440 BLAKE2B 1c6effe086c50cb8b11355db0439207330446a245c42420a948e1c3ff8caf917d9a76ea00f231199a5bd79e7396bcd2a904b764ffa1db611c57947274095a0b9 SHA512 7c843c40f0029bb122fdafec0f5416164b77fac69142c2308a6d815f2f409cddb33c5a08547409e278f06036e21cb2a53cbd3263c23f59c6618c12c201b8209c
-EBUILD tappy-2.4.ebuild 1024 BLAKE2B d6efa1ad2889c38d554f6b0a9e0fdc92ceacb01221b4a9868827dffd96b37a68a38c50efa623ba1e4807dd69fe1142878e9b06534c6b085cc6984f5d75a44c6b SHA512 bc087e32bfcac4f277c68cac975ec8f1a00b96ac077c5a1d179537530d8a04286034d4ca6066bd4ef1a33b048f09adc0eba1cd0de33ec84e8bfe1601807df5da
+EBUILD tappy-2.4.ebuild 1031 BLAKE2B 11eaf565d85cb141c24295925c95ed7ba176f304f4173af7605fbbd551e86dc65cb1917dcca6d3f196f136cb69db4f9f72eacbc422de077373e5659677ec8c6f SHA512 0ad32c738eaddd1055b1e8564bf17b6c3cabbac37930f698fb7b30c68698cddb0da3a112d74498529019b9fff629937f68de075dcd0053250fc8e55c1742e1f8
 MISC metadata.xml 466 BLAKE2B e3ae71b2ade021aa7dac05316df1b14e1a483245103cff6aea76b6663735f5f9b2d772a7d75c6bd539da8bd1728f82639e324822fe86e1a5895b6729f455f8a5 SHA512 d43be4cc82a9795c36d9d39b37c92bd810148551a635879b802aee0fa87f833492a4c67c5e12c7b9d2cb800295242faf4157ae0cfa04269261a1b438a305262b
diff --git a/dev-python/tappy/tappy-2.4.ebuild b/dev-python/tappy/tappy-2.4.ebuild
index 5fc3df8da5ad..a8095b812977 100644
--- a/dev-python/tappy/tappy-2.4.ebuild
+++ b/dev-python/tappy/tappy-2.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 IUSE="test yaml"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/thunarx-python/Manifest b/dev-python/thunarx-python/Manifest
index 3bd6d9e1f8ed..4e99915063d8 100644
--- a/dev-python/thunarx-python/Manifest
+++ b/dev-python/thunarx-python/Manifest
@@ -2,4 +2,4 @@ DIST thunarx-python-0.3.0.tar.bz2 303035 BLAKE2B af0193a3bc97c859ba98f52c612d5af
 DIST thunarx-python-0.5.1.tar.bz2 334426 BLAKE2B 59f8e625b10ceeaefffa4b6dde150c32023365e76854c6e77ae2f222b509856353c8d62de26ba4e7b967cfcce1219205923938389fd1714a420bc9e1ac2b12b2 SHA512 0c1d8f20b74a3eb87b3c2c181c6438bc059dff75afdc26cfea19dffb7efe1f14e6a880689f73afcbbcb5922312741df72018e3b9980c4a45426e7a7d4651177f
 EBUILD thunarx-python-0.3.0-r2.ebuild 778 BLAKE2B 57afb8f9b5469211715bee3139ad5c07d665e42331a940014695376a2b881b3e2d3e94b81af7e38ecaec8504bac59c34201b2ce8c2ba938b35af24cad9fef536 SHA512 7313f7552e7cbcf31fc83305d81e65452651e77f17d7d57b5d9a4dbe917c8dbe3343a2f02f7d76f2ff1f2475dd46b2fc3bd7ad41c6173adaf6b98387bd957e1f
 EBUILD thunarx-python-0.5.1.ebuild 736 BLAKE2B 18ca72da40bd039c860ae5f94ed63dec66b6e98c73011a0467a7e335e2ee22fccd34e982e1fb3885eda5cf66225949a8003399d609a358f850aa463be6cbccb1 SHA512 21153a227919970d8d44d87fccd3ed07ef93eeb7c4843e55d7b1d9769eeea189c30820d57030931b8d635915414c294c4d2cd59730b0a9ee50c86c78f9778449
-MISC metadata.xml 357 BLAKE2B 48cf41f710ba774f8adaea9825d2b72803e19e55a76afea97cec934449c0723d7ca411ee20297652179abd621bd6bbf533aaed3ebe0d6601b13ad26840d225c9 SHA512 f707818cf1217c314e8c0a18c990f4b1e65b358e7fefe68490d59956c97aa40a2f2b0130d89a54a658dc2caea11e0c5a01f04553faab53dd32513bc299e90b58
+MISC metadata.xml 249 BLAKE2B cfb34e0ab5b7155d26bee3e5cc55d570e05151273d6793455b82980b3e3411983eaee6a6ea94f896b18df24efdc964f180bb00b3852a98a2cc5571f1d22f6d84 SHA512 ec9e5427d44f20c2c0166fe103e6e8b8384a300685f7c9774f9177a1533d7057f332af1ba1046462f75bb3f2812e075d01b5eaeb625340c911d2bc6d2f9acf7c
diff --git a/dev-python/thunarx-python/metadata.xml b/dev-python/thunarx-python/metadata.xml
index 7bdac6c6ba25..0bd003b69c23 100644
--- a/dev-python/thunarx-python/metadata.xml
+++ b/dev-python/thunarx-python/metadata.xml
@@ -5,8 +5,4 @@
     <email>xfce@gentoo.org</email>
     <name>XFCE Team</name>
   </maintainer>
-  <maintainer type="person">
-    <email>xmw@gentoo.org</email>
-    <name>Michael Weber</name>
-  </maintainer>
-</pkgmetadata>
+  </pkgmetadata>
diff --git a/dev-python/toml/Manifest b/dev-python/toml/Manifest
index 0b00b294217e..d86c56216961 100644
--- a/dev-python/toml/Manifest
+++ b/dev-python/toml/Manifest
@@ -1,3 +1,3 @@
 DIST toml-0.9.6.tar.gz 14074 BLAKE2B 758dbde35e1afacad8456cfac42354f3205d2d1ae79ceeea1803fe253472e3299ba171ce9435529f64fd8a31adc7cc1c05282a76a47118b7aa0e3ed61ccacc25 SHA512 9f2804daebae0744c3a00bfb27b2f1efd73c96e7e5a14316d492200d63ba546167f669a187297c76daca5ef35b7adb6f309c1f6129302b6f41e6b7673bdb43b6
-EBUILD toml-0.9.6.ebuild 588 BLAKE2B 462c3f0fdad6ddab2ef1f0374a1db798cd3a730029bd528afb2339445d42f6a70b409c3d865674b9f224882bec1630796ec7bebeb225ad96679b1d5b404f43ee SHA512 5485fb102ca55b7b6cc36281976ccc6faeb54a8ccf35309e7bac20ac3283002213352f6880b1cef3b2a896c59a46fa526fed2518007543b94c39b90ceb878b23
+EBUILD toml-0.9.6.ebuild 442 BLAKE2B c0dfa1119e97513090f868d568cd22a920367aadf36b471e9e4ed4de74a6718884900cfe1a19fdc81fc2c3d9f8ae3b52866e2de0204752f482d139a2659481cf SHA512 10751337398519aa902f4ca940dda7ce7486f235cd86a35200320b61405e4e0327c892aabdd97a7878be508a8c753d59378d98291d0cf5f25e80f171a5baa689
 MISC metadata.xml 324 BLAKE2B d9ee23ed157896fac55ab5bddc1cf299572ad05d4b1de97749c0ae196f01515272feea6cbb3e93a71ad908cfb1cdac70a702b2d94b6ef2a74ebc25b044b5c049 SHA512 d5578a5e1e35bb8b263dba80e0f56ee663bfc6fafe052a82889e3d1551a5143345645fcb09107b5115f78a1d40dd4b2a50609a2df096cf870ec6409764d7715a
diff --git a/dev-python/toml/toml-0.9.6.ebuild b/dev-python/toml/toml-0.9.6.ebuild
index 875843eb94ff..528467cd42e5 100644
--- a/dev-python/toml/toml-0.9.6.ebuild
+++ b/dev-python/toml/toml-0.9.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,15 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="test"
 
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/tox[${PYTHON_USEDEP}]
-	)"
+RESTRICT="test"
 
-python_test() {
-	"${EPYTHON}" "${S}/setup.py" test || die
-}
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index 84b20a47b10f..e0781075feb1 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -1,5 +1,8 @@
+AUX tox-3.6.0-skip-broken-tests.patch 1579 BLAKE2B 1de72f080eaab2b3da17dc5e2edfd5297072fc3cf03015113f633cfdf3596993197a75aab507b5c3b055bc7cc746093a1d0a5e95146d7a9ef562991c516eef07 SHA512 4f731f456bcf941f0120586d486c826970fdf9d28f475eba9e55d561a48c38ee43c4bb7551de636ea2f5f17c7267be3bacc949b1a5230c7c35f800efe2b398c7
 DIST tox-2.9.1.tar.gz 1855982 BLAKE2B 3e2f5fd3d3e45e54f96b0a6fc8f9e98bfba3b48540cc2922a897e016b5aabc9974772c9b897e0fab7b38b00f99478a063ad988ffa8b65fa53f684997334e492c SHA512 ff19b2bb7ac963379f1cccd4973ad9eb4dabfbda976cde7caba50ad010d8fa57c1cba91d63e3e0512e44cc7d350bc9270fbd9b30db1bd55f7d9c239e7623d066
 DIST tox-3.2.1.tar.gz 268827 BLAKE2B 764835d04fb0c17f32eb8e2041b83f90d6a729b781a5b5b95e9ecb1162f1c29ed595d4a6369524b390a31853b8003485b27a3a12d63e84f49e92675f1a9bee13 SHA512 79f5a1c8f6e818fbb8444754e3767d880fc1fdfe63b46c518d37440fe2b2f3ce572865aff83d9492c24486fded49893cc31bd9b11254bac4db507260304bc76f
+DIST tox-3.6.0.tar.gz 257255 BLAKE2B fc61eb9c3c7eaca483c5de99b72562fb936447534cc1c08e70e8ed376fe70e0467d07168cb518f097002ea96ebbd709364236af49307c3c4c84f58feafba6bd7 SHA512 fcee3d78f266ebe036931589a68b51e111ba34cbe3fae6ee9241b4e98433ca75c59261ccaef014e00b3bfd678d10624c72c45146d594a7d25d6f437101f4c93d
 EBUILD tox-2.9.1.ebuild 1307 BLAKE2B 1250817a04c4eccd2471adb950ce316092b95b0d8c015a606dac2f0854ee48e32de220a5171b36e56c240a67766e6e929d8e8052a069be3651fff04d0d0ca014 SHA512 672f5fb09123ca77fc4ff93da6c00a82b02e1119ea9dcf5858792ca01b07a17ff5d0137174dbce0ffbe75b15e5c2aaf26811f412a258da6c0c22b9101202c077
-EBUILD tox-3.2.1.ebuild 1926 BLAKE2B f0cd10f46ae714b4dc244428576baf1db69e65b5fd5f095ae866ebf61d82826fecef9b6a599e13dfb86dd1377b1b6805c51f468da1597acd5628d7243659a11c SHA512 9e754fce0a095f1376cd7d6b34792244f91f6feb7a7285320ffe93a5401deda4fb0d554a5a5281396ca05f52ee13e587a15343115ff9281b7d4be0536fe07b7c
+EBUILD tox-3.2.1.ebuild 1928 BLAKE2B 4cbfa0acbf80e27094579911d80df2f2ee497010fcf0425921232d2118b0f45d485c3a6924eb724ddca4c6afa0dbc48295708ac264876f10de6f6fd42e334ef5 SHA512 7874949582a0e556547e90e32b9ae2234e254f1f44e80799227acf5b5b69a6ee52cac4f34a1c9133f70e3550211ee8e6af4e1e887f3eadd0c7bff24158a1a830
+EBUILD tox-3.6.0.ebuild 1210 BLAKE2B 2dea69c67b0bc271a48f54f6bb0f87679440bb2130976b06ed22c3864c049dec39c9811c3c623ce27d06f18681a3ac98c6550f9d5e070f47ef6838d27c3d4ca9 SHA512 7f6f70cd049db646b2dfb535a19686649fa54fd8e8392c861dfbc26d0f30f52e056b822739982185d1fbace07ad5a6b9664276915f5263e0e829b3cba637b132
 MISC metadata.xml 465 BLAKE2B eba47520bf4a2f615fbfad7c26ac19af51d6b9c0ef8dff0212a6723376b34a0d17386f05b3f4dd3ab715b9af867fabc038c300fa8df357c648dedb03efbeed88 SHA512 9bcd58c451d7196c9870a04b76a504090ec217c7c88f47f17e141c5c9519fc41d24dfc83d97eb48b935d90b621a0ada1ed664fafffd7880e91627e56259b3c76
diff --git a/dev-python/tox/files/tox-3.6.0-skip-broken-tests.patch b/dev-python/tox/files/tox-3.6.0-skip-broken-tests.patch
new file mode 100644
index 000000000000..ea39bb30c1c7
--- /dev/null
+++ b/dev-python/tox/files/tox-3.6.0-skip-broken-tests.patch
@@ -0,0 +1,39 @@
+diff --git a/tests/unit/test_config.py b/tests/unit/test_config.py
+index 08a1ced..86e3fb6 100644
+--- a/tests/unit/test_config.py
++++ b/tests/unit/test_config.py
+@@ -1869,7 +1869,7 @@ class TestConfigTestEnv:
+         for name, config in configs.items():
+             assert config.basepython == "python{}.{}".format(name[2], name[3])
+ 
+-    def test_default_factors_conflict(self, newconfig, capsys):
++    def xtest_default_factors_conflict(self, newconfig, capsys):
+         with pytest.warns(UserWarning, match=r"conflicting basepython .*"):
+             config = newconfig(
+                 """
+diff --git a/tests/unit/test_interpreters.py b/tests/unit/test_interpreters.py
+index 0787b95..51e2ccc 100644
+--- a/tests/unit/test_interpreters.py
++++ b/tests/unit/test_interpreters.py
+@@ -60,7 +60,7 @@ def test_locate_via_py(monkeypatch):
+     assert fake_popen.last_call == ("py", "-3", "-c")
+ 
+ 
+-def test_tox_get_python_executable():
++def xtest_tox_get_python_executable():
+     class envconfig:
+         basepython = sys.executable
+         envname = "pyxx"
+diff --git a/tests/unit/test_venv.py b/tests/unit/test_venv.py
+index 51cb3c0..31a273e 100644
+--- a/tests/unit/test_venv.py
++++ b/tests/unit/test_venv.py
+@@ -427,7 +427,7 @@ def test_install_command_not_installed_bash(newmocksession):
+     mocksession.report.expect("warning", "*test command found but not*")
+ 
+ 
+-def test_install_python3(newmocksession):
++def xtest_install_python3(newmocksession):
+     if not py.path.local.sysfind("python3"):
+         pytest.skip("needs python3")
+     mocksession = newmocksession(
diff --git a/dev-python/tox/tox-3.2.1.ebuild b/dev-python/tox/tox-3.2.1.ebuild
index 61461fa6c1a0..757b58aec8a9 100644
--- a/dev-python/tox/tox-3.2.1.ebuild
+++ b/dev-python/tox/tox-3.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~mips ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 IUSE="doc test"
 
diff --git a/dev-python/tox/tox-3.6.0.ebuild b/dev-python/tox/tox-3.6.0.ebuild
new file mode 100644
index 000000000000..46fa53e8f938
--- /dev/null
+++ b/dev-python/tox/tox-3.6.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{5,6}} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="virtualenv-based automation of test activities"
+HOMEPAGE="https://tox.readthedocs.io https://github.com/tox-dev/tox https://pypi.org/project/tox/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# doc disabled because of missing deps in tree
+IUSE="test"
+
+RDEPEND="
+	dev-python/filelock[${PYTHON_USEDEP}]
+	<dev-python/pluggy-1.0[${PYTHON_USEDEP}]
+	dev-python/pip[${PYTHON_USEDEP}]
+	dev-python/py[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	dev-python/virtualenv[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/pytest-3.6[${PYTHON_USEDEP}]
+		<dev-python/pytest-4.0
+		<dev-python/pytest-mock-2.0[${PYTHON_USEDEP}]
+	)"
+
+# for some reason, --deselect doesn't work in tox's tests
+PATCHES=( "${FILESDIR}/${PN}-3.6.0-skip-broken-tests.patch" )
+
+python_test() {
+	pytest -v --no-network || die "Testsuite failed under ${EPYTHON}"
+}
diff --git a/dev-python/tracing/Manifest b/dev-python/tracing/Manifest
index 124bc5181d78..8d1aa5b3c1b1 100644
--- a/dev-python/tracing/Manifest
+++ b/dev-python/tracing/Manifest
@@ -2,4 +2,4 @@ DIST python-tracing_0.8.orig.tar.gz 18796 BLAKE2B d8f8e76c8a37e457be3806e7fc2419
 DIST tracing-0.10.tar.gz 20364 BLAKE2B 8c37ed178d037c8a3db22955999df3c6716c4cb35b1eca04e53e788aa0219e2eafa77ff489b1b6f77c60c6aba078d8e12f67a191e9a25d22bc112ee5124d85ee SHA512 3e9874d55df3b599cddc817680e49fed2bbaaf510597c4f41984a742b22c0b3596d29875f2fedcb890b3acf43cd5c52faad7de334781d9eec16676e9f10bf5d1
 EBUILD tracing-0.10.ebuild 662 BLAKE2B d6f4948b6bbf2030cfc0a33806b54ad07a83c9cc91045c1db72e808716e6ba89029d218be041a5b885bffdf8d396c0297357a0b62fb34685c04f04a6f926a2c7 SHA512 a1d054229986168cfbdd00b6dc0f787ac39ab4623bce1a06b96596afbe2cc5b300afaaaf2633eedd48aedf9d9c1fb504c02b2fc4a4ca900b26ac1c261e3829aa
 EBUILD tracing-0.8.ebuild 709 BLAKE2B 7529d5b57fc74468af068366392b8e5aad9d964dee83c4e03eca6bb67dd2eae88be353d3f429e064cdc2552a1864a2f0887dcecd57026afdbfee20eea8101816 SHA512 e2dd714778c6bca2005e443e58ee55bd4101d4e93247bddcad97cbfa91baec003a9b99ff9f1972b0f08ba422e94bb0dc93bc513b43ee8882f66d9117c3ef7cfc
-MISC metadata.xml 250 BLAKE2B fef48a48388f26a915c53bca9aa9cab62fb73ec006736542afb4cbbe0c7b81d23afe2884f52433c7d390fc38ac32f957a6f6efe285ee1cafaed76407a964cf9b SHA512 924271cfb32ceafc4134e19b53fbeed96f2e9056addc3c2cbdec28890254abf5f0714979a3ab698ca046e41ef5c2cca2932350830bd8bd3a8e214d99123c12de
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-python/tracing/metadata.xml b/dev-python/tracing/metadata.xml
index ea6b59e79026..7a38bb900964 100644
--- a/dev-python/tracing/metadata.xml
+++ b/dev-python/tracing/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>mschiff@gentoo.org</email>
-		<name>Marc Schiffbauer</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/dev-python/ttystatus/Manifest b/dev-python/ttystatus/Manifest
index a02d4f3f5581..c9cdbae1fd36 100644
--- a/dev-python/ttystatus/Manifest
+++ b/dev-python/ttystatus/Manifest
@@ -6,4 +6,4 @@ EBUILD ttystatus-0.22.ebuild 480 BLAKE2B 030f109e34d4554372ddb24a354681aa5fb276b
 EBUILD ttystatus-0.23.ebuild 489 BLAKE2B 9e320dac4060af471dd967728883d013ee4c3b8c056bef0bfba467bde3a10ec77ebda6098d2a47196ced3b06df5032e7e83706e4cfe2ac8c4213523f300de0c3 SHA512 9077281c7c4ee294c290952a5a50e37dbd89a1c7793bdf9a3c5eca922f6501df644fc145f9dde228d8a1c69518992ac19bdff0dfee6c0061eb16449d61fdc7e0
 EBUILD ttystatus-0.32.ebuild 483 BLAKE2B dccb177d2f734037efef5020259ae9aeedbe5f85a1d3b7474f126c54752c271a45431e505a829bcbf3466757e413f40b37419b02db9982e94721648869a152aa SHA512 7b107179d287c56fa9bffc3057d9988cf179e49aa4b4a92edcdc31dc7bdeb7fd69b37e1932a56fee7905e2e305787320aaf1c62fccf4194648def62f4bcb40c6
 EBUILD ttystatus-0.35.ebuild 546 BLAKE2B c8e695b3a7d4780814cdb70a3fe01fb5fb38380b1fe44de1fd73713774f1a3a957cc73027c07cf842e1bb1a92a94f34ff160713a4d3c823f360bc3ff9a884e21 SHA512 3f59da4728fd460e8b04e0871977117ecf378409b19bf89e30bff766037a92fbd13448eb25688b3abe69f8e3bbfee31983074180de0785652c6c0d876c06d5fd
-MISC metadata.xml 250 BLAKE2B fef48a48388f26a915c53bca9aa9cab62fb73ec006736542afb4cbbe0c7b81d23afe2884f52433c7d390fc38ac32f957a6f6efe285ee1cafaed76407a964cf9b SHA512 924271cfb32ceafc4134e19b53fbeed96f2e9056addc3c2cbdec28890254abf5f0714979a3ab698ca046e41ef5c2cca2932350830bd8bd3a8e214d99123c12de
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-python/ttystatus/metadata.xml b/dev-python/ttystatus/metadata.xml
index ea6b59e79026..7a38bb900964 100644
--- a/dev-python/ttystatus/metadata.xml
+++ b/dev-python/ttystatus/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>mschiff@gentoo.org</email>
-		<name>Marc Schiffbauer</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/dev-python/twisted/Manifest b/dev-python/twisted/Manifest
index f757aa6f5fc5..ac6e577334cf 100644
--- a/dev-python/twisted/Manifest
+++ b/dev-python/twisted/Manifest
@@ -18,5 +18,5 @@ EBUILD twisted-16.6.0-r3.ebuild 5723 BLAKE2B 852bb39907941b8a06351eb109cca2a75ae
 EBUILD twisted-17.1.0-r2.ebuild 5748 BLAKE2B 89d1134a993c8c474c4afb010e5cf99839b396b7c17cf5f8369485852c4306fc9db0bf0f1820f4896d499d8b4d499e8bdf9e3056e79edcf84a8c13ec876c404a SHA512 662b4382f38de1c3177e73df9e7598f175f6a511131d633a676534ce2ca80e1e1fdec96a5bba3d859de973b416cd02a384233c24fbf56069f0ab6dc59910dccb
 EBUILD twisted-17.9.0.ebuild 6037 BLAKE2B 6bcb95874ad77de1a27e823a936bc99da1149a3a7040ed24d3ce4d726e8946d153b29e0d1bd7e0c51791e5d1167cfbd6ce2b38e98e98f917d611fd1979b313e2 SHA512 701e4475125c89600b85158790da2198d46774b8011fc3db66a4c3efa22538523c45fc13a0f31041d927432284dc6372ccde014cfe89d2a7d829141bdc10c6bf
 EBUILD twisted-18.4.0.ebuild 5905 BLAKE2B 1096e2c14fcfdcd8e0e5271587e734e8dadb5395fae138c4f73e4e2786d0b2d4765004a2244327ce63781754955d5641f3a75d4cd846cc750b8e4e879ee307ba SHA512 edf4bfc48e7eee3c8be3c59cb700f84d0f6c5411306477786420a5cc71d682c4df1fdb9b16d740eb83045d38424d693c5a8abac41c376b370d818f3296a35d39
-EBUILD twisted-18.7.0.ebuild 5960 BLAKE2B bede9cdbb01f4d8c79b4829ab8507a7cd4cf987767ea6981cd2d477f887c639a6fcd32f67ba17840b0fc50b68d5e1f4415954f8d49e5079d6f88fb68acec9064 SHA512 a72d61294a4375f70d5cf754187d5eac8245feeaecb91f2d1d6fb77bdd70a5e4e03ee6fb06a2758f6bbeb80768d63a4d7b0a64636ea37f82815354f564ec6a4f
+EBUILD twisted-18.7.0.ebuild 5962 BLAKE2B ccb750c50c6a5256ec7b852832eed6e2e1bb01fc48154034779f1b57529bf868c72c1dda64eb853679341103b069baa45472d26c56290d6ac72beaedf2c819eb SHA512 bff23ce89de80d0e0a252bbce108121fa63c1b3a681ab4f2c3ae878cf9e8336f5d02f960e84ca79ff5d326727ac4c5b8fee36395a0b8a7ce7374bd15136117ad
 MISC metadata.xml 1429 BLAKE2B f6bf7279da38a837c80fff9f9319d5c2d3893fb4a5a17d731b170153d1c4e10479b58a6576d84fa59ae653794aa017862a4fcb11bf1bc6ca85c374e3b9dc7cd5 SHA512 1ddcc6bb727f97eacb712badf834ceca15a4544e340090622774bc0e781f2ce1a20a96f8b5018535998e9865204697a25ab84eff87c480246fe14e39ef9411ed
diff --git a/dev-python/twisted/twisted-18.7.0.ebuild b/dev-python/twisted/twisted-18.7.0.ebuild
index 45bc575df11a..ff236d1d49da 100644
--- a/dev-python/twisted/twisted-18.7.0.ebuild
+++ b/dev-python/twisted/twisted-18.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,7 @@ SRC_URI="${SRC_URI}/${TWISTED_RELEASE}/${TWISTED_P}.tar.bz2
 
 # Dropped keywords due to new deps not keyworded
 #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-KEYWORDS="~amd64 ~mips ~amd64-fbsd"
+KEYWORDS="~amd64 ~arm ~mips ~amd64-fbsd"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/unidecode/Manifest b/dev-python/unidecode/Manifest
index 3d03a1d1893f..75f5e09b14a0 100644
--- a/dev-python/unidecode/Manifest
+++ b/dev-python/unidecode/Manifest
@@ -1,7 +1,9 @@
 DIST Unidecode-0.04.20.tar.gz 205830 BLAKE2B a840e67df24483a0d4843666c4d06be24fedad5669debdf734d02a8a362f0ea5c531fd19512c41136343e56c5527ccd9c4692444cf83b68e533491b8cb54b047 SHA512 07708649a130d4a1747fcc24816717a512c1edeb4c25e01a5e898b21d2e76bca6b45d983cc452fe56bddea5556632b91aa2daee511e33a423197e0df9c80e125
 DIST Unidecode-0.04.21.tar.gz 205931 BLAKE2B 701afb86b89fc17a8eb9c769b4be1d08a30f0b44881597735478108d8121f57e2539a8209b9aef9c90f5aa8cc9f9dc76bea837d9b2ebad502a840c37628ed5ff SHA512 33fc546b3eefc4ba5feee90d584e49ccd81dd0ae00671f7e44f43cc3dc8a458b86ed6dbfacba6dac7539112408137fc1db6329cc42f31ee250755d841c7c29c2
 DIST Unidecode-1.0.22.tar.gz 208877 BLAKE2B 21df38361b9b66f5e2d6822afcdf4656cfb240dc679f7469b41652b95d3a6921b9409a65891e359708f5bee09dbeff1885801ca3842c8ecd12b31e31689d69ca SHA512 f7663b320040bc750bc10ac0ed222e4feeb22c903b103c148cfa31e9d4cbae146d9668dc45c6efc82e8ed28e0db28d5de5e3ef1259c712bf317f2c6b2543772a
+DIST Unidecode-1.0.23.tar.gz 210727 BLAKE2B 2d19139e2b337bf979585b99a5fdbe0fc629487413a0bf9928fff954f99bf06efdf59a85ef623ab9334e5420971613d8b748bee8173918e099c33c9210eb2c36 SHA512 f3f48a1c06942caf06a9be29250af6f2ddb022cbee6236e2f9ab897af0b11517be3300b4a391dd89befd531b138eb1c163f9bfac178496c01ff2870b6a522f3e
 EBUILD unidecode-0.04.20.ebuild 588 BLAKE2B 269f69a3dd7050665171635a56762dbe9b2f4ac3f7a3a2ee422ea5a9b8913da02265a6761b39e05402cfbfa2f08fb93fe88c6e8c64567e4019ca2b8c751273d8 SHA512 97bb012a8f2a910bb2cdf2a661145232b9c0624e382faf7bfc017579cc2c1da86bb1a6d48e8cae9cd6799923aec497baab5e61e34bd3bd7e7150158a7f009419
 EBUILD unidecode-0.04.21.ebuild 596 BLAKE2B a13ee8cb417a0a7724ae1eff0f3abca8dc247458658e80a9c6c5a3991fc5f09740926a31ce37bb4646c2d60d4d5a23f3a7c3b48a6bc07b2e4d75870c5e240669 SHA512 a8befe494a6dad7e85672d1a2ed06c1413594387aef925127e542093c275ec007ae12f0866e17e6975aa361fc539d08f45ed90cd66b65830a4caf86ea59d9add
 EBUILD unidecode-1.0.22.ebuild 607 BLAKE2B 1f3906e131c963e875b4b3c052dcd440599cca7692657747d79924282526937ddc152e2373f5340adc208ad68000631aceb9ee365f0f3330405d491b55e2ff83 SHA512 84bface97cfecd7989a06600ffbf11a846b22b0a7d5542efa7d2107f2f2ae9394b5435718d630ae3023910c5628b8aa1b452352d3d2b7f19decdb37fa36eba79
+EBUILD unidecode-1.0.23.ebuild 690 BLAKE2B 253dd209b3c03e553344c87a433340f65bf6b6af08825261fe7d47e755388e81999979c71f80c060590643d71044cdddf457444bcfb08407b0d9e5bad4ea37de SHA512 1c67a6c1b79cdb4732a01bdaea5ed8e56199e8b9631c157f1555225d4e97b71e03d619d6075fc90a844eb12395d76c1f067e3e0ec572eceb1fabb508d6f44aba
 MISC metadata.xml 596 BLAKE2B 68ded8e71de4e3b964343ffbca55b2b5c6a58168513658e1c72607afd8a53c185e71bfd652a383cbabc0b49b0e36542bdb0066fc6ea8636b0e92f744c6b86615 SHA512 4df580a02af8983a753c80ec3ace0c356d701305b36669ae7796f7d0c0774348c6534bbf8d75f2e79b7a4e5471d500bcd34df33875996066b7c07d55a4a91f8d
diff --git a/dev-python/unidecode/unidecode-1.0.23.ebuild b/dev-python/unidecode/unidecode-1.0.23.ebuild
new file mode 100644
index 000000000000..859689a7fa49
--- /dev/null
+++ b/dev-python/unidecode/unidecode-1.0.23.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6,7}} )
+PYTHON_REQ_USE="wide-unicode(+)"
+
+MY_PN=Unidecode
+MY_P=${MY_PN}-${PV}
+
+inherit distutils-r1
+
+DESCRIPTION="Module providing ASCII transliterations of Unicode text"
+HOMEPAGE="https://pypi.org/project/Unidecode/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
+S=${WORKDIR}/${MY_P}
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/uranium/Manifest b/dev-python/uranium/Manifest
index 19b5d3892ff0..4a03699f9c41 100644
--- a/dev-python/uranium/Manifest
+++ b/dev-python/uranium/Manifest
@@ -1,6 +1,8 @@
 AUX uranium-3.3.0-fix-install-paths.patch 1716 BLAKE2B 13ea6150f1cfb1a07ac1886be8281110bbca5abd39b78807fe67317052579efa0498bc8a321d09fc953c9358dfb963ed210451549d14d6f58ac4a94cc3e9a5d1 SHA512 a7007c74a2e46e281dc0db6fcc45475e36f3a261445c2162fe0a548e577cd7cc344957e3284c52fffdd21cf223e91ab5b4fc1936b6893de614c4143cd1b40419
 DIST uranium-3.3.0.tar.gz 906093 BLAKE2B d41608170da64f93d6149e76cc28fa476e439f6b291bc667f8b562dbcde047f234aa77cfa52b73420f286b926ef05ef50df8fd74722fc81dd3fe94b407bee7f4 SHA512 48de8ecf100f6bfbaa6b3bc6562fef25991ad07375f3d8f752f130b44c2e4728b2979f99de23570cd46367d868bb7139dfd9d73a7d3755d2141edc1fd46939b3
 DIST uranium-3.4.1.tar.gz 646742 BLAKE2B eb65d5a35b3c63cfb069f6c1077a91b7aa10517dd7fe6938b639f1229e61c5c6aa892447cd9d5851df46808f01f237820811b4358a235c50a89f2333df3418ef SHA512 59e0a605f3d898765bb670104cabb7fb1471061934900e63b54c1a07219970e07414a3983e96a577f5986302779b7acedc8e0ef0da3756dceefc0170ec80645b
-EBUILD uranium-3.3.0.ebuild 1389 BLAKE2B 66d6d70799f21ba5906e78e0308c83beebaa28b7809d831b032a5b41f451a403e119536f45959bbd38816f85f21354a73e2f9301adbe3cbde439e4ff2a7a93a2 SHA512 7b662a387df685fbc46af0acbe82428a05835edca3e2a3ad1867634c21da027254295394735e43684f3ee5b1eaaee160ee8144a46b596bcffe7c697de7f8b582
-EBUILD uranium-3.4.1.ebuild 1389 BLAKE2B 66d6d70799f21ba5906e78e0308c83beebaa28b7809d831b032a5b41f451a403e119536f45959bbd38816f85f21354a73e2f9301adbe3cbde439e4ff2a7a93a2 SHA512 7b662a387df685fbc46af0acbe82428a05835edca3e2a3ad1867634c21da027254295394735e43684f3ee5b1eaaee160ee8144a46b596bcffe7c697de7f8b582
+DIST uranium-3.5.1.tar.gz 664431 BLAKE2B aa7a5241672316ae63cc2e55bb0986cd3bbba3c82cf90334efd7d097b714eb574f0caebec571beab6a3f78c08ab9a7c1699842031c5bcd074ebb0d9008e05784 SHA512 2924721f5308eb8f27826316a705a12f0768889a4a6c9de431d6827a98036b664497c12ef1dd42e47f67e566fe169d7b5941b62426952c9bec1797933bfc62ce
+EBUILD uranium-3.3.0.ebuild 1386 BLAKE2B edfd604861aadc381f2b921a80b73a637c619e951aea9002ab5e8cf42a3aa1e0ebc239cd697992ecc2f575484e5fd0ca2b2bae7848b791a93606fbc415f8d068 SHA512 1107c60e0eee9920beafe186f6a745b104fb0968c0dc80939901e5fcb51fe0487228c5f3b7b0e08491e5b75c6d1356381ad949889d961c906e1cad656c6f812a
+EBUILD uranium-3.4.1.ebuild 1386 BLAKE2B edfd604861aadc381f2b921a80b73a637c619e951aea9002ab5e8cf42a3aa1e0ebc239cd697992ecc2f575484e5fd0ca2b2bae7848b791a93606fbc415f8d068 SHA512 1107c60e0eee9920beafe186f6a745b104fb0968c0dc80939901e5fcb51fe0487228c5f3b7b0e08491e5b75c6d1356381ad949889d961c906e1cad656c6f812a
+EBUILD uranium-3.5.1.ebuild 1386 BLAKE2B edfd604861aadc381f2b921a80b73a637c619e951aea9002ab5e8cf42a3aa1e0ebc239cd697992ecc2f575484e5fd0ca2b2bae7848b791a93606fbc415f8d068 SHA512 1107c60e0eee9920beafe186f6a745b104fb0968c0dc80939901e5fcb51fe0487228c5f3b7b0e08491e5b75c6d1356381ad949889d961c906e1cad656c6f812a
 MISC metadata.xml 975 BLAKE2B 42ea7df7c2ee42408ada0328335319d95edc41c92d8ae74d77fb178629e48c7ab7886e4ea07f058b9be9b67f04d29b795eb353e47de60370b7949158cb7798ca SHA512 6074599c0b62f2f527041621550ec183bfa26400eee212c3e9cd0ab9742917ddf762ef668a6bba4628cee8063a0f40104f21d25e260de1d164b61389c9544824
diff --git a/dev-python/uranium/uranium-3.3.0.ebuild b/dev-python/uranium/uranium-3.3.0.ebuild
index ea926475cda6..cd83c93f844d 100644
--- a/dev-python/uranium/uranium-3.3.0.ebuild
+++ b/dev-python/uranium/uranium-3.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/dev-python/uranium/uranium-3.4.1.ebuild b/dev-python/uranium/uranium-3.4.1.ebuild
index ea926475cda6..cd83c93f844d 100644
--- a/dev-python/uranium/uranium-3.4.1.ebuild
+++ b/dev-python/uranium/uranium-3.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/dev-python/uranium/uranium-3.5.1.ebuild b/dev-python/uranium/uranium-3.5.1.ebuild
new file mode 100644
index 000000000000..cd83c93f844d
--- /dev/null
+++ b/dev-python/uranium/uranium-3.5.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{5,6} )
+
+inherit cmake-utils python-single-r1
+
+MY_PN="Uranium"
+
+DESCRIPTION="A Python framework for building 3D printing related applications"
+HOMEPAGE="https://github.com/Ultimaker/Uranium"
+SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	~dev-libs/libarcus-${PV}:=[python,${PYTHON_USEDEP}]
+	<dev-python/PyQt5-5.10[${PYTHON_USEDEP},declarative,network,svg]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	>=sci-libs/scipy-1.1[${PYTHON_USEDEP}]
+	dev-qt/qtquickcontrols:5
+	dev-qt/qtquickcontrols2:5"
+
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	doc? ( app-doc/doxygen )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+DOCS=( README.md )
+
+PATCHES=( "${FILESDIR}/${PN}-3.3.0-fix-install-paths.patch" )
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)" )
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	if use doc; then
+		cmake-utils_src_compile doc
+		DOCS+=( html )
+	fi
+}
+
+src_test() {
+	emake -C "${BUILD_DIR}" tests
+}
+
+src_install() {
+	cmake-utils_src_install
+	python_optimize "${D}usr/$(get_libdir)"
+}
diff --git a/dev-python/urllib3/Manifest b/dev-python/urllib3/Manifest
index f4ddea55e5c0..a471d9aa929e 100644
--- a/dev-python/urllib3/Manifest
+++ b/dev-python/urllib3/Manifest
@@ -1,6 +1,8 @@
 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
 EBUILD urllib3-1.22.ebuild 1755 BLAKE2B f74bfb8db93173a4388ae644e81cf4e3c8a3fc491ed0f3453def06a323b03ffe52bc471a32c0fdab64880554417082f0c4b7967f9d1bb185e04afdc65da3faf4 SHA512 8bab85bac5e97dadc1729434a108c82609a82a69b8af505aa77f267c897a368e49d23ba176ce45f583517e6844185ca2524c09cd31a1a76795dc99b8e6d1849f
-EBUILD urllib3-1.23.ebuild 1866 BLAKE2B 24a481d18fbfc929accd42d6e3e6e1de64c1437fc3a428e644f6589396dbaacc52ab0bcdd64201c06888ae5eb79d80c12135cc659e442469ce6e22f9909dca27 SHA512 c41c3566d1fac3fd03c2a94fccdd1b812f3ba8a64f45013e0ae16fcd35a13eedaf10d97e16a03f12f3c93f2a55269acc0e7a1dbdc7e36ef3b4a0e558bf81f2fd
+EBUILD urllib3-1.23.ebuild 1908 BLAKE2B be64fa2c37476ddb8a5b6c36670c1605a8d58e5fb6ce9361e76d83e37c36a24f00e827e48a18f2a1ae40f3b4b447f9d9402195ae143d5eb90260e03199fe9045 SHA512 4a55b4e23b5f94f979585ccf4abf335bd83c9dfbb435d6e53f64ac4b7ecb39f86880fc17809350059fe70c00f3e662e1e4e07dfb9032d3c91da9e5f0a91ecfae
+EBUILD urllib3-1.24.1.ebuild 1821 BLAKE2B 8045dc502b05aeb28d83a2bafcf50e0da85b8715148d61fb6b3d53986612e35e99b533606599cbd40ea49581daf6c146874ffb8e7d23574068efdd559953be9d SHA512 d6438f817e27e882e8ca5261cf5d202cbaa24440dbd57bc54cb0463bfbd784d5874248af28f89f157c30322f50d5545f29e15b60a78535fb59e76c7dcb69dec4
 MISC metadata.xml 376 BLAKE2B 2e9ba1b23bd9ab2770d23ce9bdf21f4083f46184c22d1dc0bd449b6605c24a2ef0168e1503327b549ba55e81b7bb52fe5f73fa375f06f3c64fabfac6cf5a9d77 SHA512 97d216a4841d8c78655c923060a0040b75fbb2d19a42e51081fc63a4af80514db5abf09a02706cc52387ab7ac72e964f947f1ded50bcc7f8fae6d022d5353543
diff --git a/dev-python/urllib3/urllib3-1.23.ebuild b/dev-python/urllib3/urllib3-1.23.ebuild
index 8fa669db6d19..b047e9d4d8ff 100644
--- a/dev-python/urllib3/urllib3-1.23.ebuild
+++ b/dev-python/urllib3/urllib3-1.23.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 ~x64-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/urllib3/urllib3-1.24.1.ebuild b/dev-python/urllib3/urllib3-1.24.1.ebuild
new file mode 100644
index 000000000000..e30018402c85
--- /dev/null
+++ b/dev-python/urllib3/urllib3-1.24.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,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/utidylib/Manifest b/dev-python/utidylib/Manifest
index fd8bd19b1495..e6f79cc7716e 100644
--- a/dev-python/utidylib/Manifest
+++ b/dev-python/utidylib/Manifest
@@ -1,9 +1,3 @@
-AUX utidylib-0.2-fix_tests.patch 2084 BLAKE2B e17a306a25f14806c33b05a350028ae4f2c8abf58055c5776f2736886dcc6a70d4dda3796b00ecaa50f36367983653507093b209e064e6d310d637eca57dd3ca SHA512 64d66929c0c318f2033877b51b8564fe32ac82512b08e28fb2c6252f591eeaa6ff84d2a23d7e5ea82a1e293371c84049f68033a21c8258fc9483cfb9f7c615cb
-AUX utidylib-0.2-no-docs-in-site-packages.patch 475 BLAKE2B c909872b10b569b879d65eb7a886953e0b2d1b180704a616da6816604414b9f4a16cce90170e93264e7528fb1ff9100f7a76088ecfd136c51f6ad2278d2668ff SHA512 ffa0d4c261adfa9d49b5b0a3e559d80a627098a07667f935528a41b18a11ef18dbd86d6b48f99a8f10ff3c0ed91b966c00c5a78b9400b9caf7c9c57036b6d1f7
-DIST uTidylib-0.2.zip 17575 BLAKE2B f13964dc452d05e01fcd4dca601f35b6aaa4675cd0c10086998570e0deb0b8a0f53a1e6c243db8466862feeb1746299895946e381205280c62c6cb741619bc68 SHA512 02f6611f1c7dd42db96012f7067ada8ccd841532744a569492a2f1c0524a3f1777b8f997a716b9bb18f69f31cb922dc89328d0bd284830620a930a038b303893
 DIST uTidylib-0.3.tar.bz2 13809 BLAKE2B c6b495933ecdc21543c79e3ff200cc06ec4ebc1682cf9172bd988a08afef8b69db17eec4b88665aff5dc6cef371f3c665f6de3ffcc1dc515f778b523333c891b SHA512 4503f2a6366e5110740b312df2300d62bb68e1e1032184e9b56dee75995309c76d4f8e5851c73e7c8e08cca7bba9c74436d8dfc0524f115f3abb2bdf5529cc35
-EBUILD utidylib-0.2-r2.ebuild 1074 BLAKE2B e932e1a56825dd6897dc32503d30a776d936a58b9100184e64a6721de30313f42ef80ec67826d304eecd391601ea20f1d368424b2d9f2ebe9c5783f4b805dc68 SHA512 105a3114c8541c6d6377a03a3ecceb1e8aa38e3154b941c8936a5c9adeaceb2c0dc8f8b47fdae4932f455f719fc4568831200dbac50cdba90f6098b139f506d7
-EBUILD utidylib-0.3-r1.ebuild 996 BLAKE2B 00a939d1b4fcebac9501c4f3e85eaf8ef2dc38e56247b765ff1a4e7037d4ca7f1b9fca9be7e8b9c771d246c36b7983045d423d03d74cca91c0af31157803d720 SHA512 b466417d355b1b501453993d1102c7cc557ada59ccd3aa116b8b204bd485c961f5b7dc948aa0c49221cfa3a35b5ab5687e6c02575f58127cd72f15211675f277
-EBUILD utidylib-0.3-r2.ebuild 971 BLAKE2B 9a9ac9901c711d7f5370e90809a19a7f9eded6175202cb7cb3ddbaa336ae2df93dd07d955f352d070181ce8a2b7a5a192189ba1fd45bf9d3a69ca82241864cb5 SHA512 23526ebcd3476b74d9d795e6738be76ae501b07e76f38f8948f3fa0388df1c4702e20188d1ddfe9d0f4a30e382da78b31ec353865cc72a7579de67c19cd83d4a
-EBUILD utidylib-0.3.ebuild 968 BLAKE2B 4abb04af906eb0d4c1a5fe381cbd4043f13f87bdf83e436ae380f70d0aaff090f5fa189668ac8a7e153ff17d4107d8cd64438504792d92df3cdec98ee5158739 SHA512 8ab4a0ee4b7953250bb049c06bc8bc1ac2a787f6faab73bd714bab4aa087d5b435a833e7efd382de1e53c52091adbe4687c25bade1f23cf464c0726b42b85637
+EBUILD utidylib-0.3-r2.ebuild 964 BLAKE2B c4876467287bf406d6abcb78193a7069897ccbebfc41a1eb667e209995d35c89c55756bc964c88576b4fabc9538d20bbc47717a97dcb0ee371a3642803d725e9 SHA512 74cf7fb803ff9b7ea26b64109bc26fc8b889c8abe9f11183e1b77c71878c23f943573ef87dbbb6273baa0efc1b2a42bd73ac7b58b637bb83d4d11ee6ff3cea8e
 MISC metadata.xml 372 BLAKE2B 58932a89c0765511f1231a3ea43ac6509792a03b345655f7d15ec306a33a0264d49b32352c57e8d3cc73294c8cfcbd679289011312bdbed55459f6751dabffa0 SHA512 d6602ff98aa2ae6a69cad590ab014cbe5b3f1fc1b28c64e91025140fbecaa78c49d6e45bc8b8b5432b0cfe4c91402db3d3954db92905ddc42c13540a9c1e2ab5
diff --git a/dev-python/utidylib/files/utidylib-0.2-fix_tests.patch b/dev-python/utidylib/files/utidylib-0.2-fix_tests.patch
deleted file mode 100644
index b55a15119ba4..000000000000
--- a/dev-python/utidylib/files/utidylib-0.2-fix_tests.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -uNr uTidylib-0.2.orig/tidy/test_tidy.py uTidylib-0.2/tidy/test_tidy.py
---- uTidylib-0.2.orig/tidy/test_tidy.py	2004-02-24 08:53:52.000000000 +0000
-+++ uTidylib-0.2/tidy/test_tidy.py	2009-07-25 15:50:56.000000000 +0000
-@@ -4,6 +4,10 @@
- 
- class TidyTestCase(unittest.TestCase):
-     def __init__(self, *args, **kwargs):
-+        super(unittest.TestCase, self).__init__(*args, **kwargs)
-+        self._shared = False
-+        self._parents = []
-+
-         foo = u'''<html>
-     <h1>woot</h1>
-     <hr>
-@@ -13,13 +17,13 @@
-   </body>
- </html>
- '''.encode('utf8')
--        file('foo.htm', 'w').write(foo)
-+        file('foo.htm', 'w').write(foo)
-         self.input1 = "<html><script>1>2</script>"
-         self.input2 = "<html>\n" + "<p>asdkfjhasldkfjhsldjas\n" * 100
-     def defaultDocs(self):
-         doc1 = tidy.parseString(self.input1)
-         doc2 = tidy.parseString(self.input2)
--        doc3 = tidy.parse("foo.htm")
-+        doc3 = tidy.parse("../foo.htm")
-         doc4 = tidy.parse("bar.htm") # doesn't exist
-         return (doc1, doc2, doc3, doc4)
-     def test_badOptions(self):
-@@ -33,7 +37,7 @@
-                 self.fail("Invalid option %s should have raised an error" %
-                           repr(dct))
-     def test_encodings(self):
--        foo = file('foo.htm').read().decode('utf8').encode('ascii', 
-+        foo = file('../foo.htm').read().decode('utf8').encode('ascii', 
-                                                            'xmlcharrefreplace')
-         doc1u = tidy.parseString(foo, input_encoding='ascii',
-                                  output_encoding='latin1')
-@@ -58,7 +62,7 @@
- ##        self.failIf(len(doc2.errors)>1) # FIXME - tidylib doesn't
- ##                                        # support this?
-         self.failUnless(str(doc2).find('\n')<0)
--        doc3 = tidy.parse('foo.htm', char_encoding='utf8', 
-+        doc3 = tidy.parse('../foo.htm', char_encoding='utf8', 
-                           alt_text='foo')
-         self.failUnless(str(doc3).find('alt="foo"')>=0)
-         self.failUnless(str(doc3).find('\xc3\xa9')>=0)
diff --git a/dev-python/utidylib/files/utidylib-0.2-no-docs-in-site-packages.patch b/dev-python/utidylib/files/utidylib-0.2-no-docs-in-site-packages.patch
deleted file mode 100644
index 761c4947dfa8..000000000000
--- a/dev-python/utidylib/files/utidylib-0.2-no-docs-in-site-packages.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- uTidylib-0.2-orig/setup.py	2005-12-01 00:48:14.000000000 +0100
-+++ uTidylib-0.2/setup.py	2005-12-01 01:10:33.000000000 +0100
-@@ -54,7 +54,7 @@
- 
- 
- setup_data = dict(packages=['tidy', ],
--                  data_files=data_files,
-+#                  data_files=data_files,
-                   cmdclass=dict(install_data=install_data_utidylib,
-                                 bdist_wininst=bdist_wininst_utidylib,
-                                 install=install_utidylib,
diff --git a/dev-python/utidylib/utidylib-0.2-r2.ebuild b/dev-python/utidylib/utidylib-0.2-r2.ebuild
deleted file mode 100644
index e71c0277816b..000000000000
--- a/dev-python/utidylib/utidylib-0.2-r2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-MY_P="uTidylib-${PV}"
-
-DESCRIPTION="TidyLib Python wrapper"
-HOMEPAGE="https://cihar.com/software/utidylib/"
-#SRC_URI="mirror://berlios/${PN}/${MY_P}.zip"
-SRC_URI="mirror://gentoo/${MY_P}.zip"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="doc test"
-
-RDEPEND="app-text/htmltidy"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/epydoc[${PYTHON_USEDEP}] )
-	test? ( dev-python/twisted-core[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}/${P}-no-docs-in-site-packages.patch"
-		"${FILESDIR}/${P}-fix_tests.patch"
-	)
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		"${PYTHON}" gendoc.py || die
-	fi
-}
-
-python_test() {
-	trial tidy || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( apidoc/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/utidylib/utidylib-0.3-r1.ebuild b/dev-python/utidylib/utidylib-0.3-r1.ebuild
deleted file mode 100644
index f4930840d563..000000000000
--- a/dev-python/utidylib/utidylib-0.3-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-MY_P="uTidylib-${PV}"
-
-DESCRIPTION="TidyLib Python wrapper"
-HOMEPAGE="https://cihar.com/software/utidylib/"
-SRC_URI="http://dl.cihar.com/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="doc test"
-
-RDEPEND="
-	|| ( app-text/tidy-html5 app-text/htmltidy )
-	dev-python/six[${PYTHON_USEDEP}]"
-
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-RESTRICT="test"	# 1/11 tests fail
-
-S="${WORKDIR}/${MY_P}"
-
-python_compile_all() {
-	if use doc; then
-		${EPYTHON} setup.py build_sphinx || die
-	fi
-}
-
-python_test() {
-	py.test || die "testsuite failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( build/sphinx/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/utidylib/utidylib-0.3-r2.ebuild b/dev-python/utidylib/utidylib-0.3-r2.ebuild
index 180247a06a16..2b440b273f8f 100644
--- a/dev-python/utidylib/utidylib-0.3-r2.ebuild
+++ b/dev-python/utidylib/utidylib-0.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ SRC_URI="http://dl.cihar.com/${PN}/${MY_P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/dev-python/utidylib/utidylib-0.3.ebuild b/dev-python/utidylib/utidylib-0.3.ebuild
deleted file mode 100644
index 177e0d3644c2..000000000000
--- a/dev-python/utidylib/utidylib-0.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-MY_P="uTidylib-${PV}"
-
-DESCRIPTION="TidyLib Python wrapper"
-HOMEPAGE="https://cihar.com/software/utidylib/"
-SRC_URI="http://dl.cihar.com/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="doc test"
-
-RDEPEND="
-	app-text/htmltidy
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-RESTRICT="test"	# 1/11 tests fail
-
-S="${WORKDIR}/${MY_P}"
-
-python_compile_all() {
-	if use doc; then
-		${EPYTHON} setup.py build_sphinx || die
-	fi
-}
-
-python_test() {
-	py.test || die "testsuite failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( build/sphinx/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/wheel/Manifest b/dev-python/wheel/Manifest
index 55daece4a979..52f0ca11b135 100644
--- a/dev-python/wheel/Manifest
+++ b/dev-python/wheel/Manifest
@@ -2,8 +2,10 @@ DIST wheel-0.29.0.tar.gz 54143 BLAKE2B 8f29c81b9b3c8ee419c26f04e09f437a2113716f5
 DIST wheel-0.30.0.tar.gz 43087 BLAKE2B 796a57298571a9430094be93f38c679941157679d5a75d7d5da88be4d1f970f5aeb9810bbaaa31c77b71959b3c6eadcd618314ab3fa82b959c592c72b8171c0a SHA512 d39fb683ca2937745b057464ec17f5fab0475c2b1225cc4c84f1b0e8cd61a4bb039730dafdaa687f7b054ce080c4b7acbd3196045db14e015585536fcf498f84
 DIST wheel-0.31.1.tar.gz 38574 BLAKE2B 83684b33d587fe4a9593aa1b45c8e3f9543a97f80767c973f2b796bd23191af489760507fc491e4c471d804cb8c8a969de2e6cc509beeae66e1911650be5d725 SHA512 38854a54722cd8b3ff3b53bc62fc56255b37adac5ffb3fc1b0cb5f252a3cebd84390f3bac0600835c64bbec158337a7a13f0725dda47a659183fd038986cdd75
 DIST wheel-0.32.2.tar.gz 17647 BLAKE2B b6ca2fb32767e639274676b88c3ae7996e2b8d618b5b11e43d31694a8351da9bdd1c50cbd4c8f7eb2ffaa55bdd4b2fe9393177514bd32f2275629067c8f95984 SHA512 584ac926ded13737070cfbed5ef18b685d4e4440d8b6d60a64178cd88cc380fcae6618d4446bffffebc6e1ce1acccf91d21bfefbe006dcff6771fe7ce5f62cd4
+DIST wheel-0.32.3.tar.gz 18585 BLAKE2B 14b2fc9c6f306865be96040c00e5244a132251bb48a3cb9656261e4724a6bd5754713e7442f3310563efc202081a43a5803e4bb672073b239362ce46b9171b8a SHA512 6f663b3a3edbf470a3565eb5ad763d466f857f053be32dd4242d9b94874844076c7a9142c13ba0185697b9b96fbdbfb1be2abfdfbeb00ff4853bfa9e52681db4
 EBUILD wheel-0.29.0.ebuild 998 BLAKE2B fe9d6e9b2a16944bc754ba9d9bcfcd471bb4f4d3d5cd3db6c15e575042eba4aee12103b5af9be465396f215152ed8b147c5939d649a72c1637c6cd40577491eb SHA512 387cd792495d26346e4aea329e53ca640c0582f78af2b7a7a5e96d6ec2d7bf4c581ae6deeb12a51d869f69a8e58d764f709b76464003c17e53b1f61088249bd8
 EBUILD wheel-0.30.0.ebuild 1023 BLAKE2B 5a96e4dddb45dbc42c58b484b505683d0653668a20943debae1561faf22aa8e1d98145853e3aa68a1a06e03dda9fc758e3babc4fd7eb65be90f625ce81098377 SHA512 646b30a918659e0b0ea0a0eeb64e17082500620e1b5451618439a109e963025884abd87ea838a5bbd8d530fd4823daa8d94591aea2ff738eb020f8d8ebf59d53
 EBUILD wheel-0.31.1.ebuild 1025 BLAKE2B 81f8b4da6db1df776bcb92683292bcc86d6d87ddc72821fa6d441bcbaf12066862524f677bec1b86e9528bc893761e67d8b870454c0e2ff1a8067626de6de00f SHA512 7e48c1706be6499875bf7b3766319c344652b53607e561c45ac5a0cdf9c7ee8e095650e5fd7f37f2b476e1a93e4741cab57e9b84d13b04254390e556f0f08845
 EBUILD wheel-0.32.2.ebuild 1022 BLAKE2B 8f77e64d6c60d9a865831a700bd825f424bf768d857578e9e7dfe088325dd7d4b880733c9458cefb47cfc6c64e16f1372d16380180d7d4b9b34e8a10ef7a2575 SHA512 3091d699022ccf82f5434762dfd971ea9b64b1f4b427b0b1a392a6291ee2c788cf20d7a9af63670cda27905b4f0e3d83aa270c1e3492d1ab868096c7702b863c
+EBUILD wheel-0.32.3.ebuild 1022 BLAKE2B 8f77e64d6c60d9a865831a700bd825f424bf768d857578e9e7dfe088325dd7d4b880733c9458cefb47cfc6c64e16f1372d16380180d7d4b9b34e8a10ef7a2575 SHA512 3091d699022ccf82f5434762dfd971ea9b64b1f4b427b0b1a392a6291ee2c788cf20d7a9af63670cda27905b4f0e3d83aa270c1e3492d1ab868096c7702b863c
 MISC metadata.xml 308 BLAKE2B 32390fb7a1a3de815d3a791850d9f96d8092be48cf2ac61f8cebdf132e7d1c5c4cba95bac3edc3f2ebd6a2d9e9437e0c9187f9668ed95c4ddb4ee6072f496d46 SHA512 d5fdaba19a51f826d45ba93cc77a08fd4be563634f51236cec379763f066ed925869a57c94c75a34ed58302619d419f31dcad641d9e85c68d11d72ec53d2d45d
diff --git a/dev-python/wheel/wheel-0.32.3.ebuild b/dev-python/wheel/wheel-0.32.3.ebuild
new file mode 100644
index 000000000000..befc3c65c39b
--- /dev/null
+++ b/dev-python/wheel/wheel-0.32.3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy pypy3 )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="A built-package format for Python"
+HOMEPAGE="https://pypi.org/project/wheel/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
+IUSE="doc test"
+
+RDEPEND="dev-python/jsonschema[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+#	test? (
+#		dev-python/keyring
+#		dev-python/keyrings_alt
+#		dev-python/ed25519ll
+#		dev-python/pytest[${PYTHON_USEDEP}]
+#	)
+#"
+
+# Fails somehow
+RESTRICT=test
+
+python_test() {
+	sed \
+		-e 's:--cov=wheel::g' \
+		-i setup.cfg || die
+	py.test -v -v || die "testsuite failed under ${EPYTHON}"
+}
+
+pkg_postinst() {
+	optfeature "Signature support" \
+		dev-python/keyring \
+		dev-python/keyrings_alt \
+		dev-python/ed25519ll
+}
diff --git a/dev-python/yarl/Manifest b/dev-python/yarl/Manifest
index b4ba81bfa3b4..27108c76d4fa 100644
--- a/dev-python/yarl/Manifest
+++ b/dev-python/yarl/Manifest
@@ -2,8 +2,10 @@ DIST yarl-0.9.8.tar.gz 125806 BLAKE2B 983ccd2516ad00e89b75cb94a2237ea85325947d8f
 DIST yarl-1.1.1.tar.gz 156284 BLAKE2B d070b0ea5cb06ef78f850a130d3292e66f592fd46ccf671cfe51f93c0e419a599f42f6a7255e3eb0f15ba96b1ac0cdcd0bce4deff81da6e5dcc25f7a8136bd78 SHA512 fe53e24401e91994d04fd7274200f92168bb08d78c460b49e800646a3e4611f6baefca4ede5b2b6727f2e6e4cd51296ca834305c0e2fb377ac3a928463f995cd
 DIST yarl-1.2.4.tar.gz 159570 BLAKE2B 2214917d01ba8f7ba4ea66e28711bcf2549fb1016be9da49147788d61a51168bc81b209ee1466482c93a8fddb4bec87c9ee072b703a1b0094553ecfcc525c0a9 SHA512 370fafa7ca507589660cb9f025bfa154c7b351fa6f7f7cfbedf8b20b64a175bba78e7673b122443132b10e6214e503668efd98c79dd79ee45364b1f779ecd8f1
 DIST yarl-1.2.6.tar.gz 159816 BLAKE2B f8f8525aaf3471baffc1c9640a2b95f7d1a0b8607ccbae41ccfea5296a1a40968020282ca40d06e38ff04e448b43af1d7ead8703d618c6fdd520ed6581fd7077 SHA512 44384a11944808583139bf87846cd0080545efddb04be750d923e1b7dc8a4f88c3801b9e6fe742136298c79e60ac94e2584e3b39e42f002af4d6bd970896d3f2
+DIST yarl-1.3.0.tar.gz 159748 BLAKE2B cd7844545f3ee749d1dce865e21065c2b8e0c1ebf4715a3f8ec01064e534fa5b8b872539aece8a7e3a7ae147942ff5e0dc1878d84449d8248fd8e33c4234e3f1 SHA512 58e539900e7754b0a3d41960ebe20d21fd7245ce71fccb31d6a1204298dd71cacd742b2cb2b4c49c3a9b28ce5c664c412334f29e23a3c608aad8018142ba3e14
 EBUILD yarl-0.9.8-r1.ebuild 580 BLAKE2B 3ede8e4c60be7440d92c1c755393198bbd07cc7b0859482a578f461af6fc798027cf940b0a1da4bee0d4ae011b46562385f4127c23aea09d9a85d78bdfada946 SHA512 a223d7ffc84d391979807702196f17435a7577bbceb6584f1455a88ca99dcddda2f70b4e8c77a83dbf6dc51cfa1c04655e6f0dc2b6ef7593d2e5889f8fce82e4
 EBUILD yarl-1.1.1.ebuild 662 BLAKE2B 797f00d18d3e41bdaa57b47de4920293e614eaac2a2c1c7c3fffb334fd9a076b251ece4f9f9ead63e1126bfa29e5d1dd40e17acedc74b3787cfac7cbfb475e6f SHA512 5934001b41b33fbb2f3155ac4987f5230b4a59132ddcdfead3fa477e2e5963b1a3a79dd33296d656cf285b90209ce7c71855cfa0e0792471505705f6b51b8678
 EBUILD yarl-1.2.4.ebuild 664 BLAKE2B ba8d0e46dd8517187c328abf10a25c8e95f51f6f660c026826c139c31f9e4d9d39ab67ed1d60031cd4cc0bb97be4ff89b89173d2f829c436fa3aa992bfd9f855 SHA512 4b7b03aad9f19357b671bf3a1ffbcb8e03deb962882b31c6b0578ed54689ee5538f8d38cd849a3f6e98e598bd34a205a58e9716c4e89a4df692512fa1343f845
 EBUILD yarl-1.2.6.ebuild 664 BLAKE2B ba8d0e46dd8517187c328abf10a25c8e95f51f6f660c026826c139c31f9e4d9d39ab67ed1d60031cd4cc0bb97be4ff89b89173d2f829c436fa3aa992bfd9f855 SHA512 4b7b03aad9f19357b671bf3a1ffbcb8e03deb962882b31c6b0578ed54689ee5538f8d38cd849a3f6e98e598bd34a205a58e9716c4e89a4df692512fa1343f845
+EBUILD yarl-1.3.0.ebuild 794 BLAKE2B 92974e937a8a45e57b9a7979bd5f568b948802821b4c80982a000b224e5aef0ae7e8247bcde6518fa5aaf6decb0fa00540aa9403a49385814327bae69da28365 SHA512 f9e4944e1e50e287da9098a4ccd5bccfad9755a654461b0672c6bc040478e6d08a0e0341f1b60032bfce163b6115684e3848f673e3f04e0eaa4d1e8a4a08d159
 MISC metadata.xml 439 BLAKE2B 8d9b97af296f25f501da90aa57deffca21625c8dda04f04e458879977865609e2fece4231deea45f297e3dc74740cea6a2d3a1e0be9b8c37eb5b08379361fef6 SHA512 f554403c332e415434d21a63d65f755dfd80dcdd813f3832b8e09ece9e26a2d28d274de9afcff7dbf2cf64122e4f4b50e546d7a2f67cc6f2090a4da8205cba8c
diff --git a/dev-python/yarl/yarl-1.3.0.ebuild b/dev-python/yarl/yarl-1.3.0.ebuild
new file mode 100644
index 000000000000..97d08d1e295c
--- /dev/null
+++ b/dev-python/yarl/yarl-1.3.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Yet another URL library"
+HOMEPAGE="https://github.com/aio-libs/yarl/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/multidict-4.0[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.0[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	# don't use pytest-runner for tests
+	sed -i 's|"pytest-runner"||' setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	py.test -v tests || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/zope-interface/Manifest b/dev-python/zope-interface/Manifest
index 303e615d08d3..1533ae0a5b23 100644
--- a/dev-python/zope-interface/Manifest
+++ b/dev-python/zope-interface/Manifest
@@ -2,8 +2,10 @@ DIST zope.interface-4.1.1.tar.gz 864139 BLAKE2B 5531be26538fc54dc1108130813797ac
 DIST zope.interface-4.3.2.tar.gz 143139 BLAKE2B 60e8d1ed360192cfd2bafc5738f1a5278216d1ca55ca7104d261078915f9ea1966a1001ceaca02bff9359a69b38b402a77c42e872b1a64f29f61a80805587b4a SHA512 4a9b0f8b7e3157f29aca3810baea13d880b09d80945f23953e13325afe6780c2c1a5562a875f97958c1b33a28e009dd495f608aa7af79aded4f2ac2d61d3a251
 DIST zope.interface-4.4.3.tar.gz 147052 BLAKE2B dea636ebed2f66035510d467615a9532a7c082ddf4ad3bb26fe0101f790db667817e12c4fd3f4a0b654151422e6ff8cb156f3d2e4310e0294ffdc7b5b4e836f9 SHA512 29d9f3f1fe9af8a4ffb1e6d2f067bba1fa1bac7b02690ba8429985aa6ca76d3f337076bc8c48f39d0f338ccd855800b2f28b319a183a285191cc007bf8d9c9ad
 DIST zope.interface-4.5.0.tar.gz 151261 BLAKE2B 45d84249c4c64e8c5a7406ca50f3fe960130727cf36dce4d6469b84da2747c1dc2eddbc29c779024c40bb7f2457559875ffd39e64c5e0ea7aaa911d7d19e2ca3 SHA512 d3a256723901bf505e4caa0f9988814cd583aefa1adced7ea9ce0a9130e67909f8d6b5dd20d986182a34ea216d63aec1aa4513fc76110e6d96a43a49f1719ee1
+DIST zope.interface-4.6.0.tar.gz 150884 BLAKE2B d31c006553b31f7a5096f69d33341c868723aa0eeee375265c61896fc2dc16109e3f5135a0007604f9e6049fc0cc905e0f8c7ad23e1156a636094d0b334febc7 SHA512 cb82144f0b228dd4d2f7cbfba130ee190265bf809d4e928262935c3b5551a3a298df4eba2dfe7ecde96fed27f39f59ab95e9c11f3eadf0fdc13f61b5c046f78f
 EBUILD zope-interface-4.1.1.ebuild 990 BLAKE2B 0729e2f728a41900e3700f862484779805efaf9663fe44c052f3401cc3bbce1e3adebef7e2cc14817c2d14d4af6968ddc5a24e7921eb78ea18c0c47656ed36d2 SHA512 1c29fc3ac4e42397ebe0aab827b21f43793486f23af0492c66feebdc8f303b13e24206e660f623d1e37421d394af415457de9096487b23f80d5c2a516828c3b1
 EBUILD zope-interface-4.3.2.ebuild 1035 BLAKE2B d7374a0b31b73d857659b569dc33a0575fb97acc462178e976b3071c4926642181e624495a8df816c9fb7fb939b62e14e99a224539f8df966e7cc662647ee63e SHA512 e7bc7ce215f332423fb4bd5a1def6199ea8a091931366e12406217a7a4dfb2a4700efda24537400e13db8305d98a52f5e3222b2328c8fb2a9f458e73eb665ef1
 EBUILD zope-interface-4.4.3.ebuild 1281 BLAKE2B a5d3774b4b12660253634e02dbeab78426983e0fb94339cce121f5f7634a02a4637a3cf42a8c99e02f5f01fe8889e0fb5e3158ae526e5f12d397d6fbc5b9732a SHA512 11816e8a8e6793fb4f9f9be3246e4efee9b3999ff2e744b25982fcf285d0c29879710777d60b243115eab310689e876b5de060af77e8cdbc846b9c81976df2d4
 EBUILD zope-interface-4.5.0.ebuild 1292 BLAKE2B 967138753260fb83e6c11d036c9240c81df96d19a94d1c8025bd9ac881058cbb498b163b89cba29e6cf2a12592fb4789621c84c5ef7adc890c256b42e98f2598 SHA512 08df16098422b0c353f4bfa67b1331a412325563364708f95e5a9967107ba2a7c25c4c38921de5a4475658e3bf54cccf37b8278e0a2e269f2942c5e7f760cd7a
+EBUILD zope-interface-4.6.0.ebuild 1289 BLAKE2B 1dfd7e935b9db329461859eb80ee1a5f5f78aeca539b9e1f790e40443a304e92fd04dcf51e7fcf95cd07738856daefa903e5ccaeebfae0f10851dfd466ea07ea SHA512 a739b76f496c19f8d2b2bc180861a079f4455a5a098f3facd0b12612f1d2df53a4de02a840d3bb395b14b5c42805cc867c3b04a597c862099184beb7df63ef84
 MISC metadata.xml 386 BLAKE2B f8454bc6cb7c55f203d75f44428b0fe404d050e4938f80e5ca1e0504811a3ea73980ab474d12b47f31a87ed508a2f23143d6393eaf2f66eaface7b35a2058a61 SHA512 fc31e083f990006f9a4bdf1cdef5b8efee3e69e8444f614dd5fdcc0d7ddb8291cc1e45c21ab1418668c2e247068a39467e837aa8b869cc050a856635b8789fdd
diff --git a/dev-python/zope-interface/zope-interface-4.6.0.ebuild b/dev-python/zope-interface/zope-interface-4.6.0.ebuild
new file mode 100644
index 000000000000..89eb54f5c785
--- /dev/null
+++ b/dev-python/zope-interface/zope-interface-4.6.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy{,3} )
+
+inherit distutils-r1 flag-o-matic
+
+MY_PN=${PN/-/.}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Interfaces for Python"
+HOMEPAGE="https://pypi.org/project/zope.interface/ https://github.com/zopefoundation/zope.interface"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+RDEPEND="
+	dev-python/namespace-zope[${PYTHON_USEDEP}]"
+
+DEPEND="
+	${RDEPEND}
+	>=dev-python/setuptools-33.1.1[${PYTHON_USEDEP}]
+	test? ( dev-python/zope-event[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+python_compile() {
+	if ! python_is_python3; then
+		local CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
+		append-flags -fno-strict-aliasing
+	fi
+
+	distutils-r1_python_compile
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	# remove .pth files since dev-python/namespace-zope handles the ns
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/zstandard/Manifest b/dev-python/zstandard/Manifest
index d434df0063fb..49ff1843f4b4 100644
--- a/dev-python/zstandard/Manifest
+++ b/dev-python/zstandard/Manifest
@@ -1,3 +1,3 @@
 DIST zstandard-0.8.1.tar.gz 463785 BLAKE2B ac4dce58cefa05d265824004464bad89a7f4c4e5f19ac1d8b5b8b0ad6f806318e2b82ffb6f3a290e3605961801909b339b1e5d89fdccd76fd28c75a695a92e0a SHA512 0ddbe22381397443c6c9f84e64f9358160bede104c4f48351119d880ac4f88994739b0b3915454567d2b2b04930c6ead5aa290a40323ba4b0bacf5e97809793c
-EBUILD zstandard-0.8.1.ebuild 565 BLAKE2B 3d289c597c85abbd0cefc17a2d40b4da4e2e2b1ea486ac5e11f41c92405571d99f3f444927362e3ab891b7307719c5788f772b11f9d04ffac47ea37235c49ec2 SHA512 f66e212432b5dab7ec5f558430481b40dd4b8713aefa22c21f9fd5a617899d26f2c3f97b20e96a3b40d2ccaf94ee624cffbbfd275c7bee73d856b5f399242da9
+EBUILD zstandard-0.8.1.ebuild 667 BLAKE2B 569a26aabd7fd0d0ef2cd63ec8e02ed5c352afc9857d15d9b8b077aff1faefd4d1dcabab3423b48f2bdab307b685800fc84a290ef8a5e67c8ea044c4cde67241 SHA512 51394753862a35c93c4ad27a65d03531681ea68aa42d8d037620c33a10440035f32331e9926be6a3319e3c57d43eb9c89fff9ea063fe371b057a92ae49681e45
 MISC metadata.xml 377 BLAKE2B 987c1e1f5a7a37a8686acf05929a8c7cfa702358d5c8fcb678ebec0e28ab590d2dbfe92892330d006b202cc4fbc22eb4fec8876902ab56f44990a59932d6c0f3 SHA512 54b4b2a4b98fda27659ac1cb39e16ff788687aa814d882822ffdfa9c085b04bb3a24885f9a08ea73b05b959ed6441a6ff5090c1159300c1d024f1abf239cb141
diff --git a/dev-python/zstandard/zstandard-0.8.1.ebuild b/dev-python/zstandard/zstandard-0.8.1.ebuild
index 1dd90db6e4ff..d531aba35b86 100644
--- a/dev-python/zstandard/zstandard-0.8.1.ebuild
+++ b/dev-python/zstandard/zstandard-0.8.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="dev-python/cffi:=[${PYTHON_USEDEP}]"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
author	V3n3RiX <venerix@redcorelinux.org>	2018-12-24 14:11:38 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2018-12-24 14:11:38 +0000
commit	de49812990871e1705b64051c35161d5e6400269 (patch)
tree	5e1e8fcb0ff4579dbd22a1bfee28a6b97dc8aaeb /dev-python
parent	536c3711867ec947c1738f2c4b96f22e4863322d (diff)