gentoo resync : 27.10.2018

48 files changed, 761 insertions, 78 deletions

diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 4453385d68e9..5bdd611f67b9 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/ansi2html/Manifest b/dev-python/ansi2html/Manifest
index 2f24160ebafb..55c1dd9e4f8c 100644
--- a/dev-python/ansi2html/Manifest
+++ b/dev-python/ansi2html/Manifest
@@ -3,9 +3,11 @@ DIST ansi2html-1.2.0.tar.gz 46748 BLAKE2B c5ea7d35640f93562f6098a46dbeff9248e25b
 DIST ansi2html-1.3.0.tar.gz 35989 BLAKE2B b2f949e2c559b2da91d3095b4d8ac2091bd15aad46b178a01aa59d4c900917e733f6ab3884d9c4c7c46bfa530936339d9b105a0471a09eb7a01693c43e8a87dd SHA512 73d1b3431e22146c4fe18fef4b05413231d79d627c396d67528d0aa1ab07a7ef4bcfeff56829b85d9fe9ad508599b782318911f7b10d6b9a1bc98780e31389d7
 DIST ansi2html-1.4.2.tar.gz 25485 BLAKE2B 93f3bbd307b916c9ca60379235600606dbe16f1b6e423d0d2615f7825e92a6d7a8469ae7d60cf5131b4c3431897b3161bfcd2a0327525a332bcd6a6980dad5c9 SHA512 29c569839788968ba5a1fed8dddd4cc92f40ca88b4135b597815012ea44a44e8b7a3c2259d2d5d5f3cc690400be882236b88c0764a649da5679431501aab0b1c
 DIST ansi2html-1.5.1.tar.gz 27133 BLAKE2B 8a8017b8f4edb878b105138ec0dfe3fbde8647315382d763eeae7f90f094b60f0cb7205718c75930ccb7ca1183e40e5205eca6f8362e20445d930d92db23bc22 SHA512 367fa9721de65a6e14118d65de9ea8ede1ecc9f0809115ecccf481947aa442409ca972442e51a75bc4f14913566255142da4e411fe060dfda5e55f84a7ac67af
+DIST ansi2html-1.5.2.tar.gz 27124 BLAKE2B 0d02e8cea46622c4d2cbd06f06fd31b3c7e93d61f6b9eadb37815d2ee490b6ce4233fb019f175f61465ef89520a944bbe14543627a6421a64304b58dc038c0ca SHA512 163d5784d04e6eea0847676b967051382fa74a354c19462d1b73980fd1b0a7eb45ce1f1bd88cca803356e7767ccab1bbce6de4152c98aec98534f4ed7d65a83f
 EBUILD ansi2html-1.1.1.ebuild 974 BLAKE2B 63d51cb4874427dc950def125e69f094048c770b43c1c53677199c5688efc2e505a64599c2b26d69f62e58bdb0b373aad14e9faa5b27c151050e998d916a0a77 SHA512 d0e2fb2fa975c8a3db5fa5e1a7c316e655188fde167e8a09772c9296f2d0515bb03b48960f98c8ba1b2c322f92d51572878e78236f0687dc7f40e14c77cc1d76
 EBUILD ansi2html-1.2.0.ebuild 974 BLAKE2B 76346fb51b15eef7d57484aa8d15cd36d5a740e18d6f3c75494ddf9bad1cfaa89bd7597aa446fc33bd1399d2fc3787732efb30884c8396f22afe1d458a3867d9 SHA512 9a0a7bbf42528bb6aeb8231bd4179b4de056708f28caef17fe8a0fcd636dfcc13f79aa7bb71a9b1a4613944b23008f827aa514bd92582e575b0104766191405f
 EBUILD ansi2html-1.3.0.ebuild 1091 BLAKE2B 3c1cb0b29a60d36a478ca0d25dcb5c83189ce5f5cbd5eb568890b9447a8e812bee8e04d6cb6e5cea7d130b6700954e17d07eca1bd03ab2add1b3b1858b9f208a SHA512 c08e8fcd4bf6e2590a7d9a56b62d8ca8944d3b5dc72fbc11bf0d96a8500e4650254ca0dca1e92f51cd3b9729c663cfa391f03eb8804b9e6533113dba46201b7c
 EBUILD ansi2html-1.4.2.ebuild 1090 BLAKE2B 5df0dec2430651026cfae0df0218f71a57ec893d223136793355c707c334488a2c6c4fc3c5c2e1b3568a9c975116da5441542e20dcb0453f33b95600f558a92d SHA512 40ed7958d2ffe8c5470efc0881994cb552e54f306c5a334209399361ea2c06dc282e04c55c9c83483dec85020e70eab09f88cc18638af2c18f4314ed306ec64e
 EBUILD ansi2html-1.5.1.ebuild 979 BLAKE2B 1c4ae47f10db340813216ee782450af430abbfdc139c3352d323c8135090896977983e219a8dc0b97d8cec410cd9a48698c09f0f218ffc903067bdfd6bcf103b SHA512 f9fd53e3670073b907e174a8c26ce27fffda82c84197fafd85160246e1b35fa9a8961b8dbeeb36a4580f434a830be4793b447f78a1a74db8121b5da779d18243
+EBUILD ansi2html-1.5.2.ebuild 979 BLAKE2B 1c4ae47f10db340813216ee782450af430abbfdc139c3352d323c8135090896977983e219a8dc0b97d8cec410cd9a48698c09f0f218ffc903067bdfd6bcf103b SHA512 f9fd53e3670073b907e174a8c26ce27fffda82c84197fafd85160246e1b35fa9a8961b8dbeeb36a4580f434a830be4793b447f78a1a74db8121b5da779d18243
 MISC metadata.xml 392 BLAKE2B 13621595cc083a069522c51b4e29b362f7217698c194d5247d73a3acdaca7ca8b13a3afb0e9b0671785ce246219d44bd8511c5ef243111d43067b138635f5963 SHA512 a17684f5bd76762a832cba99a1edcd2b2ebb1abdd27f36528fb4d2ded639b6223f60495c6dd2ee548826f3a2e177238318c02962d2300ace37eaa881e76cf095
diff --git a/dev-python/ansi2html/ansi2html-1.5.2.ebuild b/dev-python/ansi2html/ansi2html-1.5.2.ebuild
new file mode 100644
index 000000000000..076a1f0115aa
--- /dev/null
+++ b/dev-python/ansi2html/ansi2html-1.5.2.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=( python2_7 python3_{4,5,6,7} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Convert text with ANSI color codes to HTML"
+HOMEPAGE="https://pypi.org/project/ansi2html/ https://github.com/ralphbean/ansi2html"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/six-1.7.3[${PYTHON_USEDEP}]"
+DEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
+	)
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	"
+
+src_compile() {
+	distutils-r1_src_compile
+}
+
+python_test() {
+	chmod -x "${S}"/tests/* || die
+	esetup.py check
+	esetup.py test
+}
+
+python_install_all() {
+	doman man/${PN}.1
+	DOCS=( README.rst man/${PN}.1.txt )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/flake8/Manifest b/dev-python/flake8/Manifest
index 3e2f547f0d64..bf00aa08e68f 100644
--- a/dev-python/flake8/Manifest
+++ b/dev-python/flake8/Manifest
@@ -2,8 +2,10 @@ DIST flake8-2.1.0.tar.gz 25010 BLAKE2B 23f89456a28815700f88e2eb3abd29e0936b0c40b
 DIST flake8-2.2.5.tar.gz 28333 BLAKE2B 016b5b05b7448dec762e7d5e06fad9d631351d02ba5941a34760c51406164dc2c5508e3c4c54b52c49738c193f815a816d9cd39558bfecaeb83cfddbc6dcc63f SHA512 fe5e06d3a7699e3f348181108f1ab3ee9eb1f2b0422de582a172d3a4aed42a5cf839ef8a5b5b113da1e0c3c2b53ed7b43af1ca24314ea842d0d3d3735eba1dee
 DIST flake8-2.5.4.tar.gz 81663 BLAKE2B 89bd5965fe1f6862cadbfc7b614a819a13d4ab147994485542ba519d6151ab11d4b496066c74141020858f468050e7b6dc3d6ce3a89ddf809e9cdc6d130984ef SHA512 31cbec556fc41361ac464d2547275e319ab663c907a4a8644113a2288a9f349bcfbec85197b6dfa13a7db9e82419f01e0f2abc84a347e133c144ea137e0daa28
 DIST flake8-3.5.0.tar.gz 140608 BLAKE2B 938ad4406370da27155512355432edd23a824db1d6ee635591628fefad43ee1116256ae7f240496d93941800212ea2479be73fb9ee9bd03c9a54ab70bbce452f SHA512 ac5d1bd9c44ed76c9e5cbd941b24bb552aa76e156b24ccda6cc8440ee90f3a574fdb393665adc75298e4f57111d7ab3115ef21ef9088fb327d0a9703d442450c
+DIST flake8-3.6.0.tar.gz 144684 BLAKE2B 3a6edf83860c6c6a59c150cde47b22eeb17b9e83cb23e4d8f747715b8867093a7f1d1e2bc55c9f9cf43b69463746026d839b0177f2abef746581563a670c3ce0 SHA512 f4377bc7806074a88f88b3652c3061583e576ee515b2b741cee9c6dc18f84f34a7807c93fda9dca3d8b006e379dcee60bb3ae20e6a2e62fd216a82a2b36f2eb5
 EBUILD flake8-2.1.0.ebuild 1073 BLAKE2B 1f90fcc6a57da202d9b8026f89c5657a85efb0e2a5fad78057362647ee384907208fa8de6624f5375739c0ec386959e2936fc985d100f7ae2dd40f150d2b918c SHA512 0f7cd9b30bf9b095506af3796ce2927d2b14572a9f42e34021a205c090388ef08a6ce091aaabd19441b32e18c0d43c94cc1fd274f80e104c465d1bde88b46f1a
 EBUILD flake8-2.2.5.ebuild 1099 BLAKE2B 95b243ac6b57a1876810d4189dfc2b70aecc993194b62e95a17d6e410cf1e3378adae7eaa7a4027ac55b0528e0315d74149d0e2512c55450801fa382715b46f1 SHA512 552e6145ec0ad5a64055722fd6c93019e4a3169e80ac57eccad3838fb9b9b32cb1a111307fa6e6f5e1e5331b10d958b9d269ccdb5a791d75588eb8f15777e571
 EBUILD flake8-2.5.4.ebuild 1605 BLAKE2B 050d4a5fe950252e89f9913c375bee3e73dce9b99eacf6722c72035ed4bc60e349e1184d1afe2fa54652a19b2ca612e56d786642d7aef4646621aca078729a3f SHA512 7e0ba75cc91d90a2f68082cc6ac0d41388529271f7bb42f9088a9f10033405b980864f4db136fe640ea8a0201a45b4056b49179f9747ac051ace2e344ce7f301
 EBUILD flake8-3.5.0.ebuild 1637 BLAKE2B 250dba56f400fc9761907c2d70bfb251a2abdd820ea698d48f4898b405022c4f811da90336df9f81a5534ca82cb3bd19301cbc979780b720528ccee9c9a88c9a SHA512 1e0467aab3fb0738bf798f915cf6c4a024c0895998a4c27043a30161068d85b4adcbd33ad13fde458288f5439c3839444fb2122b3dbd6dc2348df71984abdb26
+EBUILD flake8-3.6.0.ebuild 1644 BLAKE2B 4d90f1881e8b1a4f4b59a0a5b6190a2aec2a75e164ca06e278669933b645fe3582876166763b1451610c0be4112902fd0266151ad69c14e6bb7df4a5462ca799 SHA512 46dc86d634d86abd9ed8ac5a13cfad83b0ec1a429d861734850cbe9a894eea67282af0d48c7c2da5cdad5dd0b25ed48798ce319d1a3d37cb6757251be7106f4e
 MISC metadata.xml 373 BLAKE2B af4d7678c87281f631048d3c49b0a642ceee1d771be2b662458888659b7c8e262c98adcd7bcb7f6ab251783998950725729ed35c887c004f8d8da87da81eda7d SHA512 449aa40152590e7103a4bf10006a33e6a0d5010a7846b0c5fbee8a78d99a3539995eccf441845c205bf48fc1e9b35cd7b1d6af0d98b469bdd06989baf8b88646
diff --git a/dev-python/flake8/flake8-3.6.0.ebuild b/dev-python/flake8/flake8-3.6.0.ebuild
new file mode 100644
index 000000000000..5e7f69a1d642
--- /dev/null
+++ b/dev-python/flake8/flake8-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=( python2_7 python3_{4,5,6} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="A wrapper around PyFlakes, pep8 & mccabe"
+HOMEPAGE="https://gitlab.com/pycqa/flake8 https://pypi.org/project/flake8/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+# requires.txt inc. mccabe however that creates a circular dep
+RDEPEND="
+	>=dev-python/pyflakes-2.0.0[${PYTHON_USEDEP}]
+	<dev-python/pyflakes-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/pycodestyle-2.4.0[${PYTHON_USEDEP}]
+	<dev-python/pycodestyle-2.5.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' 'python2*' 'pypy*' )
+	$(python_gen_cond_dep 'dev-python/configparser[${PYTHON_USEDEP}]' 'python2*' pypy )
+"
+PDEPEND="
+	>=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
+	<dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${PDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	# Flake8 falsely assumes it needs pytest-runner unconditionally and will
+	# try to install it, causing sandbox violations.
+	sed -i -e "/setup_requires=\['pytest-runner'\],/d" setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	py.test -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/flask-debug/Manifest b/dev-python/flask-debug/Manifest
index 094e26d62cf4..10829df7cc87 100644
--- a/dev-python/flask-debug/Manifest
+++ b/dev-python/flask-debug/Manifest
@@ -1,3 +1,3 @@
 DIST flask-debug-0.4.3.tar.gz 9148 BLAKE2B 9263a4df08f1a9518a42a025a14a89b902c62ab08b25d79b3dfffb25675a47785d0bf9075290190ee4622a30a89e190a465a87986b47ceed7d724ce0b59ad218 SHA512 7bc1cf9f88f28e2ca5a24c1454dcdb4e2a450eff3c00329f299c3840032e0803079f565652974f4c3a0e5aac443365ce47a3d2c2fee8e21e2e0c7150367e8816
-EBUILD flask-debug-0.4.3.ebuild 1195 BLAKE2B bd2b740de12688eeeb31784a122547f62aebde2530dfc0043334b1c44fbf93864b6a32b740f06a83aef254956ef50dfcbdacbdf84f652ce307080463e4ebadf3 SHA512 272e1a8931a0c8e7d9762cc3608105037c9c696d81d4848386ed99184a66ad8116ecbab63954dad4221e6c198d5aaf0b2f1dabd5e4baefabdb07a0e7de07b63d
+EBUILD flask-debug-0.4.3.ebuild 1197 BLAKE2B 96fc50391da1dd706b4cd0e32a8fbe90ec0328930e4c2bffd76fa1c2b3770cd0e4bfbb537dd09a67ff83de112aebfb57eb407f995bda40d7cabb02581386c731 SHA512 bd056446bae9f64d5d2b216991742d6f506641bf6bf081661ad022b48812d0d0d9cc8259bd5ccd0805d36808c8f44e5223e7cb4cba3477607e3f607e28b4f16c
 MISC metadata.xml 437 BLAKE2B a47818cc11d0365a7a03da5ea3c9fa7bb60d3ec783d63bd8780e11db56dd2093e39ecf4633f462f17cf95e97c93dfbc64301c1c321450a985dcfe28bd6a1bbb5 SHA512 93d72b4859ed2838632f65de971957dc279ccb5897b703b61baf5287a5748f33a7b94f484f8f457b6e4a4e7c5c25e7a5f35506c86e3f539ad7240bbc66748398
diff --git a/dev-python/flask-debug/flask-debug-0.4.3.ebuild b/dev-python/flask-debug/flask-debug-0.4.3.ebuild
index cccb072ac7a3..fc044605a783 100644
--- a/dev-python/flask-debug/flask-debug-0.4.3.ebuild
+++ b/dev-python/flask-debug/flask-debug-0.4.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=7
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6}} )
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6,7}} )
 
 inherit distutils-r1
 
@@ -47,5 +47,5 @@ python_compile_all() {
 }
 
 python_test() {
-	py.test || die "Tests failed with ${EPYTHON}"
+	pytest -vv || die "Tests failed with ${EPYTHON}"
 }
diff --git a/dev-python/geventhttpclient/Manifest b/dev-python/geventhttpclient/Manifest
index 1c6bea45660f..de27ea1e6234 100644
--- a/dev-python/geventhttpclient/Manifest
+++ b/dev-python/geventhttpclient/Manifest
@@ -1,4 +1,4 @@
 DIST geventhttpclient-1.3.1.tar.gz 82598 BLAKE2B 5fef20a74c431ed53be4eedb3ec7e040572ad960363d41dda8b93c8f08f3eb05ba6160676c1c3ed957d1528a12aa297400063377f3788754e9e76401bb3421ae SHA512 a50486e1485c449a821176f0aa139cb05a3c7675fb045086e086cc7bb71d6e1d75191fae6972b381e7e69dba89d23c387464503845badd29fa361e03aa866079
-EBUILD geventhttpclient-1.3.1-r1.ebuild 1169 BLAKE2B 28daa115267542dd3add11048ae93cf7d945655ccc00d9f3f809694786ec570622c5b1b76a6dfba50af63afee34174a92eb2dc5f1be780491bf4edfab9337063 SHA512 415325308fec15a32407527986120cff084359c92616689f660f8b790ae4a2b8dd205358cb5894c85c6d705141c07e8db3eee6d06c18ed40b4edfc05312707e8
+EBUILD geventhttpclient-1.3.1-r1.ebuild 1267 BLAKE2B c342630133cbb99c26ad552d789099b3a582c974f7a77c38e05d25c1b1570f87e335f258042df27dcf5f91c77fb96741b71021284232384b2bbc0897f896bb75 SHA512 65d450d5dd3e171be2c164096e80ea5262e3050e7accda44106b2aac153ce7b517e42415beded8359afdd34fb04638d2d6546a2569e81553959313c64fa7adb5
 EBUILD geventhttpclient-1.3.1.ebuild 1206 BLAKE2B 58c4a33e84c81c036c94fcdeb7815ca1180b906b818e44cb2a0d5d3abdb29ea713c4fe510c67a82c1733382f1fc1f40b4535fbc0f1d60981c0999a328e0d0dff SHA512 aaa836aaf01c328404d2198b6641fc18204e621983bc750a83d961e565c0b86e226946cd4ba31b6e8686ada01711c729c1a3c0d07b97ba0e12d0eaf3eaf61f9d
 MISC metadata.xml 454 BLAKE2B c0c62b4bcb9e480cdbc6739010039421f139999d7df9673d260ee2365073a108479892dce53e86e1f8ec721c9a33d3967bd41e468994331970a583189aa8c0fa SHA512 1739f134e47ed32c68fce16d76684f6c2393f1e25fe0b098499b1362379cca9b7522950ef77afd9d8e063e1e0335e50dc3cd44192d91ef01adfae68c02fd9d96
diff --git a/dev-python/geventhttpclient/geventhttpclient-1.3.1-r1.ebuild b/dev-python/geventhttpclient/geventhttpclient-1.3.1-r1.ebuild
index bbedb9e89a28..a16291b3b011 100644
--- a/dev-python/geventhttpclient/geventhttpclient-1.3.1-r1.ebuild
+++ b/dev-python/geventhttpclient/geventhttpclient-1.3.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=7
@@ -36,7 +36,9 @@ python_prepare_all() {
 
 python_test() {
 	# Ignore tests which require network access
-	py.test src/geventhttpclient/tests --ignore \
+	# Append to sys.path to avoid ImportError
+	# https://bugs.gentoo.org/667758
+	pytest --import-mode=append -vv src/geventhttpclient/tests --ignore \
 		src/geventhttpclient/tests/test_client.py || \
 		die "Tests failed with ${EPYTHON}"
 }
diff --git a/dev-python/grpcio-testing/Manifest b/dev-python/grpcio-testing/Manifest
new file mode 100644
index 000000000000..ad0724b3026d
--- /dev/null
+++ b/dev-python/grpcio-testing/Manifest
@@ -0,0 +1,3 @@
+DIST grpcio-testing-1.16.0.tar.gz 12533 BLAKE2B 98238dc7aee745b210356e999c6048b028ceed8ee2f356557808b4567fc4cf2f90a111e6cce36122cf3294fa5f4b3be1c5ac6659ad6fa97d26e1bfecf4d9b5e6 SHA512 88d33629ccd6c4d4865a9d643c44f074246d01c0c84d57b06bc011e22d4d735261e4a959720512ca03e699a6e1d26eb0c19997a65f52b5cdd199b22072c2d020
+EBUILD grpcio-testing-1.16.0.ebuild 515 BLAKE2B bc5660b9b881543b45138e3d0803c96bd37787f8defece62ede3bba2d93490ed0e77a9df59d2a881523af96e57cdd72f96be18197c0fc0f026f8806125c15cf4 SHA512 2eb83dd4a73f6f51708bcaddafb702c580d20c674fbccc8c8bc959f7f2b530a67bf4700a4e2545c94ba405f5e0b3a07ffd97a9eedf876988e6c26c14a16f94ea
+MISC metadata.xml 462 BLAKE2B 159e29c960dba2f197de7e1b8eda84162039ecdb35777aeb00314f8af9a7bc0771071e63a1528c922519568594f06971b228036914500d2ce3d33b411ddf0685 SHA512 8326b0e1b98c2921b461ad44663711318f2c48e4e411380de4b4bb26fca11d726d627fe47ccd0d1149348b55aa9391d97d144f654d016a1fccb34791f5850487
diff --git a/dev-python/grpcio-testing/grpcio-testing-1.16.0.ebuild b/dev-python/grpcio-testing/grpcio-testing-1.16.0.ebuild
new file mode 100644
index 000000000000..03c920504ce2
--- /dev/null
+++ b/dev-python/grpcio-testing/grpcio-testing-1.16.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[${PYTHON_USEDEP}]
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/grpcio-testing/metadata.xml b/dev-python/grpcio-testing/metadata.xml
new file mode 100644
index 000000000000..42fc46aff1fe
--- /dev/null
+++ b/dev-python/grpcio-testing/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gyakovlev@gentoo.org</email>
+		<name>Georgy Yakovlev</name>
+	</maintainer>
+	<longdescription lang="en">
+		Testing utilities for gRPC Python
+	</longdescription>
+	<upstream>
+		<remote-id type="github">grpc/grpc</remote-id>
+		<remote-id type="pypi">grpcio-testing</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/grpcio-tools/Manifest b/dev-python/grpcio-tools/Manifest
new file mode 100644
index 000000000000..764f81f46567
--- /dev/null
+++ b/dev-python/grpcio-tools/Manifest
@@ -0,0 +1,3 @@
+DIST grpcio-tools-1.16.0.tar.gz 1893006 BLAKE2B 01224d6af05a87e23609d47e5fefeb4784b0ac63cc1198e9f81de03b0b0fed5b2e2d706a486627c1d0e770ba66fe7be00dd98b866fb98e1d14299302a080e3b7 SHA512 86b66242d17d52d08ebb0861d08bcda4dc90fc142d2777bf99d0e4bce72049f88edd5d2ea52c2b33b9a77d94ca8961d877a97ed614766a3061528d41c96e6e96
+EBUILD grpcio-tools-1.16.0.ebuild 673 BLAKE2B e78528704ddd3ee06b2ba4db44e77aad89d55110078ee6e02d337262e1fc74f59f8eeaa22ef0c9404f7131db8d42491ceb35d9fb7c35ee16bc714724b5ab63f0 SHA512 53072ae2af6fa9e63a827a4e580678ccc7de489d7cded9ba3980440abb8a148d4e55941b295d7b9a5bdba591367956fcf50241467a5f3b54f2c7f86226a43191
+MISC metadata.xml 476 BLAKE2B 62016e9a321f9c5b06d8a473d75b5efca8246df90ef9a67a33c02c416c58a8ee1be875cd54567d55bc9f10ef32082e11c01a9f1550293137aab8942e05dcf744 SHA512 cedbae8a8d9d7c6689c676c433aa6fea3c16d41911e0ee4a30929dbf2adb8ff72a2f0d81f996196a3b4090f8a5103a54eab4c651b359f9487d59955a6861152d
diff --git a/dev-python/grpcio-tools/grpcio-tools-1.16.0.ebuild b/dev-python/grpcio-tools/grpcio-tools-1.16.0.ebuild
new file mode 100644
index 000000000000..1cc3d8eb6721
--- /dev/null
+++ b/dev-python/grpcio-tools/grpcio-tools-1.16.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[${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/metadata.xml b/dev-python/grpcio-tools/metadata.xml
new file mode 100644
index 000000000000..b140e0d02b97
--- /dev/null
+++ b/dev-python/grpcio-tools/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gyakovlev@gentoo.org</email>
+		<name>Georgy Yakovlev</name>
+	</maintainer>
+	<longdescription lang="en">
+		High-performance RPC framework (python libraries)
+	</longdescription>
+	<upstream>
+		<remote-id type="github">grpc/grpc</remote-id>
+		<remote-id type="pypi">grpcio-tools</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/grpcio/Manifest b/dev-python/grpcio/Manifest
new file mode 100644
index 000000000000..5219c8da880b
--- /dev/null
+++ b/dev-python/grpcio/Manifest
@@ -0,0 +1,3 @@
+DIST grpcio-1.16.0.tar.gz 14519470 BLAKE2B 872ef15a7994303ce7ac0a573e49c94260eb8480d8ee94e25471ec9395827fafd3f5e3bd6f4793eb15091827e6d780b8dd6d01f38eef85db80fb234a710f370b SHA512 37d5940f1543cebdabf2b1340a042f98e5f321c42d92d05c88631c0eae42d94d3fe86893a21704a22b70c1fbd70bf091c1af2b51cd5c1d316dd8f0a586fb0eb7
+EBUILD grpcio-1.16.0.ebuild 923 BLAKE2B c1958ba9f6c2071dff53d33799edc6dfca1ea0a493ead17508ca8c3d4863bdaaa6b4ac8954cac203759f2060b7ac5f4e791ce7043e40119dfc82fc9c4847d121 SHA512 3013e475948cbcca3e37c06aa7c06b326574a32cf8231d4785a7bbd66066de336daa23b432eb5dd210b32b8f4786f5b86c50a94df7df8af4a0f3535022ea8677
+MISC metadata.xml 470 BLAKE2B ad01d702b7a0ffe570bd30f50d47bb4fed725fbdff6f838acc54ac767d0cee88bb28bb0642f804fb04858d36a63f8ff7e110e4ae1dd26b8eb539b0a5c77cf5d0 SHA512 bf26387089977138bcf6be78b469bb412988e96c6bf5b4a9897f452378ce71fab1012a7d9268fb55f2883bc9636b712b59abe5498ffdcf199417d97fb09cd90b
diff --git a/dev-python/grpcio/grpcio-1.16.0.ebuild b/dev-python/grpcio/grpcio-1.16.0.ebuild
new file mode 100644
index 000000000000..312146bd5e1a
--- /dev/null
+++ b/dev-python/grpcio/grpcio-1.16.0.ebuild
@@ -0,0 +1,36 @@
+# 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_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/metadata.xml b/dev-python/grpcio/metadata.xml
new file mode 100644
index 000000000000..011f4a88ece5
--- /dev/null
+++ b/dev-python/grpcio/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gyakovlev@gentoo.org</email>
+		<name>Georgy Yakovlev</name>
+	</maintainer>
+	<longdescription lang="en">
+		High-performance RPC framework (python libraries)
+	</longdescription>
+	<upstream>
+		<remote-id type="github">grpc/grpc</remote-id>
+		<remote-id type="pypi">grpcio</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/ipykernel/Manifest b/dev-python/ipykernel/Manifest
index bd8889f5aa1d..f3f5eab8e3c7 100644
--- a/dev-python/ipykernel/Manifest
+++ b/dev-python/ipykernel/Manifest
@@ -1,5 +1,7 @@
 DIST ipykernel-4.6.1.tar.gz 90591 BLAKE2B 9d66e569e416e30fa0af93e9442326a081638e55e004c751d38b3e995e2e1c6baeba5b61e125ae8484a31344ca541070035154e4453f9eda30f7a2ac436e7f1c SHA512 3124534a8a059056211ac573784c491ba18d6e936292523382a9604af10bc2c911b14f49f7625242e29189b46c673da25244f3c9dfa3148d460ba4e466eef001
 DIST ipykernel-4.8.2.tar.gz 94441 BLAKE2B cdcf08c114c6c53ce4ed9829f3c2e0d2184f5b89b54556f92df25ecefadcc38955f992572a6dfb9ee49477e9a2111304c9b4f636edc47c0c0a26209c5f616579 SHA512 6542b086ef14abe70f51393e585c1e02eac0967b863c2e3de2dfdcbcdc2f4c01597bd035990f09f07d76005628a3345be97d1b5e5ce7a772ce7074bb31b4d4df
+DIST ipykernel-5.1.0.tar.gz 101198 BLAKE2B cfe0593d7de3eebf9ad43dc80d13f53dab0bb599836ea43c8e1263b02e78f6689837bffcea3c275f2241e370d67afb50510980940aea5a2b29a6ce674509bdab SHA512 0792b7f86d81b178c46522c8d6cf5fd57b0e411dfff13832d4e3d38782bae743fac7390dd5f2e2e738db66ce1137ec26e74511896b47667c88e23a245606a698
 EBUILD ipykernel-4.6.1-r2.ebuild 1131 BLAKE2B ee25175447e339c402f03caf3ab67d21b4dc5b0398d4916292a0373337bde8cca312cdfb7508488e187d5d690cad86dcf80c2fdf23e7de12b50c7b3436ea97fc SHA512 1a9fe2d39244a8e585e1cfd5ff037fb47f6cb239a3ed9d6e027c71fa7ad31d4f75e31ff835de265c32e7a880607803c18edc16b4fcd95275772c2af261718cd1
 EBUILD ipykernel-4.8.2.ebuild 1133 BLAKE2B ec80ac77a49ebd001fe29e5e77d53b0c5d8f0539a43e2bdf23ce0507bca81accad10bfcac1feefae6aa142634403c7ec4ab83e10e914807b7ebde8472990f3e0 SHA512 574fe2341da6a1e218390945037acef7d6e79b80eb99ea48feb7bf2e0bdbeeb786b8f12abb34559b6b099b3e081186981395973829e52abbac33bd200ecd5df8
+EBUILD ipykernel-5.1.0.ebuild 1120 BLAKE2B 5d1b00d4801f6ff260734de0189a926834b213aa672977e8ee5cb7d3586694830fbea11f4bd04993aab1d00eb66059d8bf41a15679e7a71c3223eeea7427076a SHA512 2879a4bcb4a17dd233eb5d00c576099c8b85f684efdb9c0a4335dd0369c8484c42e06e097a34a998649df50fd5f5ebd5f70347990bfd55791270b02fda7a9c92
 MISC metadata.xml 493 BLAKE2B 46ff719452b5145a401147fef18fd62fc55542b2edc27017f2f8729d04f304339ccf5ad63de07efbd9c5419d663a498c76f9ce312f06869b3621a17fb72b14dc SHA512 f4176cf4bf94b2a2859ed74298ad8d1b7beb310d9a00f499c32528beb46014aebe7705d47f01bfcc6273729271360a404aa7cd03e046918418d80b8b6bb4f269
diff --git a/dev-python/ipykernel/ipykernel-5.1.0.ebuild b/dev-python/ipykernel/ipykernel-5.1.0.ebuild
new file mode 100644
index 000000000000..42545dde0b45
--- /dev/null
+++ b/dev-python/ipykernel/ipykernel-5.1.0.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=( python3_{4,5,6} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="IPython Kernel for Jupyter"
+HOMEPAGE="https://github.com/ipython/ipykernel"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/ipython-4.0.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '<dev-python/ipython-6[${PYTHON_USEDEP}]' 'python2*')
+	dev-python/jupyter_client[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-4.1.0[${PYTHON_USEDEP}]
+	>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/nose_warnings_filters[${PYTHON_USEDEP}]
+	)
+"
+
+python_install() {
+	distutils-r1_python_install
+
+	# bug 628222, specify python 2 or 3.
+	sed -e "s:python:${EPYTHON%.*}:" \
+		-i "${ED}"usr/share/jupyter/kernels/${EPYTHON%.*}/kernel.json || die
+}
+
+python_test() {
+	nosetests --verbose ipykernel || die
+}
diff --git a/dev-python/ipywidgets/Manifest b/dev-python/ipywidgets/Manifest
index 0142fa3a893b..1f48a5c672d5 100644
--- a/dev-python/ipywidgets/Manifest
+++ b/dev-python/ipywidgets/Manifest
@@ -1,3 +1,5 @@
 DIST ipywidgets-7.0.0.tar.gz 1006851 BLAKE2B 2ee86d0459b6c88b351994dcb4385d31378235a0be157387d90a476e49958bde25df941aa92068266df377c75dac13925d15ba2f8da0987d70adca3e726fa1a7 SHA512 39219478c12f26a2bab0e975b6fb53a7f9ee92b10fa05bd885b21c7c981a4402ad65f497223a4a2c30a7d6d18bb56bec715a20659926075f2e3730e72022ade6
+DIST ipywidgets-7.4.2.tar.gz 4114472 BLAKE2B 45f946da974c1f7c5422248bd5f2eacb92a6791f089d13fb17e025b94058d97210561a6291a6c5b8c7e8e484e7128f5315db2af6cf212762f36e6d884929686f SHA512 ae5ef0615a9771cd83ca17a2a364bd5d6ee0d934d82adf2c70fde84b7c9b000d7bb32595977a607b5439423e0553c9bb8293617b43d0cf322f6bcf4b3b912eec
 EBUILD ipywidgets-7.0.0.ebuild 922 BLAKE2B 969e60264bbccf53c4938c14fb968b39e0ac717fd82d844c14b0fb0a6935a4f3ca2fca6a5765f8c23374476696f284ed2103340d361b94add8ee10436ecb2ec0 SHA512 7e885fe4844671d12606ff3cc52d9560bb168e3aae2d07db1275070cb5e37e8210166dc3f4371fe144c25fefea634d5e7ac1ed8e7a2dab9086c9290205e4a39b
+EBUILD ipywidgets-7.4.2.ebuild 921 BLAKE2B eb66417d2955213a4a8d51d5737adf84ffd8ce19f50bc4fca076569753bc26e6541e49a7a41077d76013592ac8b4a358254bb55da5a7d1071cf5ec487c753da9 SHA512 f96609ff7a45954548fc443548214e6b9e115365e619e3a6926bf3ca98f962b635bbc33b6152b7fd70d45da89fcb7a2496bed425802c2717e8d710de40d6aa3f
 MISC metadata.xml 520 BLAKE2B f8892f1fa8cc869c859fddedb9aa976d5a564586d23d30b758301810ab21bab4b28067c7411de000ee16312b3c12d16ef9fcd927c42601cf4d4560dbcc242cb9 SHA512 2072af0fb3f92af2e73edc7d2e69b9773325ce5c1bb8046496fbeb4908789ad2896126c78c5bbccc475e57cd78385ea15c03e4c4318325912cb23babff45b10c
diff --git a/dev-python/ipywidgets/ipywidgets-7.4.2.ebuild b/dev-python/ipywidgets/ipywidgets-7.4.2.ebuild
new file mode 100644
index 000000000000..2aa8dcd33cbc
--- /dev/null
+++ b/dev-python/ipywidgets/ipywidgets-7.4.2.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} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="IPython HTML widgets for Jupyter"
+HOMEPAGE="https://ipywidgets.readthedocs.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/ipykernel-4.5.1[${PYTHON_USEDEP}]
+	>=dev-python/nbformat-4.2.0[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-4.3.1[${PYTHON_USEDEP}]
+	>=dev-python/widgetsnbextension-3.0.0[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' 'python2*')
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	nosetests --with-coverage --cover-package=ipywidgets ipywidgets || die
+}
diff --git a/dev-python/irc/Manifest b/dev-python/irc/Manifest
index 605e7cb2df21..c4b8ebb1b705 100644
--- a/dev-python/irc/Manifest
+++ b/dev-python/irc/Manifest
@@ -1,5 +1,7 @@
 DIST irc-16.3.tar.gz 87067 BLAKE2B 61d8b9cc20390a3eb918e5593a167b28f37154ee05cb4d7a72f8901509d3345e8d6bee9c17b66aa6c71fad4608a9f98eb3848190f82eac7db6f2013227979c25 SHA512 84b5a56a441cdf22396c10b81c115cb2e297ac082785e9baf0bc73d655034be1ff3f553d44412f066ab4b74530faddb66a9cc2f511a332e87fe49af0b6e68e5b
 DIST irc-16.4.tar.gz 86909 BLAKE2B c1544a36cb4173fdd22514ab5c6a61d691634224f93c9a04aa08b9fc91203aa18ed2bf429221089fd2bbea45de6138e8eb480b1ac706e36c6ed2c01405397dda SHA512 9080d3dd484751ffa80b117184cd63c4728b1bc50f2493b046a1fd3779e65016f874d0e629d2ac8a3b36db39a91985b890f3a1fb35bd9638d96f2654bf6da943
+DIST irc-17.0.tar.gz 86522 BLAKE2B 1fc1d2faa4e13bfdabffbccae0c40ea7dd477894a5b6f24370950d4bce5e833103fcd2c20d39e2fd0490975b1f36fb234bc354d08f1524062f4dfe7195158750 SHA512 7afef790048b6905d1ae1fa559fa100f57a508586a9d3641890c578730677c965b5c1dc9e00927c8178955632ff919c00484c535eaaaa5c411ce15f68a7d3f93
 EBUILD irc-16.3.ebuild 1680 BLAKE2B 93507172331fcb0e1cc18553ba3b97212320c2e71fa74d223f03e8ea7daa8df5d72da85a8e2152a240aa2a07493f14e8c8acd4cf1e95da4cef26194ead5368f2 SHA512 1bdc0ac3df0942435588f233d5edcbb58758e8b6e7346220da2c982500b63c3cf61f73ededbcf6175b1a79962224d1b7390c9444aa14c8f0b0348120c16f3265
 EBUILD irc-16.4.ebuild 1683 BLAKE2B 03a597644b910da9aa5a8be18c8cfa1082c04df2fda32dafb3677a80570d93f51163080622ab5d5f6f04d30b6199d327f42ae1ebf196c7fbc307862f9e8b4f7c SHA512 f779a74a3a336f53f06bf02eb08d5037c00f75a992795f8b62ccb47977747a52d48f6ae008df926d262416323beae250872ddb6359461544bb03607369fb969d
+EBUILD irc-17.0.ebuild 1640 BLAKE2B 82520475ffe4bfe152255a605b6f6588e2a76710502a2fc175bfc81854f5a966d11fc192f70cf01e6a6a739cab8f3eddb542b3567b251b0e5f789e55407e0694 SHA512 199be3b8ed834ae4f4db17b85506ff5508a62ad2ebef807c5e89ac3ecb424baccf551f75879b294ef42cad166ca01fbbeab9ed6655a4c910cfac46c77baa1f87
 MISC metadata.xml 690 BLAKE2B 5bee1fd162cf7a46ee59a40c945991887fe187d09b647907a2e05b80dbd9327d039d40986b5b5549e27f8729153880a234ea50c9601e171b5cfa13de295d6ba8 SHA512 1aadd270ebeedd1ffaea3f62bb804e48f94f822ac6f4d8502753259c098c7b18a5a94d0643f35eab2df47ef3537d513e37bbb9d04b619cf88580a4d5a463095d
diff --git a/dev-python/irc/irc-17.0.ebuild b/dev-python/irc/irc-17.0.ebuild
new file mode 100644
index 000000000000..8bf685353b8a
--- /dev/null
+++ b/dev-python/irc/irc-17.0.ebuild
@@ -0,0 +1,64 @@
+# 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="IRC client framework written in Python"
+HOMEPAGE="https://github.com/jaraco/irc"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples test"
+
+RDEPEND="
+	>=dev-python/jaraco-functools-1.20[${PYTHON_USEDEP}]
+	>=dev-python/jaraco-itertools-1.8[${PYTHON_USEDEP}]
+	>=dev-python/tempora-1.6[${PYTHON_USEDEP}]
+	dev-python/jaraco-collections[${PYTHON_USEDEP}]
+	dev-python/jaraco-logging[${PYTHON_USEDEP}]
+	dev-python/jaraco-stream[${PYTHON_USEDEP}]
+	dev-python/jaraco-text[${PYTHON_USEDEP}]
+	dev-python/more-itertools[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}]
+		>=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	test? (
+		${RDEPEND}
+		dev-python/backports-unittest-mock[${PYTHON_USEDEP}]
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+	)
+"
+
+python_compile_all() {
+	if use doc; then
+		cd docs || die
+		sphinx-build . _build/html || die
+		HTML_DOCS=( docs/_build/html/. )
+	fi
+}
+
+python_test() {
+	# Override pytest options to skip flake8
+	pytest -vv --override-ini="addopts=--doctest-modules" \
+		|| die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/scripts"
+		dodoc -r scripts
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/notebook/Manifest b/dev-python/notebook/Manifest
index 0d3aa88f9683..aa218ef520ac 100644
--- a/dev-python/notebook/Manifest
+++ b/dev-python/notebook/Manifest
@@ -1,8 +1,11 @@
 AUX notebook-5.0.0-example-execution.patch 941 BLAKE2B 6df33095a99042a5345dc3b759121a43d269d1092288c1384d61844430d90e967868ad71fd7eddb6bba4b2493e489ac6b57b01f21d8a48297cd36438cd98861b SHA512 f9482d26fc098b9a3d525f5e299cf094cce192c6231d6bf6242e3e8081b7ab69f8f7955a746772aca7aef3d4c973b444f5f04004d1fe54e623bbd84d761f0512
 AUX notebook-5.0.0-setupbase.py.patch 1368 BLAKE2B 7c80334d515becf41d881a1d4b3820a263c8cac2913dd9ef4df149bcd85ee7a09df6ba91e607f15ac35dde1a504e89775dec93043bfcdc7700643b645c986929 SHA512 14274ae6e2bc664e6c92390d480da0f5615b7f51863c10f3d11a7ec1a788ff357ae8113bac0c3d15932e322137b9e251c31bdf34c36a2dbbc0771407fe614a96
 AUX notebook-5.2.1-setupbase.py.patch 1407 BLAKE2B 0c7a0872f62df6c3e77aacdcb3736c09441479de127eb228fc8d65828a16656f37c4742c6101de841326a24c62bd4a4c76cf8d31f9dbfe61bc4249ecdaf55582 SHA512 6a01feb531b4594bbc0520c80dce53da66fbad3cfb3fce22c2b20e5d6652b8691581fe6a321ac5771b47ee1530bd27b0fac3fda55ab15573037379b84362bf67
+AUX notebook-5.7.0-no-mathjax.patch 1438 BLAKE2B 66719f5342c08fce7576a70780b38a97ac3e768f3385218da15e7e2b7073ec0e1bbe943f320e4ebd0618401760de96295fc1b0ea0f2e919487b41f90acabfef0 SHA512 ef2754a0e7f552de34411532e7cbddffeab66364075a5514290b09f956b3486791f757b9a159a6c3f975507b8a5626612efeee754933927e2b505aea5f5df2db
 DIST notebook-5.0.0.tar.gz 11481080 BLAKE2B 3cc483d338ca22c6b4d7199100875e9425f90e1a7059c016cec07500f0558c437db5f7e367a5c4441520deb68fa891be31c07cd93e858c872a1f12d893530479 SHA512 fbee29cc554f36e94b1fe9804187a50581e840cfb5884bcdf2fef82ad9ae3ae0e2082ea0056f815bfa2a1c2f203679169155e61e53253aa2e9004a43ff7fbcae
 DIST notebook-5.2.1.tar.gz 12458130 BLAKE2B f10a91fd79064fb09889c4ee30a84a0b34321d3a89f950609df9a90106ed4af75268cc1b087d0229882575d548b7b2b78632aa97452f89fc67910586911fc467 SHA512 defdb08e37dcec9fe799d0b03dc8dc2339f37c9417e4b138ba83b98433dd77f0dea3d83e07368e67f18155af1a67bbabea21ccd061d8a926b6b084fd25960576
+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
 MISC metadata.xml 472 BLAKE2B c68faaf3f609c2fc884c61f1fd1e0296460316ddd6da67aae1492a850a9128654d6f903f9337d92f9f0bfb78b00b94191c99a26dffec92279e79ddfc9ab39fd1 SHA512 23588835d3a40661f3a59b92a9ccfb9e40777f14ff03b6f9c403eb9eee5560e0a805c6a76cd8ae2fb11eeba39b264fa0fedf44cc4fd2231318fe1cefe2c27846
diff --git a/dev-python/notebook/files/notebook-5.7.0-no-mathjax.patch b/dev-python/notebook/files/notebook-5.7.0-no-mathjax.patch
new file mode 100644
index 000000000000..f9ce5c3a9e39
--- /dev/null
+++ b/dev-python/notebook/files/notebook-5.7.0-no-mathjax.patch
@@ -0,0 +1,44 @@
+Disable bundled mathjax.
+
+Patch by Marius Brehler.
+--- notebook-5.7.0.orig/setupbase.py
++++ notebook-5.7.0/setupbase.py
+@@ -169,38 +169,6 @@ def find_package_data():
+             if f.endswith(('.js', '.css')):
+                 static_data.append(pjoin(parent, f))
+ 
+-    # Trim mathjax
+-    mj = lambda *path: pjoin(components, 'MathJax', *path)
+-    static_data.extend([
+-        mj('MathJax.js'),
+-        mj('config', 'TeX-AMS-MML_HTMLorMML-full.js'),
+-        mj('config', 'Safe.js'),
+-    ])
+-    
+-    trees = []
+-    mj_out = mj('jax', 'output')
+-    
+-    if os.path.exists(mj_out):
+-        for output in os.listdir(mj_out):
+-            path = pjoin(mj_out, output)
+-            static_data.append(pjoin(path, '*.js'))
+-            autoload = pjoin(path, 'autoload')
+-            if os.path.isdir(autoload):
+-                trees.append(autoload)
+-
+-    for tree in trees + [
+-        mj('localization'), # limit to en?
+-        mj('fonts', 'HTML-CSS', 'STIX-Web', 'woff'),
+-        mj('extensions'),
+-        mj('jax', 'input', 'TeX'),
+-        mj('jax', 'output', 'HTML-CSS', 'fonts', 'STIX-Web'),
+-        mj('jax', 'output', 'SVG', 'fonts', 'STIX-Web'),
+-        mj('jax', 'element', 'mml'),
+-    ]:
+-        for parent, dirs, files in os.walk(tree):
+-            for f in files:
+-                static_data.append(pjoin(parent, f))
+-
+     os.chdir(os.path.join('tests',))
+     js_tests = glob('*.js') + glob('*/*.js')
+ 
diff --git a/dev-python/notebook/notebook-5.7.0.ebuild b/dev-python/notebook/notebook-5.7.0.ebuild
new file mode 100644
index 000000000000..039e056f3a3b
--- /dev/null
+++ b/dev-python/notebook/notebook-5.7.0.ebuild
@@ -0,0 +1,108 @@
+# 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_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Jupyter Interactive Notebook"
+HOMEPAGE="http://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc test"
+RDEPEND="
+	>=dev-libs/mathjax-2.4
+	dev-python/jinja[${PYTHON_USEDEP}]
+	>=dev-python/terminado-0.3.3[${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/jupyter_client[${PYTHON_USEDEP}]
+	dev-python/nbformat[${PYTHON_USEDEP}]
+	>=dev-python/nbconvert-4.2.0[${PYTHON_USEDEP}]
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	dev-python/send2trash[${PYTHON_USEDEP}]
+	dev-python/prometheus_client[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' 'python2*')
+		>=dev-python/nose-0.10.1[${PYTHON_USEDEP}]
+		dev-python/nose_warnings_filters[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+	)
+	doc? (
+		app-text/pandoc
+		>=dev-python/ipython-4.0.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.3.6[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+		dev-python/nbsphinx[${PYTHON_USEDEP}]
+		test? (
+			$(python_gen_cond_dep 'dev-python/nbval[${PYTHON_USEDEP}]' 'python3*')
+			$(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]' 'python3*')
+		)
+	)
+	"
+
+PATCHES=( "${FILESDIR}/${P}"-no-mathjax.patch )
+
+# Opens a qtconsole
+restrict="doc"
+
+python_prepare_all() {
+	sed \
+		-e "/import setup/s:$:\nimport setuptools:g" \
+		-i setup.py || die
+
+	# disable bundled mathjax
+	sed -i 's/^.*MathJax.*$//' bower.json || die
+
+	# Prevent un-needed download during build
+	if use doc; then
+		sed \
+			-e "/^    'sphinx.ext.intersphinx',/d" \
+			-i docs/source/conf.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		addwrite /dev/dri/card0
+		emake -C docs html
+		HTML_DOCS=( docs/build/html/. )
+	fi
+}
+
+python_test() {
+	nosetests \
+		--verbosity=3 \
+		notebook || die
+
+	if use doc && python_is_python3; then
+		py.test --nbval --current-env docs || die
+	fi
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	ln -sf \
+		"${EPREFIX}/usr/share/mathjax" \
+		"${D}$(python_get_sitedir)/notebook/static/components/MathJax" || die
+}
+
+pkg_preinst() {
+	# remove old mathjax folder if present
+	rm -rf "${EROOT%/}"/usr/lib*/python*/site-packages/notebook/static/components/MathJax || die
+}
diff --git a/dev-python/nuitka/Manifest b/dev-python/nuitka/Manifest
new file mode 100644
index 000000000000..5ed371c6e7c3
--- /dev/null
+++ b/dev-python/nuitka/Manifest
@@ -0,0 +1,3 @@
+DIST Nuitka-0.6.0.4.tar.gz 2010373 BLAKE2B 96d31fde6d087bea81051bfcc208d52466b9c45785c2167c61721440fe930906958ee840bb98258c7c1b98c067302049afd63bbf5cfd422a69c1994675c29c70 SHA512 f9a30ad578b80679c0313be84150adff83a90b35c758487fc9f5240d527cf0a905b6257a0dfdf2a2c8c7322688108a6673c56238480344adce123d67416eb197
+EBUILD nuitka-0.6.0.4.ebuild 630 BLAKE2B 5526f072dba96751c9fa057829fedbe82dcf2a032ae2f6df815e54783a216d6d2a363b49f0e4b0f0b1627299e4f94ca79198b46e69830b3a0ef2a90afc2ec9ca SHA512 764095edacfea35fe8eed86c5588821895f49d3e2d7c7ca244661c7910e9e7796e1ebcef6ca31d1759c0ccdf433fece6944a5d003b644b1e0c88a55272ed9837
+MISC metadata.xml 750 BLAKE2B 56bff65b936301e2d0347e553a1ea85b89c4c991697f665b47b01dfd7e40b94726fca15c67e4387fb79ec19f77851e275bb80c48ded3f76e6cf4cb81d10ba90f SHA512 01ed4ef871d9d43ccb30b60e5051f513b56d7ab3eb46ad64b76e6ee8f53f0088c4a3d75227a0870e82664476954d6603f70614232735f107bb24a06702c014ab
diff --git a/dev-python/nuitka/metadata.xml b/dev-python/nuitka/metadata.xml
new file mode 100644
index 000000000000..a082b06e69cd
--- /dev/null
+++ b/dev-python/nuitka/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<name>Oz Tiram</name>
+	<email>oz.tiram@gmail.com</email>
+</maintainer>
+<maintainer type="project">
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
+<longdescription lang="en">
+	Python compiler with full language support and CPython compatibility
+	This Python compiler achieves full language compatibility and compiles Python
+	code into compiled objects that are not second class at all. Instead they can
+	be used in the same way as pure Python objects.
+</longdescription>
+<upstream>
+	<remote-id type="github">pwman3/pwman3</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/dev-python/nuitka/nuitka-0.6.0.4.ebuild b/dev-python/nuitka/nuitka-0.6.0.4.ebuild
new file mode 100644
index 000000000000..f90b09327492
--- /dev/null
+++ b/dev-python/nuitka/nuitka-0.6.0.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_5 python3_6)
+inherit distutils-r1
+
+DESCRIPTION="Python to native compiler"
+HOMEPAGE="http://www.nuitka.net"
+SRC_URI="http://nuitka.net/releases/${P^}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+RDEPEND="${DEPEND}
+	dev-python/appdirs[${PYTHON_USEDEP}]
+	dev-util/scons[${PYTHON_USEDEP}]
+	"
+
+S="${WORKDIR}/${P^}"
+
+pkg_postinst() {
+	elog "nuitka needs app-admin/chrpath for building"
+	elog "stand-alone executables"
+}
diff --git a/dev-python/pbr/Manifest b/dev-python/pbr/Manifest
index 9785da032eff..2b371b6a90eb 100644
--- a/dev-python/pbr/Manifest
+++ b/dev-python/pbr/Manifest
@@ -3,12 +3,12 @@ DIST pbr-1.10.0.tar.gz 111425 BLAKE2B 2cef589ada2892dd8357ad3248c4b544d58c699d24
 DIST pbr-3.1.1.tar.gz 102665 BLAKE2B 301515d50f8550f5553a29faacb1daef589b41b8116320abd4552bb67886498d89eced1f95e1efdd6ac0511a5587eb479dc9d2963a74e92300463c3c53201e7d SHA512 c01fb83678f8fc3acddc153dd341a17ed9d602b6770f0ff244b1c5b54c37d4ddcbd0c3d726f7d7020865819e02797c1c79a0c15e9ee2ae5c1510fce7112b2a3a
 DIST pbr-4.1.1.tar.gz 108683 BLAKE2B 5c0157ff14590113e7baae0bdca1ff46108a7a10d6eae8bd0a2d06bee62b4aa65eed25c900ae1b67324ac6b416641081c63a274c9694db1877b5d9073c1c04d9 SHA512 ed739901b3a2d1eafa1d4d408a39f1e5d967776571efe0913877145aaccee3114558e107a4e5704403288324c63a08cfbca07a3409bd1baafcbc33105abdf3e4
 DIST pbr-4.2.0.tar.gz 107958 BLAKE2B 716283ceb7b1a8da41e77441c7526bf8cbdb5be7c710013630d3bbddf7de0ce37f3abd063f6103f3ec27fc5c09796f6452d8117df3b533b3c7377bf6dce7d37f SHA512 d46d93333b4d0d3fd5c14e0a474ca7beceddf794a5dbcf66f810993b8d33b48602518072effcd429566f4eede2a38c4aec289df262c2c0e7ab4b82474e14f14d
-DIST pbr-4.3.0.tar.gz 112935 BLAKE2B 460d9f93d66a9381360f3b47beb0fb8a3ffcc21be231e5875019b00d5b60efacd7237c073f9d7850b23aed75ad842fbb6b082d665367dcc5a059b8eb0064641d SHA512 6e87c62ca434a85506f1e9d9e92d29ccccd24484120748fdfae081e3a574a9d9edcd2e3960bd0ecb5d3c8543a919b8b0f829662957ed657693022c8940f76d74
+DIST pbr-5.1.0.tar.gz 114412 BLAKE2B 9a886d3ee564f800208529be7a6e1999691a92ce68d8e9da09f36ff7b4c5fe497461ec2c21d09e969e912a8475aaa07154b74fc110ca1f58d62366e67df412b5 SHA512 f09b75c18e1acebb60e478c660aa6cc86c8c52834db40972e74729a13d53990d15d9efc887a584b8176af892845fed861a9cc3291bccc5d85673612c10eb0154
 EBUILD pbr-0.8.2-r1.ebuild 2101 BLAKE2B 4e85eb993ab7e6dc05687c531145441b1627fa61846546bd3c66cc5690bcb1f55b7b49ad0f5dc4cbf86c4e949deb7e66c11e9117a90c7933334477c6eeae6f73 SHA512 bc6d083dadd1d46e7d6f311d43e89e4fef40e7c1a02f826359166c42aa4c075c1336081bea03986519dbc9912785b1f2732326d1bbaa0ddc391c9649356a8b7c
 EBUILD pbr-1.10.0-r1.ebuild 2602 BLAKE2B fcd63f45eba4952178bea076c77e5d6880c27f310a8e2043867bc1f278f5d450f9a75832f90dc482c709d4bad4eadf3c1f150092e546e624a03290fea7390664 SHA512 d516a6d42efebe51e2846721e8292fb402d9ee5a88cea385a281f8f7d828da30c59df9582fac1174c2100f8943b318a52d208d6ee10d294a9a3e915e95c1a589
 EBUILD pbr-3.1.1.ebuild 2828 BLAKE2B 7fc677aa10ce15627e6e6f6857f0d5b1fc336fe139e42b3ff1aa62d2d898eeb6a92a8e7c22e06e5f597025a4ad16e60dfdec60758b6b5f36569bdd67a39566c1 SHA512 58894ca83de7006ee6486d75ee1673c970ccb207d50c84332b215086468e3288b10a38245a92c8a6330f2a26fddd001b70a9d89b8144009459180474774c1cc1
 EBUILD pbr-4.1.1.ebuild 2601 BLAKE2B a2945d95e1ba37c28d86fdd0bff32f0a880c801eeddb2f3f70f6b21fbac7c0bb869021ccb389888c146f5920b7350af1d0c53d34784f9dd0e0934eb937ff1f55 SHA512 c71925bd2db17d18a625ea6510f589c8bf7df9f10031659f7a6c4a63432826639ba6a93c99be229b5f62933051fc00532d53bb0660f89e0d0c804b8bc7af44dc
 EBUILD pbr-4.2.0-r1.ebuild 2747 BLAKE2B b1f4ae987da3a891fe95f9d059b089acb8f75bee89dcfadd981db41de800fdc9432e24530f2f638e0804eef9c0a316244e8b3059074fe797513373d4cfa5640f SHA512 d0cf43215fecf025910e51f22d92fd11501f8d649c31292a1623605f3536552fbb5ecfd84650e8788ec30248ea72c85b8a725a80cda0e4a1207ab8d0ad5318d9
 EBUILD pbr-4.2.0-r2.ebuild 2790 BLAKE2B 7abb3158a404d077fe0742c9ae542db9141b9de42a3c2537ef6ee0bfc7d9f542e2909e3351bdf9a6988cc08603cb24ce07044e49b08ac1f0c438cd8c6320fee5 SHA512 83903d15a678cc80171e0cd49e6bfedaebfa245494d4c2875bc6679d4647e65a816c9f41181f49739fd035b4c93a92a06db899b5a44f0688420035480c111bb5
-EBUILD pbr-4.3.0.ebuild 2787 BLAKE2B f861a99fb83212df43972145b0d2a7b2d182c37322e4d8caec90156d0c515875858027c49c62624ecd9a17234964a3dda6395086da08210aac7e398d0d1900e7 SHA512 4e5f933ecbb05ad987632dc2abd25734e28815c6547fdbaecfe2588a44b75ebd38b12be4ffc4a5921e0066842171ab7184a1a923f44aeb16a54c6bc3a845750c
+EBUILD pbr-5.1.0.ebuild 2925 BLAKE2B 4d98333c8093a1978a7f8f7b1ff4035a18787897e15cb3f4514c96522817deb613b1adf5356267ebadb53eb926ab0b1654659937b903b39b153a3b2867222bc9 SHA512 08ed8cf91ac16b094b9b7e69178408e2c7f864997afcbae5b43b612fa35995a3d2592919833b8cca3b71d4e9b14b9bf19a25d61cdcf943af3c9fc890cc47ef38
 MISC metadata.xml 686 BLAKE2B e7638d779ac7aa46c074cf4060bbca595c8e555e972da8b418762bb40237ef0f6d89125f3c0e8f5201a362b2425247ed5a7ecd9d26afe9981f9e51dd005c28fc SHA512 b4bff66d2f42e08f93d723e43bd1b6b32d8bd01a45136a741992af07c11da7fe0db847e46316e5bd237f47cb844fb481e09bff0c6df3d071197686d7dfaa7bc9
diff --git a/dev-python/pbr/pbr-4.3.0.ebuild b/dev-python/pbr/pbr-5.1.0.ebuild
index 5011d435355b..c0cc4e82f516 100644
--- a/dev-python/pbr/pbr-4.3.0.ebuild
+++ b/dev-python/pbr/pbr-5.1.0.ebuild
@@ -24,6 +24,7 @@ IUSE="test"
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
+		>=dev-python/wheel-0.32.0[${PYTHON_USEDEP}]
 		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
 		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
 		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
@@ -36,6 +37,8 @@ DEPEND="
 		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
 		>=dev-python/virtualenv-14.0.6[${PYTHON_USEDEP}]
 		>=dev-python/stestr-2.1.0[$(python_gen_usedep python{2_7,3_4,3_5,3_6})]
+		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
 		dev-python/sphinx[${PYTHON_USEDEP}]
 		dev-python/wheel[${PYTHON_USEDEP}]
 		dev-vcs/git
diff --git a/dev-python/pocketlint/Manifest b/dev-python/pocketlint/Manifest
index bf0a09dd6f1b..5309e1a55b56 100644
--- a/dev-python/pocketlint/Manifest
+++ b/dev-python/pocketlint/Manifest
@@ -4,6 +4,6 @@ DIST pocketlint-0.17.tar.gz 22612 BLAKE2B 3245f80c486a4d16389262d5795be32b784af1
 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 484 BLAKE2B 53c73b134365db1b096f4530cb86b9c40e1a9dcb22f438fe7f8504fae4a8699fdf2df38a823399733957bb46cf48c629ed1e2b8dda42e8421ad622994cbb315c SHA512 52ef44009daf6dd1641ed7aa34effa967e64b3de2e61fe8114d2686fc915494692ec3f3084e1e220d72298747bf2727373a6f0fd10edd2236f7cf1f070553230
+EBUILD pocketlint-0.17.ebuild 483 BLAKE2B 85524ef1753ce1d9797f00efdd51a28a5b3adfb736e88f158dcf62b9b4c4c0db9edeb29de2dd8f5e6cde8d140390b5b9ea7f3dd609840285079b40be95fb6371 SHA512 aeab739eae7f5fbe7929aa78aa93949e10a8b438014e9c0f412df0a8e20345bfe5fd280548259baebb5ad282534e6fd08c6ab85291669e192d41b3e0da9ad8f4
 EBUILD pocketlint-0.18.ebuild 489 BLAKE2B a67e8b0a84e9b00694516d2e1258053936faa0a68e67a380e8abae68a3cd028abc31c512063952df43b9c328b70bcc718e98700b52042e3d2597831005084093 SHA512 b006f2bb67cac803b24c12814c49e675e462953200361cbfd8ca522ace6908d18d3808eec8fab5a3627854496cb1ee8d4378d675b7390c2c131e8d451390f08a
 MISC metadata.xml 348 BLAKE2B 832ec69373391ee6c884d446b58ccfb07de61b7519b34be09e3e592ea061c0cf0a10203a5c69bd05e2400366891fc9c74a7b1d74f4a7f268839aeaeb5781602b SHA512 925fd532aab036f7bb18011abfdf98daae08e648aa8b64853d721396dedc431254f54ae2168e5572e2e1f101c6e5ffde2b08a26e423407d84e0e849bd7d4d38e
diff --git a/dev-python/pocketlint/pocketlint-0.17.ebuild b/dev-python/pocketlint/pocketlint-0.17.ebuild
index b7e157b6eeab..175c417072d3 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/python-dateutil/Manifest b/dev-python/python-dateutil/Manifest
index 1b8d6380a85a..3bcc4ec12f08 100644
--- a/dev-python/python-dateutil/Manifest
+++ b/dev-python/python-dateutil/Manifest
@@ -3,9 +3,11 @@ DIST python-dateutil-2.6.1.tar.gz 241428 BLAKE2B 93b1d43dacdfbf528b085864b04231c
 DIST python-dateutil-2.7.1.tar.gz 298061 BLAKE2B a6bc2a3bf83ff234ddc53db5a3353b19303dd9e0c6d2d702537643e134508f96ccc69b962fd957d4cc754b07cd24b3c3c2ce07becc0add7db925b841d6a32b5d SHA512 3dbadeac3dd22bf51279c4237df96a925ed4063384a82e756a41e314c216751f2c90f8909a20ba96fdb065966034e9c7e40c1ea152876ca733a2176893c4deb2
 DIST python-dateutil-2.7.2.tar.gz 298000 BLAKE2B 4091108b125eb080809c74cdb53daa27973b2dc4b2c4f79eba2afb295fce7b6c21a8589d4643ad5af212900f55dc4139711929d5c7c4a2b094ac749d76125761 SHA512 b8fdc867aa67c4e5602bb3e9bf906dd4d32a6616fcdfd5f39d146d849a46d13c266bc9c2eae28490399fe608ba19dcb824d05ce96d556de07999449eaece7dfc
 DIST python-dateutil-2.7.3.tar.gz 302871 BLAKE2B 8b6cff6f977d52b64665f33d10513a638addada91a00192eb1f522aa9b239d5fb051bff3cfb837871ea61d7ab69994cfe5b42bb3b00851b5f15368c26db06fd7 SHA512 6b9973fa7db69d931bc6e772201c67bb7bbfa693ba35484d34960bd7e6227f2a2343df814a9fdbbff253e750299c48e7cdb2a609bf4522595df8a7fc595784fd
+DIST python-dateutil-2.7.4.tar.gz 302229 BLAKE2B e2a43d8587f895a9a72ca5ab5c18a5c471497c8f8e89459450219e9f5ecb55223f36f219d77df8da4c04d55fb5feb3a17f9a5c2318c077dac4307da7c0bd9645 SHA512 3b02b397e3138dc755f34a2f7a50464f96a73b7be1f335ce7da3fa99e6d59f34a0643dfb1c933d4ef4fbaab88364fab6e760e4b1e7040b8cbbfebdd75e7e9a4f
 EBUILD python-dateutil-2.6.1.ebuild 945 BLAKE2B e76a7b5013c9c5bd1d4839b8b96a74e26bdba1845b33264959f892af6ba4ff7613721ae8329c350656a706406a33a0d95af2cba6044f8123c40c4e937c3fbbe2 SHA512 47a4de4eeeace543f6ff2763a6adf29e1eaa3b1e8724dc462b8ef9290c20dca5276be4a6a639ec75e1932ee87b489e4bee3be8efe36c2ada86abaf33c4094b2e
 EBUILD python-dateutil-2.7.1.ebuild 1132 BLAKE2B 923c7bd5fbbd51013ebbc630f56429272ebcb768f68cc51d70d734dc477a4f0e614b4da6a411702384c78720b7e661a8d69e7fe12b00b4057bcbac3374c1b636 SHA512 d64f414372593288610a36fb6300b4153d9f306d1d414ce166887ecd011f9e8b9442738e5d43c7d4e5d3f485910663879ac3757d8f378a4f0a7846c017c76d46
 EBUILD python-dateutil-2.7.2-r1.ebuild 1216 BLAKE2B 2378173007cb7d68554d68a328b0b0641140bf8bd6015aee6532bc8bbfad8495832f479604a147eaf4e9b0bd1f1e93dedb7483287b8b3c53b83e0584565535c7 SHA512 c122a60a40fa20a03306da0226a5c53965004b9133b592942f7bf564d0017a0dd61da44dcbb1a006e8860e0ddf05cb721fb631f3d3f65620747521cec25ae4c5
 EBUILD python-dateutil-2.7.2.ebuild 1132 BLAKE2B 923c7bd5fbbd51013ebbc630f56429272ebcb768f68cc51d70d734dc477a4f0e614b4da6a411702384c78720b7e661a8d69e7fe12b00b4057bcbac3374c1b636 SHA512 d64f414372593288610a36fb6300b4153d9f306d1d414ce166887ecd011f9e8b9442738e5d43c7d4e5d3f485910663879ac3757d8f378a4f0a7846c017c76d46
 EBUILD python-dateutil-2.7.3.ebuild 1227 BLAKE2B 5957ba56914678d227018e7a68528c9a1a230a06b198ac98da636a28340f0060af5b6f1e22606215d315f43f0eb3ce2d4e721dc59f5dd013feea220124719dbf SHA512 c7cf38ec9cd0852f86ba78fe2f03111ea2d0d632a362fcc011e8b97f7956bd1baa2ef837763b944b836665404958e177d5a94da8bff0bfac17044c2c9162a1a3
+EBUILD python-dateutil-2.7.4.ebuild 1266 BLAKE2B 77e95ad8621cac6dbb076fd50de06e7c5fcdb381d046e7f4aa2100760c381938720a3717f6e5ad60bd6d1be5060f52ddca271e2800d4ea14b5a697ba6ef95a61 SHA512 299b1fa96c23259df45e52fee243018587b139fa28ed42b50e067eaa4fd38b46955d1333cb8ab715e7a121821c2afd45f7577b583b686ee8c7b2954215161718
 MISC metadata.xml 603 BLAKE2B 1bf49feeeec3ffc2f767228a84b3f9edf53cf44d8a1df3fa8f85798c0d3ea8f448d6113d425baa6b4b342b88746133d2770b951488d602dbb175f5ff9a99ea36 SHA512 87f5ea8b8918e72b57b91d32ed103d88f93ad9fbbe0a8f3f8b8ea72627d82e5cac25246553a0cb6988af26c30841ca5a3ddccf7f957603283a1b4e455a7c6439
diff --git a/dev-python/python-dateutil/python-dateutil-2.7.4.ebuild b/dev-python/python-dateutil/python-dateutil-2.7.4.ebuild
new file mode 100644
index 000000000000..bbfe20ad843a
--- /dev/null
+++ b/dev-python/python-dateutil/python-dateutil-2.7.4.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 pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Extensions to the standard Python datetime module"
+HOMEPAGE="
+	https://dateutil.readthedocs.org/
+	https://pypi.org/project/python-dateutil
+	https://github.com/dateutil/dateutil/
+"
+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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/six-1.5[${PYTHON_USEDEP}]
+	sys-libs/timezone-data
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}"/0001-zoneinfo-Get-timezone-data-from-system-tzdata.patch
+	)
+
+	# don't install zoneinfo tarball
+	sed -i '/package_data=/d' setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	py.test -v || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/python-stdnum/Manifest b/dev-python/python-stdnum/Manifest
index 76205f3626b9..9a7469abdb99 100644
--- a/dev-python/python-stdnum/Manifest
+++ b/dev-python/python-stdnum/Manifest
@@ -1,3 +1,3 @@
-DIST python-stdnum-1.9.tar.gz 466861 BLAKE2B 31656cb64ab422dd172ee1a9121cf41d18bfd85a98a38a956e499e04e20369115449ed0b4b946e1aa2ce8d41eb24ca20b296aa178151276f3ea1e37153875969 SHA512 ed236e7fa5f64bb812578f019c2286a139f75356073ec7d0b0fc9220092b5e0e5d3b4fd133661e4126ac3f78141457af1793fdbc45a22daa4d36ceaf1535901f
-EBUILD python-stdnum-1.9.ebuild 617 BLAKE2B 5d158623cb394fba9e4761f7e464f46826636d064842afbe085c48da71f03fe204bdc891680786f02303e0aead4d6c7fb1bc558535d2fb7f0637986f6383a188 SHA512 88bb49476ff4e96f9ba1498a60da8dc0eb35730ccfb1136935246998a07280f8fbde8c1278ed0a58b8d60f8d55f83077f6b01d5b648b3bf7db30cced4a411dba
+DIST python-stdnum-1.10.tar.gz 477929 BLAKE2B 40eb5a7814a4bfd5457aa95b39509ace603ee3ee568fa0bf9f5c499702f358fb6915b84f25952f93448d7aca46bea4cd3ed8df0c04b89f4e97f9250110979f27 SHA512 e4226a0cf145744d9af4e31de1dca8b7c64eb9229053899882b198456302c92e9abe31801a7d43b29d2dbac22d263733e8bb011337ff1f17496f6d72fad56a1b
+EBUILD python-stdnum-1.10.ebuild 614 BLAKE2B eefb82597f3cea15ffc5f0202c60f6444e43c1a3243088e7e643fd6cb8c45558011901cb45eb64fdb2c2f2169b6afef9efd313d63b94bcecf64a14d3de9e93de SHA512 d315f7cc552f2600c33fa598aa10f9d09441d2a2312e609ec00724c4ec78c2fe7a08879a1941bb19881d3ee5b239b76b804eca40769da72f7d2172272623d5e5
 MISC metadata.xml 475 BLAKE2B 4a2fe0a8f727cfaeb086d33e384b52ada0555f7c57028470c1ab2524bf4e12cb4b501736a9e9b0d14cfc66880e2878d93cea188f035fa52b8c959dd99d034797 SHA512 4aae016f69e817168682ce7a08e9cd61da5397d83706b628b4a743491251c80ee0947f5a00f3f3657c2f80f276661f0287a5359041451b997c214ba94cd2430e
diff --git a/dev-python/python-stdnum/python-stdnum-1.9.ebuild b/dev-python/python-stdnum/python-stdnum-1.10.ebuild
index 6cc5bf1ad672..404a644410d2 100644
--- a/dev-python/python-stdnum/python-stdnum-1.9.ebuild
+++ b/dev-python/python-stdnum/python-stdnum-1.10.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
 inherit distutils-r1
diff --git a/dev-python/python3-lxc/Manifest b/dev-python/python3-lxc/Manifest
index 8931b1c59151..8c166d18f4b5 100644
--- a/dev-python/python3-lxc/Manifest
+++ b/dev-python/python3-lxc/Manifest
@@ -1,5 +1,5 @@
 DIST python3-lxc-3.0.1.tar.gz 27424 BLAKE2B ffdf128e06d7b256652588af7c464045479ce907d2119dfe9780737c7bd5f3008c01d834a79f63932bfa51e3094a9d40af46c4cb6c3be72108205d65a8ee3d11 SHA512 7e6b6cb9a02e5af8b3fc8aeefff2954c68d2d1154751fa97a70bce86131021571e15db86bb0d6900a93dda78247e37b75cdfe250bf4d1b7548dc8383ed3d45f6
 DIST python3-lxc-3.0.2.tar.gz 27300 BLAKE2B dc4ba71b156eb0f257bf9d717f07f22afee3d00666601b709341d9091a1a75d237c174f613a93b6ecf7c69b4e6cc75187316e656a02a1d52f0e9970b8f3af6ad SHA512 2fc776decf6248be39f9e8a607a967acf180f3a07e45fadd6be4450f01caa4a854f217dcf7e81e27b5b838c2cea04ef09c8ab8b87c5be5091185bba2eb6b6d23
 EBUILD python3-lxc-3.0.1.ebuild 488 BLAKE2B 2647e70a041e8471ba5c319ba18f68bb2633a7314070b43b28f4a1f8a42730175eca28010d807be9128000439f2decb70b5651bf54f265f3b0de018ee44898a3 SHA512 cd2b832892317b2da908180b99d6ba7b231ebf563aee9e963f445dc2793d1cd3d020a40a22d03379e4ea751c2d28b3cac2b77cd9813bc47acc283aabc763db47
-EBUILD python3-lxc-3.0.2.ebuild 490 BLAKE2B cac2dac3adf8d039562baa723e074357be9214e693ac8122b878abae69749c15b33d63f9c291fc4741c9b71894d3ad83914b3b3710eb0883c7ddc0d66a38cd7a SHA512 18ed28c82b929e283f180f276ba901e6a8dd81091b60e6a11f2ed17d5c9d23309985ca6fda5c1801d633cf020cfb0f53a3c6e668cd2b183be7a116132eb3119b
+EBUILD python3-lxc-3.0.2.ebuild 489 BLAKE2B 7f2fa950a0fc8471997fb644227ddb0101b18ceeda6147898d46ec7e2b324fcf3aa24c6230379b0fda4075676225e2c2d1489b1b655ceed177a5609f2cc4e3b0 SHA512 fd0d0cf362ea74d1171f75c8a1757376ffde2b8df451837f9d48e5248cdd623cdfdbb0123850df48de815a87b7667fedc1def337a13b8dfb0eee8c1b591456d1
 MISC metadata.xml 475 BLAKE2B 4542a3c6240d1afce6fc554a255ed7097ab9923879241e73a77e391be5ee7f6638aaeb5f28ee859735c8abe412c3e62726aa64d67ce744ee1805bb7375dc1d87 SHA512 9db5e045665924cdcd5aa9d843be61c602440d2a18328db38733091ed0050e3c21f14c280a49c1db1bdcf9ae095b7bc58e50b5f3690e092502da87b2b5fc984a
diff --git a/dev-python/python3-lxc/python3-lxc-3.0.2.ebuild b/dev-python/python3-lxc/python3-lxc-3.0.2.ebuild
index 2f5864cdfceb..c3e8de0285e4 100644
--- a/dev-python/python3-lxc/python3-lxc-3.0.2.ebuild
+++ b/dev-python/python3-lxc/python3-lxc-3.0.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND=">=app-emulation/lxc-3.0"
diff --git a/dev-python/simpleeval/Manifest b/dev-python/simpleeval/Manifest
index c9a7ff1110a9..e2cbad43c825 100644
--- a/dev-python/simpleeval/Manifest
+++ b/dev-python/simpleeval/Manifest
@@ -1,7 +1,3 @@
-DIST simpleeval-0.8.7.tar.gz 11654 BLAKE2B cc61dfa8aa069aad9985c69cf5838c4fecd44856e117c34e80a8209bf5b34ac81d7b4dcfb395cff88d385236086f1b0ce5e34ba3ab3ce04bbaa9ce7c89a32567 SHA512 7fef73e3b4d62e24048be164f156f19cfd844116fb9603ac88753b216b984f873babb351216ec6f96e29009fadcebd9c81f7e49f6577197c098e4f10ba2116a1
-DIST simpleeval-0.9.3.tar.gz 14582 BLAKE2B 9726e07abf14327701499b7486d19cf7246d9b3a5ddf172059943a0375d3977872b6ef803a2c189f44c9af62900db5ae3392ad57c452e86bfeb0abbe0944cbb7 SHA512 8f9dc5076da57e40388e3e247028cea7db7328c10d88047d68b36e86383209abd7c63e64fa0d64901f82dc4274825700ca7caeb0546e56a1a3a584237d7f8f1d
-DIST simpleeval-0.9.5.tar.gz 16893 BLAKE2B 407212c85f5292cd0085e64a03d680215bb5966caf2415b145c5bfe44863af28656dbbca3d25001d53c3b04421dabb06f82bd419d8f43acca8af7c903d0d7162 SHA512 27e50b3927fa45045cd9d40bcc1959d0d456aacb5c080b490d305cef1a5785889cb151512f2eeace6ffebffa69d155b3495f3e16dbaad244d16d7486a3a1708f
-EBUILD simpleeval-0.8.7.ebuild 521 BLAKE2B 613fbbb7b72c6eadd9ab674a3aea3680534c0cdb524a2fdab9ad9bdffe901f310afc5e27d447ad6a90a6034d86c5c41b452126f10336cdd8c93b5f8bc83b9665 SHA512 932547b689f19c83a293f4d24a248a01759753d87e04b9a3446f9117b592163774c8ea8540d4d21647bb6fcd76eb8831f7300caee2697ca8c774504a51ec07c0
-EBUILD simpleeval-0.9.3.ebuild 521 BLAKE2B 7ca6717a95676f4cba288b1e18e5ef92ab04080f7641819246b7602c328e5cd7d2d76c365b01094609f4e7c7cb01dc6c21759527dafc1f0ddb043a8d7f0c9258 SHA512 056fcb74642f40a843ea0febe9829ecad1418bb44a949325fca7440ef4c55dd483f16b1b9db89a8e91ee8f4b702db9ca7fac1ea3d8708fbdc886646ed0bf84f5
-EBUILD simpleeval-0.9.5.ebuild 525 BLAKE2B 6840e5a72dca068f4b2d936786acfe1548fb8a5ed818d5c1c688141256c0bfd2e227642a6834860428fd042a8eb342dacd521dfb614c01aab87cf868b6d77902 SHA512 65b3523cdbabd750c3de95a6d7d34a7fd3f73c436226833a0e564a988ef7e35aa52c638af01f613ba47f2a4e94ca5d9e14cf8343726de6212b2c1ba5a2e07742
+DIST simpleeval-0.9.8.tar.gz 24554 BLAKE2B 92adb2de03e2e70be99adef625de54c02c39305475f8df4517862c9a2726ef5c36e3e411f6cd1b4e47d57ed20ce66b3fc55ef402e705c4f3d49b8b2389919e18 SHA512 3aedb78571442283bc7b2bd1754dcc2197f81b264c6e629acdd8307a0adb7a4f06e084bb121caa0c36711153253b884942cb5c50614afb58e0e895247f8c20aa
+EBUILD simpleeval-0.9.8.ebuild 526 BLAKE2B 83f9e453d2c5db72bc6697e3538be0a48e6d1fcfbab6eef3bccc552a7846bdb4fbe3963cf20b24c2d14dc4e4ba667ed4f4ee0435836f6f4caff78d58ad1fdbc6 SHA512 040e32a5ba5208fb4ba6ed0b6f431e690f3a0063dcafb03dfd08a1464030373705d1e861870c4bfe875c4c9e90b31b0886e6e8a74faf9080d8ba78db5dc0cb1c
 MISC metadata.xml 483 BLAKE2B 5ca6ac5ffec78efa1b4c14df21173e15050efd7a024d87cbbbd86e59835afe2dabd4ac44c277a23276eed79dbe889f0f5a5a514048aebce42aae9c46f8d832f0 SHA512 a2f3d2ad7fb0d4d887022003498692c18db8e4ea6de1f5c5eb2a10e48af624a887dc2a06d91a73023c17a2fadb52e30e9e14b9686f0c0d73b60b6fe35ac39222
diff --git a/dev-python/simpleeval/simpleeval-0.8.7.ebuild b/dev-python/simpleeval/simpleeval-0.8.7.ebuild
deleted file mode 100644
index f9ef468ee78b..000000000000
--- a/dev-python/simpleeval/simpleeval-0.8.7.ebuild
+++ /dev/null
@@ -1,26 +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,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="A simple, safe single expression evaluator library"
-HOMEPAGE="https://github.com/danthedeckie/simpleeval"
-SRC_URI="mirror://pypi/s/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-DOCS="README.rst"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/simpleeval/simpleeval-0.9.3.ebuild b/dev-python/simpleeval/simpleeval-0.9.3.ebuild
deleted file mode 100644
index 88f0269569a1..000000000000
--- a/dev-python/simpleeval/simpleeval-0.9.3.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} )
-
-inherit distutils-r1
-
-DESCRIPTION="A simple, safe single expression evaluator library"
-HOMEPAGE="https://github.com/danthedeckie/simpleeval"
-SRC_URI="mirror://pypi/s/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-DOCS="README.rst"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/simpleeval/simpleeval-0.9.5.ebuild b/dev-python/simpleeval/simpleeval-0.9.8.ebuild
index dacb7bcd0b14..a47c510b426c 100644
--- a/dev-python/simpleeval/simpleeval-0.9.5.ebuild
+++ b/dev-python/simpleeval/simpleeval-0.9.8.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=5
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/wheel/Manifest b/dev-python/wheel/Manifest
index 0d58ac3c1345..55daece4a979 100644
--- a/dev-python/wheel/Manifest
+++ b/dev-python/wheel/Manifest
@@ -1,7 +1,9 @@
 DIST wheel-0.29.0.tar.gz 54143 BLAKE2B 8f29c81b9b3c8ee419c26f04e09f437a2113716f5096e1b6e21f23e6a7426e58b7ee00c0846cfcd816670bee4dd908ef577e4142fae546d4ea643af2c2612049 SHA512 b72dec3cf71e3d87c611ff41f1381ed7f2c654edb50c808fb4fd0f552bab3572434495bf18c36d2ecc7cb8b355782054d3d6dedd5589ffda15027e72cff24602
 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
 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
 MISC metadata.xml 308 BLAKE2B 32390fb7a1a3de815d3a791850d9f96d8092be48cf2ac61f8cebdf132e7d1c5c4cba95bac3edc3f2ebd6a2d9e9437e0c9187f9668ed95c4ddb4ee6072f496d46 SHA512 d5fdaba19a51f826d45ba93cc77a08fd4be563634f51236cec379763f066ed925869a57c94c75a34ed58302619d419f31dcad641d9e85c68d11d72ec53d2d45d
diff --git a/dev-python/wheel/wheel-0.32.2.ebuild b/dev-python/wheel/wheel-0.32.2.ebuild
new file mode 100644
index 000000000000..befc3c65c39b
--- /dev/null
+++ b/dev-python/wheel/wheel-0.32.2.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/wsproto/Manifest b/dev-python/wsproto/Manifest
index e70ad1eee00a..d8f62fd62398 100644
--- a/dev-python/wsproto/Manifest
+++ b/dev-python/wsproto/Manifest
@@ -1,3 +1,5 @@
 DIST wsproto-0.11.0.tar.gz 41179 BLAKE2B 72486adde659e96910bcc56efe5f3ddd71d962e2844e332eabea2a0cbe5574678be85d330fdd54f951f679dfe5b1c185641a30169cc6cd9ac6c4ed066c6a3533 SHA512 583e030dc88971b3733e5e84e5fbaa70d6043d01485cabbbf45470baa31e4f511aea55e108132fc298aeae0031542af7bdd22b7ae25b11832179025a2fde4bdd
+DIST wsproto-0.12.0.tar.gz 45252 BLAKE2B 1be690faba6665b11e2e1c1725935addb132d7008f0ae81e7d5c383a152a5d79389287b3c152cb380e0bdfc97a3438e2a48b62f3c8acf6b501427bc617225ec0 SHA512 159b7f67eff60c2514cfca17036d95017109fe251def6cec132998ac82a037484e3e248d4335539fd03491f56c491a7cf51582aa3f74a44d7d150220a875b18d
 EBUILD wsproto-0.11.0.ebuild 673 BLAKE2B ef3472151357d0b5208a860e0e110ee44a097ee2890879b392ff4868c5e193e5ba4d0d40d1313dc9c327efa44143b7d1b7a0f0dfe829d6d3070c2af4588bba51 SHA512 a2ea337eca93dcf61bfd487baf28d9723d28b7eb539355f476a322dc9a4b94565c3e05be7862eb7403ac6dd5685968ccd5cf4624540fe61f5197f2ebf92c1eb4
+EBUILD wsproto-0.12.0.ebuild 711 BLAKE2B a205ffff33b852bece8d9d7ac18aa4eef13408efa33b26c41006cad0150a65d30bbe6d3673583e93119848f3c5c712625574981e7c1b4a8cc714b1d3281d0fa0 SHA512 2988768b1429000215a81649898cec4eb0ba7bf047eff28cce4153d44b8f9fddc3bbca1186bcdbd95eb2633f20913418fef4f50d451c1fd967aaac7e8ad735db
 MISC metadata.xml 589 BLAKE2B cd779642e22d2843565d087f42dee8bc89abc872632f9a3accb251ba89498d7f4d7c494adf83db613ee06591a7a48b40584b4f3ff23f1cf900d6763364e3b843 SHA512 fd6b82b6ef0367af0227bafab043b9a02e84c61a39435d3b93e2b4c492d247ee121a5985510427ded8339db68f1471c18928b2c3fd12f87d72f72320c1d6d854
diff --git a/dev-python/wsproto/wsproto-0.12.0.ebuild b/dev-python/wsproto/wsproto-0.12.0.ebuild
new file mode 100644
index 000000000000..98cb9d8b563b
--- /dev/null
+++ b/dev-python/wsproto/wsproto-0.12.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="WebSockets state-machine based protocol implementation"
+HOMEPAGE="https://github.com/python-hyper/wsproto https://pypi.python.org/pypi/wsproto"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	=dev-python/h11-0.8*[${PYTHON_USEDEP}]
+	virtual/python-enum34[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	py.test -v || die "Testing failed"
+}