gentoo resync : 02.06.2018

49 files changed, 325 insertions, 35 deletions

diff --git a/dev-python/Babel/Babel-2.5.3-r1.ebuild b/dev-python/Babel/Babel-2.5.3-r1.ebuild
index 8a64938ac16f..254db65acaff 100644
--- a/dev-python/Babel/Babel-2.5.3-r1.ebuild
+++ b/dev-python/Babel/Babel-2.5.3-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="doc test"
 
 RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
diff --git a/dev-python/Babel/Manifest b/dev-python/Babel/Manifest
index 81f3f964ec50..170ee153c970 100644
--- a/dev-python/Babel/Manifest
+++ b/dev-python/Babel/Manifest
@@ -1,6 +1,6 @@
 DIST Babel-2.5.0.tar.gz 6612353 BLAKE2B 85268f0226f1db019fb906da0dfbbc6b6aa199ab491e9d767c932fb5ca77cb6d86328ebaa9c6eb61fb8d28c8e566babd435cdcee9b900c3c680d0dfb49c2bcac SHA512 b24b74121695e0068fb28a6294d4b5b2065e94dcd62ca0d70c8fde3a00cb5ff111480505594460989c6f67a75935f55e153b1b493f917317d2c5ee0f0d7921fc
 DIST Babel-2.5.3.tar.gz 6611941 BLAKE2B 99b71642b00a853fea844220c0ce5ef2fe425906cbdd1618e31f39b60d16382d54ff5e00c493153eee2be8894edc8c96e57fc2703620db5bafcf7b7a4f1b72ef SHA512 1a41f69141da9f66e27110e7a1a5955f76d8ae9353ff7e54182c5bb6ca16e8b4799031e4df1049af54de513da9f101e171e4312b2e7775f2cab9116d5b50c0fb
 EBUILD Babel-2.5.0.ebuild 1474 BLAKE2B fa19a905009e0ed2b3c69a8b941aeca328e923de63b21dc1424c45a28828bf500a99d5f3680032ced396d73114014b3e8c0d52d0e5fee648e9793c102aa3585f SHA512 e57278aa11d989c671a01836089d8642a9ebf02085133ad664a6532a439259c181a69177a3e2063196d27d65056d07bb754aa4416aea60142808dcf2eca36a8d
-EBUILD Babel-2.5.3-r1.ebuild 1522 BLAKE2B ae59ac62d9d0de18309855928abbbf6ac5781b37f70d73dfa2893fa573d5cdba12200bf73abbf6b6282fb089e6a7c98358ff140b2e3d807c716049916173eee2 SHA512 b8b9fefb2bf01060dac00eaa8b9b1be4d2361eb3f181672568498db3a3ef82b0d03902d4595861e8615ddff21eb79ae330ddf13b9a0eef921acd803c98ae75d5
+EBUILD Babel-2.5.3-r1.ebuild 1521 BLAKE2B ba4f44bf1300c927d7bb1ebe8ecb45beba57a4e29b5d4d64b83f2ff9e6f693d65bcb74be3ab9daa45bdefa136e6e1b57467fd89daa4778ae5cd7ddcf84e7249f SHA512 8cc4bc5b40e2e5282342133d1fcce3b0af35d6c377f2e1bc9224c6458757d50c6b1649c714d978c32ea1d41eaf78cf90328d703b915a752d01eba4ff8cdb7225
 EBUILD Babel-2.5.3.ebuild 1475 BLAKE2B 6accc1bb679517e07e9872ccddde886e584753a34025b62c95ccedb2dcad5005535bcfac3027b33c3ca987594a4c799cb8c8f7eeb4bfacd6d282fcbaca38e2a7 SHA512 22cd5ca8483f03efa51f8ba7127df0890ad24da1ffbee9ddf56c50e3064e4f8d78ac1244b377ea6ff023c04d4e5f10e8d11554be5c245d28faa52a5228495730
 MISC metadata.xml 715 BLAKE2B 8bdd049fad7b20c0fed9c6cb5d468468421fdd83404d73f9972bea9e74cb1c7a7bc8a268aa444b62990c61da5a6441491b31a1b02600abef1f693b385ac2862e SHA512 7623e3246442997195e57ee74ca3a60803a90787486a930d4952d06521e0ca295216f8824f9b781f27c48c9e454fc9b0c8a4a9c10de9339a27c043b97acf1cee
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index a7ef30f4dbd6..7fb46ea3defd 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/absl-py/Manifest b/dev-python/absl-py/Manifest
index 5049f11a9d25..be4b3640d7e9 100644
--- a/dev-python/absl-py/Manifest
+++ b/dev-python/absl-py/Manifest
@@ -1,3 +1,3 @@
-DIST absl-py-0.1.13.tar.gz 180047 BLAKE2B d10ff30109cf1a1b21d276b30e1066abc8c002d1c944a13e006a6fa097fc3fc98d4ca4441d194cee61137496aaa9a2314b71408ba507804376fb8750af0130e8 SHA512 ce93346a5f74bd4251789670dffdf983bf557f3e6a90ded9150998c53f8ed3a43fb1aa7b15556695e3d9dfa7a2237bb5462edadc23a8ceeb5f5ce2b87b0623ed
-EBUILD absl-py-0.1.13.ebuild 507 BLAKE2B 5d1f91a75fd7ec32d1d39f3c0d6a74915e53574ff06d7d598e13a8fa3eef49e32b18a7bed90a62e3bdfb92af4e9adcacb6cdf19ba8bb89dcb0b6b12ee87a78d1 SHA512 086853d1302f421dadee8da3a0b075d1fe8eb6933d1322c443b8a656e7f15414417f1f0c6fbb22d52ed57329b548b37cf7c0f44b0d9fbe83221fffa75868e74d
+DIST absl-py-0.2.2.tar.gz 189357 BLAKE2B b53976b50f1738d671a32df2fabf197785cb4be1f68dbf7f0bdd5bbbb1a73439646f5b6a9ea42d5df40debdbb8e8c72c554f428a948f3117dba5d6a8e2b473f2 SHA512 d2a393e78acc9ac28fc9b1129c23de9c2ab6059a7527eaa29e4182356b16cbce1fede94af2a8b51af9d1c606b162d8ae84eb3036ced784a89d4f7547bfce73ed
+EBUILD absl-py-0.2.2.ebuild 507 BLAKE2B 5d1f91a75fd7ec32d1d39f3c0d6a74915e53574ff06d7d598e13a8fa3eef49e32b18a7bed90a62e3bdfb92af4e9adcacb6cdf19ba8bb89dcb0b6b12ee87a78d1 SHA512 086853d1302f421dadee8da3a0b075d1fe8eb6933d1322c443b8a656e7f15414417f1f0c6fbb22d52ed57329b548b37cf7c0f44b0d9fbe83221fffa75868e74d
 MISC metadata.xml 507 BLAKE2B 0a25903f7c7a7b2954b7d7e9a6e405cf7191e4c759b5bd34bd5891dbfb1e328e6e3ebd9ed9fb34bced6b807759ee6b2c2b04673608d4b8db4fe63f93c3c19dc3 SHA512 64f94f3f0e4e2d4fca4d98aaa2886172019ae38cff25aa6e73cc8cea8e1d39a765918f93dec489439ef4ccae85e01972dece72f3ba06eeb37b91cd6f928393c2
diff --git a/dev-python/absl-py/absl-py-0.1.13.ebuild b/dev-python/absl-py/absl-py-0.2.2.ebuild
index 34d6e2a3bb6d..34d6e2a3bb6d 100644
--- a/dev-python/absl-py/absl-py-0.1.13.ebuild
+++ b/dev-python/absl-py/absl-py-0.2.2.ebuild
diff --git a/dev-python/betamax/Manifest b/dev-python/betamax/Manifest
index d5c1db38f3c4..bc0280b36da6 100644
--- a/dev-python/betamax/Manifest
+++ b/dev-python/betamax/Manifest
@@ -1,3 +1,3 @@
 DIST betamax-0.8.0.tar.gz 78398 BLAKE2B cc9546eb028343621ef47a9cb7992f1d3eef4a2b6837cc8b670ff7d0313020def203ff06bf1e21c2d4ef26932df65e71562110b14bf27fc5c1a6ca3ba9023f54 SHA512 52b330747b6add52390b50dd63c05851adc01ccd238fdb5c3401efdfc26be363a3f61145dc0e1f3cc43ff520e1457e33fa47952d2929c7c3e12c3e2612621f95
-EBUILD betamax-0.8.0.ebuild 752 BLAKE2B 64b099666af9fde798e1870741e4dfa718b78fb6e3672ad9e8b64d5f41699757208cc4b7f6c093b5852430111d095e724a5636871f3009393ae38f614471935a SHA512 7201645e3c0eea52b2259b28a08e9992bae7de57d1d82286e71035cd7490968d7d9ee7c5c25084b3acbafc91afed146902691a4066c336e6d5a3da7028ef83c6
+EBUILD betamax-0.8.0.ebuild 751 BLAKE2B 26c4f06b57587f2a1db48d6be7841e01348f4f229b7bfe9b7b8c29064222480c604d263757b1aee9d0d3692706663a8735dc4d77e66fcc70edde4875ff6b7958 SHA512 29df8e16b2b5c9e300d248e8ac79752d545699b0e3105f407144602aeebee9036e749a1b85c67d8c1e9fe6d022f96d5e23c511798edcf46480fee13351fc1012
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/betamax/betamax-0.8.0.ebuild b/dev-python/betamax/betamax-0.8.0.ebuild
index e39b5dd1f255..35eeba71ce33 100644
--- a/dev-python/betamax/betamax-0.8.0.ebuild
+++ b/dev-python/betamax/betamax-0.8.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
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="test"
 
 RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest
index 471b619f636a..f3703cb2e205 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -7,7 +7,7 @@ DIST cryptography-2.1.4.tar.gz 441557 BLAKE2B 66aa07930ee54469328977e27096e65b7a
 EBUILD cryptography-1.7.1-r1.ebuild 1725 BLAKE2B 3327c2607caa9f5fe09f617091dcb21ec637cc5621aa10dcfdb07c82af71a7663a603ae2b7a1597ede0895221c2cf57fb5eacb8883ceb10f89fc36e9c1ef2900 SHA512 9e31689524057c73cf174c8ec4621b57777f20e75295748c91c58eeec8a058ac5067d996aaeb5508d87b07b58c3484e8a5a09c9f4585cadd10009cdc7899e79d
 EBUILD cryptography-1.7.1.ebuild 1662 BLAKE2B e93ee9089ba409dcc50f7a09aed35fe63706c0c08feda1413c1127fccdbedbe5de857b9f4980d2348125bfab11879b71b48e12c2d187f0ed8db6f5b083466e90 SHA512 33688e944e9b4a46f8a49b643fb5f8203716aca424ae6fb84d0b9351310efe4f7941eb2c329a8b4f11c159511aca7e8ee94bcbd25d89d3da919f943a591eda34
 EBUILD cryptography-2.0.2-r1.ebuild 1624 BLAKE2B 7bc96039e6e97bb471124fbc1d1a669a94b6b95a1066fc3a06e5adf84514efcb5651fb9a8c837942ed649e910fdb86ea86b4d92c4dca2177d81bc41ebc6800de SHA512 a65cda871f652ff1e903226396c238185e01a666b84bf1fd15a41707989b5848e4b442bce23c3bbc78a49bd64bfd27eb4d75274b2cb99be6c6ec5710d82df896
-EBUILD cryptography-2.1.4-r1.ebuild 2167 BLAKE2B 88d88d008ac9e992437eb0a5614e3c235b0a77040510f1a775388452b24d2dad2ede1e68cc52fb315d20ceaf520576bd3294a58b7bddc97e787f3a38fcabe672 SHA512 049faaca8acb3c5c7d70b19a4342dcb82478a9953f8f93f5eddc8341c08d73f7355e058e4e1916eec2747757658af6925e44e074894ce940b16d6f1c16b7b1df
+EBUILD cryptography-2.1.4-r1.ebuild 2163 BLAKE2B c58897dd5f2f67b32238d71b15c1b9b080258fcf2d99b614f54205b2a1c356d425f2139d0ce9d8ec97a59873af0ede38e8bbdecabc530bbaa3787ce44cb126af SHA512 4e97f44751883fa5caa341e142df7ffbb4fdd800440b7b35268b8ada0181d8ecf1fdb718bedf41ac4cb44c92ac5c7a83ff4cd9fda4e195cf4c4c29a30330da08
 EBUILD cryptography-2.1.4-r2.ebuild 2176 BLAKE2B b968ca511a87e4b7a72385f939bbde3c046c3b8100696c2b2b71cb1fc4c9585d26856b683fc493c22e5f8fc8a2c328eca55643d0758589d988725c65b7d12f83 SHA512 1fab8535615be14b8d11f9f690dce40359e9e6e3885d6a195ec531f3bbd13668300f5e3ec85256d5467173310c09597923fedc5fc54692d6b9f5d1f51dc65735
 EBUILD cryptography-2.1.4.ebuild 2044 BLAKE2B 2dd3ba08232364b585e92ed6fd83a204f9d1192ca016a796275a200b995c9e3244c687c042600be62a7245f327813ac6d95f6fb8fd1682c0b861cd106a5d2e72 SHA512 43cb90a1de0f0501cbff6385bff0e80eb1fe412479dbfca2bf8ac3d15e93b2c4621b80ca45c7482852620de97eab249cca0e7d2a050856cf4147c22d0523b2bb
 MISC metadata.xml 384 BLAKE2B 6dbfdd39bb24b2df61454716e308605ae1d35c3babd01f16556bbbab240e425434315cb2b80a2c3e8e9b18b237899b5fb96566a7ffefde2af3af1dcc2e08362b SHA512 c2806f846608bdd0720b589494e13f57ab2d64026747f2b13f412c9a0e9d2bef6b16fc357e4d16b74ad7a2a2af8daa5e28d0b6bfe4d2141ce68881c724fd24c7
diff --git a/dev-python/cryptography/cryptography-2.1.4-r1.ebuild b/dev-python/cryptography/cryptography-2.1.4-r1.ebuild
index 6f274fee00f9..00035b90760b 100644
--- a/dev-python/cryptography/cryptography-2.1.4-r1.ebuild
+++ b/dev-python/cryptography/cryptography-2.1.4-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 IUSE="libressl test"
 
 # the openssl 1.0.2l-r1 needs to be updated again :(
diff --git a/dev-python/enable/Manifest b/dev-python/enable/Manifest
index d3227b353510..5679005bdfc2 100644
--- a/dev-python/enable/Manifest
+++ b/dev-python/enable/Manifest
@@ -7,5 +7,5 @@ DIST enable-4.5.1.tar.gz 2571975 BLAKE2B dfd294f80e22fa89243057f405fe83ecadeb376
 DIST enable-4.7.1.tar.gz 2728889 BLAKE2B 2952c1772ea902b2a040a5dbc1ade4fcb41f38da41cb9cfd3a574d16397fcceedb5d2216e19bd14ca9881ff27efa93ec0fe4b94db8f3baedf174fe062c825f1e SHA512 49ca414d1273fb5ddcb1732e621f91a5ac49ff02d63b5b36b8d9e28dd737eb4a312f35345fc29db555db1c6e0e8c9bf2204f8662b43a2761db6c2d656c6b2140
 EBUILD enable-4.4.1.ebuild 1666 BLAKE2B bec6b56b0ad122d2d2b9458292e518a427c97a0113dec8a2bdbd3fc09fb8f89f84ae15dbf2223337562170db0056f857934d1ff2abce5dd3f11a2d01e84d6fe5 SHA512 4701233e904bfc9adf144bbd6bd89dc2c86c66e382796ec3affa161254eb9f3862e1b4443bc2941dee8626e092ab014c3e6f21393dc19b63bf84cbe163fb876f
 EBUILD enable-4.5.1.ebuild 1945 BLAKE2B d89ffe2526ccff7a1d0de99eeec095ca66849abfa76a51d8e41e99ac9b1023a89a1cf8cd5b190010d07547a567a0cbcf5f5b16396100d2ca635c67c846487762 SHA512 32f6b2e4728085bc4d0e610e38e5889a901ea89024cf7b4d415aafd6b69c90db84c0fe576dddcc7f443fedf781ce936309f5d19247cb13cea8133322892c21de
-EBUILD enable-4.7.1.ebuild 2034 BLAKE2B 88fcac8f7b41fc09c1a77a91ae5c7e56ad8fbca0d5e2b6c7d717b3a2ca2a89c6795f77c658c8735e468662ab07a8c4e47c01a0ad9909d94741277bdd49610237 SHA512 e56bace1e7ec7947d86d8bf314148b9e39c7d470811f24f91672efcc967747dd3ec32871072f8c38a09b0d7a5947643a59ee5821c3f0e9bdb424084f81a55adf
+EBUILD enable-4.7.1.ebuild 2033 BLAKE2B fc9841f446b7129ec8bb8d932c0171488dfaf13396064b5b003dcb6a33eec405a2144e4416036d683749c1f58b1704a4b58962400f20b235642d322e8927383e SHA512 409d14e71a0bd0097c2c1dcd5e7e0c04aa6b6628f718bebfe706fd40673d882d872398625e9a456eec6481cb85b5a86e58fe1e2a86e504b56b737205795a0e35
 MISC metadata.xml 636 BLAKE2B b44b5cbab602b1fc525e1500e814120417f10bef9236a30fc982c4b2d06bdc8b3cfeb5166b97ee400756364a7329e5abb8383367f1363884b2fb93f75ecdd55b SHA512 1f7066273188655ff2c98f2c90a3e39916c8d1201ee62e0ed024fa8e847e5578034af870956fc9efd3c900f075532b31703cb301fcabefd8a2c876dd9a412eab
diff --git a/dev-python/enable/enable-4.7.1.ebuild b/dev-python/enable/enable-4.7.1.ebuild
index 89cfd0158d08..8354cdf87549 100644
--- a/dev-python/enable/enable-4.7.1.ebuild
+++ b/dev-python/enable/enable-4.7.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/enthought/enable/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples test"
 
 RESTRICT="test" # Until https://github.com/enthought/enable/issues/303 is solved
diff --git a/dev-python/freezegun/Manifest b/dev-python/freezegun/Manifest
index 7e7a1c596f73..ff76a1d4202b 100644
--- a/dev-python/freezegun/Manifest
+++ b/dev-python/freezegun/Manifest
@@ -1,5 +1,5 @@
 DIST freezegun-0.3.10.tar.gz 20398 BLAKE2B 971f4f3de565878b8a1e4671160f41cc7c558f5c848f5c79dfc48e3f3e3cb71ff9c71090705167d4252edbfee040ef52a7eafd33073011c07337311a7e0ec366 SHA512 64364459dc72484e2124a20a0a84d2b88617efd0578fba687adb51635d578a1e36a00cb119998082610c608e7b6c3589bff5424e38845bad026e85449c8065a5
 DIST freezegun-0.3.9.tar.gz 18118 BLAKE2B 7382646acf0ca8100680cd44d22de3263541031686e05f7957023eaf22f2a1dea370c98f8b6af89a5075aa5636c304e6e7d5a1c64285aa221a73c732bfc5e0c6 SHA512 1aba8ffacc8b9ebdf810253181418bacb75c04222dc59a5e1e526a9f2d97573944926b1b9fcb6c6e6971a7958acaf9b7522c5582190ae6be448c043b6f908c17
-EBUILD freezegun-0.3.10.ebuild 903 BLAKE2B 03dff316b20b26b151cd8747d3ccd91721ef45911e99ba546bdb1b9a58850a64c0fa954cf83d4a2282041c2b8d1ffa255737311edc15add9ae440532ac2bdee1 SHA512 df1e8dec378c4996535f37846ae0e6ca620c7f7b43b07b5e09f7a55eba6255e6366c26d5a3f8c673e3e16798185ddb96f8e372c1786ab2ec9a90c6418b77743d
+EBUILD freezegun-0.3.10.ebuild 902 BLAKE2B 900f7c75c9baafb6ec92eced753d5673fdcbb0e8079285a0e5ba4df45476618abd4cf8bca97d6d94fa6969bf7f3b4870d0c39f0dcabd9cf569bc1ad208443319 SHA512 46c31f01e639551815f7dc390619705de21e73a00ffcdfa050b7e5b058dbbc02501e770d4fcc5da4df31964e34ab9503f759536c6fc78d21d235744122abaeda
 EBUILD freezegun-0.3.9.ebuild 654 BLAKE2B a48e34dd3278053d7eb42f73e0e6c226f2c28d0075dfd7457bae59a6913631b0389334eaa1ccfef4535ffca72f3370f0a255f362a26c54c9f19ce37317384f30 SHA512 0060d7b5a703225eae1dc91cf3d5568cbb48926e1f60bc7ee4ae9936a62a7286f974d9887b91af19cc3269779ab9e68a334ab6208f239e5aebf9342a75c47510
 MISC metadata.xml 392 BLAKE2B 574f859b6be3de78801f9214b561b366ddb87357be71a6891084da1f3de2e6481692d5da7ca6d5008d3ae963cc1e36ead4aae6115f0008d63d65a089cf70115f SHA512 b39f8a45d62f0c220fb915ad64c6a17e9f9619aa8c358694c3a3a83464eb5fcf50ed658430d9aabfb76e8310d4ab3baf059a8de78ebe46a59d6af187735489ed
diff --git a/dev-python/freezegun/freezegun-0.3.10.ebuild b/dev-python/freezegun/freezegun-0.3.10.ebuild
index cd858343f8e2..2e7dd7ae6b8e 100644
--- a/dev-python/freezegun/freezegun-0.3.10.ebuild
+++ b/dev-python/freezegun/freezegun-0.3.10.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/icalendar/Manifest b/dev-python/icalendar/Manifest
index fa020ceef7eb..bc2e17cfb47a 100644
--- a/dev-python/icalendar/Manifest
+++ b/dev-python/icalendar/Manifest
@@ -1,3 +1,5 @@
+DIST icalendar-3.11.7.tar.gz 78330 BLAKE2B e6186f58903d835ac3357db959b6fef79aba34bb9b692128b6209b9c8139f7ed2eda81fd5cc54b6f3186d055e611f1489fcb61b1a10f914ee4c79ba8b31bf67a SHA512 445dc7b9c8c7ee2ad3345c5a4e4bca92633cdabae95f3cab63dacf549d48b7578242566d236cac8d5a9df4158387cadc0f09327e1b3e5038d223687365bec884
 DIST icalendar-3.9.2.tar.gz 66283 BLAKE2B 487a8fdf04f028de30003762860640b8983df026aa7a5ba0efe3a57ddd09c51bb406a5e58792203d3a0ee3d44186b0b6dcaa7194fefcfed85c3ab714129f6b4d SHA512 da50bba72f7a114263672ebd45cfcca5f7c2eca48538901f595b26ef18bb21a6290da4392c62cc27d1202083fcab7f5bfe6c9a463df38087de0ef764999f7eb1
+EBUILD icalendar-3.11.7.ebuild 1303 BLAKE2B 8203deac70c7579777dd4a5e5f4663ceeeac4b1fe3d80bd5bac26899a8d1885d501eafc13779b043c07c90547bb2d207ac6bd7833146a9da3ca10b6da6617b9f SHA512 ff99c4500c76d4a2be37507ef3a7c17f976eb5057eda0e53f22dfd97bebff4516be7690349a4d639e0d731d174fa66512010f27384210a6f83d93974630c4fbf
 EBUILD icalendar-3.9.2.ebuild 1301 BLAKE2B e49dd25f50d01ff43cf9b0bdbfbb309111890a88be052c5abc577bd67c257ea43d6e63cf9e73c3315f8b110133e29aa4c68171d854133822d3c70e37d6c71d2b SHA512 b7cb075497bf8282e3b2332a701805b4be1f3881f9ad248f49750606abf04d9167b0326308898ec7332530ede1ab28e463b8bafd444bf68f14fd597af3261219
 MISC metadata.xml 477 BLAKE2B ba3e50265304565f743e67aab83f0c5457a0db7a104ab8a0d7a85f5d610e49b61a3314e4f037c73e4dff469adcb66ea6c0de6a0027c3fb487637edcd74e1f84d SHA512 468420550f8bdacfb0425ea8df443f1e25552f3e2c132869dd12a1cd74cee4b8174c2dfff2023a80d17f570e8c6d0b0163968f603086d8ea30f61a50e174ad22
diff --git a/dev-python/icalendar/icalendar-3.11.7.ebuild b/dev-python/icalendar/icalendar-3.11.7.ebuild
new file mode 100644
index 000000000000..a785d641fa77
--- /dev/null
+++ b/dev-python/icalendar/icalendar-3.11.7.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+inherit distutils-r1
+
+MY_PN="collective-${PN}"
+
+DESCRIPTION="Package used for parsing and generating iCalendar files (RFC 2445)"
+HOMEPAGE="https://github.com/collective/icalendar"
+SRC_URI="mirror://pypi/i/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE="doc test"
+DOCS="README.rst"
+
+RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (	dev-python/python-dateutil:0[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	# reset conf.py to not read version from an installed instance
+	sed -e "s:pkg_resources.get_distribution('icalendar').version:'3.9.0':" \
+		-i docs/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		pushd docs > /dev/null
+		emake text
+		popd > /dev/null
+		DOCS=( ${DOCS} docs/_build/text/*.txt )
+	fi
+}
+
+python_test() {
+	# From tox.ini
+	coverage run --source=src/icalendar --omit=*/tests/* --module \
+		pytest src/icalendar || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/jupyter_client/Manifest b/dev-python/jupyter_client/Manifest
index b7fada4c3145..ccc150627c34 100644
--- a/dev-python/jupyter_client/Manifest
+++ b/dev-python/jupyter_client/Manifest
@@ -1,4 +1,6 @@
 AUX jupyter_client-5.1.0-setuptools.patch 1062 BLAKE2B 1d01f2b7382d19f63c8bff813d6fbba21db25453e73366681d2b1a361f9842002ce7d5f535aca5e49e4073e36e708c28ce91aa59037daafe1b4da7627a47616e SHA512 b373c4bd3278484252430bf463d873249895aa6e5b041274352866d73de9fe3196dd64a73385aed8878b44a33e742e64623427d6a2d68706fcbdd70d4a539109
 DIST jupyter_client-5.1.0.tar.gz 265233 BLAKE2B 1f4533e1c6578e61b1a7591889805d5e324a3cd368cb3998131f2047056c87984ae26d83c9de0277aa6f19b61db4c4d9b39083b795e0891ef7d5394949b5fa44 SHA512 eca7adab1f8aae05743c341a257d4ca4338b0838cc3441939dda48229cdfa13b267bdc338b951bc4e6e139d03d26b40a1294140218f84ab800d211f7e0d8bfc7
+DIST jupyter_client-5.2.3.tar.gz 271787 BLAKE2B 36761e53050874c141c38f545f8f6fb53c144c30f686b3706594d124a65e410c205379b7ecbeed12f1520f0f568c7db3c802223f6fdb8f76407074beacc21918 SHA512 89b980ecc281bc1512e1fc4ba35862cc6e541f825ee07a1382d300c8088f24611225ab415d6a7c1e4209c47a74c113ec95f863e8fb0b33c6db9eb9c3521fc0ae
 EBUILD jupyter_client-5.1.0-r1.ebuild 1006 BLAKE2B fafe7632922c5b611495bac2ecc5bfc1c97bbe0fbaca3167ea3d806d39f7b4b48af638fb6f45b03c43bdd65ee0e2bbf47ec0f52cdd2d949e7d54eaef4c62e86e SHA512 07112f26abed3758fc0c793e6e237c6612ac64df90994e32decc5f9a48f999692c627dbefff010f50277ea3b0ad03f5dde57b7ad97a6dc867d579f6037fedb88
+EBUILD jupyter_client-5.2.3.ebuild 952 BLAKE2B f807026432d5ee8f7708f1a064b71e20e609c6fc8d7c2ff76d0f9fc4810f8f17b76c2c51c94f0cbc0412856ec7675d9e7158598cdbaa7f285a43faa55422f49f SHA512 04378d26190e45cf42f35a8fb11c24f9bab15c129535d27b09a89f79c44dc17d4c17f3b6276fda796d27f57c25d30e291c51ec88ce2a0efbda9481c249badbbf
 MISC metadata.xml 647 BLAKE2B 39c5be4c32d971bf1aacf3d384b370fdcaec2d77fc675a71065bd5b124559b174b3e4b7f1ef8bbdae4fd3f9b873822f4a2af68b1a9e5c05425c67cd67b226ccd SHA512 ffa9ecee1da3f5856daefeedbee972936ede17b2a828acd2ae1f80a82badc834afa2cdfef6f4a2dd70d29babdead8de8f5f60b888f0ff5e72b6b3993142177c5
diff --git a/dev-python/jupyter_client/jupyter_client-5.2.3.ebuild b/dev-python/jupyter_client/jupyter_client-5.2.3.ebuild
new file mode 100644
index 000000000000..df80a23326e5
--- /dev/null
+++ b/dev-python/jupyter_client/jupyter_client-5.2.3.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} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Jupyter protocol implementation and client libraries"
+HOMEPAGE="http://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/traitlets[${PYTHON_USEDEP}]
+	dev-python/jupyter_core[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-14.4.0[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' 'python2*')
+		dev-python/ipykernel[${PYTHON_USEDEP}]
+	)
+	"
+
+python_test() {
+	pytest --cov jupyter_client jupyter_client || die
+}
diff --git a/dev-python/llvmlite/Manifest b/dev-python/llvmlite/Manifest
index cb06b64c5a2e..dc2abe0a6e24 100644
--- a/dev-python/llvmlite/Manifest
+++ b/dev-python/llvmlite/Manifest
@@ -4,9 +4,11 @@ DIST llvmlite-0.20.0.tar.gz 96753 BLAKE2B ec9cfa554f44162c0d6e755628603c9afd8564
 DIST llvmlite-0.21.0.tar.gz 96462 BLAKE2B 8458037ca49c2c7035cc65539c1dc933f26c694e07502bfb0f37adfa389c56d715b53310fa977461fa75d7f826384a9c408682bee942e7cda6a299b16192c183 SHA512 25fb0986faf558995e6405a77d675d1dfcda2f79f8e6f5183d66a16f7b1f323df7eefb54455d9a15412c4eb88cd2e160d9f45038b7d97da6fffe78d7adc0e296
 DIST llvmlite-0.22.0.gh.tar.gz 156077 BLAKE2B 1b95a0636807fcf38955b32bd5c7c19784df2cc6708f23624c047f0e9caf4eb2fc26c7a1cb778d7cc7e42b8aeaee1ed43c92bcdaf7eb2e798c25f692b96b786a SHA512 633ec4d294dc246ebff5c7931e9bea86efa28323242411f3f54bc34c99085ebaef477b5bfd8224080790a12b188308ff9662c284b360e1a2939f4fe9b84a9458
 DIST llvmlite-0.23.0.gh.tar.gz 167384 BLAKE2B f0f64f389004b8c07b40ad42bfe2aa10b06769c59c6ca84fd89c5c38e0f453bc079d435418fe19bdd5b97b9cac698eae5c537417bee181485390745b8d319fc8 SHA512 e4fa0096d73351a73b0509ca312dd79f8b4a50eeae03d7491761c68738e1c4f8204be1c2eefad71e10edfbcaef062dafa4270029e1b254febc580016aff2d3b9
+DIST llvmlite-0.23.2.gh.tar.gz 168206 BLAKE2B 8ed2c2a84cdad80bcdba95e4e2d0f15b8c0a6cab2114b4c5f6eb32a303e29a9185629cf692acaec1455ac059227a755f621147397ece59343347434572186dff SHA512 f5f0a27ff7d523d3ce9c183b60db1106ee89f2650dfaac9e745414dbf91e14cf3ba9056e694148d07f4caab4b9f9fdd1806aa67f580de1b8b317b906d2c4fe65
 EBUILD llvmlite-0.19.0.ebuild 1288 BLAKE2B 27924c47e881063a44db3fce338e5240ad739d8e0283791a623f5ab91fa788e1ae5bf9526adf89153bbefc368166f78aecffbfeee8ba0ccc74c6f43d812b7a49 SHA512 81f241338e6d2e249b8ee7a9b9dbc184f47ed6c461259437f664400f49b2ebcd45c5434dffbd8781f0f6b34e93a8ceaf1394353df5ccb67a19158c72ff5d0db4
 EBUILD llvmlite-0.20.0.ebuild 1286 BLAKE2B ba74befabce5dbf8a93148349e230788702f1372788f99f388c827700a2209c77b7a0ff80a0c728da14f11e6170658b0d87b6ed5ce28a1500c33f8a42adc8af5 SHA512 afeeea625207aaa2ed0a60ac07fb8546e513c21bd8f864d5b0e29570016b5a7431b21d4ba4beb23822cc6be38bce5d5c34604e544b900edba1b6b1cf57f7d600
 EBUILD llvmlite-0.21.0.ebuild 1286 BLAKE2B b182d554d988f63beddc4afee57d32047ec362beab482d1f51e69722563e2608e3668ee3b87050674446fa6d6a5c4a7853b0e6410a670934fa46a76f3e957ce1 SHA512 488fad8be499311fb676ae86194f5571d22ccc97ff397f240b232e13258f6cba15b0422e1b5df5e5ae2df8482382447bbac3ddec6ddf1f0bb90d3fcf1e3dd165
 EBUILD llvmlite-0.22.0.ebuild 1362 BLAKE2B 2fee95bea5f4516ceb3f36afc5f5109e96372c472387f2d450ef64e42e7392269e3fc94c83be04f3c803d476ada0037383d397d41048b707779d1d0f6506577e SHA512 eecbd4cfbced2f8191b669211ab8a64f0657cd891877615b1c2805362a39ce4c5f5b1ba60c672e5cd6f7091a21528ee365f5d5bf809ba12a46e367fd14d16dff
 EBUILD llvmlite-0.23.0.ebuild 1373 BLAKE2B c9a3d565bf96d46f014d930e75367de160b262c7ef0ed628f67ecf20952e4de30a7cd107701697317f3f8c8eab391d19c3e586f18b7657d6a075a0be36e186e9 SHA512 1a3b72daca787f501e37489c6d207c53179314bf3aa71a9c3b6c895ba3f08ac603ffffc23847ff5e6644d162b126e08520a55c05d1375cbf1387905db1bc75bc
+EBUILD llvmlite-0.23.2.ebuild 1373 BLAKE2B c9a3d565bf96d46f014d930e75367de160b262c7ef0ed628f67ecf20952e4de30a7cd107701697317f3f8c8eab391d19c3e586f18b7657d6a075a0be36e186e9 SHA512 1a3b72daca787f501e37489c6d207c53179314bf3aa71a9c3b6c895ba3f08ac603ffffc23847ff5e6644d162b126e08520a55c05d1375cbf1387905db1bc75bc
 MISC metadata.xml 792 BLAKE2B 8247c0ac546df47bc70b8e525d776dd391fa553d75d7bb0507986ac2f7efe1d023db7259f8938c13b383ef719a10acb3e1357bca4dc398a42b68ba756c0c351a SHA512 8dab7bc4b6d33f9a3c458dde08e07fe22680238185e8f144ada7ce7374ecb3fbd38149f67d2a11cba7a816384c556edf618e45ec331e6054b97aee60c529a35a
diff --git a/dev-python/llvmlite/llvmlite-0.23.2.ebuild b/dev-python/llvmlite/llvmlite-0.23.2.ebuild
new file mode 100644
index 000000000000..e7d50fc0b39f
--- /dev/null
+++ b/dev-python/llvmlite/llvmlite-0.23.2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1 llvm
+
+DESCRIPTION="Python wrapper around the llvm C++ library"
+HOMEPAGE="http://llvmlite.pydata.org/"
+# upstream slacks in making pypi releases
+SRC_URI="https://github.com/numba/llvmlite/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples"
+
+LLVM_MAX_SLOT=6
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	>=sys-devel/llvm-6.0.0-r1:${LLVM_MAX_SLOT}
+	sys-libs/zlib:0=
+	virtual/python-enum34[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+PATCHES=(
+	"${FILESDIR}"/llvmlite-0.15.0-use-system-six.patch
+)
+
+python_prepare_all() {
+	# disable -flto, we do not force it against user's wishes
+	# add -fPIC, needed to link against shared libraries
+	# plus use those vars to force our CXXFLAGS/LDFLAGS in...
+	export CXX_FLTO_FLAGS="${CXXFLAGS} -fPIC"
+	export LD_FLTO_FLAGS="${LDFLAGS} -fPIC"
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	"${EPYTHON}" runtests.py -v || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-python/matplotlib2tikz/Manifest b/dev-python/matplotlib2tikz/Manifest
index 53382a72abc1..1e2102a17f4e 100644
--- a/dev-python/matplotlib2tikz/Manifest
+++ b/dev-python/matplotlib2tikz/Manifest
@@ -1,3 +1,3 @@
-DIST matplotlib2tikz-0.6.15.tar.gz 526046 BLAKE2B 4cc3585fe1a83c563fd00928843a16b4ba1ab2fecf8b662beaf40cd9e0211fb4fdb09c4bc4c1f110452621cf5d92f86bb492d0838be20693b86c3b4e9bd73566 SHA512 1f5b05319090d74fbd7ec99ad0e3f236f44107de2381d69e423f5878ba4c7666caca46ab87ae187f52f3ffa907cc4d75018b2ce6c9bcef44062e369f9a26be11
-EBUILD matplotlib2tikz-0.6.15.ebuild 953 BLAKE2B 050308f095cd2e9487d24137ce711c8c2a2648557caeb0457415ec7893936f1e432febc06c766a9ef5e2e4acaddea9fd3c66dd3ed233a7168afff61084f7a3a6 SHA512 b77e444ba539474f79378a25cf8bd4936fbee6a789c3c7ab4bd8c70e1e9714d437cadf60a33e5989586bd7d560ad5ecf16adaecb892ed97be53212e082a162f1
+DIST matplotlib2tikz-0.6.17.tar.gz 526409 BLAKE2B 704ede0539aeb9668b4c1534b6dd13bb2a5bc18e7861bfdbe2e9002cc5a8b8c4639ac77384e1249c52ef33e04986b85f27dc5219e9c9c7c8b7b03cb5a7bf586c SHA512 9a8f34a69147271bb252a4e04bc5ce27c39fc976c29d1530df109287bbfd163f37a3b5f3d6a03def962e06c2a69e7d256028b12372847fbe14459cc664eca199
+EBUILD matplotlib2tikz-0.6.17.ebuild 953 BLAKE2B 050308f095cd2e9487d24137ce711c8c2a2648557caeb0457415ec7893936f1e432febc06c766a9ef5e2e4acaddea9fd3c66dd3ed233a7168afff61084f7a3a6 SHA512 b77e444ba539474f79378a25cf8bd4936fbee6a789c3c7ab4bd8c70e1e9714d437cadf60a33e5989586bd7d560ad5ecf16adaecb892ed97be53212e082a162f1
 MISC metadata.xml 1108 BLAKE2B e2f8648c239f0f117db6f046e0a8fbb006ad25530e791987f974fed0ea105d626bbb867ddcbfba05b1fe041be751c7737fefe241ea31cb6acce89f9d0fc0c115 SHA512 ffd5556daf5c3903437775b6da6bda2623fe8a9d8d6d8a8ce2f3537c3c50bc57353fbb0151a40c1a7ed113fc0732b64b231a38b69f10a785f4e089d94c1507e1
diff --git a/dev-python/matplotlib2tikz/matplotlib2tikz-0.6.15.ebuild b/dev-python/matplotlib2tikz/matplotlib2tikz-0.6.17.ebuild
index 6aaaf8cd6d9e..6aaaf8cd6d9e 100644
--- a/dev-python/matplotlib2tikz/matplotlib2tikz-0.6.15.ebuild
+++ b/dev-python/matplotlib2tikz/matplotlib2tikz-0.6.17.ebuild
diff --git a/dev-python/mysql-connector-python/Manifest b/dev-python/mysql-connector-python/Manifest
index caf59a5e6105..9fa5153e66a2 100644
--- a/dev-python/mysql-connector-python/Manifest
+++ b/dev-python/mysql-connector-python/Manifest
@@ -1,5 +1,6 @@
 DIST mysql-connector-python-2.1.4.tar.gz 11766506 BLAKE2B 41ba6a4515e20de6cfc876ec770b382347881fbd521ed68f09e287be91ababd06544edde7302fa6ab1e9b0f05dd04d2bfe06c5d2c9cb00c8c2f262a4d73a67e2 SHA512 1071c4b3d0e30dd90cb1ed7d6376a7dd688f16b285ab28c26eccd182a3b3c5bb3c36890aec38b037ccf70e2c2ae24a9013139c7ca71e69ae8e9e29f2c15204d9
 DIST mysql-connector-python-2.1.7.tar.gz 11781659 BLAKE2B 332092059a32249e449f99540beb9eebf80e9381cef4560208412a19385894eb2193f02d5a20aceafe9644b8a225926a02d57c3acc89ba7d321b6d0f9c7c4d76 SHA512 f88c3a6dd3c3c1cd5c16165daef801dbcc7ea9163406273dd751e25687a57dcdf4ffbcdb65bb107e8cd9d7c91029823f625dc19ab34116398263fa074598880a
 EBUILD mysql-connector-python-2.1.4.ebuild 974 BLAKE2B a148e95f3388e98a072b7088af9da7ec43716de92106cb315e1b0aee81654ad236a6c4afa008358a880fcb7ac21ec38bbf3c83b564b4361652a75e9758e84889 SHA512 7e4fe486d550b2e6f94e596784690f1e4ec6c3113a8e6ca967c593a64310dba67073e272e6b0efc8e232e382da16ef1c9bd04951af1bc141cb4ddcc6cce29235
+EBUILD mysql-connector-python-2.1.7-r1.ebuild 998 BLAKE2B 1d20c7310fafac0ed7afa9ae13509da7bcdda58fe1a435d22de4c86a797ff9d0bcdae5874167622263078199b63169c92034ad9b0a056c0dfc7b875ff5e57cff SHA512 d29a7dac07978fff4439a479dc382da3e6631d20bc0d4cc6a8cd36ff4eb89a20758797ac1528a013cea96c52bde4b03ee38684fcb8f608f69d58adff142a5191
 EBUILD mysql-connector-python-2.1.7.ebuild 976 BLAKE2B 0cc28ba8d002c25ed7842ee06641c865aa83a84ebf64cdcc7b7136941d8210a70e4ae58b55b3a3af4b1d30f9abeb1d8911d2ebb3466b285b5ec4c5b5706f0f89 SHA512 29612cba2cb0dbd93750dfe3929b0418dd81f488d61829937700e5a2aad429dfa60db9ce1c7ad88d001dc756594c054de8eed1b2a26e821b9b9044e9e9f6d561
 MISC metadata.xml 336 BLAKE2B 280111bac38fbd60e25601789026033a61dab0c2706af1874a765aa3a697cdba5d5b051a0dc28490782cf135104f92e793c68d02b74bdcffdd113252b9a3ac7d SHA512 27da38ceaf7dc44250dcb4651e2d171f1ccf0d5a3a2c04845dc6369e1a264b71ea909f7d799d3eabbd989f4c9c37c201f511887956613bf7176697da63378838
diff --git a/dev-python/mysql-connector-python/mysql-connector-python-2.1.7-r1.ebuild b/dev-python/mysql-connector-python/mysql-connector-python-2.1.7-r1.ebuild
new file mode 100644
index 000000000000..00b4a6a06cac
--- /dev/null
+++ b/dev-python/mysql-connector-python/mysql-connector-python-2.1.7-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+inherit distutils-r1
+
+DESCRIPTION="Python client library for MariaDB/MySQL"
+HOMEPAGE="https://dev.mysql.com/downloads/connector/python/"
+SRC_URI="https://dev.mysql.com/get/Downloads/Connector-Python/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~arm ~x86"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="examples test"
+
+# tests/mysqld.py does not like MariaDB version strings.
+# See the regex MySQLServerBase._get_version.
+DEPEND="test? ( dev-db/mysql[server(+)] )"
+
+# Tests currently fail.
+# mysql.connector.errors.DatabaseError: 1300 (HY000): Invalid utf8 character string: ''
+RESTRICT="test"
+
+DOCS=( README.txt CHANGES.txt docs/README_DOCS.txt )
+
+python_test() {
+	"${EPYTHON}" unittests.py --with-mysql="${EPREFIX%/}/usr" --unix-socket="${T}" --mysql-topdir="${T}"
+}
+
+python_install_all(){
+	distutils-r1_python_install_all
+	if use examples ; then
+		dodoc -r examples
+	fi
+}
diff --git a/dev-python/namespace-zope/Manifest b/dev-python/namespace-zope/Manifest
index d78ef4c65bab..60f61b051770 100644
--- a/dev-python/namespace-zope/Manifest
+++ b/dev-python/namespace-zope/Manifest
@@ -1,2 +1,2 @@
-EBUILD namespace-zope-1.ebuild 936 BLAKE2B 082135d1624f4a32e91f22bc3cf42c725332462002aa1a6d5194ff9c312f781023d15dddaf3e6f2b924458615b9469d0ad773be2789c267d127e1dbfc21fb607 SHA512 edd691bdb50b8aafd9e08847e354f46805fd851a132788ae7a7f2d3e1d185faf9821d765ca37dcff47b49123d7358728271fd0904579f730c25cb64120842f50
+EBUILD namespace-zope-1.ebuild 935 BLAKE2B c87b2ab8b7948a39e582c5025d68d80ba3f0bf276ea9b2ae272da11a6f53b2a59c544c7df6b1bdd895d4042cb5d13fce950b5833ab19a62e18bf3a208cb5673b SHA512 166ef487456ef86ff4814df241eae75b50be51cb404c17baf8613bcdec033d999554f4968d2ad066f4bc4a6451cadff4a4f4244238e2251e24f6332af113983a
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/namespace-zope/namespace-zope-1.ebuild b/dev-python/namespace-zope/namespace-zope-1.ebuild
index e5235f9c95c2..abcf4567e977 100644
--- a/dev-python/namespace-zope/namespace-zope-1.ebuild
+++ b/dev-python/namespace-zope/namespace-zope-1.ebuild
@@ -12,7 +12,7 @@ SRC_URI=""
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/pandas/Manifest b/dev-python/pandas/Manifest
index 018516381878..95f829519364 100644
--- a/dev-python/pandas/Manifest
+++ b/dev-python/pandas/Manifest
@@ -3,6 +3,6 @@ AUX pandas-0.19.1-seqf.patch 14381 BLAKE2B 8acb677579d429a7d82712477f8e820256119
 DIST pandas-0.19.1.tar.gz 8360233 BLAKE2B 82611ca1a3e3169ac2d084f4dcd9c4d4d74e9e9c9913a41acad48ae68a208a884dfd877445a7d658a7ff098ef383cedae7e79a4900baa8d56c032ce9aaad96eb SHA512 6451990a7fae8c6db8ab0b014a13b4f1828754d3998f13c17b111f891fb9fd23f8e09b907623096dfa55668c42298eee1373210a9fddb95f56dd7d552b964e6f
 DIST pandas-0.23.0.tar.gz 13092442 BLAKE2B e11ae088c9a4be481f516d83797b1b1d5e9c82f7d9fa98f1ea65e3405e33c99e1e1cf7a35f56a21d9dc922c1d0828b4947d9c6189a5f76ad5c1b28618293f9da SHA512 c9dc7bf843e3392b8b1b4d46c6aa6dd12435aa974abc875574a7a8794abe6ea531fa92d8a635153839fd3fef9059d96a4512831b86b1fb6fb69588c8b29a95d6
 EBUILD pandas-0.19.1.ebuild 5913 BLAKE2B 994e9ea3397d2dacb0a01ad17c8285cae39a898c5615b42598f0a85745a74b4c01a2968da343a969160f18658fdae8cc6e6f0288f7254189d6233a4e16b21923 SHA512 6e88582440d02ad3adf338692082ff671c0c4f93f56adb029abfa5dea7210de30308371f990e4b2bbcdfbd510040e40c18a373123a862099d779993f81dda714
-EBUILD pandas-0.23.0.ebuild 5867 BLAKE2B 1f646f93b08f31f65bb61479fb09b3cf1005dd21dbbe859c332de535f2540f22bc53180e23bbdb66870a0675ca527f37343b3a5f9aabde9ae1c953775bf9a76e SHA512 922c5dcff6e238a018781f2b289149fe004b72371411dc0f3191565c9a590e7fe5f3e372ca8e524c4745e26789e68d5029e7ff96de23f1ee274aaf4c6e2fe828
-EBUILD pandas-9999.ebuild 5824 BLAKE2B adee94b3e8a50e86a21ef64b75650ae372d7b9d9be888519fdf4769e6fe3d6e4425e5c325685f820b8d7599addc39e260d6b138080b40f9e275586dae9a3a096 SHA512 043c913888f3290c2bc651de252ac73d8ea9c9061a72781f747d291f46a3f8dd4b760ef2449f61b5249a79293dcad6ca389b11608e0431c6324c9e1adde1a189
+EBUILD pandas-0.23.0.ebuild 5907 BLAKE2B 552a809a85a1ec3842c5e3ef7da41c32b07818f11a00121eed4fe4ff3131d8e90a3f56dba4f2f546fa226e23f29da8d3827bb17f676caf654b7c1293de294226 SHA512 e1b4cce520baea14cfaf7c46e7f4ac881b6871133b13c50828ed946482b4d4f3fca688db4508007a108fd7f94997f384f6ca14eb53667e9f28e697e8d8aba94e
+EBUILD pandas-9999.ebuild 5864 BLAKE2B 23df5dc740f518ce7c82cda5d351b248f8d8e0983b937be43200f2a2f5bc6d48ea71234203fc6776f94a9460dc6e6340dbfa0248b64205eb2792a7b633ee58a3 SHA512 80c4d885b9dc3872b3da9a9daa9f18e2e1b226d249b23eb2d8b3b3161458648ebd77a2c3b17d25e58d2f278d9a9fc2372a62b946acf24bdc441da882067fee67
 MISC metadata.xml 834 BLAKE2B b075b9c90c4f1be265117df2c47ace4c86dad3fec9945b5a483a11048211348ee10e433f378610de4a9b599031914b32992b9fad693b832cf0266b0f171b3e38 SHA512 85ad67a653f4ced5fb9331b778fb2906c253874cf8e522f1b67547ef8e2f49e084e84d9e055aee7e2a57c6e6e4e7f7791a4ce299fac7c74dd6448a94977e8f5e
diff --git a/dev-python/pandas/pandas-0.23.0.ebuild b/dev-python/pandas/pandas-0.23.0.ebuild
index 57471830de8c..3664e9b78fea 100644
--- a/dev-python/pandas/pandas-0.23.0.ebuild
+++ b/dev-python/pandas/pandas-0.23.0.ebuild
@@ -76,6 +76,7 @@ DEPEND="${COMMON_DEPEND}
 		dev-python/ipython[${PYTHON_USEDEP}]
 		dev-python/lxml[${PYTHON_USEDEP}]
 		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/nbsphinx[${PYTHON_USEDEP}]
 		>=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}]
 		>=dev-python/pytables-3.0.0[${PYTHON_USEDEP}]
 		dev-python/pytz[${PYTHON_USEDEP}]
diff --git a/dev-python/pandas/pandas-9999.ebuild b/dev-python/pandas/pandas-9999.ebuild
index 6bf3185ad30c..469385a6a855 100644
--- a/dev-python/pandas/pandas-9999.ebuild
+++ b/dev-python/pandas/pandas-9999.ebuild
@@ -77,6 +77,7 @@ DEPEND="${COMMON_DEPEND}
 		dev-python/ipython[${PYTHON_USEDEP}]
 		dev-python/lxml[${PYTHON_USEDEP}]
 		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/nbsphinx[${PYTHON_USEDEP}]
 		>=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}]
 		>=dev-python/pytables-3.0.0[${PYTHON_USEDEP}]
 		dev-python/pytz[${PYTHON_USEDEP}]
diff --git a/dev-python/ptvsd/Manifest b/dev-python/ptvsd/Manifest
new file mode 100644
index 000000000000..8b8e512999bc
--- /dev/null
+++ b/dev-python/ptvsd/Manifest
@@ -0,0 +1,3 @@
+DIST ptvsd-3.2.1.tar.gz 51934 BLAKE2B f94b57430bbc39bec90867f3d3b0e98fe88e3a6a8df26ef62f9e5aa4b966358c960881acca4df5a5f8d4538fad0a1c095488b11602673c092236f3110f4e9f8d SHA512 00524c80323ace2753a3ad07b441357f1d4a5c8a6a64eaa0d42c09fac9f6db2c291a1e55dd12ddfd46c257490979359088498fdfdf9fe7afe04bb6ceace33654
+EBUILD ptvsd-3.2.1.ebuild 552 BLAKE2B 04aca203e29a48fb70c4e9893877025beeb4e8864c9eb57b956ab0e303cddd3b6cc01ffbbda140fd491f703c5dba2e16bce101e3c7efa60dde8aa7b96b931352 SHA512 4d933ae4da8689c904ca63701b078e4228ab03423ed976a3f7192bffd24b5c7b9ff83219bc615ae9ab311518ca93cde1549392e35f4c944353bf2c431dbb292a
+MISC metadata.xml 341 BLAKE2B 1a9fb681f0a7e155da2d3584ef81421b359cb9c935590780b9773140cbeccb81e4d97811a4bac800096096a06f24a10c51cf5fd9d04fd7f34b7efb897967caee SHA512 1a0bfdbe1365247c7f1ad322c1a6216c0d90edb549b7d8f83ecab81f0b72385d2f43b684ecd01d8bdafa7c4e3b0cefe2edddcbfd910a126a2488d0ba3e46030f
diff --git a/dev-python/ptvsd/metadata.xml b/dev-python/ptvsd/metadata.xml
new file mode 100644
index 000000000000..eda35d8bedf5
--- /dev/null
+++ b/dev-python/ptvsd/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">ptvsd</remote-id>
+		<remote-id type="github">Microsoft/ptvsd</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/ptvsd/ptvsd-3.2.1.ebuild b/dev-python/ptvsd/ptvsd-3.2.1.ebuild
new file mode 100644
index 000000000000..8fb3f60afd06
--- /dev/null
+++ b/dev-python/ptvsd/ptvsd-3.2.1.ebuild
@@ -0,0 +1,17 @@
+# 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="Visual Studio remote debugging server for Python"
+HOMEPAGE="https://pypi.org/project/ptvsd/ https://github.com/Microsoft/ptvsd/"
+SRC_URI="https://files.pythonhosted.org/packages/59/de/54ad88ba555ce66920165949febf4810359c000c4c73568a6215603b437d/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pyblake2/Manifest b/dev-python/pyblake2/Manifest
index 8bf88a6bdd7e..8150e11c56a2 100644
--- a/dev-python/pyblake2/Manifest
+++ b/dev-python/pyblake2/Manifest
@@ -1,5 +1,5 @@
 DIST pyblake2-1.1.0.tar.gz 125855 BLAKE2B 46af4c24882040bbdd221f90e06652918798e4555c0a7307a596ca4c9ed3147f00297269a44d174782c2b0402eac03ecf5387b1c5a16efb57d036730b58b2630 SHA512 e13c7e4f3a35155cbf531e337895349ec01f0ac36908a4e746cecec063601adfc8a73a7961a9c310d01d3231f44f08d2cc92e891e9cb87659bc7170b9fee6102
 DIST pyblake2-1.1.2.tar.gz 126693 BLAKE2B 01690ec32a07b7ea59d7d040523ce8cb523f18927044f2d38c0a143a344fde661498e1a4b35a0f161be7b761a324677f80e88c4a0045dc324f0d588997e884f2 SHA512 26297d788208a80c8102602135332d5ee1424711d9c693828af232b5546301c5d144680367a954d8d9765998a23b82046b157b0072fdc63305ff0088feb16e55
 EBUILD pyblake2-1.1.0.ebuild 800 BLAKE2B 5c3fa94d977b1579966283790a073aa038f26c07d420cd713cfcdd96a2da7c9c4cf3d4180f5d9bd8c51542852392c7cc7d2b3c5ea827943535c0337033119545 SHA512 b1ae954130ed64b5d9bf7ea3d97634a38d38cb1fb659a50bfd349f3d0265c65d3e0f1c3315b265a18530e912973a2b0bab5ed4993f535170579e0fc26ea3e16b
-EBUILD pyblake2-1.1.2.ebuild 860 BLAKE2B 64f2e01ff44b80a071dd689f66cd22d96cece3f8f6e9cd0927005219b7cbe80d8d52bc3612eadb19f052f19b9cfec5ea59f83c9a042884d0835083122fa57498 SHA512 3b955fa22ce43ec33f946346ef6cc6f4324851618dd7b292edb6379e8debe3b43e5cd6f5e95d29511f5e9e4b39ff767ebe17e5064afe94d069190f50e67334d3
+EBUILD pyblake2-1.1.2.ebuild 856 BLAKE2B 7438fd71cc7db5597b9d909c7678ecc9d56e5547ef084f6892229c6e20a4d3c2c30816fbd906b3dcca7c10ad9d9ae8a48c4ad4f6fdd87ad15129b0629c8a7771 SHA512 15ec72d6632a9427f45d4d3d2fb65609f18db9d14c7dfa12f8f83a889d42a2ffff15e7098bdb3b497814b32b570c66cb8dc9d89939c14376fabb189602e84869
 MISC metadata.xml 452 BLAKE2B b5539d95846469f07dc0ec47d4c34f4ae7fa950c58d728f5ba92efb3f74d849598af1eeb7c3d3ab90a41591746e94b3d4c3ea5330c423fb340cbec4a1da28e80 SHA512 28acd5472435f8832eb8cb7587e651f428309e9a37c17cad378fe8f01c47896115c4d42ace1c6125eb99ddd30de562d42503b6dac42432b55b37775cdde7c1ff
diff --git a/dev-python/pyblake2/pyblake2-1.1.2.ebuild b/dev-python/pyblake2/pyblake2-1.1.2.ebuild
index 4cd01bd6babd..97f234dbbe23 100644
--- a/dev-python/pyblake2/pyblake2-1.1.2.ebuild
+++ b/dev-python/pyblake2/pyblake2-1.1.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 # pyblake2 itself allows more licenses but blake2 allows the following three
 LICENSE="|| ( CC0-1.0 openssl Apache-2.0 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/pyftpdlib/Manifest b/dev-python/pyftpdlib/Manifest
index e47448249562..f19ab3ffbc48 100644
--- a/dev-python/pyftpdlib/Manifest
+++ b/dev-python/pyftpdlib/Manifest
@@ -1,5 +1,7 @@
 DIST pyftpdlib-1.5.1.tar.gz 127582 BLAKE2B 00233ab4acf5aae4902384f514de0d6da9a55b7312b7744ce3f16fd222b5abeae0c65f0f9309ff40d0cbd960baee2c269a1fc6ba72ed8f700c7dbfd47e646a8a SHA512 81bb634aef7190d97b5939b998c8dd8caf1ce77c2ca66d085826880590a03e7fe4aeefb5eb67f30f25b984962eaae740c4c8c1d5900909029702e37c36bb2b9b
 DIST pyftpdlib-1.5.3.tar.gz 183189 BLAKE2B dd563f59ff21b2059e1c6d6ac6015561d5e0de07b52ea212589afea61abe63a2a61deed86bb133969c8dc99b826b7e23ddf071e0b28ac7b84a066f3fa7f31d90 SHA512 f0e56f170fa77e0866cbbead52ad52276ee45b6c3244557bc59cd2bf599934ae4414a684661d4d47f76098b3da19e23c1a037aaa07a6a81f8d1be14b90191517
+DIST pyftpdlib-1.5.4.tar.gz 184986 BLAKE2B 6973b1f7e0fc0c89eb5d79e082690a706b56553ad4b2ece68a8216bb99c185d770475e349402ec71baf1bb06e5ecca5be2a3c52512f0d8283c4cc249bc28a949 SHA512 6eb308021dad28c1c51a88b366947a71b7bc1802571dc14cedf3a264bd0cb8504ef990d7e3110d10709f971d4d5b0001bee859b58fb4d02a1b0d46532acc9295
 EBUILD pyftpdlib-1.5.1.ebuild 1298 BLAKE2B 2b6ff8c9de74fc7e94720c6deecc32ac2303674f80230b7b2823f43c84755153f69d6c3254264a5b1f41ead167227b71fabca1341549765b045679686d9df1f8 SHA512 5c44d3dcb62a9b72e4773bb5eef46b69576924367db85de5a73977f187d0cf5c8023c0756b913dcc238d6e3ba16f62a06355fd74463bfbe716a900aa3eb86468
 EBUILD pyftpdlib-1.5.3.ebuild 1463 BLAKE2B b133fb918b07756287a1936f7639946541f241736e494834d06898cb0c193c35e07324307f612e5b12389999477bff44f0729b94d83e15faa022429fabdcba19 SHA512 dcec60595eb0f5fb72ca7f72b657b3f275dc80974a1bd6655704fc00bce2c4c25d3c4c6d42f6c7f0ae202d70df95c4a26fc853448c4948feb3f690c452ca6f0d
+EBUILD pyftpdlib-1.5.4.ebuild 1693 BLAKE2B 8c29a8999d93fa682151fe7d5fa3b6d7f0674b1c87e67226370a54d36db7d156c7beb527e78d4359cd32212f3000873b57c9862850295f70b1cb2c6fe250583f SHA512 9af8ba7d7932286082fef24650e50416125363eff4cfd6392d8b57e7dea865c4393d7c87ed5a05ae02309216d02e1bf5c040c9556ec67cd6b1178c4ca64edb53
 MISC metadata.xml 438 BLAKE2B 0e0860eb9d885ec9b432b504bef6a9394cf4a2d6d99751c80fec8441d8910f8a17364e5f32782638ac689abf5cdd3ebcb5fa20e7da3d612a5e8844e8c8a34d76 SHA512 a748827370b53c94fed352cd6bbd7468a22c7ca2f15c4601c98a2689e3a7e652ed28434bcd125fe0f3018d5508600df03130c18d7d67834b28ac0c3480b16345
diff --git a/dev-python/pyftpdlib/pyftpdlib-1.5.4.ebuild b/dev-python/pyftpdlib/pyftpdlib-1.5.4.ebuild
new file mode 100644
index 000000000000..bc5c598d7193
--- /dev/null
+++ b/dev-python/pyftpdlib/pyftpdlib-1.5.4.ebuild
@@ -0,0 +1,68 @@
+# 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}} )
+PYTHON_REQ_USE="ssl(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Python FTP server library"
+HOMEPAGE="https://github.com/giampaolo/pyftpdlib https://pypi.org/project/pyftpdlib/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~m68k ~mips ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+IUSE="doc examples ssl test"
+
+RDEPEND="
+	ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	test? (
+		${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/pysendfile[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	sed -i "s/'sphinx.ext.intersphinx'//" docs/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build docs docs/_build/html || die
+		HTML_DOCS=( docs/_build/html/. )
+	fi
+}
+
+python_test() {
+	"${EPYTHON}" ${PN}/test/runner.py || die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	if use examples; then
+		docinto examples
+		dodoc -r demo/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] && \
+		[[ ${PYTHON_TARGETS} == *python2_7* ]] && \
+		! has_version dev-python/pysendfile ; then
+		elog "dev-python/pysendfile is not installed"
+		elog "It can considerably speed up file transfers for Python 2"
+	fi
+}
diff --git a/dev-python/pyopenssl/Manifest b/dev-python/pyopenssl/Manifest
index e0e4dce42c12..7690087c9e4d 100644
--- a/dev-python/pyopenssl/Manifest
+++ b/dev-python/pyopenssl/Manifest
@@ -1,3 +1,3 @@
 DIST pyOpenSSL-17.5.0.tar.gz 170870 BLAKE2B e8b8986a7c5475ac3898df4877a8be86db359af79e1718bad85149440cff543c501ee23eb369270d2c539a9e3f4e13165ea87b858ef6916ee79ca6e49f6e5370 SHA512 f194662b5842f1e3a4fcb910b9f2e6482d1dcdf834f306acc3dd6d9723f65038f7bff550248fa6268d90c839c9d9e8248bb6c7d399495fe6aed25291b93ece86
-EBUILD pyopenssl-17.5.0.ebuild 1627 BLAKE2B 20ad9d740bbe796302a4311d8eade95d349c936a3f4dba22c271439452413121cbead6fc822c847933202e9fe2dce1cc8e52bf12d6641c32826e372d2ec098e8 SHA512 e0cfe96a7f9f2ad6b8047284df2347e3bdb19dc13d6643b67eb58cb1c2fc4a7e6c74139d3711994ce8ad1e65b32d9aebaa3854ccbbc539ca5e39afec2b2d4762
+EBUILD pyopenssl-17.5.0.ebuild 1633 BLAKE2B e6f88fc39b487de408b80cf15ad2bd759328644b032752650f9b2a7cc523cfd6be0c959918a137321aff9b29711a6813a23bea838ed08659a92cc5b779179f3f SHA512 4c4aea08ebd461276d517ecbcfb1b6faffef6cdbf2f015dc0e2abd0e291305f47aea2b4b750ce1382cff7603ca902638a03ba2d01e30d2cd20d69868130c98ec
 MISC metadata.xml 418 BLAKE2B 69f135bab3b0cffa47cc8e807e1f537f7fa0bd599bf3309ab92ddf41f894c21ab0e3f793ea4caa65d272043d2dc0352fc54c7160b31fccabbeb165775a895d97 SHA512 5cd4b0381e79245626500a2a38b9f7bedcc8e4742445ac16f12a96133f1291ec49592f2259294f153d5f1b27969cd6f7f364d49f32d0793b12b2ad38b824f441
diff --git a/dev-python/pyopenssl/pyopenssl-17.5.0.ebuild b/dev-python/pyopenssl/pyopenssl-17.5.0.ebuild
index 3ef9a3171db8..cb67bb84ca77 100644
--- a/dev-python/pyopenssl/pyopenssl-17.5.0.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-17.5.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="doc examples test"
 
 RDEPEND="
diff --git a/dev-python/pyyaml/Manifest b/dev-python/pyyaml/Manifest
index 05917f94f957..da57b502804c 100644
--- a/dev-python/pyyaml/Manifest
+++ b/dev-python/pyyaml/Manifest
@@ -1,3 +1,3 @@
 DIST PyYAML-3.12.tar.gz 253011 BLAKE2B 530f2910acb757af9e2a738d93ace45daee3fc5764f19fbc758508e873f05ebfa2486c4f82800540e5e405e7f114f06f963e5011908fd15014ca8b8afb3a76aa SHA512 e16d8b7f4f026b6a95b11fb59c54ec5f114f6f516294eaa95e718abdf5d37c17a9c4b5e0a0a61fca04e801792d9b7fb801087cf849ff22b9581f6af204b1883a
-EBUILD pyyaml-3.12.ebuild 1059 BLAKE2B 60f4c54c132c10d258461b74f1ac28f6bc7e24026e0f01af2edf528556ca7f385bca94043fed1a15c449297160704fecd51fca8f4ee86bee473ae09d5a5b5322 SHA512 e3ccf231d8fd16aac853bf3dc930795bab162fcfa3e4a1cec734a3dda3c7e1426b122e16b0ac1d68c05b9febfbe471dcecb83dd030df83bb078a4e87cb25f6e5
+EBUILD pyyaml-3.12.ebuild 1071 BLAKE2B 26371843719c51f88f646e78efa236fe263394086aefd11eb6d09e37631f5d5e9ad6874fa14ae855bbbddc1a48b8c58c6257df609e3b3076ebeb6e92e9693096 SHA512 a656e21e09ca66d23db90bf0d393127245b5076b55f59109bc0cd1333c3e89ffbd55b3691620baf54fc3bf6d6e2c8681407b0b971e405fc4ff84765532fa5ea1
 MISC metadata.xml 345 BLAKE2B 8c26b8b05b08ed9abab5ed2cb36552dc9af33ee2b30cf3ebe551576d7ad44908b3dff195cd7f1a3f5af9323d17eadee407e42bfeb99150be2a0ac4b48653c1eb SHA512 1fdee5219c989b3edf11bdb63264c6ca6bd54fb1f44907bf20ce7ee6b1968c9c6f2c94363698be87d92eb6cd07a034acca7dbcffaeac40d2add8d57a240772da
diff --git a/dev-python/pyyaml/pyyaml-3.12.ebuild b/dev-python/pyyaml/pyyaml-3.12.ebuild
index 47a7cf1510a8..e374c93b7ad5 100644
--- a/dev-python/pyyaml/pyyaml-3.12.ebuild
+++ b/dev-python/pyyaml/pyyaml-3.12.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://pyyaml.org/download/${PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="examples libyaml"
 
 RDEPEND="libyaml? ( dev-libs/libyaml )"
diff --git a/dev-python/requests-toolbelt/Manifest b/dev-python/requests-toolbelt/Manifest
index a380f831afde..3d0d9d80c92e 100644
--- a/dev-python/requests-toolbelt/Manifest
+++ b/dev-python/requests-toolbelt/Manifest
@@ -6,5 +6,5 @@ DIST requests-toolbelt-0.8.0.tar.gz 196129 BLAKE2B 435059ff2879c44a274641c49adae
 EBUILD requests-toolbelt-0.5.1.ebuild 496 BLAKE2B c5bedc4e7b17cc2932e3801f98c29f8885a83e4071f08bffee3cf07af2dd78a876950949be5851f0abb9f619123a730c4e2ea265215b0189ed4698b696af0e5f SHA512 8d91f3a4637944a9b19e8abf93caaf4be208f7a52a1760351b95037485980ace11ca6be63bb1b5465fda5ea8e245e437426e46595d6d5ba1f5754fe9478df801
 EBUILD requests-toolbelt-0.7.0.ebuild 496 BLAKE2B 4be3275cb8b4140a1ebfdc1fbf74edd711154d58c180f80da133e61937267dab47af989de3955c74bfbb67f277137a39b125bdee422a8a36e9046ff8fcc0a02b SHA512 440173c9a947e5a8f591fcf7aa8c75d5ea2b78ef80db14c59e4da68fcd4d438d1be3247054a89ec17049e102457ba02b928616435ddeb5e775991da3c7cff721
 EBUILD requests-toolbelt-0.7.1.ebuild 766 BLAKE2B 3011c5a00c9c8bb2025b02bcfb626fea0e79841b2bf63760a876aaef8a757b6e64c60c2b661e88e00852e66f30d000bae6106c6e85959bb5ca68a5d99ed554cb SHA512 103507c91c951cbb1a3af1860c31634cd386d33903667b73978580854290dd47d421e313cae9105c4a4656b35eba803e73afec6628105654a5b92d973580c50d
-EBUILD requests-toolbelt-0.8.0.ebuild 1032 BLAKE2B 07402aa20bd3cb8d17186ca25cbd9b7e9a2cc820622b5da4f465f9f2157e46bca3b0ff32ce53d92d4f72245532e5fc221c932f4a8bcaa0ffec30bf2b6f94a3c1 SHA512 60385428cf927e46817ca91b91a4a7e4232fc3c9a08c854995e0193438792b8851e1fb6049836f1a38690f60d02a53fe16a84b0646df0c5a68cc4bf426c703ba
+EBUILD requests-toolbelt-0.8.0.ebuild 1031 BLAKE2B 32afc93af286ada098c415f5968fbe0e4dabcfc672ed97b87cf232083b987984dceeab1c2ba0f360e0da7c7ea45640e51795c5550e29659b1a6241484ad44f85 SHA512 4d7be375b9fcea1263f2f796fcdf62d2e90f2afd5f6dc800775fb682a47571ef6dbaf74f9012af79f5e7c3f59a2fbdc40910cbc425cea7a97efbeb64f8e42181
 MISC metadata.xml 297 BLAKE2B 0dbab9c3d9697a1ac5ab03c7111a1862d977546c23cf42967669a6e3a19eff6e81b2a0701cfc2e11904c220026a5bc7b19934cca17339ab7f9037891ab5b2c8f SHA512 46897583f3474724b466e1d1a6b5e0d4c4d557730ce38c809ac2224d2b1dec3e844c0b66b7b6d9f5e60f82cd51a791c1a3ddf545d9898d70038ea2af183a8691
diff --git a/dev-python/requests-toolbelt/requests-toolbelt-0.8.0.ebuild b/dev-python/requests-toolbelt/requests-toolbelt-0.8.0.ebuild
index bd0cabd5197c..a3058c171dd2 100644
--- a/dev-python/requests-toolbelt/requests-toolbelt-0.8.0.ebuild
+++ b/dev-python/requests-toolbelt/requests-toolbelt-0.8.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="test"
 
 RDEPEND="<dev-python/requests-3.0.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/sphinx-py3doc-enhanced-theme/Manifest b/dev-python/sphinx-py3doc-enhanced-theme/Manifest
index c3095dda39fd..7c1c88160b28 100644
--- a/dev-python/sphinx-py3doc-enhanced-theme/Manifest
+++ b/dev-python/sphinx-py3doc-enhanced-theme/Manifest
@@ -1,3 +1,3 @@
 DIST sphinx-py3doc-enhanced-theme-2.3.2.tar.gz 41894 BLAKE2B 9a38169b7e2c3331267f5c0a102d01cb0185689334adc98abe91626b27217add0abacde3422fe528588322ccc96f6976b80ce0e510cecfa80837d9b595cb2457 SHA512 efeeaf1bbb7f5557f5e1500dd0a49aa001b714f329f594e95676d8833eede7eb5e0fa978257caeab9630360b05f48132ffb00137262c7a5b663cae6a009ed42d
-EBUILD sphinx-py3doc-enhanced-theme-2.3.2.ebuild 569 BLAKE2B 6210a82d0d76d4fbb8f61e98fe0b90e8cfa3ebb2dee428bd5414ee984d8bd82555559b1744331a46119a10db1f62276d427bd7242a5459e977ed3ddbc7b81b48 SHA512 e0b3bd81a69ae020659b2190ae184944984f5608e0217681730f189ddd8ea24d21d0a974c952b51f98ead1c5aed46ebc77ac28405a89d38cca6a20333b680ee7
+EBUILD sphinx-py3doc-enhanced-theme-2.3.2.ebuild 568 BLAKE2B 480bcb0cc9bdd616dcb1d3bbda19a5516c96ae0780903a7ca437a9784efb9cbd4e91bb41ac21554fc3f2f79c4947c58e8c53bf4a7c162bd067028eb65c2aeff2 SHA512 5707e77392ff4bfb216f5f33067c63e0199ea25bd3985ddff21baa8bfe209447c9d2258edb227c3e1f078697f5e67d082527644f66ea3fb829b513aabc712308
 MISC metadata.xml 593 BLAKE2B d8e69d801973c15666c838797ca8b5bd746623b2bb2915db38e4b7461757abd2ad6dfdd95078348775c0494dfd19dc5937337b3cc9966bbce88a3711f014c3e7 SHA512 21771b0ca9695c748fe0fdfddaff603a296c671af1d1e7b097fdab104eaa33ea61bc4ff887f27f94cf0a76ff9a52ddbe7055167b5f651f954e78f318a7f9d9df
diff --git a/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2.ebuild b/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2.ebuild
index 68356250c40d..9a090c9d00a5 100644
--- a/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2.ebuild
+++ b/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-python/ssl-fetch/Manifest b/dev-python/ssl-fetch/Manifest
index 33d4628c5ace..22dcaa96793d 100644
--- a/dev-python/ssl-fetch/Manifest
+++ b/dev-python/ssl-fetch/Manifest
@@ -5,6 +5,6 @@ DIST ssl-fetch-0.4.tar.gz 11663 BLAKE2B c75173f40367d1e84a0ed3e13dbc7e6b8270302b
 EBUILD ssl-fetch-0.2.1.ebuild 1190 BLAKE2B 8885d59e82aeac71900eaf0a4bb3228eeaf56fe948291f584a20f1e4c2089aca10ce162a6e4cb4e5c80363333b2e69355e89d7154efbaeb0089b687717e272f9 SHA512 eda99d106c18e6e478bf5b01219a2c691e693cf1e445a8917cd9ea87b48ccb5edcbbb9ff782cf3285bb8c41aaad967489af6cacb63ffd6cc616bb821d66dd5b1
 EBUILD ssl-fetch-0.2.ebuild 1139 BLAKE2B a0a79b33bf3fc0bfd732796adba22e132998af0187065e7f4041737154a82303e042935246e4bb108af52bbb2bd7f189157a8fcc181c10a7f4df4091aa3e7366 SHA512 b4f62fa1589c0445ecb7d884ac6775eea3d40430eb647ae6f01e63dcc360cd21efeb7fe1aad08137071512c158cf60725eadd82d43449784694ecb2186d11b2e
 EBUILD ssl-fetch-0.3.ebuild 1189 BLAKE2B 50a7db90b1b5a8d9f8c6337f72ff9226d61f0a4fb56e5b9e630c4ffd406031ecc8dc1536b784682e76f2c8865b8f80906c3264eba6667ce4adec53e613434924 SHA512 1bdccaca073b9ef7cb4935f0f5dd8b3abea4f733293261198ea70783ec68bc934d43160ac3754ab1a85b839d522844189c0676b1684878e6ad28446c63c159d5
-EBUILD ssl-fetch-0.4.ebuild 1210 BLAKE2B db98c96315cbe5b285aec06533f45f4c887755ac4830a3d53f4c01590c724ad75ed618ae374bc7d2ef41978dab5817466da35999e6b596e29e9cbf65d2b41774 SHA512 43e2921a5fdcb33eb96d5aa67c2c10e24fbeac8336292ffb35ca690060e2c03ad9ac15a725e5cdeb0ab034faab578abe559470f79b708b86a84d4410df29d8a8
+EBUILD ssl-fetch-0.4.ebuild 1223 BLAKE2B c5b68c9ac015216a5982de30acda79a37db70bdccf0208d6b004593e46ba83653daeeb86bf67864a2498815e13652bd8a1a9413c5df2e33143038d55c29b475a SHA512 3324c388fb175b979a617c6c1e14e2b07eb57b023a4236ddc4a25060134ab0cad6b850d13a84c39c28fc4d1c6e1d4a61ddd7946e07eb6e1180e5ec9ffcb23e47
 EBUILD ssl-fetch-9999.ebuild 1092 BLAKE2B 4f6e214f1194c740942e0e115347d6c057a56266afd4651823caac2621bb87ac39c2c64754741cd47ec1798c4091215562308145a5f75faf8faeac302ba6defc SHA512 3fe14a2dcffc91568225e8d889d03d7e12bb53638f137756bfbbedaaeaa3aa540fe324765d3377c2282eab76c415c23c87578eb6516ca0c44418cd0326ae5bf3
 MISC metadata.xml 585 BLAKE2B 660e38c7d1e6eb94fd0d517ccb3cdf563f0bf62e2b427368932a76fee743def08d377db47f8f3c7269a9f8bc89a72d4bbd7ed1280453e505a5365a4e1e541fce SHA512 e654050b05973990c8ff763039fd131a2f08916f81caf09d36cb5baa8fc91c4b15522319e22ffc689ce52a0d0c8fb63af5bacd894d9904e993242b3a8d653ae5
diff --git a/dev-python/ssl-fetch/ssl-fetch-0.4.ebuild b/dev-python/ssl-fetch/ssl-fetch-0.4.ebuild
index 37bd889cfd86..39ccaae590d7 100644
--- a/dev-python/ssl-fetch/ssl-fetch-0.4.ebuild
+++ b/dev-python/ssl-fetch/ssl-fetch-0.4.ebuild
@@ -15,7 +15,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 
 DEPEND=""
 
diff --git a/dev-python/traits/Manifest b/dev-python/traits/Manifest
index 3ec47609d54c..295a7316d2d8 100644
--- a/dev-python/traits/Manifest
+++ b/dev-python/traits/Manifest
@@ -1,5 +1,5 @@
 DIST traits-4.5.0.tar.gz 4853612 BLAKE2B 6c3d83718751de1e0553487a45d073c285ada96686558133fe61472c29c3d4661e1c0bce68340bada9667f3f9e0c8ed11050a714bc0c55424dbd4ebd17e3ad8e SHA512 d506b4395395898eb824896d299bfcde609e100025cf9a55cd7d7c47615545efd3b007e46549e564fbfb2d5882b36ae676843f211f168b2557c504849c5ef582
 DIST traits-4.6.0.tar.gz 434937 BLAKE2B 91d457b411f78b74a077f3bfaa8e3f627d0ddb959784ba0ce9e07e3fc8b76cddcaee1fd7293d8336c4fc0630d49527fd29e1a9ccba6b724846069f6282c643e8 SHA512 0fce336696e4cbb1d4ba63a07ad42867cb179a9efa6c348623036bd6d2eb791302539ae89994b11acd5a9f1be42a0febeb517db1716342b78aa71ca1277fde99
 EBUILD traits-4.5.0.ebuild 894 BLAKE2B 2baa2e7b5e93f71a886c9ac089b3c53e00a1b530644e395a972f8d738e5bef675c33c326083f568a5f5a57417b8bce8fb1a31a367d065efc312b4a648d121737 SHA512 a9cbe9b572b8fcbf31f5cf5b4843da932fcd51715be442ff4e254b557e598a7c0368d47e76ad91e6c7ca8c44f6669c95e880708864780b46774394b7494c72a1
-EBUILD traits-4.6.0.ebuild 936 BLAKE2B b410aa1c293867d2be8b2549c1c9a367c12204c784613fdb8dee2dc6b2c0dbacd16864637489225ac936d192d7f7e9dbac0ae635e48de07236c279c61818c2ac SHA512 f6b0a5cb486f4851b094031cbc01a41038a3ed88538f9d9b58a10224720f01423dbe56518136f712b2fe7b06285aaeeb2b968f7dd826896ed83bd68ab8d49b8b
+EBUILD traits-4.6.0.ebuild 934 BLAKE2B 4e47cdb7ee015f07feeb4a125e8bff246392434c47e16500a1f48b7351d5a4b899fa2c04fa5103298052dd1721bde46d42b01f4f3bbd4465407258732f9ea11d SHA512 dfb723c1978e133614e5f706b0bfa09cbf7642d62c4e54fab754a52bfd14fd83a414d6d361c9e7f73e248e164132295767bb698f98b4ec8187004ed7ee5475e9
 MISC metadata.xml 1133 BLAKE2B 22ceede6128cc9a0688d4d827512b118a674e95492f889a5b8c3042811fcea27020f7696752905e5cb6e57015c838f7b9beeccdbab8f90f93d6c91ac04b023b4 SHA512 4cbab7c0b05c5d13b70caa8bb5c6bb080e5490adee2e3a81c28699ff455969e3f0a8784b4278621b01aa9c16a334e7bfbe0a8d0558f6162555cff86704b11570
diff --git a/dev-python/traits/traits-4.6.0.ebuild b/dev-python/traits/traits-4.6.0.ebuild
index 2c80cfeca796..3e515ed35068 100644
--- a/dev-python/traits/traits-4.6.0.ebuild
+++ b/dev-python/traits/traits-4.6.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
diff --git a/dev-python/zope-interface/Manifest b/dev-python/zope-interface/Manifest
index da228e8255df..e616d24e7c2c 100644
--- a/dev-python/zope-interface/Manifest
+++ b/dev-python/zope-interface/Manifest
@@ -3,5 +3,5 @@ DIST zope.interface-4.3.2.tar.gz 143139 BLAKE2B 60e8d1ed360192cfd2bafc5738f1a527
 DIST zope.interface-4.4.3.tar.gz 147052 BLAKE2B dea636ebed2f66035510d467615a9532a7c082ddf4ad3bb26fe0101f790db667817e12c4fd3f4a0b654151422e6ff8cb156f3d2e4310e0294ffdc7b5b4e836f9 SHA512 29d9f3f1fe9af8a4ffb1e6d2f067bba1fa1bac7b02690ba8429985aa6ca76d3f337076bc8c48f39d0f338ccd855800b2f28b319a183a285191cc007bf8d9c9ad
 EBUILD zope-interface-4.1.1.ebuild 990 BLAKE2B 0729e2f728a41900e3700f862484779805efaf9663fe44c052f3401cc3bbce1e3adebef7e2cc14817c2d14d4af6968ddc5a24e7921eb78ea18c0c47656ed36d2 SHA512 1c29fc3ac4e42397ebe0aab827b21f43793486f23af0492c66feebdc8f303b13e24206e660f623d1e37421d394af415457de9096487b23f80d5c2a516828c3b1
 EBUILD zope-interface-4.3.2.ebuild 1035 BLAKE2B d7374a0b31b73d857659b569dc33a0575fb97acc462178e976b3071c4926642181e624495a8df816c9fb7fb939b62e14e99a224539f8df966e7cc662647ee63e SHA512 e7bc7ce215f332423fb4bd5a1def6199ea8a091931366e12406217a7a4dfb2a4700efda24537400e13db8305d98a52f5e3222b2328c8fb2a9f458e73eb665ef1
-EBUILD zope-interface-4.4.3.ebuild 1284 BLAKE2B a6053a540e3e52d446cc2766e6e5a70281ebc7adce08b72753a5f12d19627edf822a23a117a2ac88804a364d40f07699bd2579cfcd03038e46e8f41d0413df40 SHA512 9ef7f7a0e92e4499b53dbe4b08e73381b24fa680dd6615ad0003df0e28ba742ae955c0393090320752192b67d90dde6d0ec29aec8ffb4faa67d1c92485d0c5d3
+EBUILD zope-interface-4.4.3.ebuild 1283 BLAKE2B edd62af1a25a5602c5e795c1448d19dba25e5ac8761f9237191668f0cd06c206d4d6b4b089a80dbac22438a11b436dd4ce3591a553642c2580d95605b4e3457a SHA512 36b6086a3a711d12eb70eb7380c549e7335447b3358cd15b76f6168eea38426583a01f665596b2add64a8a3e75b063826f7e30b7237ae277560cd740bfd1b4ec
 MISC metadata.xml 386 BLAKE2B f8454bc6cb7c55f203d75f44428b0fe404d050e4938f80e5ca1e0504811a3ea73980ab474d12b47f31a87ed508a2f23143d6393eaf2f66eaface7b35a2058a61 SHA512 fc31e083f990006f9a4bdf1cdef5b8efee3e69e8444f614dd5fdcc0d7ddb8291cc1e45c21ab1418668c2e247068a39467e837aa8b869cc050a856635b8789fdd
diff --git a/dev-python/zope-interface/zope-interface-4.4.3.ebuild b/dev-python/zope-interface/zope-interface-4.4.3.ebuild
index b351a3bc17b3..7001e0ab632e 100644
--- a/dev-python/zope-interface/zope-interface-4.4.3.ebuild
+++ b/dev-python/zope-interface/zope-interface-4.4.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="