gentoo resync : 08.01.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-01-08 21:45:04 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2018-01-08 21:45:04 +0000
commit: 65737cf14a7220bd9a487aa2af4ae0e79bd23e86 (patch)
tree: 625754b14ae80ac167d1b150c2314b647cd008e6 /dev-python
parent: 5001a6c7b6da2956f5b17c695b1e0059dc7b8de5 (diff)
49 files changed, 528 insertions, 125 deletions
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 71880492dcea..9c168f7738bb 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/ansicolor/Manifest b/dev-python/ansicolor/Manifest
index 8489c71fbcbb..3e0202bdf488 100644
--- a/dev-python/ansicolor/Manifest
+++ b/dev-python/ansicolor/Manifest
@@ -1,5 +1,3 @@
-DIST ansicolor-0.2.1.tar.gz 5678 BLAKE2B 538c4223ede3263cc46e52da53cc75e2a3c3ea4685020262b7efe13050d6f33ab307f190f83b4bd44f0e99a5228651ef18afe61c960a5e355584196df44434c9 SHA512 334b90eaf3f21469062ff4f70043fa902c1cfd53e7d73d22e4df63dbeb55db1f33d71b5a88ef6ba4481a9144ee7652ea68d9554f5155e129f462872d064430b5
 DIST ansicolor-0.2.4.tar.gz 5971 BLAKE2B 95be4af04df9ec9104872fa1a97dfe48174032f22cd5c0e2f9cd8292f2fb1a391476b93985df227cb7b15ef2c6998c912976c3f071ca88e74835032acb138307 SHA512 1f20955a5ddf6a2125146fab220884b3dace2faef5b06c637c396b1769ad60e69ef7ae8a4ae3ecd49d0b849efdbd388b611eb738dc7c1b7f19027afc3f30e57c
-EBUILD ansicolor-0.2.1.ebuild 565 BLAKE2B 83bb21aadd973f3e09a9f721e8c0bbacbb0d5d359cbbe92b35bda044d2a54b2152d2aa7ddaf302e750ba22d1ea5920dadfc05c737ac03e271fc3818041afcf36 SHA512 73a812bb0baf9eaceb625967ca2433cf71f73d977c2309ef829e60546e48e71668b048afb6534eb7c9f15bba6a873897da5de7abac183287318c517e59878f31
-EBUILD ansicolor-0.2.4.ebuild 573 BLAKE2B 4bc9498aa85090f3d7b1aeffdce4fbeecf6cf7dba89f891c6f46d43beadc28e79b17216e2d040af2b9722e2f4aead229115ace72ae610560dd13d44bfef6fc47 SHA512 caf3fd1ebbc8c6bac308bcee477e3cdf14ad3f0ed531b01be34102b5f96a5e37f3f75fff0c2cad99532767bac4c9d655169110028b3ca6f3e435e042828a7336
-MISC metadata.xml 305 BLAKE2B e1328867725ae4514e5b0202e26cf5021d0c85edb5eea6d61e453b31c42876aac2cee451208f9575b3e4905db670b40b950fd9ca407a18232c88aee1efd09c24 SHA512 9de4b49f53061b8ed45073bbad59a8f577ca075f271eba90c1822655da1310e212b31774ade66a9e318478f92aad2e863e46bff4ab067288e7d8c2b4f37e6913
+EBUILD ansicolor-0.2.4.ebuild 578 BLAKE2B 6e992717a80c4f93407abf4c8d7382917207c0584b05671cba124e6ef679ffafcf3e2efaf5d512cdb76bec4134b2e4f1608630e34fa82b58072011a1768b318e SHA512 53a17a624ea5ac2c48b74edc46acb7fea0a4d681b346503f19bc5a8f2c9c86b594ecdf948598052620cbe8dda8e37ccd61f16aa2895e5b126198bc1589df415b
+MISC metadata.xml 497 BLAKE2B ce249e4bcd8f3e7eacfbe1ce27ee5fc2746173417a81dc51ea3234632e436c256bb5be663d9a8e0a514378c084a6beffda8b30112d82be96c1f6d1748f78d8a7 SHA512 539ed7d24279e0c9a23166e4c2a19326c6bbeeebc17b5d55b0ebf45621005c47bb6cd7f434a30d93c585b7444b327f9e87389f0a63cdf000ea8e13ae23625400
diff --git a/dev-python/ansicolor/ansicolor-0.2.1.ebuild b/dev-python/ansicolor/ansicolor-0.2.1.ebuild
deleted file mode 100644
index e042e1b6f104..000000000000
--- a/dev-python/ansicolor/ansicolor-0.2.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Produce ansi color output and colored highlighting and diffing"
-HOMEPAGE="https://github.com/numerodix/ansicolor"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	https://github.com/numerodix/ansicolor/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/ansicolor/ansicolor-0.2.4.ebuild b/dev-python/ansicolor/ansicolor-0.2.4.ebuild
index 552bcb87be0f..fc1f9fea09fc 100644
--- a/dev-python/ansicolor/ansicolor-0.2.4.ebuild
+++ b/dev-python/ansicolor/ansicolor-0.2.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
 
 inherit distutils-r1
 
@@ -11,10 +11,11 @@ DESCRIPTION="Produce ansi color output and colored highlighting and diffing"
 HOMEPAGE="https://github.com/numerodix/ansicolor"
 SRC_URI="
 	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	https://github.com/numerodix/ansicolor/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	https://github.com/numerodix/ansicolor/archive/${PV}.tar.gz -> ${P}.tar.gz
+"
 
-SLOT="0"
 LICENSE="Apache-2.0"
+SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
diff --git a/dev-python/ansicolor/metadata.xml b/dev-python/ansicolor/metadata.xml
index 74b262541d0c..6baace5d033a 100644
--- a/dev-python/ansicolor/metadata.xml
+++ b/dev-python/ansicolor/metadata.xml
@@ -1,9 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="pypi">ansicolor</remote-id>
-    <remote-id type="github">numerodix/ansicolor</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>itumaykin+gentoo@gmail.com</email>
+		<name>Coacher</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">numerodix/ansicolor</remote-id>
+		<remote-id type="pypi">ansicolor</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/castellan/Manifest b/dev-python/castellan/Manifest
index ffab68145dcb..d6fb22a03dca 100644
--- a/dev-python/castellan/Manifest
+++ b/dev-python/castellan/Manifest
@@ -1,5 +1,7 @@
 DIST castellan-0.12.1.tar.gz 50245 BLAKE2B 93f56301ffb57f44fd89fccafa5a2aaede3a3b8f54bf223e1e2a3cc1f14304b2d153557d62f884140512ef72747268b9f86e1102b067a0810bf8235df2e72a7e SHA512 f5e3a8a6ed6c00caa242d2a2a1431f2ddd56ff0168a62fa825eb90083cc1830fe2d8bc4d21b8ed6d1b5f6d1042cb2ad778d49e6a39b003768a61b9ff4d389027
+DIST castellan-0.12.2.tar.gz 50938 BLAKE2B 03cec0cd85042c482432bef7a0115413a9ea03aab05555dc1d4a65b5cb9893b57e2164a5174fb984c8ffcd190b27f9c26552dc242f9d79e3d60dce5a4a27479e SHA512 11ed1eb7fa1e5721f26afe23299ac7b0d13b4570b1f0670f4b13ac05149bdb9b9daa85cd1b29374f7d67eaa22957088b2f42313e23d8c0adf4edef108f7b44d9
 DIST castellan-0.4.0.tar.gz 49026 BLAKE2B f5c4854ce4837a33c6bca369799da2f6b6109a1ebb2bebf47ee93f687214f9388039c237d474ef401bdddd3f983d18af6e4d84f3d6fe3418d3f8989c6811a3f4 SHA512 2ccb2a757810c6ec125dbb8832cd09f918f9fbf84836ff69c79872471c7e4e40bc8030e305336ad9821de7c3b93617d39917387a6ab8f68443fb09d3f74d4dd5
 EBUILD castellan-0.12.1.ebuild 1437 BLAKE2B 69aba8d6c23bcbbe7438a5608761ea8ba4a0a0ddb010f5e92ca26c20cc5d9e1fddcdbf9c03e55781ff6b133515652354bf724e22fdc0101d2dafd97e047819e0 SHA512 aa3a0b44173a59d3c44007fe0ad573edc2affd4aeb765eda18bc7d208ef15828a61dca39ff5ad234a4a696cdaf26b45ebce726f15bc494bfca9ced57aac4e76c
+EBUILD castellan-0.12.2.ebuild 1439 BLAKE2B cf57429fdb2f914e7cef8d90ce2e89e809e684ff8a8eee0765eec39225b4ed37656ba0e845bb29b43c5a771304ffd7ea1a19a7b084e06594e8fa25c51c0c4547 SHA512 3acff4b72a401b70f8527b70bad7637e465510f98438a2d3d18f951f2bc40a461db4e69cbf3674eee7d2f7b5c279313ee89c2acd39005e03e08f885a4bed1a10
 EBUILD castellan-0.4.0.ebuild 927 BLAKE2B 4970a777ef6a94cec2def40cbdc097b18fe8f001455d86c55f8aebf973aa7a076bb0f415657862828e8a6d91f9cbe0955de9f973f665c977e1779b096f07a60c SHA512 a7e4cf2a25a51e3b2ddf54a182b229ef441e6c2f5925b62c1efd4a457376cc36c0b8cef52691abe0e113c53913a13a0e649ecc3551ddf8c0ffe2529238a379c1
 MISC metadata.xml 326 BLAKE2B 5ce95fc1eeafa570c9910dd492a822dfeb251bb98c5b341281ee99e7402be32234fc38bbca1b7ea0fbb67f8bc88e9b1a1c85da73f79d2a9ffc3a69289da507b4 SHA512 f8d928ab94ac70a7a3c2548b67a6296b8e86b5e239a9c74cc4b1a120f64c1e2e2084612b025e26fa3c02099f543ce156e5419a5f6ea165eff79b2dd77e9a2d66
diff --git a/dev-python/castellan/castellan-0.12.2.ebuild b/dev-python/castellan/castellan-0.12.2.ebuild
new file mode 100644
index 000000000000..cb2b3e5e78b6
--- /dev/null
+++ b/dev-python/castellan/castellan-0.12.2.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=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="Generic Key Manager interface for OpenStack"
+HOMEPAGE="https://pypi.python.org/pypi/castellan"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.6[${PYTHON_USEDEP}]
+	!~dev-python/cryptography-2.0[${PYTHON_USEDEP}]
+	>=dev-python/python-barbicanclient-4.0.0[${PYTHON_USEDEP}]
+	!~dev-python/python-barbicanclient-4.5.0[${PYTHON_USEDEP}]
+	!~dev-python/python-barbicanclient-4.5.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-4.0.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-4.3.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-4.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.14.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-i18n-3.15.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.1.0[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/contextlib2/Manifest b/dev-python/contextlib2/Manifest
index 300cd9ec946a..7812da878a36 100644
--- a/dev-python/contextlib2/Manifest
+++ b/dev-python/contextlib2/Manifest
@@ -1,5 +1,5 @@
 DIST contextlib2-0.5.4.tar.gz 28523 BLAKE2B ada08a83e968f58caba5851b0f6ea0eedf8242d5e4b0d4e9c036ed0576c4ce8300669fd09d4ab3b019d8d49bdb79dfcdd03668d5af8519119013c931f037daa8 SHA512 c8bb5bf9dbbf5bfd882663813f2a456d82215be7ace55aed1d5047ce7f21f26d5518982ec26344b1e950d3aea27cd8a5c48627730bb28f8b3cfb6a331fd7ba66
 DIST contextlib2-0.5.5.tar.gz 28755 BLAKE2B 4fa16a0591c5e2138123b4f6d539bae8993bf826bc92b9ba08d335efd142b5e20c53e0d4e3cf5d7ac5d8b43cff45a19e170a7d97a9300fe385fa53d042cbfa38 SHA512 d5c97ff8eef7d8b14da0bfdc3515f8019bcc05e24cb922ce08ca2366d5182b029d873bbf172e9e6791297df05e24f6faf40868550063dcdb54f451b14c9e505d
 EBUILD contextlib2-0.5.4.ebuild 615 BLAKE2B f3020ab69487a87067ce7148f7833665ff3d81bf04f07b1dead69e2e12d307dee6319bfffdf80ac18427a5e98a8cd7759bdfb6a7a14082380e8260a137cca116 SHA512 79df172750eb66c1137916eaf2a09d5cbb9b2601f0608c1c57c463d14544d5847da6fa5b4af22cdea763cb4b00aa2c95a58dd1420da53f4f6d302f97939ed20c
-EBUILD contextlib2-0.5.5.ebuild 652 BLAKE2B 16429a3d6cb5a3ae826047acc323a9988b9d8e65320d40c99d0fe170a7f8d7a4532d955452254d987c3b19296aac7b47b70b2ba9a6aeabca4758f9574c1eda24 SHA512 26b27e2c153afcc8f4d16e6537e109693bf8c001e7269576358c5c8b99670fe93df98ad978a3b77422596bc8ea09f4833c1405fcb1c1a771059990e6f607e624
+EBUILD contextlib2-0.5.5.ebuild 657 BLAKE2B e3dfc9f4bea741e4d70c9c093604114b76bdeb135978005676a706852e6e5d5592474694db6199cf05d5837e3dcf1a5cbf696ee32809cd5a3b99a35b7302e7bd SHA512 47bb7c2d3fd9a7cd8322bd3e3d6ebbb05782d0a5a9a8151fbf0b1baa4427e8a4682f3d94d00e150c6ee738eb1c50e6ef6b1c6061321623410162374b00a24293
 MISC metadata.xml 324 BLAKE2B cfd3b05583ab0f14acf1057ac34124525ffd63c1855689ac19fb10fa9f998f477d1c070226c9e5798dd68c8629b2564e2112d24f38306a0f3958526179c4caf5 SHA512 616fe24d7cf8c1e1c52add7d9a8fc15d6e41cf20c116e73997b1e3a732110f6305e5ec50de9a4be75d58c588f55da30980bbdcbd65078c05a6da0dccd89cb36d
diff --git a/dev-python/contextlib2/contextlib2-0.5.5.ebuild b/dev-python/contextlib2/contextlib2-0.5.5.ebuild
index df30dab09b42..471c5d88c7b1 100644
--- a/dev-python/contextlib2/contextlib2-0.5.5.ebuild
+++ b/dev-python/contextlib2/contextlib2-0.5.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # 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="PSF-2.4"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 hppa ia64 ~mips ppc ppc64 sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc ~x86"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-python/eventlet/Manifest b/dev-python/eventlet/Manifest
index 6a63d717b385..994d6d05c49d 100644
--- a/dev-python/eventlet/Manifest
+++ b/dev-python/eventlet/Manifest
@@ -1,5 +1,9 @@
+DIST eventlet-0.18.4.tar.gz 288920 BLAKE2B 497b5e154de495049e477ab54660fa4e5af978c5a2d4a8faa566a965ccbbc017aaf9fc14df6e763191ad2daac70c859b935bce6cc73c6c097bcadd507d738f55 SHA512 3098f2e8649b1e10157b9474571b372176b05263a7d5e7bb915b0464551d70505bbdf77dc072f64c1c05b3011406ae4814ea1b6f746cea766bb58827b1515fcc
+DIST eventlet-0.20.0.tar.gz 466828 BLAKE2B 43beb8f924c5e375a554db3fb90e3c39121ff9899aa1a214118531e3e6fa7711899f278b2187e1e61409a58c05e9bba1a8a6392e1b31a811ef1f32dd7b929016 SHA512 4be70ba8cc3ac76d424aad66cd214e97249a42785319b992d048a77cd26f53a428f7959596d07da9a88c92ee103d73d4990733fc00bca57cc8fd242041365348
 DIST eventlet-0.20.1.tar.gz 469509 BLAKE2B 727844b70c4e1874a58efc95551dd7f12bec1c8d01cadeaedbc49f00a86e1393b690076fe720e8efdf00107f72b892a3a1f4c4921f95656b904221e748df7f09 SHA512 875c1ca82822a486bf28866c7d1f34df2419e7d33450a21740434d2e7f15c37a1090436cb7fe1feaeb5c810d39e4b238206c502323317897c8a42e844cbe7734
 DIST eventlet-0.21.0.tar.gz 484191 BLAKE2B 07d3f5d1dca11032d51fef9ceb624e07da9e93bed914233da9abbdff27f21f2482b9e3417b50a63f383cae13615c6a781104a05dfb66f28d6ab4e469bce06ef9 SHA512 4ee682ca8faf870ff6f1d72e93527028f73ae13d7f755eceafb23f3cde48e52b83ff04b645b7e90299997713de93c52f244db8b81d6abc7788a56ea38c7b0f47
+EBUILD eventlet-0.18.4.ebuild 2040 BLAKE2B dfc572598d7883689f12204c8c7cb81afe10b97f8cadfea99ca469947a0543c0a1921630d031c000de0e31ee901f314ab4e363e9d62f221413b481ef67314afb SHA512 cf2cb7035c0cd19839d3a754adeeaf49b09f79ef063cc97df902cccf926c546011543cfce7fcde6e7e1a0a10935aa85e9add6576baac9d6ceb5a244ed5dc079a
+EBUILD eventlet-0.20.0-r1.ebuild 2144 BLAKE2B 74d19fa82fa5eb26b621c0a72c561f4c5a19078088c7702e2559615bf15d331981337026804daea2103a082748ba46d4f75a58f1fd6dcc3e7a592fb997f665ff SHA512 696ecc53399848101a48319830045daffa86d8a7adfb5ab1f6d10d353d87f702bf4671bf0e579af722748ada68d0be2b0d7c7c2e282c5192ae6810b6c3f68e31
 EBUILD eventlet-0.20.1-r1.ebuild 2160 BLAKE2B 2778f81d3164fca874f040b62c64f7bb40e5891b69ce8850fcdfd7864c75779e90bdd72c3226e022df1b71f4b944ab3ed17a1f76af55e3ea3f654a4af849ba64 SHA512 de3ea57285a9ddb5374cff54fb9c6f0c82bb47fe7280d7d63d24181212997d46391f0b49ef9e18fc7a33493509678571eac989d1067760c52f1c8c1bcad2ca88
 EBUILD eventlet-0.21.0-r1.ebuild 2162 BLAKE2B 96c5c365c094f656794eecb8676e9b431d398d0935bb974248051e325bbfbfacf8e37eb6c8eafb5903d7270454ef7e23ad89f1c6c418ae7a8d34e11185437e4e SHA512 c297755f8541b1eca3937c8688013de5328319426ba732916a3ee1532579800e0d74735532f3788bc1ea6e66d9dcfec6a8663898e1e93fb35cdcbed37f547d99
 MISC metadata.xml 380 BLAKE2B abdf12718464c834d63994ad012a6d47279fa6f0e5cb0d075bfbbf24167438220ec9681eac874c93dc3abd9c1498a1a7f658a622f8ebe764cb6803b1b2bb4561 SHA512 8100edfde1885122848aa543b99bbc8529b9dc2aeea3b7efb74a3d1e8e01bdd2110e4cdce2c4ddeab9fd0182f193118e876843a61a25e17355d0916d50331daa
diff --git a/dev-python/eventlet/eventlet-0.18.4.ebuild b/dev-python/eventlet/eventlet-0.18.4.ebuild
new file mode 100644
index 000000000000..4b00621ad223
--- /dev/null
+++ b/dev-python/eventlet/eventlet-0.18.4.ebuild
@@ -0,0 +1,63 @@
+# 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="Highly concurrent networking library"
+HOMEPAGE="https://pypi.python.org/pypi/eventlet https://github.com/eventlet/eventlet/"
+SRC_URI="mirror://pypi/e/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="doc examples test"
+
+RDEPEND=">=dev-python/greenlet-0.3[${PYTHON_USEDEP}]"
+DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
+		>=dev-python/python-docs-2.7.6-r1:2.7 )
+	test? ( ${RDEPEND}
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	if use doc; then
+		local PYTHON_DOC_ATOM=$(best_version --host-root dev-python/python-docs:2.7)
+		local PYTHON_DOC_VERSION="${PYTHON_DOC_ATOM#dev-python/python-docs-}"
+		local PYTHON_DOC="/usr/share/doc/python-docs-${PYTHON_DOC_VERSION}/html"
+		local PYTHON_DOC_INVENTORY="${PYTHON_DOC}/objects.inv"
+		sed -i "s|'http://docs.python.org/': None|'${PYTHON_DOC}': '${PYTHON_DOC_INVENTORY}'|" doc/conf.py || die
+	fi
+
+	if use test; then
+#		sed -i '/This is a Python 3 module/d' eventlet/green/http/__init__.py || die
+#		sed -i 's/^import/from OpenSSL import/g' eventlet/green/OpenSSL/__init__.py || die
+#		sed -i 's/^from version/from OpenSSL.version/' eventlet/green/OpenSSL/__init__.py || die
+		sed -i 's/TEST_TIMEOUT = 1/TEST_TIMEOUT = 10/' tests/__init__.py || die
+	fi
+
+	# Prevent file collisions from teestsuite
+	sed -e "s:'tests', :'tests', 'tests.*', :" -i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	# https://github.com/eventlet/eventlet/issues/152
+	use doc && emake -C doc html
+}
+
+python_test() {
+	# Several errors 1 failure
+	# https://github.com/eventlet/eventlet/issues/151
+	nosetests tests || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/eventlet/eventlet-0.20.0-r1.ebuild b/dev-python/eventlet/eventlet-0.20.0-r1.ebuild
new file mode 100644
index 000000000000..b0366da9f319
--- /dev/null
+++ b/dev-python/eventlet/eventlet-0.20.0-r1.ebuild
@@ -0,0 +1,67 @@
+# 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="Highly concurrent networking library"
+HOMEPAGE="https://pypi.python.org/pypi/eventlet https://github.com/eventlet/eventlet/"
+SRC_URI="mirror://pypi/e/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc examples test"
+
+RDEPEND="virtual/python-enum34
+	>=dev-python/greenlet-0.3[${PYTHON_USEDEP}]"
+DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
+		>=dev-python/python-docs-2.7.6-r1:2.7 )
+	test? ( ${RDEPEND}
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	# provided by virtual/python-enum34
+	sed -i '/enum-compat/d' setup.py || die
+
+	if use doc; then
+		local PYTHON_DOC_ATOM=$(best_version --host-root dev-python/python-docs:2.7)
+		local PYTHON_DOC_VERSION="${PYTHON_DOC_ATOM#dev-python/python-docs-}"
+		local PYTHON_DOC="/usr/share/doc/python-docs-${PYTHON_DOC_VERSION}/html"
+		local PYTHON_DOC_INVENTORY="${PYTHON_DOC}/objects.inv"
+		sed -i "s|'http://docs.python.org/': None|'${PYTHON_DOC}': '${PYTHON_DOC_INVENTORY}'|" doc/conf.py || die
+	fi
+
+	if use test; then
+#		sed -i '/This is a Python 3 module/d' eventlet/green/http/__init__.py || die
+#		sed -i 's/^import/from OpenSSL import/g' eventlet/green/OpenSSL/__init__.py || die
+#		sed -i 's/^from version/from OpenSSL.version/' eventlet/green/OpenSSL/__init__.py || die
+		sed -i 's/TEST_TIMEOUT = 1/TEST_TIMEOUT = 10/' tests/__init__.py || die
+	fi
+
+	# Prevent file collisions from teestsuite
+	sed -e "s:'tests', :'tests', 'tests.*', :" -i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	# https://github.com/eventlet/eventlet/issues/152
+	use doc && emake -C doc html
+}
+
+python_test() {
+	# Several errors 1 failure
+	# https://github.com/eventlet/eventlet/issues/151
+	nosetests tests || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/html2text/Manifest b/dev-python/html2text/Manifest
index 9d0df76e8816..0309874f75f2 100644
--- a/dev-python/html2text/Manifest
+++ b/dev-python/html2text/Manifest
@@ -1,5 +1,5 @@
 DIST html2text-2016.5.29.tar.gz 46879 BLAKE2B 0e7ccae7ae4d90fb202d9fdb8edd81f74b204f81c2410f345eb923fe610f61fab6ba71bcc95138fb3706ee51007a2c72c76497cee48818032934e7f809fd46ae SHA512 58b71fda6ea6fd1a71dec757c91cf342265a2c89ff5c45e752436068419fb6c1faa1ca0d5a6baafaaa60186a85aefdd840989177ce30e55bcda1c6209fc375be
 DIST html2text-2017.10.4.tar.gz 50527 BLAKE2B 96b7060761a629cf4313104323517c4a9070aabfa02be43e80c89b56b92329785817abc7ab9fef4a8537cbde4a797926d3c1d444c11f3db6112074a31d8a8e61 SHA512 c7f9b765572b5eac72837aa757f0be07df0270b49f9b3a3ec8c3c65ff929505166b0510c106116ffdca484b56120b6c162f86b600d88a5a35e86d06cd6b6fa19
 EBUILD html2text-2016.5.29.ebuild 959 BLAKE2B e505909351f72a318d9fa566907ad91bc25e3ad43d3ecc1d5a1ad7db852ae386409bba2a111700365f9b55c8ac987af196ff8168343395d346bfa6253faff7c0 SHA512 758d2bfc792069c5ee9ed436f81861e9173e39865e0ab3c8ffe74d78a4c7cac983772177ae6e11103e073dfd86389a34243e97bf8310694a592b1cb32bb1dae5
-EBUILD html2text-2017.10.4.ebuild 932 BLAKE2B b81b383edb4ff9c9256e82e51ec972f4cd1e9ab9a96c4a913d203202f09ef04fad14a71760f8499086dc812afc40a5aa4858c89c8590a6b215101d65b5d292e7 SHA512 3e4e0ded8806868b1af581dcf21d5eb74427b774a729cc39b955307ac59d6b8c107d63a429df6ded169c89e21a53f173ecc2f800a9c2544992c2a2e1ac297168
+EBUILD html2text-2017.10.4.ebuild 939 BLAKE2B 5dee445f07f36cf0c42cef023791dd1788599882bb2a5c50369765ff3b987226ff3abf4f7b925c7b19769c6467340393a5d81515326f9facb4547bab604aa0b1 SHA512 2ae7fc12f84b5f9792274213d3865f53d5270a2160294b25a48d0da1bdbf5dc9d7ea5b7aa3689369e72d882ae4b79cdb4f567990e4ae907b986b7ae135ea9663
 MISC metadata.xml 332 BLAKE2B 2df3c377697f219f255f69968f31426f716334507a858fc4ea27f0dcb09ab1f7b2d98d4da2760c94ced1747ad908896a6c7c6cc1cd89fb5877707b14e37f825d SHA512 2fea207556f26e64296d5804463e561410aff69312cf947dfb2eceee8c664980d86cbdb6b062a0457953e16018cb0304771311a3313056efe0183a85c8b2d5fc
diff --git a/dev-python/html2text/html2text-2017.10.4.ebuild b/dev-python/html2text/html2text-2017.10.4.ebuild
index 9eee8c70ea91..45203c6e8c70 100644
--- a/dev-python/html2text/html2text-2017.10.4.ebuild
+++ b/dev-python/html2text/html2text-2017.10.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/Alir3z4/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 
 CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="${CDEPEND}
diff --git a/dev-python/keyring/Manifest b/dev-python/keyring/Manifest
index b1760ef06137..684810ade5d8 100644
--- a/dev-python/keyring/Manifest
+++ b/dev-python/keyring/Manifest
@@ -2,8 +2,10 @@ DIST keyring-10.3.3.tar.gz 39531 BLAKE2B cb1f790ab13e30a3cbcb101bbfee0dd3b9b6474
 DIST keyring-10.4.0.tar.gz 39632 BLAKE2B c284c42b46ed07b8e7aa6d3cd609887afd7bc890a3390274c719003cca70ddfc9fa8ae3a88d314d1d33e690e8a80718434b608105335beccf0858abad9a5d28e SHA512 34b1503588fedd480b2031d5557349bc6cd70108e68205a38338e091d2865df512f9a9aa3525fb11fbbb9bc06b2cfa759685495ca94b4044ec034070aa3dc0bb
 DIST keyring-10.5.0.tar.gz 40664 BLAKE2B 6a556ccf6819729e68700b58583b9a92c6785100d8f30130bb3778ad74085fcab9cfa4eca3c381ecabedff397649b9dd2d50c8c6a4d6d6c1e22d34b7ac813056 SHA512 da1cd064ae896458b1bfc6906a3d40abaa45b6e69f5760fb87d7f7176eab2c909515bbf6e3f01ecd821e340fd1f967ef2aed02053d4211e87533ea4fd6b4e08c
 DIST keyring-10.5.1.tar.gz 40755 BLAKE2B 0a4914a0f07ac898487258c8ae700ccc6883aea8581d58b3802d971f6079a646fe45467562ac752d965ff39c8b68f7fdbf5daec7f947bf88e6bca6ddb09393a6 SHA512 2e18487c061d67b866390e4f2f740ceb281b75e9ead01c00e2851aec9f56cffb6268334b35d64b498eaa719639fceceb29cf6adf46c6930e3506c04f672e897c
+DIST keyring-10.6.0.tar.gz 40782 BLAKE2B acd327711a8f7deb08d172000294d5f104e2d01b65dc7412fa8ceec1c24405206982af04e75da0dfdb7a224a4f8c9ad6f8d5f37106e68eb1add637d7d5027c4f SHA512 56e9c11ac6d50d22ca74f6d677eb24da876a27c84501d8be4ad0cee44356a67213a7d255e0fdab1343411b75b55e9ab50210d0ae95879ae9f3acb8cbe73f9848
 EBUILD keyring-10.3.3.ebuild 761 BLAKE2B ec1f8073c9a930db5fac94b2bb69c58753cfc42f4dbd148a8de4a5ddef4b5a43fc414f3b65a7c847650bfb52368175a67c7916f0f860853c5eb05ff5133b6afb SHA512 09240d0c2463587ec9656e61e2db74d7efcd2c79fa8bc9428e191e0220cc4edde49092fef638ec74abdf924daeb6c5420b8e28d15e4e34972f7feecc19c3fe9a
 EBUILD keyring-10.4.0.ebuild 880 BLAKE2B 8ffb9aa55b279716aab789f14cb76dd3f6fdad0b37dbc54eb04383dbe22e2a2d4bfdcc840e12ed44a09c87b4c23b36722a4067fa41c830352452bf4ff02352af SHA512 a6d152bc4446e1a4d37e152c2bb1011ce7225c2fd3609533b73abf33bed6f18a5a0f38dbecf765e91f40cdf47fe126e34bf6c4730b926cc3c3bc21978847a802
 EBUILD keyring-10.5.0.ebuild 932 BLAKE2B e3106520824b8b325d519f71353ca31d46d0f522cb5ff6d11cab88185e4dd9d4005e2b939ef9dcef4f2a91a097e5bf5749f8095a5145decd4d296cf93ee7af43 SHA512 0343f6b0fafa81dde6771476a63f6262a275be55322e177f12b19fe2b414ab2a8545b670852d6c2738f9269b8ef63f80880d9564882c6ff8525d45ec0f3c3792
 EBUILD keyring-10.5.1.ebuild 934 BLAKE2B 3d8229ca9a57e8a9413871d68d6153d33b294d476e8f56e50a9ee63c54e00a6ba8224a57d89fb518cb55be2596a61fa09197b6816fc8a6e3de5d5da9218a4d36 SHA512 c3a3870be3dc46da5733db046740f735bdf6a0808335371ab29c32566143bb4fb7e9ab90846204a727a3aa4c783ab16c40a8aa7416f9ddd03c007de30af79a23
+EBUILD keyring-10.6.0.ebuild 934 BLAKE2B a5a350c2c92d166b9a4b2789b9a47cad5fa16dec5384dc2e6e38da2a50a7d240131d61563276b36c545c93deebec1ed3977612cb05554a5b664482a172696990 SHA512 cbd0df38056c13d8e0b18c78768f291ced0887a8619d7c3323136b0359e8d5db82accc62bde2090e4f1b39f2cd429c92e71c5a2ea01944710cd30f3e9f9021ee
 MISC metadata.xml 672 BLAKE2B dc2296acdb196c85c9cd2c2badc6ee991258e43f340576990610fb975837dd9e24c0f2aee0d24c6b8e79e17436719b17e5ef3a4d9c356b08ecc5f33881cff2bc SHA512 19e907e069f6e6092791babdd8b914791d1c52c32187747edc127ce4c80ecad2da1edcdf6e6387c15f9c2b041767b9072668197087afc3644b7713837d5f2ac9
diff --git a/dev-python/keyring/keyring-10.6.0.ebuild b/dev-python/keyring/keyring-10.6.0.ebuild
new file mode 100644
index 000000000000..b72d4c521d08
--- /dev/null
+++ b/dev-python/keyring/keyring-10.6.0.ebuild
@@ -0,0 +1,38 @@
+# 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="Provides access to the system keyring service"
+HOMEPAGE="https://github.com/jaraco/keyring"
+SRC_URI="mirror://pypi/k/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="PSF-2"
+KEYWORDS="~arm ~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+	dev-python/secretstorage[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+		dev-python/collective-checkdocs[${PYTHON_USEDEP}]
+	)"
+RDEPEND=""
+
+src_unpack() {
+	unpack $A
+	# This is an interactive test.
+	rm -f "${S}"/keyring/tests/backends/test_kwallet.py
+}
+
+python_test() {
+	py.test -v -v || die "testsuite failed under ${EPYTHON}"
+}
diff --git a/dev-python/os-brick/Manifest b/dev-python/os-brick/Manifest
index 60adb410255b..d22ffbc74c43 100644
--- a/dev-python/os-brick/Manifest
+++ b/dev-python/os-brick/Manifest
@@ -1,5 +1,7 @@
 DIST os-brick-1.11.0.tar.gz 140220 BLAKE2B b67dd7222f16136f561caaba3344b2e721a1038afd39e1786a22541bfa42ca137ed60411d4a161aa57e1467b3451a92a3b3d3b05c025ab797fce2dac63345e9e SHA512 69eeaa6b1fec9732e07ad2527fec2e624ed352bc18fe6d96546e787869d3d388113bea378e64a1d346be2dcd93eb8f69f94655f0fa8d9230fa8fc8e9a1e48847
 DIST os-brick-1.15.4.tar.gz 161212 BLAKE2B ffe1fb1965b097a2ceff19dccbc473e79692d700a57024b38b93b16eb12e727755236b3914efcb656b6cbee5fc4c31ec2d2588182391bd84dd2e47980906c067 SHA512 9e13e1d562eb62ef393c531dff27d7d2623f9843deb991fb1be74a42bb5e558875d7195c1499f147426734bad3c4b3907c65f036ffa65f23ab6585d206bed696
+DIST os-brick-1.15.5.tar.gz 161371 BLAKE2B 0fdfb5978cb1d1ca635d64f98b75210b03353c033affd9834294c4d505a0d9e580f0f829a5e5c96fdb53f1cf2a29ba63ded6fbba4ae662a5dad0d20fdf98356b SHA512 c73c0f227e68aeba80b6b5687fc876e7dfe3ba36a800b7241ed08a0f189e0a57adfdf3b3e1f63230514ddac848be84e1f05e6be6aa0f50412695c6d37124717d
 EBUILD os-brick-1.11.0.ebuild 1407 BLAKE2B 09f0d998a887f252a7207453c4e8f5c86ee6ffb2b4b504a4fb8972c197c7a381b37b0ce2a3fe98970f243fc36f0cf3e8c50cf7d9cda1cd898dbc0850ae1b2d16 SHA512 b4d4f88a23981167a261796ac783333b15ad3462f735b30d76e2d6c6505a57bc4f79cc817b32750a14de6cd2a7480b294f9efb530508a11ae7aa95e3fb9814f1
 EBUILD os-brick-1.15.4.ebuild 1636 BLAKE2B 193234b7ef8f9c843b0f188350ad153e346868d4fae17b3969711e2caaa919f6457e0ecea218cea2ce61d253db39738bbe738c3e7b9a53a502875abe76cc08b1 SHA512 126de6913d114e6b0c103716489c5931ba2b3fb7475dedc5687e30416a425b40111539a08a90c1583e21807fdfd668a13d4a67eda1e0fb787c4458a7f2d3538c
+EBUILD os-brick-1.15.5.ebuild 1638 BLAKE2B 00a1fdeab7dec59cb42345ca78eac409ec7c8c891971cf5fcdaca9845e33d13445e75d996933206590138e0df023d7dd05a469d635fd92376e710ef0eeabf189 SHA512 ba312e2bf07612d2d5075013d6a044468591dcf9c9f15841f35a33ba65d28c17e9813c949ed27059f1a53b9b5c7c31f4c377027d0393ae78376c30439b179d86
 MISC metadata.xml 381 BLAKE2B 6d5a168e81b27c1e9a5ada920a182616c150d5f5ca204e334067f4bcce2878b19152810391d0506b9e4bf1dd287bc56fda035d576c5fee64a9ff2fecfb7b39c3 SHA512 b3cdc328f38ade8cd2ebb44c533ec0c79fbd1c187999bcf6c9c04104ba7c29136f0a0d6d57016aa6c7b607e66bfc511eaeff90c6d1a9708c494f4358b324f3b9
diff --git a/dev-python/os-brick/os-brick-1.15.5.ebuild b/dev-python/os-brick/os-brick-1.15.5.ebuild
new file mode 100644
index 000000000000..d9c9a8407b0b
--- /dev/null
+++ b/dev-python/os-brick/os-brick-1.15.5.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=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="OpenStack Cinder brick library for managing local volume attaches"
+HOMEPAGE="https://github.com/openstack/cinder"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-1.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-i18n-3.15.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-privsep-1.9.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-privsep-1.17.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
+	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/os-win-2.0.0[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/oslo-log/Manifest b/dev-python/oslo-log/Manifest
index eb5591664ff0..07944d4f5519 100644
--- a/dev-python/oslo-log/Manifest
+++ b/dev-python/oslo-log/Manifest
@@ -1,3 +1,5 @@
 DIST oslo.log-3.30.1.tar.gz 78884 BLAKE2B d45e6d2e02877f9d913e449d8f4cd08e271712e96faf1d47ea534319f3af073e122d2910977b8cfe28f683786bf645beb335fc6d5d0400058e11a8a31941a769 SHA512 0a53a3228ccb00a58c02577ec391ada064c17999d51fcd3e6471a46d601473c5ab5686cfd61d11ebb33a594dd5845317920fdce3ca48283a39dec28f1a23b795
+DIST oslo.log-3.30.2.tar.gz 78807 BLAKE2B d2042a185daed8aedd2f3ff7ef1a5a47b730b1a79c05e73aba60a635a459f1f683d27e422568f1798713e0d095863bbdb0580a4a6f8263c1f47a6055aa1f81ab SHA512 c4e7b9f5c7a3d813ea816b06cea58cc1d8908f4914bf3221f564c65bb8998e4fed7df96faa54d69782e5ce43258339f32330b12f51b4a4cdb9bfdd5aa092e7a6
 EBUILD oslo-log-3.30.1.ebuild 2209 BLAKE2B b5323391e0c490ff5b3e1230a6df69a26f45a9e9caf759ff03a6b8f9ef623b261bde98dc90c0a577a30e9f419999b4403fc3dfebb3080d9b3b6a6f994649cbbb SHA512 50ad442ad63f6a9f10cc9770ab8b4b89486420d21d7f6fdb3370287ad6d33279d676a377a55b6c7e9ea1a9f5b20d7c44ed2201c821caae3ad31b0487921cba5d
+EBUILD oslo-log-3.30.2.ebuild 2211 BLAKE2B 734961bf7ea8594e5d66c9f5754c517f5effb7f23db175addb5c10c4cc85d237bc0557d7b2ba87f5e1f2301d12816f4c417653b0db7faa982a405389cc2ea3c5 SHA512 66f9084ffd310545fc59626ed75b6725e0621d257359745ecae2c981b6f14c4bc525168757623b8670ce758c27fe1a8ee7a2ab1bf7127d6fa7fa2d5d96e2c031
 MISC metadata.xml 882 BLAKE2B 4d0b8744bc619081ffbeea3099c745d07f12de450dccbe6dd4ddb58ee6aa87c7269cdbc2bf6daac36b5a4000e5fdb94ef056a7cd0c7557d4d909359392a2ed72 SHA512 89df6a639f1b44eccb4409c95237f3b4841312b74e74d315a169b7c6faa8a457507b7c085ebbef56b8e399cf37b27ff02474491a128880e919866a6da01a084e
diff --git a/dev-python/oslo-log/oslo-log-3.30.2.ebuild b/dev-python/oslo-log/oslo-log-3.30.2.ebuild
new file mode 100644
index 000000000000..5eec2386e530
--- /dev/null
+++ b/dev-python/oslo-log/oslo-log-3.30.2.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=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="OpenStack logging config library, configuration for all openstack projects."
+HOMEPAGE="https://pypi.python.org/pypi/oslo.log https://github.com/openstack/oslo.log"
+SRC_URI="mirror://pypi/o/oslo.log/oslo.log-${PV}.tar.gz"
+S="${WORKDIR}/oslo.log-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-4.0.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-4.3.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-4.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.14.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-1.19.1[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/pyinotify-0.9.6[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
+	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]"
+DEPEND="
+	${CDEPEND}
+	test? ( ${RDEPEND}
+		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.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/sphinx-1.6.2[${PYTHON_USEDEP}]
+		>=dev-python/openstackdocstheme-1.16.0[${PYTHON_USEDEP}]
+		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
+		!~dev-python/reno-2.3.1[${PYTHON_USEDEP}]
+		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests oslo_log/tests || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/oslo-serialization/Manifest b/dev-python/oslo-serialization/Manifest
index 13287dad7439..5d1b58d73f17 100644
--- a/dev-python/oslo-serialization/Manifest
+++ b/dev-python/oslo-serialization/Manifest
@@ -1,5 +1,7 @@
 DIST oslo-serialization-2.16.1.tar.gz 28733 BLAKE2B 7c2b776d1fc9ac249ca6200e13356984fbabaf66fc9f6f3d0418a39b213f4b67550cbad505508582f3a002a3e65d5ce031184404df697f152c627021b15d93b2 SHA512 36e162c8f93d064d103052eb8295de7753ac9739f6c9c9f8d048090f5f2663f643f69507d9c47b9fd6142f5ba14d1eeb49120119cce5c6e60cbe09248e8f5a1d
 DIST oslo-serialization-2.20.1.tar.gz 28701 BLAKE2B c854f6add39d7a995469faeccb9da63f12741b529143fb5d6e796b7534c58c1cc509ac18b8fac5ca73d4114c80558c42452acd6f4ce896e564d8074140b75c2c SHA512 4844544df91a529744cb8e869592e77fd9bb8bd26ff7b13ee4a37d9b9c31c181205663f98ee4795cb0e593b029744293aa029cc5ffa67851f4a27d27a6cae298
+DIST oslo-serialization-2.20.2.tar.gz 29486 BLAKE2B 73fda86ced11c7c6dfb1a15c761645583cee463521285dc194cc1aebd5ef100832190bb0b07f825472286dab8ffc4dbed5cf6183fd86128bd74d51c5d15996a8 SHA512 1bcf50a090a0ec74d1aca7de6cc83f7451778eae7335427d11f732120ec99163441ee0bde13df6e660574c7ac5fcafe746cdbcb421e57f02d782f2405d5e33c7
 EBUILD oslo-serialization-2.16.1.ebuild 1937 BLAKE2B 6bc59ae526e9e3d0059fd0b13c4b08b14d5aa854d09bc7ddfa55816d3a5c191a0c9c0bb6ad23dc9f6f6cdafb863c807ad118169a283019fd6834f0163c40125f SHA512 ecae4ed604c659001c8ab3c48b3af0d003510c1a8dac526be5c4e939a032331f665579ee989bb643f5ba6f6976c2def43e1aed1c431925344c35160cf8df755e
 EBUILD oslo-serialization-2.20.1.ebuild 2040 BLAKE2B ee5499b2a8801af8608153998641b6bcbed64735f51461bde750f4c6842625c1e1c48d02972db31853720477ba150e48ec97384259530ebf54f68fb6e9c940df SHA512 27e2caa11cdddce256e2f2daaede5c408a88831ddbb0b3ec107f9a65b5648da79576a64220f3a4adf60ea3157a2c0bb837780626e1933058f5465fa42d115be4
+EBUILD oslo-serialization-2.20.2.ebuild 2042 BLAKE2B e271762e9ef1047970b42f702232758635b61cd8baedd9bd5a389face2bdf294fb59c3a353f629a075cc175183efa125be1210fc36b07427263d40dd1cf1cfec SHA512 f99b37fd2563784409426e4b02411e832dd451c619793cd3fd1ffe4cf7833a3dbfd139d993d3bfb57e37a145c87f8ccc0d4695e4d8c0570ac045ef6d041887b5
 MISC metadata.xml 481 BLAKE2B 90f53fcdeb1a61f964745333fd7edd154ee61b05382b6c0a1aa54e78d7486cdce6757fc54c01a1ba2c7d9362f0ddf1045bf77dcc76036b995b1e0f0ed8e9b7c7 SHA512 41eb0d120210769caf9bc59d2ca53d136ec6dafb8e4eeb0dff126eacee1029d49ce18d85b6b19749a590579f63ffffe4c9d69919443c59c36b133d60629a6815
diff --git a/dev-python/oslo-serialization/oslo-serialization-2.20.2.ebuild b/dev-python/oslo-serialization/oslo-serialization-2.20.2.ebuild
new file mode 100644
index 000000000000..156e394f611b
--- /dev/null
+++ b/dev-python/oslo-serialization/oslo-serialization-2.20.2.ebuild
@@ -0,0 +1,76 @@
+# 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 Serialization library"
+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"
+IUSE="doc test"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		virtual/python-ipaddress[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/netaddr-0.7.13[${PYTHON_USEDEP}]
+		!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
+		>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+		!~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
+		>=dev-python/openstackdocstheme-1.16.0[${PYTHON_USEDEP}]
+		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
+		!~dev-python/reno-2.3.1[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	use doc && esetup.py build_sphinx
+	distutils-r1_python_prepare_all
+}
+
+# Note: Tests fail due to requiring installation.
+#
+# Installation appears to fail due ot the use of namespace packages but root
+# cause was never truly established.
+RESTRICT="test"
+
+python_test() {
+	distutils_install_for_testing
+
+	PYTHONPATH="${TEST_DIR}/lib:${PYTHONPATH}"
+
+	rm -rf .testrepository || die "couldn't 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/py-cpuinfo/Manifest b/dev-python/py-cpuinfo/Manifest
index 210916666d8f..803a3196bcdf 100644
--- a/dev-python/py-cpuinfo/Manifest
+++ b/dev-python/py-cpuinfo/Manifest
@@ -1,3 +1,5 @@
 DIST py-cpuinfo-3.2.0.tar.gz 76019 BLAKE2B 2a0969911b385e51ead94a92b89a21bf6ebd6a49ce5229329265ec0611fabe1180cf4ac617c1786ab25605fbf11463e85d74a02195cf01ebc40a5f8d1350f83a SHA512 737d5a73d6991ce5cb99125951a75492f48177030986270bbe7dcc0efb4e3200c9957bfbe51bd5a7555bfa8e62db68c3a5227e47e5e6bb2115ff2c10c0bfb688
-EBUILD py-cpuinfo-3.2.0.ebuild 610 BLAKE2B 4335fb4b30db1f802976e607fd371fb6189a7a582bc730ba14e186e4c4c66d77783b84167994fab2c6d2c5fc48e7bfeb1e3a05c61b20f6de37893242145d5d19 SHA512 4a39799e73050b870b32a2276d8cf7a7f038053121a616868104d09f97afc388f644470dfee8ff90d1dcf42c6279ed52377310fc187d7319fedbd4bf078da488
+DIST py-cpuinfo-3.3.0.tar.gz 76052 BLAKE2B ffa9d53ccca034b8b4707cc60c8c38b66bd76101e4c6c8d8bf5de743904270a4b9236c0f03192336c2fb32fefb665c5a6d5587639a408ff0bb9183b33f9c3ce7 SHA512 b31ebfb0f066303813d699a7aa5bd5b8d4e0b3b6e8422dfb4aa53c5b64d2234c5275fc293b3eb3ee72752691e023dc94fc013ccf6a0251d307c4b10619135524
+EBUILD py-cpuinfo-3.2.0.ebuild 610 BLAKE2B 5dfa714a166e7a79417b4850f91e3fd77d68b0eecef8002a8dbe9b119fa63ec3dcd9f2fd61fab11e4e79a7cb3e04cc855013d058a95146e5408d8fac6a468d0c SHA512 a0b5af5d2ebddf322c832e76ee45782ed6ce5d33fd27910dde17642c31fae67903323f9d75d0fad3b9fb32b9df599c82c763be0b7dee2575c77763d88e044789
+EBUILD py-cpuinfo-3.3.0.ebuild 610 BLAKE2B 5dfa714a166e7a79417b4850f91e3fd77d68b0eecef8002a8dbe9b119fa63ec3dcd9f2fd61fab11e4e79a7cb3e04cc855013d058a95146e5408d8fac6a468d0c SHA512 a0b5af5d2ebddf322c832e76ee45782ed6ce5d33fd27910dde17642c31fae67903323f9d75d0fad3b9fb32b9df599c82c763be0b7dee2575c77763d88e044789
 MISC metadata.xml 531 BLAKE2B ae246808bbc91d82d4d635474be548d3a3e5d48cf45dadfe17e13c6b3e766871106c329a1e478ce7f65478cba17bc28673b459c83b6bbe779891a7f86d605ce0 SHA512 388ada1a9c39b57369dfc9f164530a871801149d44a1439679509fc733b90f33256e8f9a5b5ef22af854e5aaa7c9e1857e87943f25f0c4e06eff2c6b64d440d4
diff --git a/dev-python/py-cpuinfo/py-cpuinfo-3.2.0.ebuild b/dev-python/py-cpuinfo/py-cpuinfo-3.2.0.ebuild
index f82e66ada297..308eee31c506 100644
--- a/dev-python/py-cpuinfo/py-cpuinfo-3.2.0.ebuild
+++ b/dev-python/py-cpuinfo/py-cpuinfo-3.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,8 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Get CPU info with pure Python 2 & 3"
-HOMEPAGE="https://github.com/workhorsy/py-cpuinfo
-	http://pypi.python.org/pypi/py-cpuinfo"
+HOMEPAGE="https://github.com/workhorsy/py-cpuinfo https://pypi.python.org/pypi/py-cpuinfo"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/py-cpuinfo/py-cpuinfo-3.3.0.ebuild b/dev-python/py-cpuinfo/py-cpuinfo-3.3.0.ebuild
new file mode 100644
index 000000000000..308eee31c506
--- /dev/null
+++ b/dev-python/py-cpuinfo/py-cpuinfo-3.3.0.ebuild
@@ -0,0 +1,27 @@
+# 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}} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Get CPU info with pure Python 2 & 3"
+HOMEPAGE="https://github.com/workhorsy/py-cpuinfo https://pypi.python.org/pypi/py-cpuinfo"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+DOCS=( ChangeLog )
+
+python_test() {
+	"${PYTHON}" test_suite.py -v || die
+}
diff --git a/dev-python/pypy-bin/Manifest b/dev-python/pypy-bin/Manifest
index cf57634fb310..59cede4c87d0 100644
--- a/dev-python/pypy-bin/Manifest
+++ b/dev-python/pypy-bin/Manifest
@@ -24,6 +24,6 @@ DIST pypy-bin-5.9.0-x86+bzip2+ncurses.tar.lz 6261498 BLAKE2B 7d0dace223ae6793ca1
 DIST pypy2-v5.10.0-src.tar.bz2 19181430 BLAKE2B 4a0808c74fb167a7e98625f1d5b8559bb3a0383445387a0c48f951d75d009c57806eb600a141a84a7cb800e2f53fe091367cbb0b23192bc52b995cb65246c076 SHA512 11892418d753ddc59e928a5f59b3406b7c22b8689ad6995eeb183182dbb5184117e68bb567c770ffa60a14d6763550d658e260584e65da5025ed481f48501379
 DIST pypy2-v5.9.0-src.tar.bz2 19175394 BLAKE2B 0d5fa0d013d8cdb9765bf0f535877894d7a3544c19481973f788187251d1bd2ba11f88950430e85c7608ea394cc952ae7dd7275b9843397ab098e153cf96ec7f SHA512 3170747e81088043c6a4885bd0bc92e911556420b6c2539a4ed7e62956f1c741651f772def0fb00d8826a1bef9d6f4e79a13682a4456a31d987f7c9bd8608a4d
 DIST python-gentoo-patches-2.7.14-0.tar.xz 13428 BLAKE2B 0048e48ddaaa4bef08451354fde95a123042880f26dddc9267c7f9a90fd8abb40955e26ee8c9dfc5a1165556bb3e11585b27288e635d42a4000dd3d7654c41ad SHA512 6da5b52065752b54e9215d0f0809c75167dc3690d0e94fa21dd7595626925bc5c1dd065d31b3bd696d7087f3986de145d3a335a29eb7bd77442637a7ec2863c1
-EBUILD pypy-bin-5.10.0.ebuild 6224 BLAKE2B ab65602ada1b7b10f4f8516a6db8ba99058b62a0c2bd7743a19d9978a2af4331190b3e5d40b96a1fd38833f355a1c2d7b69ba733358759b924262a858e26fdaf SHA512 12ca960476b14ae81b2f21e7a603c48ab70e1cfebcef23fb016dfb6b6735321bab883ceeeebb24585dd6decf8217cd941276f2de22160665261c1eb5e12a0d47
+EBUILD pypy-bin-5.10.0.ebuild 5951 BLAKE2B 08ab9100162de3469727fb08a057d209e3809432e1fde15487f66f97073eff91145da0adeb961f5efb0e045b12a7af892966a121294f0ed6ae4119fedf5ff314 SHA512 9a6672f5702b3858353ed6c53222f427962754d72293f87e0e768806d2624539b48957c02e68cedb292de93e337721deffe2cba121f720ba0a6fde8c6e0bf92e
 EBUILD pypy-bin-5.9.0-r2.ebuild 6224 BLAKE2B ab65602ada1b7b10f4f8516a6db8ba99058b62a0c2bd7743a19d9978a2af4331190b3e5d40b96a1fd38833f355a1c2d7b69ba733358759b924262a858e26fdaf SHA512 12ca960476b14ae81b2f21e7a603c48ab70e1cfebcef23fb016dfb6b6735321bab883ceeeebb24585dd6decf8217cd941276f2de22160665261c1eb5e12a0d47
 MISC metadata.xml 317 BLAKE2B d7be288f31d09754073e991e0f753e673e47fe1698408d13ce01dd58aa458e9ff9894973b27a293e426c074fbafaf5ca784fdbae0c784c1a5bf5d51bad1abd21 SHA512 65d1795605d0120c94911b2c295d8da13e01f9ac6b0750a7d536be64bf5244e20e2bb7286b33e75346e0dea333dc8970c4dcf0e98842e28f5a202ee2ddbba294
diff --git a/dev-python/pypy-bin/pypy-bin-5.10.0.ebuild b/dev-python/pypy-bin/pypy-bin-5.10.0.ebuild
index 8c3b3d419da8..ef34c44ba088 100644
--- a/dev-python/pypy-bin/pypy-bin-5.10.0.ebuild
+++ b/dev-python/pypy-bin/pypy-bin-5.10.0.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 pypy )
-inherit pax-utils python-any-r1 unpacker versionator
+inherit pax-utils python-utils-r1 unpacker versionator
 
 BINHOST="https://dev.gentoo.org/~mgorny/dist/pypy-bin/${PV}"
 CPY_PATCHSET_VERSION="2.7.14-0"
@@ -52,7 +51,7 @@ LICENSE="MIT"
 # pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
 SLOT="0/41"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc gdbm +jit libressl sqlite cpu_flags_x86_sse2 test tk"
+IUSE="gdbm +jit libressl sqlite cpu_flags_x86_sse2 test tk"
 
 RDEPEND="
 	app-arch/bzip2:0/1
@@ -73,9 +72,7 @@ RDEPEND="
 	!dev-python/pypy:0"
 DEPEND="${RDEPEND}
 	app-arch/lzip
-	app-arch/xz-utils
-	doc? ( ${PYTHON_DEPS}
-		dev-python/sphinx )"
+	app-arch/xz-utils"
 
 S=${WORKDIR}/${MY_P}-src
 
@@ -83,12 +80,6 @@ QA_PREBUILT="
 	usr/lib*/pypy/pypy-c
 	usr/lib*/pypy/libpypy-c.so"
 
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		use doc && python-any-r1_pkg_setup
-	fi
-}
-
 src_prepare() {
 	eapply "${FILESDIR}/4.0.0-gentoo-path.patch"
 	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
@@ -119,8 +110,6 @@ src_compile() {
 
 	pax-mark m pypy-c libpypy-c.so
 
-	use doc && emake -C pypy/doc html
-
 	einfo "Generating caches and CFFI modules ..."
 
 	# Generate Grammar and PatternGrammar pickles.
@@ -192,9 +181,6 @@ src_install() {
 			"${ED%/}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
 	fi
 
-	# Install docs
-	use doc && dodoc -r pypy/doc/_build/html
-
 	local -x PYTHON=${ED%/}${dest}/pypy-c
 	# we can't use eclass function since PyPy is dumb and always gives
 	# paths relative to the interpreter
diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest
index d20df9eccc9a..3379058cda19 100644
--- a/dev-python/pypy/Manifest
+++ b/dev-python/pypy/Manifest
@@ -5,7 +5,7 @@ AUX 5.9.0-shared-lib.patch 826 BLAKE2B 745ad99f5fbcf63abce99104147f0169178d8409f
 DIST pypy2-v5.10.0-src.tar.bz2 19181430 BLAKE2B 4a0808c74fb167a7e98625f1d5b8559bb3a0383445387a0c48f951d75d009c57806eb600a141a84a7cb800e2f53fe091367cbb0b23192bc52b995cb65246c076 SHA512 11892418d753ddc59e928a5f59b3406b7c22b8689ad6995eeb183182dbb5184117e68bb567c770ffa60a14d6763550d658e260584e65da5025ed481f48501379
 DIST pypy2-v5.9.0-src.tar.bz2 19175394 BLAKE2B 0d5fa0d013d8cdb9765bf0f535877894d7a3544c19481973f788187251d1bd2ba11f88950430e85c7608ea394cc952ae7dd7275b9843397ab098e153cf96ec7f SHA512 3170747e81088043c6a4885bd0bc92e911556420b6c2539a4ed7e62956f1c741651f772def0fb00d8826a1bef9d6f4e79a13682a4456a31d987f7c9bd8608a4d
 DIST python-gentoo-patches-2.7.14-0.tar.xz 13428 BLAKE2B 0048e48ddaaa4bef08451354fde95a123042880f26dddc9267c7f9a90fd8abb40955e26ee8c9dfc5a1165556bb3e11585b27288e635d42a4000dd3d7654c41ad SHA512 6da5b52065752b54e9215d0f0809c75167dc3690d0e94fa21dd7595626925bc5c1dd065d31b3bd696d7087f3986de145d3a335a29eb7bd77442637a7ec2863c1
-EBUILD pypy-5.10.0.ebuild 7987 BLAKE2B bb23d3399fa7bf74d3eff1c222d2eb06f41a39ed06f340980a44130a27bd6b96bbbdf42b46c04f661f2f1ca242536b135148974d036f92e53b4f54929adbd20f SHA512 7e79e31ea5073ce5581258f6649406320afccc37b01bc83d1ee6a05d0f6980b24f8bc08b314d9394ca85f98583953f5492ffc8ee2f3aa9b92b2f93f6d4943033
+EBUILD pypy-5.10.0.ebuild 7860 BLAKE2B aef28d2f43bb879586b3988345e58d04bc624d6134491787809fd34bd35bd004ed5589684adf428601fb885879da72fd4991e82bd8b57730c67a13b5c25040e3 SHA512 7b67815c1efe03ab475d25e685c0ecf4408873986a99b9bba3d7cc067e5bbffde32b5af8ea13c3e2c2d12351fbc88123ba706cf8b49d40178cb672335f1a2b9e
 EBUILD pypy-5.9.0-r1.ebuild 7987 BLAKE2B bb23d3399fa7bf74d3eff1c222d2eb06f41a39ed06f340980a44130a27bd6b96bbbdf42b46c04f661f2f1ca242536b135148974d036f92e53b4f54929adbd20f SHA512 7e79e31ea5073ce5581258f6649406320afccc37b01bc83d1ee6a05d0f6980b24f8bc08b314d9394ca85f98583953f5492ffc8ee2f3aa9b92b2f93f6d4943033
-EBUILD pypy-9999.ebuild 7997 BLAKE2B 30affa36be13cb3ab09b22cf76b1458b421f07bc4e8279097bfa9650f67422963b624349e1710a501277da9620c6d3b2ca7fe3238b121eb25c49f0b81ef881a0 SHA512 1fced57979aa3902cf12f95e61f4bd946beec808ca78d162e2a9b19e8d7be4b58a2c7b2653c6ccbcadf813e7b34d9d31a19b342e11cdfe6ee75a6239b1a4b137
+EBUILD pypy-9999.ebuild 7870 BLAKE2B 4b7455f9ce4d640900f0bed356d8d1bb43750944685e62a96a299c18a8ec9ffc560cdd666bc2ac98dac512c87981a36e808893e492576a830394d6767926830e SHA512 a9975515dc6c9582105e829cbbbb8c50d87f22a8adaa7c4d0ba06fedeef13f3d5635912f887b958552ce6e983bdfbc6736ca340b999017e75fff346e53fd9997
 MISC metadata.xml 636 BLAKE2B da5771ec2ee59ac934959f6e72c5aee2225ee2d88e2c4c5d6acfae95b9652c973160ed0ea29f0f6143d25a249944925ef157693979871863c04a483da972bd7e SHA512 c52d59231928b12da09c2c7149afbb852ceaf1342a2747d85493c9abc15b8d68fd24495349e583aee5cea18799bd4dada3943bc523a4e18745e2036446cd0841
diff --git a/dev-python/pypy/pypy-5.10.0.ebuild b/dev-python/pypy/pypy-5.10.0.ebuild
index 7cfed8fcca3b..286b7be69e1d 100644
--- a/dev-python/pypy/pypy-5.10.0.ebuild
+++ b/dev-python/pypy/pypy-5.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,7 +19,7 @@ LICENSE="MIT"
 # pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
 SLOT="0/41"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 doc gdbm +jit libressl low-memory ncurses sandbox sqlite cpu_flags_x86_sse2 test tk"
+IUSE="bzip2 gdbm +jit libressl low-memory ncurses sandbox sqlite cpu_flags_x86_sse2 test tk"
 
 RDEPEND=">=sys-libs/zlib-1.1.3:0=
 	virtual/libffi:0=
@@ -39,7 +39,6 @@ RDEPEND=">=sys-libs/zlib-1.1.3:0=
 # don't enforce the dep on pypy with USE=low-memory since it's going
 # to cause either collisions or circular dep on itself
 DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx )
 	!low-memory? (
 		|| (
 			dev-python/pypy
@@ -188,8 +187,6 @@ src_compile() {
 	cp -p "${T}"/usession*-0/testing_1/{pypy-c,libpypy-c.so} . || die
 	pax-mark m pypy-c libpypy-c.so
 
-	use doc && emake -C pypy/doc html
-
 	einfo "Generating caches and CFFI modules ..."
 
 	# Generate Grammar and PatternGrammar pickles.
@@ -262,9 +259,6 @@ src_install() {
 			"${ED%/}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
 	fi
 
-	# Install docs
-	use doc && dodoc -r pypy/doc/_build/html
-
 	local -x PYTHON=${ED%/}${dest}/pypy-c
 	# we can't use eclass function since PyPy is dumb and always gives
 	# paths relative to the interpreter
diff --git a/dev-python/pypy/pypy-9999.ebuild b/dev-python/pypy/pypy-9999.ebuild
index fecf7b18d4e4..c0bc0a26454b 100644
--- a/dev-python/pypy/pypy-9999.ebuild
+++ b/dev-python/pypy/pypy-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,7 +20,7 @@ LICENSE="MIT"
 # pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
 SLOT="0/41"
 KEYWORDS=""
-IUSE="bzip2 doc gdbm +jit libressl low-memory ncurses sandbox sqlite cpu_flags_x86_sse2 test tk"
+IUSE="bzip2 gdbm +jit libressl low-memory ncurses sandbox sqlite cpu_flags_x86_sse2 test tk"
 
 RDEPEND=">=sys-libs/zlib-1.1.3:0=
 	virtual/libffi:0=
@@ -40,7 +40,6 @@ RDEPEND=">=sys-libs/zlib-1.1.3:0=
 # don't enforce the dep on pypy with USE=low-memory since it's going
 # to cause either collisions or circular dep on itself
 DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx )
 	!low-memory? (
 		|| (
 			dev-python/pypy
@@ -194,8 +193,6 @@ src_compile() {
 	cp -p "${T}"/usession*-0/testing_1/{pypy-c,libpypy-c.so} . || die
 	pax-mark m pypy-c libpypy-c.so
 
-	use doc && emake -C pypy/doc html
-
 	einfo "Generating caches and CFFI modules ..."
 
 	# Generate Grammar and PatternGrammar pickles.
@@ -268,9 +265,6 @@ src_install() {
 			"${ED%/}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
 	fi
 
-	# Install docs
-	use doc && dodoc -r pypy/doc/_build/html
-
 	local -x PYTHON=${ED%/}${dest}/pypy-c
 	# we can't use eclass function since PyPy is dumb and always gives
 	# paths relative to the interpreter
diff --git a/dev-python/pypy3-bin/Manifest b/dev-python/pypy3-bin/Manifest
index 4ed8461474c1..cc7313c57a62 100644
--- a/dev-python/pypy3-bin/Manifest
+++ b/dev-python/pypy3-bin/Manifest
@@ -14,6 +14,6 @@ DIST pypy3-bin-5.9.0-x86+bzip2+ncurses+sse2.tar.lz 5654668 BLAKE2B 964c06920e2d5
 DIST pypy3-bin-5.9.0-x86+bzip2+ncurses.tar.lz 5640443 BLAKE2B 4aa4a8cdfa536aea52cf6b94813e6c70f071ed62bc1bceac0584b2ab1a0b9d5a60e6d219ffe67f09f418246847ccd1f32f280b38c9bd973eca2c30c002a42856 SHA512 663fae9004eb7f002b849d4697ef67fb72df33faddfba7272a6d795432ecca4c110dc1fab43617909f962584c7519582f085854f55829ccc63dc988654b6add5
 DIST pypy3-v5.10.0-src.tar.bz2 29075971 BLAKE2B 02fb64d514ab292e09ced57e1c206b04d0fb38353ad6ec0e836448344a6d126d0fccfb61cbd278ea3acaa227032640e82f9ffd7efe3b33ade1ca34a18831b3e4 SHA512 69a373c18dbad9dd617f994ad885c8d8975f0c484ba9dd547e6e892c9a3030a43e9e3ee668aee5f4969403883de1311cef97a0a5e5701921172ee6c2119b771b
 DIST pypy3-v5.9.0-src.tar.bz2 29055111 BLAKE2B 181d87ebe4a83a3f03b28d891f248f718ad120ed54621f8054f19a65aebbe90b65c69e40ca656612356b2019aa9ac22d5e242e688a80190b046511a8ceb9c040 SHA512 3d5384d644fdd1bc8b95f5747dbd1771ae06eb2cfc7b57be359b8bf40177676afd097620d0cb9d9000c40d8cce075cfa6bfd92de987d3dd927c04d7d595dc5bd
-EBUILD pypy3-bin-5.10.0.ebuild 5731 BLAKE2B b3c6d18c7f1f6cd8da43c3427c97b681e7179d8e43fc075981cd39ea69f555d59351d8c693901d951da71db5b2d3b4cbc050e5b529328d1a4406e98d927f1f38 SHA512 57a4470d880c96565d00692e7c685b6b8e3016bdf21d954b1d13a8fbf6aa5d4c48965945c1488dc677c24b7fb5c03cc8c5301fb3e1034f03a24530b1555718dd
+EBUILD pypy3-bin-5.10.0.ebuild 5543 BLAKE2B d790bc82ec0c0f4e48bbfabc557241fb6eaed1e02678764ac887f498b08e277205d308126a4095a553d0d568499d6062cd76c47af1d887b0dd318a9a66fdb9f8 SHA512 ff0391da50cce922e424f2e5d47bbcd6584327be54eb03fe5570a6df45ddfab3dae510053e820961678dbc5c4c24d85bf59bdf6ce2f7cbe13ea1696a57712dff
 EBUILD pypy3-bin-5.9.0-r3.ebuild 5730 BLAKE2B b254df486fc370e41ef7ae7f53294299ddaed93d3a8e7d1900b9cd3c846b48835a589cbdbb4357ba065c84b08d7f3f13df9e33cb14e1acb4604054683fdb3d8e SHA512 1b79b1603a148046e6c333960d0e35fc05c5e92bc6ed9fb10e62e519ff158a5ed331c31774152c28c07ec8aee45504fef403e9fcbaa6698dc68d0642d996fab2
 MISC metadata.xml 317 BLAKE2B d7be288f31d09754073e991e0f753e673e47fe1698408d13ce01dd58aa458e9ff9894973b27a293e426c074fbafaf5ca784fdbae0c784c1a5bf5d51bad1abd21 SHA512 65d1795605d0120c94911b2c295d8da13e01f9ac6b0750a7d536be64bf5244e20e2bb7286b33e75346e0dea333dc8970c4dcf0e98842e28f5a202ee2ddbba294
diff --git a/dev-python/pypy3-bin/pypy3-bin-5.10.0.ebuild b/dev-python/pypy3-bin/pypy3-bin-5.10.0.ebuild
index 2365033c5b06..2457cda763f7 100644
--- a/dev-python/pypy3-bin/pypy3-bin-5.10.0.ebuild
+++ b/dev-python/pypy3-bin/pypy3-bin-5.10.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-# some random parts need python 2...
+# Test runner needs Python 2.
 PYTHON_COMPAT=( python2_7 pypy )
 inherit pax-utils python-any-r1 unpacker versionator
 
@@ -57,8 +57,6 @@ DEPEND="${RDEPEND}
 	app-arch/lzip
 	app-arch/xz-utils
 	test? ( ${PYTHON_DEPS} )"
-#	doc? ( ${PYTHON_DEPS}
-#		dev-python/sphinx )
 
 S=${WORKDIR}/${MY_P}-src
 
@@ -90,11 +88,8 @@ src_compile() {
 	mv pypy/module/cpyext/include/*.h include/ || die
 	mv pypy/module/cpyext/parse/*.h include/ || die
 
-	#use doc && emake -C pypy/doc/ html
 	pax-mark m pypy3-c libpypy3-c.so
 
-	#use doc && emake -C pypy/doc html
-
 	einfo "Generating caches and CFFI modules ..."
 
 	# Generate Grammar and PatternGrammar pickles.
@@ -170,9 +165,6 @@ src_install() {
 			"${ED%/}${dest}"/lib-python/*3/test/test_{tcl,tk,ttk*}.py || die
 	fi
 
-	# Install docs
-	#use doc && dodoc -r pypy/doc/_build/html
-
 	einfo "Generating caches and byte-compiling ..."
 
 	local -x PYTHON=${ED%/}${dest}/pypy3-c
diff --git a/dev-python/pypy3/Manifest b/dev-python/pypy3/Manifest
index eab1aafaaf37..e270ce4f821f 100644
--- a/dev-python/pypy3/Manifest
+++ b/dev-python/pypy3/Manifest
@@ -5,7 +5,7 @@ AUX 5.9.0-shared-lib.patch 826 BLAKE2B 745ad99f5fbcf63abce99104147f0169178d8409f
 AUX python-3.5-distutils-OO-build.patch 3627 BLAKE2B fe4fd23515f0d1cfc236ac3e773b6a70a9b0fbbaff4719c1f1621e21433cfdb1f53b6bf5f348069d7bf03d26bd039f793e4ef2ac4f6271062d83c088ccbab56d SHA512 5e8e4ab7d326386a244df9d0fca5b54e16b5943e35d12ecaf9ea986e79d2d8d8e85585f6286e0fc440dbb7a8c17e2bcf7a11498ff9cc5f523e97d8b353d9a511
 DIST pypy3-v5.10.0-src.tar.bz2 29075971 BLAKE2B 02fb64d514ab292e09ced57e1c206b04d0fb38353ad6ec0e836448344a6d126d0fccfb61cbd278ea3acaa227032640e82f9ffd7efe3b33ade1ca34a18831b3e4 SHA512 69a373c18dbad9dd617f994ad885c8d8975f0c484ba9dd547e6e892c9a3030a43e9e3ee668aee5f4969403883de1311cef97a0a5e5701921172ee6c2119b771b
 DIST pypy3-v5.9.0-src.tar.bz2 29055111 BLAKE2B 181d87ebe4a83a3f03b28d891f248f718ad120ed54621f8054f19a65aebbe90b65c69e40ca656612356b2019aa9ac22d5e242e688a80190b046511a8ceb9c040 SHA512 3d5384d644fdd1bc8b95f5747dbd1771ae06eb2cfc7b57be359b8bf40177676afd097620d0cb9d9000c40d8cce075cfa6bfd92de987d3dd927c04d7d595dc5bd
-EBUILD pypy3-5.10.0.ebuild 7045 BLAKE2B 14adacd8c97eca79a3d70c770af1e6b9e9d28bd810244e083a3031a837472a8ce7da765e92f3b4cad7d489d0c349dd3f3ba4d8aaf300716ea95104dd922b7cfe SHA512 c69a165bf40f968efc3a00d04573750319fb4663082b107bf14eb46f40bd0a86534eb8939e303c8db3686a4c6644acb6668d5d1da325d9717c466ec799db6157
+EBUILD pypy3-5.10.0.ebuild 6917 BLAKE2B 18198e6dd1b66a2631dc32192af024a16b5bff8c6aceac84c2d36ad92eef7e20be35a53223cdf57e3bfc37fbdf4381b7e274dced1fe245e30999e3685dbc6e85 SHA512 4babcc4db87573e392298486c5aa10193812f1a95655bdcb17e9f652a8c576ccf33fabdffa191f20e8296c21f1634a409abffbe189bb5947cc1b1d152344488f
 EBUILD pypy3-5.9.0-r1.ebuild 7043 BLAKE2B fb91156cf416003da95dc67787018676f4f3bd75f4d218e9b0213cecb400db5c3882aacb73cfe87d8482bebdb7fb51f1621cd4868388830b0fe34aef9deac3ab SHA512 79f2187c150dc0c28e4b4062d38485a2e2aafed46e4375b28a023d1a43df20fbc31fec933c2f221d73f306e92e5bb6011568229885ba0b70f67d332e3e2757da
-EBUILD pypy3-9999.ebuild 7633 BLAKE2B 72cec5d50ab90be2667bfbc153805fd74156614996f189dc68112e94950718baf533d26a2b95fdd24bf798cf959fccf19fbf8c0cac908ba7b577e50c63efac44 SHA512 72552f667c38ac510094d6642d22db004e80860191c4ca93764e7838ce1d2da441739fe42248b1bbe8d25499ee2590209099f1d941feca39d6d9d33db6d21580
+EBUILD pypy3-9999.ebuild 7505 BLAKE2B 70b6cfff8eef4cd61619b4dee821dd490f7e4981aca009098980e185cc3580a6a07084b2c0ef73b9d2a4d3a1b8b7c4660091b754cd2daf77836f98e27347e653 SHA512 ac2fd55431e394326ec3baad4d66bba6e9ee8ff9c86642fd738d1a0a42a5cbe9532bdca5e34ab6fce4c252f6caf296f3d1aa37d7971513bb35ef324245741680
 MISC metadata.xml 636 BLAKE2B da5771ec2ee59ac934959f6e72c5aee2225ee2d88e2c4c5d6acfae95b9652c973160ed0ea29f0f6143d25a249944925ef157693979871863c04a483da972bd7e SHA512 c52d59231928b12da09c2c7149afbb852ceaf1342a2747d85493c9abc15b8d68fd24495349e583aee5cea18799bd4dada3943bc523a4e18745e2036446cd0841
diff --git a/dev-python/pypy3/pypy3-5.10.0.ebuild b/dev-python/pypy3/pypy3-5.10.0.ebuild
index 8d3c3e165e4e..dcef9d5439d2 100644
--- a/dev-python/pypy3/pypy3-5.10.0.ebuild
+++ b/dev-python/pypy3/pypy3-5.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -45,7 +45,6 @@ DEPEND="${RDEPEND}
 			)
 		)
 	)"
-#	doc? ( dev-python/sphinx )
 
 S="${WORKDIR}/${MY_P}-src"
 
@@ -152,8 +151,6 @@ src_compile() {
 	cp -p "${T}"/usession*-0/testing_1/{pypy3-c,libpypy3-c.so} . || die
 	pax-mark m pypy3-c libpypy3-c.so
 
-	#use doc && emake -C pypy/doc html
-
 	einfo "Generating caches and CFFI modules ..."
 
 	# Generate Grammar and PatternGrammar pickles.
@@ -230,9 +227,6 @@ src_install() {
 			"${ED%/}${dest}"/lib-python/*3/test/test_{tcl,tk,ttk*}.py || die
 	fi
 
-	# Install docs
-	#use doc && dohtml -r pypy/doc/_build/html/
-
 	einfo "Generating caches and byte-compiling ..."
 
 	local -x PYTHON=${ED%/}${dest}/pypy3-c
diff --git a/dev-python/pypy3/pypy3-9999.ebuild b/dev-python/pypy3/pypy3-9999.ebuild
index ff2a3ff800ed..c3217b6688dc 100644
--- a/dev-python/pypy3/pypy3-9999.ebuild
+++ b/dev-python/pypy3/pypy3-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -46,7 +46,6 @@ DEPEND="${RDEPEND}
 			)
 		)
 	)"
-#	doc? ( dev-python/sphinx )
 
 # Who would care about predictable directory names?
 S="${WORKDIR}/pypy3-v${PV%_*}-src"
@@ -179,8 +178,6 @@ src_compile() {
 	cp -p "${T}"/usession*-0/testing_1/{pypy3-c,libpypy3-c.so} . || die
 	pax-mark m pypy3-c libpypy3-c.so
 
-	#use doc && emake -C pypy/doc html
-
 	einfo "Generating caches and CFFI modules ..."
 
 	# Generate Grammar and PatternGrammar pickles.
@@ -258,9 +255,6 @@ src_install() {
 			"${ED%/}${dest}"/lib-python/*3/test/test_{tcl,tk,ttk*}.py || die
 	fi
 
-	# Install docs
-	#use doc && dohtml -r pypy/doc/_build/html/
-
 	einfo "Generating caches and byte-compiling ..."
 
 	local -x PYTHON=${ED%/}${dest}/pypy3-c
diff --git a/dev-python/pytest-fixture-config/Manifest b/dev-python/pytest-fixture-config/Manifest
index 5da906c6d64f..ff62af573196 100644
--- a/dev-python/pytest-fixture-config/Manifest
+++ b/dev-python/pytest-fixture-config/Manifest
@@ -1,5 +1,5 @@
 DIST pytest-fixture-config-1.2.11.tar.gz 6525 BLAKE2B cae41f542fedfcc8587dd5a4cc117480f22fc8abd6f5b85b38451e8199c52d2cb20c4a44fd014504fdc6835be940b4935c95e73dd16cd42049a0e01737a65f6b SHA512 9d335621c7aec41ce769f450fb618ca1611a0e97bf3bd3bdaf43bb827dde62af28fb255a36643c4e6e9c958e7f7efe3f4fc308b3129fe7625c0504c0c46f1518
 DIST pytest-fixture-config-1.2.2.tar.gz 4995 BLAKE2B fee7acb10140320b2ae14968fd99bb11f6c23f54cc86fc74a52855b58071c8deaefb1343c4d92726f7fad5e873c25c426f04d8ced3ecece3d953dee4c7693b7c SHA512 c2d2346c50c8a73e37ce217e240eabdecf872700c9f4b020f1ca7532a06e6a5dc6b140356d96b1bf8c83f1cf737d95775abaa206c3dcf7e02555b26aa995f12d
-EBUILD pytest-fixture-config-1.2.11.ebuild 730 BLAKE2B 7bc4b3c2bd5993e5a3309b3ae99d03d898740174fcea4a237e42b45cf605d3d924fa1a911c0fb7653278aa9250b6097af05dd8e342d636478b75026284f4ef63 SHA512 1c1a2f4b3555b1a1f41e71ae92516e1ef0f996a117ad5173b573f3113c7b50ea275c252d9c6f568dab043ffd900bb5cf2dbbf91711453f76d6e4ab5f89e1eba6
+EBUILD pytest-fixture-config-1.2.11.ebuild 735 BLAKE2B 9602489cc36a4f561ff95ae7f185538f06baae994e8e66ff376e620669a9d88a2d8d82addf0d31acff82bc1e3e6bc6f7414945f749fa11133ec008d89d8f8e55 SHA512 a4c9801bc33d13156881be0901ae6deb62fdbb947f7085f63852123df52dc4b526114f006eb63cfe357013f23a9ae6d1f13eb71adca09a0672ed7d0256d22f81
 EBUILD pytest-fixture-config-1.2.2.ebuild 707 BLAKE2B 50cb74b0a9b4cc1ea33c850762f2f1dde94497e47f99808323b9cf2fdcf8b9817cfb657881e256a7aa638b5bd8ce40ae5c33cec56a3547da88aabe2bc3010aaa SHA512 e1554212104ddce7d35730af725f612cf646e469b7f154e5af843d555c4e3e8d45d3081a413b4db69deb11f124503d2a4ba75820a7a2cfdb804c2bea23068316
 MISC metadata.xml 676 BLAKE2B 7f3622c69e6d371d1ab8d57d06d3aa045bcb21829a2ff0d4f160941cb804fcbf2c0540a460e50e3ca6286b6a31e2e6b8791f92fd711fbcc9eaf1186b7cb37ed9 SHA512 9e4cc39afad13c0cdce47c59c42c4d71436422d37d4f113a446238036b1f05d38eb8fa6d53b9001ca630483492dd315090062efe221339e63776f126d964620d
diff --git a/dev-python/pytest-fixture-config/pytest-fixture-config-1.2.11.ebuild b/dev-python/pytest-fixture-config/pytest-fixture-config-1.2.11.ebuild
index aa91d8c32711..6c46923ac167 100644
--- a/dev-python/pytest-fixture-config/pytest-fixture-config-1.2.11.ebuild
+++ b/dev-python/pytest-fixture-config/pytest-fixture-config-1.2.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # 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="amd64 ~arm64 hppa ia64 ~mips ppc ppc64 sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pytest-shutil/Manifest b/dev-python/pytest-shutil/Manifest
index a61687648511..f57182c28941 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 1012 BLAKE2B 14d64840eb058db1a173734d1c4d8310fdc34ccf399e33cb500a27a66e35a7aa61e8d3d36ba390c2631c431d9d12db72495d87c1fd00dd9b7dfbcb1b09902d4b SHA512 6b8fdafa8938035c0f41219781872c07a2315a6d9a5d5b784813853644030166786c864de9208c7e2bc2138fd34ce2fc1f7128ea99348e78d6ec1683e72111dd
+EBUILD pytest-shutil-1.2.11.ebuild 1017 BLAKE2B 62f435ed502716009f195804e3369ea6e8bc9e8632883930ac1fa90c3868913fb8b1bb5d04714af3b28e943a745c97d1f94e17d7805d74d43bc47bf9796b5064 SHA512 f98ebcc31ce74ed4f4063d392f4fa093647e27f3b6fcc6c39ba3851353c9635bc6925965642890cb5b4e3cd186adac70e1c6a869a4d89947142a045872dd6868
 EBUILD pytest-shutil-1.2.4.ebuild 872 BLAKE2B cab69c456f8db4a45fdc6af7a992cd5f4e160ad522ecc23a4327a5ee447ab82147bccf0d3d0a104b2bda58451e10b2d2626ff163d3c7880595aafe35df6a5409 SHA512 148ca3da3d06f2d26a9799cc2cc8eba28a99cef29de0dbefd2e0957527655cf53c623fe4bf5ea1a542fdc48ddb9f56608521913b9837cb1c352af8523f62691c
 EBUILD pytest-shutil-1.2.8.ebuild 872 BLAKE2B cab69c456f8db4a45fdc6af7a992cd5f4e160ad522ecc23a4327a5ee447ab82147bccf0d3d0a104b2bda58451e10b2d2626ff163d3c7880595aafe35df6a5409 SHA512 148ca3da3d06f2d26a9799cc2cc8eba28a99cef29de0dbefd2e0957527655cf53c623fe4bf5ea1a542fdc48ddb9f56608521913b9837cb1c352af8523f62691c
 MISC metadata.xml 730 BLAKE2B d12c0e9355407f6bb2a942bd03b56e4c516a0deac0d0e1f246749c21c330778808a0b30c34e50df39dda8e591680e947bd64f7a09063f2c2fdb55657418c57d7 SHA512 c775452390ffa0666b23f3f78bc96fbfbbbd94796ef9bfb79fcf251b97ca94f96b0c2980b2ca1828104499c78da15fbb198eeb000e55006debe9ed03ebebb0ca
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 6c6ce8eda5a3..9fefc64efd74 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-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # 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="amd64 ~arm64 hppa ia64 ~mips ppc ppc64 sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pytest-virtualenv/Manifest b/dev-python/pytest-virtualenv/Manifest
index 3a42dd736762..6da22588fe70 100644
--- a/dev-python/pytest-virtualenv/Manifest
+++ b/dev-python/pytest-virtualenv/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-virtualenv-1.2.11.tar.gz 9528 BLAKE2B 2ddcba76f89d207e8efaac8d59c6c1209fb9557fcfad586e1226b70d49ed8093aab602149335d23d497b0674e606d00d289fc291dd721aa7470f12ec221b5f61 SHA512 317ef8717f0ad4da6d38167f1f0dd65b6f1b3bd08bd1361fe6a27e6e422cd9fab62f3fac3848082bb24411505ecd41495fc1cbedb970d43945c8f6f8cfbbdf41
-EBUILD pytest-virtualenv-1.2.11.ebuild 864 BLAKE2B 3c2d095dcc0de7304162264bfbd0b57f524bdc621b1e1c7cf787e3ddc67a509f688fba4cd71d1f7cd907dbb825d6c6524370421c543591991384f36fd04bc930 SHA512 1d6a7c832d5ed45e1b324b47a25556dce34fcf994f4ac4b111850b6e09cdcd5652a5bc7f0467260124a075c74eef70e7d375d7acfc2de2f1b6b3c0efe5d54f28
+EBUILD pytest-virtualenv-1.2.11.ebuild 869 BLAKE2B 1a4475a6112f6e79d23b06b0e6a509b0f81e9b1ac639d33a659e39d626143f05b44f336441f899a87cb584f2a42d107da801005607b0170700e4dcd086131b66 SHA512 888c6d49f9f765760d530f8c5d1de7cedeb5068272d07e293802cc01c37a218bcd80b74e1ed6082d1c8476c3266733b3e6ef5983ab129ed0cd41c98fae50a9df
 MISC metadata.xml 704 BLAKE2B 5def8fc368efcb89f29107dead2b04bbae8f868d94f7d95396292e35933e556f1f0cdaace88e9063beb890999d2db384da85ba44e61fe5d48fb660f9f0f220fa SHA512 856c8ea08f2f1f4f2e1be19e2a2cb2aaad2a143f270417a2632685b44432c36a947d7d98b51bb87cd6f32943e814a39790943e0c4799dac97d84b92103b759d9
diff --git a/dev-python/pytest-virtualenv/pytest-virtualenv-1.2.11.ebuild b/dev-python/pytest-virtualenv/pytest-virtualenv-1.2.11.ebuild
index a4a887148236..3899d0adbd05 100644
--- a/dev-python/pytest-virtualenv/pytest-virtualenv-1.2.11.ebuild
+++ b/dev-python/pytest-virtualenv/pytest-virtualenv-1.2.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # 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="amd64 ~arm64 hppa ia64 ~mips ppc ppc64 sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/setuptools-git/Manifest b/dev-python/setuptools-git/Manifest
index c62f59330ff9..4946536799aa 100644
--- a/dev-python/setuptools-git/Manifest
+++ b/dev-python/setuptools-git/Manifest
@@ -1,5 +1,5 @@
 DIST setuptools-git-1.1.tar.gz 9450 BLAKE2B c659e3b894c3bcbed6bf8d40aa390dca476912782dbb2222c9b1dd5bebc6c98ba28b50562eba776232014093f8a222cf1075d02752da7d90a18bb594b4e724d7 SHA512 39e19c107f6398aaa1b78961c3b0d9d7b57b181d8ce0d93780460867fb7535ce45d266b93af43f45aa7afb89299199df22b0fdea61e9090932aeb4bd69c5f1f0
 DIST setuptools-git-1.2.tar.gz 10546 BLAKE2B 52b7cd8387037b1eaee91e9df7de9944ea08bf02f4cf9ea74fa9d0febf85d930af989e9a07289935d8886f0fa4439c4cb46556ff81343981153ca35314703a9b SHA512 c070911618b6b92c862fb0bd40f1daeaf79e2ba10389fa1e69e4c50cfdd39c8e57a612082cbc7d932f8cea12a769e13451e35e1c8fe34f170d4817fd0d44f156
 EBUILD setuptools-git-1.1-r1.ebuild 631 BLAKE2B 3a9bcb27ca70dd491d8d90d9d4704c2a2b03775d3b15a55b11c440612ec1c9da42c4f7f797d78aa608be9be977feb8aac32fc2e35dd936e270a0384591729d38 SHA512 00a140936e3adf214b3ddb0d67eb6bc84588d7b245711c43cb1ca47c9db05aa19e605e98b9e4317300e899f00c211e21e0841a5199bcd8d5bfb0a5d715fb0eb0
-EBUILD setuptools-git-1.2.ebuild 680 BLAKE2B c9005a104695a4cc251cf035ab5f18f1bd735a10338ae2f13b0071a33b83a3421a6851c0be14d73664be4fbbf761bb650db12edb0ad4f89f24c7304ae9682e6b SHA512 beacec7f7115876733782cd63066fd09d09e978e512775c99647ad620069831a7a792d76168229ff2e02dc81f59e9ee3fce17cd75679ddb38c31193231366afb
+EBUILD setuptools-git-1.2.ebuild 685 BLAKE2B cfe002fb9b83f7d104625a4018f87f03f6bd33344bedd65e79331e7ecc1f50659e2d7c50f9bf66bcd5ed2fec939a8382edfa7fc622e1c998c371d174596d14ce SHA512 11c355c0aa4902d76fa095681f4f0e6ccf8c470d017cf2f6776a76c625a1374529114d796979c05f2100eddce91a5415dfddf01bc46070d2a68270fc3ce83ee2
 MISC metadata.xml 617 BLAKE2B 6a8553d2d3deaa7eedae6706e516b6cab014df33acf8a4589084ce2ddc8b3bdc619253ccc176cfa28a7092efe9044ab171b585fc87d933ec5e833303ad2b6dc1 SHA512 057677807a316be80d26eb8aa9b07a87a60251a6185c85ac1042db7040849ef4e9554be1d9ac15d1b8ff212df2f39446f3c56208fe83d12581fb0ba283d1ebff
diff --git a/dev-python/setuptools-git/setuptools-git-1.2.ebuild b/dev-python/setuptools-git/setuptools-git-1.2.ebuild
index d5712cf06a7f..5fb37bd877df 100644
--- a/dev-python/setuptools-git/setuptools-git-1.2.ebuild
+++ b/dev-python/setuptools-git/setuptools-git-1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # 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="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 hppa ia64 ~mips ppc ppc64 sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc ~x86"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 		 dev-vcs/git"
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index d639342ad910..a5c8375156be 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -3,6 +3,6 @@ DIST setuptools-36.0.1.zip 711296 BLAKE2B c58a4efd8d3a2d574ff6ba5cd01a196fc7ad61
 DIST setuptools-36.7.2.zip 726758 BLAKE2B 8821d3142f2149fbdea4d231052c3990fa7a14c57c421309683c6a65102ce4911850acd5d492087aa0f14a0026da732e47eb9bf971030443fc1b57f9f909aaaa SHA512 746dce135dbacb65565787a20a2611388605e2371c94f0f8803e7712e515e69c270751d16a21f381bf6e8ddc0a1b39494db7d0c67bb32e6230a90c5d517e78f9
 EBUILD setuptools-34.0.2-r1.ebuild 2041 BLAKE2B 636bb3604f802e4854dd4835da7eac8cfe2f0eacbaef2b8bce8906009bf424e8152e076f505363adca79aaa9c47fe12cfc1bd4c7a35c6e71077a43064f18c551 SHA512 8a9db9943611582d5276ed7f009cba5ae5c839b49d21e95ece52d94da6508a70811117e3aa1774f195f976428667d5b3872cc2192f78294456eb83fc50addba2
 EBUILD setuptools-36.0.1.ebuild 1902 BLAKE2B 35f16b636fe826c5dc788549b3e24922ad2009fc11ba060e2a99250bffb383091447e7096dcef8c7dc35fe092f7f5d3ed428e1562bea5bf5ce30e5a22920e5c1 SHA512 b205802dbfe7a2c0962b3399b4cae6fce1437f3922f2f138c5055497e514dd49a52d1513dad9d2323eb2360c4d59f37607f24dfe17176cd1c6f136875198827b
-EBUILD setuptools-36.7.2.ebuild 1851 BLAKE2B b5c5dfdfab43a9a67d081a3d5e904f8eabe79d9fbf9bc543b8431efb3bd4dd125f70ce303f7403e4f432da7a6e13855e75f89ad4064b5da10aae5902ddf9e75b SHA512 61e6059be529b53c634446354e94bd242f6af9a0cc1f2b3fa588397cebaa8d27c9268ee30ba33efc2d0b8ddc18662c04e4fe937aabbdb35d15f227bda78cf9b7
+EBUILD setuptools-36.7.2.ebuild 1856 BLAKE2B ff81b3c14ab0c70033aa7524fdeb43593eb81db469e57dc830fac23777722df420939b01054d616c4afa142e4656f77e5fc8f73216e6d481f90e9f395049055b SHA512 52902140f245ab92b96651116754e195155fcadeb5ac97a255f939e5f613234311b3c11ff8d2646acdc997002c5a4db3f58f113039842cfcf450ae348ef8e549
 EBUILD setuptools-9999.ebuild 1828 BLAKE2B 24067d8da779d29d821819cb7b620f69150ab580e4438232a94f8b335c07ee5fb383b3b52db8a7fa53086af9813157204f816b3d4e8e322c9b210d0aa6df385a SHA512 fe855fbf0f1012ae83b82c138d1fb8f2822d09285b0dcfe5a31e430922878da217549943e868c0a96493f83d4b26d9e47312de7639edb329eacaf9e13d9d532c
 MISC metadata.xml 380 BLAKE2B e6c532ce30c0def7dde2f2ca91e1663f290954f1f099fc837247540c31979a215be5550bc42d4d841f62d3a81554ae5377c148ec34dc2e92bbca3daaa1021fb1 SHA512 70bfa11a90dc1bae499e235e01c05ff1b0ed2960062fcef46ed07095b59309c4a0c3adcd47f7b0131ff1035c8e77c5bdf75975ac1eaccaa1a9fbd06a3f868f94
diff --git a/dev-python/setuptools/setuptools-36.7.2.ebuild b/dev-python/setuptools/setuptools-36.7.2.ebuild
index f0ae5ef5d299..d3c64a1e792e 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-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # 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="amd64 ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc ~x86"
 fi
 
 DESCRIPTION="Collection of extensions to Distutils"
diff --git a/dev-python/statistics/Manifest b/dev-python/statistics/Manifest
index a11b8ee86619..405152803843 100644
--- a/dev-python/statistics/Manifest
+++ b/dev-python/statistics/Manifest
@@ -1,3 +1,5 @@
 DIST statistics-1.0.3.5.tar.gz 8303 BLAKE2B bbefc6b9ea5fa00f2980072afced8810e9a33acba5ef07ffbaa6c6356a1dd66fe8062b98bf6d4273860d482aa352453395c16143220afca7050cee3546fad8ab SHA512 1d7fd2304a885dbd9ebc564323349f9c5ad1ea1ecea8182b52a1f42308963bd49f07c9dc9f0b87a35d2f6ed3c37429dbc38183c0b1bd65a527558e4504a9a3a0
+DIST statistics-3.4.0b3.tar.gz 12486 BLAKE2B d13c8fdba3a8788f1959a97fb3d11c53cdfa5d217751b0b1303d0be186e6f37a27ba5f641cf0cc90ecb96482527bdaa4b61778795a6c6a0fa19a93d881376d2a SHA512 d7bd7614fe3afe24e542eaebfedcd2147111ec567024e2533faaa379438c3f53138ce205c9b8fc71bed51bc13d5cb3d370b476f199a6250f4457adcba4be6522
 EBUILD statistics-1.0.3.5.ebuild 543 BLAKE2B 611726bb5d7f6de0dcfc09d4c4233fdeee5bcb8dd8045ce0a2294c5c92d0fc92010336b8dcf7fa1912f0ad0ec1269a27a9194cf0f74c00c781d47a92047a6584 SHA512 1cc0eafa7bb5b0c2896e2b6257b53b889eb004a07023e9ddd0181312cdd6031dcbaef954012fe5c43d9a905728a3942d5546113a8a28da4a39299254e249b0ea
+EBUILD statistics-3.4.0_beta3.ebuild 590 BLAKE2B 0e5f6dfce8f5afa59a159adb9cc564637a36344c8b35bea1538bc5a442d375480dbe8aa290f27f7c1793360361b7bee4747365b945599bbff12d2f2edd1a4986 SHA512 084f718dc1f7e56f56b84ccc4b7fbea7ee130aedc28e96f4af939b807ce54439a6f83ada57051fe2a7b8a5d8f891c94a23cab158c80a8f1f6eb6311d67994e56
 MISC metadata.xml 527 BLAKE2B 6b5ae878e0f3364775f80e272491e8e6b618b4ea129544760a3f56b6a4db33efcb1f85a2af4f812d67def3430218205ff6637c427fe2ebb7a812c6ff9d573e8a SHA512 a8a996bf135883825f9857cbb3a8608a1f340bdb32393b7438fa863c617fea26ce0ef05e2985b2bd763a73aaed9a7c565a7b789e98bdc231831b1b315fca0251
diff --git a/dev-python/statistics/statistics-3.4.0_beta3.ebuild b/dev-python/statistics/statistics-3.4.0_beta3.ebuild
new file mode 100644
index 000000000000..01236be413e2
--- /dev/null
+++ b/dev-python/statistics/statistics-3.4.0_beta3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 pypy pypy3 )
+
+inherit distutils-r1
+
+MY_P=${PN}-${PV/_beta/b}
+
+DESCRIPTION="A Python 2.* port of 3.4 Statistics Module"
+HOMEPAGE="https://github.com/digitalemagine/py-statistics https://pypi.python.org/pypi/statistics"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S=${WORKDIR}/${MY_P}
diff --git a/dev-python/zeroconf/Manifest b/dev-python/zeroconf/Manifest
index f48bef5f2747..380db8c44ded 100644
--- a/dev-python/zeroconf/Manifest
+++ b/dev-python/zeroconf/Manifest
@@ -1,3 +1,3 @@
 DIST zeroconf-0.19.1.tar.gz 22769 BLAKE2B a63332d70c5610da4fe44cc32d106893241284c3f70b5d6f55f68e3b3dd045a9c39b1009e9dce0b80c836d5ab0693b99974901ee664513c36f34c31907162d46 SHA512 1a7ac803caca1b230eba6c4bcfb714613f218850d9373ea0de609a3c9a509d13acfd14d64f9efbab78637b74aebdf385cf2deded1ff871fc6f3aea4477a07730
-EBUILD zeroconf-0.19.1.ebuild 977 BLAKE2B dbc14d334e4ab0c65affda8082dd8845c4f594de6a9358d20d2b1f77728ec63098388883369ed4a844742ad35c6df03af5c4c8a1e6315d4837b0cc37643c8d05 SHA512 550ecfec4d9e389e9b0d4ff6a5be4a9cbba88d8d0a44d634700b414bccf1f1d9357e7fdc4f3b2fa3c47c1053629e2dc6eabc867dc9d0550893531d2fac0846be
+EBUILD zeroconf-0.19.1.ebuild 975 BLAKE2B bb1124734a40c28f230afde8c41fe4559821244e6c212458f34feba665007642e9ee8bcee4c01f316117715824f7eeac8260e106796a3b0d68923b6ef91d926b SHA512 53cf2129695433c2fe1dbf87fd16cc1698bc227a567ca9554b4ab52457d91be9bfd9c7d575553dd9d4b57f5d82fcfd9472083f16b1971366ece269e2f50ad2a9
 MISC metadata.xml 387 BLAKE2B 9dea981cf6247ad6fb6ddb3b060671ddb031ec703dc00e61e2efb4909478d01b5dfa309ed848dafe321d388156d16f44bc7b803dab79731205e374b5f046757c SHA512 ccee11a4aad084b1ac1dd901d966e1424b7ad3769b4bdf62c2dd44f9cbb6ec1a566443967ba45b37ef6241f43d2a06c17ebb5028254fbf40e0a480fcc3d76f89
diff --git a/dev-python/zeroconf/zeroconf-0.19.1.ebuild b/dev-python/zeroconf/zeroconf-0.19.1.ebuild
index 5b6b4b8a2700..b296885d58a5 100644
--- a/dev-python/zeroconf/zeroconf-0.19.1.ebuild
+++ b/dev-python/zeroconf/zeroconf-0.19.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # 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="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
author	V3n3RiX <venerix@redcorelinux.org>	2018-01-08 21:45:04 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2018-01-08 21:45:04 +0000
commit	65737cf14a7220bd9a487aa2af4ae0e79bd23e86 (patch)
tree	625754b14ae80ac167d1b150c2314b647cd008e6 /dev-python
parent	5001a6c7b6da2956f5b17c695b1e0059dc7b8de5 (diff)