gentoo resync : 09.03.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-03-09 16:53:27 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2018-03-09 16:53:27 +0000
commit: 80208fb578cf92cc308906660ca6d7860c6b2a1f (patch)
tree: 6f06818031b553c506fc10dfe9908a835df288aa /dev-python
parent: 06a7b5647e11a8ddf69b1c3d3ded6a8ba28b923e (diff)
221 files changed, 1640 insertions, 563 deletions
diff --git a/dev-python/BitVector/BitVector-3.4.4.ebuild b/dev-python/BitVector/BitVector-3.4.4.ebuild
index 9bac10b49484..aa07104c408b 100644
--- a/dev-python/BitVector/BitVector-3.4.4.ebuild
+++ b/dev-python/BitVector/BitVector-3.4.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
@@ -8,8 +8,8 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 inherit distutils-r1
 
 DESCRIPTION="A pure-Python memory-efficient packed representation for bit arrays"
-HOMEPAGE="http://cobweb.ecn.purdue.edu/~kak/dist/ https://pypi.python.org/pypi/BitVector"
-SRC_URI="http://cobweb.ecn.purdue.edu/~kak/dist/${P}.tar.gz"
+HOMEPAGE="https://engineering.purdue.edu/kak/dist/ https://pypi.python.org/pypi/BitVector"
+SRC_URI="https://engineering.purdue.edu/kak/dist/${P}.tar.gz"
 
 LICENSE="PSF-2"
 SLOT="0"
diff --git a/dev-python/BitVector/BitVector-3.4.6.ebuild b/dev-python/BitVector/BitVector-3.4.6.ebuild
index 24ce353995d9..8c8eccd56866 100644
--- a/dev-python/BitVector/BitVector-3.4.6.ebuild
+++ b/dev-python/BitVector/BitVector-3.4.6.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,8 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 inherit distutils-r1
 
 DESCRIPTION="A pure-Python memory-efficient packed representation for bit arrays"
-HOMEPAGE="http://cobweb.ecn.purdue.edu/~kak/dist/ https://pypi.python.org/pypi/BitVector"
-SRC_URI="http://cobweb.ecn.purdue.edu/~kak/dist/${P}.tar.gz"
+HOMEPAGE="https://engineering.purdue.edu/kak/dist/ https://pypi.python.org/pypi/BitVector"
+SRC_URI="https://engineering.purdue.edu/kak/dist/${P}.tar.gz"
 
 LICENSE="PSF-2"
 SLOT="0"
diff --git a/dev-python/BitVector/BitVector-3.4.7.ebuild b/dev-python/BitVector/BitVector-3.4.7.ebuild
index 015fc4ec811d..c9a9689084c5 100644
--- a/dev-python/BitVector/BitVector-3.4.7.ebuild
+++ b/dev-python/BitVector/BitVector-3.4.7.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,8 @@ PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="A pure-Python memory-efficient packed representation for bit arrays"
-HOMEPAGE="http://cobweb.ecn.purdue.edu/~kak/dist/ https://pypi.python.org/pypi/BitVector"
-SRC_URI="http://cobweb.ecn.purdue.edu/~kak/dist/${P}.tar.gz"
+HOMEPAGE="https://engineering.purdue.edu/kak/dist/ https://pypi.python.org/pypi/BitVector"
+SRC_URI="https://engineering.purdue.edu/kak/dist/${P}.tar.gz"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND=""
 LICENSE="PSF-2"
diff --git a/dev-python/BitVector/Manifest b/dev-python/BitVector/Manifest
index 419217817f56..6cb0e4225e7e 100644
--- a/dev-python/BitVector/Manifest
+++ b/dev-python/BitVector/Manifest
@@ -1,7 +1,7 @@
 DIST BitVector-3.4.4.tar.gz 121822 BLAKE2B 1261a7b86130b15eeb3b9ab3565787e673ecb1ee908666eb7784d1da3052bd69b9878a7eeb50df49bfa0ff76b8f2f9d777517c254a320feca187161cf1820701 SHA512 b2310ef712c97538e29d008688efdc10269030bfdf7656733093dd4580ff4dfa171f6d58683c3a6336e909a020ba5100474e18997c1b2a0873a0da2e622ba9ff
 DIST BitVector-3.4.6.tar.gz 125137 BLAKE2B 877d2d855ce9eb9f1126df981c92dd8a7a475b15cbccc371ef4649692ac8b449a009d37ffd9c1fc70cd6147faf7758a18c6d83149a22786278f07eb3106a2de0 SHA512 56994692b7cd62f5790a1629d6a653f66f147e674dbc1a5f256dac4462c3eedf6363551165de940e4823d78462f63a44dce03ccd28073db1d93f2e2af436d0ab
 DIST BitVector-3.4.7.tar.gz 125013 BLAKE2B 8bd058c485d630755c0c06d4fee0e23c00a32a341d86f92aa22a48aaedf6ececb10bdae22e60a5bdb83f54c013fde8a914266deb64948ded0b2b95f5a4e4168c SHA512 5f9c9d13de6bec4b982a98564561b250152ba0ebdc119c75ddaf3822451dabe417d023fa529fd0ab8f583f86209369937b803d3ed0809ebeb312886504d96dfe
-EBUILD BitVector-3.4.4.ebuild 547 BLAKE2B eba0eb1622ec192f9a51b1b4920b826af87b3c3bc6e4151f91dcd8cb90dbb4689fa66231dc72888fee3fd35724984bfed467d7f5fff31c59f431776dbcc7f326 SHA512 08cd5e4f4fe358bda76068dd755831294d40b5c554b18179a11d542eb44ef7a9647923910e98dfbf91976dcb7d8052e24af9d68bb69b11d25c310f07305a582b
-EBUILD BitVector-3.4.6.ebuild 549 BLAKE2B 93ea7df15daf8557428d8ae797f4c7d20b47b391ff40c537d90444088e3db4fc620033a2914fae02df6f76c98a3b315549456d3ad6b236dcd791e1d9cec5a609 SHA512 4fd28952545a810260066210f5abe3fac2a4602689f520af1263fc146df5b565573b9250f537ec4d22af4c6ce851b43bc71934dca9effa89cb16476f4c95da08
-EBUILD BitVector-3.4.7.ebuild 657 BLAKE2B 00a3b16eb5f3b3ddbaccc98c8d7d9f56892734b5314d11f6ad574be7198297b7e7bc1987722501ee504990171be1dcd780eeb8648fee8c731b3f4070ee32e58a SHA512 92066cf8bd612e9e039ac09f2fa38132d707bfeebbd26aeae77eb2e3125862f869c728ba02635a0b7f5f867b244623aa0b83c380b077219cde5d5038025d8ad9
+EBUILD BitVector-3.4.4.ebuild 549 BLAKE2B 9c2f6539f862ba131957b88a6cd59e1a5918a991e12c54e63002b96161e8d4cdfe663abf7c554626a674886f83b826c7de8897468e9ee19c03177dc4c6755d38 SHA512 34f7379a08270bf82eb091a87d3496a0546a11879ccf611ec83416473ab86d66843804603ea2b0bd43e352174149739f485f355e96fd24e65771c9ce836fd490
+EBUILD BitVector-3.4.6.ebuild 551 BLAKE2B 6812958bf2b93c8ce1d42d917c587e3beb51dc32bd477d0dcb71bb180cf5f05bbf3647ec867647f07d4a7d88f95068b55bace569b8c15237bf194cbdecaf6874 SHA512 94a6ef8eb015631cb29c327010112986eeb132b17f0466f70f0bb6d66f9a22f8fe93f504034f9f7af19f63778672120f481e8d1495c375555cc3ad8c44ac957a
+EBUILD BitVector-3.4.7.ebuild 659 BLAKE2B c38eaf5e12b63ecec8fd0d7366ea772ddea2db2f9ec230c4f9541403405246d5cabbf30070b325fba2c505093b8678a2bcedefbd539a95cce7112b60b83f050f SHA512 3dfcf93af6a135215af749139d6e70f02841d67dcccd1cfc0927bb4aea0259fb291ce41f9e15db9052582e6e671ac5ab853f92427d17ee6285123cb35e1c6773
 MISC metadata.xml 456 BLAKE2B 28bb633e8da03c0f1ecc36ea797b9a29c579c226ea6a2c66f87d9639fb508c71b779cebcd5d6fd748ad2dcd28eb1ad6c39579888bac6fd682c1fc19069a8abe8 SHA512 e1f71284088a9a68ca91f5f55e286090ed8e836f67caede5a7f875ee27ba93f435a73e5f6b0c33c0bdfa670a1a006e8583f6fa3aabaf80b9a8ba82c3c72ff72e
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 595047b0e791..216b90a5c45d 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/PyQt5/Manifest b/dev-python/PyQt5/Manifest
index ebc8ca2308b0..4c93273a52f7 100644
--- a/dev-python/PyQt5/Manifest
+++ b/dev-python/PyQt5/Manifest
@@ -1,8 +1,8 @@
-AUX PyQt5-5.10-qt594.patch 972 BLAKE2B 4a51b1cd661dc71be287b6ce76f4ec894e931e45704548a52f87890c8f6ee95cfa604a63ec4009741d8f929f1e356b5204eb99798f5694ea6c81d8e299b2c21b SHA512 ac4fe4bce5767af524529d68bfd6307d75f40d61710934215703dd9d489afc5992cf14ec080b885245b20e55df3e1e884cf9708fd5735025fb4c09ac7d4053d7
-DIST PyQt5_gpl-5.10.tar.gz 3109934 BLAKE2B 96553b9a6f93c9ff86dc574e44f989d1aa371a5bf28cf3023ebcc9526791d28deab47e6f76ba70b46d33d80fc00d0b4df47cd4bb53a649dc98b8d0c0425d6742 SHA512 a86520870536618857ed3ee1601af45f5a0b456de192a5d6a3f8fa734e5cf49b8ce373928c0f4aeaae365d3fa95db03b5f59ae2903bc5eb2304b7edf22198033
+AUX PyQt5-5.10.1-timeline.patch 1063 BLAKE2B bcf04d91798b0dc2136ff9c85802abd14d35fb6daa952784ebce23a7b3c930421260f0f1dd80e47f2bbfc49ca9e26159f05c23ff136af4b68e69468d117dcc52 SHA512 8e09feca5f42ff61c479d098f7ab0299cba51a9234eb03146568166e50d6b2fc7d424bc4297905bd0d733508c891ac5b2287c05c6039f9f60bcec12978ac5821
+DIST PyQt5_gpl-5.10.1.tar.gz 3110469 BLAKE2B 75e24bd8c0739d47eff6212435aa783eaa302633beb0494f099edc3f8f99600cd03dc3cba5152ed7ae703cfe445ecae06ec5d2281dd7c0640c71db041659bd6f SHA512 04cd0292f7a088f9c0d088d7c73ec96cfc40253f771dfdf194eb92be7635e6fcaf04863fa24215e9c34a096658549bb2feeb8d8fdca1e39ed87f0256ef0f790b
 DIST PyQt5_gpl-5.7.1.tar.gz 3733746 BLAKE2B de8aea058876d740f391901434fa2c7ca1760b323b555efb48b06f8ba3213baccec676bc3984832e0775b28f0d2b2ddf0c37fa35317c237ed9af2e20469ff9ae SHA512 7498713f73807522e58ae38ff58548cf80c2f2c418d6c55e20ce613cdc997e4ee7139076f1f152c7c3edb970bde14febc3496009f934e31ff71f01a1605f558f
 DIST PyQt5_gpl-5.9.2.tar.gz 3102848 BLAKE2B b87f25693aa2b20211119f89cf13665bf88f14de8827d43ba757344ab9bdef0b0c197abb8386308c72925da263cabb6efd3f104db8a350c51fca3fba8c7c06b6 SHA512 5af2e65addaed7dd02d8dbf7a7c63767e565fc8edeb7b51e5991a00cda29f75b666529097646e821aaff556f350a929fd451f548bba76e97355b7fe10bd913bc
-EBUILD PyQt5-5.10.ebuild 5678 BLAKE2B 1254d629ced2d4abd4097c78d4016f4de2c56f1d625400db25ff3356cad7847d9de475e5b17fdf2294e87de43aa24c39e6973bb863b42bbee5176ed90b67d790 SHA512 211a0de1ff763ed1cf1431a97927500dbc06b3856b9e9ba3383ee133facc0f74594da760836e655afcdaac341862fe2dce9e15f4825329401800c76de13713d2
+EBUILD PyQt5-5.10.1.ebuild 5681 BLAKE2B b14acb52f6f25a74333445c589af13415749a8bc60dfa50a9fa82f597b24856d0b6dbd10c061142103b85817ad4c4980d38baaf4fe7db1d5958e17631580430e SHA512 d99e76127a3445ef4ba7865213df1191bd4c967b5a7acf8389ee7d5521c95bc498e5dcd4c31478fd3f81f07ed457f81481f4bac6e978c3c5a2e190beb8e18e09
 EBUILD PyQt5-5.7.1.ebuild 5547 BLAKE2B 29e51fddc17c2cb03213d244f929165cc95d71b870fe121efed70166f0aeef5a6fd6d2ea9803c0038cfd37363e5abf9de66e0ac89d8e186a9c3fdad988809188 SHA512 187e6664388e61b62066e95797d0a467b30941441ff83872fbeed16abfdbacf5d4bf5ecc575f93ca83fa09e3be16af993d358bf99f3c16f76610aaceb27b1900
 EBUILD PyQt5-5.9.2.ebuild 5684 BLAKE2B 112240ab66ced96c8dc49a1df6df80ee9833297db2a23e22e197acb78e034ee0e6ed45ecfeae136787ee0ca808bd977eae315c37ad1bb0bf54375be2dd4c28f4 SHA512 3df5af3b273a243b23d883a6ef8541551d1195f8ae035c2bba578154488fc0301b8bdf54ea144936841a32cde92dd0319d6b36b64a08614b287c6fe6ffc85d90
 MISC metadata.xml 2458 BLAKE2B bbebf12bc59da0f7b6737598e9c683f6ec45872a7207c23fd5b47c73c68a9eeaaf9ac0d4fc18c05d3e79b22e333bbb43d2bb7bd70aaba80288d0fadf1020d8c1 SHA512 8554c97aeb873a2a7e1d50b8aacc3638a87fdc0fdc367d61123b63bd506b1376873d88a967773e8f1050f0e8c35ae180d61c7eb2c213c345e5b17a3c0e4c7df8
diff --git a/dev-python/PyQt5/PyQt5-5.10.ebuild b/dev-python/PyQt5/PyQt5-5.10.1.ebuild
index 16b925075fe8..5312e89d1ca0 100644
--- a/dev-python/PyQt5/PyQt5-5.10.ebuild
+++ b/dev-python/PyQt5/PyQt5-5.10.1.ebuild
@@ -94,7 +94,7 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${MY_P}
 
 DOCS=( "${S}"/{ChangeLog,NEWS} )
-PATCHES=( "${FILESDIR}/${P}-qt594.patch" )
+PATCHES=( "${FILESDIR}/${P}-timeline.patch" )
 
 pyqt_use_enable() {
 	use "$1" || return
diff --git a/dev-python/PyQt5/files/PyQt5-5.10-qt594.patch b/dev-python/PyQt5/files/PyQt5-5.10.1-timeline.patch
index fcdadab5521a..857492266e01 100644
--- a/dev-python/PyQt5/files/PyQt5-5.10-qt594.patch
+++ b/dev-python/PyQt5/files/PyQt5-5.10.1-timeline.patch
@@ -1,15 +1,13 @@
-Fix build with qt-5.9.4
-
-Bug: https://bugs.gentoo.org/646580
-
+diff --git a/sip/QtCore/QtCoremod.sip b/sip/QtCore/QtCoremod.sip
+index e40d12c..4419f2b 100644
 --- a/sip/QtCore/QtCoremod.sip
 +++ b/sip/QtCore/QtCoremod.sip
 @@ -22,7 +22,7 @@
  
  %Module(name=PyQt5.QtCore, call_super_init=True, default_VirtualErrorHandler=PyQt5, keyword_arguments="Optional", use_limited_api=True)
  
--%Timeline {Qt_5_0_0 Qt_5_0_1 Qt_5_0_2 Qt_5_1_0 Qt_5_1_1 Qt_5_2_0 Qt_5_2_1 Qt_5_3_0 Qt_5_3_1 Qt_5_3_2 Qt_5_4_0 Qt_5_4_1 Qt_5_4_2 Qt_5_5_0 Qt_5_5_1 Qt_5_6_0 Qt_5_6_1 Qt_5_6_2 Qt_5_6_3 Qt_5_6_4 Qt_5_6_5 Qt_5_6_6 Qt_5_6_7 Qt_5_6_8 Qt_5_6_9 Qt_5_7_0 Qt_5_7_1 Qt_5_8_0 Qt_5_8_1 Qt_5_9_0 Qt_5_9_1 Qt_5_9_2 Qt_5_9_3 Qt_5_10_0}
-+%Timeline {Qt_5_0_0 Qt_5_0_1 Qt_5_0_2 Qt_5_1_0 Qt_5_1_1 Qt_5_2_0 Qt_5_2_1 Qt_5_3_0 Qt_5_3_1 Qt_5_3_2 Qt_5_4_0 Qt_5_4_1 Qt_5_4_2 Qt_5_5_0 Qt_5_5_1 Qt_5_6_0 Qt_5_6_1 Qt_5_6_2 Qt_5_6_3 Qt_5_6_4 Qt_5_6_5 Qt_5_6_6 Qt_5_6_7 Qt_5_6_8 Qt_5_6_9 Qt_5_7_0 Qt_5_7_1 Qt_5_8_0 Qt_5_8_1 Qt_5_9_0 Qt_5_9_1 Qt_5_9_2 Qt_5_9_3 Qt_5_9_4 Qt_5_10_0}
+-%Timeline {Qt_5_0_0 Qt_5_0_1 Qt_5_0_2 Qt_5_1_0 Qt_5_1_1 Qt_5_2_0 Qt_5_2_1 Qt_5_3_0 Qt_5_3_1 Qt_5_3_2 Qt_5_4_0 Qt_5_4_1 Qt_5_4_2 Qt_5_5_0 Qt_5_5_1 Qt_5_6_0 Qt_5_6_1 Qt_5_6_2 Qt_5_6_3 Qt_5_6_4 Qt_5_6_5 Qt_5_6_6 Qt_5_6_7 Qt_5_6_8 Qt_5_6_9 Qt_5_7_0 Qt_5_7_1 Qt_5_8_0 Qt_5_8_1 Qt_5_9_0 Qt_5_9_1 Qt_5_9_2 Qt_5_9_3 Qt_5_9_99 Qt_5_10_0 Qt_5_10_1}
++%Timeline {Qt_5_0_0 Qt_5_0_1 Qt_5_0_2 Qt_5_1_0 Qt_5_1_1 Qt_5_2_0 Qt_5_2_1 Qt_5_3_0 Qt_5_3_1 Qt_5_3_2 Qt_5_4_0 Qt_5_4_1 Qt_5_4_2 Qt_5_5_0 Qt_5_5_1 Qt_5_6_0 Qt_5_6_1 Qt_5_6_2 Qt_5_6_3 Qt_5_6_4 Qt_5_6_5 Qt_5_6_6 Qt_5_6_7 Qt_5_6_8 Qt_5_6_9 Qt_5_7_0 Qt_5_7_1 Qt_5_8_0 Qt_5_8_1 Qt_5_9_0 Qt_5_9_1 Qt_5_9_2 Qt_5_9_3 Qt_5_9_4 Qt_5_9_5 Qt_5_9_6 Qt_5_9_99 Qt_5_10_0 Qt_5_10_1}
  
  %Platforms {WS_X11 WS_WIN WS_MACX}
  
diff --git a/dev-python/Rx/Manifest b/dev-python/Rx/Manifest
new file mode 100644
index 000000000000..d0e539956f9a
--- /dev/null
+++ b/dev-python/Rx/Manifest
@@ -0,0 +1,3 @@
+DIST Rx-1.6.1.tar.gz 89543 BLAKE2B ee0b6c30c794febdd045231ff61a330a512c86a9dd3c56a6afa900c31ca774725d7bf5b589d46b60f79cd1f0bc967b5ab5bc87a58f6d3dbebbdb1b6618db875d SHA512 8602b5175c058e855ac4b67d8feed435f93632da2f4033fe0db54fcbb012a702786b29f97fe3fd641f054c3a61478dccac21c614b5708f7bfb0b986c9951e6a9
+EBUILD Rx-1.6.1.ebuild 366 BLAKE2B 134589ba6ac50ba7049595a2ce71cacf6655c54883edba3704947c786c7bebf6490049b805d804420620217f033962ed50154f167716bffce1eeb37332131f2f SHA512 a3ef53f1cc68c5251165a84c8ce3a487b43ff8f7e42afd124bdfa4da50f960593de48fe919c2e1c4cd93921d3118f6e3c86950b59676b206ff73377c6906f6d4
+MISC metadata.xml 327 BLAKE2B c9349fc7bf783920d0f8469ea19b8cf475c4705d3499364ab79a6960e19c3458b7d2a18aa90a470b033003fe461f06d34d25206b702c835e5a311d698d4c2e95 SHA512 382a7e9dd6cf734155229b3acc48060b4d11f2e68b2fe906ad8508ea5de95b1adcd5d23d58b6ff4881f7d5c9f103e64b60787eaebbeff2db8f9b24188dab6395
diff --git a/dev-python/Rx/Rx-1.6.1.ebuild b/dev-python/Rx/Rx-1.6.1.ebuild
new file mode 100644
index 000000000000..b558de60874e
--- /dev/null
+++ b/dev-python/Rx/Rx-1.6.1.ebuild
@@ -0,0 +1,16 @@
+# 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="Reactive Extensions for Python"
+HOMEPAGE="http://reactivex.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
diff --git a/dev-python/Rx/metadata.xml b/dev-python/Rx/metadata.xml
new file mode 100644
index 000000000000..8f43c182b5fe
--- /dev/null
+++ b/dev-python/Rx/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>blueness@gentoo.org</email>
+    <name>Anthony G. Basile</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">Rx</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/aiohttp-cors/Manifest b/dev-python/aiohttp-cors/Manifest
index 7c1675e439c3..2b0a1119994e 100644
--- a/dev-python/aiohttp-cors/Manifest
+++ b/dev-python/aiohttp-cors/Manifest
@@ -1,5 +1,9 @@
 DIST aiohttp-cors-0.5.0.tar.gz 40018 BLAKE2B 774b3da8f459828145253f21dfcd10741b428e5594b2e02c42d3b46fdc8bb3821ec53f93547665d4b56758684358f3626d811f4dbe6490a01b40b4f274ba3a0c SHA512 86c24a1fe18fb3b2b8fca38ef9aa7ebf07fc1b202d353a540b7d651cbf618c57c5afbe125d91c0d72aee937909dbea0cfb1baa182eebdc5402b66f9800706bee
 DIST aiohttp-cors-0.5.1.tar.gz 40081 BLAKE2B f491bcebf406b089baeccb62c1ce113fc3ef485f3103a24ef93b08b1b33b66c2f419f58dac80f8d6c262e4826762a27dbde479c8de6c17fe991a3b084f0dc061 SHA512 a06f65a479bbed50022394d51345e08bdf98a099f4b6efe355f4a4762155a564eee3d4e10ddb417daa7498ebc1abb93a3437b1a2cc6af9c2ad5fe8a8714c237c
+DIST aiohttp-cors-0.5.3.tar.gz 40266 BLAKE2B 701886b291a1b89f88a704ae04e3264cf2afc51f63f03ddd4464d40ba7bd3a1c6b5fe3f095b634e8c6c36c5a967e9a6b9b88335ff23988fc8bcd726c037fbd1c SHA512 0813ea48de714c85e361dfdaeef1a69526f7446dcc4ce637139cd333dedea58c635f85cfad1c3ccfb0df6e573f0351f282fdbd9726211d5915ed2ba120206b09
+DIST aiohttp-cors-0.6.0.tar.gz 42507 BLAKE2B 7b63916b983d3dc208058c8b04445a30762eebc4999135ae802d1ceeeccc476a335eae66126bb3fd16f938af3649e8b9096433c2df09e82bf4e5d4ba8e38c42c SHA512 75453ebbc074d5f25cc8efc46ffdb76fc90b0a96a9e6fce0eee5a5f28dba31cb50301289cac3b36c70ccdbc10c8f4ba9e362d8e9f350ba7f9dfacd06e6f5e699
 EBUILD aiohttp-cors-0.5.0.ebuild 1160 BLAKE2B 6891e4427a74557d3a662513094f3c9d46cd4cd4ffc4c8265ccc502ba10448f73d57fe4378315ee62929d9701f747bb5824ec94d7500cefd843ffc2d1948f19c SHA512 85a4063f92210c47539b42ab05691c23af1bc9c70868057d635ec27419b0da48e7c63250f02586baa0534ddfd2ef245d4e14d795a3334d15cea2201d85bb3764
 EBUILD aiohttp-cors-0.5.1.ebuild 1165 BLAKE2B cc5cc061965901922276beae4224d1de4441d8cb9636964ee52b7f26936ca9901150595f5d79534ff5f654804f15b046153ae188c8403888f00d6d3892e380c0 SHA512 0f71d31846275cf8b7998367f2f897f34dc6ce409633004faf31a3ebb6b09825f9efcd4d21a7c5f39766743fd68ce307668b6bdb4ce8dd52ae3070e636cfa050
+EBUILD aiohttp-cors-0.5.3.ebuild 1165 BLAKE2B c24df6c14aca6e8df1681fa5514ea9977adbd58208bf84bda8ec59d558cc26d63de505ba43308c57284d244f5d798db28cd043f108c09e058d189f8028eba7a2 SHA512 a5f75e622c7e94d6a15536782f6c027c417d7e5135494789870b32f31ff3aa5fae816253d5e6cc51fdd2b79b891477129ec5680806e7290079110c0d34ad1f17
+EBUILD aiohttp-cors-0.6.0.ebuild 1189 BLAKE2B d65e97ff6a550be7ce563182e09e19de5b3e120dd2bc1046fba3cfd032072162090606ec951a7aa4320fde3cedbbbf7d28fb6aac204396b966e3cece4501fa16 SHA512 6cd255d7989b7250f74516938d71ec6b9aa1c383734af09a0801083cd0408d6815ce829a1a6204df2d2b6dbb32e292949239d3219e7b8a8864e54bd75f902195
 MISC metadata.xml 253 BLAKE2B 0311910d10e4b501d39c01678bb1e58bed2e6e3252e6c3195d3284cf2e9652081b10a83f045689a56c69a4d318b209bfdac0a63ff6dab2a8fbb0160ac9c7e2e2 SHA512 bf75301ff2098e846a7d6dc9166d1c8b6e77b4f92327e5c5aad0edcde6274e6aa224d89c2c5ed7efc6fb7fcc7258a2a01a24591a43688679c4109f8cc89fd9b1
diff --git a/dev-python/aiohttp-cors/aiohttp-cors-0.5.3.ebuild b/dev-python/aiohttp-cors/aiohttp-cors-0.5.3.ebuild
new file mode 100644
index 000000000000..974f16321d80
--- /dev/null
+++ b/dev-python/aiohttp-cors/aiohttp-cors-0.5.3.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=( python3_4 python3_5 python3_6 )
+
+inherit distutils-r1
+
+DESCRIPTION="Implements CORS support for aiohttp asyncio-powered asynchronous HTTP server"
+HOMEPAGE="https://github.com/aio-libs/aiohttp-cors"
+SRC_URI="https://github.com/aio-libs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+EGIT_REPO_URI="https://github.com/aio-libs/aiohttp-cors"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-python/aiohttp-1.1.1[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/typing[${PYTHON_USEDEP}]' python3_4)"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		dev-python/pytest-pylint[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+		dev-python/selenium[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	# for some reason, it is installed by 'setup.py test' on py!=3.4
+	# TODO: investigate
+	sed -i -e '/typing/d' setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/aiohttp-cors/aiohttp-cors-0.6.0.ebuild b/dev-python/aiohttp-cors/aiohttp-cors-0.6.0.ebuild
new file mode 100644
index 000000000000..c50b49783a70
--- /dev/null
+++ b/dev-python/aiohttp-cors/aiohttp-cors-0.6.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Implements CORS support for aiohttp asyncio-powered asynchronous HTTP server"
+HOMEPAGE="https://github.com/aio-libs/aiohttp-cors"
+SRC_URI="https://github.com/aio-libs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+EGIT_REPO_URI="https://github.com/aio-libs/aiohttp-cors"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-python/aiohttp-1.1.1[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/typing[${PYTHON_USEDEP}]' python3_4)"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pylint[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		dev-python/pytest-pylint[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+		dev-python/selenium[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	# for some reason, it is installed by 'setup.py test' on py!=3.4
+	# TODO: investigate
+	sed -i -e '/typing/d' setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/aiohttp/Manifest b/dev-python/aiohttp/Manifest
index 0b33fa8bc472..6c97be74fd7d 100644
--- a/dev-python/aiohttp/Manifest
+++ b/dev-python/aiohttp/Manifest
@@ -1,10 +1,14 @@
 AUX aiohttp-3.0.5-tests.patch 294 BLAKE2B c535d85c0ad73394897db4db2743e3e6c09faa98a5a8a013b5b5b7af79adffaaa30f20a4cdff65760911c8f3ff373318e144d7ace6a7de6b0fa7b6cf9b8bf352 SHA512 0e5871efad3d360757fdd1ef723b741669a1e0b98728f58fe689b66b765dd4607e05a72cb618ac55b6a61cd53247916f9d497ca147eb7c8c86b8473a298a4b38
 DIST aiohttp-1.3.3.tar.gz 526273 BLAKE2B 5721479dc2141167118f226b266b504d689fa6708d895817fa448c4ffcdcfd71f5e95c98015d3a0e159d1f8d67232f3ad8a31abbed2532eb60564518df017bee SHA512 39342270f615f7e5e01889ad50ccb60335151e94631007b105acda9930038d2fb66128469ca44043280c9f737130e2361129e2fa1c857a7654a1151b98a19a69
 DIST aiohttp-1.3.5.tar.gz 527432 BLAKE2B 6420ecc1eaa29713643dbe9a05061df5277f10e263469d82a24397fa2ec53cf57aaeac86c22a17f06102bfcc69bfe959b6e00b264d9ef30eb193405f4eb9ea70 SHA512 b99630fa9006163d61e0e010972aee8daad021c5ad0152b04fb6f8b661f18ea03fcfa8d35603ecfcdaef4ecbaff0159b49e2f40164241bb5def48b2847e2d966
+DIST aiohttp-2.3.10.tar.gz 848324 BLAKE2B c32a7be3f3d9ba0bd1308c5bea779a10e177b9c018a03fb3cf95d1a1392180f3b4ea294dc23e2e946cc1065d16d212a169ec262a79034ae94b3a5067fbaf362c SHA512 e4ea725bbd3d7d749f2ec21eea1ff9f5c836fbeaa17ad72f77e378c69b008448e57503175bee6adff86110f65edc915cb6368df3011d1d9d61cf47718b086be0
 DIST aiohttp-2.3.2.tar.gz 841030 BLAKE2B a291baa1c5e915815ec80ea1cbd8434b31f4098eeff20767898fc73d75c6194df4bc2a5d21147a8e5c506f5bc377e79b6e8937ce65b9c73616366f439e542c1a SHA512 e481787fec8c9f21d49978b378fb5ef8c06d06cd7a6625fc36c5d4a035e9047f4ed0e38b25b613f1b685ca40e18c796376750f4ac0970fcd1d72ca7fbe31d13f
 DIST aiohttp-3.0.5.tar.gz 738000 BLAKE2B 742d3647a61e21ed8fc7a0a344337c5260b2bc34ffeb84660ddc031ff3872c97d7cadb66a02a4bc2531ca22b54fc1b93e8cf321d696cf4ec21a60170631d866c SHA512 650dbe3e5363c259fc5ce95baec4fd16ca2fd0836236d7d8f65597346f72fec29f803e037ffd6fc4e726a28a973aa09b0a3874a685516fbc4e843ad7f0f08b7b
+DIST aiohttp-3.0.6.tar.gz 738111 BLAKE2B 28a3560a7b351ee974db8bbdd372798e01696e66660b6330707c542253c4d8a0405e6e8c2c8ec03c3b0ea8b548516ffb2dfe14b800b5f17e908991244bfd9335 SHA512 43f1b3c2da1bc57ac6e83a01abb3568b71ed5514e9331aaba4b691ff036d2d3e72eeddadd0f2f20608fa1f622a673ce1d4489bced2096ae546a350ad5f438d0d
 EBUILD aiohttp-1.3.3.ebuild 1546 BLAKE2B 3fce4cc4595b0628ddeb022a59d06a57ce8700f8fe3c0d9ce60cda37afe0b31de1c91f8a509c49b296a1de78e8ab0dd75863b508e95dabeb17fa4ae3cf86a136 SHA512 8b12d96faa49923a7ad541b5de41dc8cb2aa47ebff0b7203d422f6b0f7fe0ef2ab2dfa2d04e74aa03aed99833c202c3fa99f56fe35e6e762c5bf03dab048037d
 EBUILD aiohttp-1.3.5.ebuild 1546 BLAKE2B 3fce4cc4595b0628ddeb022a59d06a57ce8700f8fe3c0d9ce60cda37afe0b31de1c91f8a509c49b296a1de78e8ab0dd75863b508e95dabeb17fa4ae3cf86a136 SHA512 8b12d96faa49923a7ad541b5de41dc8cb2aa47ebff0b7203d422f6b0f7fe0ef2ab2dfa2d04e74aa03aed99833c202c3fa99f56fe35e6e762c5bf03dab048037d
+EBUILD aiohttp-2.3.10.ebuild 1724 BLAKE2B 800c981a869a62d1571f065a3671556028697e9b89739da8b61749921fd45aafffa23557c5ae00f1ef7840b4b20e3349f6163fa77013d01dcede6996599fe35b SHA512 853580b7cf7c9fbf6a879979283580141468e5dbcab1c2421956be8725504489e8cc1c40f2f16b1228f06e5307e4f5119914efc609f66071237d2151d73db543
 EBUILD aiohttp-2.3.2.ebuild 1591 BLAKE2B 4e33b62f7938397f65f623760934eae62011fcca2e442a599ee92cc8e51926a53fd91288cd5cea3ba453d2683c0d0642bfc45acbc5b9bb52817049753cbf298d SHA512 5d9bd5ccdb55ad9ce780f94c9e346f9f79cbc53cb76cd18aeefb3624f3c418a5856593f57effe1b7f1765a3cd2ae454d499a7d553f14937f9a23406dc9caffc5
 EBUILD aiohttp-3.0.5.ebuild 1829 BLAKE2B 8dfe5f043de73b63c21942c79b8ae240766a30185570bda2f4213f6b759e46a2ba2d0987e5eb4c5a70cbb90fc591ed0a8d8e36050fadd7a6c22d49db40054c75 SHA512 9a0e35e90b834c8da6ca4462e76879159686f7abd2459fc7e5742c769585bce69c6bfd4f43d625fc7b3de0d530d882bd0787985970f12cb8d3c0544ae0fe8eea
+EBUILD aiohttp-3.0.6.ebuild 1836 BLAKE2B ffe40279f2b515dfec7b2899db2899afbd714a7e67c85ca9ef661e781c8f71e3ddc1970d421136053c2a4656b7ace5d24856b89ec9806cbc272ba72b7a1ba882 SHA512 d841b336276717af313f38c52361291784de6fa59ea96abb4f7e446e0840348afbc54744526e1bfaa9ae43585563058840f440b430f76418e50e8ea6d83d32aa
 MISC metadata.xml 489 BLAKE2B beb80da34848dfe7b81ed65d75923480644ecf42e2c5ce04a7f66f3e729651fdc6035054482aff966ec9f03cfbb812d3be0afd783af69e37f1002182e4885473 SHA512 d8c9e2edb8a57a3b6b02bb5314aef77dc266af6e80fd0300eb0652c59790232017d0062f5b7361b059c382d1c904f0f46cd0e672d1963e9595f3d4dc7514f182
diff --git a/dev-python/aiohttp/aiohttp-2.3.10.ebuild b/dev-python/aiohttp/aiohttp-2.3.10.ebuild
new file mode 100644
index 000000000000..d29494b31f3b
--- /dev/null
+++ b/dev-python/aiohttp/aiohttp-2.3.10.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="http client/server for asyncio"
+HOMEPAGE="https://pypi.python.org/pypi/aiohttp"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz -> ${P}.tar.gz"
+EGIT_REPO_URI="https://github.com/aio-libs/aiohttp"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+# Test suite is broken:
+#   ValueError: option names {'--fast'} already added
+RESTRICT="test"
+
+CDEPEND="
+	>=dev-python/async_timeout-1.2.0[${PYTHON_USEDEP}]
+	dev-python/chardet[${PYTHON_USEDEP}]
+	>=dev-python/multidict-4.0.0[${PYTHON_USEDEP}]
+	dev-python/idna-ssl[${PYTHON_USEDEP}]
+	>=dev-python/yarl-1.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/alabaster-0.6.2[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-asyncio[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-newsfeed[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	test? (
+		${CDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		www-servers/gunicorn[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="${CDEPEND}"
+
+DOCS=( CHANGES.rst CONTRIBUTING.rst CONTRIBUTORS.txt HISTORY.rst README.rst )
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	PYTHONPATH="${PWD}:${PYTHONPATH}" ${PYTHON} -m pytest tests/ || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/aiohttp/aiohttp-3.0.6.ebuild b/dev-python/aiohttp/aiohttp-3.0.6.ebuild
new file mode 100644
index 000000000000..37ecc7609be5
--- /dev/null
+++ b/dev-python/aiohttp/aiohttp-3.0.6.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python3_{5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="http client/server for asyncio"
+HOMEPAGE="https://pypi.python.org/pypi/aiohttp"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+CDEPEND="
+	>=dev-python/async_timeout-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/attrs-17.3.0[${PYTHON_USEDEP}]
+	dev-python/chardet[${PYTHON_USEDEP}]
+	>=dev-python/multidict-4.0.0[${PYTHON_USEDEP}]
+	>=dev-python/yarl-1.0[${PYTHON_USEDEP}]
+	dev-python/idna-ssl[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/alabaster-0.6.2[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-asyncio[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-newsfeed[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	test? (
+		${CDEPEND}
+		>=dev-python/pytest-3.4.0[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		www-servers/gunicorn[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="${CDEPEND}"
+
+DOCS=( CHANGES.rst CONTRIBUTING.rst CONTRIBUTORS.txt HISTORY.rst README.rst )
+PATCHES=( "${FILESDIR}"/${PN}-3.0.5-tests.patch )
+
+python_prepare_all() {
+	# skip failing tests until cause is determined
+	rm tests/{test_pytest_plugin.py,test_worker.py} || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	#PYTHONPATH="${PWD}:${PYTHONPATH}" py.test -v tests || die "Tests failed under ${EPYTHON}"
+	esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/apsw/Manifest b/dev-python/apsw/Manifest
index eaf98458ad29..f0fc6f7d864d 100644
--- a/dev-python/apsw/Manifest
+++ b/dev-python/apsw/Manifest
@@ -1,6 +1,8 @@
 AUX apsw-3.6.20.1-fix_tests.patch 340 BLAKE2B c70f404afaed26c92f60690820812fb0ccbe355f43384b4e0a931851c27348b04335aa4c25baf5b2662c85403ad2eb075ce049a724c297a46ea2f796845aebd8 SHA512 386cae12d949a6f4dd55dc7e3e1bc176c43c5001f10acc75261c92fbe14bb09c0e054dfa4087d285496dec4cbd4a9add5733742dbfa82c6e10ee1c8d0f43fb0a
 DIST apsw-3.19.3_p1.zip 678966 BLAKE2B 1726a50024369831fe0ee442676adc4415c7b71e5e12beddd4e09f688aad930bb54664435c569ca728c2dd7b24b4eb46655778c7c35249731f3a83194a40fe6b SHA512 9f9e05c865a19e7b6e6b37e6228027c027ba683be2d5ff7a1767bb3bbeb090bf66879a0eead4fc9e34fc4d84c1edc98137b2839f84ffab9bd36330d05435ab4e
 DIST apsw-3.21.0_p1.zip 680827 BLAKE2B 8fceb2d782f3bbaba28f26904ed11281be7e2be351d78c41d39d2941ad45304bd7e62cfbbc9134e21b1ffad4f7b7d1373a2866d6cbb61345c263502b23fb018a SHA512 c2009d243765532e27220478d1164f97201afbd2b1de1e4090b4f35b63c83d0a82d2bdfe14c6625858867633995d3d8eef91f17ecbbd915f99e5a4a4edfa7b61
+DIST apsw-3.22.0_p1.zip 680988 BLAKE2B eda9b217ee8d23b5fc80e5d240b11493f8ef82208f3b694619ba168f4bd640691cdf253d9315fb0f2d178fcce2bd1ed4028d75488f5fb3c0db95c518fec8f71d SHA512 c82de649a9245283dd0acc37700270c6c4dde1995cdc88bf7afb7cb3913a6f1a4a7a077e80eeb70cccf2fcb058406b610c9f05f478c6dc9ee8f7ff9cde7c7395
 EBUILD apsw-3.19.3_p1.ebuild 1055 BLAKE2B 0051a9e6f3ac8a4e9a082ba67519120ab53b2b436fff94294eaa4aad1316c1a854186c0d36e596e48902a7f5fc84ec986c1761dbe05d2ec5599ef8563bd77b1c SHA512 f8a332998543699139d5ca8357f5cb9c7ea5ea7c07dddb142058a906bb28005f451136cb8c7774bf47ba4bd7c8e76091e35843206f53434632cf0ba275f615ef
 EBUILD apsw-3.21.0_p1.ebuild 1057 BLAKE2B e175826406da5d6fdef7b3122dffff395be9a5aa4c994e21509731e55d0895fac19a462fcaf6ade0815bf939a889c54e478732f3d5854d412e8cde02c87dc16f SHA512 f818ef35546e3d46a2f42f0506cedb4d3aedcdca46a151a56cc8b68ee8958cbfdd82a874c78bb1a8d79db144d85509602009985c2367fcd1df64c2c6cdce2b53
+EBUILD apsw-3.22.0_p1.ebuild 1057 BLAKE2B b5eab2c145a4a5f93ef02e4ec5d466c4489413f9653c1a8e94b4f2af2c01903581b41075d59c5e2d64edbc4292c81ea559bba9f9ea7cb148052fb49bd4a48cfa SHA512 9ec4e8b5c58fc9825a137c15783f230a5cc64373c5cf50d6073435292246fcd09b0243601e06d22efd1af4bdfe1dd032639fe17623899a6425e55352cf050b11
 MISC metadata.xml 677 BLAKE2B 8125a6d9906cfa5626bff6182635ac0b6c65d52abfb9011fb486430055b3484855a7529c0b4fe7d3c2bba8646318a8cb01a37e2ac0b63def11abae26bef6882c SHA512 970eb7e730f147bbe24fbe377f6b9a1557f56d536ce462aef5ccba23059295c4c8d88bb384a7b7ec3f401a512e04134ebe19efa03473a90841d7c6246e2eb244
diff --git a/dev-python/apsw/apsw-3.22.0_p1.ebuild b/dev-python/apsw/apsw-3.22.0_p1.ebuild
new file mode 100644
index 000000000000..2f4ee216ac74
--- /dev/null
+++ b/dev-python/apsw/apsw-3.22.0_p1.ebuild
@@ -0,0 +1,42 @@
+# 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 flag-o-matic
+
+MY_PV=${PV/_p/-r}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="APSW - Another Python SQLite Wrapper"
+HOMEPAGE="https://github.com/rogerbinns/apsw/"
+SRC_URI="https://github.com/rogerbinns/apsw/releases/download/${MY_PV}/${MY_P}.zip -> ${P}.zip"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+IUSE="doc"
+
+RDEPEND=">=dev-db/sqlite-${PV%_p*}"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=( "${FILESDIR}/${PN}-3.6.20.1-fix_tests.patch" )
+
+python_compile() {
+	python_is_python3 || append-cflags -fno-strict-aliasing
+	distutils-r1_python_compile --enable=load_extension
+}
+
+python_test() {
+	"${PYTHON}" setup.py build_test_extension || die "Building of test loadable extension failed"
+	"${PYTHON}" tests.py -v || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/argh/Manifest b/dev-python/argh/Manifest
index 667a446a8342..dcf398eeceb6 100644
--- a/dev-python/argh/Manifest
+++ b/dev-python/argh/Manifest
@@ -1,4 +1,4 @@
 DIST argh-0.26.2.tar.gz 32913 BLAKE2B 315dc36c4a98cb4a8fdab68a30ed3d4d87d1565717722ed496255d8b1b4e505277032217da4c5d750f210974890d8094c52f920044173ff2168adf7cb7f6a2bd SHA512 90382900d5cec9629dacb4459a2c9491d1425b66fa3f90d7cbf511dec846a99dbb9424f3e08f0c006da48fbf9c067078705be70b314700541fd800630e4b1707
-EBUILD argh-0.26.2-r1.ebuild 691 BLAKE2B 2d8138656a765e916e23983a9f207d25dc81202a77ad55d3be5ef913b27912d277e876784b507d41f17f2e375069a97e63e2ebd7acb230ccc33fd3b4883823d4 SHA512 cbc07fe0969f2f4a506da78fa346793204d339f981e9d2690559f243c7d3216f5ea641f5574849ed460954b3b4730fc4eef6c5e9f598a3a710fc851894bdc920
-EBUILD argh-0.26.2.ebuild 685 BLAKE2B 23c3dadcc0eb6a6c639f4c18a423f33b87efec30e329aeb063503a129bdd7a83afe422153dd3ca94245e20d4f6364cc26dc0b89db5f242acd2b1e3b6b3b86833 SHA512 68a8986975e1cc71e4b13be245ee16d4c9fe05727e46f790c9920dc731b818f97c64803a04ca19358a3d2a9e66e2576ea520c86609e621dff2ed0c7e3285a482
+EBUILD argh-0.26.2-r1.ebuild 689 BLAKE2B 774dd598de78d4a16e6f3b45c97373b9fd275fa2f4648182415c627a68a2479e04e606c373cf08d3f292adfe57187d03e5f655f5c7be0ac09f7a96acf9d262f8 SHA512 e329bb664be3f574f1163802ea4f860c3e3a8a48545520c4ab6a478cf830199410abe8a38a1478b6f8898beb11891293a37fb970d551a98c4dbd1d784391704f
+EBUILD argh-0.26.2.ebuild 683 BLAKE2B 43746e1b54becfd3abc7122ecab1177976dc702cc05699a0cad7951729722f791724127a9d43deaab6ac5f0dc7ff80aaef4d98cef9e82e1b79d38c3ece2ad5ea SHA512 fa139347f6d7f712f7f7460e7869f28b20ad8d2cd9ff1824cc05420a9ffd9a28044f81d3f302b15e8df3b7e33111859f2b4b429579db68ee396cb5a7b6c87ca5
 MISC metadata.xml 307 BLAKE2B 172ad4318c81373d000c3138ea3efd86183f1b17fbbdbb793a99aa43732c85ebbaa90235096835ca07a70db115fad09debf1f9ca3c5a46f6f01b6273b4e04d5a SHA512 6236f4f54de93e831341d268725741e3a46e4a4cd815ead1d5751ab551ec06fd58acb410d2cff973c992d564b69f21e6e56168ad567fe3e7c810eca5c2a83712
diff --git a/dev-python/argh/argh-0.26.2-r1.ebuild b/dev-python/argh/argh-0.26.2-r1.ebuild
index fed4b80bb851..409a529b632a 100644
--- a/dev-python/argh/argh-0.26.2-r1.ebuild
+++ b/dev-python/argh/argh-0.26.2-r1.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=5
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
 inherit distutils-r1
 
 DESCRIPTION="A simple argparse wrapper"
-HOMEPAGE="http://packages.python.org/argh/"
+HOMEPAGE="https://pythonhosted.org/argh/"
 SRC_URI="mirror://pypi/a/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/argh/argh-0.26.2.ebuild b/dev-python/argh/argh-0.26.2.ebuild
index a4a1febe622e..1ac96d8bd62f 100644
--- a/dev-python/argh/argh-0.26.2.ebuild
+++ b/dev-python/argh/argh-0.26.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=5
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
 inherit distutils-r1
 
 DESCRIPTION="A simple argparse wrapper"
-HOMEPAGE="http://packages.python.org/argh/"
+HOMEPAGE="https://pythonhosted.org/argh/"
 SRC_URI="mirror://pypi/a/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/awscli/Manifest b/dev-python/awscli/Manifest
index f12b96400b4c..128e71e6dd38 100644
--- a/dev-python/awscli/Manifest
+++ b/dev-python/awscli/Manifest
@@ -6,6 +6,7 @@ DIST awscli-1.11.154.tar.gz 553172 BLAKE2B a9c46453407efa6a2f5170105a24f108bcd69
 DIST awscli-1.11.158.tar.gz 553030 BLAKE2B 9a36fa3fd4fca2df9b561965fff92f2679f8714f7618026900449056e1c91c5e586e89250afabf620516f9690a98860b31370c9ccf9a5a0aede2aff07f5601c7 SHA512 25c9a3636e7a83e0f9e090906354d2f4a8e44bc1de262987eb3f071b303d64056f2b149954097e57678e0a5553a136a1289c81999ea19a757ff3bea15fad215c
 DIST awscli-1.11.81.tar.gz 544970 BLAKE2B 583a821298c416e8cc9dd9af9d55457fb1eb61cd415159aa880df1a78fd777f1b15e11dce3b712401bd9e1ed2e3ddc5ecb44652870a23f0e0c35aa25e7a07c70 SHA512 61b355247d75939d2814ca0594fb1b4498d7a1dc008e27302328c09bbe4ce72a6eddff64712410bd2023663436fd41d405a6a19a1c53c872a0ae6e68a0718175
 DIST awscli-1.14.16.tar.gz 576598 BLAKE2B 708271155f54dbba643385513691a9fc1cf406eae2d87108a0081b46f84914acf79bb398948daa5df02433904d644e6f0e3ac623859b57a270ad8f1e240b0e8c SHA512 6ad7b908cb1b858a7837042322f59a5aaf71c909d87e783e2f07ab0624b2ca9110cf879c292f9a39012f9e5dac95189a7401d319b3f088662d15c827e9396a06
+DIST awscli-1.14.50.tar.gz 587829 BLAKE2B d98f0ea4fe135f6ab5b458d251e763bd2d3c75eaa3edcadf0deaf33350a01e384b7f3a797069d631bcb3338b5a6b77c29d704e4a83946bb65e4c47fa523d8f8f SHA512 c42cfb3ffd75ca4b472b62ecf7917fb204190363b62cbc55c19afe43293258dc762ab3133fea38fd20efc4625db5d97ef274517168e2a2b3cc53d0081b2945aa
 EBUILD awscli-1.10.51.ebuild 673 BLAKE2B 9ca5320955d387ae29963c45e45ef05f79e4de6a4337f713a100a59f2ecb3966fe3a813b07921ef436bcab2662b3a7f6686aba2cf84b0817a89bd06626d7658d SHA512 e6bc2f4ca40c10deed7fcbf49d66930530a362e00bd2c5404445f39f06125c70f8abbd2e153d509f275efc04ec754dd3501bd6266813462f56640cdc409a1eca
 EBUILD awscli-1.10.53.ebuild 673 BLAKE2B 9ca5320955d387ae29963c45e45ef05f79e4de6a4337f713a100a59f2ecb3966fe3a813b07921ef436bcab2662b3a7f6686aba2cf84b0817a89bd06626d7658d SHA512 e6bc2f4ca40c10deed7fcbf49d66930530a362e00bd2c5404445f39f06125c70f8abbd2e153d509f275efc04ec754dd3501bd6266813462f56640cdc409a1eca
 EBUILD awscli-1.10.59.ebuild 673 BLAKE2B 9ca5320955d387ae29963c45e45ef05f79e4de6a4337f713a100a59f2ecb3966fe3a813b07921ef436bcab2662b3a7f6686aba2cf84b0817a89bd06626d7658d SHA512 e6bc2f4ca40c10deed7fcbf49d66930530a362e00bd2c5404445f39f06125c70f8abbd2e153d509f275efc04ec754dd3501bd6266813462f56640cdc409a1eca
@@ -14,4 +15,5 @@ EBUILD awscli-1.11.154.ebuild 726 BLAKE2B 005eb8588a83cab59c3e5db314daaaa99129a3
 EBUILD awscli-1.11.158.ebuild 726 BLAKE2B 005eb8588a83cab59c3e5db314daaaa99129a336ae55b46057f7525af16e7bf7e7694fd4c6bdb96a73c183a2cc9b1acc5ba15be94241f9c09f8745473e2aac5d SHA512 d52c7b261680789f9160dd6801520d0f4e8b933aee72e309729f7917b10aa4f5389a7e1272456e39f583257dcac86f6cbf18244f15e4c3b828e0b3b45143c8ad
 EBUILD awscli-1.11.81.ebuild 681 BLAKE2B 349ce2cda522a2eb6019e85c7f7f11f8beb8521e2b2f94b0d15b9ecd5fd18f2636d44390706b562eb15b2a372ddea28bdc7ed44dd3d6d3658c8cb8c6af4ecbcd SHA512 b886a434ff4b057e11be9d46faaae6f5e2847f1cb24cee87fb21fac8fd8d9ee6a9553eb308fa6a22681ede683581485d2a4df0d7b71f5e64b0cd2baa56a701df
 EBUILD awscli-1.14.16.ebuild 736 BLAKE2B e04b71c9eaac8f1577bfa40f82127eb31004396ac5ef504552822d8f222cace0bcd522d5a7fb40ced80700f59e6bb7dba93967905b827dad36f22e4edbe59475 SHA512 edc515f0d1bf19437678ef2d6859e2c5b40d3158ae1b92df03e4817d0762a43fd490d1ed391e6de3bd5426b220df4981361ced4b1dad4c09f5257f9d17f69908
+EBUILD awscli-1.14.50.ebuild 736 BLAKE2B 82fb69eaafdb5c7f60f4810427cb7968be6b0c501b9c8951c330bdfc3aebbffe483dcbf124cdbd449a5362d1d09fa70fa45380bd28f120b1dfe67c1151a9380e SHA512 98937967b390d5f7dad9b0c4873eff46dd653ce244c8146f62ce9a77557e27f0376731bde0ebd57f6a8f0abd72af8fc9e799e77e0d282a8dc52636242f7e794b
 MISC metadata.xml 316 BLAKE2B 29c8ad67f4e7c5db4439aeae00deda8b57bb36bea7bd6490ae60efaa30cd2db1f7b2cff5b21558cdadea05f9caa8a9f4ee580fe2ea80959fe6ef7ef6f740c550 SHA512 86b3359e64e41ac4f2216e5bbcee6468100df3cd6e9c25595527d6819a2c27ce327797163a3a43bab11516a4826cff47825449cb797d7fe845794700a3a2bed0
diff --git a/dev-python/awscli/awscli-1.14.50.ebuild b/dev-python/awscli/awscli-1.14.50.ebuild
new file mode 100644
index 000000000000..09f1db16250d
--- /dev/null
+++ b/dev-python/awscli/awscli-1.14.50.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="https://pypi.python.org/pypi/awscli"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/botocore-1.8.20[${PYTHON_USEDEP}]
+	<=dev-python/colorama-0.3.3[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	<=dev-python/rsa-3.5.0[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.1.12[${PYTHON_USEDEP}]
+	<=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
+
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	"
diff --git a/dev-python/cheroot/Manifest b/dev-python/cheroot/Manifest
index 92e76ecb6cf6..5e3a713723e9 100644
--- a/dev-python/cheroot/Manifest
+++ b/dev-python/cheroot/Manifest
@@ -1,3 +1,3 @@
 DIST cheroot-6.0.0.tar.gz 62763 BLAKE2B 0946c01c6a6233dc60ca3dd896c3d1dbc0feb97d5099d88598db340a8812b2be4cb076383c0e39d30cd2c6fd3402e048b716a02e82bec8ce08d5b8fca4b1be0f SHA512 0109fbf3b73ed3f12261eaa3c6d86b6c6b80a1ba3564548ba3288aa6c61a1c08db60886e677991bf7997e6a5b1ec7767a3e06098ec1748453e72c40fda7b82a7
-EBUILD cheroot-6.0.0.ebuild 929 BLAKE2B 06bd6d597c356cf67f11c59ec5581aa8329755f0aa567fcd52dee2a22563ec91d1b821ee8d3ab857995e993dc84bd6b7e848052a630a8082e4bd4cbdfa23f259 SHA512 f81b94e434e4f9a20a6ded0673788444768a497d72b9a18e3d15400daa380358c4c633abeb3b97d9186a64d38410a1fbf1b204e0ebc75132bb38321e7e3d0fdf
+EBUILD cheroot-6.0.0.ebuild 934 BLAKE2B 59350eec6fa0b8f8eb94e06f7feb27d31d34a14083e4becc2f341c78edf4c1202596a9b98f3a2ae34e297ab934882b0cb48d6dfc0b9e2bb9a8b4590c62d1eb58 SHA512 e53b24da58678cd26c376ad7a666f0d1a446369756af015030e01c983d90e1240f4dab841efed5caef3f3d1c2a2b05b05f7b5f7cbe5e9034c38b2b965b5c7562
 MISC metadata.xml 370 BLAKE2B df7ec3eb606f1557e048245eca81402f40f9cd9bc4ec8112ecb0085f65530d9a66b952d56f826b2b97733018ec4b4d31c16ac26bebd3a40f3424421255fcb770 SHA512 22ff00c4677bd898e9d88f2bdebabed6a145a9dd33d6276e997c0435c64fc9dfd396a35a88c6facc8a3844187f0b598bfe8606637ea88420a6c33e1ea9765cbf
diff --git a/dev-python/cheroot/cheroot-6.0.0.ebuild b/dev-python/cheroot/cheroot-6.0.0.ebuild
index 87d8ebd8f061..ba5b7abd2ea4 100644
--- a/dev-python/cheroot/cheroot-6.0.0.ebuild
+++ b/dev-python/cheroot/cheroot-6.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/C/${PN/c/C}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86"
 IUSE="test"
 
 RDEPEND=">=dev-python/six-1.11.0[${PYTHON_USEDEP}]
diff --git a/dev-python/cherrypy/Manifest b/dev-python/cherrypy/Manifest
index 499a9f987ad7..26e42b1024c7 100644
--- a/dev-python/cherrypy/Manifest
+++ b/dev-python/cherrypy/Manifest
@@ -1,5 +1,5 @@
 DIST CherryPy-13.1.0.tar.gz 687221 BLAKE2B ab9c8f50026e26d171877e4e68f1c5a53fa8519190bcc577e12999cdf8a7f52be37f4ba9ed83a276a9f33676839ec63bff68aa8f9f51ddf15557e09123bf2530 SHA512 c32cf009d6a5b557560a00cde0f47a01ae481c7f60b7f340e5c99bf2d7c757e7c7cbf3ef2f4f71c172057aa09ca332f2d211cc97623ea29ba9f17287c7bc42dd
 DIST CherryPy-3.8.0.tar.gz 433711 BLAKE2B e1b4a554138a61e8c6313c3055723583d812e573a352d67bd5448f799e4f2f22694b800810b53cd041c665e46d9555b471d1da91c252ade96459778d7a5c07fa SHA512 25f84093e30d814c0980f7d77b98492113470c3297c66ee8652e40650757f8e2b7db01bb8de6d7a1ea9b4bed8b764502b1f563ac6f0d082970bc2d46739d19c2
-EBUILD cherrypy-13.1.0.ebuild 1313 BLAKE2B 9223217ec3a6c44569863a2f2b3d3adb14877266cc5a0be1460a58351dcf8bfc369aebaa30ced963710ff970e42da5f32d6bd3c10a3d37e366d12e84a98f102e SHA512 d4e5491995b2e5870002936e239efc743b835a4d8be4c3ba9f0b8954a61452c1027bf0b3e5764798c7e9ef9a3b444a24311c07d0c125fc67e79ffbf00d0771da
+EBUILD cherrypy-13.1.0.ebuild 1318 BLAKE2B be676682e727d1594775f68fb8d780e1debdf483a5282a77b01bbfdf2dee491eda7d903537a5cbf88abfdcd26810dc9bbd901b54f004510ca3f88dc673b135e2 SHA512 e5e67dc2dd900f8d775a09bad96fab67c4615a59e9e69981668a3876c2c63f95eac41df4c21be3ee5a99dc795e6f6332d929e5c9db61a4c4235d323dd6ab59ad
 EBUILD cherrypy-3.8.0.ebuild 1661 BLAKE2B f3ebb5b8bf5ea529d9a3be6041b93f1490249e88444d718ef095511dea4af4f97c73841bd2301e5b084ce78c6b76b547cbd9ce72351276c6b411d26e4374f51d SHA512 7149cfa87ee95bed2f95e0107425e476155902f411a7261b4b05e8eb002aa3f4730d3c3469aad48ead90fe5838baa14b2e4e441e0d1848e013c88e9e8ecbf195
 MISC metadata.xml 321 BLAKE2B 6636b11693e6e9d09f579bc88b203bd7c41f67222887365de5db2c3aca4c34d8cb2e341f217240ce562f43d60e78221442c12b08f2f7e516c36e06d928a9a995 SHA512 c777da5d545e3d626d663830437ec91a8f228c58734c7df4e4a16f0609904a5ad4613310d2d05b4e8ea89053371ad0bd4f0624137afe54ff6c4f5d9eef734d10
diff --git a/dev-python/cherrypy/cherrypy-13.1.0.ebuild b/dev-python/cherrypy/cherrypy-13.1.0.ebuild
index 55d7017fb48d..19fbef165c1e 100644
--- a/dev-python/cherrypy/cherrypy-13.1.0.ebuild
+++ b/dev-python/cherrypy/cherrypy-13.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/C/CherryPy/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86"
 IUSE="test"
 
 RDEPEND=">=dev-python/cheroot-5.9.1[${PYTHON_USEDEP}]
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index c584c60d2413..1461dca8910a 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -1,9 +1,9 @@
 DIST cfe-4.0.1.src.tar.xz 10933628 BLAKE2B bc1bb8875e83ccecd446a48cfa41f5c98a09d6ad24ff439a983f629711b4513b9c4bee4070f8df13b6b2a52d673b0706733a4c151ce5021a0233147debff14ac SHA512 936c9e1626b27e63a4fb11f3c0cb998eeaf9a520ad6e2bcd67cb4352e59e7781ecc700df79794f3fd70473d90b7e2ba418a39038eb0146b68e843f0705c1f964
 DIST cfe-5.0.1.src.tar.xz 11483036 BLAKE2B c4eb54cd8271b62cf7a2219db0b599b68c00b6e574d1946220efbd1633e841796e6717d6eeb35e84a6db32a731a3285b59cedeb3b1a8f3c3c502b799fdd0a720 SHA512 6619177a2ff9934fe8b15d6aa229abb8e34d0b1a75228d9efba9393daf71d6419a7256de57b31e2f9f829f71f842118556f996e86ee076f1e0a7cd394dfd31a2
-DIST cfe-6.0.0rc3.src.tar.xz 11959032 BLAKE2B a054cec4aacf3e711edae7df6dfe21283bdb4953b5a29b54b41f45c6c085fa5a7532199e6f09c46ed100de8cdd5d61acdeaaf1d3b21f54154a8972807215dfd8 SHA512 364e1ae830f453b4da06e5396b6cbe934f46c8e30ca962951d71e0f228ddd9825109c20038ed1cc76f016dab52c0fe54e61b0e054fac3d1135443469030bc3d4
+DIST cfe-6.0.0.src.tar.xz 11959224 BLAKE2B 257edbaedf72bd941b67b4aa2f152a96a37bbea72d21d22d4445152685efe40d75b9a7a39955545643e841ad6693ef12e52b207b9119098774f39e858b64bc09 SHA512 e886dd27448503bbfc7fd4f68eb089c19b2f2be4f0e5b26d3df253833f60b91d70b472a6b530063386e2252075b110ce9f5942800feddf6c34b94a75cf7bd5c6
 EBUILD clang-python-4.0.1.ebuild 864 BLAKE2B 40d3452c9f28d5c154a51258a764bc380addf20f8fb71e8f5e3d9a0fb60822d805df009f58f24457b834870a07abe365bcb6d3ed6557713282129992c1ae1d84 SHA512 d2900dfa55a69965e146800f097f8be256d022aca8d85f54db205f75b30cf72015d27c4e8f4981725d50c7a1c2a14c15454f009b2d8a3636103d6d133b0a2324
 EBUILD clang-python-5.0.1.ebuild 1018 BLAKE2B 84acc3e37c530b17f6d4b21bd6ef519cb8cf960efaab0d3241736f3bc6d8c28d0e5764e76b2d7e4becd024b3ae6662c3fa125e0a2baa9a28c05b157460839e22 SHA512 adc39f63cb3b8edebd2344e35b325cc006b29f524d7e20b2cc6a44476595bc873733bc776fab50584c1b30700e2a51cbeaed13531b6032e5ff244d856a06f1ba
-EBUILD clang-python-6.0.0_rc3.ebuild 1002 BLAKE2B d93a667f73fcd51c8fd1f8f5419f92c1895f0e1f28e94a8922b6a14b6ff0ee7a96d2a6f673e2600b4267b7401cc4859a0b89e8d58060874a779ddd6d95c41372 SHA512 772579258fc03f044a4c090985e6a98083d8d31233ab654021305f490518b1461e8073fdd655144653504df08f2a5fbbc2907f96d9a8f2692aa4785e83669b6c
+EBUILD clang-python-6.0.0.ebuild 1011 BLAKE2B 4e278788bfb8e705b4976b3becc3340d2ee3ec665de6f828de7ac9986aad592ce410844fb847716693d60f35865af382dd503c991159e537f41fbbf068351fe9 SHA512 02249863f21f53beb8394965401d5978297da81b08b90a9f14bc74a8032dec0f22855d2f4be2ad697dd42133b746ae21e9b3a35ce1c8f569afbbdde11aa1c0d1
 EBUILD clang-python-6.0.9999.ebuild 988 BLAKE2B f83893a8d12607cac36cb8963205d7104864e4b7e644856c619d483739b530e00ac1b4de96bcf6cb312180a2e7bb47f7a0c8dcae32bb06e8ca5e55a53927fdff SHA512 eff745749f8a606b584f359ed6f68b2dd18f2192b1bc6ea0e6337dea6f35240c8f9ea2304039a638c549bf60c28470134e0fa580b3daeaee592bfc13ff3e2ed7
 EBUILD clang-python-9999.ebuild 963 BLAKE2B 1a6d55304c90f7e01c10321401490bcc88be4672d1c28e1eb1759ba42179a495b7d5a46b552af46ed310e20df48df4746b89e9b8e64269846f7131775f4c61f0 SHA512 d1e933646aa6069c5140b490c7070ddc2d41698b92052793d51339dfd622ed2e7624bd23bffded5d6cd9d72a329eaa1e3318618a55cb557c53cbe511c409e685
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-python/clang-python/clang-python-6.0.0_rc3.ebuild b/dev-python/clang-python/clang-python-6.0.0.ebuild
index 5290aac1032d..5ed21cd33b64 100644
--- a/dev-python/clang-python/clang-python-6.0.0_rc3.ebuild
+++ b/dev-python/clang-python/clang-python-6.0.0.ebuild
@@ -9,11 +9,11 @@ inherit python-r1
 MY_P=cfe-${PV/_/}.src
 DESCRIPTION="Python bindings for sys-devel/clang"
 HOMEPAGE="https://llvm.org/"
-SRC_URI="http://prereleases.llvm.org/${PV/_//}/${MY_P}.tar.xz"
+SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz"
 
 LICENSE="UoI-NCSA"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/cliapp/Manifest b/dev-python/cliapp/Manifest
index c9abe37b504c..89ea4d6e492b 100644
--- a/dev-python/cliapp/Manifest
+++ b/dev-python/cliapp/Manifest
@@ -5,5 +5,5 @@ DIST python-cliapp_1.20140315.orig.tar.gz 51107 BLAKE2B 3ff4b1203041fbc5ff0ad67a
 EBUILD cliapp-1.20140315.ebuild 619 BLAKE2B bb2d6ab798d93d38d31be45d4ba0d5e986a4ed2ba0fe9fed8ebab3fdc3c924347c1603ed5f0b1dc1bfd23482b16887f1d338eb62d6b2b48050dc42be67feafc8 SHA512 1c1d1e3b682ae148e5111004fddc77dbf8ee710165409e484a7cad2e9d086334a7d17d601c68d294c3c2ba28b6adda6a3df8b1ee26b46287dfde7102be2a2a76
 EBUILD cliapp-1.20150305.ebuild 605 BLAKE2B 823c4863996f55a48074590d0c2d910d9255fba57bdc325480d720a0f4e79fa4eb641daa4bcbf6a7ef507aec6fbd1459cfb7ba4d9e672d58ce6d3a625aecb152 SHA512 64d7a3a2f2af67354eab0d78a092e04fb9b7d9640e587d76681578f13d9feab832b567328c30f92ec8653d7d4759cdca37f9c39fa899f130348d28348aab61f3
 EBUILD cliapp-1.20160724-r1.ebuild 732 BLAKE2B 1e5428927cb789cf7bc6b71c89a6e737beb4243d7179ed5f30a945969df818f7eae2e7ae806c4235fde69b1d1ad5732f4f21d8d1565806cb800ba25ad2376427 SHA512 4d2221382e5484e5f65723f05f4081975d603e11d2ac44186bfd800fa160d49c444134cbb7c0781f422006d630685879a58ec0d8e2f206c998e6c831f475783d
-EBUILD cliapp-1.20170823.ebuild 678 BLAKE2B 9b07b9f6ed8cc3e47b8023efb860387f2d680f36b4031a34d45e02052a69b37611d3fa3ff461ff2e2065cf5c9ac8f13efce230b32d6911f8e89933276def3505 SHA512 08ea0a84d43affbef68c7963ce01c98e6fe89825d187892deb6f50fd09fa6cbd727280ed1cb722158f195b86c07d0dab7c924a0bd470161485e9b208453bc811
+EBUILD cliapp-1.20170823.ebuild 673 BLAKE2B e30a17d7054b444ef5af5bd49ba141c6c8735bdb4d9a83a960281b7031443f4e221ecbf9306db42748c58911742a363ebcde3cc1d087f81124c5863ddc050d8f SHA512 5c44a243b52891538de2e94c2b8c2065939ae3beb40e597297f9387e6d1787c34c0365c9eb505e4cdf21a40f5b61465e2ab35fb5240c36c3d852e5f454da6087
 MISC metadata.xml 250 BLAKE2B fef48a48388f26a915c53bca9aa9cab62fb73ec006736542afb4cbbe0c7b81d23afe2884f52433c7d390fc38ac32f957a6f6efe285ee1cafaed76407a964cf9b SHA512 924271cfb32ceafc4134e19b53fbeed96f2e9056addc3c2cbdec28890254abf5f0714979a3ab698ca046e41ef5c2cca2932350830bd8bd3a8e214d99123c12de
diff --git a/dev-python/cliapp/cliapp-1.20170823.ebuild b/dev-python/cliapp/cliapp-1.20170823.ebuild
index 8b16ff6e1040..13f210c692c0 100644
--- a/dev-python/cliapp/cliapp-1.20170823.ebuild
+++ b/dev-python/cliapp/cliapp-1.20170823.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://git.liw.fi/cgi-bin/cgit/cgit.cgi/cliapp/snapshot/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd"
 IUSE=""
 
 RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
diff --git a/dev-python/configparser/Manifest b/dev-python/configparser/Manifest
index 58c1ce91c943..38240d2f9844 100644
--- a/dev-python/configparser/Manifest
+++ b/dev-python/configparser/Manifest
@@ -1,6 +1,6 @@
 DIST configparser-3.3.0r2.tar.gz 32885 BLAKE2B 395a6fc69b1b4c8f6d59bf088ade94f0573faf26964a38a64393912fc8ea7279d4d8bc67d3f7cba5d754cbe82572ddc12e2fdef1ae3ce18cd216f4705eb78b85 SHA512 86c095bb64766e87ba59462a99d0287ec52073f27a1c9be7d37568516bc0cc4af6f362ca90a1b90f52aaa4342dc275d769c77f18d80c0efb114ba6fce37fff5f
 DIST configparser-3.5.0.tar.gz 39573 BLAKE2B 100baa33268376e44bc8f7f8e875e93f081baf71226fd84430823617805c0c983e49b5ba08261ba0d73e92d30e0151a9ef9733031673e16fc4012f4020881298 SHA512 490b9f7807bce02667f41a48389b51f550818d2bd4296b528833d65d4b04bdbe5b906e7584e55eee4495405267a697ba26a056e6504fe6b3f8cf07ea8f55f7d3
 EBUILD configparser-3.3.0.2.ebuild 500 BLAKE2B 7a2d3c01e3f256c953e6d5609572e3aded6f23d0d8420b9e7a701aef341833822345fca08e4d2ddd417bd56f593fe4deee2677bddb912c36ddb46f2051cbde60 SHA512 16602bb08b32942017d65476aea2599975e1aae9cdef2cf883d4e7be1521ab9cf2d6a92c4e4e556893d9c10fb5ee9a1df40d3e45e1f6e77aa1d0550f77589d95
-EBUILD configparser-3.5.0-r1.ebuild 703 BLAKE2B e2e9e25a1be24a62214f94abf00a11dba66db35d58819fefc3c8faea835e0b20c4a77d628d55cf637d0307110144b99174b2f5075ed99d81a26fc67aa4e14cd7 SHA512 2cf6ce6b9087f67ff5a5b96ed657d60909716b5e5d9fc79957165411ec64b0de795f79336fd3fb774b54dd500e906c44b5aa0b4d724e900ad3bb593f108da13a
+EBUILD configparser-3.5.0-r1.ebuild 699 BLAKE2B 5bc70c54c798c1fb30c16ef523aa1ab950132117495e175a522e72007222606aa6cc4ee2bf8e10b8dd5263c12a562605a391f46f02666ff186a0238157214586 SHA512 ca6a0b1e114d19c9e00b555947f29ee2b8949a8c490fd85ec8b29f5e1beca9be3f638c84af60614aa476a86d51e80b87efc6859498c3d1daff8fb5c2446de2f0
 EBUILD configparser-3.5.0.ebuild 480 BLAKE2B 1df85570e677a345ef4b97a1d16f4c32e56e0f6bf78512b8291c95a48a60237f3ea6ec224045cac8d7e34aefd4bcfb12b3547bac7c4328c1f75eef6eeea4325c SHA512 0615d9e1b734c60f996b8e0c800e3b0434497e7f3def8e2a48c5126bd1716e724e8c7681d1a5bf16c9d373f063d2edaba50b6d9b1325e6e4ad809fda3fc8b384
 MISC metadata.xml 325 BLAKE2B 8b2c0dc1df941bc82398abee2ba3521a98bf318d2cb7ab34105eae2f10582c94d9d6c14dfc4eb9dacf1a87c0e4e0b80aaedfcf8d172205ed2b945abf1d3578f7 SHA512 84ae4fb022faa7158c67ee9be02019edf93a84b0f97d56e9bc4384bb57abc4f7c93db747627cd87696506383922101f3f5c58ed8509111b75eb6f3574cabc75e
diff --git a/dev-python/configparser/configparser-3.5.0-r1.ebuild b/dev-python/configparser/configparser-3.5.0-r1.ebuild
index a0f5bd0587c1..12ef27784d47 100644
--- a/dev-python/configparser/configparser-3.5.0-r1.ebuild
+++ b/dev-python/configparser/configparser-3.5.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="dev-python/backports[${PYTHON_USEDEP}]"
diff --git a/dev-python/django-opensearch/Manifest b/dev-python/django-opensearch/Manifest
index 08413374b29e..8afcab260323 100644
--- a/dev-python/django-opensearch/Manifest
+++ b/dev-python/django-opensearch/Manifest
@@ -1,5 +1,3 @@
-DIST django-opensearch-0.2.4.tar.gz 15770 BLAKE2B ec57f16eadfb8905b1598b4e80a2cb6b7c996fcc6eaab2bd133df20e2ab23281c52d57b45879a7e46e6ec34db7645b3f7241223ef04efe6515b75892af1973d5 SHA512 6852f95b52a68cf1c48ceeaa365a691391e7a19363221e3bc32a9dd4c863e37a9611b1f31f91c342303b0e1b3418c4a27873d0a980e64aeab87ff2ccb1aba63d
 DIST django-opensearch-0.2.5.tar.gz 15870 BLAKE2B 88229b8545633bb46d37cb03e1fc3a7f8854a36b14f662e4edfcc8c3518014cbb67fbc9b6c25775b4b22eca73de26ca94621e7f92c502d0fcb5dd41e1da30af7 SHA512 70ec931de2687bd6e688fd60262a85de553700247c852a686fea422bb5208b5a3e0441b5778dead1838ae693a22103ed3db1677fe395f000531573bac5a501c7
-EBUILD django-opensearch-0.2.4.ebuild 487 BLAKE2B 15a8272ae071749132790553338f4b3e05cddfc14d41a79b4844a157a0a7cd223ffd6baac132b5edfd72de10ccbf85cf3620c20780b77bc8c89e3c579df28a90 SHA512 3ed730b4ed928448dbc34cc7f291d9456bb2b619b6f070468984898287c976e41e02d710bb51cfda4bfc178a050fb55767ccadfe0c10f847ca236dd9f853f909
 EBUILD django-opensearch-0.2.5.ebuild 495 BLAKE2B 9e375654c2f137f4c484e9d42d166998ad6933f1411ae2d1b8bc4690d52dfbaceaed35bcea6fef08469a934467abeb327766a70bcb0aff173689fedf4fea353e SHA512 11acda47fae0e0b1be1ae922c55824766bdbe35f606adcd5826e89a56039065eed52ebee2cf9cfb2596c9ba803e2a1a65490f10f60bd0f098048331719ec37d7
 MISC metadata.xml 354 BLAKE2B 558b764145561e2ba0e0de72126ced8a42315bcc3a7343cf9f8c1d5f89d80f27f2ba3a2eb35c78e0dfdce93312945ce7d00b0856b80ecb179860c180896ee285 SHA512 ad0ecef3112b5816856ae9fdf28112630a7946a9ef5b4eea4abd401e16198ea20fb561edf40be045e35c2f05cbacb6a644eef9f4166848a124a26ddb112ac8ad
diff --git a/dev-python/django-opensearch/django-opensearch-0.2.4.ebuild b/dev-python/django-opensearch/django-opensearch-0.2.4.ebuild
deleted file mode 100644
index 33ea6109f7cd..000000000000
--- a/dev-python/django-opensearch/django-opensearch-0.2.4.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit distutils-r1
-
-DESCRIPTION="A django reusable application to handle opensearch.xml"
-HOMEPAGE="https://github.com/vint21h/django-opensearch"
-SRC_URI="https://github.com/vint21h/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-python/django-1.7[${PYTHON_USEDEP}]"
diff --git a/dev-python/django-otp-yubikey/Manifest b/dev-python/django-otp-yubikey/Manifest
index ac814b0422e1..e6f38c00d34b 100644
--- a/dev-python/django-otp-yubikey/Manifest
+++ b/dev-python/django-otp-yubikey/Manifest
@@ -1,5 +1,3 @@
-DIST django-otp-yubikey-0.2.0.tar.gz 11264 BLAKE2B cfa950e11e4ce57713fb3b0607a614dd294938779398b6cabb5ea1a4168c9753de6a35a887ec75a8d66a8ebd187e0c4687ca32bd72b13e4b84b5bee0e911a635 SHA512 f0b18fb262caa76a25af0a063c85c07b41f7d211dacd1db2dc6cd55995bc505a1e70535b70a95cba722685a3b34c8a304e9b829b9c3f27caae67921f86f7ffde
 DIST django-otp-yubikey-0.3.3.tar.gz 14233 BLAKE2B a85eba8bf9c590d4747627baaaa6c038afea7d766203974508ee1ccb6bf807642720fae78a64584230f013daefd87475c5c9f94f1584ed4ddbdcfbdb31aee57d SHA512 80c9ffb42a7109a04eca4fabca33294b3a65abeb12f408cb6d7c6c06644896629df43d32833d514e0a60ddd6352af073fb5b2f1174a07b370214a76ccc093c3e
-EBUILD django-otp-yubikey-0.2.0.ebuild 550 BLAKE2B 89b872b509530de9e757e1c1ea3272b3d352c75c10ece012db761e9ee3f73954b49d84b0dbb32b8a205194d2758769acbc5accec1780a718a4d497a0679f6391 SHA512 533596a78445dd646a53ea7ad72b85cec6a453fd3a70aea48ee81819b79c25fc11a52f4ee121eefce5d61784e4d222fe297397c28b440ba20bfcd9c0321ded07
 EBUILD django-otp-yubikey-0.3.3.ebuild 572 BLAKE2B 2f9dfe15e30dd4cc43e27bd4c265e018db2f140499b07bb5edd48c4e1475972da4b922bd6feb1adff3e423ffa1eb3f39f23b7e6e5885ea2eec249d34a03cfbc6 SHA512 4a8800b24cabba93de68ccd8416bb8aa77ef29db4bb2ae00a6e1402f23c8d2883a1fcbf176e094a044ba1016c9f03c57bb3b5aed8f08c93d00eff15e0e459d6f
 MISC metadata.xml 408 BLAKE2B ae32f3256c4b00e48ee990a195184ce96c229af699b0d428dc4bf77b806922e7a2bd65376347701c2a082bdaa6f1857e56e6962eb50744aa8552f48d256cb95f SHA512 09b07ec22fdebf40d37315530f77d4a369f40d1cdfd7b351604b4234be50849bcd79cac06c88e92d9d5fb3a53d29ebbc0a656048e40b05f2ad7b3438223887ea
diff --git a/dev-python/django-otp-yubikey/django-otp-yubikey-0.2.0.ebuild b/dev-python/django-otp-yubikey/django-otp-yubikey-0.2.0.ebuild
deleted file mode 100644
index ed54486e8a73..000000000000
--- a/dev-python/django-otp-yubikey/django-otp-yubikey-0.2.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="django-otp plugin that verifies YubiKey OTP tokens"
-HOMEPAGE="https://bitbucket.org/psagers/django-otp"
-SRC_URI="mirror://pypi/d/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	dev-python/django-otp[${PYTHON_USEDEP}]
-	dev-python/yubiotp[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/django-otp/Manifest b/dev-python/django-otp/Manifest
index e97308181f5e..959ea093a271 100644
--- a/dev-python/django-otp/Manifest
+++ b/dev-python/django-otp/Manifest
@@ -1,5 +1,3 @@
-DIST django-otp-0.2.7.tar.gz 76879 BLAKE2B c8486d48a2e01a5522c6f8fd6fc6b8c7de50a048aceeef8191d308b041f21a978e481a5635b72c16749346b9152984b7c707e15a621110fa4c3e7e3937aa2a50 SHA512 b48c6dd505ed06b4028a1d27213ea759a1a54ca5f4e5c8dc2aad826535a80295fcdde3a1da455256927d26906e53ee40c47a0ab89de5c6331c2f3567e43fdae7
 DIST django-otp-0.3.4.tar.gz 39992 BLAKE2B e85cee8d868038aa936a8a3bd7dfd326a28a7609f3a6273637e075fb971dba27060b39f18773628c6a963525a0aa83328d72de937957f430629b8ad6fa77e127 SHA512 62b6683050a9dbd0bcfc9a63bd965f19e5d088c3e53c5e45067f8a785aa7b2a7b540d0331742bf8b979ad95d308f944bfef250989d1f782849a71bbc79a7d53c
-EBUILD django-otp-0.2.7.ebuild 554 BLAKE2B afad2cbca60645985112adc8c451072a6e59243cf0cbbe1dfc97ed41b92b418c48b8e3b3d5d5b2194e12d0ec9c6fd5723099f82cd9826970509e3f7ad25c7752 SHA512 d9661aad79a073b17f74ebe07d04d71b97bbc64e1db6a82260c1155b9555eb1e4994c07e90a8539e1b74352b362aa5003e8886cd301abe041f9b5d1d66f93ace
 EBUILD django-otp-0.3.4.ebuild 548 BLAKE2B 22f6b4a7622785753cd90777cee07b372c04e4c0017a64a1dda198be47d40ea057a62e815f19e5d1fc63dfbd08637f43b6ad7465e91692dc813b19d2eedd5c1c SHA512 14bbd14992e01a344d900b9ae43e6d6beeceb1380de82461ce0adbddf18744efd81de5fdf1cf7dcdf2f8b224f76546d03fef662e2ba81ffba983326df398d8e4
 MISC metadata.xml 400 BLAKE2B 5c7cc72fde15918a3ac6a6d0023cb4702d544f7188c64b2f49f8c54ae2ca341693dacaf32e8825118598e15ff69cfeac930f8b6f4d6ef7a50ff3d65ce81f1fb3 SHA512 118076dadf13dc3ab4a1cb780dd49a399ff2e09f0afda93cbd7b4dd725216ab128f00fe6baf945edc30c4c586d18e2e200f84af2869ce87078daafa0c113aec3
diff --git a/dev-python/django-otp/django-otp-0.2.7.ebuild b/dev-python/django-otp/django-otp-0.2.7.ebuild
deleted file mode 100644
index 5d3bb203538c..000000000000
--- a/dev-python/django-otp/django-otp-0.2.7.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="A pluggable framework for adding two-factor authentication to Django using one-time passwords"
-HOMEPAGE="https://bitbucket.org/psagers/django-otp"
-SRC_URI="mirror://pypi/d/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/django-1.4.2[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/django-phonenumber-field/Manifest b/dev-python/django-phonenumber-field/Manifest
index 688874912e56..4185feb605f9 100644
--- a/dev-python/django-phonenumber-field/Manifest
+++ b/dev-python/django-phonenumber-field/Manifest
@@ -1,7 +1,5 @@
 DIST django-phonenumber-field-0.7.2.tar.gz 6208 BLAKE2B d0c771a61a299551d075208f5d9bc8077910111bd54b2353fdffd8243f37ec492e57ebcee68341d368d5cd851da6b9af43655ac05da7e7da0e172958ac7608b3 SHA512 bdb48ac1fa22c959409ba37b28786fbb46220628bf88265dd3c13ab2c676816d0dd1ed9195ce614a8184937347c3c4760fbdd1f57e235758790881af9a44f504
-DIST django-phonenumber-field-1.1.0.tar.gz 12479 BLAKE2B 34bb088d9fd1bcffa04dd93d06893bf14d93630e5c92922d55d59322e7befe243445b6ba2f1e44994eca49e8b02909eaf3db5ea63c47f06cc6055a6c5b69491a SHA512 7bd5271f807392412cf11b4a1e557693657f5751ffcc26e16c394f872799eb50f6bd87e2b302ac6a7e615c84a2876921ac2c6ac9bcbef3df4ad7b7274c3823fc
 DIST django-phonenumber-field-1.3.0.tar.gz 14501 BLAKE2B f754f464376d684bf6d2cdaec8b16996cc4718947c5c4aab43e41d6dd66823d0ecfabc261bca918376ee92b33b1397786c88c82fede60261f073927a9a115470 SHA512 2a0065691f9874edef96e41c237d8a58b4ac5c3efe7a82c421dca269185962f518808083ce82e73a281c95675703b24820a7b5dae09a08474b6c2e3e7f529f1e
 EBUILD django-phonenumber-field-0.7.2.ebuild 632 BLAKE2B 999bf873a04f4fbb31d801012e873f996aaa3e69fac897b6c7f3cacc2f4e00613d758db4296119943ba994b7fe1ce09730c166dbb64a9bcf027d3339ee3138c8 SHA512 423e44f3c8a80f8b9f7f9a431321ded59b6d613cc8fe6393d0bd6281e1933ac1627089a8bfcc36d9d93fd3d3def526bc25741422d3f01a66b5c8517bd5b456ae
-EBUILD django-phonenumber-field-1.1.0.ebuild 636 BLAKE2B 06519357a7fbac6abdf2c3112584470d5e487a830b44087fa5f9e0959b82fde895741637ba2123a954e7929bd9fa03c7486288a2a89637ed90f5871be988ab8e SHA512 56a9cfef407fd0260d5db215424adf1c72d733f7585140ce4e13d05a3a5205ac9ed4acd6de7400905e7fda331794c691caa6fa424620cac0c90a59e9361f1729
 EBUILD django-phonenumber-field-1.3.0.ebuild 638 BLAKE2B 2a5905b6a8bf1d18e9abc0226b0779ca641aacb3edb660ba62e135886f6162c61d701fe37075d367b21f11db1407d93016a97d44717793a24f613cb04a4542b3 SHA512 0a0c455c695e91bab1a58729a732595f7701f6b6b32c3203335d242a8623323f29927f88a09b2bebfca6289b555c4edcb1c0b60a0d8cd5d4c96293414f658adc
 MISC metadata.xml 430 BLAKE2B a1f022dd8c4b38bc851536f73622c3b9e4ef1907f5bdc5c9bcff4009980b439b90e034b9ca5fb22eded9bc14b2ab17f81dd241ec1b9afbf1feace865f17fac57 SHA512 aff5f4e78379f8c7684f2721c8026efc56f543d3679a0f417aadffd8688eb419514429e82617b32ff9cd65075a7bc38138a2a9d5dda032b779554257dbb82402
diff --git a/dev-python/django-phonenumber-field/django-phonenumber-field-1.1.0.ebuild b/dev-python/django-phonenumber-field/django-phonenumber-field-1.1.0.ebuild
deleted file mode 100644
index 807d25578bc2..000000000000
--- a/dev-python/django-phonenumber-field/django-phonenumber-field-1.1.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Django model and form field for normalised phone numbers using python-phonenumbers"
-HOMEPAGE="https://github.com/stefanfoulis/django-phonenumber-field"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		dev-python/Babel[${PYTHON_USEDEP}]
-		>=dev-python/phonenumbers-7.0.2[${PYTHON_USEDEP}]
-		>=dev-python/django-1.5[${PYTHON_USEDEP}]"
diff --git a/dev-python/django-two-factor-auth/Manifest b/dev-python/django-two-factor-auth/Manifest
index e47ce7332a0e..c12ed59fccde 100644
--- a/dev-python/django-two-factor-auth/Manifest
+++ b/dev-python/django-two-factor-auth/Manifest
@@ -1,5 +1,3 @@
-DIST django-two-factor-auth-1.2.1.tar.gz 102165 BLAKE2B d8c156c3b3e2ee3ecb247848c0284bfa6bc29c0c90a276865f26800623ba6fd45d9239a8b9b2e5f2f04d4846344c2ad56f7ebc71ff75fbaac5ce433e3e8bca3b SHA512 c7947318929a91096e329e21db81c798f6522050d45203dd2cdeb0708f03d06ab6c650305546cd5e53080cdc77f43c6bcedbc77ad7eb1c88ffa49da5957f40ff
 DIST django-two-factor-auth-1.3.0.tar.gz 98955 BLAKE2B 9c9053a0b1f7c8dcd67b1f82ad5f0db5e790d6e589bab0489960fce8bcb3bdceb51e43bb2b42507c4a3ddd100722d83dc88f71521d3a9fd6513ce3e41aa0247c SHA512 5876e82897b7b86663f12701652d266c20a9d4ea16da8722e96050ecf3a3997fb0bf3e08cbcc1ae12763f68e52d66d2749343f8b7757d4286da14e8ceb98c85b
-EBUILD django-two-factor-auth-1.2.1.ebuild 961 BLAKE2B 3506e550affeb298f91f49a91b3c38d995c6633d80849cb342b2d28efe8c319f00c7303a9704c693f68652e9586b85a19da9f8482d156ea80e08deb4c3be0979 SHA512 863ccdaff622c767521032f07048632cfb60379c3a0ebaf367108570e7a2372007a044bc71d35e8cef16516ab0a720d906db822ad98b740c7f626dc2d4b509f3
 EBUILD django-two-factor-auth-1.3.0.ebuild 1041 BLAKE2B 3674cb2d3e53c66468b3be2d79077f719ec78268fe5864b9c0e3efa7af0b8220f00ab645a41493ffb3a9a7dc5cb489c5962c80953cd6fff0d42953d34f6777ae SHA512 e336545ecb1e6562559101f3005955cab138fac0549b0157dd4614895e0227f2f88a2994d7ea6bf3c0633b39c7dc0f51aae9f0ce5ec99894e681b1597d776b9d
 MISC metadata.xml 455 BLAKE2B 1b4248c62a777456e2f537fcb32f41e5fa923fe3c7c508bc1cb187984e9d3666efba53bbcc6bcafc3007cf27a0267f0e284fb560e826035c29bad60b28c445e9 SHA512 4be974d6f6d469532d9f984a754485c54294f34854eb4c6fbeda60226857204e050192200943ad31f2c74bf92731f0c672d684bb5e76082a32cf789e5e56dac6
diff --git a/dev-python/django-two-factor-auth/django-two-factor-auth-1.2.1.ebuild b/dev-python/django-two-factor-auth/django-two-factor-auth-1.2.1.ebuild
deleted file mode 100644
index baf534d1a7ac..000000000000
--- a/dev-python/django-two-factor-auth/django-two-factor-auth-1.2.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit eutils distutils-r1
-
-DESCRIPTION="User-friendly Two-Factor Authentication for Django"
-HOMEPAGE="https://github.com/Bouke/django-two-factor-auth"
-SRC_URI="https://github.com/Bouke/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="test yubikey"
-
-CDEPEND=">=dev-python/django-1.4.2[${PYTHON_USEDEP}]
-		>=dev-python/django-otp-0.2.0[${PYTHON_USEDEP}]
-		dev-python/qrcode[${PYTHON_USEDEP}]
-		dev-python/twilio[${PYTHON_USEDEP}]
-		yubikey? ( dev-python/django-otp-yubikey[${PYTHON_USEDEP}] )
-		"
-
-RDEPEND="${CDEPEND}"
-DEPEND="test? (
-			dev-python/flake8[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-			${CDEPEND}
-		)"
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-	sed -i "/'qrcode/s/^/#/" setup.py || die
-}
-
-python_test() {
-	emake test
-}
diff --git a/dev-python/dulwich/Manifest b/dev-python/dulwich/Manifest
index 719ad4f318cc..9a4bdc47a258 100644
--- a/dev-python/dulwich/Manifest
+++ b/dev-python/dulwich/Manifest
@@ -1,6 +1,6 @@
 AUX dulwich-0.18.3-skip-failing-test.patch 695 BLAKE2B 27ad8e5037931859e8dc138cc1c4c760051d544aa6212270978fa57bf66b8f0a401e5e005975904f07f775bfb7085c5fb7df16a0f3c743a902028bb8c7ff35cd SHA512 765c9942b0d46d9da5a78a972e4277bf55febcb9ab3991cc1c9561f84ce0c22bd37a5ccca75cc804db51436676393e5e6528e83ef4d599ba9859cc1e4efd98f4
 DIST dulwich-0.18.5.tar.gz 330097 BLAKE2B c29f3016ab63082051c8c4fc42301c12ca752008a317afc41defceee2db47e50efb69b9a21b3d50c241b3b51c32222c1e9cf35eedaf2811f66cec2330ce7865a SHA512 4ba0f70ebddf4c7f4e71721812e228f820226d4ea42bda4d5f06a0720a029d4dddb800cfc05b2610525922c5fcef1020edd1485105706d9ef3fcf810e6381035
 DIST dulwich-0.18.6.tar.gz 331325 BLAKE2B 781227bf91d8df8f941dd2eddb1682fb8c358d37f35671b08334ef197355e33dbbd09d18b43a179f9200cd6abca563a2fc833da68bd860859a52d951fe679ac0 SHA512 2d2120e23dd4bc2c9dcfe601f21ac757ee3fe2a343923c50b32c067f4d329ac89cdf0894bff450bf52c69e99759bb8692f0f14ed73d01be6bc3b0402d58d1148
-EBUILD dulwich-0.18.5.ebuild 1330 BLAKE2B af0949771ce43dd58c5933d9c97dbf5333a3c21ae2aaf2eb3be2c43bed90d86e791282a1dd1d5769dec5e4a6d7b63174e4a4c3cdb2cf9cf786cbe83285b892e4 SHA512 b02557f172bbaabaaf85833df73157d93b20123d50592d600edf8f0aa94881a95bdcdcb8838301bfeb43ac2209b8b51cf1660bd78921955c07302c3d8670d359
+EBUILD dulwich-0.18.5.ebuild 1329 BLAKE2B 88eb1801396b86abf530c73ecff27f55fea55074ca3b888dbec7b1294fb92629cd7ec44e9f7984bba623a37cf2e05d6dca57ce144e5a4b3b53282fa62a7f5fca SHA512 dba5abbe37d81f56ee70712ab4877bea0e7f6efd269617450ef6c6d825e81f02495a3a27e39dd9b92ac173152a2cfa60195f55d00ee9bf8c5e5c8e27e1db3121
 EBUILD dulwich-0.18.6.ebuild 1332 BLAKE2B 6f3d39bbf883be1399ab9459e25612348ca031671a771ae25a0595aa10d3de80537906dd895bc46196fa5d7ebe62a4aababa846921a325c109d28af5a6291b3b SHA512 937e977c3c85bd9de34f1717608a67f67ec1df1126fda2f74213e02a6f03c0a0a5fdd3d9e8591d5b5c635f654dd859023358254da3b2ea292eb8f48fda665a8f
 MISC metadata.xml 555 BLAKE2B 4487eec512ac72ee6be5bc357b6eca9a51046d8ca108611fa0160ee84e433232b96547b161fdf1469cc726030e490fde677561c63deba754fe62bede1f96efeb SHA512 1f48222049a8ada15172ca0868c6b3f2eda4f465409cd1058ab6b9e498a521ac52d14f1bc2f2265c588f0afb9d874f4a45e6effef40e022f9bf8f6c7e4e38353
diff --git a/dev-python/dulwich/dulwich-0.18.5.ebuild b/dev-python/dulwich/dulwich-0.18.5.ebuild
index 8b3ff1c57e16..65ebed3eb805 100644
--- a/dev-python/dulwich/dulwich-0.18.5.ebuild
+++ b/dev-python/dulwich/dulwich-0.18.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="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples test"
 
 DEPEND="
diff --git a/dev-python/eunuchs/Manifest b/dev-python/eunuchs/Manifest
index c5470d0f13e3..e532d9b4afff 100644
--- a/dev-python/eunuchs/Manifest
+++ b/dev-python/eunuchs/Manifest
@@ -1,4 +1,4 @@
 AUX eunuchs-20050320.1-python-2.5.patch 262 BLAKE2B 9cbc91b19b83925718e2e1c4416587b601e2e68040bc38974081541654fc3ba14c965f8517047572bc99f8557422c1593ba63f1b95d196f0b2363048fea98bd2 SHA512 43d026c6a00d8ff660b07ee8bd4e7cb635cc5778d6c87054f90ba95e48c61abac874756fba111caa399da9d812ff1784b822a6214b10c94559674c2917df8ff2
 DIST eunuchs_20050320.1.tar.gz 8448 BLAKE2B bd2f28408ba8e709f37840202229641c22c0d5c970b90822f0ec6a4bec992c81c1ed4b756a29a937365eb15cefae26bd33a000a8a269c04e6aa7da8e4aaa44e0 SHA512 b3272de7ac2a41c2c632aa17424dcc74ef3b6d536be5684bd54e4f22ce2d7c6546ac7b1b7cef2611f00b467780b11a30eca9c8804c0f8839a13adff6894ce88d
-EBUILD eunuchs-20050320.1-r1.ebuild 643 BLAKE2B b0242d7f4804d53c5e4d73c3175ef7f252f4219704d95226c5be3d007f5f77e762267c6b6e2633bc13502a463a47e7962a3129265f49ec1f62f1380f188eed4c SHA512 ce9568f69fd9fd8644c9a2dd6e31d6e589f50ad5407b23d6114b820da3d76c3e056187f8dfe34d7c4efa342806b3a1b697c5f9a932e08a2011f2ac7abd2dac82
+EBUILD eunuchs-20050320.1-r1.ebuild 650 BLAKE2B f64411bfba271c6ee1635fa8eaca665798ffad5d93e10949a4a99c4b86b0ac3b681066e38957b22b08174e65d1129bec754d83389f593c6d6544e3902086e088 SHA512 d061c0fbd078b2cf48e9dad96f12a9a046ca8cddf691c9ec2a1766f73b865ae95dee85e31250f653ca0cbd4b445df96619dd6561bb6359497fb4f76fb4e6a5e9
 MISC metadata.xml 658 BLAKE2B 0626c877770029e99b6bbe9c2f40cad0bcaa24dce5a4b2b2c261f4e7f69b5f670e095b3d4be74d24708a89f786a5f57f1a12b28612eec9d7fa8c20ec016e7e6c SHA512 92618daf26770efe92b1809e150401c0e5d8e987bcb1d1b497f7a9e1eddc39ee08ef0c393d17009c76dd4460ec778f50c6f540bbd89ad681c34d59423f8120c4
diff --git a/dev-python/eunuchs/eunuchs-20050320.1-r1.ebuild b/dev-python/eunuchs/eunuchs-20050320.1-r1.ebuild
index a599913c9135..f8a3ccf76bcf 100644
--- a/dev-python/eunuchs/eunuchs-20050320.1-r1.ebuild
+++ b/dev-python/eunuchs/eunuchs-20050320.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/e/${PN}/${PN}_${PV}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ia64 x86"
+KEYWORDS="amd64 arm ia64 ~sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-python/fields/Manifest b/dev-python/fields/Manifest
index e818439ae0c3..37e5f54f75c2 100644
--- a/dev-python/fields/Manifest
+++ b/dev-python/fields/Manifest
@@ -1,3 +1,3 @@
 DIST fields-5.0.0.tar.gz 36232 BLAKE2B 7e5ebc5b7c76b456acbe02e0b325685776c573dd0715e27402e5245e04f3c54e6e0ac04b8780a50d9b560cb5fbb664bca6a3addc76666f012aa2427140dbf870 SHA512 3d80b9c6a1d0a43568045fc25422b0db783c84e2e3f2be8b1d41b0150f48fef58736d863d06b4562b29190cd6dc2616829faab8e901b7268ac2e9e63e996180e
-EBUILD fields-5.0.0.ebuild 768 BLAKE2B e8061fa7758e7e1175a63c00eef15124bb54e10457386bf568c1680b71ec89395038224353c9f0e1fc9662f0c2094eababf18f9e3ee75023f999cf8512fb8a28 SHA512 83994f09e3bbeeac100d87bd569c95475338c24317c15f0735c41884e7c3db8c9c9c042f5dbb21d6226b60e1fcf39d3c2fb363bacae3866afb7017170bea8d8a
+EBUILD fields-5.0.0.ebuild 773 BLAKE2B 1c2a5371f8b6ea2f9af65a354c1bcd0785841b9e4a098ee56bb0560ca15816cb03d6e755007b3efae2291b70be0246b180c2f36cec0aea8b3fd2ab13dfc275a0 SHA512 b839431be2d7cb0a321612169702d0505557aa2d816c9c16d8da073c34086a8bf3e5e0060803572d42241cfceeebba5051d0582cd6e9e8b841b2f6606d884181
 MISC metadata.xml 336 BLAKE2B 4bec1a37213268f4116b30d5b6db4b43718d3803467423c01ea7c44702c0ccad255d2c0ae6d55469f0e6c6a82a6c4f344000f86989fd820b13513ac4e9d354c6 SHA512 3c055d4cf5070c7535ac37c335f224c0cafbeb68a7bf7677acd06a786b4aff93b5ddeeed3e2514cb999407c21303adf2945561688d5e20148d7e712000f62d0d
diff --git a/dev-python/fields/fields-5.0.0.ebuild b/dev-python/fields/fields-5.0.0.ebuild
index f69b325c87dc..181d4c3c084c 100644
--- a/dev-python/fields/fields-5.0.0.ebuild
+++ b/dev-python/fields/fields-5.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 IUSE="test"
 
 DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}]
diff --git a/dev-python/flake8/Manifest b/dev-python/flake8/Manifest
index eedc132dc219..f95d1fc35fc5 100644
--- a/dev-python/flake8/Manifest
+++ b/dev-python/flake8/Manifest
@@ -5,5 +5,5 @@ DIST flake8-3.5.0.tar.gz 140608 BLAKE2B 938ad4406370da27155512355432edd23a824db1
 EBUILD flake8-2.1.0.ebuild 1073 BLAKE2B 1f90fcc6a57da202d9b8026f89c5657a85efb0e2a5fad78057362647ee384907208fa8de6624f5375739c0ec386959e2936fc985d100f7ae2dd40f150d2b918c SHA512 0f7cd9b30bf9b095506af3796ce2927d2b14572a9f42e34021a205c090388ef08a6ce091aaabd19441b32e18c0d43c94cc1fd274f80e104c465d1bde88b46f1a
 EBUILD flake8-2.2.5.ebuild 1102 BLAKE2B bf6ddd7b789b57bf23f653c405b261a16cd5cb783f91e07dd5b62ddca82a891766ace4c727c1df9e178c5912e4bf963e0275a0f7382edaf74a002a7f2d4b775b SHA512 0cae93c37085868960eeca63c005c2c8d0d191e3deef5e223f130c2f9ed6712002815fb4da27b239f47f41fed37d82f4172e4b31842b75aa7f00666e5176c415
 EBUILD flake8-2.5.4.ebuild 1608 BLAKE2B 57c5b33880c3fbeb57dc00064d1417a256697864f5baeec45bfd7a802e58c812452abfbe3134a24193c2d6dba4241af87f2306e691c3e365b0b68bbb08b027ad SHA512 55f6fd53f6d4525af92cdd5bde0f6baa634f4c607583e2c9b89074964ff31a71923502d0e661c6b280d34708e1fcd2edf2474edfe894211507fe54dbb1e526d6
-EBUILD flake8-3.5.0.ebuild 1644 BLAKE2B 7bd9b938cbd2e78862c8423862370a32b4393d6ded4a062cccd9cd354f62e047f19d630fb895b0e575a14a2d8a3a0596e1ea5719e05ab01fc80ec1b9f2b03336 SHA512 8815bbe0f3fbbbc9cfaf0b97b52a4ab5d807338ae475dfadc069d8227cce4b098362c5de1fa05c234aca6f7ff22183cfea773498f2aa2197458ccc0203bacb5c
+EBUILD flake8-3.5.0.ebuild 1640 BLAKE2B 91f01cce7595c6c366d41d8378a772d78c86daebaca208861a0e985a80fe843345c8d3e76064b325d13d4ffeb0709240534ffe33411870f27a6e21b85c533dcf SHA512 64f5c0ae973ed7a7d7b921e16f4c9032d5007f76149dcb7373f8aa0dcf2e610aef92c838213323934fc8cd457bf0aba22b5768d115599d4d730de0592017c8b1
 MISC metadata.xml 373 BLAKE2B af4d7678c87281f631048d3c49b0a642ceee1d771be2b662458888659b7c8e262c98adcd7bcb7f6ab251783998950725729ed35c887c004f8d8da87da81eda7d SHA512 449aa40152590e7103a4bf10006a33e6a0d5010a7846b0c5fbee8a78d99a3539995eccf441845c205bf48fc1e9b35cd7b1d6af0d98b469bdd06989baf8b88646
diff --git a/dev-python/flake8/flake8-3.5.0.ebuild b/dev-python/flake8/flake8-3.5.0.ebuild
index b48bc2d54c00..20834fd7bd0d 100644
--- a/dev-python/flake8/flake8-3.5.0.ebuild
+++ b/dev-python/flake8/flake8-3.5.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 # requires.txt inc. mccabe however that creates a circular dep
diff --git a/dev-python/fonttools/Manifest b/dev-python/fonttools/Manifest
index 13d3ae2a00cf..d8378d63cdb5 100644
--- a/dev-python/fonttools/Manifest
+++ b/dev-python/fonttools/Manifest
@@ -1,7 +1,9 @@
 DIST fonttools-3.0.tar.gz 298992 BLAKE2B 74adad38ea49e95b19a306d7a37cdff60f9983d32f4cce0685135153f1cd9adaf1b344edff57cdb060ec085dfde41d9f096e4eb49d5789494e19e54343c55316 SHA512 d0793d4c17e077e2cd308f37680d8b2ac34502542fda5a4a20e9567dff3667c8fc3f73aff8605e2e86d5486bf9a61f3f25f1f8d20d6de610477f7f8b0c7be40e
 DIST fonttools-3.20.1.tar.gz 998249 BLAKE2B e6949d421d317cf2ddfe5d77f59b770b6a7ae97d6b3fca319ef36b81291478e66389043e1482d7685ab01a1fea31fa0d2eebb9310e7628f65dbdaf177fd0bbd7 SHA512 62945c6bb38f53d986f5637dc41273aabda53726eea9d0ae558768aab129bd4dd2c8d1632c16059b09f41a7c957a5ad310fac8669e37fa342259ccd290408cb9
 DIST fonttools-3.21.1.tar.gz 1002962 BLAKE2B c60d95b769abda7c973b5226d6ed5f23fe4ef159f7ddbdef8fcb4bda27f173f6a1856c596ef845954d4d555e3c475242bd03abfd37cfd0553ee87f86f733d1d3 SHA512 db06d84e7a2998b317a4166be328bf3e8ed1e168e623993f120c94df1e8ee35e6836b906cb53b15d3abbda7ca84ca4924b708d03b6e2fe96414d4f4007777f4f
+DIST fonttools-3.24.0.tar.gz 1264063 BLAKE2B a457b0f44088b0aecadc897070a95f4b1b8ae0ef1237d59f67e967e21d08f1a55a07ec5dbe06d80daef9ef11cda447303e05060bf6b3dbd94ad62943356c2a44 SHA512 7417a4472791b80308fb800f48126ef6ca2d9163a5fcac76caaa3623072ce30726ffd8d005e03adae96272c4f6183c010d6883a78cd26f48aaf065bcdc1ddebe
 EBUILD fonttools-3.0.ebuild 721 BLAKE2B 795ed9214f81cb968350bddaa894c8c614faa5745531797ed6564eaf2591022e920a0773f95db80ce0896b3413e6685df8a84179da95bb7af7a94fdde2e0f97e SHA512 25263d4a9a2dc606e62e68425708ae4ba4c9b4c37f3f7c3f4a8950adb5145342ab594c5fce718797d2d4aaf56e240eb76fa8ffd3ca24281f4943030a176f3aed
 EBUILD fonttools-3.20.1.ebuild 795 BLAKE2B 16231c6206e9c0d0105607c509de4f680d3d67b78dbd6ae1b4b6a8aed7b0f0f1be2415c5e77277eceae8b5cbccbaf4866791991a519cf03c4f386b13205c5960 SHA512 6657e2931c11ffec069c4c0fc1fb0bbf11c740068639fff39125dfc77c0d531d7bea6ea8ec66f785775332a03c2bbfae8916a6db3c9e33fbcc56895f0d1c1a00
 EBUILD fonttools-3.21.1.ebuild 807 BLAKE2B 78b8e653ff5cdd3aa01f1f947574306186c5ff98051633b6ca34d4b01af6c77288383ca5debb681f2323a66bc3eccb0ace035550ddc18da093e8d3209c9c3d61 SHA512 b48c9ac995c15f4500e97e503bc8f9f5e6c147bbcd37b6b9f9defc5748e3d0216667c9cc140f487bf90d71dcd8eb6db6ba471d7377daa0bb7acb489ea1156533
+EBUILD fonttools-3.24.0.ebuild 807 BLAKE2B 78b8e653ff5cdd3aa01f1f947574306186c5ff98051633b6ca34d4b01af6c77288383ca5debb681f2323a66bc3eccb0ace035550ddc18da093e8d3209c9c3d61 SHA512 b48c9ac995c15f4500e97e503bc8f9f5e6c147bbcd37b6b9f9defc5748e3d0216667c9cc140f487bf90d71dcd8eb6db6ba471d7377daa0bb7acb489ea1156533
 MISC metadata.xml 474 BLAKE2B 54300181cb1e91d9754d3a0ab96f3ef8ecf4dbfb2d57ac6d2fb2cf9727acd07fa39b45155e1109e570b498be6cc3c1c98919593620f050482a41490c6a219af3 SHA512 f683da73b5db5e132fa4eacd6de94e50e434f12a88e14b1d97585492c4c4bbe3dda1791eb7855e6b4111ecd61601da4da22c6b77305d9affdd8f9e478c140ed4
diff --git a/dev-python/fonttools/fonttools-3.24.0.ebuild b/dev-python/fonttools/fonttools-3.24.0.ebuild
new file mode 100644
index 000000000000..05b98a8b6b8d
--- /dev/null
+++ b/dev-python/fonttools/fonttools-3.24.0.ebuild
@@ -0,0 +1,34 @@
+# 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} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Library for manipulating TrueType, OpenType, AFM and Type1 fonts"
+HOMEPAGE="https://github.com/fonttools/fonttools/"
+SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	touch Tests/svgLib/__init__.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/funcsigs/Manifest b/dev-python/funcsigs/Manifest
index f8364305bbc0..0f448d8e8458 100644
--- a/dev-python/funcsigs/Manifest
+++ b/dev-python/funcsigs/Manifest
@@ -2,5 +2,5 @@ AUX funcsigs-1.0.2-fix-pypy3-tests.patch 3154 BLAKE2B face7accdd8bc2c5d3ab9dbcf9
 DIST funcsigs-0.4.tar.gz 25697 BLAKE2B 0b57ac0ce3aa8ff16724af9be94f297c15c94ed9083e2dd78796f134054db0e5f8213d1671352e0122a90bb2e8da78937c7a44f2e231b64de29afbb0dcf8b6d5 SHA512 64d821e94049ae906b9e5c8a2590f80a7d1d819554258e20f4170207576e5c8f65d32759a3f65bcb05fe721fa502658ff5767cd435932ea926c792c62ebe96d5
 DIST funcsigs-1.0.2.tar.gz 27947 BLAKE2B 3006d46018ae040b930e397c3f11575ae0ef18a8b2c9b6c10075804d83d23bea1fb81179de85180146673e0bd4c775a68c0ff624cdaceb1894efe5b2c8fd753c SHA512 4e583bb7081bb1d6c0fe5a6935ca03032d562b93ef5c11b51a72ce9e7ac12902451cc2233c7e6f70440629d88d8e6e9625965ee408100b80b0024f3a6204afda
 EBUILD funcsigs-0.4.ebuild 648 BLAKE2B 79ce679e541a72b4501707c69332ae2bfc961df050d6d3ce4d57792746b57c658b90ccb719d829718d901c35f47e29b4cb31277f82846c36e3205dd452487799 SHA512 153be4574e0d49ab639c6778049faf267ef0646910da3c2034a196896edcb67afc9d07142dae276db525c65b558dfd0a4ec49991f84bd6418fc3d5921553ac4e
-EBUILD funcsigs-1.0.2-r1.ebuild 894 BLAKE2B 8138c8c38b956fb11eb3d7db62cda5ce8ef738db6f243fb693dea0437413b1e5882ec2785a3eeeb5c9d1365954bb6fca59dc16d50375368d06d4cc9f22099f93 SHA512 8ffc8fa5fa4ddde883a44b5c3555c86354e2d2b1a2df286c57eebf8daac5f146c98a90535855a82b51f3c561aa0d99f16770396eeecc8de3199d0ac91a67f6be
+EBUILD funcsigs-1.0.2-r1.ebuild 893 BLAKE2B 60921c0303e9a4142e6ab25b9bb4bce3ea1a140e8abe5b2bd777325d5fc2edac16e70930bc2f0ce3605931f7a42b089c72a49ce70082613aab3196b70f5b3ab9 SHA512 f93790644b00b01a02ef1541b4d957ef99df73f4da321f703e4263ec1bc440ae48a6072bd01b758c8cee6687bca136b610a56db5f8e3a5fea9353d9256a844fc
 MISC metadata.xml 321 BLAKE2B 8aa6245455756e5d3a197dfb37bb706551ff8ea0c6beb047d0c59c54d2ed74853e6d9857d37a531a5313a7a85a0849f5e0b308a58fa98a3cce6040b5b91a1a80 SHA512 a3df23a85e33881f6ac0da0b0e33fd69de760c79e636574982606964134d303bfa219f429006a54ad71622c05c07b6eb233a1e8918f4703257b0e8c389acb6d8
diff --git a/dev-python/funcsigs/funcsigs-1.0.2-r1.ebuild b/dev-python/funcsigs/funcsigs-1.0.2-r1.ebuild
index 27b3464b8267..f300a92655af 100644
--- a/dev-python/funcsigs/funcsigs-1.0.2-r1.ebuild
+++ b/dev-python/funcsigs/funcsigs-1.0.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-python/future/Manifest b/dev-python/future/Manifest
index 34ae4980e6e6..9a1c338d126c 100644
--- a/dev-python/future/Manifest
+++ b/dev-python/future/Manifest
@@ -2,5 +2,5 @@ AUX future-0.15.2-fix-py35-test-failures.patch 2339 BLAKE2B 737ba57bc09a141ee2fb
 DIST future-0.15.2.tar.gz 1583441 BLAKE2B 9c552a5f3598922f8910480d054015020112aae4f7e14d2c139dda13a0b26e878b75eaf5068d66f20823ac4659d85edd4087a95d9474dc27bf15767cf6e9d921 SHA512 24a0eaf70795efe1644b098c5abbcb0103d9172a5243721f0d26b1cbd108872b6c0616180da8f5507855ddfc7b26bb10a606a64e59d307d39042b346700f77ee
 DIST future-0.16.0.tar.gz 824484 BLAKE2B b098366cc7a7866c4aa4a35f1a6a5cf113698307de8f4cce6c77e4ce72a8433dd102111f991e35ffa920c09a0d31cc048b9502dacd0aba1b701c11eaaeab8392 SHA512 41c795cd1746a76df84de2da9fbc611fc6164322c1c712ec9e8a8626c21c2717cb4899ec150d95c5e0c037270e6bb71e099edd169609369aae619daea9df2e5f
 EBUILD future-0.15.2.ebuild 495 BLAKE2B 6796334fd8cb1a1e2c90a4a55c4262bbfba55eab6defad0deb788466ed93790887b38f1e3d63f41baa0b586d7cab5e5731c08cbc4f958ae9799ef7c085ed4b8d SHA512 39de67be4877db5f248267e72642090763473ea15935e69ec069a726a5d4836c1de9efc46626e422d4bb18299b5ddcb5e42514781020417fdfdd6038350ea2b3
-EBUILD future-0.16.0.ebuild 565 BLAKE2B 9f4e6f943b24e8177e6764804380c5c1c358d34bbe31e0079864f3890e1e4f1f068fd75d5696d40284c4d8f35ba455a0ce6886edcfbe7a4d22d1bf23089b6bdf SHA512 a723ab1f3b88196ab70c6357f153db793c2887832c71f0f810db1f4ca8e8f01208baa8bcc75ef71565e868f84dff592452c6bc825f424dea2d31333892c80167
+EBUILD future-0.16.0.ebuild 564 BLAKE2B 0c48291c4be9e1945b9e87757ce552549874725af15ee00ac4d80ac250894fe8e10cac2564eef3e62810910e9c49a0e9909da16cd665fa38a78b6d2a4f22aa1c SHA512 59fc2aa73923cf13716a9da2c14d1ae2e22c55d3af7aa6f9378e958a6783a2d427efb2a62fa137c42806d9dbb47330002827e01e24ec6f2dbd866dd532ee7a21
 MISC metadata.xml 309 BLAKE2B ac0715185226cea8e3c38698ed3e494b6464d86dad0211e4d0583e3ceb6634c2b1ec230d9dff659d5ef47208b6f3358c701a0c42e49848816ae99703cab82f46 SHA512 e01e3b2733211e1eb6aaef4da19265c7165411a46fde4c2156118700c315bc2ad52cd87de1b90355741de77d91aa22eed5f9e5847d45186bf7138d246cd775e4
diff --git a/dev-python/future/future-0.16.0.ebuild b/dev-python/future/future-0.16.0.ebuild
index e79e77fbce97..fc6e63a4c9d2 100644
--- a/dev-python/future/future-0.16.0.ebuild
+++ b/dev-python/future/future-0.16.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ppc ~ppc64 ~sparc x86"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-python/futures/Manifest b/dev-python/futures/Manifest
index 7dea915bcbab..cccbd7b146c4 100644
--- a/dev-python/futures/Manifest
+++ b/dev-python/futures/Manifest
@@ -1,5 +1,5 @@
 DIST futures-3.1.1.tar.gz 26471 BLAKE2B 53c7678cec213351bc1c172de857c60bbcc392f24a0a6d1fba42eb6190f82d8f01977f8b830e9db5ba0628eb50f2d6dcf0d0421c4b06e42adbd1d429c0c28281 SHA512 7ccb041271ed2688591942f46ab2d2c92d806efbd5209ff9aba77c6d5d3c1a1495fccbeb1718d914894b0b8d936438687e8f3cc22b7ab6625fb518321084ead3
 DIST futures-3.2.0.tar.gz 27320 BLAKE2B b2a6c380955ce29fd434e30897d39d1fe1dbe758ec663bb243c4891849f3e45cf5eba10b71a9e6a028b32f20f876d5662188ec387d442492c7f4b73463b2f728 SHA512 e8c08ebc38d7397b5c2a5dc8c22567af1a1b6d5ce6fb8c189f663fb25b96f1ebcbade1ec0a95e9970dfac73606ecd5d7c6f79cc010fd62930a5b005d9babdde0
 EBUILD futures-3.1.1.ebuild 853 BLAKE2B eb0520e89d24ac5a5f25cf14e264cec2719167f26da8e7c4139d7b0aa19bacfa47f6f01ffb5d3f7f9efe17ee3325ca7980d8a1b58d66ce6367108ec12356dfe4 SHA512 42f0bee45189ee5ffb85383558a59c60d5525aed4f7ba9ab6dad87ca0e1c71040d33ee68d09746d83063f7102a28b55fdac8b61dccd9239a689e3cd2b0193229
-EBUILD futures-3.2.0.ebuild 870 BLAKE2B ee5032410810473f3cf65230abfc8d8f4676d2ddc419e4e0cb694e67539e7bc274ee475f9c9c6939e2adb6929e9a12477fbf76671ee92bf9f0631de6a5036292 SHA512 61eef1088d6d8deb49914ba543e99ffe6a7e33ec6a252058d3d8c9cfe2fd341abcd5260ad307e2eacb0b114f416c9ad2766bffb88cc63ae49cdf790232a3ba50
+EBUILD futures-3.2.0.ebuild 882 BLAKE2B aece6ede26a821b85c2017278bad6d0ed6cca49aff2055ff6e6d44cabb9ab130de48f03de01e964374ad204660db48300989fa849b5a016fc02b53d5f095aec9 SHA512 701ae2c359da2d27c3001b7b21c862708f2c1b1fc875a3c750df905e588b7b903c578292111ded6e28635a5648ebf235ff8a5505c9fa228cc0fb6b0018072333
 MISC metadata.xml 373 BLAKE2B 1e9903ae68ebe8e33d96f6e6f811fe125edb4f81b1c84c21fa9f962ce4fe7053269d00f29ef5699fcab98e70a755414ad86db30afc528be60ded71e6f60f9eea SHA512 df8ba320e5dfd914b6cc6cb15dbd5efc19047c0d57c44a60fd401de9a7f9c59e06b5975dd832c78202aa34fad94e0771e8a5ff6f16f246c220c5640ec2c84921
diff --git a/dev-python/futures/futures-3.2.0.ebuild b/dev-python/futures/futures-3.2.0.ebuild
index f4ee46a2e49e..365e46e9f900 100644
--- a/dev-python/futures/futures-3.2.0.ebuild
+++ b/dev-python/futures/futures-3.2.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux"
 IUSE="doc"
 
 DEPEND="
diff --git a/dev-python/gevent/Manifest b/dev-python/gevent/Manifest
index 32c91b43ffc7..458d13e816ce 100644
--- a/dev-python/gevent/Manifest
+++ b/dev-python/gevent/Manifest
@@ -2,6 +2,6 @@ DIST gevent-1.0.1.tar.gz 1455636 BLAKE2B 1de7c6986db96f8568a43aef1ff3c9b80b09047
 DIST gevent-1.2.1.tar.gz 2808619 BLAKE2B 2e3c15adb33401012951f0f93fe7f17c1c7597bb4021a4a9ebc7ecae390565d9892bb2fffe9cdac4f7e207d97d50da5d335ed8e42070d67d6be617cf955eb0b4 SHA512 22740e8e114869c1f53bcfd6796226927a3a726d4fd49d104b947f0c97546c7490eabea98b4492db794e21d26d0aee85f1e40b01d386a47063b042a719e61726
 DIST gevent-1.2.2.tar.gz 3108671 BLAKE2B f80df00f58ae2f65aa7f65fc9eac5cbf63a0084f24ccebc71ba9bafba72cd48fff2e7d0b1d8de7939dc669d7708e120fc14077cc845fe3ce212d6a80a42b5158 SHA512 1e2dd544cffea62ee32de2e4066b3f4c121058a1211b89da281ec3882f3763217fe2d346ce38b66e27df9f59cfe05bb137d1608a681dd10eaf06a33dc22f531c
 EBUILD gevent-1.0.1.ebuild 1465 BLAKE2B 8bd3b84be8b9bd022827f5041d1ed1acaa61b6967ac021d5c765f41f0dc47dae214d71038a6d25785207637f7535057e33cd3b6b6ca76516939b31427ee6f28e SHA512 a3b4265512e6f68d3047643b16319fbb06af3daff8f9b2a2beec7deb0243b03ce65efef48e411565f780a7f83f07999ce6773d841fb3fb43eb59034ef3582c3a
-EBUILD gevent-1.2.1.ebuild 1852 BLAKE2B 38782ba2e3ee371800cb7e3f4088f6777e2c39db428607df9ad4b44673193739f867b047386567f6437631525b13c5ad74ccb04580a7031a50154de2e5c08df0 SHA512 339a7194eaa0d72bc8fbde32b426d44ea52a5d176c62f865c4be446ce86f38261194ce0d6189b185ff8d81698c7440c990dc723e139a501f5031179e19125428
+EBUILD gevent-1.2.1.ebuild 1851 BLAKE2B 99b9184b2e916a79ac2f3bc297a0cf5ef4a19d641ad9e038052567dc4687cbc3e000d6e406ffd9293e28151b32beb1b518cd3a8b186dc86631792f97167038b9 SHA512 fe53afe4aec8235e474df2e4cd223ff14f3604667fea49c7053c74018ce88bdf5f0bf136ec9a6b561b6b479822df9b478b2110cb5485a469e19ea316b61abc4e
 EBUILD gevent-1.2.2.ebuild 1854 BLAKE2B 3adc28e5589ba12e7fc5ec2b530ef2196246c6b18cbd6ab2b1f7a9a396d112a9f4fe9cc081eac6b1e85227d3c2f0ac1e3735a0e0fe4ae95a451cde4a9dd3e89d SHA512 1ece43983ce47ff5ac96d2fbc1392abb811b7cb3a1b2dc19a10323b1e0cb7f2ebd1e09e8489fe9a09105caabb59d8409a41eaf7fcad45b28d9f5651fc9bbd00a
 MISC metadata.xml 374 BLAKE2B 87fe7f375b08bf4991954e018241ce4b150365409df516a12b79d221a037d718342dae60461663fac1d5af34458d352e287901e15fe68b1074927680055c204a SHA512 443f847333d35cd55f9c33624664569ecc8c2d0b7c74a358a716e0e133072edb0f29abfc36d6fb446db6890ae1319ad9d719a6e65e2bb35f9c9e9259379241fc
diff --git a/dev-python/gevent/gevent-1.2.1.ebuild b/dev-python/gevent/gevent-1.2.1.ebuild
index ec83f1c297d7..04a34a956f3c 100644
--- a/dev-python/gevent/gevent-1.2.1.ebuild
+++ b/dev-python/gevent/gevent-1.2.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
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~mips ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples"
 
 RDEPEND="
diff --git a/dev-python/geventhttpclient/Manifest b/dev-python/geventhttpclient/Manifest
index 964a9119f67f..f28c1624be05 100644
--- a/dev-python/geventhttpclient/Manifest
+++ b/dev-python/geventhttpclient/Manifest
@@ -1,3 +1,3 @@
 DIST geventhttpclient-1.3.1.tar.gz 82598 BLAKE2B 5fef20a74c431ed53be4eedb3ec7e040572ad960363d41dda8b93c8f08f3eb05ba6160676c1c3ed957d1528a12aa297400063377f3788754e9e76401bb3421ae SHA512 a50486e1485c449a821176f0aa139cb05a3c7675fb045086e086cc7bb71d6e1d75191fae6972b381e7e69dba89d23c387464503845badd29fa361e03aa866079
-EBUILD geventhttpclient-1.3.1.ebuild 1208 BLAKE2B c45a798745a82fbd96e854277356e0e4d43e7f50d05a1a93ad63cd081395146f3f422364d22833dc8c588bc865c8b4aa8b87599832cee6fdbd2582062829d1b5 SHA512 d1d8416a62adbf251680e7d2b9fd435f008b2c2e7737642637354092c40504db79a0013517045f769838d542d84a53d4775db28b095f5d4c43492c6845bbe4a9
+EBUILD geventhttpclient-1.3.1.ebuild 1207 BLAKE2B 9f06db42ea4b6061e9df9bc9ee549ce1c04a589f7d78093ba620e2d551fb20db4a6c31d5efeebc643562242e22eb0930fdcd731f48da98d4788b1c792fd96b4d SHA512 8a7f9daff2f9493af829403ec3974612a57112f1968532ab869c7f7af27b3f73412f40955a13c6e908288536ecc692181f6b540cbc53b9d215d4f4a8b0067f62
 MISC metadata.xml 578 BLAKE2B 06c3f4fc095149de5f807dad238aeb050ce371e6fd10af29020eaaaf14085552b2482822bb9281a4923a0c26968dd498aca5df59baa6e6b8990b9cb2598854a9 SHA512 8d9a834f198c8b8428a68e2493d2e54d56c2e2995018e57ea5e67bd8f56c0c9cb312a8b39ae14a4ea1ea3187f8406bbc67a756e091b65909a3c29879a2ac5a9a
diff --git a/dev-python/geventhttpclient/geventhttpclient-1.3.1.ebuild b/dev-python/geventhttpclient/geventhttpclient-1.3.1.ebuild
index 883f5906c85a..8cb8d84fb3c7 100644
--- a/dev-python/geventhttpclient/geventhttpclient-1.3.1.ebuild
+++ b/dev-python/geventhttpclient/geventhttpclient-1.3.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
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/gql/Manifest b/dev-python/gql/Manifest
new file mode 100644
index 000000000000..b6a0531679de
--- /dev/null
+++ b/dev-python/gql/Manifest
@@ -0,0 +1,3 @@
+DIST gql-0.1.0.tar.gz 3925 BLAKE2B b463235b5c9b6af8be77340d219a60e5886389fc18e066995a56d1ae80079a8de80336ae56d068c403d62f994d17cdddcf4191b0884ae971cecd23c5d17dc66d SHA512 23e35587a61e982a017260525ba9bd5d78a006eb35aae3d1cf48ba92fe954eaf14194e8f19e99813f44386b2440cda7701c85618043514a0f75101654c9145d2
+EBUILD gql-0.1.0.ebuild 639 BLAKE2B 290e5dd613070e00e0af4d1f0c4ca52432f3e706abc41ec89b0b0957c3d0dd32864aae9336fac110d09e4d7904c67f881b562e13b06bd69c5e4014005a786e58 SHA512 f11c67f1f2ce688130c5d3904d02d79472c63b128df0e0d2eb85521f1ed7c762c839a55f325e356bc31fa967de1d6a90705e2a0683a8944a0897af24e1dfef06
+MISC metadata.xml 328 BLAKE2B 1aba0861a5311a449a387615db179898725d66ddfbd75e4cbb28ef6245d54373c6eb413cdf2b5f36a708c6db697b4d761ca961f44e58e8f8579cdcafb1e4b546 SHA512 065fcfa59f0f5bc7e5beb66b531255219a4753b92105f9d9d343238c883d1386497cfbc5bf7ba1c295c7b348dfe1ce4ef616f69e250f464fb8d214aa07921fe2
diff --git a/dev-python/gql/gql-0.1.0.ebuild b/dev-python/gql/gql-0.1.0.ebuild
new file mode 100644
index 000000000000..2c583e085695
--- /dev/null
+++ b/dev-python/gql/gql-0.1.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
+inherit distutils-r1
+
+DESCRIPTION="GraphQL client for Python."
+HOMEPAGE="https://pypi.python.org/pypi/gql"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/graphql-core-0.5.0[${PYTHON_USEDEP}]
+	>=dev-python/promises-2.1[${PYTHON_USEDEP}]
+"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/pytest-2.7.2[${PYTHON_USEDEP}]
+	)
+"
diff --git a/dev-python/gql/metadata.xml b/dev-python/gql/metadata.xml
new file mode 100644
index 000000000000..b1c183a89191
--- /dev/null
+++ b/dev-python/gql/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>blueness@gentoo.org</email>
+    <name>Anthony G. Basile</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">gql</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/graphql-core/Manifest b/dev-python/graphql-core/Manifest
new file mode 100644
index 000000000000..fec6bf61a05d
--- /dev/null
+++ b/dev-python/graphql-core/Manifest
@@ -0,0 +1,3 @@
+DIST graphql-core-2.0.0.tar.gz 156989 BLAKE2B 8ff0d64322966dd5fadfeff586a73db770f02337f899c7326ea6e584c093ecc237624f116d31983960ed4683dd53b6813ad99ab1173857e828de98f35eaf1f74 SHA512 caaf1a32550a671048224f37f75ed2a374290d763f9594a5f0bcd102b54f4cbc491005bae102d648c6dfaa052b5bd06f939f8638d6c895d5c133710dc2b0ce67
+EBUILD graphql-core-2.0.0.ebuild 908 BLAKE2B e3fbf2cda9378a038e199d8d433637ee72e5fada0e6092dbe9254cd5f3e8e29a42f31e3af08e151ee517514f070a6476a2f77a2c349a8b12f23c14525ffe6f73 SHA512 c825b2e5ed0d6e8edce4b4f6c3997090593250bf9444d4cbff7b6ac59304761be722e2dc205f29941ab0c0e40c27dd4d171bc641a5bf85421bb3cf845c833dc3
+MISC metadata.xml 337 BLAKE2B ef6b015336e3997873eced370a205310ba3b98a9607c7f22497f3348a96dd3c2c0e404ef09ccf0106eafebc69012efc5d64a2384ca0c4fc42702c42d3947d313 SHA512 93e093015e1cf58ae9f19c625eee6f89186a91b35eae980edd70e6742c80f08e5f1c7ba9f8cd5f282ec88f13655e4baf7506e8bb990ee12cd0750bfec01ff0f1
diff --git a/dev-python/graphql-core/graphql-core-2.0.0.ebuild b/dev-python/graphql-core/graphql-core-2.0.0.ebuild
new file mode 100644
index 000000000000..d73013847a56
--- /dev/null
+++ b/dev-python/graphql-core/graphql-core-2.0.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="GraphQL for Python"
+HOMEPAGE="https://github.com/graphql-python/graphql-core"
+SRC_URI="https://github.com/graphql-python/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/promises-2.1[${PYTHON_USEDEP}]
+	>=dev-python/Rx-1.6.0[${PYTHON_USEDEP}]
+"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+RESTRICT="test"
+# Add these to test when we have them in the tree
+#	test? (
+#		=dev-python/pytest-3.0.2
+#		=dev-python/pytest-django-2.9.1
+#		=dev-python/pytest-cov-2.3.1
+#		dev-python/coveralls
+#		=dev-python/gevent-1.1-rc1
+#		=dev-python/pytest-benchmark-3.0.0
+#		=dev-python/pytest-mock-1.2
+#	)
diff --git a/dev-python/graphql-core/metadata.xml b/dev-python/graphql-core/metadata.xml
new file mode 100644
index 000000000000..5057a52be361
--- /dev/null
+++ b/dev-python/graphql-core/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>blueness@gentoo.org</email>
+    <name>Anthony G. Basile</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">graphql-core</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/idna-ssl/Manifest b/dev-python/idna-ssl/Manifest
index 0b7694c89f20..359333e598d2 100644
--- a/dev-python/idna-ssl/Manifest
+++ b/dev-python/idna-ssl/Manifest
@@ -1,3 +1,3 @@
 DIST idna_ssl-1.0.0.tar.gz 3375 BLAKE2B 28ecee9e271619b7a4f3698aacbdbf0e953ed9b52640818007dc86f34145d8ea000260991d44cfa4cd896b74172b0a32962c3053152558b8d621396df2e248de SHA512 d1f7479cc3edff164bb26deb05af757906ba91241bc668f1b087560087a89f741a0b36e166bfb8142128ceed6008621ab36a2556ed2304ea6374c19982bc663a
-EBUILD idna-ssl-1.0.0.ebuild 596 BLAKE2B 0e1f4a4d737cf5ac8b218fc0848f2c490b00a84cffc05ff9bdc4bce49e91c1521871048c0926b21cd39ed686661dae6769034435dceb7db71071b96f3a4aeeab SHA512 11b2426a043d970e6e250ad4be2facb520ccc64583a92fcf22391ee85a7469212cf01efc411a952a7b88924bbc86f2bb08ca37575fa587ad24b75d1016e145db
+EBUILD idna-ssl-1.0.0.ebuild 598 BLAKE2B 53868380a47c21221fd09be8864e4cb55fe3175404d64b15973bdce8fd6205e425017c03d07a33bf8b59c6bc72c80c7dc816525a2e83e754cbd06cc096451b03 SHA512 1738e46db0bf36b314035599dc551142f28e4eda7ddba8155f975d57adc71c0fef7dc4e6bab6913e2ea013ecd9c5b7f4d96682f46fd2f8a8c502678fcd0810a0
 MISC metadata.xml 368 BLAKE2B b2f78fb9dea9edf6f2b2a7fb72412302b014e8b1b536653ae12fcd2bc8fa94bb253ff780aedcfd32fcddfcc2030b363e12440dfa4efef1a886e99b8b0acd8dba SHA512 531bbcdb7ec492aa4c38f4352cb0a93c618c60d9f8920ff476f6f8b7991744ccba2188a9e441e696a02d1c4ef4ea9af3afeb2c81a0d046e700796ee45b7f3888
diff --git a/dev-python/idna-ssl/idna-ssl-1.0.0.ebuild b/dev-python/idna-ssl/idna-ssl-1.0.0.ebuild
index d58e5b28fbc8..916824a4f0f7 100644
--- a/dev-python/idna-ssl/idna-ssl-1.0.0.ebuild
+++ b/dev-python/idna-ssl/idna-ssl-1.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_{4,5,6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index 21f12cf66131..fec8a0c72b15 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -7,6 +7,6 @@ DIST ipython-3.2.1.tar.gz 10884249 BLAKE2B eaeb5ad3cb1cfd38c5f81e0d312773e0ba617
 DIST ipython-5.4.1.tar.gz 4973571 BLAKE2B bbda7b5a172ea1e80a9867f036ef68d1d0ec0a7340d77d8b4bbce63c5db7d3aade106ee5a6d59fb7e2b773c37d8263e51e1eaaa81d582849a70de60e93b7205a SHA512 b37dae27a558585ec4f42fa22e86380ac81990207ec680fc7b0e6f97ac81c99d915cfe77488bc0b91a61c34e0c00b323df08aa06b142ce0fc88ce30203102907
 DIST ipython-6.1.0.tar.gz 5066094 BLAKE2B 4f68776ba15f50b2f0fcc1503dd5c62ac464d9d0ace0801f572c9cdc1a0ddd7d840369a3df5940551c848376985cc74848002cef53869014adb2fd9714989acd SHA512 6b1d9713b5e8c3870ac8cd8bea9d3a6f0c0302e3983017516128ede9f0baba21372890873df29fbba3f9d2f47ba16bfadb1c611f9de23b71595c0ab8f917695b
 EBUILD ipython-3.2.1-r1.ebuild 5049 BLAKE2B dfa09c80e7b558bf7efe9fafda23b2555987b196844b9707ce8e8b564a6e58a8d132284d0a16eb9f9b91896b361a0e2327849cdf7c5863de04a5c726604e7d0e SHA512 687dc470606dd48fd2128c7f8d1850cedb95bc4bb18be81f72b9656a06889741cad28c10a6f13a73b069c43794299c8127a33ced778eb350f367db5399352f5b
-EBUILD ipython-5.4.1.ebuild 3645 BLAKE2B 42e25bb5e0277e79af42cea13c17ab0a9e061928b3bf7676f645528ebbc432a5f48bcab0d7f9fdec048c3988c2b18a8773f6532fdefbcdde3094da011f323429 SHA512 db674c38e00c44a040bd90432a869e142fe138d00ec06144522de5f91db3e6c1cbf1e73fec262b59b2968be527e2600f39d628b844c42457f793a6a8df86c4c1
+EBUILD ipython-5.4.1.ebuild 3651 BLAKE2B 1864902bcdd51a44a978e2f4581deace47e7ea96282ddb06759dd06f946f8f0d7a2c924bbbe9ea3e7267af64ca4f802d9578526056ca59c4137426dabdd5fa8d SHA512 88b0c0f779a6fd9c8af80d9c03de517c9965a0e3b12efb712f698247cebbba8c5e4683abcc94e1078b47710aac8a6c17738d8aee4cd85ab05592103b0985950e
 EBUILD ipython-6.1.0.ebuild 3387 BLAKE2B 546e96ad93f0e43c8f433f4cd6f8c17a0336edd8194d355a41e7333774f32dc881b0eaa24a648bc5249a7ca72ef7a2612bf7a433b0538941801bfc0eb5b77758 SHA512 b8a6305d6f8de92ddafedbdfa695b51275349c2a1e1da03f674d94e67a5e62d48d0c38c84c9ecebd5fc5d11ce394fdb384d7a6807cf413855dec0516e5dbcd9c
 MISC metadata.xml 3035 BLAKE2B 02b40c2c8b11edf3e5d24f4fcec3e99369924cf1067e72c5a64d3a8e2373e318e2d8131b3b47e09527051fb6027af833f29488cab833dc7b71d2a76367b5e5f7 SHA512 a841d52fc997a447ec98335dad7cbb2971a0498754eb86942d6a9aa9f14cdb3b8687f78e882adc8b84c1967a16f75239e8fda6bfedc58622b052bdadda719dcb
diff --git a/dev-python/ipython/ipython-5.4.1.ebuild b/dev-python/ipython/ipython-5.4.1.ebuild
index e7a438809ad8..2c5b24121289 100644
--- a/dev-python/ipython/ipython-5.4.1.ebuild
+++ b/dev-python/ipython/ipython-5.4.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
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test wxwidgets"
 
 CDEPEND="
diff --git a/dev-python/ipython_genutils/Manifest b/dev-python/ipython_genutils/Manifest
index b3c1254f6ae7..a3a6354e9ce3 100644
--- a/dev-python/ipython_genutils/Manifest
+++ b/dev-python/ipython_genutils/Manifest
@@ -1,5 +1,5 @@
 DIST ipython_genutils-0.1.0.tar.gz 22255 BLAKE2B ee24a3b226894d51c36d2e3e7ec5a0422c571b46670d7822f0555b2f5551be176560e76682d4c7e7e167cd0bbd9b321d4dd936495ee824c7e49a4d5aab1a9f85 SHA512 714f850783d5e3c042da409217c0e213cbce249a42fd689c3559745861a991fecb5dbf98a012a4186053d9bb7ca4d52dad742b676eeb5163bc4dfbf256181081
 DIST ipython_genutils-0.2.0.tar.gz 22208 BLAKE2B 1a898e11cec26787f530f72e2d2a79e7834664e0f6be6a27ddd426bc2d0b3f39ee46e9ea10ad03e01a08054873c9752007038e863d7dd9e501613a68e40e1635 SHA512 0e5a9f8be17d98dfb74ec77d1360ee79276a13fe1914e6d31e8740f06375ed1671c49356a77f118495f50823b8384c1e2c5b6fae73965e3d4249c831b9a2b095
 EBUILD ipython_genutils-0.1.0.ebuild 606 BLAKE2B d9ddbdb30e69c6b62bced05c2b2234858b06fc10d5d1fae422ddac8bf3ec0a9bcf1d558fc8a76dc7ff0b639bd4b0fb386ed829ce57a11325acf3bfb23dfd2319 SHA512 1a303a98bfe7f8d0eb2c83e9da1d7f507ce697d31e7da2066f302f74f5982ebb756c3279e8ba6a02e2ff5e7778654d9ee780029082309162936c32903bdb5cc9
-EBUILD ipython_genutils-0.2.0.ebuild 607 BLAKE2B f0d090049022666b30d57818a7cf95a3dd61a1e423f81e192d9729de6cea64a7f9fef588cf9f916ec282fde10e5d9143abf1aab4cc6b2365a767f91f8a7b0ee5 SHA512 6788f720f49ca991b2374e34e32abf69cab9cede676b0c285d77a1543f7df96ca2bf6a7d3c1ee5514d9915c83f47db283339cebbe9bed452e61264c8d8f9fe14
+EBUILD ipython_genutils-0.2.0.ebuild 613 BLAKE2B 0537697771545a5b20919aee7418e8c2907da9ba98474c26d55375432d0561fe3c7a8183ca84404ec63f5656b4d8419cbdebc0536daf0105a0b902e594515dec SHA512 006edea2869a17dac50ce058f5fd3fb78f5cd25b4f8fab19c6b5ada99698ebdc002135a3be10a138a8fb5de374b1d5d616b6d9a2ce99593ffe9a2cc018a405ca
 MISC metadata.xml 729 BLAKE2B 91bb45e44e2ccd4686308049920a2a9bc9a0334af7b2cec5365c35d3462782c9f1c95b5496d364ac1b92bf1514102b4e5d6755ff8beabdf5887f0262cdbca889 SHA512 13724fe12d5a5053947c38bec58984747985fee21954ff33072c954bf6e9bb53c4b9d23dad194c4cc6b1151ae83d1f8f53c9f91368a370aa51f84c7ced0178fe
diff --git a/dev-python/ipython_genutils/ipython_genutils-0.2.0.ebuild b/dev-python/ipython_genutils/ipython_genutils-0.2.0.ebuild
index b8767f4bff24..45197675d733 100644
--- a/dev-python/ipython_genutils/ipython_genutils-0.2.0.ebuild
+++ b/dev-python/ipython_genutils/ipython_genutils-0.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
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ppc64 ~x86"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-python/jedi/Manifest b/dev-python/jedi/Manifest
index 271ec252bc29..26b3eef54fc1 100644
--- a/dev-python/jedi/Manifest
+++ b/dev-python/jedi/Manifest
@@ -2,5 +2,5 @@ AUX jedi-0.11.1-exclude-tests.patch 940 BLAKE2B 2c5540b62529a27a8beb8c3ca1b2f2c8
 DIST jedi-0.10.2.tar.gz 373879 BLAKE2B 8007b31dc6c96d9538ab141b976fd4554ea16f01bb277692534a2972a6dcf61ee809c7573a7a3f7c0eceb29505de6ffe3ec0a7234a427579333b453fc9cd9dbc SHA512 847b000894b5e17cf5582c88245989ce1f0e17b595c79a2cdf4cc7a805fe7360ea08f28ac31473408be795c9ea210c85541cffa5fc7e7119da8c0228eb509351
 DIST jedi-0.11.1.tar.gz 332402 BLAKE2B bc0a8df89c3d8b6cccc387a22cc08f613c990c59e360c58ae1d2becf521a755892afa4972195f6e40ec3bb48b74b20a966034d0e5bcad5051f90e5b4cc082270 SHA512 61389704a318f89d12b053b786bfb6bda21d2696830c001d6d6e66191fc060d731bc05ea71f2e70725532dcbe109c5c7346a36d227e6f8ab0eb2512f4c1a8945
 EBUILD jedi-0.10.2.ebuild 988 BLAKE2B 89b371ff6dd445e36936a5cf43a334a352e9480d41616d4cb0dfa0ea2b10343a6ee2744b654c5ccc020313a40a00b2c0e0ce6fdbf528bf6c82e99e3dd0b829c2 SHA512 e354c07d1f2378b94675b59476a9bab9ef7db19eff2be6fa5f86fb931fadf6c2de55f9df43203481957a42f622d75b0867389523e3d3dd7e2267c1d02797d611
-EBUILD jedi-0.11.1.ebuild 1159 BLAKE2B 0c9ef5c572d68d2d0e7b33bac99aad787cd2839ea2d12fc1403f02c1fec4cc6d99a5657ec6f90a9dc1cac9d5813bb984f8b424553d393bddbe9fe37c37100091 SHA512 deb21320d18956edf0669ec60c29c48b25d019c7da7d3c61ccbd4e198b2ea7dd245b9cd40469a6322b23efa05aa12efd331015654ec6c2c9bcdf449b774b755c
+EBUILD jedi-0.11.1.ebuild 1165 BLAKE2B 347d4994b8a7f454f9d89b95a5bad3a9397e160eaecf29afb79e0e7297f939701805c343cad95ec93d586d4efb18937569b5c2c65ed3b41d1836dea03386c642 SHA512 a322b16e8e6dec54c9371177e52f4762f10d674a383718e00910521ef1a3c19d904fb4d41180da44c1be6b33990dca6612c03c844214a29a0b64d721e91b4961
 MISC metadata.xml 375 BLAKE2B fd65a43f1efc2cbde98dd68be5a47415ecec66d4d2b2c878235a1e77b24311062d6d9c16da79bdaa358b7910612a6460ea5cbc9efdb03a6fff5d2299d734841a SHA512 16271d48499888ad36f71d79301ddc361831a7263f3d0ad19d12c29b51c52c24806a7a366c6e263b4b6d43e28856cd336b0bd728fa00a5fe5111b505fdc50977
diff --git a/dev-python/jedi/jedi-0.11.1.ebuild b/dev-python/jedi/jedi-0.11.1.ebuild
index 7aac943f7a2f..fd79ffd6a5ff 100644
--- a/dev-python/jedi/jedi-0.11.1.ebuild
+++ b/dev-python/jedi/jedi-0.11.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/davidhalter/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ppc64 ~x86"
 IUSE="doc test"
 
 RDEPEND=">=dev-python/parso-0.1.1[${PYTHON_USEDEP}]"
diff --git a/dev-python/kiwisolver/Manifest b/dev-python/kiwisolver/Manifest
index 23c4a64520fe..722635f8ba68 100644
--- a/dev-python/kiwisolver/Manifest
+++ b/dev-python/kiwisolver/Manifest
@@ -1,3 +1,5 @@
 DIST kiwisolver-0.1.3.zip 48696 BLAKE2B c5a89ae53b21e188cd7bbb82162fc81814f7794cb786dbb0c3f54f05f845d7b8780f159b55f42cd358ede8b0d8a0bc12132e10ea8249ba31f8e5e64075953c49 SHA512 ce5ccf03da88743f091aba7e01ec3d7f4d7a83cb1d2e33b52a4a825bc4b9919329e73bb85a05effc83f6cc449082c5534a036a8d639937229fc7bedcc90d5089
+DIST kiwisolver-1.0.1.tar.gz 34783 BLAKE2B 104fb7789e004841921bc43fe98a98b247c7f0506a94b07d10ff1e758287a272c9d2f119b7a086847653cdf1bfc9d5c94823d1eb0b4a30ea93cf2b8b05027013 SHA512 01002ae1dbf6482ed68c49ad3da80b772db84ec221c4b111c42f1b493f19299e0ddb187e43e64b380eb2ddc292d5848d6e09a5a1dbfaf68950a65423a913ec18
 EBUILD kiwisolver-0.1.3.ebuild 557 BLAKE2B 44665a1ac41ca4bcd438c87dbf806a9464f60458eece4ae0d263cce38dd4a1695a49c6534151689c13347f1e4c7541d6b503c6b45430ac9a97c565a393ba8eb7 SHA512 80b46de3ebf259e3ffd7fb3fef5d873fd39e8733b8745d909858b9f5168982879d39007bc9b9d2699879281a1986e35bb4a5f52d1b60df420e03bbc787686c19
+EBUILD kiwisolver-1.0.1.ebuild 530 BLAKE2B 34c0331ac9f93f8c5cd56eb803d239f5106b580a39862c8622b6f978f60a8b8ce67d22cc8cf4391dce0a164dd6a6f518d496c71be8f2841ab0139b079fef6686 SHA512 313aafae986b8bada1d00dfd2cce57776bd0d7d52bbea97f5ff82ee3fba120ace52ee0e5821bf03040da222dc9ebd033e971a46489f48fa1ea3362a01f4ab3bd
 MISC metadata.xml 297 BLAKE2B f3bcf69a0615862f39b7182500b5f2b476786d974a7dac4ae07d7409610659ecd69bbfe13a926615ba5ef59a3438cba37ba246ab1dd3666e84bcba8efa03357b SHA512 8e2af9d77af6a660d6624bb67076747b79884797a2a1cfd32df0301e7aff0d2d4f8dfe48acb8f3a2de5d3b4c51ed647cb2a373d04e5a5d1e3abc763b270197af
diff --git a/dev-python/kiwisolver/kiwisolver-1.0.1.ebuild b/dev-python/kiwisolver/kiwisolver-1.0.1.ebuild
new file mode 100644
index 000000000000..f563f9daed05
--- /dev/null
+++ b/dev-python/kiwisolver/kiwisolver-1.0.1.ebuild
@@ -0,0 +1,15 @@
+# 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="An efficient C++ implementation of the Cassowary constraint solving algorithm"
+HOMEPAGE="https://github.com/nucleic/kiwi"
+SRC_URI="https://github.com/nucleic/kiwi/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Clear-BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+S="${WORKDIR}"/kiwi-${PV}
diff --git a/dev-python/libcloud/Manifest b/dev-python/libcloud/Manifest
index d8e2341d4898..ae2c7e71444b 100644
--- a/dev-python/libcloud/Manifest
+++ b/dev-python/libcloud/Manifest
@@ -1,5 +1,7 @@
 DIST apache-libcloud-0.15.1.tar.bz2 570953 BLAKE2B 1baca706ac57d76baf4f83824ea0fccaccec51f38114a0103777e2965e67ad9cd96ad46459841ea702d72f8f0c3ce166037714d04f91c1f2369ddf6f455ffa63 SHA512 0cbc02c955cb91e135d73a5198ad216d0f91fa942b88dd1ffc1c46a487190f45500f003d2825cdb4f6c96c4ca7e5cf2681709769b0c2d8801b08e5a41b3d69b0
 DIST apache-libcloud-1.2.1.tar.bz2 992983 BLAKE2B e3caccd2814f3b25fa96fbc21972fb3694a6f5e55663564f712b98b64a60e577baf1da0295b914fef2440a461f6fa16f313e83bde252360ac6786995527afc04 SHA512 12e239f286d8eb523597488998582be02d6e8cd4e21a8fa7c639c829ba622833e4292ac4cd7cbc8b94670e19ec1711cb0032bc72433f421bf2ba2b8c70dcd954
+DIST apache-libcloud-1.5.0.tar.bz2 1258553 BLAKE2B 9cad0f61ab8505deea99c15022da92caf24295480d16bedf9c735c1117a055c94162cdcb331734c572f375de3ba10b499d5ed46a5a11f1e634d272e69748ef79 SHA512 91c10d164f56c9f75c6e5633802c3cf31046ab7a3ae554b73310b1da2d882ac1f8e90aaf3462db57ac0949dfd66cb840ec8fc6e6b79c46128668f13183d47b30
 EBUILD libcloud-0.15.1.ebuild 1062 BLAKE2B 15b4910bad526f4488720488c21d7d3e9416566601c552f93f0c0493207056c307bee09df9bf3c9c6b9edfd0872025fc0e05d2d97c972e8e7770b121b9bd06f3 SHA512 443b4f6d3f66169d0b54963dd7b804f9918bd5ac8c3e61d2e53efb9f015e41ea70ab3cae6012406b0eac4c61efe382c506727c1af2006eb6430b6294dd96cfc7
 EBUILD libcloud-1.2.1.ebuild 1173 BLAKE2B 1e3420873ee1322f31785b7a5001f8bdb225ecdf03a8f7c5db79e8570f68bbf8c8eb85b6bd55a3a737917da37b180f28b1c96458e94e6ae25d195c24e8cc738d SHA512 46a0171b1a4c021025d17120f0b99cfc4728b3329206b24c51efe5266bb7e2c8be77512f86ab116bbcff6f61755dd1259c6996025b9df1af81e27f5fa1574cf4
+EBUILD libcloud-1.5.0.ebuild 1209 BLAKE2B f51a2549f969a867fb4055fabe43937eb379097b6a07a64298953465187a1662e2f52c44aeffd92ad4398752eb33bb16c38731b408bdf8ece4579773b6d5eca8 SHA512 4293451c418b505d9e76ade278427a8019b820c4acb2cd5114891352f03a3493db22ab39be8dd8a023291ff85f5fa44d0f3d5e6afc931605c8e59071821923ad
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/libcloud/libcloud-1.5.0.ebuild b/dev-python/libcloud/libcloud-1.5.0.ebuild
new file mode 100644
index 000000000000..414bc3b2bb65
--- /dev/null
+++ b/dev-python/libcloud/libcloud-1.5.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# py3 dropped due to failing tests once lockfile installed
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+PYTHON_REQ_USE="ssl(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Unified Interface to the Cloud - python support libs"
+HOMEPAGE="https://libcloud.apache.org/"
+SRC_URI="mirror://apache/${PN}/apache-${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples test"
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/lockfile[${PYTHON_USEDEP}]
+		 $(python_gen_cond_dep 'dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]' python{2_7,3_4} pypy)
+	)"
+
+# Known test failures
+RESTRICT="test"
+
+S="${WORKDIR}/apache-${P}"
+
+python_prepare_all() {
+	if use examples; then
+		mkdir examples
+		mv example_*.py examples || die
+	fi
+	distutils-r1_python_prepare_all
+}
+
+src_test() {
+	cp libcloud/test/secrets.py-dist libcloud/test/secrets.py || die
+	distutils-r1_src_test
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index d4daa0e3c42e..466e71a271d1 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -1,11 +1,11 @@
 DIST llvm-3.9.0.src.tar.xz 18235716 BLAKE2B c348d36cb21e716e8656b97489a0b7223fe81599e36ebf6f88d6191b1dec9eafc2d5d5413657ef89473af193b660c4b13317bebe5ecd02ad6c761c0ffdbe7f40 SHA512 f18ae32531218ab156c3e56c11826be0fd05f0799c82eaf2e6a043b38e1277560b4d921987513b88b11d97ea2619feaf277eec72181dd2ae4f4108c2836bf7b2
 DIST llvm-4.0.1.src.tar.xz 21065652 BLAKE2B 6327eed2d1feb108440f22d2581d1ff86c10a10c29793538d8d899c7e2dc83d3f7b147d3fd4bcce2bd2bf57c071b08c624aeafe40a3e7a3914506e7751727e6c SHA512 16adc39b34ddb628f81b171119a8e2a0e9138b25011e803ef0b688e2fbea116fc4953d3a1b61b90a98a75e33619f81566b7cb06a9a2ea4d04ac5e0eb303a2d1d
 DIST llvm-5.0.1.src.tar.xz 23428720 BLAKE2B 3db4d33df21018d17eef0042c0d8d82a8412bd5daa99cfb5405a6ec83c5774178fa76b220e8731c2a9a64dabf898aa90fe29c685327bd63a4f078e8e94a9a77e SHA512 bee1d45fca15ce725b1f2b1339b13eb6f750a3a321cfd099075477ec25835a8ca55b5366172c4aad46592dfd8afe372349ecf264f581463d017f9cee2d63c1cb
-DIST llvm-6.0.0rc3.src.tar.xz 25295644 BLAKE2B 5832b3daefbbf043caaac38791eb95a321cbee82bfa12710e332ea14b8ee6d1fe81c4fcea19cdbabd24b89e338575e367bab481c47eb6a6bfbd6a926f02fe5b2 SHA512 9932debae40ced0137c1e1675fb91b996326c7eed1b67d1280bd2b0f5bd62e15d47c87d0e215fe29680cb628853c6a446587623a6f3312ce42612b2ac865e3cd
+DIST llvm-6.0.0.src.tar.xz 25296048 BLAKE2B 7ea90bb63d6f26cfbc1c1ed2f243b0fcd8ad2ceb7963cf768d262cd55e9a0c71a9cfdea0333fb220faacf4540d924d2512532774dcfb52b52490ad74e38c09e0 SHA512 a71fdd5ddc46f01327ad891cfcc198febdbe10769c57f14d8a4fb7d514621ee4080e1a641200d3353c16a16731d390270499ec6cd3dc98fadc570f3eb6b52b8c
 EBUILD lit-3.9.0.ebuild 790 BLAKE2B 13015298e24920449372388bc9a0fe5b5c705b49bbc50cc6114c8b18f9861acca1d394d08de4ee87db70ee9d363309a3cf8f3ac1bbff865a0c6c6f5c14aaac6b SHA512 57854f8499794d42e9c312b006f54454bbac7679c166c603872ebffe01c47411bff083f7fce0eb817151056ecdd72562224e383de96bdd5c46487f895e33a6e2
 EBUILD lit-4.0.1.ebuild 812 BLAKE2B b8a77a1fbf9e545f8c599352e64b7cf72f74d9f4ea121fccfe27af8e15efdda097ce1a39d1fbb30d6ef3265915098a26a0991cccd226e7f3939548f9dcae2225 SHA512 430f1df07fa4c7bca1f071fdfa067fd4655c741ce0eca361c7cf607aaba5c9e636f6da528b9395617baeab5e253aebeaf56ab4d821463c1917686be7366b8562
 EBUILD lit-5.0.1.ebuild 886 BLAKE2B 621cf485f6be72c0ed5113f884372916ad2b5e0a29799f75405cdfeb3e421de09c1bebf896132739cb87ad2a0fcd93fd80ad5c2b20f09000acab5d42fe0573e3 SHA512 160030a64d54b5b4ee2150c674dc6eae392f369969ebc2fe5fe2f812d5d756def7cf5d8fa5994299f2c15a5c00b487700447377165a51b2ed625c41457fe1bd0
-EBUILD lit-6.0.0_rc3.ebuild 894 BLAKE2B 671e97a26cb07f3e74e0fa7a1cb81fd73be07b603f47a4f17c65323dcbb6adebe4fbf53e1a334552bcd1bab76e675447f7cc7226d7b44c0d1d81681f6918b4fd SHA512 6162483027fcf0eed5e65e10cf01bcd4cea1bf775ccc441c6b514911999cc0cda5c7fb73c48e1b200cd6b3b3c3799157ec6dccbf17798b5ecdfe880c6d76cec2
-EBUILD lit-6.0.9999.ebuild 877 BLAKE2B 94c804bb68480e5385d4dfac2119040c6ab777bea39da06c087d79a0f2987ee4a4b94728faca0d4b166ea61239b745a96c25c509a92060c6d19fc48a128e5d9a SHA512 409f27ee42ec978aec5a162e4e4ebfecd9e6818b3e86b4be1666e092853b136f4015ddcac6eccffcf1f02566f44eda55ad6cf9062c2b36af23aa1ff578ef9ea4
-EBUILD lit-9999.ebuild 852 BLAKE2B 291dd2d16d189f07ce47fac6867237c92c909cdfb777f2c2a5a71dd539c7bead63cbdfc99f8f2a7f4b6cbd0582ed0868582ba436d52eede2544d084bfd1a812d SHA512 e7a9494aefa3430f7f26a7483246a058a6e05c5cac7fa3b4948ae4e5abca51b3893ac255c31bccbca85beb378011a5689a353f6ed6203332e45cd11a7ff43037
+EBUILD lit-6.0.0.ebuild 987 BLAKE2B cb868f65e4c83b5646210b6b4a9175c58bfa33cab0d90b1596e69b6440fd5a72198b1ed8847880b2c2ae74e545cf1d5fb1867b32015667ebb24981ac5fdb61a4 SHA512 1c8dc31a44719b0fddb4f133d843ebc1020a964390459bc73c84b9ff4482d23efa59a61bbb7b276472da0627eb720bc2af2956cca2a842fd95b877aa3f06a54b
+EBUILD lit-6.0.9999.ebuild 961 BLAKE2B cb1a25ddf6915b528d16dbb4cc200a708f0e4906659b280d2a87f7e02a536665ad592378ad446b9149373dbd643e683200e8169703628fcfa8db9b08536a777b SHA512 44fbdfa703aa94f2f4621490321bdcc092226c842b2f41d6223fb23a703686fcd004ec843b5bbf810a358179dd3e7b86997e4dfdd6ee7e32550301478ccdc4ae
+EBUILD lit-9999.ebuild 936 BLAKE2B 2e34b2068e182c7720a3281ebdc66075cc73d0aaa8728b87ba4e4155e366ac57404e162d149230bea77856ed75e8f7eec95d9e924883f9f584314ae631389cec SHA512 1e860f314eba2e95c0242ee897fe09ef938055e3a87cb9c7df2f546e2711430feae2bd469149f668010bca3ac95c9e41c3a19a2235a44ae6ef8ea29ea575ece9
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-python/lit/lit-6.0.0_rc3.ebuild b/dev-python/lit/lit-6.0.0.ebuild
index 21a3b1818491..9485fa2d1416 100644
--- a/dev-python/lit/lit-6.0.0_rc3.ebuild
+++ b/dev-python/lit/lit-6.0.0.ebuild
@@ -4,16 +4,16 @@
 EAPI=6
 
 PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-inherit distutils-r1
+inherit distutils-r1 multiprocessing
 
 MY_P=llvm-${PV/_/}.src
 DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
 HOMEPAGE="https://llvm.org/"
-SRC_URI="http://prereleases.llvm.org/${PV/_//}/${MY_P}.tar.xz"
+SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz"
 
 LICENSE="UoI-NCSA"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -34,5 +34,6 @@ src_unpack() {
 }
 
 python_test() {
-	./lit.py -vv tests || die
+	./lit.py -j "${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" \
+		-vv tests || die
 }
diff --git a/dev-python/lit/lit-6.0.9999.ebuild b/dev-python/lit/lit-6.0.9999.ebuild
index f167a14c32b7..d3e98d7342bd 100644
--- a/dev-python/lit/lit-6.0.9999.ebuild
+++ b/dev-python/lit/lit-6.0.9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-inherit distutils-r1 git-r3
+inherit distutils-r1 git-r3 multiprocessing
 
 DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
 HOMEPAGE="https://llvm.org/"
@@ -36,5 +36,6 @@ src_unpack() {
 }
 
 python_test() {
-	./lit.py -vv tests || die
+	./lit.py -j "${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" \
+		-vv tests || die
 }
diff --git a/dev-python/lit/lit-9999.ebuild b/dev-python/lit/lit-9999.ebuild
index 43d292abf1de..74471d6212c7 100644
--- a/dev-python/lit/lit-9999.ebuild
+++ b/dev-python/lit/lit-9999.ebuild
@@ -1,10 +1,10 @@
-# 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 python3_{4,5,6} )
-inherit distutils-r1 git-r3
+inherit distutils-r1 git-r3 multiprocessing
 
 DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
 HOMEPAGE="https://llvm.org/"
@@ -35,5 +35,6 @@ src_unpack() {
 }
 
 python_test() {
-	./lit.py -vv tests || die
+	./lit.py -j "${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" \
+		-vv tests || die
 }
diff --git a/dev-python/markdown/Manifest b/dev-python/markdown/Manifest
index a32c1365966a..482c32e5bcf0 100644
--- a/dev-python/markdown/Manifest
+++ b/dev-python/markdown/Manifest
@@ -2,5 +2,5 @@ AUX markdown-2.6.8-dont-build-docs-default.patch 387 BLAKE2B d3ecf07d57d8aae13ec
 DIST Markdown-2.6.5.tar.gz 301781 BLAKE2B 527a84bc8c4a891e64749bce273bf10c439376386c27355f386de8a0dd89e2bf0c1d6cadb0ff937fa3825655ab6220901f7b17ea2d184f3b3d178cbb54af58b8 SHA512 d966136a7184ada4eec70af661aba441694a8c4f59e57d59a28dfbc1649ca1e90cc1e4a29b354b3caf35362e1e0c96eeb3f46c68f82d7a898b76c08866d459d3
 DIST Markdown-2.6.8.tar.gz 307330 BLAKE2B 6867f15425bd84bc030ab52000dc2f83bff0c9885854cec4a2a785f80b18129160bc57da30226fe17f42043b4938482e2e4eff9cdb3d4370b0146cc09f1ff576 SHA512 85c1a16ebb50af79f378eb2fa936342df6174a4f597a74fee6d0495ef2bc4c7c8337463799e427cb6788b3429e400309958b5c4784f536593047ab2e47ac7c23
 EBUILD markdown-2.6.5.ebuild 1413 BLAKE2B a58769e42e854c1904f23b3a6dc72465d330c453a3f40737df17e29e98c3d7478352c106d02a97d400ae95e8c70cf8be34b6591f79a9665d3ec36cc9a9172c31 SHA512 0447c35221a7aaa7ea6a2d9f82a6114811f6c468bd6d6d09e3faf788b696c69ae39253e1293b2a1b44d6a72a53b2e203d8280780706b37258980094c0570d3ca
-EBUILD markdown-2.6.8.ebuild 1462 BLAKE2B 5f6fc81da0b7ac5a018d5ff6dd68dc9032d6c51f1354530a8d09431d1627a6bd4925023149efe45688ea61d5cd7cc68ec7253b213715f5148b46bdcd88e0b90e SHA512 87f91893733e74e24f6745df01625793460ce42277d596a543d4481a9b14adc701636fb7243099088600b350664016d4a2ad3fb4d4473a0ce3bff8a731d5ab14
+EBUILD markdown-2.6.8.ebuild 1467 BLAKE2B b2395f8bb3f941babf2047fbdc5a7d6c850c5ec0c7ed759e176f30e7dd8a79fbcb840d62f20b84cfd38c8e23d3aee3212c4e1a47fd00c646aafd2904ae301774 SHA512 fd8187243a96ea34738e7359f57c04aed76fb2ab2e45a28f298e262b36cbfe8e7aceaedd338b73a1e05b1d7ab4c316b7da38aec13b918dc67f5dccfd1fc3ead6
 MISC metadata.xml 465 BLAKE2B 8eadaf9d2733b1b3d93a389b0009652eecc3a0c3b6347ada4f27d99bd69b0de1be199eb1da7854655b8814a946f40a711e8fc092b22b214c18dc696dd3c0222a SHA512 4c9a52b62e49040fde94cc2d3d9edf88c42d085639d893fb81d119b8c216100f912e2725a1bbb31b1136b505ef8102f560989289da5aadc6c8f433f0186da44c
diff --git a/dev-python/markdown/markdown-2.6.8.ebuild b/dev-python/markdown/markdown-2.6.8.ebuild
index 6ecf1d60adc4..8dd931931a63 100644
--- a/dev-python/markdown/markdown-2.6.8.ebuild
+++ b/dev-python/markdown/markdown-2.6.8.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/M/${PN^}/${P^}.tar.gz"
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc test pygments"
 
 DEPEND="
diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index 05abf96b3f98..08e11cb85fbb 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -3,12 +3,15 @@ AUX matplotlib-1.4.3-cross-compile-1.patch 1779 BLAKE2B 6d95661d0300976064cca5f2
 AUX matplotlib-1.4.3-cross-compile-2.patch 2066 BLAKE2B edb86f5bf9c2d53a13d27fec7bfd35c9b51644662c548279c6e05f72d1c626625525d0600c89bc4e00827b3f1de777f76ac626f51bd448a4a0478cadb8bf6810 SHA512 d547b79d2a6f2dcca5105093faf9bc15208b1d28737d17a65d4ad716d74029d1a575d0c83b684e139d203f7b58a34a161a8e3968bfe1515f47c754b29117a824
 AUX matplotlib-1.4.3-cross-compile-3.patch 2202 BLAKE2B cac5953ba4d075d232f9e4514e6654fc8eefad7aab45141d6f9768a48c90020b62178a2b7754c74c4c53e4de40392e3d1c4a49c786ec5e8b735c82f627c23a58 SHA512 5c1a7579a2cd4e97f56485e0300d9dcc7c8871e99bd93e03113e68b95996960ece039a41203775afc2c627f0a2483f038e0e693c73efdacfbb85d47ae855b7b1
 AUX matplotlib-2.1.2-doc-make.patch 363 BLAKE2B 043318c6a584427497f284d1e770b7a7e2cff2fb40b12c4a1a684336ddede6967c01392b722d128b4b4138b2833968f8ed67a3a412c4cbb4fb23f167b4f28851 SHA512 043a4d00c69db6f3c5473514d103c1beb0685eb329ece5596caf80740f64e0c2bcb114f889c11782a7913b9d3f86614f7bb8aedcf902c41f9d1cc7a2f6ac8e51
+AUX matplotlib-2.2.0-doc-make.patch 363 BLAKE2B 043318c6a584427497f284d1e770b7a7e2cff2fb40b12c4a1a684336ddede6967c01392b722d128b4b4138b2833968f8ed67a3a412c4cbb4fb23f167b4f28851 SHA512 043a4d00c69db6f3c5473514d103c1beb0685eb329ece5596caf80740f64e0c2bcb114f889c11782a7913b9d3f86614f7bb8aedcf902c41f9d1cc7a2f6ac8e51
 DIST matplotlib-1.4.3.tar.gz 49933525 BLAKE2B 40ea29ef7197d364f9caea63904b11231a4f74ca93184de8b1f8c7f78713cf887ea8a6fbee1b3f545c895eb353e0eeb5d65308657a3138986fb080ac44164427 SHA512 51b0f58b2618b47b653e17e4f6b6a1215d3a3b0f1331ce3555cc7435e365d9c75693f289ce12fe3bf8f69fd57b663e545f0f1c2c94e81eaa661cac0689e125f5
 DIST matplotlib-2.1.0.tar.bz2 33051088 BLAKE2B 6a97909a44ca37c3ec09a9e723909bb0169828e56daeec5711220a6caac632d19e77ef2fc042a61cb82760c9750d04753654761a707b6265a038af9c55b91bd7 SHA512 872ff86e989b4e9352663f4abde1768aa05b1adea3e1b234efdb301429d421718314b27950e508d92df8fc9136764b07e8a6861b66512e9695a496993076bb5f
 DIST matplotlib-2.1.2.tar.bz2 33422388 BLAKE2B cb4826b563e9820a17e568de78044cb81af6fbe86221505fe9cfbab7e06fb95cc3a4eff8772443197cdddf6e49b4b59d204fab39054e627b95f0169b74f630a4 SHA512 861354363f625a45f40ce7b31263088c950c8664b8ef13f8019da222ba4a8df7d0a8ee048a1bd84102e472ec48318cfea9df905d58a28efb788ba59cd5348061
+DIST matplotlib-2.2.0.tar.gz 37246563 BLAKE2B 98d0b2cd6221f7e35d6d023b9c580733370b2def914e1ea879245a10399767f6269d81da561630518d1663da4b8afadf801c627b4c713cc37ad628a917cc446a SHA512 70932e4511e6748cc97c1c6b55705d31e93c1c2bd91b163158a4585dd916318337243ba89e6a62319c628fba955bb768bb73380991f6b7ed8678ef61413926e5
 EBUILD matplotlib-1.4.3.ebuild 6155 BLAKE2B a3332a75cd8d312b15c11c089c9e6f6d26907114125617317a2d180c17f14bd3a6948fb68dbba301fb8b42444f013f16be8a4475031030687292d02313c8c73d SHA512 5fd4a4c0ac70389555bd43e85825c21ed4a0ed18782c6777a74e6c2f8a75c90c7537fcf529f115aaf6efb4d20b4c3b50874425365301659215506b7e7aafcafb
 EBUILD matplotlib-2.1.0-r1.ebuild 6173 BLAKE2B 45bda87d10e48cb942e015b518deb5476f40c64ec79a7acca3366f49d70da8036068353a3766d094e00b8108718a8aa67c34cfaa4ab37f2151322c73d8520896 SHA512 e40659b624f307e591c32f9b9f2e9aa181e8a3bdeff45535be07141b4f2657b066ded21de0adea3cdf18903cdb86882aa425a79432a4d906982de776171561c1
 EBUILD matplotlib-2.1.0-r2.ebuild 6230 BLAKE2B 32fd252c9c94b28951eea2bfc76e9acc763c584484934a4b01a86515592a11dc23e476cd1714d1b47b05ba792ebce1f63d62b7729d2333488cf7ce889618614b SHA512 7bfd228192a97f11b7e44f7034abd11fe52d2820fbadacf3e2398804d86af7c4b9b28a508339aa122fb9d63c5f933aa811d1dac18d9b9bef1c6942e619dd3752
 EBUILD matplotlib-2.1.2-r1.ebuild 6319 BLAKE2B 05a46ec6a0cfb909179bf9d89ccedb782c3de3e9dd3acf9d62d1e05ceeb572c0c80a60711bba3179fdb392fcf54f13bbed6e969fed22ef90ecc03ff4a630e8df SHA512 b9c5459e54ba70a12ea88a0aad7e57be9fd8625972a049e818e7ff9bac33e4c117a344c256ca769cf99d83dbbc1f34164c61ee823a0e3e7782d10b9013a6984a
+EBUILD matplotlib-2.2.0.ebuild 6371 BLAKE2B 7f63e360c68572b92b4934187bddd120526c09cece285d17ab2b1d2c9c1f894aea342731ba5d4795a54dcc66fb46272d8b4feb507a5ca0bfd24ac9210a5d8803 SHA512 ba0ef20a8d2a8386b640ddcaeed75d18becaf57594848c7ac02f3178ea2b84873a6b79678cc0bd806679252a7ad01a1a4d92e01e77ede8e696616f7e45a5bec2
 EBUILD matplotlib-9999.ebuild 6396 BLAKE2B e1e7d6415cadc503db5796a8aba507aa6a94f8acb7e529caeac9d71537570293d75293b607d20a33b94a7352fdcec0e2c1de8d6302f981a1cb15d15585991951 SHA512 1a6406602fabea4b12911a89d34e69fed7b418c3127dac5679ebfe706e144aa62c93f3aa19ca832d75fdff0b4f2c5e5029a92ed3e1a8fa6bd61973cedf5504cc
 MISC metadata.xml 1063 BLAKE2B 396b976a60c89ae2b6bb9d365a8234663994f561a99ac0d59385a15245ae245fc09cdb6626b79a63cae53651c39d2df97ea8825016be0ec3bce7d6ad60cd15d5 SHA512 25344a9f8d7ae73f1ec9f493cef17925c94fc4cd44486a9928debbd18ba53010455393e3e97fc70e67a9afae9d6c15b12688af16e5e9f7e090748481969eac4d
diff --git a/dev-python/matplotlib/files/matplotlib-2.2.0-doc-make.patch b/dev-python/matplotlib/files/matplotlib-2.2.0-doc-make.patch
new file mode 100644
index 000000000000..7ca0c6974234
--- /dev/null
+++ b/dev-python/matplotlib/files/matplotlib-2.2.0-doc-make.patch
@@ -0,0 +1,10 @@
+diff -r -U2 matplotlib-2.1.2.orig/doc/conf.py matplotlib-2.1.2/doc/conf.py
+--- matplotlib-2.1.2.orig/doc/conf.py	2018-01-19 11:07:49.000000000 +0700
++++ matplotlib-2.1.2/doc/conf.py	2018-01-21 20:06:44.120901546 +0700
+@@ -136,5 +136,5 @@
+ }
+ 
+-plot_gallery = 'True'
++plot_gallery = True
+ 
+ # Add any paths that contain templates here, relative to this directory.
diff --git a/dev-python/matplotlib/matplotlib-2.2.0.ebuild b/dev-python/matplotlib/matplotlib-2.2.0.ebuild
new file mode 100644
index 000000000000..ac5be72c5fef
--- /dev/null
+++ b/dev-python/matplotlib/matplotlib-2.2.0.ebuild
@@ -0,0 +1,257 @@
+# 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='tk?,threads(+)'
+
+inherit distutils-r1 flag-o-matic virtualx toolchain-funcs prefix
+
+DESCRIPTION="Pure python plotting library with matlab like syntax"
+HOMEPAGE="http://matplotlib.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+# Main license: matplotlib
+# Some modules: BSD
+# matplotlib/backends/qt4_editor: MIT
+# Fonts: BitstreamVera, OFL-1.1
+LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="cairo doc excel examples gtk2 gtk3 latex pyside qt5 test tk wxwidgets"
+
+PY2_FLAGS="|| ( $(python_gen_useflags python2_7) )"
+REQUIRED_USE="
+	doc? ( ${PY2_FLAGS} )
+	excel? ( ${PY2_FLAGS} )
+	gtk2? ( ${PY2_FLAGS} )
+	wxwidgets? ( ${PY2_FLAGS} )
+	test? (
+		cairo latex qt5 tk wxwidgets
+		|| ( gtk2 gtk3 )
+		)"
+
+# #456704 -- a lot of py2-only deps
+PY2_USEDEP=$(python_gen_usedep python2_7)
+PY2_DEPEND="
+	$(python_gen_cond_dep 'dev-python/functools32[${PYTHON_USEDEP}]' python2_7)
+	$(python_gen_cond_dep 'dev-python/subprocess32[${PYTHON_USEDEP}]' python2_7)
+	$(python_gen_cond_dep 'dev-python/backports-functools-lru-cache[${PYTHON_USEDEP}]' python2_7)"
+COMMON_DEPEND="
+	dev-python/cycler[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.7.1[${PYTHON_USEDEP}]
+	dev-python/python-dateutil:0[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10[${PYTHON_USEDEP}]
+	media-fonts/stix-fonts
+	media-libs/freetype:2
+	media-libs/libpng:0
+	>=media-libs/qhull-2013
+	dev-python/kiwisolver[${PYTHON_USEDEP}]
+	cairo? ( dev-python/cairocffi[${PYTHON_USEDEP}] )
+	gtk2? (
+		dev-libs/glib:2=
+		x11-libs/gdk-pixbuf
+		x11-libs/gtk+:2
+		dev-python/pygtk[${PY2_USEDEP}] )
+	wxwidgets? ( >=dev-python/wxpython-2.8:*[${PY2_USEDEP}] )"
+
+# internal copy of pycxx highly patched
+#	dev-python/pycxx
+
+DEPEND="${COMMON_DEPEND}
+	${PY2_DEPEND}
+	dev-python/versioneer[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	virtual/pkgconfig
+	doc? (
+		app-text/dvipng
+		dev-python/colorspacious[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/mock[${PY2_USEDEP}]
+		dev-python/numpydoc[${PYTHON_USEDEP}]
+		sci-libs/scipy[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.3.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-gallery-0.1.12[${PYTHON_USEDEP}]
+		dev-python/xlwt[${PYTHON_USEDEP}]
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-latexrecommended
+		media-gfx/graphviz[cairo]
+	)
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		>=dev-python/nose-0.11.1[${PYTHON_USEDEP}]
+		)"
+
+RDEPEND="${COMMON_DEPEND}
+	${PY2_DEPEND}
+	>=dev-python/pyparsing-1.5.6[${PYTHON_USEDEP}]
+	excel? ( dev-python/xlwt[${PYTHON_USEDEP}] )
+	gtk3? (
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		x11-libs/gtk+:3[introspection] )
+	latex? (
+		virtual/latex-base
+		app-text/ghostscript-gpl
+		app-text/dvipng
+		app-text/poppler[utils]
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-xetex
+	)
+	pyside? ( dev-python/pyside[X,${PYTHON_USEDEP}] )
+	qt5? ( dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] )
+	"
+
+# A few C++ source files are written to srcdir.
+# Other than that, the ebuild shall be fit for out-of-source build.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+pkg_setup() {
+	unset DISPLAY # bug #278524
+}
+
+use_setup() {
+	local uword="${2:-${1}}"
+	if use ${1}; then
+		echo "${uword} = True"
+		echo "${uword}agg = True"
+	else
+		echo "${uword} = False"
+		echo "${uword}agg = False"
+	fi
+}
+
+python_prepare_all() {
+# Generates test failures, but fedora does it
+#	local PATCHES=(
+#		"${FILESDIR}"/${P}-unbundle-pycxx.patch
+#		"${FILESDIR}"/${P}-unbundle-agg.patch
+#	)
+#	rm -r agg24 CXX || die
+#	rm -r agg24 || die
+
+#	cat > lib/${PN}/externals/six.py <<-EOF
+#	from __future__ import absolute_import
+#	from six import *
+#	EOF
+
+	local PATCHES=( "${FILESDIR}"/${P}-doc-make.patch )
+
+	sed \
+		-e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \
+		-i lib/matplotlib/{mathtext,fontconfig_pattern}.py \
+		|| die "sed pyparsing failed"
+
+	hprefixify setupext.py
+
+	export XDG_RUNTIME_DIR="${T}/runtime-dir"
+	mkdir "${XDG_RUNTIME_DIR}" || die
+	chmod 0700 "${XDG_RUNTIME_DIR}" || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	append-flags -fno-strict-aliasing
+	append-cppflags -DNDEBUG  # or get old trying to do triangulation
+	tc-export PKG_CONFIG
+}
+
+python_configure() {
+	mkdir -p "${BUILD_DIR}" || die
+
+	# create setup.cfg (see setup.cfg.template for any changes).
+
+	# common switches.
+	cat > "${BUILD_DIR}"/setup.cfg <<- EOF || die
+		[directories]
+		basedirlist = ${EPREFIX}/usr
+		[provide_packages]
+		pytz = False
+		dateutil = False
+		[packages]
+		tests = $(usex test True False)
+		[gui_support]
+		agg = True
+		qt4 = False
+		qt4agg = False
+		$(use_setup cairo)
+		$(use_setup gtk3)
+		$(use_setup pyside)
+		$(use_setup qt5)
+		$(use_setup tk)
+	EOF
+
+	if use gtk3 && use cairo; then
+		echo "gtk3cairo = True" >> "${BUILD_DIR}"/setup.cfg || die
+	else
+		echo "gtk3cairo = False" >> "${BUILD_DIR}"/setup.cfg || die
+	fi
+
+	if python_is_python3; then
+		cat >> "${BUILD_DIR}"/setup.cfg <<- EOF || die
+			gtk = False
+			gtkagg = False
+			wx = False
+			wxagg = False
+		EOF
+	else
+		cat >> "${BUILD_DIR}"/setup.cfg <<-EOF || die
+			$(use_setup gtk2 gtk)
+			$(use_setup wxwidgets wx)
+		EOF
+	fi
+}
+
+wrap_setup() {
+	local -x MPLSETUPCFG=${BUILD_DIR}/setup.cfg
+	unset DISPLAY
+	"$@"
+}
+
+python_compile() {
+	wrap_setup distutils-r1_python_compile --build-lib="${BUILD_DIR}"/lib
+}
+
+python_compile_all() {
+	if use doc; then
+		cd doc || die
+
+		# necessary for in-source build
+		local -x PYTHONPATH="${BUILD_DIR}"/build/lib:${PYTHONPATH}
+
+		VARTEXFONTS="${T}"/fonts \
+		emake SPHINXOPTS= O=-Dplot_formats=png:100 html
+	fi
+}
+
+python_test() {
+	wrap_setup distutils_install_for_testing
+
+	virtx "${EPYTHON}" -c "import sys, matplotlib as m; sys.exit(0 if m.test(verbosity=2) else 1)"
+}
+
+python_install() {
+	wrap_setup distutils-r1_python_install
+
+	# mpl_toolkits namespace
+	python_moduleinto mpl_toolkits
+	python_domodule lib/mpl_toolkits/__init__.py
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+
+	distutils-r1_python_install_all
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/mccabe/Manifest b/dev-python/mccabe/Manifest
index 0ec72f1710cb..b2af93ad946d 100644
--- a/dev-python/mccabe/Manifest
+++ b/dev-python/mccabe/Manifest
@@ -1,5 +1,5 @@
 DIST mccabe-0.2.1.tar.gz 5031 BLAKE2B 6f52106337ed534933de0c98fc103cfe209bddb30623a3b710681f4f0615a964c4d0472d4dc56f1ea4e60dda695eee540f9f9b441111808684f09fc8207b69d0 SHA512 7155e52063e786c140c541f1410d0c319387b4b5f24ec3c60ba3d5a963a92d0ee545254559941ac0dbe961f46750c0e61271fbe82653c6b1465c0a13b31ec325
 DIST mccabe-0.6.1.tar.gz 8612 BLAKE2B 6828dfd852cf9b47de10bd889dd4c32dc1ee95910fbd27e0921cd7d9975a0831b1c2763eda5b2d77d7e4b44b5a9d0e89f0818cab71de655954cc87cacfe8d382 SHA512 d8fc251a29790887c14c5932c5172b4cd578cd37ccf14cb96e80f0b97f27023427ea032d14e1e2a99d72627b055eb285f60db69e679ecd79d90a34b0255703d8
 EBUILD mccabe-0.2.1.ebuild 553 BLAKE2B ab9defb8f678c26edfe4abedd8cad4b6603d6fb40ae874c267d24e4f550e7fe8276604996f40cc7b62faf65bf1e8186a2d37425ce3e65e0d5f65a514f299d562 SHA512 5ac2247052ee959a29a582884d4d8d10df032925ed6eeaf0c950081dbf05e091975952fb2394e6abb7e0f5f3ed93b4201bc90029e8c84aa34165bda8bfeefda5
-EBUILD mccabe-0.6.1.ebuild 885 BLAKE2B 2566f9d44a6bd633cc6b7be66e8da7713ab7422b66f0015b8b050dd049e17b3a89bf87f2025a1842a8b8f55f375901587ebcaee349f118c5829eab6a9bdb4f32 SHA512 142cd0eb02e50fd29f46e2d0e1989f5cb6e569f83dc45626d854a6530b0f43ba6706aa725988a8d8df1e9555de67f34dc283630bac45c3face115388c92e4f85
+EBUILD mccabe-0.6.1.ebuild 881 BLAKE2B b1f47b49554ca0e9f00c53e63b963b62737eebbd2845fb20c80039648ff6cdb6237305f5830695bf90059be2511d96e25b45fb4eda2c7ae8df0aba2e3b252b40 SHA512 2ece64bf2ef9c7d5bd83503b17ff6fe3b96fe0de0159011e49b30a979af5cba789adb0ac318aeb4e10a92c6b326dcba196d042d52084a13f7bf8788bd350cf97
 MISC metadata.xml 373 BLAKE2B 0a0d03ce9752401f11326bd24a760ee9f18b792e6d6cb6f229513eff68f35acc943dde6b9b842a508e7bd7344c13e1b8d74b38ef1ef1401823ee106573502412 SHA512 9672aa38d9c5e31835bd0b7b1d3463f2e625ff71b4ee79d39b939cbae4df67241ba64f17cfa928aeb6fbcd0bc787c076dc078b56c92bcc1a46ea26f873472fc1
diff --git a/dev-python/mccabe/mccabe-0.6.1.ebuild b/dev-python/mccabe/mccabe-0.6.1.ebuild
index c41b217fdb74..d8680e1ff0b7 100644
--- a/dev-python/mccabe/mccabe-0.6.1.ebuild
+++ b/dev-python/mccabe/mccabe-0.6.1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="flake8 plugin: McCabe complexity checker"
 HOMEPAGE="https://github.com/PyCQA/mccabe"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/mock/Manifest b/dev-python/mock/Manifest
index d1f5d77f173f..8be25206745f 100644
--- a/dev-python/mock/Manifest
+++ b/dev-python/mock/Manifest
@@ -4,5 +4,5 @@ DIST mock-1.3.0.tar.gz 70908 BLAKE2B 4df669c5d54fc835c70d6190362d4dea9cc0d2e7ca4
 DIST mock-2.0.0.tar.gz 73684 BLAKE2B 970bebe72b6969b58acdc2856b53054f992d01f9f3ca5f91b73073d0a1c9ec89a5c94fd66eab85b258f23f33326825ff6598bb2ba8e07eded1e6540a26ac5fa3 SHA512 a08007651b749d2843b94f5045d74c122958888290aea21930455538a854e6b04c07115e21d82edde996154bf597d7a8784a2f4213cbabc49a98dec22dd92238
 EBUILD mock-1.0.1-r2.ebuild 1125 BLAKE2B 90ef59e9b9f97961b83e5426cdbd82c4cfa8b2bc901b18f2588c71238c93418db084ca5ad2177bd71748167258e8e69baea2e5e22ac0baeff968710a08fcf40d SHA512 32f957b31401e1e78f575a4facf63168fa6d6e64d4f5947929c79491ed1997081b02a4ea176351b786dbb1c73e061167be0037885cd951800fd2c8ed6e71839a
 EBUILD mock-1.3.0-r2.ebuild 1073 BLAKE2B 04e814e0e3babe2b9bc187d0a30d0e81f0292306fe05f370b4203d152f10d251ec36a79c139722395e020c17c7f7d267a2f219779d85f9b7ac16ee58d89ec837 SHA512 601b41f1e291903f62a786900aef41e815396c21c2536ea1d9d0acfb27b305765bc3ee7ec2fa8270f14d6f70f76361cc007cd9cc926fc072b1cbcee145913e39
-EBUILD mock-2.0.0.ebuild 1084 BLAKE2B 437b23e53565ea5e99ace98ce18cec4deddf23180725f3c48a002e3f0c457abd85ddbb4b5fbdf43cd551fe079ac32e46255350f79b7417aceef998faf928bc9f SHA512 45e9d2983daa5a90142c2cc1da13418f5c89285685eacac271fdb76f2eada9e0f6d6a9e8a1011b4939b9c6ec78a3a0242a05e9d35614b3cacb412e970747a04d
+EBUILD mock-2.0.0.ebuild 1083 BLAKE2B 0cdd29d7a241f4ac1a9fdbd463249f535189f28f4413c4ec85aaf02c3186fa3bbaeee16afe5e9cc8d02db4c3b407896e34760f6bef3dd12b6e44a1371988e769 SHA512 3263046cd68566214a17d0ed14dc6ea6a428903529b9908503f3aa72de9ab967307d4cd5919322b4363fe72303d78442dfba31e5c6fc61bbfd8a41f41bf0337e
 MISC metadata.xml 365 BLAKE2B 80ce989b7585192744838e804490286b598d6a4e082a2e88fce1efdc34c3ef3185478fa6ce3f08c81dd680c62b4de0c7eff3fe7c926d96479ab856aa46c69250 SHA512 89eda97d1f0ece91d573a9fc4fb5d357733b757b1214a56c7bb14a10f84e1c275d2cc49ed773597c4e320df03f751fb093fef7f3805deb450380df4dd83d875f
diff --git a/dev-python/mock/mock-2.0.0.ebuild b/dev-python/mock/mock-2.0.0.ebuild
index 9c5af1506b58..36df22a66043 100644
--- a/dev-python/mock/mock-2.0.0.ebuild
+++ b/dev-python/mock/mock-2.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 
 CDEPEND="
diff --git a/dev-python/more-itertools/Manifest b/dev-python/more-itertools/Manifest
index 5f6580f7eead..4497c8a01cf6 100644
--- a/dev-python/more-itertools/Manifest
+++ b/dev-python/more-itertools/Manifest
@@ -1,3 +1,3 @@
 DIST more-itertools-3.0.0.tar.gz 37622 BLAKE2B dd1806f4359406ac0a57a8eefe8d6c31033177e3f1b4fd297dfcdb525df6bd5725ff16f25abb1957dcb1cacb21bf1d037a3c9def9e9469904efbe2fd336cf5b4 SHA512 575de991b6337e6416489d92b41201536397d84ff41030a2cf09ea57cc994e03dcb4dd19eda321243ceafd49c11271da43a4c4ed5a9261cf771f0b7f8e40345c
-EBUILD more-itertools-3.0.0.ebuild 938 BLAKE2B b9ca9ea14f323bba0096c463bf9b78defc0bf099bdda8d072115aeb4689b8c11263009d575768c22f1d300acc6e422cd2354237a12e6278858bf26e876ac4e55 SHA512 6d34438e310ab1f9b2ac8be045ebce01e4fbdf2f2d2fd7b9c70346b0b8c8aef5f6ee50dd37e84316f523b2ec6a4fb32577275fe1639327201ce3631e4c5ccd1e
+EBUILD more-itertools-3.0.0.ebuild 943 BLAKE2B 7a6ef64611e4c7f789c30857bcd93fbaa78c5003c4c537989c97860afb6e1beafdd3a4cfe4f80b10d36b58cc29761c88b32e3f3780044837821eb317f9692c24 SHA512 a47cee800b670a1c09e8e67b7766f242fbb3833b4ee9e33571db11e782eb056367bbe0b86d559393299c7b66d45475c46c94b578c92eab1f7b743e85ff46bfcc
 MISC metadata.xml 451 BLAKE2B 22dc3c0fcc0e1061f4060b8456e7f8686f40d100af79b6bef394eb1e9111aaa9b7b5762c94bb3b27464739328388dd56f02cb9813860acf23067148f03ef2f66 SHA512 4a22e7394227ddac2669e188e6b77170d41c30054a388def0a4d8ff2ff27de676949f4b8932d8d1adeca6c8570be3733da9983e173dc620298ed0bf3ea365ddf
diff --git a/dev-python/more-itertools/more-itertools-3.0.0.ebuild b/dev-python/more-itertools/more-itertools-3.0.0.ebuild
index d609a963b321..55a44f00d6a9 100644
--- a/dev-python/more-itertools/more-itertools-3.0.0.ebuild
+++ b/dev-python/more-itertools/more-itertools-3.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc x86"
+KEYWORDS="amd64 ~arm ~ia64 ~ppc x86"
 IUSE="doc test"
 
 RDEPEND="<dev-python/six-2.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/msgpack/Manifest b/dev-python/msgpack/Manifest
index ba4b2aa40f20..983ee44f3619 100644
--- a/dev-python/msgpack/Manifest
+++ b/dev-python/msgpack/Manifest
@@ -1,5 +1,7 @@
+DIST msgpack-0.5.6.tar.gz 138292 BLAKE2B 6a3b8472b785d77e142d21464b9e52c55166a8eff56009f63df5daa8cd5b6dbce4406a06ffa8d478cb44dfbdfab2f3b4b29cd11279ea82f67906b97d507f7eda SHA512 bdbd193bd3bd02e78d9c6e8d9d8fa687d13583dff2813bc77c5e6cbbe0d180765da3c9a80d176f9993589e35f548ad04973e3d523d0b6d41ef7916ecd86195aa
 DIST msgpack-python-0.4.8.tar.gz 113641 BLAKE2B d22efe13302e28d0701b95b2dc4cf4792f9e045efdf77b31ac5c6170b503c885c265ff63387fe76a1aa67b1624963aa26d76dffb15fc2cb10cfe672b59e71b99 SHA512 59e9c43be6b92e6d10f40999e0902c350137e67a83c43bb15b273eca856a6eb39f24b625b02b40188a9365ce3101f03bfa9aa3dfff56c5c3b551533942183481
 DIST msgpack-python-0.5.1.tar.gz 138953 BLAKE2B 1fb7e5be33992808319e1444ff7f84cc13f034e60ce0ef2f72161bd4ccd0cd1ede27382bc1f365f268557c8ffe503fd12de66eb5840e79760d818e7e2f67fdcd SHA512 e5172e20bb25d2e12ba34ad2805ba4ea0776397986e8bf8e26d21353f57a2dba59a9c6669c817e4e91d5801558a50f95d81e02343f8f0292a01ec5d822fba61c
 EBUILD msgpack-0.4.8.ebuild 770 BLAKE2B 5572e7ad6442ba346ad3e1d9288ae6721b3587424e843474aabe0b806778e8b34719b1bb8f716f4e679234641028090ba4cd73c9d9f5e121e2189d7be4622853 SHA512 96b0e59f74fb4d05d4c88572e74a0a87d8bf7db4e4945aa125b60521b7f74857acba19ace64fc759e65a1295ed63b319c3d3046511f234f4a0bf4517d4c15df9
 EBUILD msgpack-0.5.1.ebuild 771 BLAKE2B 5b9c60a88b72bd5bd238e4474cb7662cd07d2f24df53edddf17967a856ee25a170f50f6ec23738ce205d12b1a6cf65a4bac9c3075389d731a2743f0a86a58647 SHA512 3aedcb271f0699ceda59908af275aeb9b72b68e1d8122512a96872bb92c91b5e0dafb3d63447957488ce4c9b1df677a6bc99784dd976a830d1f082ba3f807442
-MISC metadata.xml 391 BLAKE2B ff92d277a83506f36ed8cfe23dde10d044925d5e92d35e1ab09283d6ae2d259886982434d96898b570ad83abdf9ed3c02e695998464b9bed596ad95aed6f7daa SHA512 3001105274f7bcc446a3ea5d0e278073a51b1c480a78127574dbdb427e656719673f7a9543c8bf9b3d8181e414612f3f186e7ab192fa0fa9333a988f17593f79
+EBUILD msgpack-0.5.6.ebuild 1022 BLAKE2B afd46cbd4e5328e449c46187777f68dabd68fbb59273ccb0f5b18d13bfb5949ab2333bdbbf34d7fa33acf0d210bbb3973fbffcd903669fb611c6b4eae97514cb SHA512 36580b2fb443be2c6de085f2a02614c9572ca54d403fb9bac2f359abf2f860b3581613a04ebc1cd7bcd8820e1f82a225cad4bf8cc2acec62d29ae6e656959ebb
+MISC metadata.xml 801 BLAKE2B 8455df40b89a2cb103d06cea5d334a70a2f9f913786c046533a3415c7dbd71387b72133ffcee0d9d2a5e2a70890c602453a4550ca2f9b5dd183f3103f278fa5d SHA512 c7633faceb2c6da02e144af13aad5256376ca60842e674f835c28f9eef9a34665ef5094fd8f1269b6d7a8b2355a9e3fba11863b1940d3ae152c126e89ef9c60b
diff --git a/dev-python/msgpack/metadata.xml b/dev-python/msgpack/metadata.xml
index c0744d424d52..9d8ee9118cdc 100644
--- a/dev-python/msgpack/metadata.xml
+++ b/dev-python/msgpack/metadata.xml
@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+  <maintainer type="person" >
+    <email>lluixhi@gmail.com</email>
+    <name>Aric Belsito</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Gentoo Proxy Maintainers Project</name>
+  </maintainer>
   <maintainer type="project">
     <email>python@gentoo.org</email>
     <name>Python</name>
@@ -9,4 +17,10 @@
     <remote-id type="pypi">msgpack-python</remote-id>
     <remote-id type="github">msgpack/msgpack-python</remote-id>
   </upstream>
+  <use>
+    <flag name="native-extensions">
+      Compiles native "C" extensions (speedups, instead of using python
+      fallback code).
+    </flag>
+  </use>
 </pkgmetadata>
diff --git a/dev-python/msgpack/msgpack-0.5.6.ebuild b/dev-python/msgpack/msgpack-0.5.6.ebuild
new file mode 100644
index 000000000000..c983343b0e3a
--- /dev/null
+++ b/dev-python/msgpack/msgpack-0.5.6.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,5,6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="MessagePack (de)serializer for Python"
+HOMEPAGE="http://msgpack.org https://github.com/msgpack/msgpack-python/ https://pypi.python.org/pypi/msgpack/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="+native-extensions test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	native-extensions? (
+		>=dev-python/cython-0.16[${PYTHON_USEDEP}]
+	)
+	test? (
+		dev-python/six[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	# Remove pre-generated cython files
+	rm msgpack/{_packer,_unpacker}.cpp || die
+
+	if ! use native-extensions ; then
+		sed -i -e "/have_cython/s:True:False:" ./setup.py || die
+	fi
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	py.test -v test || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/multidict/Manifest b/dev-python/multidict/Manifest
index 343e1ae19c2c..ab0e695cf45f 100644
--- a/dev-python/multidict/Manifest
+++ b/dev-python/multidict/Manifest
@@ -13,5 +13,5 @@ EBUILD multidict-2.1.2.ebuild 878 BLAKE2B 9e37896184224fe2b95daad32e7171c832630a
 EBUILD multidict-2.1.4.ebuild 874 BLAKE2B 37523db11ade9f2c65333559ac88be845ee737ddddc307e6d442b1e38b5c405bad51f849d06117189b67bf1b53a1c1238036d24927bdfd8e45463d20e33a96aa SHA512 b3a2970a265bf709e95a975ba31f7006ae1a1ce261b555495eb5770b81e76ce3af31fe4e0749d769ea70ec8c222ae6e21e30843a9feab9d82424371d33259cb5
 EBUILD multidict-2.1.5.ebuild 1049 BLAKE2B c4fb30f7accc1ce25b45f3cc8cfdc6d6bac799330708593773ea4ee16eb533d6e73673ae5a911ca343db04b5f205e008e446b93e5c96bbe40eef9e27d504e052 SHA512 e96c235ad7a272127d20107d5eff61cd840d35173c0b81d63202532f0e7a1e3d81b4dd880c0bbe744a2b4de3abbf8a2ea0bd15977489f3173fbc8a70f81e5a0c
 EBUILD multidict-3.3.2.ebuild 857 BLAKE2B 936db37745d3f4c12a7cfcc4c3b5da68885c52ee88d974cb14e443dd3386dceca6906a66296cfb0be9b6cb004a3cce1eb68614e188c9ffe7560afc0ebc970da0 SHA512 6fd7be5f8772ff2d1a17a25dc38dd161dfe791b36ed19fcfdcebff48960145ddc0d6b6a5d52936e9bd99803725d944d70b9ddf6073e78c46ad84486684b47dbb
-EBUILD multidict-4.1.0.ebuild 989 BLAKE2B c44248db858a843feccd77168d135d0c003f027fca7cc7d2624728658416b4ce7a7a9d7561141280397575196d53e0b24d928bb76582414e0462192bad1d203d SHA512 17272a2bfcbccad3501de8f29e0d04a7e7726834faf56ac226457794e9d1b89b0d6a1d2dfcc13898ac153163a2fc40eb2f28896bbb756b4b2f088bc3fe681667
+EBUILD multidict-4.1.0.ebuild 1062 BLAKE2B 6389ba660f6c1cf57efcfa8ae4fc838fae11618238d95ce9457ceacbae31ded545305793508c8fad00168b956a36dc595c33372fa5de74782afbe9c98fa57e82 SHA512 b0dbae21b6849da1db86d9175dfe2774d2340ed0561f001b20c56fed00941bb556f7a9d1d431fd7bc5991b8e9338a6c9dc4b28dc36786252509950ef17437f5d
 MISC metadata.xml 428 BLAKE2B 3f7c1f816583b35bd0150ae21c61142bbb7ac5b216edb5011bc032410e408f2566801db025c8f6274dafbfc555b0b32aaca2708684a3601ffe8d371b23e0d556 SHA512 edb199503c42c55b838b5338656b41e760c90ec3e81114106dd352e2c3886f0161a0c6ef258c5c0a0728d2420bde5d26dea41b25b030eb947dbacd702cb2b594
diff --git a/dev-python/multidict/multidict-4.1.0.ebuild b/dev-python/multidict/multidict-4.1.0.ebuild
index 6c6e9b49f66d..02df4b8087a8 100644
--- a/dev-python/multidict/multidict-4.1.0.ebuild
+++ b/dev-python/multidict/multidict-4.1.0.ebuild
@@ -27,6 +27,9 @@ python_prepare_all() {
 	# don't use pytest-runner for tests
 	sed -i "s|'pytest-runner'||" setup.py || die
 
+	# don't enable coverage or other pytest settings
+	rm pytest.ini || die
+
 	distutils-r1_python_prepare_all
 }
 
diff --git a/dev-python/neovim-python-client/Manifest b/dev-python/neovim-python-client/Manifest
index 059c72775b12..130480fb8010 100644
--- a/dev-python/neovim-python-client/Manifest
+++ b/dev-python/neovim-python-client/Manifest
@@ -1,7 +1,9 @@
 DIST neovim-python-client-0.1.13.tar.gz 41413 BLAKE2B 819c3e7763cfb357d45130928dab23ad149a5f9d8efb0df8699a805bc394662447837ad3edc869705a95d74a37f2eec4f155212da918ac779d389c150a0d7189 SHA512 ecef42601632551c98f8de019bfdf4dbff3ce1f0e1b6943b78a506b710e5810f6a7e611adc09435992b97288ff365a416870a74202a5c68236b5daeb51d15c8b
 DIST neovim-python-client-0.1.9.tar.gz 40599 BLAKE2B 48b43d344ed0c7aa3faa95a16c9714f2d105a916364db55d68263db7b8307a90d084bcf7559dd17277bb8dfbe6d7bbab8d3dafa250b4825b2cebddc00d130dee SHA512 043429407d140b37004d5344f9244c8cb5a37e2b5d450454e6535bece7fb05f037e5eff2a63431fad55ab2470372c4a17e0a608a94af65a2f400f2158b736ce4
 DIST neovim-python-client-0.2.0.tar.gz 41892 BLAKE2B 0ae59548ae1e376c618c24edfa73f3f68f5c059b2772be8ba3aae08d38c7a368d8b341da0221092ec8fb132843e1ea2d313bedf0c51fd202d5953e530f205d3a SHA512 b8363be2892f4dfaed0251186a3f370ec31be51710b659b71f52575da773e254b388afec2f5999a6b526d722b5232a16c59d7e28e49df30b4760ef030238d068
-EBUILD neovim-python-client-0.1.13.ebuild 828 BLAKE2B 2e50b899049660e8ccc4df26221f695db84bb814999c9ccce6656dad07e01208e4b0eb514ec319df1caa8aabd76e2a3afd1a1038049d81e1a1a48d7fa7445dd4 SHA512 80603a381d4f66cf1f1c05611cb87a3abe64b2e0e64dcf3534e777256194b497820e11b060c2218a3752b099072abea494b21cf0a3f9ef7e1665c0eb0cea41ed
-EBUILD neovim-python-client-0.1.9.ebuild 675 BLAKE2B a92e8fc5f69e7beb65032e66452aaf93e280f74a480e2ca1e8ea9dc0248f62c54765389128d153b10edd36cdaef21b0092fcd4a88f7b3779bb73de5e70e29cc2 SHA512 cbbd852156edcc2fd27365497cee82e741ce79750a2e337df3f4bd52f1689f3b9a62724c1a55623b44e08924357502ff0344968d515bf0a6ed996ecedb7840a7
-EBUILD neovim-python-client-0.2.0.ebuild 667 BLAKE2B 03872fffba5a240fe3248537d8fc0bb43ce34e2a02c62828c9b49cad8118831e067f9229b2086810af6151e6b8497950a878571f313139fcaeff0c0267117ef5 SHA512 62012b86095d9f8ad659d048fe3a19e512b5deaface4ca6e653301a2c01cb357e9186ea7fbbe7987ea8446839ff7dda7190bc8fb4e4fb10c3fd20ec34dabbfa6
+DIST neovim-python-client-0.2.1.tar.gz 41971 BLAKE2B 9ebff937e08963cb8c764c4dcfcef8b6e28e8d0219635f9602ccc77b0bf4412a797de71fbf149bcaafe85bd1122a0d3cec1d8bfa81217c8c2d5a89bc1772c572 SHA512 710be7f5355077fa1eae256c541a06d475902492a19638c5786e25aafb9181f40afcc8df70aca0da15a569a9d6b095ab7bd8008e4f947725cf081954fb7c042e
+EBUILD neovim-python-client-0.1.13.ebuild 877 BLAKE2B 1e30bb66d30a8d733bdc6708c65357f8711cbc9a176fc7c1a0f568ea43962e97311aa18e527bff268d7335de77938d1ddf1c95c8f7b10caa3023bac03b95776f SHA512 c627687a3faf385941d038c4f8424ebd12d59e1cdd9568912151bb51b3d46315dc3a9acf3905a17a6b90ab144dee439354a9a37cfe0f3ab3dfcf1b3c2ff60142
+EBUILD neovim-python-client-0.1.9.ebuild 716 BLAKE2B 9318d75183c0e887c6492d5faa90abb7dc9ff3eb83018c6f25a21099d869a3f104b22c9c808e695319e095a94a7bc1a50d9203deefac29c4dc76091a7a040697 SHA512 e3b179414eb6cc66fdd22225ab748e274b3602efd3bdc89afd577ed34561c34f6a95e895edfbdbf81d81464171081fff6103e2ca935fe65948f832bca9997e21
+EBUILD neovim-python-client-0.2.0.ebuild 718 BLAKE2B 387e6364ab57ecd10b6649441f30814d610b9e49bc95b1d4c727699756b09ff1186e009a9e8f5e7303ba12d75a0a6fffbbb8ec9fe466d67a3ff0c542d24415a1 SHA512 946d41d26aeb586b822e5d36cdce38f7094ab4f2141dbf541a08b50f82d2154423b54773cd4e399dc7876741b5872aadc47f4ee0c7c960e5702e7dd2c60a8ce0
+EBUILD neovim-python-client-0.2.1.ebuild 669 BLAKE2B be2d2739dc178847d527dd32df525a367409f9556d5a4a6f5230e0fa6cc7c864e341c9955c92833948a47e7f122f51442593048ce6c933eb911c1354fa48d3d6 SHA512 7dbfd180271b06cfd18a31847603b5fa1fa9e895e908fe21e879ecd056114ae8c59601ecc338297df241017100d6f42ca901d6e2bb66508cd31d2ebcaf25a67d
 MISC metadata.xml 451 BLAKE2B c2317fb2bf039a77c223c958dd1238ed934621c556c9c8f565bca643a73e79bd036b71bf104146e810300bcfc755328365982d44fc4b4c46676e64d8720ae64c SHA512 cf9f4169ee1ea2adc6f88b17461202cfe120c20a5367ccc0da4099b8792841d13057d8c133c85179b1c5b00ad4bc9954a0e9202b3810a6342f8e052ffa3dc2f1
diff --git a/dev-python/neovim-python-client/neovim-python-client-0.1.13.ebuild b/dev-python/neovim-python-client/neovim-python-client-0.1.13.ebuild
index 0e7fd586cc31..996030447e49 100644
--- a/dev-python/neovim-python-client/neovim-python-client-0.1.13.ebuild
+++ b/dev-python/neovim-python-client/neovim-python-client-0.1.13.ebuild
@@ -16,7 +16,8 @@ KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
 COMMON_DEPEND="
-	>=dev-python/msgpack-0.4.0[${PYTHON_USEDEP}]
+	<dev-python/msgpack-0.5.2:0[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.4.0:0[${PYTHON_USEDEP}]
 	virtual/python-greenlet[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep 'dev-python/trollius[${PYTHON_USEDEP}]' python2_7)"
 
diff --git a/dev-python/neovim-python-client/neovim-python-client-0.1.9.ebuild b/dev-python/neovim-python-client/neovim-python-client-0.1.9.ebuild
index 8ad3f64bc344..2560f7bfa1ac 100644
--- a/dev-python/neovim-python-client/neovim-python-client-0.1.9.ebuild
+++ b/dev-python/neovim-python-client/neovim-python-client-0.1.9.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+PYTHON_COMPAT=( python{2_7,3_{4,5}} )
 inherit distutils-r1
 
 DESCRIPTION="Python client for Neovim"
@@ -15,9 +15,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 DEPEND="
-	>=dev-python/msgpack-0.4.0[${PYTHON_USEDEP}]
+	<dev-python/msgpack-0.5.2:0[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.4.0:0[${PYTHON_USEDEP}]
 	virtual/python-greenlet[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/trollius[${PYTHON_USEDEP}]' python{2_7,3_3})"
+	$(python_gen_cond_dep 'dev-python/trollius[${PYTHON_USEDEP}]' python2_7)"
 
 RDEPEND="
 	${DEPEND}
diff --git a/dev-python/neovim-python-client/neovim-python-client-0.2.0.ebuild b/dev-python/neovim-python-client/neovim-python-client-0.2.0.ebuild
index 9199fbf0576a..036143b5f005 100644
--- a/dev-python/neovim-python-client/neovim-python-client-0.2.0.ebuild
+++ b/dev-python/neovim-python-client/neovim-python-client-0.2.0.ebuild
@@ -15,12 +15,13 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 DEPEND="
-	>=dev-python/msgpack-0.4.0[${PYTHON_USEDEP}]
+	<dev-python/msgpack-0.5.2:0[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.4.0:0[${PYTHON_USEDEP}]
 	virtual/python-greenlet[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/trollius[${PYTHON_USEDEP}]' python{2_7,3_3})"
+	$(python_gen_cond_dep 'dev-python/trollius[${PYTHON_USEDEP}]' python2_7)"
 
 RDEPEND="
 	${DEPEND}
-	app-editors/neovim"
+	>=app-editors/neovim-0.2.1"
 
 S="${WORKDIR}/python-client-${PV}"
diff --git a/dev-python/neovim-python-client/neovim-python-client-0.2.1.ebuild b/dev-python/neovim-python-client/neovim-python-client-0.2.1.ebuild
new file mode 100644
index 000000000000..3814f0211ef1
--- /dev/null
+++ b/dev-python/neovim-python-client/neovim-python-client-0.2.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+inherit distutils-r1
+
+DESCRIPTION="Python client for Neovim"
+HOMEPAGE="https://github.com/neovim/python-client"
+SRC_URI="https://github.com/neovim/python-client/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	>=dev-python/msgpack-0.5.2[${PYTHON_USEDEP}]
+	virtual/python-greenlet[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/trollius[${PYTHON_USEDEP}]' python2_7)"
+
+RDEPEND="
+	${DEPEND}
+	>=app-editors/neovim-0.2.1"
+
+S="${WORKDIR}/python-client-${PV}"
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 9e23ba9ffc72..566143dd86bf 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -18,7 +18,7 @@ DIST numpy-user-1.10.1.pdf 406114 BLAKE2B 88d43e87071eb88223c84720001671677c6f8c
 DIST numpy-user-1.13.0.pdf 580593 BLAKE2B dcf86d0a87ceb7062b8fb339d37bfe3c3fd5e166f3079a079d50f6afb51bde9754d050c97b3e4aec237aaf797d70a2458fe0f26beeeeaf1594330e08c07e181a SHA512 d3891d449b72c2d97af28182e0bcb12559abc114f8dbf0e0c68362c1af50e6aeab565b31b4aa44ab079e8d47f550081a79a4066c37fc52a1c70c05be45eb5c11
 DIST numpy-user-1.8.1.pdf 408305 BLAKE2B 2956e42ebad45b021f72c7e71d357d953ea8a26639b4c6e81dbe1718052304ac5ce1a7f96646d94ad48bf737ddc6962fcbc304e31dfce32b85cb8165b0ada6e0 SHA512 9e646e89e7e67834fa596e43082b43842d1c59287d22fd8d20c9f0a1d3d56a518a08cc2c036de4972ad0d6d9d3c2f56e2210f76e7244d3f7547b5204d84d3c7c
 DIST numpy-user-1.9.1.pdf 418111 BLAKE2B 683ed35ca9e123387a08a88047ad0cfd8bf3698efee7c17c3b57941f57f86297798787f13b142a1bf806f775e70bc116109decb281ab82959c08932c06aa1f3d SHA512 724302468a8e93daf70d379bb1ee7369953e297c40ea260f080b7aca3c9c81e619a81705bdfb2ea214da5b5325ec2b48e953eceeaa1d60c07593b00c35989f45
-EBUILD numpy-1.10.4.ebuild 4070 BLAKE2B 67a91881682dfd8e6b80c5c18b1e53c25bf742907857a755c9f671506601b9d1ba8ce96f62b0582f465cd4f442a34258c25877922e1828e613fd9eb36872a7b9 SHA512 fa27a99853a99fe5568ed5a000c5ef2894792aa6b927b4df20698178603dc187633973a6a72d97d10e04128e5722f5665efbfa8be56aebceed8a438b9049485e
+EBUILD numpy-1.10.4.ebuild 4069 BLAKE2B b696f6b5ac649576e7a43ebdb29c947be31d0370d3a6248ea90db8b729ef8b0fae2d0547a4ff8f4dc0ea47a218b41adedf2aad95c3ab03deb448d59f7d0ddc43 SHA512 c54637ee7acf4a3f400b186df07bfd8e949d5883d789c8978d39b1709a8251b5b0660cb95ebce9c7af217a2abb2bb4181b8c3f3de77a92461380e70236267132
 EBUILD numpy-1.13.3.ebuild 4621 BLAKE2B 2889f3b8969c4dd2e72ce7bb51973a89cd17636f055c17f8adeababdecf132cafe788715a54bc117ca0140d48c04bea46fd2ed8394cfd6fc75c83071cc9ea5cb SHA512 2a14957f44d34569efe69ffbdb2c6ec688080fce67c2423da9e4670648f67b6f7b9f9f01f5639d5a82f0c39e8d13af8f83aba89ca31446c57758faabfde81c02
 EBUILD numpy-1.8.2.ebuild 3958 BLAKE2B c2adc30c2fff21de615af9341824e59e46d0a5b5d5e0d725e2b37ad50cdc98c32e5a9efb00e7c77194a9386ace2389453cd963ab954b87f8ad481f20e645f2e6 SHA512 c2ca2bbae41ae787a7d7c0bfdea213a217a67be2cc0c4f8e399ea9c81f0b777563194d733bd350ff0af6c2218c0f1a4f1792e1d77c1472ffdd9eda37e736277b
 EBUILD numpy-1.9.2.ebuild 3971 BLAKE2B 1f26245296aa824966a93ff8f2881a0a4d6559745d8e39bbcbbf1ba94997193bf9c3b57cfe1d752e7ff1973beed34fab482818445c107e9bfb645ac09d95b0e9 SHA512 b8228e945ed92b73041a676c412e66566333274612dec1f33ecbeb9b5a7ccba377c906fe429fdb760ceafc25fec6ff6a9b1c93655576af04c5ce3b8baa4010f0
diff --git a/dev-python/numpy/numpy-1.10.4.ebuild b/dev-python/numpy/numpy-1.10.4.ebuild
index a9b753959a5e..51072638494b 100644
--- a/dev-python/numpy/numpy-1.10.4.ebuild
+++ b/dev-python/numpy/numpy-1.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=5
@@ -24,7 +24,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 # It appears the docs haven't been upgraded, still @ 1.8.1
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc lapack test"
 
 RDEPEND="
diff --git a/dev-python/parso/Manifest b/dev-python/parso/Manifest
index c40fc79dcd62..4dca6c274dc7 100644
--- a/dev-python/parso/Manifest
+++ b/dev-python/parso/Manifest
@@ -1,3 +1,3 @@
 DIST parso-0.1.1.tar.gz 376876 BLAKE2B ad0b9492273d23da1f4133a2f1e6edd2fa7f2213dbe12868f891863e9286fa0281de7fc6c6924b78a5820f94867971bbc09f18b3d0f2e4832c9c875850205254 SHA512 1199651136af1c9f0801a031a197e367f7fa73b5878b863103a506481e8b325e6b305e4260510a567dccf91f298fd7e9e5674f4dc410765ae1f9112f742aa6a0
-EBUILD parso-0.1.1.ebuild 871 BLAKE2B b55ed106e5bc74b0fe06b8c3e642abba305d5fa39e34aa50f6ae9564dbd68c7ac2ecfa0364f41739c94e06571c1ed8778fe6be937e9c92f784388e3c46bd740a SHA512 ac4aa43c7bd671aa48c74f139078f1ab9d5f8de49f0b1bc8424aa8b22547195f573f2b39bf03a993f44eeef2aedf86b66e4bb6db57e228515e4efb3735565fbb
+EBUILD parso-0.1.1.ebuild 877 BLAKE2B 30f7d9436ab8174101194d971da04fbc9e9d23eb5551e610d03f184fb3d384452f9407598f6a7e01b62971f46d6ec30f96797f1f7c7ac6303e15f670ee776226 SHA512 163b86af3c132714bbfc65123e82bb22ef3ac941281e4f540c4d930313ff3a112f2edba4242594110235c3d23d1370049896dc2b96fce87029cd96277d106155
 MISC metadata.xml 377 BLAKE2B 0ac7d9c46c0b591fe46ff373bcb8942261cf0b819d9397500928546c4b07541c958edb116ecf1ff79f0a83c2f02784b019e7d64bd8a82bdfb397ef70fbbaa0c3 SHA512 7d719c633f81372caafbfb0a913fa455fd1d150210ea09713a0888b38d18ccae646b17bbe32a66b931016ee6e4bc826a1670a033466c945a2591e77f9d6d7b7c
diff --git a/dev-python/parso/parso-0.1.1.ebuild b/dev-python/parso/parso-0.1.1.ebuild
index 99e6a66edd99..db4201381c7f 100644
--- a/dev-python/parso/parso-0.1.1.ebuild
+++ b/dev-python/parso/parso-0.1.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/davidhalter/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ppc64 ~x86"
 IUSE="doc test"
 
 DEPEND="
diff --git a/dev-python/pathlib/Manifest b/dev-python/pathlib/Manifest
index a8066f72699a..683fcf039b67 100644
--- a/dev-python/pathlib/Manifest
+++ b/dev-python/pathlib/Manifest
@@ -1,3 +1,3 @@
 DIST pathlib-1.0.1.tar.gz 49298 BLAKE2B 918b363ebd4101fce50927dd83200cf94b44d820e9f422489be8b06cb5dfe732aa9373b936606a07efbfe0c624b685d1c9efe8851ba74aa60df9f45c08cd33be SHA512 d85e45dfcc85ce75a7e7b609163dc8c75c688f279c1833510185f280af5501e473376dc09bddc6a804d1fcc3177a939db85af37b7b8d5b183b9bc2b85b3b0f8b
-EBUILD pathlib-1.0.1-r1.ebuild 496 BLAKE2B 9ed6155c6c52b31b7e5ab435eab94b779f3ea1e436f4a057d8e58876d14f5001b3e4ed6cfa75310f8e2bbf110cd6f0e7eaa44a435ff33778b5b54b13cf7261cc SHA512 6f92fa81043f13f327ea6886981862164c9ca82aa5ccbc36c022a54f1aebaa9b1798b2bc92343f21a320d71173f7431fad7822a4e3501913db46e246a3f7aa7c
+EBUILD pathlib-1.0.1-r1.ebuild 502 BLAKE2B 8ad6c8b81cde6fa2bb8579168ab68dbea5f80042c342e5ad67349990206210aeca27654419958f3dee1d22281843198443494e61b11d776a3fca53a8239d0552 SHA512 d443a5415143ec9986774f9ec866f1941ead576f18bc323fcf1af4eb0bbeeabc57ba53bfa401b5f89e6f0708913b3f1310b3bed5fec53786abcdec2293f9a325
 MISC metadata.xml 310 BLAKE2B dfac529133f0a3fe4c0fc865d7f7cc9d70a7b37dd2d8fcd4f1c87a44ec6f9ade254454e01cfd4dbd57a04f9643f079bdbc358d84cfcb0c09cb416d3ecad2db99 SHA512 462b029410c6c013f274599ee749a79541f9a40a1819b168963421d0b8bfbeedae5590a460c7295f0e9a249fa9298e7526b0cace165a29f82383d8943bd9842f
diff --git a/dev-python/pathlib/pathlib-1.0.1-r1.ebuild b/dev-python/pathlib/pathlib-1.0.1-r1.ebuild
index 21f2f1021ef5..d6d9ca198dd9 100644
--- a/dev-python/pathlib/pathlib-1.0.1-r1.ebuild
+++ b/dev-python/pathlib/pathlib-1.0.1-r1.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=5
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/p/pathlib/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm64 ia64 x86"
+KEYWORDS="amd64 arm64 ia64 ppc64 x86"
 IUSE=""
 
 python_test() {
diff --git a/dev-python/pathlib2/Manifest b/dev-python/pathlib2/Manifest
index 897bba0e7efe..8e15a293df60 100644
--- a/dev-python/pathlib2/Manifest
+++ b/dev-python/pathlib2/Manifest
@@ -1,5 +1,5 @@
 DIST pathlib2-2.1.0.tar.gz 30390 BLAKE2B e009fa866dcdb2a6f078d746c423484bd90df049d59c89427c631cd63ac11376bb5549f45f0e98da036b15c6674040ffc8844fc08b95abb1d677783dedf9e126 SHA512 5dad54d4bf7a37a2c425afeca030a23d802a8a450186292f3d80aa9ee5c2985701871a0386a2f58e2b05b4bbfd7734a238d0a73625c5839237e4f3984088a8b1
 DIST pathlib2-2.3.0.tar.gz 34291 BLAKE2B ef1768f8a9cc9b28f85ef84c0dfdbfce0b0087c1ffb6718e2b13eb007ea3e0ab0eebe946a1bcc2683fed7db46867f415ad2b52abedcdc87fb67bd45d5998aea5 SHA512 715fbd981d42767862dcaf2cc0fee31b9ec5050915ef7d909d14587609a7a5939e32b39736b586a890e7625443bb163832896fcf138b5c2863c451b71c36a124
 EBUILD pathlib2-2.1.0.ebuild 581 BLAKE2B 62d3e1f8e2705db80933876650fa594a8986cf3b74c78039925ca9dc024ddd979491ae254a7b09c1ed83cce2464fbfeccc16106724254373efffc28987aa7f4a SHA512 e14f2bb06e96e63d9812e31da3a27ce9b9d56f1405515c29df695167e48e7f4122f778688f66a20b8ef15630b5dd4fa7affea9b9946362b7124ded7ff0ae2ce3
-EBUILD pathlib2-2.3.0.ebuild 675 BLAKE2B 29916d5d48a2dc959f67c40b3052b7858cb924efaaee592eabf2f7f4ef957e5baac1f1599dc44bdd918ba369565a2917a3ea6b32b48f5e38af20b627b7c38c82 SHA512 6b90c2b554f82246f6bde18cedfc6bda2204848bb565d4af5c76fe8f81ed3079ee7abeddbe03dd699da7a6efc2d6b75502c84782be1df09c107cf38ebf70bc2f
+EBUILD pathlib2-2.3.0.ebuild 1052 BLAKE2B 895eafa533a0e41c38a82cfcea046ecdb5c1d539262231a9db4d41fc914190a877c429c279176a96bd50de5b4c125cfbfd400d0463d4a1b70c92f81f85cf419e SHA512 b215543d5c7c97a413cba74ae2014769be02eb4cc0e84304766d2881ebff4453d58052fbc9f8b304a6872baae0823446ac5a1a5d1392f37a4090c20751d06798
 MISC metadata.xml 371 BLAKE2B e2a18977882b53d7e6588147a17a9fe2c2a1b0850946b15036941b908ece241cace91e66373d5edaa4ac2ba46935413b223ea78cb6ca01b758673ef719b76966 SHA512 dce5315fa4bc25047346fbf06a9f2da5828475bf0b36a1dcdd6ea9917f29ed4bbefc22aba699a43d7b3c5f771939bd81b3da20df54537b22aa4811a19ab62a6e
diff --git a/dev-python/pathlib2/pathlib2-2.3.0.ebuild b/dev-python/pathlib2/pathlib2-2.3.0.ebuild
index c23057673735..1308182a31f9 100644
--- a/dev-python/pathlib2/pathlib2-2.3.0.ebuild
+++ b/dev-python/pathlib2/pathlib2-2.3.0.ebuild
@@ -13,15 +13,26 @@ SRC_URI="mirror://pypi/p/pathlib2/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
+KEYWORDS="~amd64 ~arm64 ppc64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
-	$(python_gen_cond_dep 'dev-python/scandir[${PYTHON_USEDEP}]' 'python2*' python3_4 pypy )
+	$(python_gen_cond_dep 'dev-python/scandir[${PYTHON_USEDEP}]' -2 python3_4 )
 	dev-python/six[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' -2) )"
+
+python_prepare_all() {
+	# stop using private Python API
+	# https://github.com/mcmtroffaes/pathlib2/issues/39
+	sed -i -e 's/support\.android_not_root/False/' test*.py || die
+
+	distutils-r1_python_prepare_all
+}
 
 python_test() {
-	"${EPYTHON}" test_pathlib2.py || die
+	"${EPYTHON}" test_pathlib2.py -v || die
+	"${EPYTHON}" test_pathlib2_with_py2_unicode_literals.py -v || die
 }
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index d39e0228df96..44eccfab49ef 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -1,5 +1,3 @@
-DIST phonenumbers-7.7.5.tar.gz 4639483 BLAKE2B 5189baa73853185252036499f3fdb24c5e2b49118db949ead426d6ca33dcfc0e11fcbc686a2a5d39926695def22966695a6b4a8ef5ad8808f2410c8c9147f934 SHA512 af7d573cc2a230a9f2fb06cdc4db0d9f424110fb37382eab2f4f0e91801d910f923f87518c5fc99b400a1e99bf61c516d111ae3dbc71a6bb9c4841a067e6012a
 DIST phonenumbers-8.3.1.tar.gz 4718199 BLAKE2B 83e8d12f525d2dcf09f3a5c4e08d6ccac9444d47c952c79454834850c7b2c9b0272fd23e83056a2570abbf9b2edf3080021de7cbf3351c6975f0a8d03a9eabb2 SHA512 535a9ef057183c90838bb3a28982bcbb3d95fb2c85ebfb4dff9371f0f41d17e71b9ec2d833809f668a5c53ca9eacaa4f791c829c38ec42ec0ca301332213dd34
-EBUILD phonenumbers-7.7.5.ebuild 710 BLAKE2B f7b97e95a1698fc912d5c37e7a482ceca1672db2d05336d931200108fdd6fb426c70a8cc291c39e113b51ecd43fed936248902831c259755dc568e9024e4846b SHA512 fb6925cf90effe4b483ade58d03b420321433bedc0bcc9eca0c532c3bbab4243151077c9e08609b9613d6e32b9a68a1afa2b92ea7f42f7ac95dc0ec350a7be8f
 EBUILD phonenumbers-8.3.1.ebuild 710 BLAKE2B f7b97e95a1698fc912d5c37e7a482ceca1672db2d05336d931200108fdd6fb426c70a8cc291c39e113b51ecd43fed936248902831c259755dc568e9024e4846b SHA512 fb6925cf90effe4b483ade58d03b420321433bedc0bcc9eca0c532c3bbab4243151077c9e08609b9613d6e32b9a68a1afa2b92ea7f42f7ac95dc0ec350a7be8f
 MISC metadata.xml 362 BLAKE2B 22f1ad321e9baba50e3d09bd5a8779d2abcb413c17a97dcd4956385d7166cbc1095667aac413092db3950b33230b61252a042fc62fc92e943ee40d16746679f4 SHA512 d15221d6a54b68f3cd03ad8016f26b970f630d0d78e9834ba8b78b6a691fd90eea1ea1ec2efdb21b09d336ab6f5708c3cc8b24470ede75bdc629eff8f40b7c35
diff --git a/dev-python/phonenumbers/phonenumbers-7.7.5.ebuild b/dev-python/phonenumbers/phonenumbers-7.7.5.ebuild
deleted file mode 100644
index 77ebf1a36080..000000000000
--- a/dev-python/phonenumbers/phonenumbers-7.7.5.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python port of Google's libphonenumber"
-HOMEPAGE="https://github.com/daviddrysdale/python-phonenumbers"
-SRC_URI="https://github.com/daviddrysdale/python-${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-S="${WORKDIR}/python-${PN}-${PV}"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	# the locale test compiles and runs a .java file
-	sed -i -r 's/^(alldata:.*)locale/\1/g' tools/python/makefile || die
-	emake -C tools/python test
-}
diff --git a/dev-python/pickleshare/Manifest b/dev-python/pickleshare/Manifest
index 74ecfa946429..c5ddcb57e0b5 100644
--- a/dev-python/pickleshare/Manifest
+++ b/dev-python/pickleshare/Manifest
@@ -1,5 +1,5 @@
 DIST pickleshare-0.7.3.tar.gz 5930 BLAKE2B 7cc8ea436af6c7be2ec891882fb42ff67aa71f82ec7beae48a9e37cd1bfeee24742d1a83dfcecf8f27bdf6c4d86653f9374b869960699565789ac4f435f62255 SHA512 c49f41b2778783c0de69838db0c916bbfe88eb651134959bf43a18233a4f1747599e51bdbe4b0cc7f7b13c92fc202c2159a0cdd2331b099034afbfe0df61c19d
 DIST pickleshare-0.7.4.tar.gz 5981 BLAKE2B 12679a29db75c772ba78d9c83061176bdab4ac93fb7b122ee803650e0b0d0fb951ad43f75b73ba303b6c637184ef7cc304935abbb2aebdf6928b5d47d83ee1ab SHA512 6cd4b70f63378c4f668f3428262aeca66a38ec86ef9069e3fbc5e7b0b8d7a06341e99b387f9cf29502decbb47c188b7b2183fe7d249e68914fead7e6628d7154
 EBUILD pickleshare-0.7.3.ebuild 682 BLAKE2B 1fbaed914848645e062f3cc218f46e462c8a425b3aa4fc49b56d11e3e84008cf62f044c2e5df301d1ac19e3d4332824f2f8f72a1b6479279002f9bfb99908432 SHA512 5741e7c3a0d1f08b904310c601ea3e3807f7c26028c937d18dcec698ceda1eedc8d7ee8a77b1856b4433e55cc64a9d077a3f55a4f03925225eda4aaed47a82b8
-EBUILD pickleshare-0.7.4-r1.ebuild 677 BLAKE2B a7236246b7c8d7a0eeaa67a8f10b37662e0ab0fbd98ef0205fbe9a46f1014cd1fa2d92e7411d35136214cf44e6d78817515463f87cd3630a28b9edf4cbfe5399 SHA512 f0d7fd9a8b1283cd63fbf441ae07862c89591b54625f119f6b9dc3b5555a32d61d825698e2a7e1844430c205f9ea4ee78f0ecf8ea8ba64adcd578ed500f4c7b0
+EBUILD pickleshare-0.7.4-r1.ebuild 683 BLAKE2B 00dffdab4305c06fd3adb32765fbd8f42e4efd463bb20c872ff2d3778ed92109e72eddcda5c20bb97a7d8470f4eae74c4ec24d4dc10723b6d72e048d8cc8ebe7 SHA512 95ecbae7c4dc70dedf4ddd9b1b610acf7b10ce35bc678b74adf488e51d699723b6f4e932f8977a77914588a9dd7435d99fcb774d20bd43512b556badf874ae0a
 MISC metadata.xml 862 BLAKE2B a7c04e6cdf8a9c5a074a790da324591984286ebf33fd13950d8dc7b070f750069f88d5f0d9235b5ec824c1dbac834a2e09e29b74bbb8eb23ad4c1d99c9d8986f SHA512 0f9d4a8f540699c18af10123696a2ff91002a9af8ad675769fbbe12fb3fdf160077a1932dcc5ddee5427051a6467054220cab958fc32d4c352a46bf9f4d8aa5a
diff --git a/dev-python/pickleshare/pickleshare-0.7.4-r1.ebuild b/dev-python/pickleshare/pickleshare-0.7.4-r1.ebuild
index 20d4ad5812d1..d68fb86d0f40 100644
--- a/dev-python/pickleshare/pickleshare-0.7.4-r1.ebuild
+++ b/dev-python/pickleshare/pickleshare-0.7.4-r1.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="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ppc64 ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/ply/Manifest b/dev-python/ply/Manifest
index 0091b4dd95dd..293748579b8b 100644
--- a/dev-python/ply/Manifest
+++ b/dev-python/ply/Manifest
@@ -5,7 +5,7 @@ DIST ply-3.11.tar.gz 159130 BLAKE2B 58c50b9dad445ad83a64aaa8174ed4602b36f5c8df33
 DIST ply-3.6.tar.gz 281690 BLAKE2B 1a8e9e925c1a70832e3312208470a3bc4831b7ba18a0c2eb3a8b31fc9a850ae192809b9dec098f8479f2060e63ae781063b362227db2c6080aad85a2fb8648a2 SHA512 1a408d7cd4cdc9d747154623672e6baaf37ad2190cb9d6d6a7c1e1cc3cb40f15547734441b8fc99ecd67d7804d767576bdf0ed219cc669bf3d0df37498c55c55
 DIST ply-3.9.tar.gz 150750 BLAKE2B cb32c3837f2b4bd33ef2074dcb3f1421a54e820faf0e65def16f4c354643dc3e467f7c482dfc5b7f62cfb367945632e346b6e02e16cc79a91bb6f9241e315eb1 SHA512 c3beca6f70e9fdfd11f9fc7beb18efb03f0b32be3cdc949e96c4df3d060e7e9da3ee42d1f58f7a9225d333cb7864a4253fd3a9b75c496364276fe9969ebd7641
 EBUILD ply-3.10.ebuild 1146 BLAKE2B 2d0031acbf795ac6097383adc56fe9d8b1adf1dc0b3c99bc6857b89a6f4df57455e7549e78b0583b09ddda4f0972b219d32ce86587f6b0ff9802a0ae658746f6 SHA512 314bfdfada6c58cac96fc85ee7ba61da14c7894de133f0e548e0f5054e4d8dc493f417e141d16de7e50113890ed12328f6d9c1f8109de09ea8e218d2c548038d
-EBUILD ply-3.11.ebuild 1134 BLAKE2B 95c2355301c31147f7b60ec5be0165cb5a4586caedb48dc0826b48f7b04ed99ac9cce4c0b19a8523cf1f48cd4c443ec1ca0a7bbefe016c8397e7bd932651389e SHA512 5b56e88c8953f10451a108f47ba6faa6f6ade0b904ebba5dc1b517eb60c6dd8c8c96196736fac16674f5352b3091323ed3676a0d2faa32c9a0c2f6a65bdc13bd
+EBUILD ply-3.11.ebuild 1146 BLAKE2B fee621d2e4cbb7aceb737ffb0b1aa568347756df2763dfd21632e5d08a0d366af020e992d58440634b9b329347c07faa73af68ec6202e10627a15436bddcb35e SHA512 0adb9f61dd5bd43b67daac42d438803081dd29d5fed421cb3d692d5e006b52c3b04c868711b2c9dffe8b917fa5669b91a630d7eed2c0b67c7ad5c23f55666605
 EBUILD ply-3.6-r1.ebuild 1147 BLAKE2B dfc6c35dc93693e302258c4cbbf6815a240a243229eecb00c5db624647f18500a491379efc7ae567f138479fa6cb8e367f3882771559be5b884aeec1961fc4fd SHA512 220360babcae76e19b959dde0cddae94f8ae740a7e0f23a41f8446dd27be49d856ec356a277f703b0106e96d80351fa5d5ef0827169af8eb53f39ebb7df5a06e
 EBUILD ply-3.9.ebuild 1113 BLAKE2B 541cef36cc07781d36e43e7d6fa7df9f27a7e32792e281d12d1ea6a4fd055b7dd7b4068ce362076019d859cc9e53f1a1545d39ef6765deb151f6313dab7727bf SHA512 4e9fff602a88c02cc45b1974281b7f73bd0f884a2c39059ad39de70d250ead8631af4c19a1273fe793f61f0617f838fb300a3f6ba13661455fd9f97b1d2d55bf
 MISC metadata.xml 1418 BLAKE2B df2c9fa5b1d9a0b7779fd72b390d4509f83e1ca4c49f3d64dd2c0b440d2f583c0b936535eb2c15bf323e649cacb4f1bd72bea797bd51afaf611fd8fa6490ae78 SHA512 92a5a470227858726239f537b3d8559e29d589a8aca0f1d43b8a1ee3ec00470117efb45275b5bfc0ab6d0678863db50aadd36aec326978e7a3e858c0b0be41dc
diff --git a/dev-python/ply/ply-3.11.ebuild b/dev-python/ply/ply-3.11.ebuild
index b5863d7b8c32..072c14822c06 100644
--- a/dev-python/ply/ply-3.11.ebuild
+++ b/dev-python/ply/ply-3.11.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="examples"
 
 RDEPEND=""
diff --git a/dev-python/portend/Manifest b/dev-python/portend/Manifest
index 9e6adcce1898..3fe35480630f 100644
--- a/dev-python/portend/Manifest
+++ b/dev-python/portend/Manifest
@@ -1,3 +1,3 @@
 DIST portend-2.2.tar.gz 7974 BLAKE2B 77ffcf02b65f276a5ca1f1bdd76afd54e8f6afcb1c55b6948862017f973772dfe65c9b934ffbc98d2f36f799131d23d4a7128f46e46183010def8936f2dd0bad SHA512 1782132b0dec5b678892190b70ab795b1748dfa17e257b6655fc803f0cf19652725778cd329c3609353f969959501dd11fd2b9726cfcdf2c58689e2ce280c146
-EBUILD portend-2.2.ebuild 719 BLAKE2B 868fe2b8b3b2d8b8a9bc34692c7adf3c30b9b282b496a11646b2e72d16a74a63126846fd1d201e00d85bc7a960cf658caef614a8903eb5216a5eaa4d285c1e3f SHA512 36f519767a24d7971b0ea5845a733487cbd7bc7f5b524e8d1b490fa9633ded90ccbb6fb3eaa798ce44bebda0d0e9c0b936edbde711094e0efadfbc9a0d3bdfdc
+EBUILD portend-2.2.ebuild 724 BLAKE2B 20b1c4b7e0e247804abbf9ab83ec6fd41cc3f123aee7be3f054d8934b8bbe80a2a126d53e018142416ac289f629812d31a41723189ada061faa5b3999682a602 SHA512 ade5438f7e1d090a17824dbefc60ee54ab3f405fe067ce9866872a38c9959ddd9af5385dbf4c519dc281a860ed5f6ca4c1bcc2c999494149ffd0695bf951a282
 MISC metadata.xml 368 BLAKE2B 3f51a162e0c69485b7fb54960635b24ccb4741cf053ad4ac314f7f45798cc56056a7416e2207b6eb1084dffeb9bed043053eaa2ae5ac3b8d0dec142a47d1fe36 SHA512 269ed8048e3bcf73a693874ab0a6a269fa24169a1a95d9cb5bebad5e87193c443be8883682df973b4a461447ebd6042cdc7a932f81019b0ea53b3da7c566bf82
diff --git a/dev-python/portend/portend-2.2.ebuild b/dev-python/portend/portend-2.2.ebuild
index 136a42637fa3..330589589cb4 100644
--- a/dev-python/portend/portend-2.2.ebuild
+++ b/dev-python/portend/portend-2.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86"
 IUSE="test"
 
 RDEPEND=">=dev-python/tempora-1.8[${PYTHON_USEDEP}]"
diff --git a/dev-python/promises/Manifest b/dev-python/promises/Manifest
new file mode 100644
index 000000000000..17dc4ef76487
--- /dev/null
+++ b/dev-python/promises/Manifest
@@ -0,0 +1,5 @@
+DIST promise-2.0.1.tar.gz 26274 BLAKE2B 528d938ab93790dc57545eb0064a014ea293d782ff6a7e6eeb2287f23c79c9cf9b2427ad57df524a888193c5aa9d62b21bd1e533d49ca4c8f2615d5719be58f9 SHA512 2bd9ad83a3b21dd4e3ae3052dfe6705790fb6ec925e9607960d43d9329fea606c82f6806599f09e6255ff5639c936369f88601668cf4ec8944747b1b6676693c
+DIST promise-2.1.tar.gz 17974 BLAKE2B 5e1fc9bbed3af51812c43b1c13006037ada44404564a3064cb2e39657f6bb5dc0fec6d052ae9038439c60339fd4f4b5fa97330571398bf84243805b25ead94e8 SHA512 d4d5628c9b75f81fdb5d654a76e788df5296472cd73bcb8fd9a27979b8aadeb1d40a4d52cfed173341a5a97920132b00cee44d915ef640167127a249b5c0cac0
+EBUILD promises-2.0.1.ebuild 956 BLAKE2B ca4a080716a121ffe70ce894096b04d89aba3d9d993c604ad63a95d4102425ee6e4ea5b74751ee7d73c3ea61cc36a87c707130e23dae2d5faae30432d9374aa2 SHA512 ee02f8a55d07809aecb14a8e1b9e319d908f55a467c60ec8014d4fc92b33a7ccc05679acd7e06275b9d1a645cc1aa0281681a15e1c083fea7110d2f006c1d51d
+EBUILD promises-2.1.ebuild 943 BLAKE2B 78c4c9aa28212ca1299e6afb027dc16ccfd6604916fa868fcc3eb3c01ccae388bec9b912da11f1cc393ebc59dc7be18fdb070597788980b72082cc81fbff3a1f SHA512 9ba8f56cffa7d15f87b63823ce7fd398306bacde99f20ac7ab546943d2d78e55841592683dd9d0562894029106d604b1d442608555f2fe3c21a99ba8d96002ed
+MISC metadata.xml 393 BLAKE2B 68978c2f902a87b58c0a51587bf1ef734d6133e17ee3ce0b4239bb0ff26a1ee4a04ea18259ed2cf4efed561acbb8ce5a57ca4b35e60d85e93a5e4a5928a1c3e8 SHA512 e080ac2038f5e274a4cb2e395d1811755f1441091859a7c9c231f126ade1daea3725ced4253a32164ef5483e92756f9b1ddef05f2b866e9ccc6298ca27b2c019
diff --git a/dev-python/promises/metadata.xml b/dev-python/promises/metadata.xml
new file mode 100644
index 000000000000..5fbc074d7492
--- /dev/null
+++ b/dev-python/promises/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>blueness@gentoo.org</email>
+    <name>Anthony G. Basile</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">syrusakbary/promise</remote-id>
+    <remote-id type="pypi">promise</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/promises/promises-2.0.1.ebuild b/dev-python/promises/promises-2.0.1.ebuild
new file mode 100644
index 000000000000..9e7b96f9b846
--- /dev/null
+++ b/dev-python/promises/promises-2.0.1.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_{5,6} )
+
+inherit distutils-r1
+
+MY_P=${PN%s}-${PV}
+
+DESCRIPTION="An implementation of Promises in Python"
+HOMEPAGE="https://github.com/syrusakbary/promise"
+SRC_URI="https://github.com/syrusakbary/${PN%s}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-python/typing[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+
+RESTRICT=test
+# TODO: When we get all the dependencies in, we can add test
+#	test? (
+#		>=dev-python/pytest-2.7.3[${PYTHON_USEDEP}]
+#		dev-python/pytest-cov[${PYTHON_USEDEP}]
+#		dev-python/coveralls[${PYTHON_USEDEP}]
+#		dev-python/futures[${PYTHON_USEDEP}]
+#		dev-python/pytest-benchmark[${PYTHON_USEDEP}]
+#		dev-python/mock[${PYTHON_USEDEP}]
+#	)
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/promises/promises-2.1.ebuild b/dev-python/promises/promises-2.1.ebuild
new file mode 100644
index 000000000000..5a444b8ed99a
--- /dev/null
+++ b/dev-python/promises/promises-2.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
+
+inherit distutils-r1
+
+MY_PN=${PN%s}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="An implementation of Promises in Python"
+HOMEPAGE="https://github.com/syrusakbary/promise"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-python/typing[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+
+RESTRICT=test
+# TODO: When we get all the dependencies in, we can add test
+#	test? (
+#		>=dev-python/pytest-2.7.3[${PYTHON_USEDEP}]
+#		dev-python/pytest-cov[${PYTHON_USEDEP}]
+#		dev-python/coveralls[${PYTHON_USEDEP}]
+#		dev-python/futures[${PYTHON_USEDEP}]
+#		dev-python/pytest-benchmark[${PYTHON_USEDEP}]
+#		dev-python/mock[${PYTHON_USEDEP}]
+#	)
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/prompt_toolkit/Manifest b/dev-python/prompt_toolkit/Manifest
index 1ea4e36b5b5f..6bb8bfcd2c24 100644
--- a/dev-python/prompt_toolkit/Manifest
+++ b/dev-python/prompt_toolkit/Manifest
@@ -1,3 +1,3 @@
 DIST prompt_toolkit-1.0.15.tar.gz 243734 BLAKE2B b27e61bb444360abe95714e2014fcacf2355da0540b21af35cc40cb0f0115d0a3b027236235a89a95c1ec1fa947bf5b88b236b737fab5de78e7bd5fc798aa764 SHA512 10981be2ed8b71d0cd9f663c4de047cec9664d9276968c6eec40dc45b388d1acf8eba07d534369254f178931079bf39b04eb2ceac06aa63a2021ebf62387b2f5
-EBUILD prompt_toolkit-1.0.15.ebuild 742 BLAKE2B 56882169bfe07782cd617425dd5db062440c8e2f87426d47969445848b9df93716c9f24caa6e0ce8230e91cb2eb2f6bc5006ba0ce3af0d478a0c39b9941a008c SHA512 46c14c24182d3c99daf7b9ad38584fbca7a9ef38ae3cdeea87444d3187b49347f3972c11848ffa27156f6c79dc5f941a1859f142d4a8061d735005088d9fd1b9
+EBUILD prompt_toolkit-1.0.15.ebuild 748 BLAKE2B 220894c7a9cb4b1f4e58dd407826256ad6b08bbb466ddb6a6dcce6f9f048ac4a0d8e6706dd56e8075a8a3435e1285b21a4f9ccb992a6cc9f0cd1512ac4e85af4 SHA512 24eedc749a6cb84daa88d2903e9dc9b4b08f07d694b5ed0ddb14a5982a88608f29e9d77018c87ba77b745a5e4e08ea9dd05b3c27d61f679d2785a5b1fc8bf6a4
 MISC metadata.xml 407 BLAKE2B a53543e0383cf16a19405b6722f7c5b430c69b0ac1a0863681ca700c56dba8e630f04e27fe682ecfaa905d6fb8ac4b4fbc78cbdc3e2575647071c2662ad5fe5a SHA512 7322ba928408db64bb54edf92fd385bd2fc41dea2a857bd2034d3b3e3bfe23b7fc82fd8048a41bb65f0aa103153e9f99f64c5f6abc76cc01a3d2db139b0a98ff
diff --git a/dev-python/prompt_toolkit/prompt_toolkit-1.0.15.ebuild b/dev-python/prompt_toolkit/prompt_toolkit-1.0.15.ebuild
index bc789a6bfbbc..f7c782f75314 100644
--- a/dev-python/prompt_toolkit/prompt_toolkit-1.0.15.ebuild
+++ b/dev-python/prompt_toolkit/prompt_toolkit-1.0.15.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"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/protobuf-python/Manifest b/dev-python/protobuf-python/Manifest
index 840cb1899f60..ffb5ec0a1e32 100644
--- a/dev-python/protobuf-python/Manifest
+++ b/dev-python/protobuf-python/Manifest
@@ -2,7 +2,9 @@ AUX protobuf-python-3.0.0_beta3-link-against-installed-lib.patch 1327 BLAKE2B 09
 DIST protobuf-3.1.0.tar.gz 4051503 BLAKE2B af93f125a6b7b3e0be6f50ff5eaabe0db21f62b01a694d37c0b069956ef5d658df1beef68514b00a22005a36293b4a8a18654b5656f8c614309f0a744039c2fb SHA512 8d3289a16944c255bd1cceab696e515e52467f2bfe1cc10f6b32fabdf082d5acdc248ec9cadc572223a24d04d431f75921076153109cea2f90ee533f502ab47a
 DIST protobuf-3.4.1.tar.gz 4490100 BLAKE2B e2bc1ef2ee1a0af44830b3c65a6c9e73883fe6ec0d07f6a6136f5564f0e85306005440ca6f8c4eb834c7c70f909792c9e2457a761f10f95431981263a9acd7a3 SHA512 471e52198fa878a79183dc8fbc39d9c65239be4d9dff799e12281ee9b1af61a427584534b1baae1773bc6e4c86467f89ca2e7911a21effd86bc5f40cc7d94c34
 DIST protobuf-3.5.1.1.tar.gz 4584489 BLAKE2B 995ee2f06a6358e9935b488269ee50f0dccede417c1757828b0108fbe8c67034301f3a9cb87517430acd9838ae71bb677f4edd8b59b2418f99c15d8ea3d33591 SHA512 f25ecf772facc8efd196b7c06012ce9ec24152b2c0cde38ed2e29ecded8f534221b008e649f4cbd991436ad3436130cd2e31d51e75019d08240d518111fb4496
+DIST protobuf-3.5.2.tar.gz 4584659 BLAKE2B f582212169d802a5844574eb900c9f8cbb343b7e73f2074e5ff0bfc544ebd13f4bc2b78271fb70f4465d78fdc39972ed68339f453c0d3ffe98d8564fbf520544 SHA512 09d10cf0c07a0ba249428bbf20f5dbed840965fa06b3c09682f286a4dee9d84bb96f3b5b50e993d48ef1f20440531255ce7d0e60a648bf3fe536a5f2b0b74181
 EBUILD protobuf-python-3.1.0.ebuild 1299 BLAKE2B bd2effe2b42ca7613e7b205ba330a5bcd4aa2834486884d481d5c85e81d1d6d119090a5f215a97d5539a4277b8eb6513128a76533de30104c3592d0f3e8c9543 SHA512 762debb1a599e1fd75f61d17cac6afcd3813b56c543cca50c4a6c63b44c962f9aca3cda7a02b94de2bc21a130245eda91a346d2631c508aba15575347e33bfe8
 EBUILD protobuf-python-3.4.1.ebuild 1250 BLAKE2B b531ad3c2ace5bf9a2ca33b04d7b0f977b78fa47a3f0486183e938a85cf2583c06698160996946c80e093d3f7b9abac4cb66ffed9167875a37d0268b7ad72d07 SHA512 a82b7e00afb6408dfeaf3c70fe5df077792daadca9e0de3b30689fd5ef49405e81f615fa2e586f14548715e189bc9db1a013b69bc17b599a0119801f74857d14
-EBUILD protobuf-python-3.5.1.1.ebuild 1247 BLAKE2B 8c956b27e174e3df513c2df6c059236078dd3f303e5c5d9ef7d9cf4ef9320c25f36856eb07805fac6a658764b42f7159909edd9bd994d2dde5b00b5b3254ed06 SHA512 0120e7db713042775b34b18fdad46e1a0e4ec3132ebbc8bf7441550f222a57f282fe5668c0461709c79316e172f346791e8be98339c9620b858cb420c07dfb8d
+EBUILD protobuf-python-3.5.1.1.ebuild 1246 BLAKE2B 265b9ca2e93718358f0582057c6f8ff418e8727256e78ea75a233f246f5a8b05f3d2a892f76793ee791d0fa0bd364fee15879acea79693eaf3bf639d6d49e615 SHA512 dfc737a11bd29912adf3eed671aff853fcac6375e5f52de86f118bde06af6b18fa8d167f0840d4a87850a588eb99f3d7f41d2c6e511342c0532e1a88b2e0ecee
+EBUILD protobuf-python-3.5.2.ebuild 1197 BLAKE2B 7a72898429e1047b085f667d27f0606da06e9cce4b73c90a23c1ecc4fb066cdd046eb36cb6a9145d7edf75ebe56a145ff8293c1a47869f910756e7ed31e85e2d SHA512 20710421607f45a9c4fcf3088aab18d55764af2ec7d4bbef181faee1661a77b0d368c086e726130a21e197501907a7cd8539e9d237c44d9a04261b34ac047451
 MISC metadata.xml 724 BLAKE2B b7a8c45edd03f5b00c7533f4182bb6af85ad3834256e7ad41863dff09f51647eb198964c423a548dd285f063b70099dd10c7dec63b5b534ed398d25611e3b0f6 SHA512 f2bb4ce27601eac610b2b7314a1f41a030db84a28f8fc9a4a8ea7657b4d9273fe4a4ccd2d98f973c26d851ac60a4cc9203aaecccde0df9efed1e389457f654d2
diff --git a/dev-python/protobuf-python/protobuf-python-3.5.1.1.ebuild b/dev-python/protobuf-python/protobuf-python-3.5.1.1.ebuild
index db097c8fc623..25ad0038bb71 100644
--- a/dev-python/protobuf-python/protobuf-python-3.5.1.1.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.5.1.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/google/protobuf/archive/v${PV}.tar.gz -> protobuf-${
 
 LICENSE="BSD"
 SLOT="0/15"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 DEPEND="${PYTHON_DEPS}
diff --git a/dev-python/protobuf-python/protobuf-python-3.5.2.ebuild b/dev-python/protobuf-python/protobuf-python-3.5.2.ebuild
new file mode 100644
index 000000000000..aaf563b424f3
--- /dev/null
+++ b/dev-python/protobuf-python/protobuf-python-3.5.2.ebuild
@@ -0,0 +1,45 @@
+# 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="Google's Protocol Buffers - Python bindings"
+HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/google/protobuf"
+SRC_URI="https://github.com/google/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/15"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE=""
+
+DEPEND="${PYTHON_DEPS}
+	~dev-libs/protobuf-${PV}
+	dev-python/namespace-google[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	!<dev-libs/protobuf-3[python(-)]"
+
+S="${WORKDIR}/protobuf-${PV}/python"
+
+python_configure_all() {
+	mydistutilsargs=(--cpp_implementation)
+}
+
+python_compile() {
+	python_is_python3 || local -x CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
+	distutils-r1_python_compile
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	find "${D}" -name "*.pth" -delete || die
+}
diff --git a/dev-python/pyalsa/Manifest b/dev-python/pyalsa/Manifest
index 7eda67e4ff5b..ae29bb4530e0 100644
--- a/dev-python/pyalsa/Manifest
+++ b/dev-python/pyalsa/Manifest
@@ -1,4 +1,4 @@
 AUX pyalsa-1.0.29-no-build-symlinks.patch 775 BLAKE2B c8669e67fdb72b169db4a1445c1045d9687246b5f735697d9ba1fefa9ad71dfc2ee898585febf46fc7f028aad81e8b18b6be1f871c515ef6c16c1ffe620691dc SHA512 647783293e2576e8fe3631bad6082000c315ac4b5312e4e212c7fcadd84082e06964fda66bbeda781f33f75596ef561e18b0652e25beb88d0f883c131b3d2d32
 DIST pyalsa-1.0.29.tar.bz2 39481 BLAKE2B 12644bad27c06ce4782ef3396e883bf1aab521a39d813f11d25f910c99d899b14b618f21568bdc1422a3ed448e7421c8b8129dc19c8fcd0f9c0b595f9fbae370 SHA512 cc885094b020ea6e1735391cfc73a11e29f7d59b1e24a766908d57bec0fae4f490616c59f04eb74648f8ee610e76295a9501ab31a2513e921bcd8b4fdb104683
-EBUILD pyalsa-1.0.29.ebuild 732 BLAKE2B c30c5fb84edf6be9364558686ba9ac45bff72d2394345717379c76d3b938252929975cdaadbe3b80b6cfac5dd8a6e2fd0b2f2f80726fdffd7ed529f6565b692d SHA512 41885c989d98db00b6045a8f9c766e9fa9fd5ae9c02d9eb3051e46f07efbbd04a8091870fd7768a62771b3bed81424af487ecb59236c9d832a51523a4c3337c4
+EBUILD pyalsa-1.0.29.ebuild 733 BLAKE2B 6b367e7106dc27882f76bdb553d09eb15ddeac7528ebd1f8969eae333500fe009b044053bce214115994775c471e0434cfd99af236c83761d8a0c4da79938224 SHA512 46a525baa90be1da56aea4bf5645e38aa448afd5a53f0c32c6f9c18078b08f79bc8b2f063600968eba45e549b19a1cc9dec99c057b2945d2a60f1491dc485aa0
 MISC metadata.xml 349 BLAKE2B 743c640ee72b49353f6b3b19b958609dc420f187753d9e63e292c9cdfcb6c183092953dd16c3cf0f91ee13df04b9f12a2a9893a56cacad2c70535730294d6af1 SHA512 ef94ac2639e61234b2140a6dae1683f99c3c8bf564a37d22e54612340a2d0147037e590ef8f6c639914df05684f3d62ebc96a9e2176cab82ba85e5d87171ec58
diff --git a/dev-python/pyalsa/pyalsa-1.0.29.ebuild b/dev-python/pyalsa/pyalsa-1.0.29.ebuild
index 4ab9d25891ae..c0c0d92f726c 100644
--- a/dev-python/pyalsa/pyalsa-1.0.29.ebuild
+++ b/dev-python/pyalsa/pyalsa-1.0.29.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 pypy )	# Still py2 only it appears
 inherit distutils-r1 flag-o-matic
 
 DESCRIPTION="Python bindings for ALSA library"
-HOMEPAGE="http://alsa-project.org/"
+HOMEPAGE="https://alsa-project.org/"
 SRC_URI="mirror://alsaproject/pyalsa/${P}.tar.bz2"
 
 LICENSE="GPL-2"
diff --git a/dev-python/pycairo/Manifest b/dev-python/pycairo/Manifest
index 7c435251e9ae..a46174f1cb6f 100644
--- a/dev-python/pycairo/Manifest
+++ b/dev-python/pycairo/Manifest
@@ -2,8 +2,10 @@ DIST pycairo-1.15.3.tar.gz 177056 BLAKE2B cba4a212c3537d5718a73742468444b0137290
 DIST pycairo-1.15.4.tar.gz 178436 BLAKE2B 23c5064f537b8d8be12bb64df375c1d5be8962f80adf2437115dde59c18c3755a693b0cb8b3bee248ce8c906f23acfa264f2da6e02770bc59d823beba1bc9e7b SHA512 7e785d23393a8d0c5aca9a4440eb64b0eca9a60c1a18b0dc8452edd6de9422c743d082530387bcbedd34d52377d0892ad395998e9467ba08e22c318684cbee34
 DIST pycairo-1.16.1.tar.gz 180516 BLAKE2B 0a144eb6f17bc6621b16e00ddd40784e16e5950667d57927ee238e76d4966e828d8da3d6983e09655d3eb2d3526dcb8a44da6c48e14268cd78e1d463e59b8779 SHA512 757870dd28d037d0af96308e2d1eb5d55ca2025aabda66031dc77790692e420b07802ccdbeefee430825553ed993830bc6f74de83b717e6fa876108f7b54e144
 DIST pycairo-1.16.2.tar.gz 180430 BLAKE2B 06b7f8b6c574b7afab738c7f0fecf78efafd06759394fbfe529a908011173e46aa0d89a5d041f9ec27fad8abb89b13fced8fbc0a567c8183f2072c70a3a8e357 SHA512 a5ac07f96f6607b1b40912b000c8b3b2114e75a6b8b314f1b68d2f5bb408dd7823c464d096c8cc26164219a961b448a4ea90b5a76683fb1807180f83cbc3b300
+DIST pycairo-1.16.3.tar.gz 188610 BLAKE2B 71034891bae636e23379a3fdc49c9163cff61183fe46c4027bbad3206e72255e60081dbc3cb02808d5c3840b618f6c12f8106ca5a08ddb226a65917ba2da390c SHA512 d60978f85eb0430f2038b0e7d0bce23602e8c180a7611eea424fd8bc3cdd8ce249af364abd0e77ab3b7ab439761721cba5c2398f51af2a89add3fb7fda8aa5db
 EBUILD pycairo-1.15.3.ebuild 1607 BLAKE2B 0fff3a866314ff4dcf9fdfdfaa865b504859be58ddbce3e7ffc64568d744b5ef0cf7558e045aaf1d9c474c457d9ce50c19c978b27accfe2e52e94cf00a3c9879 SHA512 a61afcf8066d8b14d1b117e7952d82d1265668005f976b20a1d53fcabf3d5bd792a62cc24b765d3113016f9b1870ad7e922d05ee017868fcaed03109866a9618
 EBUILD pycairo-1.15.4.ebuild 1616 BLAKE2B f587a875f864f1d08465f421e48b2935378dfe9c2e5a6d421aa39b1d00f11c6622fae6e0fe95bc3bc79a8126b069f77599daa5a2c191ee47399d58d52fb1753d SHA512 f8fc6a76feb2a2544c558965a2004151e8a259de7466195c02a18657e614fd956b94b21c1038a5868a74c904f8fe20f3eb06c9c352b73a83688d6fcf8ff57c0b
 EBUILD pycairo-1.16.1.ebuild 1625 BLAKE2B ce04c871a936b4bbe291c36e6cc40b6e307b609a2e415e96921f8b6b44b8524bebdcb11c57575cfcfaeaaa11f96c69f232950fc960a891422c202107f061a0ed SHA512 c6dc09c531862cccbb5f5debcffe8f2bd92c6022439d36e1e2496fbb8654bf18e2db9ec92ab1064b4d561a4e453e6fbd5d21587691e74e796609f00c6091de27
 EBUILD pycairo-1.16.2.ebuild 1625 BLAKE2B ce04c871a936b4bbe291c36e6cc40b6e307b609a2e415e96921f8b6b44b8524bebdcb11c57575cfcfaeaaa11f96c69f232950fc960a891422c202107f061a0ed SHA512 c6dc09c531862cccbb5f5debcffe8f2bd92c6022439d36e1e2496fbb8654bf18e2db9ec92ab1064b4d561a4e453e6fbd5d21587691e74e796609f00c6091de27
+EBUILD pycairo-1.16.3.ebuild 1625 BLAKE2B ce04c871a936b4bbe291c36e6cc40b6e307b609a2e415e96921f8b6b44b8524bebdcb11c57575cfcfaeaaa11f96c69f232950fc960a891422c202107f061a0ed SHA512 c6dc09c531862cccbb5f5debcffe8f2bd92c6022439d36e1e2496fbb8654bf18e2db9ec92ab1064b4d561a4e453e6fbd5d21587691e74e796609f00c6091de27
 MISC metadata.xml 246 BLAKE2B 3a28b3bb42a0352827a446ea608867a7782fe682458527ef441a528a22c9f951dc203639934a69ffb520f63aadce3037df28bf8c5304b3a5921b336142f9f246 SHA512 3245fb694492b2f698fb63aac02e66fb8a94fe35eabda45df4790bec043a1ea552e112315334001902f070093bb73e7b741aa3004757404aed97ebdb86cc9fbc
diff --git a/dev-python/pycairo/pycairo-1.16.3.ebuild b/dev-python/pycairo/pycairo-1.16.3.ebuild
new file mode 100644
index 000000000000..ec09aca8d651
--- /dev/null
+++ b/dev-python/pycairo/pycairo-1.16.3.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for the cairo library"
+HOMEPAGE="https://www.cairographics.org/pycairo/ https://github.com/pygobject/pycairo"
+SRC_URI="https://github.com/pygobject/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc examples test xcb"
+
+# Note: xpyb is used as the C header, not Python modules
+RDEPEND="
+	>=x11-libs/cairo-1.13.1[svg,xcb?]
+"
+DEPEND="${RDEPEND}
+	xcb? ( $(python_gen_cond_dep '>=x11-libs/xpyb-1.3' 'python2*') )
+	doc? ( dev-python/sphinx )
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	# Fix pkgconfig path
+	sed -i -e "/libdir =/s:\"lib\":\"$(get_libdir)\":" setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	local enable_xpyb
+	python_is_python3 || enable_xpyb=$(usex xcb "--enable-xpyb" "")
+
+	esetup.py build ${enable_xpyb}
+}
+
+python_compile_all() {
+	use doc && emake -C docs
+}
+
+python_test() {
+	local enable_xpyb
+	python_is_python3 || enable_xpyb=$(usex xcb "--enable-xpyb" "")
+
+	esetup.py test ${enable_xpyb}
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/. )
+
+	if use examples; then
+		dodoc -r examples
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pycodestyle/Manifest b/dev-python/pycodestyle/Manifest
index 4677b184d1bc..cdc50c5987d7 100644
--- a/dev-python/pycodestyle/Manifest
+++ b/dev-python/pycodestyle/Manifest
@@ -5,5 +5,5 @@ DIST pycodestyle-2.3.1.tar.gz 89460 BLAKE2B 0b7e23be13830954277d521262e9504ade8a
 EBUILD pycodestyle-2.0.0.ebuild 1106 BLAKE2B 65f08d6fd9194e73178dbaccceaeefc5a45edf33a9198a507e091c243108237ea810ed433a715b304f938f6e9567756f10a977f8f21cadfcc0b1d6cab8048883 SHA512 3b18f5f5eb919ddcd8468733068d95647ec5950fd322fc4ad029a91b2d172c89d6ae187132f9bd62c9d856fba60b405fc9ab7526244701481d8e6ca8afb910e8
 EBUILD pycodestyle-2.1.0.ebuild 1106 BLAKE2B 65f08d6fd9194e73178dbaccceaeefc5a45edf33a9198a507e091c243108237ea810ed433a715b304f938f6e9567756f10a977f8f21cadfcc0b1d6cab8048883 SHA512 3b18f5f5eb919ddcd8468733068d95647ec5950fd322fc4ad029a91b2d172c89d6ae187132f9bd62c9d856fba60b405fc9ab7526244701481d8e6ca8afb910e8
 EBUILD pycodestyle-2.2.0.ebuild 1111 BLAKE2B 65db9daf06f8c947a0a62e6d14e84c5ec3920105379f57476b4d1cc7468c4fd61ea7ecfc131287518ffc1eb5211f200c7fb8977ca9081be9d0cd848c1e19e28e SHA512 5878087454217d7e6c8afdc50a74adf2e3193f0055624fff79dae9de349ca41154f8240af31028b9d4745304629affd54416056873c6551e64412ea5a2115cf8
-EBUILD pycodestyle-2.3.1.ebuild 1129 BLAKE2B 4d7f557c191e402cc6b7704b7ac3449fd01a6c9b27fd5ee56d208bc51d5cef28406dac6c3e8e017444b26e7f8a7f92575391ac98c34bd89b7a85d1789df84907 SHA512 43bef19ca95eaf74602f2a3bdcd27fb03e60f700e8fd5f9a077ae210753b9419d5337c7924007084aeb69eefa938b37d674e13d91701bb429d6b401434b7b6e2
+EBUILD pycodestyle-2.3.1.ebuild 1127 BLAKE2B fd19e01d8d0b4021b7820359d37574fceab451f633df277aad721a68a5bd4880400ca1307a87e0d68d1ea988de49705136b3ce15a0dc45012631a781b85f9899 SHA512 5313a769831a60119c08905e0e7195c7191c4edfd78b73cdf4d44a7096d090dd8de1255fa258b3c9e7df25ea22225a35c9565994ee044baddf468240c7cb688b
 MISC metadata.xml 335 BLAKE2B 9ecbe193a8f7aaf12005920847cd3d8a34b868636a943ba30465a4eead591ce46d422bd0b0e777a86f0d5c4efd5ed925a1476f18f659f18e622dfab057df0d8e SHA512 92e19ab42f44fe1a1da2c8407214bb447262a818b2051e644851178cc7f2274198310a85d7c094839b1764664bd8f8463a6a7a96df83447768082c8ab44909c4
diff --git a/dev-python/pycodestyle/pycodestyle-2.3.1.ebuild b/dev-python/pycodestyle/pycodestyle-2.3.1.ebuild
index 4ce806d3ddb1..b977897d1a8a 100644
--- a/dev-python/pycodestyle/pycodestyle-2.3.1.ebuild
+++ b/dev-python/pycodestyle/pycodestyle-2.3.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc"
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pyflakes/Manifest b/dev-python/pyflakes/Manifest
index 1642a9996932..9a8c68ec9b18 100644
--- a/dev-python/pyflakes/Manifest
+++ b/dev-python/pyflakes/Manifest
@@ -6,5 +6,5 @@ DIST pyflakes-1.6.0.tar.gz 48184 BLAKE2B a5762c23521aa68ea92537fbc2903bb7af64faf
 EBUILD pyflakes-0.8.1.ebuild 736 BLAKE2B 2b94946fad5fbb8055fdb298976b57098641549a0d85bf10b1be9a076eed57dfb7917909dc4f3e8bf2d00d43797dba92f3ee085061957cd354cd4dca4b82a4aa SHA512 4e3b513ee627ccdfd3a23efee00e6622c9b150b29ec88ab4589d76fe8f13bc7c602d74f505484eac92cdbe65c386c2c92ed00d998a02c0628fb6aefbf8673bb5
 EBUILD pyflakes-1.0.0.ebuild 767 BLAKE2B 1798e80d675884b4e4953ccc5309d3609b83387be33e4ddde3e19388b1a35aeeee17ddf39d813395d03a32eece7ffcbeb379d43bf28b9ed8a412a667b1e65da4 SHA512 98b81862a97d297990feefdab5d2aaec5fac235b7a723a292b7ff41631e1c2144e3ee681b4970c5eb931f2fa0e2ea24ca7d85832d56dc54899a33905e0eadf73
 EBUILD pyflakes-1.2.3.ebuild 709 BLAKE2B 1a199e9e9a6c88eaf701b7b14e504a07ffa35b7f41c9705f7ee788295a18328ec0f23378d305a541c25fa8053d0ab7b30e65ff9eaecaa421c99503ffccf11395 SHA512 24d34c8c7530f19c76d5a75c72126748b42b5a0eaed26c4fc21a6d2a901499f0fb09f6ceb8aeaa0fe0e2c1e6212611c0d9907ed39589374ef6b473643b9c1fdd
-EBUILD pyflakes-1.6.0.ebuild 732 BLAKE2B c2aabb74222d9a1ab55067702a643f5dc8a88a0db44bbe71381f756944d939c7614a790185ac3069765a7e453a360495d10d77b31bb9748c6f95035fa8fc8c20 SHA512 cd12d296dbb560297b2c849c22da189b4e4f0d4007fd35b817ee072634d61f4b9f53f0f21556da88f8827e270e185d273040764694f3567a32d0cd7c4930fd5a
+EBUILD pyflakes-1.6.0.ebuild 728 BLAKE2B 8b467ecf955c3c527c11ade394521588456d71199b6151e665ac11bb5eb7873e46997ceddb2b1d79fdb88deb18d0f7e122fbfb06c76d7085b3133a2b247f7804 SHA512 a481ad564ca06482c59cd33398986aabffa573f2d068dbd26f7cc742618825f57a7f4cca4b9eccb39333359ca7f3816054d339d9d9bfdf3bfdc4e20420c8e808
 MISC metadata.xml 738 BLAKE2B 5c1e0cb1452f9aebbefe7edd7a054cad85373344f834fb88ea37414ef69b12a36f774e6da05e73b898d6300a56189ec80891eca7a3c225c95b0fc8755daf18b6 SHA512 6ac45c3c5d1fd3eeae5c8ad9950a2c97ef31d0bb72e6034a1f8b75d2a28e997660df20719431ee138a76544942bc20d609fb6e4a26a77f0ef30f912c6d2c0257
diff --git a/dev-python/pyflakes/pyflakes-1.6.0.ebuild b/dev-python/pyflakes/pyflakes-1.6.0.ebuild
index 1aa68a36b021..e0b9f73ab1bd 100644
--- a/dev-python/pyflakes/pyflakes-1.6.0.ebuild
+++ b/dev-python/pyflakes/pyflakes-1.6.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~amd64-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}"
diff --git a/dev-python/pygobject/Manifest b/dev-python/pygobject/Manifest
index 07d17f167c1f..14deb141365e 100644
--- a/dev-python/pygobject/Manifest
+++ b/dev-python/pygobject/Manifest
@@ -11,5 +11,5 @@ DIST pygobject-3.22.0.tar.xz 756820 BLAKE2B 2030b9106c082bbec4418c97945df68e20f4
 DIST pygobject-3.24.1.tar.xz 758648 BLAKE2B 95e3bc6d022b70053549f8a780aa372d8964477e881b825299ca82a7328bbdab58b037a92d36578915ac622b7c223d47cc1c35fccd3ea70d7840841eaec6860d SHA512 f35968ab12b872c85af6b2410cadedcf9fa7e17352a40f3dc557c86203aa1c38753710aab9ce55e986ee2c98b64e14123c65083655445e993d0b53431db6dc93
 EBUILD pygobject-2.28.6-r55.ebuild 3541 BLAKE2B 7d20bfad727c2f1e56b28a2d01ac354c3becd1529019eaaaeccb35083c74b8932ee14f061b249d8c02f601f880a8455c3064cd89e2be137e9eeb0bcd3f2a2799 SHA512 d4c7e7a96b5151472b20bb1663b94383acaa526c5df4d545289ca9fe0cc18889238df8b1aeaddf19a1a46cd046b43c46268a65b0e820dc7ebe403d05d664b64b
 EBUILD pygobject-3.22.0.ebuild 2940 BLAKE2B 3a5281e9483d976dec0854b885695e6b612782a4f0c1766ce416b0d1ea8d0c27b00853e71d9ae87c7c96d4ee82f94e3d9c657932f1f87231b3768f5a1c9e28f9 SHA512 999d60141ed662a29b0a8f28c57b4bf3e2dbb2770cb82d573553ab18cc7e45587989b99d740bcba4908724f9c2095fc8665b3a24c1bc1185a20b334cb431bf48
-EBUILD pygobject-3.24.1.ebuild 3163 BLAKE2B d59c93b6b2d559818b07c5564c2f00b5ea30ed4f7a5ec9014a3da97827d995af08db64f84795ad30a06bafd1eed63804bb1654a5f2d7d27738ef037753f3d4b7 SHA512 6ff9d844d2bc7aaeb120617b7f8d8b76a5036a0335d61bf6bbb4613b9a26703bcb159c957b3e6fdda77a9c311a9a673c08535339c64857a68782de99d2f4354c
+EBUILD pygobject-3.24.1.ebuild 3166 BLAKE2B 874420883c17a91a743121f371c2633106ea8556b229cb527983a76ea6c75b311125851f95424729c767829156d5a176aceef9c71762d9de49fb0ee8b3adcd38 SHA512 9ac81a96e89e332e7f4ed106cad9227348b0dd98974cb2fd96aa00e09070262c62f2eb56f9b8458d4061584ed0b3b72d91e7af14b669c9ea8ece193f863c073a
 MISC metadata.xml 353 BLAKE2B 20a18942138d7ceab468b01a639f92248bf94f0e6a015a0c6c34872cf60ab56ef91d9b36eebc74b3d3133ecbc6cfbf2aedbc24369165d0fe9a4e832394beb022 SHA512 abcb7bb015ebb246584f60f388837ed0638040f730111831b52716cbc5a9c4ab0c422397702e1d87e56b2947108d5cfa5aeac7489bcd6f89db480c68c572bcdc
diff --git a/dev-python/pygobject/pygobject-3.24.1.ebuild b/dev-python/pygobject/pygobject-3.24.1.ebuild
index 38ffb321ce51..0acee1b4a4e2 100644
--- a/dev-python/pygobject/pygobject-3.24.1.ebuild
+++ b/dev-python/pygobject/pygobject-3.24.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/PyGObject"
 
 LICENSE="LGPL-2.1+"
 SLOT="3"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cairo examples test +threads"
 
 REQUIRED_USE="
@@ -36,7 +36,7 @@ DEPEND="${COMMON_DEPEND}
 		media-fonts/font-cursor-misc
 		media-fonts/font-misc-misc
 		x11-libs/cairo[glib]
-		x11-libs/gdk-pixbuf:2[introspection]
+		x11-libs/gdk-pixbuf:2[introspection,jpeg]
 		x11-libs/gtk+:3[introspection]
 		x11-libs/pango[introspection]
 		python_targets_python2_7? ( dev-python/pyflakes[$(python_gen_usedep python2_7)] ) )
diff --git a/dev-python/pygresql/Manifest b/dev-python/pygresql/Manifest
index 66d557387c8b..f5e9d6aa0751 100644
--- a/dev-python/pygresql/Manifest
+++ b/dev-python/pygresql/Manifest
@@ -1,5 +1,5 @@
 DIST PyGreSQL-4.1.1.tgz 100883 BLAKE2B 8b3876803b61fde62a248cf6499b9396a16069fd5cebad8f17ca942990a5502a702081b395745863d54b304d426455dd94d816caea9e09809a7ff0ca1b4903b0 SHA512 4b37c56f2112471aa5f3003a1d867382ce1b7510afa0963f0ceeb2f8175ca601bb5bade9ea2038d44a1041f12233e364f138a635bb7b353d0a82aeb7d9d49b7f
 DIST PyGreSQL-5.0.4.tar.gz 637569 BLAKE2B 3f7bddb8b5e455ca4f181d254d4d125b89a64d7aaa1440b9ab5d916c395b9d93fc9814269992c134b6fd8a81f436752dbe4d7c06125e683a5257361d428c6a6f SHA512 f177ca3b023c007dafe80369b86a1742ff334137e493c3c19ac8bda0181d2543cd2431b8ab8d2d43f30d681121324bc4f236a9ebbddf1e927b071db7c9b34ea6
 EBUILD pygresql-4.1.1-r2.ebuild 1592 BLAKE2B cf71efda28ab0c4cd24540307c5b68d8585cc06ce92b415b399d4a2ce4bc70d2a9a2a4293061e75a3c3e061b37ae0d56165010ae7b048bf2512de46981ab87f4 SHA512 c862f696772b9b8d6242fc98721d8b1e7e608f3a54ddc2bd4b34e24e782390cb1ac8e4060ab13ae025b9d8c229d4b9bb03cc2a6facb254ec49073477cbe32c2d
-EBUILD pygresql-5.0.4.ebuild 720 BLAKE2B 39ff6a9e14d5f5fdfa15d3caf1e633a1f9b36ed3d51085935c2b216e58c57ee3464dca91e4e936509d765c82514d84d7c805990d4ab5332c5ed95e2e92ce89d4 SHA512 f8ed9bd95e82c8c56323271b62ee747b6607ff279d7d400c283691a6c0909b10b29bdd016bcd360720ba23c0da9886f7b0318f52f5dd6baeb6078749f515e808
+EBUILD pygresql-5.0.4.ebuild 719 BLAKE2B bfc05258e6326ad563a0e83b471d389bb69f94a55a8b3e4f3a652a9097336bea9e66f64fe624ba450c5e2fcc1b0a41633eef2ede867d55396f731243e5a13b9a SHA512 f2afca269a24cd2155ca1c7bb82eb53313e85f174f16b5affebf50551270aff1c7ffc35042986fa46bf2baefff99edf8f0390ffa447ea7184f9975f65122c4fb
 MISC metadata.xml 452 BLAKE2B 8d60fd06e68e39b5d373f30fec25979a0a67c51eee216425e382b559b908ccd12e425c95995dfd28d8487fb306f03fa10d8a71320a4ff5ebd6349e887af624e9 SHA512 f6877e2fd8cb2b6606a29e421d0f0ab4fd66a5e7446a4307718d1c0435c2e8ab3c59db795ca1e18e58eb79d0474c57bf35a3d0544095d2d7d618cf25e96ff55f
diff --git a/dev-python/pygresql/pygresql-5.0.4.ebuild b/dev-python/pygresql/pygresql-5.0.4.ebuild
index f746aca80af5..dbbe6fb5f52e 100644
--- a/dev-python/pygresql/pygresql-5.0.4.ebuild
+++ b/dev-python/pygresql/pygresql-5.0.4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/P/PyGreSQL/${MY_P}.tar.gz"
 
 LICENSE="POSTGRESQL"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ia64 ~ppc sparc x86"
+KEYWORDS="alpha amd64 ~hppa ia64 ~ppc sparc x86"
 IUSE=""
 
 REQUIRED_USE="${POSTGRES_REQ_USE}"
diff --git a/dev-python/pyqtgraph/Manifest b/dev-python/pyqtgraph/Manifest
index f41fad330a30..944a4d822380 100644
--- a/dev-python/pyqtgraph/Manifest
+++ b/dev-python/pyqtgraph/Manifest
@@ -1,5 +1,4 @@
 AUX pyqtgraph-0.10.0-qt5.patch 439 BLAKE2B 8c0b5f766adf64d67800873145223ed8f9dda75ce1d5d62784129d827c4dfb9d44bd5532b44dbe42abc6bd67d5b13082c1691d8796c3a53b4ea873faaa2d7f00 SHA512 792a739e1cdc2c7c1ce059945c4a5280f1187a88dd767669fee83fbbdb5c315c022b99c5312c9c53d88afc6d24767fcb93426f6e05b9a5d08db084ba3110cc93
 DIST pyqtgraph-0.10.0.tar.gz 704972 BLAKE2B cb1295608536b06de32ea72503b2df2be7f4ae3065b42431542539feec5eb37412e3a7697e2ee97309594b9aecc19c692ef7b45f843f37bd50148a3c0b6e1d31 SHA512 d995da7b4f13ae0009582aebe3f753dc78566dc50ba9314d3a2d37ad4ed8f2fd8bb497a01bb8b37b6d96bf14c071aad018bcbc7224d9dd9b47589a7b5b640d30
-EBUILD pyqtgraph-0.10.0-r1.ebuild 1238 BLAKE2B 09a52183ab978fc941cba857271228ba036832a2c7b48dbdde728d6903c5eecd865f9ec9d04730fb5c0e5e9eed5f12bc062a64e0494dd3031f614fc5b75770c9 SHA512 2de86ee403ecb209a5093575aab31f7aefd39ad36f2b745fea393f83c340eb2ff15872ae0dffbe3bd29adeb1956c53bedc0f0b10462ee6ca9f2e3dc686f4f5d5
-EBUILD pyqtgraph-0.10.0.ebuild 1222 BLAKE2B e0daaed27a5710a98e09508fd047492c89ea01fa8303cc4c1f370148d8b530da6905e7ffb51d6c4cdbd7df9ca24e6c07f66e366a7488a36fc92a7d3a40af4ac4 SHA512 8bd56a0d401ac1bc1d5ed34e258d912cfac4dfce5ee5f483710716de73bc072c9f94a342478bfc77c50140b3bd90bc4fc0141dcdd568c5aa3fd7a6d4aa58bff8
+EBUILD pyqtgraph-0.10.0-r1.ebuild 1236 BLAKE2B f3bdca2e131dc2f66f93a024dbf2278b2e9a6cc3b452c29446e01926640a9ae04e83ca1d8428f55b68a6fa9657680ea06f8e37c6658655dd326de959576d2e0a SHA512 9d5d5b9a638fdd915ffd3994096c6fb7fde512b2d27c4db8a926fcd8d7ed7e2193324ae85f28999618730091ad0c0c0389ac0aa38aecd34670cdf7a02643289d
 MISC metadata.xml 725 BLAKE2B 0126a36d5645e5fa0ddcbc46924f78284cb03de5632f84a790415278a91ab650b2e3c7994467e106a0bc4e900f98b0f40ca70416ea2d515b15d4f74320600e70 SHA512 51fdf4a875bc629230c1040ae34cc6b37225dcd18c04a23d3bb6b5da30c79dd7d4c10ee46fd671941d86ee15d548e7a0303bcb48e7796b20036ebb928ebd9078
diff --git a/dev-python/pyqtgraph/pyqtgraph-0.10.0-r1.ebuild b/dev-python/pyqtgraph/pyqtgraph-0.10.0-r1.ebuild
index d69ef3721ec0..86bf6f65bbb3 100644
--- a/dev-python/pyqtgraph/pyqtgraph-0.10.0-r1.ebuild
+++ b/dev-python/pyqtgraph/pyqtgraph-0.10.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.pyqtgraph.org/downloads/${PV}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc examples opengl svg"
 
 RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
diff --git a/dev-python/pyqtgraph/pyqtgraph-0.10.0.ebuild b/dev-python/pyqtgraph/pyqtgraph-0.10.0.ebuild
deleted file mode 100644
index dea43636c817..000000000000
--- a/dev-python/pyqtgraph/pyqtgraph-0.10.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-inherit distutils-r1
-
-DESCRIPTION="a pure-python graphics and GUI library built on PyQt/PySide and numpy"
-HOMEPAGE="http://www.pyqtgraph.org/ https://github.com/pyqtgraph/pyqtgraph"
-SRC_URI="https://github.com/pyqtgraph/${PN}/archive/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc examples opengl"
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
-	|| (
-		dev-python/PyQt5[${PYTHON_USEDEP}]
-		dev-python/PyQt4[${PYTHON_USEDEP}]
-		dev-python/pyside[${PYTHON_USEDEP}]
-	)
-	opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-"
-
-S=${WORKDIR}/${PN}-${P}
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	# fix distutils warning
-	sed -i 's/install_requires/requires/' setup.py || die
-
-	if ! use opengl; then
-		rm -r pyqtgraph/opengl || die
-	fi
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyserial/Manifest b/dev-python/pyserial/Manifest
index 071cf1967898..b506b238296d 100644
--- a/dev-python/pyserial/Manifest
+++ b/dev-python/pyserial/Manifest
@@ -1,6 +1,6 @@
 AUX mapping.patch 495 BLAKE2B f9a2493c2ed0f522000b2ddc774c931138adda0c7d6f8d53875532fed631936436f5ec8cd572e8fc47bf5d9ada2663efdd315d6102cc5ec873d198a53c75a604 SHA512 2a0a86462291ecd78d06c9b88e8971502a58efa61ad9d47f0df2c94240245a41e7bbf9bfbd93e7761560a16fe15203cf8c5c52eaf3eb24e1499b00dfec3808f8
 DIST pyserial-3.2.1.tar.gz 147338 BLAKE2B 6c377d1527183fc48e1369f206f409d312e4488bdb15ae1d1ed93249073ffc56529a9e6059ef57c8f2ebb867cb6d9c0b7dc3a74eafbf653463a05e603b25d69c SHA512 8d3e580cc7781fc6549ab6e408642f4321eb90aafbe593f5dcf953001730f89ee32ce6592728764027a7944bfe4a0ebe2cfac1fce071777aac7c4f27ac94ab7f
 DIST pyserial-3.4.tar.gz 151657 BLAKE2B cf47aba4a6f3bb2fe39d99e72907496faa1c9f37857810fef4d826cca72c361d0e43dbc33d9cf2291a589bf0193d17355d149e6eb61b4f9e28250207708ef09a SHA512 d71dffc330704e41caac6054adf192bee2f1c119691faf2ea93fe22e8e3ba000dc4a1434293f6f80d05a5577d85b96791f656e28d5c63fb0ce6a6605467a117f
-EBUILD pyserial-3.2.1.ebuild 1148 BLAKE2B a57e45d1ae6f68bf0c381a0e41eb2b3879a0b24d589a6863985c963bae243c5b10d38b7d5591e23d9fdc016e177110be4fcd59b918dec36e947acfa168ed7712 SHA512 b4d57606a5318c733da926ccfeb2b82e8d779b75316cd56ab8a24e577953d05dd501c8e7b86cb320949e60120577940958c3adb5ac8be760e193c91200faa686
+EBUILD pyserial-3.2.1.ebuild 1147 BLAKE2B d6c1ea4326e653e9081407d4acf6624df41db23895972e6e0242ae3f59de630c65c58df62181b10ae9412dc06d9c33d17db16dfa86132225154170f1de1fd100 SHA512 5f96006dee57b4a4cc491bff4be32c574aa941651f5e13e4966807c66069bcda545a9f03501e0a4bdf0d16f2557c78dddb7f8740ff713ea339bcfd00aa5b4d47
 EBUILD pyserial-3.4.ebuild 1157 BLAKE2B de971fce37ae3a95fa115c543c152723c01930c0b324cb1674628cb7f6c72cf60ae27f4ebc5f3024fb45811becaab3912e8065033fe47e6a21261379bf562918 SHA512 6e1f44a648c924fd0c36670c5a96936c3656b81c0a7bd8da6c79a8f1dedb87bde994c7570a126df2ae6c7408018bac5cd24cf7b931720851936a420c2f28dd87
 MISC metadata.xml 421 BLAKE2B f3c94b0b72c3df17d9c539e8b76e1f644e0b4ae1bb3d905652b568084e449bf11cab07f27e7775031eee857095671debd28bf1d2eb8c1992c6b980620b32109b SHA512 30c1232aed930c665c2603443cbff9efbb843b1866d6a4d034a517e0669f28f1e6e7562103a8badbd8fb1efd9e69b058870b9c4fcea8fa5e74e7a1ec8ba17fde
diff --git a/dev-python/pyserial/pyserial-3.2.1.ebuild b/dev-python/pyserial/pyserial-3.2.1.ebuild
index 59ef3d4e7035..cd5a0cd07d00 100644
--- a/dev-python/pyserial/pyserial-3.2.1.ebuild
+++ b/dev-python/pyserial/pyserial-3.2.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
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="doc examples"
 
 DEPEND="
diff --git a/dev-python/pytest-cov/Manifest b/dev-python/pytest-cov/Manifest
index b7edf9adabe3..8c6da0444a57 100644
--- a/dev-python/pytest-cov/Manifest
+++ b/dev-python/pytest-cov/Manifest
@@ -2,6 +2,6 @@ AUX fix-for-deprecation-warnings.patch 678 BLAKE2B cbf75e452f1cb5225d23d29c8105f
 DIST pytest-cov-2.3.1.tar.gz 35378 BLAKE2B 758846db0b06ef9534823d3458ad6211b0cfc14b551a6e1737573a5c1c5bb59c23b26d3448ff8a67d65a4293ce75dd8c79d4916d3d9a7db5021db6b907152230 SHA512 79770beb53fbb43b5d68311c2efd0accbfd890ab6dad299da8c1c0b3d26b54d984807313b1507900cda7004bfb50fedc0bd4341cfcfce47849a4f24fc8184f11
 DIST pytest-cov-2.5.1.tar.gz 36201 BLAKE2B ba07d751c7635ee01262a6f2eeffb27393d58afadb625b220237ff9d014ecdda0f18c0b5fd7bdec66fa4a948f2bb70a715af6dc76664e9c573ad56520c8dee1e SHA512 868131d6ea6dd28deec6d653dec23ceb7d3adccfa2c6bcc0a3126bbb11e924e71f200676461b2202f274ce6e14d1799feb0917e3081817d9e8583271c18a43de
 EBUILD pytest-cov-2.3.1.ebuild 1539 BLAKE2B 2ef33a3cb6cb07cde3e5a756a7b25c1e81847675a409b35a3d81a4b77a7c5baa5b50dc98b83e3590434a2fa690de006fb4fb3a1e3de9eb21b339bc0c2a5e4a6d SHA512 4b2d0235e1affbd327df01544c6db6b807752aaece33f38bcbcbf66121e05967d8355784e91015b9183b51932008cd6ec984b90be2871b0fc6e3f70e17de2065
-EBUILD pytest-cov-2.5.1-r1.ebuild 1510 BLAKE2B 0e23b0ca4e073adf31ba27697b8a2f12b018ddd444a6e349fe3ed1ff1dacbbbf10b25cb4c213d32621e2c4c2f2e9c8b5761b69b3ce20e527f09a87a0f13ec83c SHA512 e867587f9ba2e14eaf85c731e215d8a348147e52c8195d26d23bf8b696b9c282bc671320649b5d2d154f97b503281b72d4bfe2dd6073c71d0a4d8c96e16899a6
+EBUILD pytest-cov-2.5.1-r1.ebuild 1515 BLAKE2B 8f174e3a3b74b9ff4b8de4a1c3ff22b8997cde3b14cfc6b3972897843e3dbaa57cc058bfc3444bd6b24bf8d07eabd006c5fc9a724d1e2b2ebaa3fb57ecd76671 SHA512 e4382d24f3b07cf6f67948dfb1bbf18ddc56d94cbc98802b6b4682a4df95e87f597a61d97bd3217c238f90c6ccc8c9e08d77a576efb7bbfdef76c69225bab136
 EBUILD pytest-cov-2.5.1.ebuild 1509 BLAKE2B 04b63690469fe1d6af9ac85add37fd75f2f90c4bf95b092efee26e2f85bf47ecb8693628f025621928b26887312a85202c4447708e0f6b116aa886373a01ccd9 SHA512 741f39ad5f2d63ca64cfdad5a2049783d79b1402184a6bb3ced95c894ef332f5b97b23b9c4224ab168f7965af13ce8ea0bfb766fefea7e7d7c153e2b9924230e
 MISC metadata.xml 460 BLAKE2B acedcc7748c95511d1ebe201052b50e43569250e41f8d08d8eceb3f8c8b10924d64e74f6ff6453896f9fceff2a939f42d21d3013b9a486b007bb922dfd285ac9 SHA512 5600a6e66b683a30d6252699a28fecf727bdbbad6ef40cec0fabb89f5afd3a0cf1e2b8e2b80ffa6cc144ac03f5e7066117d72fc968492bd3b1d6c89a8b035228
diff --git a/dev-python/pytest-cov/pytest-cov-2.5.1-r1.ebuild b/dev-python/pytest-cov/pytest-cov-2.5.1-r1.ebuild
index e095ad0d6dbc..981f3f0a4f4f 100644
--- a/dev-python/pytest-cov/pytest-cov-2.5.1-r1.ebuild
+++ b/dev-python/pytest-cov/pytest-cov-2.5.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/dev-python/python-fastimport/Manifest b/dev-python/python-fastimport/Manifest
index a5adf433f976..97cf21a88576 100644
--- a/dev-python/python-fastimport/Manifest
+++ b/dev-python/python-fastimport/Manifest
@@ -1,5 +1,5 @@
 DIST fastimport-0.9.6.tar.gz 33333 BLAKE2B 46e654c26bd388a61ae0717b66294dbc1261aca9a2b6e1823e6d8afad014fd21d0ea54e70e018ba79cc45dc6111ccf84a4eb68e053c0812773a4c25cb32e0569 SHA512 cc38c1218d65ef4a9e3a68d8af3fadf98c7cc0dcd8075b338b8f492d25765bc2fe2247000868fd3c95e1f7f4c2b9a05964ef7b4f9196c2777f6a7941f127f416
 DIST python-fastimport-0.9.2.tar.gz 30762 BLAKE2B 2484e02077017c5534afafcc17627bef8875379bd8e66b5610408b5b11feb6db32cd9e97905a9ff3bc23cc58f6e01255bb3e18ea6fa66e0d077a42504e0def39 SHA512 8fd9f89267ca88edff94cea7537740431d02680a1eebd085ee376954b47bf5222e7575750895d0d2da246694cdac7a5afe50d857b87c0f36e04eb3511bcbe472
 EBUILD python-fastimport-0.9.2-r1.ebuild 733 BLAKE2B 940ce483a6899bbc08cf08697ee09b549f3c09eb8d9cb95e6cd2d2084c6230f7eb7e348fb851bde9d75000f412b73eb5309b61658e58902128460633430d9482 SHA512 760a4ff1038c958cb02cc7c3f5105d1fe626e775749d17b43437f9f7bf20a747301479b0fe8691a097c0c92f891d6e892ad7d7839918d1a8608c20e3ea4d8fef
-EBUILD python-fastimport-0.9.6.ebuild 800 BLAKE2B 0590e2d60c79a43343ded4c95781080b1bbcfa861362ad317770334ac3ed5d61a6fd126ee7318fac7ac5a5381b8d22655c9b2b826f61b964756c3783c7e28827 SHA512 5f1acf55b4a81f5a86a943d7390810384a297bf731ba03c69515ed2a48f4bc2141f8ae60f52fb86eceaf3dab1d970684b59482a94754810d454123ab35d2d393
+EBUILD python-fastimport-0.9.6.ebuild 799 BLAKE2B e3295fd06c6692e526de937ee59fde05f2a4a83ac1a7ff4dffd2b0625532bee851467f584cc3b8d8eb546132921dee0fa792801af6c23659e85d60282537459b SHA512 e0dc339655a413d32f49183c48e459a8b0e4e89709c109a2161d8ef18b8f2b4a5064badf538f12fe3e14ba6244cbb189f4c58f6e7ad46520085b8087a7a6c686
 MISC metadata.xml 525 BLAKE2B e52c5438439feca8777be134def1dd08137b1eaee5529da606a998c0fb31414bf953d47e9b9a2f34c83ddcf6e755a0111356e3be2b51475add936fdc1ec1edc5 SHA512 f425168fa9fac4df1cf9af941b79ac92b98aba05b05fbaa9b956ec7d0d97526e4d473c6f349f28f00ca55a2886664661ccb8f77bb793ba5f7c946062516091c5
diff --git a/dev-python/python-fastimport/python-fastimport-0.9.6.ebuild b/dev-python/python-fastimport/python-fastimport-0.9.6.ebuild
index 17ea2dcc430c..99e81de92b40 100644
--- a/dev-python/python-fastimport/python-fastimport-0.9.6.ebuild
+++ b/dev-python/python-fastimport/python-fastimport-0.9.6.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
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-stdnum/Manifest b/dev-python/python-stdnum/Manifest
index d5e550f222ff..ad78b837527b 100644
--- a/dev-python/python-stdnum/Manifest
+++ b/dev-python/python-stdnum/Manifest
@@ -1,7 +1,5 @@
-DIST python-stdnum-1.5.tar.gz 268416 BLAKE2B e12cb020c438939f2d83166bf9330e7a736c734b007fc8d7016784631dc2e9764040ff9e1f089b3a3b8132fba59b885da74eb8bbdec1761997db90111351199e SHA512 8d6394d7039fc5a2e3785eb95ef1793038ae75443224fc5af7f1cae2cb575c2f4e5451bd9668304ba95d3ee3f87dc0103ccf6c35837220f9729cbe1a3e13f656
-DIST python-stdnum-1.6.tar.gz 399518 BLAKE2B af9feb648c8612a733def2722189cc4c453c75d7c2f8b828d4df080965d43ba17826a11e7d8b57009abedfbaadbf298ae34f8c3750a6ad64fccbcbbfeeb892dd SHA512 dc2fba2563e4de658a09b7afc7d0d663f21b5528da9061f126d581e8deb2a88569c83304bde834c0da376dc65ee09274aed82d55abb60b0fe0a181e1b5cfe88f
 DIST python-stdnum-1.7.tar.gz 411134 BLAKE2B 22afadd03c1f9043a68f34dcebcb80f8c053deb550924ae16c8e9b121f47da5422a28578743a6aa3cf1b71bc8fb3b588352ff776a36c78161cb3fd69faab71a6 SHA512 323f5e37087e95143eb59345c4ddb5fb1529a136c234c8e9c957cf9914984e758b256facbfbc5de379000b8939460ea25e8105428d67f7052a23676c334a002a
-EBUILD python-stdnum-1.5.ebuild 586 BLAKE2B baad79f5c18391c74f34d22fe090c599a7cd35c2cd9d0d1e06986a6892ce4975d5fa175475520e6e1a16c4ac7725b4f4b8a7bd24758d6c2f9da747246d3173db SHA512 88d2be7a2078b7ccc7fb7f214324aec72aae4e29afaa8bcb308584ce6e3ab5e8f760b7d28a153e626f82f736797cfa0c67bd5bd6ca0d6ef27af9d2d5a85e89b8
-EBUILD python-stdnum-1.6.ebuild 590 BLAKE2B e992c6cab8507ce22543d50c2676adcb1d907b7cbe9f22e28ba41769a810da6b468d84f2a24f00e2f8eb1b1ca69a9010820d10b178b3c2ac7e00c543bae43c17 SHA512 97eac31e035313c2c4b1c6d987a702fbb0340c452b48e9ff52f1df8bd43a8d7f1f954b811ab656eccff5b0ef69818d5308347e6649a7f5e9056258ace5d6f7be
+DIST python-stdnum-1.8.1.tar.gz 421921 BLAKE2B 814e887e15573ef09ee7a050204204474a06b9a65dad6f98a67a029ee4fdb64764dcbe43c491dcc6fdb56a88ea837bfa0b14a3c45dfef6b0aafa47ce70dc6f80 SHA512 02b0f8bc7e2245f780777b3b45db860b6332ad7fedfd6e674a8d67666693107773f5eda02bb241aef950a2409d5ac241b6de8326f80159311f2c22f0d0dc9465
 EBUILD python-stdnum-1.7.ebuild 590 BLAKE2B 650245f7c0a02191702f709f1f436cf5e33eec9b549405fb92c2cb0aaa7a783e482d49cea5e6fda7e3035cdfda7e0f95b23c5a9b6e4aa37e9db2dab64331ebca SHA512 cae7b899ca9fe76c4b29d2c56d5dd800bd12d75f6b0bc1cda3e2859e6b921eb594c8ecc58fee84c99b71c75e033a0f479ab5f90120900e2bf3740af7f0f48117
+EBUILD python-stdnum-1.8.1.ebuild 613 BLAKE2B f2d38a444e22bbb09bffba355ffb50e83a7a2d148aff2a94fa10f79970263dedc5b9a61c16a5978a1bc256e45bf82d54805b69d8cc7245884faa095e96d77fd8 SHA512 a2e17ffa3d7d1ed4708bf4a25fde80f17d061e38117e892fd423338b911152fed71b06af2613e55b396fd1d98ba87db90290ed7b8131b67e1e97924c2ec40c94
 MISC metadata.xml 475 BLAKE2B 4a2fe0a8f727cfaeb086d33e384b52ada0555f7c57028470c1ab2524bf4e12cb4b501736a9e9b0d14cfc66880e2878d93cea188f035fa52b8c959dd99d034797 SHA512 4aae016f69e817168682ce7a08e9cd61da5397d83706b628b4a743491251c80ee0947f5a00f3f3657c2f80f276661f0287a5359041451b997c214ba94cd2430e
diff --git a/dev-python/python-stdnum/python-stdnum-1.5.ebuild b/dev-python/python-stdnum/python-stdnum-1.5.ebuild
deleted file mode 100644
index 65a4b727012c..000000000000
--- a/dev-python/python-stdnum/python-stdnum-1.5.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="A module to handle standardized numbers and codes"
-HOMEPAGE="http://arthurdejong.org/python-stdnum/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="vies test"
-
-RDEPEND="vies? ( dev-python/suds )"
-DEPEND="${DEPEND}
-	dev-python/setuptools
-	test? ( dev-python/nose )"
-
-DOCS=( ChangeLog NEWS README )
-
-python_test() {
-	nosetests || die
-}
diff --git a/dev-python/python-stdnum/python-stdnum-1.6.ebuild b/dev-python/python-stdnum/python-stdnum-1.8.1.ebuild
index f2da42e2503a..9bd98db12525 100644
--- a/dev-python/python-stdnum/python-stdnum-1.6.ebuild
+++ b/dev-python/python-stdnum/python-stdnum-1.8.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
 inherit distutils-r1
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="vies test"
 
-RDEPEND="vies? ( dev-python/suds )"
+RDEPEND="vies? ( || ( dev-python/zeep dev-python/suds ) )"
 DEPEND="${DEPEND}
 	dev-python/setuptools
 	test? ( dev-python/nose )"
diff --git a/dev-python/pytidylib/Manifest b/dev-python/pytidylib/Manifest
index 4594714eedf6..8d486b3736ac 100644
--- a/dev-python/pytidylib/Manifest
+++ b/dev-python/pytidylib/Manifest
@@ -1,3 +1,3 @@
 DIST pytidylib-0.2.4.tar.gz 86650 BLAKE2B 15212651c83ebbec5b74418f37bfcd0366e9b6cdfc0820953e34ec3142871248df02618a51415a36b84ac8c2e5a12d996ff7301b5bf3a001fb42297df3a98202 SHA512 443e9af0fd458d4f041e3b72415839838a4edc83f8a978e5cc0bdf53202584e269f1ad5df10967d8ae4b98b24dcffcf9f5a54e0e3f6cd620a8a6a20171da0811
-EBUILD pytidylib-0.2.4.ebuild 642 BLAKE2B c7b1c87f29d5d959934afcaa446183e0018690321ed6f8d1aadff570044b80fff04320c386b1e68fcb253ee6e4198e77191ac0cd465fab897f1381766eb0c169 SHA512 22f382894cc3cdd2334944e3b266ae1445320295625abdf0eaa87e7e52f26780f4cdb481b6540c24c8166db39e782443cb5e6c67f5545395186b6f96c14d50c5
+EBUILD pytidylib-0.2.4.ebuild 640 BLAKE2B 2592f38ce16cbcc65bf2a16741a4006a4d12b98e4140b7558539cbc4119e728ee27a5cf7df7045c1590e5097acc0998cbcfb4ca7f851ee5055888052362861f1 SHA512 c987bd0531902490041b112f875ea56241af8b9353238512f25319e816cf4837bd0903aeb9f77b21ed9841be2562b094fadf181468559c2f97e80d03cf228674
 MISC metadata.xml 385 BLAKE2B 6c53cf6462d81e85c2a9facf85c0fd7b6c0c870656fdc4cc63bcd67e646d51e14fc9246a7b75a527eccecaf4385677ea63b56dfa04aeab708b41b83c8bc4fcef SHA512 e41d4897a343c45e469fe4cd52a7ce93d525ea208dd570fe0517feda8f445fa9175d971e4c37b8f1941a7cb6931ff6473526ced82384489f02a11c4040fec933
diff --git a/dev-python/pytidylib/pytidylib-0.2.4.ebuild b/dev-python/pytidylib/pytidylib-0.2.4.ebuild
index 53dac614267f..af2a120838e2 100644
--- a/dev-python/pytidylib/pytidylib-0.2.4.ebuild
+++ b/dev-python/pytidylib/pytidylib-0.2.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd"
 IUSE="test"
 
 RDEPEND="app-text/htmltidy"
diff --git a/dev-python/qscintilla-python/Manifest b/dev-python/qscintilla-python/Manifest
index 19e572c2b93c..b3c0bd75e048 100644
--- a/dev-python/qscintilla-python/Manifest
+++ b/dev-python/qscintilla-python/Manifest
@@ -1,5 +1,7 @@
 DIST QScintilla_gpl-2.10.1.tar.gz 2663446 BLAKE2B 720ce990b4e3dd65d47cd26b473bffc07240d76b2c10d393cba41331c6f160472d87b9b22985fd45b5b8064d5358b3b25f0decfe8759542a9c987381249bca42 SHA512 ea9b95ca371a8af9262493ab59ecaef77e1697ba21d1d594aab39e836917884fd829aa4f6c4e72cce60b0d3f40eac654157cc507d027945f0034881855123ccc
 DIST QScintilla_gpl-2.10.2.tar.gz 2665138 BLAKE2B 1c6349ea717997681e678cdfa6cc590a6a1cfbe652f2dd52d57fefff71229251c46cd4554b546d2e272deb7c3f970c44f657966ad08e45279813215a775c637d SHA512 755f486d62275acb5908262c4a50ad31dd9d8fca0501eb1eeec1aa2181872f8d16179b42f4213b207fd6b46fd8a72d25af7ce6c5cc10eabb363a92c0600ca972
+DIST QScintilla_gpl-2.10.3.tar.gz 2721287 BLAKE2B cc85eea17e563ae5f4a130d26ca88bec3e1a6cbff7bc0af096c63789384d03149105641d6324f53b37a2bd8ab4681a285ccb76e6063a06e5db30d070d3fd8219 SHA512 a1b9d6869797ec074e4e0727164804779792fb77b2230aae80e6d6b5fb3a3ff9d84e17d775d18ab74c97b78bac454511fd2cb49be1fa36f71d9097abf88045b6
 EBUILD qscintilla-python-2.10.1-r1.ebuild 1977 BLAKE2B 06efa137a2b74ecba71b7a42ae696b0fa873a528f68ca216d404f81e73f4088bed21338e97275e20c94a2a206f00c284fda5df91f0b84eb88f14ae276753f3e5 SHA512 af165c096785ced3ffcf5c0f0332b445c0e9c75102ee880e85a12d087adface591caa19b11b25d7626527ae35e952a1e645bf24f7837d3900d8e5eb1bec82c5a
 EBUILD qscintilla-python-2.10.2.ebuild 1979 BLAKE2B de320b5b36a55ae2d38a44a85cba8188acc74714fe635ddd77fd5875281f787da70f635c518526df0b3f47ab565c9799dc043f7be5158f03fb9426bd13cde2e2 SHA512 0f71ca4bed1f084fde43e3a6b3bab93510a8d359c5239e936f2f5537d10a51a6158ec2db1d0e7c06c491f944542cd48a24b293c823997df7c67c0941fc860d43
+EBUILD qscintilla-python-2.10.3.ebuild 1530 BLAKE2B 468794c93a97f20d91bbe6bcabfdb82a978934321be5afad31a81f19bae7877b21644648c7490407f6e4cae72a7816d0503f9cfa90ff688f474a83220293568d SHA512 7c0fad99f6959f05258a6f5dba489071f0cd53982fdcde2967b69d8589f6031e24e76ff8172453caae1f03e27ebf61e21787ca5cb625f5c4a1d2ef150e2003d6
 MISC metadata.xml 666 BLAKE2B ca3cfedb72c4bc624270f669034a78c1fd41ed48a261b6d2fd84ee9994d130d1b558578925028eed57a85db021f3cfe4b70e51eeb9a42f4f71392994f7bade82 SHA512 f78ce18443d32b17307e96f8177bc5fb46f5b9f6b4d797e79dcacb6eb76bba578f7d666469576bd5e326717bcd9167fe34a5e1bd1ead5679619816ef8f0363da
diff --git a/dev-python/qscintilla-python/qscintilla-python-2.10.3.ebuild b/dev-python/qscintilla-python/qscintilla-python-2.10.3.ebuild
new file mode 100644
index 000000000000..ab5f9388efba
--- /dev/null
+++ b/dev-python/qscintilla-python/qscintilla-python-2.10.3.ebuild
@@ -0,0 +1,69 @@
+# 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 python-r1 qmake-utils
+
+MY_P=QScintilla_gpl-${PV/_pre/.dev}
+
+DESCRIPTION="Python bindings for Qscintilla"
+HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/intro"
+SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="debug"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+	${PYTHON_DEPS}
+	>=dev-python/sip-4.19:=[${PYTHON_USEDEP}]
+	dev-python/PyQt5[gui,printsupport,widgets,${PYTHON_USEDEP}]
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5
+	~x11-libs/qscintilla-${PV}:=
+"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}/Python
+
+src_configure() {
+	configuration() {
+		# Fix out-of-source build and installation of .sip files
+		ln -s "${S}"/sip || die
+
+		local myconf=(
+			"${PYTHON}"
+			"${S}"/configure.py
+			--pyqt=PyQt5
+			--qmake="$(qt5_get_bindir)"/qmake
+			--sip-incdir="$(python_get_includedir)"
+			$(usex debug '--debug --trace' '')
+			--verbose
+		)
+		echo "${myconf[@]}"
+		"${myconf[@]}" || die
+
+		# Run eqmake to respect toolchain, build flags, and prevent stripping
+		eqmake5 -recursive
+	}
+	python_foreach_impl run_in_build_dir configuration
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	installation() {
+		emake INSTALL_ROOT="${D}" install
+		python_optimize
+	}
+	python_foreach_impl run_in_build_dir installation
+}
diff --git a/dev-python/raven/Manifest b/dev-python/raven/Manifest
index 04b587aca024..5af986d49add 100644
--- a/dev-python/raven/Manifest
+++ b/dev-python/raven/Manifest
@@ -1,7 +1,9 @@
 DIST raven-5.2.0.tar.gz 225471 BLAKE2B 9ceb05f33cb10718af39cbb30aac0e76a4d7c79fa0fa89ab150506985de80bc364490766e974ef7711fd45cd4a73ecaee9609b6a2f585398a7b91af4590c2906 SHA512 a7e82d9060f466500e429c119a184da1f437632dae76dfd3b24b2101e3fcf0e7fcf8b7371c299e5174c15516c127a3e437269d62d908c59f02c587f3ab528b21
 DIST raven-5.3.0.tar.gz 319160 BLAKE2B 5e4b3c817e077210381354e990b9676925ef46b31afe29e615342b63659d5a434a672105ee8b0aa5319bd9e21eae75521be74b78e9ba16aa5d39d032c989ea3f SHA512 805a0910aea0eed73704dc57a32482a5b01501c27c788c105b84d12241480e70d1454ab54d924e6c8e5ef03764ed5759fc79482ee24417e801e9634353160df2
 DIST raven-5.31.0.tar.gz 275545 BLAKE2B f7b93a21884d7d0de3af5b7562aa96962babc081d292ec1e0edb8f06bf572c73c5862eb2829faa06c75d990815912cf52f789ee19cdf73e0835642e758bb1e20 SHA512 9299f980640dc5aa4d4ddccfcab4b6b514eeba389aab084e267221c0966aebbe56836b07668e74b5362d51928ac4b708913f081b73a439dde8b74a37c159b7de
+DIST raven-5.33.0.tar.gz 284367 BLAKE2B a66471ed09bb2afca4afe78f662fdc21464e89bb1317fdc5481f87bdca626ad2a0064e9b9681d63e6439ebecd3f25d38a0000666a0c55ace90ca51efb2ccd1c8 SHA512 b6924c36f1cf4e957e8399e757dd1f3fc8152c14af06b700d139cc93bc3dbde4186690fc6934afeda03c13a3b59e739ab3627759580b3adb890f0c1f1ddbe8fd
 EBUILD raven-5.2.0.ebuild 481 BLAKE2B 8ccad623ffd262e5091cfed5f0a6ee97260dbb65e1db5628b9bbf8c2ad37f79a9efc7cd02b300551fa2c745cce22fb78c39419f2ea43c0aed01bea67d9fb3f6b SHA512 0b16fd24dfc7ba828eb49abfec0d3c0c6022f4871ce8996d296da4ee9b553ed53d8ec4b878b216689cec43f5a387f854854f88f47f731d400b0f80b975e977e7
 EBUILD raven-5.3.0.ebuild 481 BLAKE2B 8ccad623ffd262e5091cfed5f0a6ee97260dbb65e1db5628b9bbf8c2ad37f79a9efc7cd02b300551fa2c745cce22fb78c39419f2ea43c0aed01bea67d9fb3f6b SHA512 0b16fd24dfc7ba828eb49abfec0d3c0c6022f4871ce8996d296da4ee9b553ed53d8ec4b878b216689cec43f5a387f854854f88f47f731d400b0f80b975e977e7
 EBUILD raven-5.31.0.ebuild 543 BLAKE2B 985dc16abcb34ff4fb46e8afe11d4ece2e6f32c91333aab46ad2785b6b7ba3766b9731998ebb0ab7693fa64c7d469040e27b9a655ab007209587b9e221977406 SHA512 71df717aedd8a2f09661961c7ce50e03ecebf3821b4294c7740479a9c1f87c03631f64adf2335ea15adec34d0763dbbcf4be64eb246b140204c8af85dfa49b53
+EBUILD raven-5.33.0.ebuild 547 BLAKE2B b264e24a33d426d5c5ff071de9b34a720ae83d7b2d895ac17beb782862670250418d65d95f57d8d2c356ef66fca529fcd6a31d5d94cef4e3e210d7bdb13f4a5f SHA512 8c58ad85d156d748493038e0144f93a6c1e153f3a2c205efcd93f3f15bdf62e24a4598c5d597c90c66f2378ecb544e672e11b7d863b2020f5d6238f2ca057288
 MISC metadata.xml 302 BLAKE2B 2948facec48fbb66ddb7c0acc7ddc49e671c9fc8d0dd82114971e1382aec4615aff364a954f9e3b2ed23285405a0e047ad0a6aaf33f4166c0253c0aac1d34a79 SHA512 d6de354f658e8eab89efec183c341052a34471cf58d339d29e511c0cfaac76771105e7b1b4f72ddc00bf95ee36a4621a7716c479b5c358fb2dbfc60d75083fe8
diff --git a/dev-python/raven/raven-5.33.0.ebuild b/dev-python/raven/raven-5.33.0.ebuild
new file mode 100644
index 000000000000..c7e0984444d2
--- /dev/null
+++ b/dev-python/raven/raven-5.33.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Raven is a client for Sentry"
+HOMEPAGE="https://github.com/getsentry/raven-python"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/contextlib2[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
diff --git a/dev-python/rosdistro/Manifest b/dev-python/rosdistro/Manifest
index e5a9c341219a..0b6f7af7aa46 100644
--- a/dev-python/rosdistro/Manifest
+++ b/dev-python/rosdistro/Manifest
@@ -1,6 +1,6 @@
-DIST rosdistro-0.6.4.tar.gz 58603 BLAKE2B 9eed482987826b69eba51f1776df0d2285c496130d500f082f82fe7fbbb8e8d5767dcaec93582328a33c164a862ac2a46ac6d0ed0f770ebb16b25e680dc1e9af SHA512 92365b556cc6615245bd69cce35efb2fe879fe42fb4aafef08b2472c67b43e14e3088c1186e8b1d4f5f3781bfebbe826b3c361a9435ce27745a3506d20d40f85
 DIST rosdistro-0.6.6.tar.gz 58881 BLAKE2B 9daa5c08b97509606d5077f55e8a85d2cd278f69aebff22feefd9661d455f38cff549ee26f894b040cad7192f044828a20cf749d83a257a8b5604f07d382f081 SHA512 2a4b0dfcaa43a8e4d4a0fff5ed204ad81317156128d9050e0c67dfe2cd9efda2bfc84f454e424ebd457e7c62c7c6add113ceb31e99310c34a9fc9f206e510922
-EBUILD rosdistro-0.6.4.ebuild 979 BLAKE2B fa07155748189f0377c4ee69288f0d876d77bd8b8ed4f942abd309fcce01db3e890da5012c5c85110fc3e00724bfafc1bf32f53d5581557887102bd1407990c6 SHA512 ead56ec46c5e25727911212be51bffd567e5b84507984ab74221b5fb4107b95e17c2f1a8f51110fc70c361cd41f3e2d881dc7d9c9f42b4f911011e4443ba5bac
+DIST rosdistro-0.6.8.tar.gz 59771 BLAKE2B 5610ef992824104570abc8c5cc0224838ee1442d942f8f317b20b300831f7536649b47360e7f542e484d75eac29af71ce9e82fadf91b540f4671478039776921 SHA512 57db65b7cba29e41c14ea4e45f951a410e6152ce4247afd1b15df51cd79e50bdbc95151eac02acc666f8bc3c2658695600ad1b4fc0f4152d71901685c9e8f558
 EBUILD rosdistro-0.6.6.ebuild 979 BLAKE2B fa07155748189f0377c4ee69288f0d876d77bd8b8ed4f942abd309fcce01db3e890da5012c5c85110fc3e00724bfafc1bf32f53d5581557887102bd1407990c6 SHA512 ead56ec46c5e25727911212be51bffd567e5b84507984ab74221b5fb4107b95e17c2f1a8f51110fc70c361cd41f3e2d881dc7d9c9f42b4f911011e4443ba5bac
+EBUILD rosdistro-0.6.8.ebuild 979 BLAKE2B fa07155748189f0377c4ee69288f0d876d77bd8b8ed4f942abd309fcce01db3e890da5012c5c85110fc3e00724bfafc1bf32f53d5581557887102bd1407990c6 SHA512 ead56ec46c5e25727911212be51bffd567e5b84507984ab74221b5fb4107b95e17c2f1a8f51110fc70c361cd41f3e2d881dc7d9c9f42b4f911011e4443ba5bac
 EBUILD rosdistro-9999.ebuild 979 BLAKE2B fa07155748189f0377c4ee69288f0d876d77bd8b8ed4f942abd309fcce01db3e890da5012c5c85110fc3e00724bfafc1bf32f53d5581557887102bd1407990c6 SHA512 ead56ec46c5e25727911212be51bffd567e5b84507984ab74221b5fb4107b95e17c2f1a8f51110fc70c361cd41f3e2d881dc7d9c9f42b4f911011e4443ba5bac
 MISC metadata.xml 342 BLAKE2B 1975e171b6e686c5fa1cf51909101b1785f2610f619de6465329c935023adcbe5d0373512bf7e7fb5a2451e31664faeb2aed67eb9af58d40005f10ee1582e4f9 SHA512 5f55e6edbfd3be1214791b1897ce625f6cc52989ac007d7de9c9eb0bff57c1ca805ee18b911fcc2c29a86a5fb9f68e1b9647f69a38dc6b1d1d74334b35ac106d
diff --git a/dev-python/rosdistro/rosdistro-0.6.4.ebuild b/dev-python/rosdistro/rosdistro-0.6.8.ebuild
index 8780e241c60c..8780e241c60c 100644
--- a/dev-python/rosdistro/rosdistro-0.6.4.ebuild
+++ b/dev-python/rosdistro/rosdistro-0.6.8.ebuild
diff --git a/dev-python/rtslib-fb/Manifest b/dev-python/rtslib-fb/Manifest
index 603b399651db..e67c7ee8d9e0 100644
--- a/dev-python/rtslib-fb/Manifest
+++ b/dev-python/rtslib-fb/Manifest
@@ -1,11 +1,5 @@
-DIST rtslib-fb-2.1.57.tar.gz 30746 BLAKE2B db8cafe226ebaa32c9695ce85de748ae935b629ecf534c8bf04532fb46bd1a3abda3128bb1269f4c1207803b1918daf838c5fb5a0c13368420a36ea67de2ef59 SHA512 0b46b17498bf2a5f4853c9d989bf6a192280d95416b195c0c9eaede4759612b6c3800fb1d3f44979c10e95ba0c3f06dd9756a805d63f61b292a611003f48059b
-DIST rtslib-fb-2.1.58.tar.gz 30706 BLAKE2B 242c308da8be784bc7c232588a4dbdee084e47ab5bf6e7e98333383d957333782ce446f248a55bfb1a7cdf66d53f8c586e02c3cb690f2fffaef52ecd639a420e SHA512 a3f4c22d42b4b76bb9a5ce2d1027c4964385fa427ec55cb92f1acb0f9b647fc0788307354144534e3f216fc12f3fc1a0a55fd4454225324aa13488f21df092c5
-DIST rtslib-fb-2.1.61.tar.gz 31144 BLAKE2B a9d8d9355c373d1f4476ca5489a5dcbb8fc848f469e3640d13a87c4506f43b7e5d5e66042e9e683634ad04ca93d795c61598d17f2b2371f37d9c2a796d2a770d SHA512 5c2423fd315ca00aede358ee18a7d0b61019c5dbd8f68134b04bb0c3ecdcdeb4117dae9f1421a38dbd4b612b563e733dd683b39fc3e47a3e87affce1f423e508
 DIST rtslib-fb-2.1.62.tar.gz 64481 BLAKE2B 121da0560decc4297e1b695038dddd83cb876bcb0c7523b60119d74922cb10b0389fb6d9246a86b79dcf9b6dc55e263834adbc107146a0e96fdf7eca0dd2a0f3 SHA512 12202f828234aaaa3a4e86ac45a2e3771baa76406d57496765c4789bae00f7043f0105c71f1f5501a37eff8004788a41dbb788532f93ebee2ab79b3e5eb00c76
 DIST rtslib-fb-2.1.66.tar.gz 67612 BLAKE2B ebfddc235ae2492f6e9f44cff4c80f767fb5fae34833ae0027cc0fc0fc32df49393d55e553ad326e64a53280108256374f486f10cf22db3ca8834f382b5a2cca SHA512 36feb8614edda50fe91b9c9db18fd3d73c8f7c8e0cfb9d397f5b928dcd6683586b0a8a6e446d56a551d04a7d27243ab13d7ccb51fd906bf4e8ffba7cb8fa4bb6
-EBUILD rtslib-fb-2.1.57.ebuild 552 BLAKE2B 39281835b1f92878934102d49a153839931e4f61aab15c78b53aceb9cc683746491029dfb13b9e60ad44774fcd1b12a30384a9755666eed3367ef48313635006 SHA512 4ff2679ee9786945df311f7951fb6c644709b78ec6119440d41b4991ec01a24316e2d937363a4244d49e117285e831b527146db63dfde49da3106eaca32f6e60
-EBUILD rtslib-fb-2.1.58.ebuild 598 BLAKE2B ef846cf2206ed591c28501300f894fa48332e3c5a90e18948fa36df3040920bc6a2c7951e51d28c8a20020db37635814454888cba51cceaca4081e3d0e07c993 SHA512 e08d61fd1246cf30525997064248085d64ee81d86adc11656979c82862d9c294366ff6455b9e876118078fbbcd544ef09fbe9531d121b4e2cdb1e81e7d5b0785
-EBUILD rtslib-fb-2.1.61.ebuild 638 BLAKE2B 7c2ada7e1b12b151c1bea9ee8583e5b1541fd9cca631a1d847095de86891ea2623e30a8913540d255dc000776346fc2b80836942148b5fa629cf96dc79ad8d8c SHA512 7ca06ff27d74afaacbd4967193a091e20f6cae61b5f8aa963cf7f6abc7fc7c75f9becd3ec38688d30a311e4fd569d78343f02143066723c815a4f1febd9a7979
 EBUILD rtslib-fb-2.1.62.ebuild 616 BLAKE2B d6e4333fae6eb964572fca087152a46994a1b4d9f7b001dbea502b8f96716336adf3aa26e7899c57606270344aa1159fb7c6e27c4f59bad26d273280cfa017f3 SHA512 685ae458f4eda8dd89f652ae35230c3c1491852bb4b4d14a914de1957c320ed93f5dacd92f0320a1a0165938407776b8f9339e349a6a28b06dbe30961bf35fc4
-EBUILD rtslib-fb-2.1.66.ebuild 618 BLAKE2B b97de837ccd7b8af42b79ed1f96587f96c518ba558631114b67a0f27c4cf29b5d41daf0d234bc6874aaad47b42b51b7d148baa66c3ae4fa01096faf3b888364c SHA512 169d3a4805aa04dda67da9b77c7314941d7739b25fb57cdeb5efdaa8595e5274085f071d5d265d58fbf40a758e39f8966d7ab37509f75b9255b49467ee5a3d1e
+EBUILD rtslib-fb-2.1.66.ebuild 616 BLAKE2B e2697dbf353d972ec65d9a4dea042de06980235eeb1ae61becb67a0359fd2345c5b45bbdf680b0d66ccf244238da9083c45f8ba29f48137a16313fbc8964924d SHA512 bc244364b854c8e84d36456c4ab2c8fc94dcb3b135a0769d3df26f2dc6d7d0e227095c823bbe3f61174995e8a95266b03ecb5cfbb1bdd25e8c16c7527cfcaa7f
 MISC metadata.xml 625 BLAKE2B 849b1694d5f8fbdd1ca4b54990c7d9feb00d4465cfbcf97672a2f3315288b681a7dd15d9978e99d8c438d229e933d7e7a4cde7095d8a0f864268dafb228930b5 SHA512 838fa39adceaef8854dd2b5f873e0f2253bb1fdf616da974154166d7fde861d11806ae439c573b6cb7d392ec37de18956bb119bcc83e48ce0a9602d6d559e0ec
diff --git a/dev-python/rtslib-fb/rtslib-fb-2.1.57.ebuild b/dev-python/rtslib-fb/rtslib-fb-2.1.57.ebuild
deleted file mode 100644
index b11341189bcf..000000000000
--- a/dev-python/rtslib-fb/rtslib-fb-2.1.57.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python object API for managing the Linux LIO kernel target"
-HOMEPAGE="https://github.com/agrover/rtslib-fb"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~mips x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	!dev-python/rtslib[${PYTHON_USEDEP}]"
-RDEPEND=""
diff --git a/dev-python/rtslib-fb/rtslib-fb-2.1.58.ebuild b/dev-python/rtslib-fb/rtslib-fb-2.1.58.ebuild
deleted file mode 100644
index aaa9c0649ce1..000000000000
--- a/dev-python/rtslib-fb/rtslib-fb-2.1.58.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2016 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="A Python object API for managing the Linux LIO kernel target"
-HOMEPAGE="https://github.com/agrover/rtslib-fb"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~mips x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	!dev-python/rtslib[${PYTHON_USEDEP}]"
-RDEPEND="!dev-python/rtslib[${PYTHON_USEDEP}]"
diff --git a/dev-python/rtslib-fb/rtslib-fb-2.1.61.ebuild b/dev-python/rtslib-fb/rtslib-fb-2.1.61.ebuild
deleted file mode 100644
index dfc864dac90f..000000000000
--- a/dev-python/rtslib-fb/rtslib-fb-2.1.61.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2016 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="A Python object API for managing the Linux LIO kernel target"
-HOMEPAGE="https://github.com/open-iscsi/rtslib-fb"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	!dev-python/rtslib"
-RDEPEND="dev-python/pyudev[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	!dev-python/rtslib"
diff --git a/dev-python/rtslib-fb/rtslib-fb-2.1.66.ebuild b/dev-python/rtslib-fb/rtslib-fb-2.1.66.ebuild
index 63d56223ca51..d87c93d7bc41 100644
--- a/dev-python/rtslib-fb/rtslib-fb-2.1.66.ebuild
+++ b/dev-python/rtslib-fb/rtslib-fb-2.1.66.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~mips x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/scandir/Manifest b/dev-python/scandir/Manifest
index 036d6052667b..20cb1921959e 100644
--- a/dev-python/scandir/Manifest
+++ b/dev-python/scandir/Manifest
@@ -1,5 +1,7 @@
 DIST scandir-1.5.tar.gz 29351 BLAKE2B 12cd7d18515ed597d0dc68ff435a442397a23691a0ad2d11d700f28b8abba58517859808190466fb799bb51a4757c4223fad0b1426c1be19bc1cd8f4ffd2601b SHA512 e6535e92011cc2c5f888ddd083a9dc48921609fd59d9bf9a4bcd596c055dc0510d48f6d3571605bbade3bd0e232e8bae94b44b20ba935e7ffdeec268ba3d2ee4
 DIST scandir-1.6.tar.gz 29670 BLAKE2B ad8c231783c14246341cd23bd79185ee10894bb29107ba7c0bfdf51982bda99fd8ce45ea52ff42687371d56b3e6d43cf1d6cc65bdaecf43da9059e524a801e6d SHA512 d01e0551696787caded787a430eea787a69a27c725505277420fd607b3fcc892218377bb340651fd906bdeb3a57e99879df3c86aeadd2399fcbe45cb2118b9db
+DIST scandir-1.7.tar.gz 32812 BLAKE2B ed80775b5acca85d8829e2fb46df33fdda08d9dad6cc0e175d1270dc51b6eb4d381a5bd813e2dfd2072ac0af0d642d20ae818e569688ffbe5decaf4421f5e979 SHA512 47c6d9642938f374eb03228cdb6c8d77aa2af01a84b7efc518d223851562a615b616e92100bbeb38c4fa7455ef5f7ae4af8d406f5148d1a26a403708b4a27023
 EBUILD scandir-1.5.ebuild 545 BLAKE2B ca19e8deaf84cc3c3b98e8addaf02a1d025008e6d0855a01f107b0f8c87998a954e4e243e5bc9bf9d40886dda014876fb5eb8ddc38b6c178d1c33adbb5c8f47a SHA512 9900677ca6b68ce43222ba4b24eb50db03e012cc247d3f17326e73784e2de770ed079f51072aac89a342dd524009454d099122626d4694c4d7eca18a4fd67799
-EBUILD scandir-1.6.ebuild 554 BLAKE2B c0c69bbf0d16f995bc29f50fc88dc2c620076397940344d88b93c65e44c86744c5df8fa658573dca8a88e5cc7ebea787aef9eea790c6bdda972714c77dde42e0 SHA512 91a40929cc6f258bfbc7d900e32009ea5b9774ecc353494f03600a9b4a19d0a03f330c97e1e2b6db3cda4493c1e37a16e2a05fae27e91181debc93046413e701
+EBUILD scandir-1.6.ebuild 560 BLAKE2B 9b717201f3a06952d0b7376d341e0291b2d650921e8fe8c8cdb84af143a7c698172533cc7a5f1971beee44387b4cd3618266f626bc88634540291a36fd3f3890 SHA512 1317a3a5cb141a01dc0a9d09d607d6c56a23e9829b063c7139ef9f07bcc76e0ef54b8b1a568e887d96e3ef4accce4dafe435a57069373f4dbc05d9b9695a0c2b
+EBUILD scandir-1.7.ebuild 561 BLAKE2B ade0de7f1074649dd71f4e83f5ffb2c969cef8f088883a579dba8c8eab356ee5eff47ef1fba94a522a56237027a98c7d3e175a59fa4f10f8d4763d69c41d076c SHA512 978a6cb7bd0dab7475477ccc189ddb83298fee86e2740c07fe3ec25e15611b91f0df67f4ffc4ebdbd9cd81de3a0719b6d7a2bd0934a70f4a6fc9cc505d4e9418
 MISC metadata.xml 495 BLAKE2B 7137cdfc395a1e80576885adb3c870ba25034a657c342b3819328f276d55ebf6d7756e57644a6ff4d45ca07cdb561078dbb1deb1b993816c7088850dee45c3bb SHA512 e762fa761b5b00288870eac3af8aed0d05efba207d83138adc873da902a7e197b710caeb87a3083e5f23436f4a2c799996fe07201195de065bd430b9c35183ee
diff --git a/dev-python/scandir/scandir-1.6.ebuild b/dev-python/scandir/scandir-1.6.ebuild
index dc46e4b8dd2a..3f45a2d140a7 100644
--- a/dev-python/scandir/scandir-1.6.ebuild
+++ b/dev-python/scandir/scandir-1.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ppc64 ~x86"
 IUSE="test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/scandir/scandir-1.7.ebuild b/dev-python/scandir/scandir-1.7.ebuild
new file mode 100644
index 000000000000..5b7b33f61fca
--- /dev/null
+++ b/dev-python/scandir/scandir-1.7.ebuild
@@ -0,0 +1,23 @@
+# 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} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A better directory iterator and faster os.walk()"
+HOMEPAGE="https://github.com/benhoyt/scandir"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	${EPYTHON} test/run_tests.py -v || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/shortuuid/Manifest b/dev-python/shortuuid/Manifest
index 4dc52dedd39f..1bb984536bc3 100644
--- a/dev-python/shortuuid/Manifest
+++ b/dev-python/shortuuid/Manifest
@@ -1,5 +1,3 @@
-DIST shortuuid-0.4.2.tar.gz 5367 BLAKE2B 21794b80377cf899c1e792d1252f9a94c200d6d0a65b837ef0284ef9c08c5e4d54ad4d3cc1ecfbcc6538521eb1ce15d5d50e2d91056afd942616db2e3cb7d07e SHA512 c60122bffdf458fb6aaf8ff4883d15f121ce8e5c0b24b99609171cc7bb103a1dbbf876b39e84129b50cc6ebfc1310740ffe684f7dfd93c750d0ff55d483273a3
 DIST shortuuid-0.4.3.tar.gz 6096 BLAKE2B f658bed1ba10b6a18508834e27c4a9a6a9d080c7a6c2a75413bb2b22a71b339ef66b73b8f99436c609b00ecdc1d38b691e2eba32b5c34ea83d4c8191275aa0f4 SHA512 409bcaaff421a392640e39a7d25d4eaa320826971dca9d13270b61f21c78f65c617c302b3f7db5d0a3400c8ed4380a3a8eda90d1e9ad13d0a3a7eca53440ea7e
-EBUILD shortuuid-0.4.2.ebuild 457 BLAKE2B 0b533e4e4439d7378fe69d52285ba98e9cdd032d65e2a2898b87bfdd995c351e4c85762bda25d8931c052a8f1d43c50e13dc977ca65186954d88f132508cbd58 SHA512 21eb948bc9f372719519dfe9721b223e90ebf6b91cfd8e67f250b513818602cd748228a77aafd2842e3eacab12be0e645ccbd5aa177411038edff03310dc820c
 EBUILD shortuuid-0.4.3.ebuild 599 BLAKE2B 6617ac062682cfc89d74da10469f5efaefb498bc2090ab2c8c6588b2e126b154ebf1596a1bf6fa827f650ab2136c069a504a01ac7ad665112d4fedba6bdf43db SHA512 9ccad404a56eb95cf7f2df03dd6c264dd85ec46ffb77b9d898b219f197605358267085bd0f5e814249af3655e9b05840d981cb7b84b4c9671f3131528c0421ab
 MISC metadata.xml 691 BLAKE2B fdb5dafdf9e13ba66063781635761dfd60e0bb7c464aa98161905c95cf6c4eece8e081c9497f2bc6c3c270be8155ec6122afac1b8aef6edd89cfa5b23776389f SHA512 277cdfa5935e51484767c65867e529d9d171f8ac7b4761ce3483f1c76c682c6c3d51953e7ffc2315510c6ef2774e9ea6db6834b3eccf98c1ed1a9cc4e744cffa
diff --git a/dev-python/shortuuid/shortuuid-0.4.2.ebuild b/dev-python/shortuuid/shortuuid-0.4.2.ebuild
deleted file mode 100644
index ab63380795df..000000000000
--- a/dev-python/shortuuid/shortuuid-0.4.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit distutils-r1
-
-DESCRIPTION="A generator library for concise, unambiguous and URL-safe UUIDs"
-HOMEPAGE="https://pypi.python.org/pypi/shortuuid"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index 8ac0dd8a1e5b..bc064de061db 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,9 +1,9 @@
 AUX sip-4.18-darwin.patch 1187 BLAKE2B a3cd0418de90e7377bc2ae1206f4620c6be379a3bd38f22c19256b06f5ba0c90ff07f34dcc8d2f44a25244e11544176a5e1b91049d220bd56cc7b3876a26ba76 SHA512 1afe049fd21f0e8e5118dec4d4b74851cd5e2c75a66a93e1a79a42267954b1edfcff9644696c7d98342499fb27fde727a554b5739cbd791d17a0e319c1dddb7e
 DIST sip-4.19.3.tar.gz 1007481 BLAKE2B cf4d53c956aa046f165e9ec05126fa9b6ca3df688b16ff79520da8ea82f7e9622e03448030db14b0d21ba090893375814f39d6b3fc62343880aa169c2680394f SHA512 b2dea0cb5e1b23531f35e94bd604ec9874f0875badb5b20eb5abd2732a1005b2dd15bb42e0007b65053a2153b50659f24671abd83a434991661168a5778b94bc
-DIST sip-4.19.6.tar.gz 1019295 BLAKE2B 107bc63b8c0f200c292bbf465507602904383a1d3fd0b76da907cda2dcf0e79edb9cbf835bc15dbefd991db6a7eeff97462965d88704e3c926ce9e0dd5af829f SHA512 1bfd2da8b0ece6156aa94713d5e9ced6226b7f49427ca4a11b65452a67e9c740b93a1f90c00a0636d4eef8a31324988a84373c15194f64774b6f8c084d0464f7
 DIST sip-4.19.7.tar.gz 1022209 BLAKE2B 51b29bd436ce7af2d4a3b45ace100075bd257c23982c6e1fcd3f8b2998ee360f1ac42683fbd0e3a371cb044a682c326e00e907db0961aebc70bfb6b583ad2bc7 SHA512 0cead34e129d25ee3d908e503a3853289bbfd77c58c563a2046ce7b65bd8f0b318b20af72346cbf4cb7a17e76c9c1374f686b5dabc284d7247897a1648c15f97
+DIST sip-4.19.8.tar.gz 1024548 BLAKE2B e43dfe542061db9f1d5981d0cc172d9c8420c4e66c282c52974ab28314c33bd28e6056b61f74b04680c1735c9bd2c4656e1a541f4bae94c858d18713f6222914 SHA512 9c0a9722a9a9dd23e2eabe751d622cdd31b376b7987b2c991f5ef4a8d11853c5c6e9f1c24a0d2d864d3990e2a45c2a159ca8511efd4a7e156a14937ef3c680f7
 EBUILD sip-4.19.3.ebuild 2120 BLAKE2B 83b365b259bb57a09a645afaf1def7a57096cbcd6d5aa56eb066b9f680746a49d0528c364fb3aac4d73050bf570caa3ec2a70361f0561f28fec49bafb003bd41 SHA512 de1ff1f0dd2701e4e40b12aa0ffb5fba5f2cd380439eaf292a835812a08a449517769bfbe9d74374b18a0122390ee5449b9fb135797782344aac824e56f1ee23
-EBUILD sip-4.19.6.ebuild 2776 BLAKE2B d1fbabcd47a7b90975c684020df39eeeb5b5975e541249046bd297a8b42895415bcec6390886e9b88c747354cbe1cdb8293a895f9aca32a2fa91036d4b8ce0b1 SHA512 3ccbd79cd1a8004364afd688b22a7920fc58ec9bb9271555c1ffe26fddbf97b612a4bc0e614b6797d085584e780d55e25b10603088439ccb302c67624b4b91ff
 EBUILD sip-4.19.7.ebuild 2776 BLAKE2B 787ad402476cc19ed1a690d0c2fcf748b7c12429f9f61f6a2008dd772c21853745c2f110a3d1f4c57bfac8116636301ab1481fd54652d76b8fbc3c0b257e1f5b SHA512 a82ee1ad2f33b3b4df3b2816f0839a9ead6d52c55c23f9fdc0e79e68319e982d8827db3aa51c9334852e9ae5ae948fb692174e2234541d6c5d2d67f851c63f1d
+EBUILD sip-4.19.8.ebuild 2776 BLAKE2B 787ad402476cc19ed1a690d0c2fcf748b7c12429f9f61f6a2008dd772c21853745c2f110a3d1f4c57bfac8116636301ab1481fd54652d76b8fbc3c0b257e1f5b SHA512 a82ee1ad2f33b3b4df3b2816f0839a9ead6d52c55c23f9fdc0e79e68319e982d8827db3aa51c9334852e9ae5ae948fb692174e2234541d6c5d2d67f851c63f1d
 EBUILD sip-4.9999.ebuild 2648 BLAKE2B 8e7fdbfc969f73f30cf5c26282f06439be6e7d01e9ee087e0377d946aced09295c01ed685e4988a09967c604c3d378e2716552076ca509f6d808fe3a02d470bc SHA512 be5b35c951f7a93d8fe1dd751d4b27132f0249a052cedc4877a3ea7bc56b646744a174a4e0796b127ab0c0082fbb2bfbb1dcb8ef4fd02ff5c10059b44eaf8ae7
 MISC metadata.xml 593 BLAKE2B 3c4b5ccd30162027c913070a54eb9b836a7add04532e1c5b03dd83f0e4e58da0d2e19aee90f1fa4a97db0008a06575a5b0fe33986e1b0c9d473e4adff056afdd SHA512 91f8918bffb715bfb1def9aa6717a8c4149b36e6a1f79e7e3d4c56e0edc51a6585dad3a93698e956f1ff0e659c1f975c3f23be5a498479fc5052369840ac83d5
diff --git a/dev-python/sip/sip-4.19.6.ebuild b/dev-python/sip/sip-4.19.8.ebuild
index 8782d5f10654..08a8e8d93775 100644
--- a/dev-python/sip/sip-4.19.6.ebuild
+++ b/dev-python/sip/sip-4.19.8.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
diff --git a/dev-python/stripe/Manifest b/dev-python/stripe/Manifest
index ca3625edaad2..8330d587d691 100644
--- a/dev-python/stripe/Manifest
+++ b/dev-python/stripe/Manifest
@@ -1,3 +1,5 @@
 DIST stripe-1.75.3.tar.gz 181924 BLAKE2B acbbc05db9bb7ed61d5ea0995f69164d3c781a54d8e033aa4e74f0d7334993b70f21799a022ede69219c7a23dfa516e8e340b5009b7cb26142ac077dce24babf SHA512 30c95740bbf2a756ebd4e9453195907c8239bd9e36377363429ee269ef27e04fe60bdc3bde921a5be0ad7ab59ea1859dbcfbbf39d6da8b81aa163cfc7793ea5e
+DIST stripe-1.79.1.tar.gz 180317 BLAKE2B 03ea5b816a6892eec4041958c9636b3083da2cb46d98bd2a85da585d51d02b1a809dd57b7507e4c965824a52c5093527b44bdbd18a2defa659c766c8ab17668c SHA512 a3255eb01692816ff6f729af0d77abf9aedad0cc3236c7f4f3172047a45378a1c0f820e1bd38676ad334ff5a9d6d2528ef2f1e021903dfbacb980a3b2dd8a7f8
 EBUILD stripe-1.75.3.ebuild 457 BLAKE2B a2c8a2c7f8de450ce46064be766b8953d80f276bdd0a95e3687ec2cfb28475d1bbbe4353956c2e6c9f765db985baee1651359e4e17baf5ab1ca9a12bf29f6581 SHA512 d8c6012d0957a21bee6a433857796a050cb6de2cd08b67e071cbea9b713ce4d8427fa037d8e263eb99f613093bc270865a7a8650ad6345ddcb45d4238acdfea9
+EBUILD stripe-1.79.1.ebuild 457 BLAKE2B c75936fad3114182081bc7c01c1368e77f85fadc9d8ff52ec491e6a3b241831fe3f2debe1ab66083a4e64937c0038a27bef835653adf51562ee7f2463c0561a5 SHA512 e6e5efc654d511290c041dc3ef8d3e4c09966456fa2f398f23d36aa5ed05a9e30572a88502f67f52ac373c7e9a90cd7c2cf00f9cfa74112d1630ff18f859a310
 MISC metadata.xml 539 BLAKE2B 9232265d094774d1f04cba8e358a9655034184c10561bb8db4f8188381fdf7583971f67d5418f2969ad4a12db46a94b4c87c3eb9486eb0ac251fad9bb68f7707 SHA512 f0052ba8457139d76ddce67313bc973564237b409801d3d6da181c495c2d80184076cbe36468850a1ddcd60de50327e728fc3433a8a4bfe9608713a33fdbe9c1
diff --git a/dev-python/stripe/stripe-1.79.1.ebuild b/dev-python/stripe/stripe-1.79.1.ebuild
new file mode 100644
index 000000000000..8c5c55ccdc19
--- /dev/null
+++ b/dev-python/stripe/stripe-1.79.1.ebuild
@@ -0,0 +1,21 @@
+# 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="Stripe python bindings"
+HOMEPAGE="https://github.com/stripe/stripe-python"
+SRC_URI="mirror://pypi/s/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-python/requests-0.8.8"
+DEPEND="${RDEPEND}"
+
+DOCS="LONG_DESCRIPTION.rst"
diff --git a/dev-python/tempora/Manifest b/dev-python/tempora/Manifest
index 191c89d29354..554e366eba09 100644
--- a/dev-python/tempora/Manifest
+++ b/dev-python/tempora/Manifest
@@ -3,5 +3,5 @@ DIST tempora-1.7.tar.gz 11645 BLAKE2B d354fb863a8d30bd9e603ad942d7c7f61a70c24e7f
 DIST tempora-1.9.tar.gz 12469 BLAKE2B da18fc066cb9cf7ee0fa7eefb39ea2ac941760144c7efdea66a05780ced43d574757665dfad6088f98c135e7b14874aef0c8243ab338fcbaa5a515ec27507f52 SHA512 cb049675d7196738debca3dc0ddd8c5e72d0468bd1a853f77378cc5564b100cd94d23c63d7b06c6bed2827365d904a1582cf9d497618493b795600b6d476b91f
 EBUILD tempora-1.6.1.ebuild 1192 BLAKE2B 775920937225e50b4335b4d4bb14bead8bdd8858d9f7bde262bd609e8c9b81d102c6b3035906133dee7ee6a07db8ccf53c8e90e9838eef6b31bc2e5505f4092f SHA512 80d5b81ae922cb59b9db54fbb42ec1ee939584da1b1280c269b530e5c83052a71480b311d7591e4012f22e28721d9dab2071f478c95a713a043e5a7343107785
 EBUILD tempora-1.7.ebuild 1274 BLAKE2B 7cf4856b2eabd47a99c6150512e678c9c436fcc3511f2e23ab848d0e96ecdd5e49c235c86a5a942b620d6893fbbde546665d9347c9296465ce19a2caf83960cb SHA512 0e4a5b8e6296894c411accbc107a8dc677bd68ac0d6b190c699200636ab853e3980de9691a316dae2f928008ca87a7137e98c7fe6c0db89a0cba04efebb9ea8d
-EBUILD tempora-1.9.ebuild 1287 BLAKE2B 81e16d6e66ecd6550eb80e0096ab3877d4ef0328643983d4618eaf90e873a08bfedfc5c9b3277b8c52aec0fdcaaf8a84cbdc6ff0caf7414db057492d45da079e SHA512 c20e86eb4e962ace556056ec18cdb326983ef4c436a38c806bb9335c3820022b6397d64b34e728b457a550f53838f8be050f65af97eb66a47beadbc9a8274df3
+EBUILD tempora-1.9.ebuild 1292 BLAKE2B 121f90d5ad118232c50c4553d3fb14d97d218806744a7e57da298ff1217d75b05b5f89fed087e53a72604b46ac2487560d1ad828215828be9ed5b3d9cc105626 SHA512 72897903cab96d1dfcea6c215978dec4527c95708947b1f839ac94fcb326a51f0c0285e07ff2507d5a8e265bd29ac510e3a7ba7cc878e114ba03d3dff33ea717
 MISC metadata.xml 638 BLAKE2B c86883f938a4779097001ac26dc998a900d39599a930fd5682fca2002f93bc6f3f8b8edb0da06476751ef32fda0ded0641ba12d120919b32bebe2843abca8f4d SHA512 06c699b11df110494a9714a8784042d45834ce647286e57c58831ce036a604f415c7de511901bbff1e9d10a114a2fc6f4ce5fd71dc72ec9cdbe856a93ebd9507
diff --git a/dev-python/tempora/tempora-1.9.ebuild b/dev-python/tempora/tempora-1.9.ebuild
index 0ae039b43846..1ec62eceaa99 100644
--- a/dev-python/tempora/tempora-1.9.ebuild
+++ b/dev-python/tempora/tempora-1.9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/dev-python/testpath/Manifest b/dev-python/testpath/Manifest
index f8b5d63275b7..8f008447c2de 100644
--- a/dev-python/testpath/Manifest
+++ b/dev-python/testpath/Manifest
@@ -3,6 +3,6 @@ DIST testpath-0.2.tar.gz 13732 BLAKE2B e7a20fdbef3dff25d8e2072167d4eb078832c7b55
 DIST testpath-0.3.1.tar.gz 91333 BLAKE2B 86787b9677e8baa6d45fb5e6f047f2ab448e385201f20af3a3a9f33d6edd6c67e4eec09c178e815626096ad77d417ef99ddee562bf0fd7947b3f7ae1862f8156 SHA512 ab826cfb76d9a3ed6f1b178240f6bf61439bd792be26b5ad407b5c3efaa455b48965ceaf17e4ca6a4bc706465a8ed1c6c31a1572df5beeea2bb8db7814dc04f0
 DIST testpath-0.3.tar.gz 91250 BLAKE2B 88ea7ad9c67eef9aaa49e435a4d56d86b8c87818a416f3630f8d34aecd85f478aff778b1fc3c13f1ad0aafb524dc649393a73ebfb6f74dd3391548f36f1c2e4d SHA512 71a3266e17616c4df4a4c465151e9d48b89f573e4562132e85982b62446396884a270a32b5d4956aac1f0be1a00096cab9d0dc1718ae8b6312b0436eca683bdf
 EBUILD testpath-0.2.ebuild 1117 BLAKE2B 593c5549b9934d2206421a63dec23baf08f7d6ea84dc2c6f3d73a4e276566fc6be7fd7de2c45f1aadee2b0148c686f73474766f9de4ce525ffa72c277b5c2288 SHA512 e59d7221078325f902df0f5eebbbad473bd90c0498ab458d7f2ab46b8efeaf83fc873902548f96aed289bee34d3d7d8386fb52376a97db2119c12a2b44078f36
-EBUILD testpath-0.3.1.ebuild 1066 BLAKE2B cfa42ab270e10feb59e626e3285f05e0ba7acc2592cfd9e07ed04d8aa89e8671c965b755c36667893a467ec365c36499b446b010fc86779de4669466e710908f SHA512 f56e3b5c7638472310d8d41169436cf942e2b7e8a7052dc2ca3df14301e5a130650a1289b005b1fe807552d7f2c2aa05173aa8fc08be0704becd934e6194cc7f
+EBUILD testpath-0.3.1.ebuild 1072 BLAKE2B f46481c25d2809860bd1421cc2a11c66b7b94a2606183a65abc69c4384e2e50e531afb31c00aeaa891cc81bc5160fcc35f38933b40d8ee9fe60a43a987eff2d5 SHA512 2969a4537e57720cff4011a5d9f79baac8f228d70e91337677d76e0daf9d005288c6135638b3578aad3ae2ae339d2e2fe90f017ee27e14f83815d98416431f87
 EBUILD testpath-0.3.ebuild 1131 BLAKE2B c98c7bc36473f006ddcd47d772e08b06f8fb4cc5ed916332f6d300dfc0d334bc850fb0f0773ce64e3e9ad5991e82eeaa7d81dd56c92a15ce6b30d50c068ea9d2 SHA512 da68e5eec7b29fa5846b1dff424e657b987aa0f39a3767f158431fb66bfd93e542fbe9211329285fc1d1f00c72e6936236c7b280b79d49dd7e8ae450deea5bc9
 MISC metadata.xml 613 BLAKE2B 46ccd59fa5e42a573ba9fe1219a5e5a103876ef3e73363b3e003f76fce1138b7f6a9ef3a023be5b695bbbc1244c047d3f70b23b553b3412695a9791dac83c540 SHA512 c251993ded801317c638b460520800bc7fee9390a3c581c01a463da661eda3c7348117aa98c19efd7eb577666dfe580fc690e2f30d2001bd98e49f2baa33248e
diff --git a/dev-python/testpath/testpath-0.3.1.ebuild b/dev-python/testpath/testpath-0.3.1.ebuild
index e00dcfd0d7da..b1f7aa8642f4 100644
--- a/dev-python/testpath/testpath-0.3.1.ebuild
+++ b/dev-python/testpath/testpath-0.3.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="https://github.com/jupyter/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ppc64 ~x86"
 IUSE="doc test"
 
 DEPEND="
diff --git a/dev-python/tinycss2/Manifest b/dev-python/tinycss2/Manifest
index 4c3aa6006370..54be1521cb85 100644
--- a/dev-python/tinycss2/Manifest
+++ b/dev-python/tinycss2/Manifest
@@ -1,3 +1,5 @@
 DIST tinycss2-0.5.tar.gz 61802 BLAKE2B 2bb6093063e6a1b2bd9f78484db73d34c2336bbb00e9aad14a9c4c589e315ca377a5ec7f1b50b8c28f91d496bb668a65032a422ae9c9fda62218bfb7560e0a46 SHA512 321af21a80dbdf8d1ad218e33c87edbe7c0b4c1bffeeb38a9b14bed9064749f71636bf70775186e8785587d5fa96e3488465a76b59f643658f84b6bdc1c5c4bd
+DIST tinycss2-0.6.1.tar.gz 59548 BLAKE2B 9c80ea593ce4831bb4846eadca44595a5b30247a9a4ce9608bb4c505cebe47d151936361e0d9d4af124ce9097dc664b6a4eb7f926ce28c4336aebd08450b71cf SHA512 fa064bbb06d641a497a3c1eb35118bbf8ca8c4d32fbd3d8c64bb10d6cdab24387e77cd4c3277a957f23de2bd527a407836245f4387d7f880958858bd9cc7ab89
 EBUILD tinycss2-0.5.ebuild 676 BLAKE2B 4ff92717cb59a8782d909875582022574ee8663213318d429f81ea0c7414c2814732010890a89e1191c214ea1e594d17dcb3af4a1059d820b81eedd86ff5b8b8 SHA512 f1334f62d608a31672963262a54c3d23edff1f4308883edeae8676107a5ef3faf7d5edd09c55c4dbcd2ac5e08a82440647d041448cf35f34e34e7896ccf67162
+EBUILD tinycss2-0.6.1.ebuild 677 BLAKE2B d2db0d6f3b2b3b8d72358738666600fc9874f68b86517e8b886c141c06243572444c1054d4e325710e3670955afaf0ec4a8efb515f9d005066601d9c8cd2efac SHA512 839dd6db45fd56b50562581e288fe473857b884a1a78f41689a177d6c7ef871ed3fefa3c26fb465efb7c98d2fa8d275213dca80a8398035df88e2f65e58d5308
 MISC metadata.xml 502 BLAKE2B 683c99288181a663a49a9046df435933df6e1c634ec258fb34016ac877b208f4d250fd23a4616451e2da5adb519ecaa38696aad15093897824b4232a80988cb1 SHA512 7f9daa5d348f1a239e5c2cee779789405263c09c86b32dd0a8efabd97a77793baf800741f3c2f8660f9721dcef4f47dc6a2cfa170588982df0fd092377dd7233
diff --git a/dev-python/tinycss2/tinycss2-0.6.1.ebuild b/dev-python/tinycss2/tinycss2-0.6.1.ebuild
new file mode 100644
index 000000000000..74e68319492a
--- /dev/null
+++ b/dev-python/tinycss2/tinycss2-0.6.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A complete yet simple CSS parser for Python"
+HOMEPAGE="https://github.com/SimonSapin/tinycss2/ https://pypi.python.org/pypi/tinycss2/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RESTRICT="test"
+
+RDEPEND="dev-python/webencodings[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+DOCS=( CHANGES README.rst )
+
+python_test() {
+	py.test || die "testsuite failed under ${EPYTHON}"
+}
diff --git a/dev-python/traitlets/Manifest b/dev-python/traitlets/Manifest
index 37be21c6267f..64049da4e66d 100644
--- a/dev-python/traitlets/Manifest
+++ b/dev-python/traitlets/Manifest
@@ -7,5 +7,5 @@ EBUILD traitlets-4.0.0.ebuild 1150 BLAKE2B 6d21d7d1fbbebe981caa31e33835de4f14c7f
 EBUILD traitlets-4.1.0.ebuild 1122 BLAKE2B 2f0c0aeedd6dc5af57dc10c662fb1a15b0e57cbfd25a9265ea642537ac1af3103b142cb281ec97205f4e9bc4b8da844bdb7f2c0c2f3fc8baceb9506df4163b9d SHA512 88f98a66aa92593a8ae06c733ae90a24ac9f08fdb891548dbb993e202d7c6fdd6adbc343c39857f3b68712036f8fc09552ea08ba5a592b824eefb5519c265203
 EBUILD traitlets-4.2.2.ebuild 1278 BLAKE2B 77e6061429b362a282597ec8964599dd248de0d0f79c5bd0c1be905d23d8013910fcbc8cdcf824776a9a8f2014c63b3286dbb8e3e8a8fb0a80697f335e2b8e89 SHA512 69988da029fd6e8ca554aba88896f15c9e13581830c3474c1d157fb8d6c4b5c8739f6d1e1a44f9058cc31a08bdfc0e1f0ecc22b56bfd7a89e1705126387563ac
 EBUILD traitlets-4.3.1.ebuild 1279 BLAKE2B ae947e8355dcb364ad6c8a37fabd9c8f0be77bb361b67ea837d25bbc1c5476d424ed15d1db3782eb96ccd8674ac858635c75d818f3426fbc36e2b5411eb7a728 SHA512 296ac6bbacd945bfa58854043fdc471b4abca44b5b414bcafeacae6d354f83883466ab2fa6acbf16312afc89d275a1ac0d89d187a5dcbf2ab7d3c584931e72a7
-EBUILD traitlets-4.3.2.ebuild 1225 BLAKE2B d03affd4ac2c93682b2c192545c9c7c6f2d0732371becc24afd4a03404ff3e526f165a79531eeb992854f8db5f061406d8fcb269a65b65d19889ba3ce01476a7 SHA512 1c78539e5186c4e3bf0892318a19183c0aaec2301cacd31aa198b426177efdedaeabc6b840a00c4345ff6f7dab0db6bcecd4fc2bd0f104ba02675cde4e6e10f7
+EBUILD traitlets-4.3.2.ebuild 1231 BLAKE2B ae22f64f3648e8ad1bb0b9816d3f689cacde063bf7a44d3450f436d430b3530924e32799e879b2bb55fe358f084057d79376d00fddd9c2bc1ae4df2eaeaf1686 SHA512 1c5a54db8f420970912d57c8c6a8212f4604886a97a5c0be9a5aa342e2ad578fc1d09da4d8f84cb6c52b9d8734b51c8c393cf87e23ac304e1772d717e036e5dc
 MISC metadata.xml 604 BLAKE2B cdae6c5e9ea3e7b98e44d815f1f1865c83c78bf3457e3a26e5132fbb3648ec585e9224faf7197e0736e7ba98f19ef2ae0a3fb32f2b9615a2efa0fcaec80cc37d SHA512 0a7e7a4383b50e9c362a5135315d325f226640255521eb507ff7741a61ffe7a91a8a5896e641596d6ee83c1b70e8727e1820e8b29d53e466239d007b1155e221
diff --git a/dev-python/traitlets/traitlets-4.3.2.ebuild b/dev-python/traitlets/traitlets-4.3.2.ebuild
index d343cd093c62..e45bfeda0007 100644
--- a/dev-python/traitlets/traitlets-4.3.2.ebuild
+++ b/dev-python/traitlets/traitlets-4.3.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
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ppc64 ~x86"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/dev-python/ttystatus/Manifest b/dev-python/ttystatus/Manifest
index 0ddea3603aea..2ae42925bfae 100644
--- a/dev-python/ttystatus/Manifest
+++ b/dev-python/ttystatus/Manifest
@@ -5,5 +5,5 @@ DIST ttystatus-0.35.tar.gz 34144 BLAKE2B 92a11676525f2db5b3bc09786ddb3651f72202e
 EBUILD ttystatus-0.22.ebuild 480 BLAKE2B 030f109e34d4554372ddb24a354681aa5fb276b156be9f74799e6dd4b10baae6aa9382bf0089fa1b86a0fa76e0bbe08d8d2d7323112356ff1e240c1c92ad34d2 SHA512 a630abd0fe622181bb23db23c8e52b01bdb24fe4a414414070632710b0763039b592bd1a8145e0f3521295dde51ee08072b3a0df0d89803d8b9b63d90c55abd1
 EBUILD ttystatus-0.23.ebuild 489 BLAKE2B 9e320dac4060af471dd967728883d013ee4c3b8c056bef0bfba467bde3a10ec77ebda6098d2a47196ced3b06df5032e7e83706e4cfe2ac8c4213523f300de0c3 SHA512 9077281c7c4ee294c290952a5a50e37dbd89a1c7793bdf9a3c5eca922f6501df644fc145f9dde228d8a1c69518992ac19bdff0dfee6c0061eb16449d61fdc7e0
 EBUILD ttystatus-0.32.ebuild 483 BLAKE2B dccb177d2f734037efef5020259ae9aeedbe5f85a1d3b7474f126c54752c271a45431e505a829bcbf3466757e413f40b37419b02db9982e94721648869a152aa SHA512 7b107179d287c56fa9bffc3057d9988cf179e49aa4b4a92edcdc31dc7bdeb7fd69b37e1932a56fee7905e2e305787320aaf1c62fccf4194648def62f4bcb40c6
-EBUILD ttystatus-0.35.ebuild 547 BLAKE2B 13b162bd1ec91a6806eb1f8fe207b238daa2d3d7e88c9d3aac5a2c4195bec5349b294fec11c7b6c11984c63e3aaf3e8b773291d010f8b9d3611ebea1a1a46c7d SHA512 c560cc716eb8b50ffe0cdd458abd7af8374252489f7279dc424c4f2a5aef16e5c7331f4f13e783b484680bd2a22c696526109c7c5a6838d81cbea618959441ed
+EBUILD ttystatus-0.35.ebuild 542 BLAKE2B a6fa9ed9cace257d5a801a9e8fed5f3a040e5e69dfb1cfeb6abf99f91d749d55bb87e5e60f198ed94c8d919188871f9eda2bfdf57140413edabce94ca8ba510e SHA512 2f2199eaef88972eb9e6f3e28b87a5019a34d9e280b031a5a92f98822a3ed70a3e2af75e331888b5a2e99ccbfef5a0b9d611182576d422e2f2c7c7bbb1c45cac
 MISC metadata.xml 250 BLAKE2B fef48a48388f26a915c53bca9aa9cab62fb73ec006736542afb4cbbe0c7b81d23afe2884f52433c7d390fc38ac32f957a6f6efe285ee1cafaed76407a964cf9b SHA512 924271cfb32ceafc4134e19b53fbeed96f2e9056addc3c2cbdec28890254abf5f0714979a3ab698ca046e41ef5c2cca2932350830bd8bd3a8e214d99123c12de
diff --git a/dev-python/ttystatus/ttystatus-0.35.ebuild b/dev-python/ttystatus/ttystatus-0.35.ebuild
index ca2c6b804aed..cdbfd12ec2f3 100644
--- a/dev-python/ttystatus/ttystatus-0.35.ebuild
+++ b/dev-python/ttystatus/ttystatus-0.35.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://git.liw.fi/cgi-bin/cgit/cgit.cgi/${PN}/snapshot/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd"
 IUSE=""
 
 python_test() {
diff --git a/dev-python/twisted-conch/Manifest b/dev-python/twisted-conch/Manifest
index 7e41f1210af7..1e332fe4584c 100644
--- a/dev-python/twisted-conch/Manifest
+++ b/dev-python/twisted-conch/Manifest
@@ -1,5 +1,5 @@
 DIST TwistedConch-13.2.0.tar.bz2 243977 BLAKE2B 96e11e1777b32b71dc7fc2c0af444ccbee0a7bbabc33cc45ea844818a3270bfb6877eee8442d4388530fbd55494d54d07b5e78759c8ae37f830a16b27c283e9d SHA512 3e9cfe76b5fdd8e18732d554721d493bed70b757b21029f8e126d486011b41da26a34409062cb5ffe4283a57b6d342434c84959b78b2781f069e22d2da610043
 DIST TwistedConch-15.2.1.tar.bz2 222736 BLAKE2B c4de3ffff523b8bb12918a5eab0b662e32f3e08985c0698b5a70167f9d655bbfb63e1c0c58e35be8e4042df4ea041c25bf421162220005caff369490b42c5d49 SHA512 d21879801e3cc925345e6528a84fa031f5cc1c8a2b5aebc5d3540fdd356d9743fe827ab8060db13b462a6d8986ac23307feaf78725950cef462f06b4edb93df7
 EBUILD twisted-conch-13.2.0.ebuild 788 BLAKE2B f82752a4b35e7c7fd4b61aba8014c1fbbf1f9ff2f867ddaf99fe05e2ad0e7a76279c55861d3d6c4c704dd5698bf6f3d2def21066e8267d26bf5dc218c343d2b3 SHA512 4e66a99ec56754da74a8e3c58da79cc837b7f723518efed38fa9f245508e0d47d14a4ea307840719590d22b187b1a1ea10854efb311a0c1af437391032e06e7b
-EBUILD twisted-conch-15.2.1.ebuild 477 BLAKE2B 1dd060588346a322b7f43c8ee805bf63325b6fe67c07e385e042fa22e941937a2fe621d5f6f76bd7a362a5aae67111f3c0a982e6cea978eb7dc040faccdecaed SHA512 9d57089497d0fd2cdb595ac0e366a97c5d3e0057f0810a3f8db538c507f1b9aeca77d1be4525178191c5342b7ddafda3e8a5b2a21c46ecc3bb2f2748e0c8f650
+EBUILD twisted-conch-15.2.1.ebuild 484 BLAKE2B f0cbe69e0fd05fdd3e54ffb07545bf61023dcb2725b660447e51fd6f0618ed3dad8477c9edc478259f03ce3f381297c809344edc5e7d2d19fbbbc615a434e3b6 SHA512 859e14bdabb4d74c1449d9c0767a3a659f9f2ba89c12e83b8dd7c3fbb4fa1495664595f72b59322d0664f6be1a23014758391c45d221bc7df917c430ba576a11
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/twisted-conch/twisted-conch-15.2.1.ebuild b/dev-python/twisted-conch/twisted-conch-15.2.1.ebuild
index 471d751be87c..8e8991d4a234 100644
--- a/dev-python/twisted-conch/twisted-conch-15.2.1.ebuild
+++ b/dev-python/twisted-conch/twisted-conch-15.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -8,7 +8,7 @@ inherit twisted-r1
 
 DESCRIPTION="Twisted SSHv2 implementation"
 
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/twisted-core/Manifest b/dev-python/twisted-core/Manifest
index 5d259479e3ea..0e499563901e 100644
--- a/dev-python/twisted-core/Manifest
+++ b/dev-python/twisted-core/Manifest
@@ -6,5 +6,5 @@ AUX twisted-core-9.0.0-respect_TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE.patch 419
 DIST TwistedCore-13.2.0.tar.bz2 1496299 BLAKE2B a7034a23c4ad890a8591e7ef1de1c3ba1dc486ac6f3d1987cfc280756323d3e968a913bc4291ef8dede295a12c02b8e166a27f665ce7f4a1c536e6e7a6991e53 SHA512 90cf2019f0d5b125c7bbb5a9e3e7d2dedcd8efd5f9b2ab057e0b41f899d394b995fe599128223c82b1a634fb881ad7ae8ddc5b86b26adb28a3834c05da45f2c6
 DIST TwistedCore-15.2.1.tar.bz2 1179442 BLAKE2B 39c9d3646fbd31225dca1a4888ee177c9547b7a9809c57e2e9577c90c02f2b64e74cfa3b8410513b7645312d39ebb292fdc8dced26a9dd29abe95dad24a8b870 SHA512 c5923d71903afac7dec15d130ff3bd247dc1a6cdeb35cc642912a43f1e5640088971ddfc7abe3e18ca1853e59ba6a417d4b465fb422aba1a052bc156d7c6e820
 EBUILD twisted-core-13.2.0.ebuild 3633 BLAKE2B f282cc5600a587079e78318834337b236f8a3b611f0fdb899a5b5be4bb81034f17b08de99b066866e795a02ddee1ed7184ff990f2febdef5fea43ec3339cf567 SHA512 8fe6f175dcccaf82e92e2d2a056cb75cff245d8b62ddae54bdfb3eb953ea6156e0b2cd63c0e6f56139f2e4a9a04bf545268931834a2698f1e3cf88e784929399
-EBUILD twisted-core-15.2.1.ebuild 4108 BLAKE2B 309447d4126ee12ce117c72fafcc0493bc5dfb2cfac6429b569de9c75c4ea6f5fc8d58d8c12caf6c23c933d82807b0b75d9aec49b534e149805a3741eb5bdffd SHA512 081c1ace52cbba4ed6cab3bb500dd94db132f11bbc683d74b423bd6b7e7534ef87f42e9f8c4592624e157cb49631e1ca2f7489075962cd2727f6779e38fe0478
+EBUILD twisted-core-15.2.1.ebuild 4115 BLAKE2B ccc5b08004f39dbb5cca6bb1c9cf457c773e3715a2f844c11ac5890b8a1724085cb34d160bb0e2b52b08bbaca70244c8368db8570bbbd0e11ed9db141dc8ff04 SHA512 42b95e762cf11f692b30a46c25c2e5e3017d51ae85b3e5b2733143969e3a6118a9f0657ca1dbad751646d653312cc329f7ac5dfebd1c7b6c6f79ef8cb7fad602
 MISC metadata.xml 596 BLAKE2B bbf2d93b3f599494e0913ae0068a5aaf6d0c972959eb5fa80231f247fd4988515aefd978d25d023ea6a66a9edf036a794599088931dd098223fa9951c567dda8 SHA512 acb4690541dd747cbee28993ec56a422149ef02150505b4b1ee1ab0418745dd074344a8cb2d3dfc76f7027229f921e8eb25738bfe4b829243dc4530c96a41440
diff --git a/dev-python/twisted-core/twisted-core-15.2.1.ebuild b/dev-python/twisted-core/twisted-core-15.2.1.ebuild
index 2293fc3cb684..293fce0e0215 100644
--- a/dev-python/twisted-core/twisted-core-15.2.1.ebuild
+++ b/dev-python/twisted-core/twisted-core-15.2.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=5
@@ -9,7 +9,7 @@ inherit eutils flag-o-matic twisted-r1
 
 DESCRIPTION="An asynchronous networking framework written in Python"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="crypt gtk serial test"
 
 RDEPEND=">=dev-python/zope-interface-3.6.0[${PYTHON_USEDEP}]
diff --git a/dev-python/twisted-lore/Manifest b/dev-python/twisted-lore/Manifest
index ce517b7275f7..d37229ae0143 100644
--- a/dev-python/twisted-lore/Manifest
+++ b/dev-python/twisted-lore/Manifest
@@ -1,5 +1,5 @@
 DIST TwistedLore-13.2.0.tar.bz2 88616 BLAKE2B 9505d0bdbb61f2ca1bc852e49a6d46a41cb921443d10c3409f91d793cb4f68c3e15363caf022eca9d5782bf250e42f2b855abe31005834e6a98c52dc8bc6e5e4 SHA512 a05752e2854c404da30562062e1d72d0376ebd5b82c3371183023936851bb6394dc3ff95160efc3e7e7781624ac48485d7c102e4487cf3bfda2a086bcc596ff6
 DIST TwistedLore-15.2.1.tar.bz2 54070 BLAKE2B cc99513a90e07793f91741d4ab43ff5ced78b3df5b9f686799eef6aec54b9833604b25c2de509d170c95449f02c90f03fb2b807f4a036c2f689afd07287dba12 SHA512 9d9c45443f702e527f82dd25b7ed73af24b1ff16d266eb0cb6cb5be230939ed2ba07dfcd9d7b02d48823043b64b33df916b58dd1d1280d3f4e4f7c3cec851d7a
 EBUILD twisted-lore-13.2.0.ebuild 446 BLAKE2B 4f8a3b2b2802113443862d4948535011f47874970c0c331448f705f74735b9130c21c7746e9e48e69996361466adcc8b79f0ea1cc7e9bee96eb621a672edbcfd SHA512 531e8c2a3f5fc6c14b1aaa86b10af1779288ed0950ed040644104796a36e361aa5a25bcd3fcf0f8c139f09f5c74b15ab087db41b1169225c49968ddd97e0b49d
-EBUILD twisted-lore-15.2.1.ebuild 444 BLAKE2B 8147f7596012e652bb81a4e2c55b37bba2e496f4d1adf2dab05db6dbf39f1d91da20272ce4a16ac663af17380e8b34f1fab1008b9c8cfd7d9ee6aa1105483cba SHA512 72c05725810425f09d24a18a272e6654ddac7de9a7fff7e922eb7526f82dd8e305f32c1f3f6477f7889da92a8d10d46986fcf4571ac1a605c8a772e046c021b4
+EBUILD twisted-lore-15.2.1.ebuild 451 BLAKE2B 84191221fa7b9e644d30a8c5ac04fb08b45bfd2b663aeb2d268e3f67201b94828bac152174ca5e994a69360147195a8ef5ee4654226c409b835c6a68f5c3ba84 SHA512 a93c44151a5d4e46af861002ab57339f0d34d55aae35bb253ac0ebc0e4c0183d919a93b0d1a2ffafe25d0bb12c6968b25e8c8da17f7b36e02f7f1997c9569d8d
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/twisted-lore/twisted-lore-15.2.1.ebuild b/dev-python/twisted-lore/twisted-lore-15.2.1.ebuild
index a7d27e5200e0..5338dc85639c 100644
--- a/dev-python/twisted-lore/twisted-lore-15.2.1.ebuild
+++ b/dev-python/twisted-lore/twisted-lore-15.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -8,7 +8,7 @@ inherit twisted-r1
 
 DESCRIPTION="Twisted documentation system"
 
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/twisted-mail/Manifest b/dev-python/twisted-mail/Manifest
index aaa74d0aa209..c80320de6d0c 100644
--- a/dev-python/twisted-mail/Manifest
+++ b/dev-python/twisted-mail/Manifest
@@ -1,5 +1,5 @@
 DIST TwistedMail-13.2.0.tar.bz2 160046 BLAKE2B d13c04c2544f59711de980bc3902e65997f02aa389ec2b59cded133dbf931f1cb24f3d1b7bf100af7ac91b7a39b02d87959fed32ac218486918630afe911096d SHA512 399e34dbf674e3e30acf49769fbb9c188f1dfc00187b82e67865490b5a9f2847ad1d70fc1bb930a50b4b77b3e017212590c93f3077a8464d9e1f662750f37314
 DIST TwistedMail-15.2.1.tar.bz2 161891 BLAKE2B 5ca48f016ba7fa5612b6a0dcc2d5244ef0bc87c312840f641ec62a78949fa4519c3ea246030da656a663d044bfe58cce9d720093471baa5b07848ec8a0c2bbc9 SHA512 d3c29ad842610dde6697e76456125716a8657f9e7938ac6e66fd3c226fc339e04551a2074c8af8627882c2a761414d5f856fe647b3900ed4eae0fbe7fb5bba23
 EBUILD twisted-mail-13.2.0.ebuild 590 BLAKE2B bb1f662f9b931ecc6ee6353e65d370ba06ac291793ee36759dffb4442f1efe1e7a6af4769ce8b2ef85ce026b68d692d6030fb3b0afe45dd7a01689c1f23b8854 SHA512 2b18307584dff18eb76d217fc8beed5001828e62cfee8b1470be5b9ca6c77048ab785430b427681f3efb5cd3228b17dd76f76e5087a580eb9110062e76314dc4
-EBUILD twisted-mail-15.2.1.ebuild 585 BLAKE2B 65772a4e2d1c0ee2fd0cf107fbb2620759d65a5a74a3fcc0308f3f957165de11dfc723eaeb642b30d2358e390aedf4649e3db9c0b11b252c6de470f853bf003f SHA512 d80354771efb2b3e94110bebd700f9222d6fead8dc6b9b9382d62d883dd05d46e69dc34f3fa21ac049ad65e22aa807694b38ba3be4a5baf47ae835547300e8be
+EBUILD twisted-mail-15.2.1.ebuild 592 BLAKE2B 1f554e84fe43ccd046178d89a743c2436e165e71903345cf1c8f21624b944e7c98a2b2ddac293fc9de8fab4eb24f4eb3291b0f9a2267fbbdce2cc4775b547da6 SHA512 2925b6fef338346e0f04a9012d42890f357c19a61268988f76a6e11fee398f086fba9bd74e0a5c08e5bdd07ac41f8fac0dd79c96b3ca5a0fec1e8781330cc83c
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/twisted-mail/twisted-mail-15.2.1.ebuild b/dev-python/twisted-mail/twisted-mail-15.2.1.ebuild
index c1796b19db35..31dca25f16f2 100644
--- a/dev-python/twisted-mail/twisted-mail-15.2.1.ebuild
+++ b/dev-python/twisted-mail/twisted-mail-15.2.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="5"
@@ -8,7 +8,7 @@ inherit twisted-r1
 
 DESCRIPTION="A Twisted Mail library, server and client"
 
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/twisted-names/Manifest b/dev-python/twisted-names/Manifest
index 735c1324cd53..de202704d143 100644
--- a/dev-python/twisted-names/Manifest
+++ b/dev-python/twisted-names/Manifest
@@ -1,5 +1,5 @@
 DIST TwistedNames-13.2.0.tar.bz2 71127 BLAKE2B bf84c95a42b3738c5764d22acd259ccd443e236fcb8c87f383a2de46cdd5c9859b09be57630a11595be125ed74ce5fe4dd0783af2dc76dfc802a873dd17e55f3 SHA512 1dc7ac69f51a41f3fa6472ae633649d61935ca0c64233a86c69755e8a53100402842712beb2b555dfbf493696bcb4a0fa7d70fa2d3450fe0448b680f85eb9fb5
 DIST TwistedNames-15.2.1.tar.bz2 88688 BLAKE2B d6256bda4c674f0aedd5fe871c1ce3d2c6780c7d8c32c26598b47e1840d9061323e925a44aae4f02ef2537a20ec947a54eaabc4daf7d45465843c48b76132ab7 SHA512 2ca2c4e4e9a49e82246f781f2fd1eb86a85d78236251e085dc88a8b52b7b58964cac4ff2db75a97ea652350f650bc06fcc4d4964747b7e9c5a6631c2ea6aed80
 EBUILD twisted-names-13.2.0.ebuild 512 BLAKE2B 5ad1fa086e72ef19dcde3b58275aa98dd68c39a211076ae3a93917c8df17da6ccd0614249bef5e2774a409131c9f5f545703c69018e6327bd68828efb235c41d SHA512 6f5b0fd30782b60d2b348400b49fb08cd20009969c8b88040822a0ac9418bfe99e1a4cb8f66e96ac4fa184da5ffbde9990e5c3aadce7dd484ced738cb3d76980
-EBUILD twisted-names-15.2.1.ebuild 514 BLAKE2B 25cf673d932f99efe8681bc6bf5992667ed16a13553c20302903befc8ed5b7a27475aff8fc7ed320d8d805140784539489c6a1677605c729fe89e2d1d33c1504 SHA512 66b1267ca13c84e060e497f314792c88b761296546799c370dc1ae04a84dc1ec23a2dc9b03e6551ae3f764943246e40920310ee36a892c824f716f3e257af7f1
+EBUILD twisted-names-15.2.1.ebuild 521 BLAKE2B 84022bbfddbb69d59323b514636cc550fd4f974cbb55215d81c075f6def6e7fcc7c38a59abbe513f979b92cbada6f5f7b56e8a4390d7aef3c9ae7dd8c4ecce47 SHA512 f6193ffe4a5f1acd91b515d7c771a3d954ebebe2136e5d08a6e45a85d33d22db23659b07a4f6a80d47b99389a1c491c47a2eab1bd2b1720046332f8b2ead4934
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/twisted-names/twisted-names-15.2.1.ebuild b/dev-python/twisted-names/twisted-names-15.2.1.ebuild
index cde2f2d8b8d8..faf83b7a046c 100644
--- a/dev-python/twisted-names/twisted-names-15.2.1.ebuild
+++ b/dev-python/twisted-names/twisted-names-15.2.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="5"
@@ -8,7 +8,7 @@ inherit twisted-r1
 
 DESCRIPTION="A Twisted DNS implementation"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/twisted-news/Manifest b/dev-python/twisted-news/Manifest
index 7dbe789fc69b..9806cda9dc5a 100644
--- a/dev-python/twisted-news/Manifest
+++ b/dev-python/twisted-news/Manifest
@@ -1,5 +1,5 @@
 DIST TwistedNews-13.2.0.tar.bz2 19706 BLAKE2B 42969d66d60d5bb228e4565c775b8d3e10acd2fd833d3b48e08d773b72bd01dd9d71d5fbdf1d4db767219d5d7f9949214bf5dda0d487c76434db3fc8c9dbc124 SHA512 439f35b882f28be1fa466fabe93c06cd688662a44dd21f58a3c2d9670f95910c038bb30b79c88f661f50be7eb9bb820f6d89a94fbf61bde2d8bb46af574c9274
 DIST TwistedNews-15.2.1.tar.bz2 19889 BLAKE2B 4043b76752dfcc8205f8b978cd87267d1fb31c1c794c65678e3a1fec1aac3b8131dd55550acf69909149873eaf55fc69f232083cebb46224ab2b23d95374188d SHA512 faa3a2b7c6acf2d9f8a63ef79bf36fecc2d48101b701bf679b4837e54f8327e5dda75e207ac2cb03a35671781c9221f62f60885a0459e970f15d660d214e7342
 EBUILD twisted-news-13.2.0.ebuild 473 BLAKE2B 6aacf502401b8a1fc055102fe41e7adc66a656d96e2e9563ff6c74881c62c959694e0593154ef7034fd895679afe1cf876623c8d7b5a5b0294bcbaa4ccb5576e SHA512 e678bd785dced8e6bf16f2c664d0049ccff40aa367176217706c0119dc14f7296de57bfc738ca9f8041cce5559b1fa4e1e9dc3cc451f747e802e09cd0cd87dd5
-EBUILD twisted-news-15.2.1.ebuild 471 BLAKE2B 39a43c6e36f3a524f9cd82339961b6fc55be487b5b44a4f29aeed916d83abdf28eb2cdad32bc36b5fed9657b44d069f7544d1fc985742ec0b044b3f9f7a8f1aa SHA512 b42d58a25f79e272d3dcffc4c549538738e406e17cb249e7288c193729f846e79a2005eb0fe7afc8761c2f8ae66a003955eda60755e3bbee5365c317bd92bb82
+EBUILD twisted-news-15.2.1.ebuild 478 BLAKE2B ceb4c3a60c6eef449891ded0b016ea5e71e4fb7fb4c0f5123b0cee00b2485fd5090da25aa70f8b9cee3e304fd505aea3a62bf21f3b9c7d2fefddc3a20f4a7af9 SHA512 cfcbe37e18555f9b3344e0669b2e3c98aa3d30a26965d4968b95f8c4e9711646a682087bc9959f7ad0dd7f5fe1ae7bb55fb1fd3815ab8bdcd7acdc7bb2f2b3d6
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/twisted-news/twisted-news-15.2.1.ebuild b/dev-python/twisted-news/twisted-news-15.2.1.ebuild
index d2f124308b48..8e0abf2fd8eb 100644
--- a/dev-python/twisted-news/twisted-news-15.2.1.ebuild
+++ b/dev-python/twisted-news/twisted-news-15.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -8,7 +8,7 @@ inherit twisted-r1
 
 DESCRIPTION="Twisted News is an NNTP server and programming library"
 
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/twisted-pair/Manifest b/dev-python/twisted-pair/Manifest
index 1fc0afb5c312..5c4270607a15 100644
--- a/dev-python/twisted-pair/Manifest
+++ b/dev-python/twisted-pair/Manifest
@@ -2,5 +2,5 @@ AUX 14.0.0-tests.patch 1123 BLAKE2B 199f563ae287a0f3e2f3b1adde2406901d0e88506076
 DIST TwistedPair-13.2.0.tar.bz2 9251 BLAKE2B 6aeb447bc9adf890829ba4341e6ed33dc0d08be2e431a2d0cbc5d28019701b42086189ddd8b69926ace2ea8a8c1099d78ceea8649e2fe481594ff116c265c627 SHA512 931b2564e66d5056ce10695e7d9884b55d42c1081feaf9edc011aef9dff21f40e628312a89970f83619611967f155f26f4bbd9d1a325d30670e245e00f47e2d0
 DIST TwistedPair-15.2.1.tar.bz2 21755 BLAKE2B 4e006c24e5daa77188dc72e9559f86b6acda10a3b843acc8f312285d299f22a86f29ee946d709c63160e39b38312e612ce88d306ab3a37ad91f4e94bc7835c6b SHA512 e7e9c8d88ca490c5e9f41ade6aede36dc23ea935f7c1658355bf685e21000e4e20ee1a3ccc3ebdba312fe026a8b7b25f2bcf51c3761668c2c3ce86b37ad3c725
 EBUILD twisted-pair-13.2.0.ebuild 394 BLAKE2B 521699c59c6c538b4d0b8f6db7421a0df56f1c937d5ec51316bbfff8c59df39dfd99d92180878f805909b53188ac792edfcd13f1c76143a634a7a88a43814b6e SHA512 b6f386a10af848bbdff709a3caf443805f925037f7a030edfda6741789daaa49b2be3ee9ed226f5da40b3afa4cc2b10b150c19c92c7d37749d8a9e9cf56933da
-EBUILD twisted-pair-15.2.1.ebuild 492 BLAKE2B de275b0117b98cd1d9c430be3ca39b062b62ecaadd1e20d42cdde380e09d90cf760769571f42193e92c513b9f038fbd16c24422d3607c59a216acafc20f50fb3 SHA512 22b38bea91a9479e6bfb28dbf1bb7cdaa40a47f167126890d7565f9c8ca2b4a0d47c58b4196d63010ee883cf11362d7a8479f929b31d4ca6c30cbe4b7b82288f
+EBUILD twisted-pair-15.2.1.ebuild 499 BLAKE2B b9d74c6f45122f9f841c47bc3bd69efa7756fbc4fb079c6c56dc13277b75f47b50ab7efc9c0895561923ac70587b3e4fc94f589a1eadf120fb4b4eda3232827e SHA512 246eea4dab203efd4e5c9177a733692b376b81c00fccd1f5c22558e1089300fcf3fce8f926bc2f465253f6e3f03a3a10bd520ea6993b6190c94cd058ee91b7fd
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/twisted-pair/twisted-pair-15.2.1.ebuild b/dev-python/twisted-pair/twisted-pair-15.2.1.ebuild
index 58c8c34256df..3e67a014357a 100644
--- a/dev-python/twisted-pair/twisted-pair-15.2.1.ebuild
+++ b/dev-python/twisted-pair/twisted-pair-15.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -8,7 +8,7 @@ inherit twisted-r1
 
 DESCRIPTION="Twisted low-level networking"
 
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~sparc ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/twisted-runner/Manifest b/dev-python/twisted-runner/Manifest
index e8db973f0441..b892e0ffc0fd 100644
--- a/dev-python/twisted-runner/Manifest
+++ b/dev-python/twisted-runner/Manifest
@@ -1,5 +1,5 @@
 DIST TwistedRunner-13.2.0.tar.bz2 12944 BLAKE2B 98060e134cb928897c4a49a66928be645c4dd48d6581792fb699900599d653882b96dfab91d50480928473b5f33eec21f891663f5eef520e43b45119b5c424e0 SHA512 1ede91957ecf349164fb63e284896f8909c88e54c032c6c326aabe2efa3058b5b9ba232e5ca60e71776dff4514a6c23483d9720e815f07c48c10232831741489
 DIST TwistedRunner-15.2.1.tar.bz2 13041 BLAKE2B 212c846c0aa6ecb1e8cae8f13dd016addba200575b13d58b028277d91b95e311d47ae30b260be05ae8404bdd6558119a785a1d3f16535537d0ccd04415ce92b8 SHA512 9cf94b62cf978f0a11dcba7ee18632d94dbf27bf629f5632f6bdbfa21096a4a8ff5298df9e7e42f03469cf3b89dccc537b983cfb198e35ba01e0ef530baa3867
 EBUILD twisted-runner-13.2.0.ebuild 423 BLAKE2B 2f4741d2b4582dd5ddba2c6760ee09b0192e202d06bb66287874309b737694cc6573a3870b2ac9c5f4796b0721c9f6e82a1688b53f686b840894925f21d212b4 SHA512 6a845d073e337d3da50e9e088055d6cbd82d7618733d1a1e9339483419daa8c3272ca75d2860b72c00bb0128bf38c91058121e3f115a76bb25fc189fd0455310
-EBUILD twisted-runner-15.2.1.ebuild 421 BLAKE2B 7b9176419c763723542e2dd816bb73e4cd91848e8c622251509512a0d0626e647fef9f60c6b978ec02935505bb56a039187f7f7afa2ee0278dbdf6d7051525d8 SHA512 590da41d2aad46627aa621160cec0fc5c5a5d4968200e1d51907fd4f6fdd3636616f02eecdc2168855a98a4d23198f9a3438ea1cf36363ec07919b04f431a51a
+EBUILD twisted-runner-15.2.1.ebuild 428 BLAKE2B 0d86dd5fca9596bcdda2796507c1ac85e4becc575cad006cad29bc1a7c50ca14c8cfdcd999b47eb59bde649b915e997d36305e6a741e202a6a8ec2e715adb457 SHA512 3c72076553f76e97f9f43f953ead87c0abf8422f2aa78d8c2117265049fb4d3245f476ec5a551af8cbea9a9bb6773f19750c9c5e0558174577b6453a9c28d164
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/twisted-runner/twisted-runner-15.2.1.ebuild b/dev-python/twisted-runner/twisted-runner-15.2.1.ebuild
index ee8ced798914..65c836eaca72 100644
--- a/dev-python/twisted-runner/twisted-runner-15.2.1.ebuild
+++ b/dev-python/twisted-runner/twisted-runner-15.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -8,7 +8,7 @@ inherit twisted-r1
 
 DESCRIPTION="Twisted Runner is a process management library and inetd replacement"
 
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/twisted-web/Manifest b/dev-python/twisted-web/Manifest
index 55e564e43641..aa5c728a3b0f 100644
--- a/dev-python/twisted-web/Manifest
+++ b/dev-python/twisted-web/Manifest
@@ -1,5 +1,5 @@
 DIST TwistedWeb-13.2.0.tar.bz2 403931 BLAKE2B b003889c566b9063ffbef9eeb3f98af22eff4ba1b10cf2db1eb76ff3da08ac45d3892790943348c0d1cf4a28d8e66050aca9281409b47e48df42ec036a25e1af SHA512 69e721ec456214d000f88268340b7cf21186073af11e7f906bf95c9a1bfaf49fdc5832b4e39586ebdddd3f1378bf823ab147de58d7aa9e8491a2561a54389a1f
 DIST TwistedWeb-15.2.1.tar.bz2 231092 BLAKE2B 2bd561f973f0ce8ac67c1ee947f07b9b4fb82f7cff6e543ad324d8ef3e60d3be28b6290abd173362d49d824d4d4c23223361d30d94702176c385f5b9a7c048f3 SHA512 e2b155deed9b240f92f173e0fb188c1538ef2275cc6564b838dac8a5ac4c460e664791623cd3e3cde996b63f1619eff8d62636c2813e8b81da5054b8eea365e1
 EBUILD twisted-web-13.2.0.ebuild 1127 BLAKE2B 2206089f97d40c46130bad092e1a4618137abfc3fde48fc839e106ee7d394a574024c5d767550a24c7024a664e8062ac82e83571d6572df51e7d1acd121ecb84 SHA512 20d2f5bb58c1e9974d2606f7eac40639d99a1c446095b14d89e4b905442349c4573b59e26bdf33f2cbcabcc1800cd30a99562ce9f06d9a391c8e90f327ceb617
-EBUILD twisted-web-15.2.1.ebuild 1117 BLAKE2B 2e221f6dff26263fa7aeb62899ae5381b25b89f4217f98ef6baee09ba1a0d9421e1583e131f361ccb6d29fd0952fedcec17a266d16d45df48a510c6f6682cba5 SHA512 f93c50516710eae93f14f8270b498202dba1aeb9b5a4e8ad5c98616a5dd821c96345a46bc1b0ff83d9ff23d96b01bcfed5601681953cef13dc977a793d3d1a79
+EBUILD twisted-web-15.2.1.ebuild 1124 BLAKE2B efb3d72f351e6f27a2a3984e6cd4510662acba62f00edf59a8c66bf4832d66d7b16009f2e961cfc79854225af55097f24a03e4a7659e2853ee12f6fe68368233 SHA512 79716ae8b4e2710e84eddd7214e8fe788d6737e931898af37a4919d8c47d7f67fb6d6918dc6a66d32a33928eb79680ae0eefe9e13ece470021f26fb85c074cf3
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/twisted-web/twisted-web-15.2.1.ebuild b/dev-python/twisted-web/twisted-web-15.2.1.ebuild
index 25e20b15f996..b17a342f70b3 100644
--- a/dev-python/twisted-web/twisted-web-15.2.1.ebuild
+++ b/dev-python/twisted-web/twisted-web-15.2.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="5"
@@ -9,7 +9,7 @@ inherit twisted-r1
 MY_PN="TwistedWeb"
 DESCRIPTION="Twisted web server, programmable in Python"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="soap"
 
 DEPEND="
diff --git a/dev-python/twisted-words/Manifest b/dev-python/twisted-words/Manifest
index b042de2ff718..992e5ab28ad5 100644
--- a/dev-python/twisted-words/Manifest
+++ b/dev-python/twisted-words/Manifest
@@ -1,5 +1,5 @@
 DIST TwistedWords-13.2.0.tar.bz2 176411 BLAKE2B a8972dc504fd03a5d3eda5a6c908989ca6561124617b12cca5b1379fb1cf5ee37aa52c798b08023d1e381e4738c784091188c2f07952bb2192ba25d027907b4c SHA512 84ff45f86a0c3d7074fdfcd01159833b461780b75c5135d7a1cc2b3c4c918ad2299c217e8f5ef8e9a71f87a005ec1037fcf870e56601fcee50347ac2e1c39105
 DIST TwistedWords-15.2.1.tar.bz2 168483 BLAKE2B 55d83e146b83212ad42d25479fe59b88f885e948127ee7f52afe69da9d5513ee709c7ad8bcc564e1e77cdcfd63f3f1592624e7dd7d957bc18a753a94a4ef76aa SHA512 aca278a69f5c4deceab0e6f1c6461186131e4b9e7558970175cd5a70232eb7096c3c10fd300a9d22612e97dceeba71765118af45eed7a610678f66d9036452e7
 EBUILD twisted-words-13.2.0.ebuild 499 BLAKE2B cb080062e56854f25138376478f3c04839007a3bdc6d22b306f31083add9461216130fe46cfc842f00c8d3e9e855ff26ca784ef29db33d65f8e025fc26527d1f SHA512 bab25a6be4e57772d5d6b3efe34042315c03ec428205c17f9acfa2554cc1396f2c3962774aef6d0585b65df5a2e719528d9653d222caadb5e6b3aad0930ba38a
-EBUILD twisted-words-15.2.1.ebuild 494 BLAKE2B 2289bbe7e0e3c9ae15d9fcbdcd6afb12510d3f59d71781a90acf509600416d539f2704ef2e76dc7133f268940cd4ec1eaa1c0f1e8fc080024e3fb129efa222d9 SHA512 12d607e47d1be076a0f7e995b0fb7d2426d86e8f74664d4e1bef735480e810d0347071f51b6b478680b8f1c74c2c1847ddaa369083cce7a8be2e7dbca1bb7952
+EBUILD twisted-words-15.2.1.ebuild 501 BLAKE2B 480f994bf3016ef4cb6754ef36c7d0ca1bf379c47de99841bdd31a8e9e29947d51e8197445b88a953075fc0476ad63e95726624608b829ea3fecd587324ba32f SHA512 8f2cf70ef58c3c115e4e5a696a8dfb17d3602cbc83b8ad813724cc4f987838a152407c12bc906d0b3fb3b4a1d296a687e6abb962e3c6d4c38916c091b89a21cd
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/twisted-words/twisted-words-15.2.1.ebuild b/dev-python/twisted-words/twisted-words-15.2.1.ebuild
index 3cfcc1ef0e48..a09ec57c0bb0 100644
--- a/dev-python/twisted-words/twisted-words-15.2.1.ebuild
+++ b/dev-python/twisted-words/twisted-words-15.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -8,7 +8,7 @@ inherit twisted-r1
 
 DESCRIPTION="Twisted Words contains Instant Messaging implementations"
 
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/urdf_parser_py/Manifest b/dev-python/urdf_parser_py/Manifest
index 3cfc5f917b8b..092aa10392c9 100644
--- a/dev-python/urdf_parser_py/Manifest
+++ b/dev-python/urdf_parser_py/Manifest
@@ -1,3 +1,5 @@
 DIST urdf_parser_py-0.3.3.tar.gz 41536 BLAKE2B f2f57b12fb44d830976303eebeb33a8794075750b8c2490da0a0d0db4e6c561d854db59cdda920d5aad3016631b824bf90b639c3e34853e40836ae92ee63f875 SHA512 b0f2787f41cee077d7b13eb55ee9ea99fe31877b18f4fa62c6205320752c39f727311bda0b44906bd8b3509527cb22adf3fa9ce3a9269e4e9d250cdf6b7b26c7
+DIST urdf_parser_py-0.4.0.tar.gz 48137 BLAKE2B 6e0adf5c5b6e8c4c6da92536ef19b1b30b9b1a9612445aff26fa323fe20951e77cdae2bda31238b8f868cfc667e0a5657808fd4fb8f968fa1799b5f792852d2f SHA512 823469fe3a8227efddc5cc805e128ac565580c9bfe4467d4e96b6a15cc8da008b9d7d6a5bee1e7da092310482692da1ce279c3e843bb95b6849d4a9bf6c3ac3c
 EBUILD urdf_parser_py-0.3.3.ebuild 539 BLAKE2B 26215cbb2ba0990dae283ce4eef0a82f8d6e28b317238ff4d40ab69cfa1402ce6af7228a8d1bdc0e182eea55474248de22c460b9f9a51c81ff56ce8b3ba80a69 SHA512 b38bd1c1ada91b765495dc786a0f80ff21e2c0ffdaebf86d9bbf32d6458113131d011fca4eae1f18bd50360e8f5ac4d6ad3d52aec6cc4bc4277b5758f0ec9d52
+EBUILD urdf_parser_py-0.4.0.ebuild 651 BLAKE2B 173d62abc5343d44dd313e85e96a02f173969fffe524db48c21b7f7e6bcb5cae37b30e62d54d8624c77336891b2f738b55fa55d267fb93ff1e675fdd9517d69f SHA512 7b58ba796a45fe881df4200223ce2d1b28400a8832415870e0f759cfae8673ebcbf3a76a28d46afa55b847c20ace8e789f6a34707ad5bca278d46edcf46f4879
 MISC metadata.xml 332 BLAKE2B e32fdf158e352a3e43c6465c4ad378e44b9e01112f06e245d717d9ab6404be91a7529dbfd7b85d68fcf0168b296d7a6e55465f9a7a291112195968e3d3863361 SHA512 6efdc6c159b3764bf93d401fe111e3b102ea30b80c6a653d87f2be031f49f0e34919d4257e1a052be2ed4b88f5451c7bc11332a0ca7dfb284df31e31f5d821f3
diff --git a/dev-python/urdf_parser_py/urdf_parser_py-0.4.0.ebuild b/dev-python/urdf_parser_py/urdf_parser_py-0.4.0.ebuild
new file mode 100644
index 000000000000..77da74e0a690
--- /dev/null
+++ b/dev-python/urdf_parser_py/urdf_parser_py-0.4.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit distutils-r1
+
+DESCRIPTION="URDF parser for Python"
+HOMEPAGE="http://wiki.ros.org/urdfdom_py"
+SRC_URI="https://github.com/ros/urdf_parser_py/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm"
+IUSE="test"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/catkin_pkg[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_test() {
+	nosetests --with-coverage || die
+}
diff --git a/dev-python/wcwidth/Manifest b/dev-python/wcwidth/Manifest
index 5c225bc050b9..bf9ceae8c6fd 100644
--- a/dev-python/wcwidth/Manifest
+++ b/dev-python/wcwidth/Manifest
@@ -1,4 +1,4 @@
 DIST wcwidth-0.1.7.tar.gz 22884 BLAKE2B 6d51be31c6cf11a23de48bfecd00d8b95e15c80b83559f67689611ac0d8406c18e3a761dc57a868e8c991ee07e286aed66fe77d905483f63ee998ca431fd35f2 SHA512 5bc9625fbd10721a50a3ac7d7f91012cca8e4f83533f265cf56890498bc52a53b155c82e67d6bc5523a5593c8d7992a1dec2a0f590318170eddf987c56f9c368
-EBUILD wcwidth-0.1.7-r1.ebuild 671 BLAKE2B 6f87dcb276149e7263d5e0b072e93cb84c49c33b3a414d2445d06c55828d9e09f7a36717dceddc0992593f7a722f22c0952b35f3c49076c26ec4299cbfac9148 SHA512 f2abc12252cca4bb3cf449bd70f0c2dabb1a4f3b5d39fd46c827d6b2390f8307af4a6e217a68641689664edb59f7ed328f01882efc8d5cbce259a80093bc940b
+EBUILD wcwidth-0.1.7-r1.ebuild 677 BLAKE2B 7de715f4307eb0de50dea2f21d36e23b779d25331b0ea7c8d0dec8cd6d0b89c5aa756160866cbde8a568163fc0d413df957c9b3916c39439645a922ff9c52049 SHA512 5457adebe7a5badc2309499a0929e6ef43b96a1f94101de349b12cc6ee6f182d0d103f552c2ca4c54e26a403c6e38e6b40debd2b86d664ececa5e96ffe0a8dcf
 EBUILD wcwidth-0.1.7.ebuild 662 BLAKE2B c41fdd3d6a40de1fac02aa149ca315e5e19f5feb4d673c788f85f050a7a4cd5e288e057a4746c31b1cadd2bcbb30b828a9dbb952756923a968098984dba167bd SHA512 8d261e73fa8a4082ae43b5b30dcfc3902fc94d2672b79a10a765e4e05bae28d96c4ae1d80d512baf6fee60e5f4acfd70fadfaf59f38810ac14526e239694daa7
 MISC metadata.xml 376 BLAKE2B 94917ec41c518ca9b328d9be7afbcba198376b1c28c3f24e24e3e994aecd877db745b07377bbba0a1c7d7b00e21cd53de31ca9ee4a0f08696d11b922cdc98771 SHA512 9f797fb27ebf7f1fd99d2c9a8c61ccffe1cc40f46991d9437dae121366da1edb31ee6ada3c202ced30fde0a90766453e72bcbb43a48919519f3de0b31681e213
diff --git a/dev-python/wcwidth/wcwidth-0.1.7-r1.ebuild b/dev-python/wcwidth/wcwidth-0.1.7-r1.ebuild
index a0359fe2f967..4621755b92f3 100644
--- a/dev-python/wcwidth/wcwidth-0.1.7-r1.ebuild
+++ b/dev-python/wcwidth/wcwidth-0.1.7-r1.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=5
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/ws4py/Manifest b/dev-python/ws4py/Manifest
index b551e717d054..6446faef6814 100644
--- a/dev-python/ws4py/Manifest
+++ b/dev-python/ws4py/Manifest
@@ -1,4 +1,6 @@
 DIST ws4py-0.3.4.tar.gz 65467 BLAKE2B c51e338f3c65e100b55e83cd7b09fb8e4eafec3adc118a2744ea4aabc54c91efacda94cb3018550049d617b6759198cfbdb4497a024c597de942abe9e5517ab6 SHA512 32cd2eb9df7367e2bf42e354766a0ca407715a863be6b51b7701ec6e0537a2ecf7c2a59423f56ae093855b075c30a4065c7f7efe3b0227915639223b9ba7a55f
+DIST ws4py-0.5.1.tar.gz 116673 BLAKE2B 31db304800f0d3da61dc4c1a3381a8fcfcfa8f16b36d916311cc32f1d294c9f7b3627dac673edf824f529f485f825ca418ab1e1a8a2fda5583c6a6a1bd9b752c SHA512 4c90d66d37fb5bdc8f7fc9fd184b20a7dc2dae811ecf3a041477e3c26a2577008be7041799daca5b8c0de65cb2454022a6c135cf02534ca98b6946abbfce0e11
 EBUILD ws4py-0.3.4.ebuild 1744 BLAKE2B 60b5ecfa1ae1f3732be19b927ea594e4b2c1ffd9a0980365b684ca578f40276f4c5432606b43c9bf2ff841d73d52057fbf600833fcb528c5b3c6639c3129a6dc SHA512 c286aac539f135c63001503cdb1ede1cdb5c589a5871025ff1b445c257fc68859bac8022c13b4bf4b9b43940fabe6786e285f521ea646f5eb10b8f0edc8671e9
-EBUILD ws4py-9999.ebuild 1747 BLAKE2B 53461b85c1514ab41a02a1822052f6f9a06c149a8be18ca1f5c17f4d81292b3b174856bf02fe65a90baa9478c70e20c331c629a0fea402d6d6209f52ececec03 SHA512 e0ae0d6d2dd0bd18a92b37f98c1eb83fdb3c77766c645ff5a94d98cb2e7c1df349067ff5429dda9fc079b2d680750539ed8c13f78fbb956b7d459f29f87017c1
+EBUILD ws4py-0.5.1.ebuild 1757 BLAKE2B 91537d7c377c77209c934fc1bd2cebe54fe8ae6053c2831cfe243fa306ec5a236b9f2ac9fc298ec1dddca03f347ffa327f47e968f90cfe9341bf3ea6662c5905 SHA512 8fb67724223be45dc4da1f9d3e03dfd151029cefa0efd05dfed89bf6ad9808f00bfa458c0abe5fa0c670b97ba318ea753818f7974518a865b09c949c12776c00
+EBUILD ws4py-9999.ebuild 1758 BLAKE2B 47a6b79fe9acbb8b336165f0080806dcf5929596fd95daad03211a398ad34c648e4935dda3a54b11b3fbc9ea33947187a6a279eba3cf8c86a7478b5eff7cee39 SHA512 db3f7a232a93c30bc77bbf1c3840f228ecbe1539499c271c8a4a3ff26b75bf75c3426e07a9292466594b01bceb3df1580367a74ecfae8f00912a77617ab16efd
 MISC metadata.xml 469 BLAKE2B 7c2212a53fd485fe5e99a53741f0d828bf09fca7dac40ddd1c0326eebffb1f0fef0c305ac00d61747d6184f3f309e711157f0b715d3fc49694bedabb9f09d513 SHA512 a368692c9de68b711cae8c35305b35e445f47046ecf2226d36d5944be4e8a6d29311c28c6ed74ae794517eb2f20c0b2eeeb0ce33e719029b843c8d23b2e2e838
diff --git a/dev-python/ws4py/ws4py-0.5.1.ebuild b/dev-python/ws4py/ws4py-0.5.1.ebuild
new file mode 100644
index 000000000000..c1c647c9a5e3
--- /dev/null
+++ b/dev-python/ws4py/ws4py-0.5.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# We could depend on dev-python/cherrypy when USE=server, but
+# that is an optional component ...
+# Same for www-servers/tornado and USE=client ... so why not???
+# pypy is viable but better with a cutdown set of deps
+
+EAPI="6"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_REQ_USE="threads?"
+
+inherit distutils-r1
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/Lawouach/WebSocket-for-Python.git"
+	inherit git-3
+else
+	inherit vcs-snapshot
+	SRC_URI="https://github.com/Lawouach/WebSocket-for-Python/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="WebSocket client and server library for Python 2 and 3 as well as PyPy"
+HOMEPAGE="https://github.com/Lawouach/WebSocket-for-Python"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="+client +server test +threads"
+# doc build requires sphinxcontrib ext packages absent from portage
+
+RDEPEND=">=dev-python/greenlet-0.4.1[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/gevent[${PYTHON_USEDEP}]' python2_7)
+		>=dev-python/cython-0.19.1[${PYTHON_USEDEP}]
+		client? ( >=www-servers/tornado-3.1[${PYTHON_USEDEP}] )
+		server? ( >=dev-python/cherrypy-3.2.4[${PYTHON_USEDEP}] )"
+DEPEND="test? (
+		>=dev-python/cherrypy-3.2.4[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	# testsuite displays an issue with mock under py3 but is non fatal
+	"${PYTHON}" -m unittest discover || die "Tests failed under ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install
+	use client || rm -rf "${D}$(python_get_sitedir)"/ws4py/client
+	use server || rm -rf "${D}$(python_get_sitedir)"/ws4py/server
+}
diff --git a/dev-python/ws4py/ws4py-9999.ebuild b/dev-python/ws4py/ws4py-9999.ebuild
index 757d4a7a3ea7..74386cac1ba9 100644
--- a/dev-python/ws4py/ws4py-9999.ebuild
+++ b/dev-python/ws4py/ws4py-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
 
 # We could depend on dev-python/cherrypy when USE=server, but
@@ -6,17 +6,17 @@
 # Same for www-servers/tornado and USE=client ... so why not???
 # pypy is viable but better with a cutdown set of deps
 
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+EAPI="6"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 PYTHON_REQ_USE="threads?"
 
 inherit distutils-r1
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/Lawouach/WebSocket-for-Python.git"
-	inherit git-2
+	inherit git-r3
 else
 	inherit vcs-snapshot
-	SRC_URI="https://github.com/Lawouach/WebSocket-for-Python/tarball/v${PV} -> ${P}.tar.gz"
+	SRC_URI="https://github.com/Lawouach/WebSocket-for-Python/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~x86"
 fi
 
diff --git a/dev-python/zeep/Manifest b/dev-python/zeep/Manifest
index a10c08940b69..eb76c0ba18c9 100644
--- a/dev-python/zeep/Manifest
+++ b/dev-python/zeep/Manifest
@@ -1,3 +1,5 @@
 DIST zeep-2.4.0.tar.gz 146930 BLAKE2B 998e6f12b264b168f0af95847a88b1ac58a1645411f8edd4fbdbabc9292179130145d5987df3edf5d559ca6f886bfcdc94bcb9426d6288b3e16708acbe10f4fc SHA512 7bd21d8feede66678557d7f6de3788509ae5d1785dd0c1ec4ffc076b73e8dac8df58eb6cc63c53ac4e28399bf1ac74ca93ef5710269406e88ea2da05f7456a5f
+DIST zeep-2.5.0.tar.gz 147413 BLAKE2B 30bedc5f95a5b911c402cdd5c13b117e478c0d63b37247a604a8b75eefb3404a5e4e7469ac1ae8188e9b3e841b706fd2bfe975bf8068e74ab07ed6aec9901c6a SHA512 f8eaf4eafd85d1464df28161a2cd39d9ad9079aa4fa39f3da11f352e52d3144b8d2c4b53a642c0ccaf70cac541cf7fca3a89b85b60bac7dd3330f4bb7a9bfc10
 EBUILD zeep-2.4.0.ebuild 836 BLAKE2B da7093d7c176dbd7c7de5bc437078115fea26ac12db66a87340c62381fe014a70a08bb8d9181a482fdbfaa12dfe06dde3b7d60c2ecb9a38e0813e65bcaea815d SHA512 ab6958245c65fda9d3d9d5f9416a1757fcf1024db68b33b2819566887bd00b978abe6e7f4059b1e5ce739025f4dd5d8de5b02eea7abe7dea5e2c509d1e994029
+EBUILD zeep-2.5.0.ebuild 836 BLAKE2B 90c8ccda196786f70ac7620ad76753e81bbeb96705ff28581fffb2c972e87e7af8587edbcbbb7f29015b5c03af7b198d375321619d515cf4521248709acf1470 SHA512 fc9e3b16799f5824aae5ef8cff1771ee873ab0344d5f496679ba45d1f45a9c66c42edb072c437c99e66c519511b91e8d41ded62e93cf9a9e2e36b352bea4a6bf
 MISC metadata.xml 589 BLAKE2B 7753eafe2db0c0494f397bdb185d121f6cf380a7007241d2a8a5e87b8a9080c026ee07c8d64d1ca1e661137c315492e28a6f6fd33578bcdc54432d9f183586c2 SHA512 b6d919287e23bc7a9aebaa3103678b7ca3927d7348a3470a266eaae25795851840c479307fd19a8fadb13f1e051b60bc617726fcfcd14983085fc33670f826ae
diff --git a/dev-python/zeep/zeep-2.5.0.ebuild b/dev-python/zeep/zeep-2.5.0.ebuild
new file mode 100644
index 000000000000..49ff707eb495
--- /dev/null
+++ b/dev-python/zeep/zeep-2.5.0.ebuild
@@ -0,0 +1,32 @@
+# 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
+
+DESCRIPTION="A modern/fast Python SOAP client based on lxml / requests"
+HOMEPAGE="http://docs.python-zeep.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="async -tornado"
+
+DEPEND="dev-python/setuptools"
+RDEPEND="${DEPEND}
+	>=dev-python/appdirs-1.4.0
+	>=dev-python/cached-property-1.3.0
+	>=dev-python/defusedxml-0.4.1
+	>=dev-python/isodate-0.5.4
+	>=dev-python/lxml-3.0.0
+	>=dev-python/requests-2.7.0
+	>=dev-python/requests-toolbelt-0.7.1
+	>=dev-python/six-1.9.0
+	dev-python/pytz
+	async? ( >=dev-python/aiohttp-1.0 )
+	tornado? ( >=www-servers/tornado-4.0.2 )"
+
+DOCS=( README.rst CHANGES )
diff --git a/dev-python/zope-event/Manifest b/dev-python/zope-event/Manifest
index 3923393167ba..e7b8ab1f1406 100644
--- a/dev-python/zope-event/Manifest
+++ b/dev-python/zope-event/Manifest
@@ -1,5 +1,5 @@
 DIST zope.event-4.2.0.tar.gz 488532 BLAKE2B 89c2c2e9e75a57afd43f7ee984cbe8f7add3cb4eaf1271695b2a5c31e77e5fccb0c884d3f8c44c54fbd06be209e4556bc2438cda9bc987124d46e795822bd841 SHA512 e39cbbccf679328db190f0641e3cb0d267fc606afc9cdbd4fb4100bde482f12f594319d885db101dfd98741225604bb49ef77094011bbe7edaa16877038f9989
 DIST zope.event-4.3.0.tar.gz 17829 BLAKE2B 5d508c834321c70399eb9888bc2b000f5b18de625c68dc089f3ab8571a7948c1e43e76c62811c955777fc2caa65585347c124e24f2afc46b23e9d30b6c4a4599 SHA512 dad303d1b76c75dcc98f1164c6dec8f8458f1adc4109146942cf9ff40ed3f92579b2da742b10798bc720ab17cbdebc86e54008cfa5155616e2ac68b332e62571
-EBUILD zope-event-4.2.0.ebuild 870 BLAKE2B d1946503b6997987273603f7ae1d4a0b42c9958441fc7b5e600874cd160b431590c5b6ae676754ca5bf4e85dbd204776e027c907c7798f9e62b5a22fb090dd0c SHA512 ef4671edac3eb8c7796f3c00fa04457f67cf927e2076a501a2cc3f9a9a15453e045626c5c254934249b6942dbb3be6521ff2b8f418f80bcd41735c6464d5a24d
+EBUILD zope-event-4.2.0.ebuild 869 BLAKE2B 8ea1f0050b13e3f65a5d7575e78ce1d0f5e1cb0da128031676aba13a90e6edee488f0e215861ecbc382a80355b51083a5c5e33d07fa33f06d2a6e24036a38af1 SHA512 c522d3536a55c0f6bc85ec5cff427fb4332c97f4b60244b4b573f06fd7a89473d5ea621277fe9bbf4e278c4029a10367779e262863fdbad182d23135d2d3a33b
 EBUILD zope-event-4.3.0.ebuild 1103 BLAKE2B 379f5f7c3b2d75dfe45928eabf16c7698d5df040ada9cd6fbecf90a96437810b78f13ed144725394427ad7ff45a7b8678d1e9e8d914287487a85729ab115b5b4 SHA512 7203951d157a0072c6f8491a180f79dc1b4522f4b014c0c3d7d1552bb12199b2376dbc8febf9f82d929164de4b2e3e3bf454db1115f24f8d221b94f883c9c8b4
 MISC metadata.xml 378 BLAKE2B 53e40f9f0e2a3c17be6503b23c943f72c4221f8d131e56378bc7aa56ed8d889706a4e09f177e137fd1cdece259a2b13a2c6aabf4709b57e20d7e3964fdc580d7 SHA512 b04f8e3a6a16e89458912a27c16154f89067883f11c35552a00cd273095b30ae085b19eb0bebe860055db4876d23085b062b57f937eca21bbc98098a8a06a831
diff --git a/dev-python/zope-event/zope-event-4.2.0.ebuild b/dev-python/zope-event/zope-event-4.2.0.ebuild
index 1a533c01cc40..1e495e37dd31 100644
--- a/dev-python/zope-event/zope-event-4.2.0.ebuild
+++ b/dev-python/zope-event/zope-event-4.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
@@ -14,7 +14,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"
 
 DEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}] )
diff --git a/dev-python/zope-interface/Manifest b/dev-python/zope-interface/Manifest
index 8aa6d3f39b6a..48d8aec5f1f1 100644
--- a/dev-python/zope-interface/Manifest
+++ b/dev-python/zope-interface/Manifest
@@ -2,6 +2,6 @@ DIST zope.interface-4.1.1.tar.gz 864139 BLAKE2B 5531be26538fc54dc1108130813797ac
 DIST zope.interface-4.3.2.tar.gz 143139 BLAKE2B 60e8d1ed360192cfd2bafc5738f1a5278216d1ca55ca7104d261078915f9ea1966a1001ceaca02bff9359a69b38b402a77c42e872b1a64f29f61a80805587b4a SHA512 4a9b0f8b7e3157f29aca3810baea13d880b09d80945f23953e13325afe6780c2c1a5562a875f97958c1b33a28e009dd495f608aa7af79aded4f2ac2d61d3a251
 DIST zope.interface-4.4.3.tar.gz 147052 BLAKE2B dea636ebed2f66035510d467615a9532a7c082ddf4ad3bb26fe0101f790db667817e12c4fd3f4a0b654151422e6ff8cb156f3d2e4310e0294ffdc7b5b4e836f9 SHA512 29d9f3f1fe9af8a4ffb1e6d2f067bba1fa1bac7b02690ba8429985aa6ca76d3f337076bc8c48f39d0f338ccd855800b2f28b319a183a285191cc007bf8d9c9ad
 EBUILD zope-interface-4.1.1.ebuild 993 BLAKE2B e709e515f10e58ed57515d8c866e0a34475c79d09b8548c37565b745a9d2c0f637f0228ac51a745fec2782f5a6ab4a5addd74bcba7cf00a6e7d43467cfd421d9 SHA512 fa53ced7cdf0829b345a6b52f668a3ffbd7abf58391920eaba4eb8c74a0aaf5cac04088f013b764dd25957f410c50836b96ca7222ba7a31659a2289c416ed2be
-EBUILD zope-interface-4.3.2.ebuild 1039 BLAKE2B 74000afcc3768d0651939e139f2e49b0a9ff4c40eb3ec14085f81daa424627b66c8c41874c5469ca48d59bfff6217ec5a05c63b74b6a3d7851bdea745ffe769c SHA512 c2b714b42e1989d55e9b3e81850a9c9ead83c1e20f59c4d21ba7cbf001e380d0d1341f9b0c52aa7821b03c28091df64730672b1369c907790662dc3996b67b82
+EBUILD zope-interface-4.3.2.ebuild 1038 BLAKE2B b0dfd3fcd1a29def213028625139bd5caed857421f438e981cb4f428c4487645f36003cab56648c60b36fa94a02c17af4aa58d2707bd0f2261a38cbd01a10169 SHA512 99cb0386184e0da0fac0dfe03e8f569025566aa5677939acdd8d1cba22adc1b50ef0986d619ee3917300c55a8793c24473db99154ce0f5d75d7ff631c5c7af41
 EBUILD zope-interface-4.4.3.ebuild 1293 BLAKE2B a2adcb5f936a0a03dc019ea0cf17e8b5d9935a9ddb737d4b3ddc09f6fef50263527f8937d742172f80fd3f8e77711f1e90891cefdc230ef99e3629fd18cf6573 SHA512 fc686ee4c4ee08d7c8a8f4254e9a38a2c7bf236b5723ec93c7ab6d9f72d12c81829fc134b04e131e9d88d0dd7c15f9d591505c1c7135c0893430962a5d9f9af2
 MISC metadata.xml 386 BLAKE2B f8454bc6cb7c55f203d75f44428b0fe404d050e4938f80e5ca1e0504811a3ea73980ab474d12b47f31a87ed508a2f23143d6393eaf2f66eaface7b35a2058a61 SHA512 fc31e083f990006f9a4bdf1cdef5b8efee3e69e8444f614dd5fdcc0d7ddb8291cc1e45c21ab1418668c2e247068a39467e837aa8b869cc050a856635b8789fdd
diff --git a/dev-python/zope-interface/zope-interface-4.3.2.ebuild b/dev-python/zope-interface/zope-interface-4.3.2.ebuild
index e75e331c34f9..fd8aac319be4 100644
--- a/dev-python/zope-interface/zope-interface-4.3.2.ebuild
+++ b/dev-python/zope-interface/zope-interface-4.3.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
@@ -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=""
author	V3n3RiX <venerix@redcorelinux.org>	2018-03-09 16:53:27 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2018-03-09 16:53:27 +0000
commit	80208fb578cf92cc308906660ca6d7860c6b2a1f (patch)
tree	6f06818031b553c506fc10dfe9908a835df288aa /dev-python
parent	06a7b5647e11a8ddf69b1c3d3ded6a8ba28b923e (diff)