gentoo resync : 01.12.2017

author: V3n3RiX <venerix@redcorelinux.org> 2017-12-01 03:04:39 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2017-12-01 03:04:39 +0000
commit: 407525b571b48cfd65e1ad7a02d250a927c967c9 (patch)
tree: 844bea44d85dc7218f54970af1c42cc9d55c3f1a /dev-python
parent: 89c6c06b8c42107dd231687a1012354e7d3039fc (diff)
181 files changed, 1284 insertions, 1113 deletions
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 9145ad921b35..b17edd452333 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/PyQt4/Manifest b/dev-python/PyQt4/Manifest
index a1e94a24a9ad..e45605ae07d8 100644
--- a/dev-python/PyQt4/Manifest
+++ b/dev-python/PyQt4/Manifest
@@ -2,6 +2,6 @@ AUX PyQt4-4.11.2-phonon.patch 897 BLAKE2B b4834b319d15f96b80e4cb3bc4fe6d3f690df3
 AUX PyQt4-4.7.3-qreal_float_support.patch 5954 BLAKE2B ae198e39b05d42aa9be83a4d2bb69ba3705f3bc8e72ebc3e7b6ba7ef650f68f7d2dcb13dfade1dbb6a441809d39f4b9ade7fa3eaa075bc13cc16a0ef20b98022 SHA512 5431778103c333c1f13850f4b5fe982f4fe8e04c6cabb013ab8fff7d6117f9d0d5b8c7bbc6d5ceaceaa84fa8984276dda373e989ef3a8d90d3a1ae2220a97af2
 DIST PyQt4_gpl_x11-4.12.1.tar.gz 11328010 SHA256 45d724461ae58b019b9be95076ca07e212eb73084aec9125bb254825c3a05383 SHA512 0651816ed5a371c24827e182eac5b2a2afe67928d95a09f63bd8158117aacd3e835b1efa06d4fc0c147a28038613a5bc088bd736a1348de68199da7952299af1 WHIRLPOOL 4b216d1d4598363d9107a2ed5df6537a9fd1e36c37b7fbb6ccefc22bd4fd93f96f9ac72799bb028259bc80f2216c81ccb738df978d8a48e1f37e7fc2ac146676
 DIST PyQt4_gpl_x11-4.12.tar.gz 11325395 SHA256 3c1d4b55314adb3e1132de8fc2a92eed216d37e58aceed41294dbca210ca88db SHA512 bc5ee53e6ab8d32e240bbbd85aec9ce18a398848c0ee73d874763156256f7942a4a452a26f34fe035fdbeba5fb1df060910688f8a1bc7f7f183543d3dd0fd731 WHIRLPOOL 001df301c9620873794c33f5294ae30ec9d4a32359d26a8607377fe2468dd33a313ef09e96d2491056cdc066edc5d80b4e80afa19976dfb2a7d291cd829e2791
-EBUILD PyQt4-4.12.1.ebuild 4730 BLAKE2B 3078942cca144c22886e1a1b9d0a6a87ad36dca91ab055216052471677643c54bce2ae64704e97e78c16cf4483d7c2c1babca9b94058d46a768b71153a88ec5a SHA512 58064759153951934390caa9f4223aa1ec3c3674d6e8dcdbac0da9f194e554f7af1d79ea7bf00f83fad8776c27dd0b759ad4f181bd181cde66efb5c06d042afc
+EBUILD PyQt4-4.12.1.ebuild 4727 BLAKE2B 103d89eef1140cd101005be43b3d66ae3e861c721257ddf2507a925aa766a07fcaf97925edbbbace8381f0062356ec2990eadf14e89426283eb9e9a2b19d65a1 SHA512 df28ff0067d97a91cbad571d73986e68337a812cddf46a58dc671d3332c54a7110292da1842881629108912865add569c05a2914a01f27d28c5230984a7e610d
 EBUILD PyQt4-4.12.ebuild 4723 BLAKE2B 441c0b2cfb0ff02295808a7d812cca49149ef06c7226ff95ff782ead9d90eab35af016188abcfe308d7d085058cc10aafb552dd4937af40af46090cc4fce31dc SHA512 04a5e08557d5f44c247105c9a52b3b524dc03f02e4798c7f3833bb6455ccc511ece323d3341c2e9e6213d9bd5f3d09b51258b006195a73072f5dc797ec448236
 MISC metadata.xml 1770 BLAKE2B dfb5d8b53c0a5666b0ffda7a9f055eb134f651781e579cd3171ddbcf0a50c3bd5d307a6ff87647c4632b66f5b64601021bb57bf6fb73cfbd504c0aea8a6dc1fe SHA512 6c6671ad8dd20f4d1701facd3b7de794b4eca907ba273f5c6626b691753ea26c0679cd4d91c1847beebcc298341ddf19d71bb4d3eb203e10720c64c54a2ee559
diff --git a/dev-python/PyQt4/PyQt4-4.12.1.ebuild b/dev-python/PyQt4/PyQt4-4.12.1.ebuild
index 113c1734c21e..09dd2383189f 100644
--- a/dev-python/PyQt4/PyQt4-4.12.1.ebuild
+++ b/dev-python/PyQt4/PyQt4-4.12.1.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 IUSE="X compat dbus debug declarative designer doc examples help multimedia
 	opengl phonon script scripttools sql svg testlib webkit xmlpatterns"
diff --git a/dev-python/anyqt/Manifest b/dev-python/anyqt/Manifest
index 06491a795ff3..f8b0c231e1d1 100644
--- a/dev-python/anyqt/Manifest
+++ b/dev-python/anyqt/Manifest
@@ -1,3 +1,3 @@
 DIST anyqt-0.0.8.tar.gz 43519 SHA256 0424953b6917fba633febe7d91b2c90bca410de6342103f880e2a7356beabf05 SHA512 8bff488972703385bb0506fce7b33e2c62a0c6469e0284062b0882dda0842d5488621c722e00c2005aa1f8ff18307e823e146aca92c16f5116d2bc974b194641 WHIRLPOOL fee2256d81daee988df08fb4c49c5399995f21c146a4f359f7d5b41a8413d2808d95244717ccb59c1c0878e59148a617e2c161e170f12844048672562b5f49fb
-EBUILD anyqt-0.0.8.ebuild 444 BLAKE2B 6adc4a950fb0c17a1958def140d6d3e0de9f6e82bf6d88667658a50703cfd17b107b86c4cfefa31bade1f906125f620f0e7a958e6521df3d1872de33b1b2b6d4 SHA512 7dffb40505c60f1b5929d5ea5009a199e01089784feab9adf2c022fe230ed510e4ffa97a716a18f761d694e841f5d833de44f762a7d1d3136083a6c5467b28d1
+EBUILD anyqt-0.0.8-r1.ebuild 485 BLAKE2B 2db489c0238301ef5d80f6ae24716356697f8277ad391280b2cfa0fa9f09b47ea1e66506bc213364b6c3239c77f2eaaa5ab16ee82c7d257dbeb1d9d08dc01976 SHA512 ccc1650d54b957be41f4c8ec4e646dc1192bebb03af8e6b3d25f97b9655fae7eb41e330ce24fec5172c06348ebf6d82d06b00257dc439db3c5b28385d87d77d0
 MISC metadata.xml 217 BLAKE2B b4bd64b91108b5009484a426472b93c0ee864691d060218864452d2e504b491022d3d7bcc4b57ad0b5e5f2e01b1fba019e8f63eb79b4db8dcaeb505593ffa2ba SHA512 9611c83ea0155f3d39afee524c6425ae6d7e07cebc4ee489a45e39ab80e97fc2bff56fd9a8d97536a5bc415da147eb587b20ccffa5baa61440df65bd26576e8a
diff --git a/dev-python/anyqt/anyqt-0.0.8.ebuild b/dev-python/anyqt/anyqt-0.0.8-r1.ebuild
index 6d732a48e557..d1427da72bb6 100644
--- a/dev-python/anyqt/anyqt-0.0.8.ebuild
+++ b/dev-python/anyqt/anyqt-0.0.8-r1.ebuild
@@ -18,4 +18,5 @@ IUSE=""
 
 RDEPEND=""
 
-DEPEND="${RDEPEND}"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${RDEPEND}"
diff --git a/dev-python/backports-functools-lru-cache/Manifest b/dev-python/backports-functools-lru-cache/Manifest
index 2d07d0f13411..f7e6357ad71e 100644
--- a/dev-python/backports-functools-lru-cache/Manifest
+++ b/dev-python/backports-functools-lru-cache/Manifest
@@ -1,6 +1,6 @@
 DIST backports.functools_lru_cache-1.3.tar.gz 6685 SHA256 444a21bcec4ae177da554321f81a78dc879eaa8f6ea9920cb904830585d31e95 SHA512 946156266d4b1bccb3eb444d1cceff6568b8c2a62e09bc9197281bdafe912069efa4c857089a7e6ea0247ab9407256a7a7c92485599692e0c0159c428137a342 WHIRLPOOL a4cccbfd49acc640c1e15949919e10343c00f966e22bac7a2dc82af776f35cadce825a7757c5dca32b189797303abedc93aecf3000203819ee869bbb37ac4a03
 DIST backports.functools_lru_cache-1.4.tar.gz 6927 SHA256 31f235852f88edc1558d428d890663c49eb4514ffec9f3650e7f3c9e4a12e36f SHA512 78dcd12f392bc110d1556f567a9f8fe977fa4ddc98a2121ceaf43606687171866832b8d32220dfb4ca335f53e89acecabda9e48ad48571f1741b21ab2d3b8a21 WHIRLPOOL a223576df439818a247784e49d1d401807955a64eee4fdae9b937daaa96afc42e535819b4f6bbd0aaf04a0764a241809a79909ecda359ede60891dfb33305414
 EBUILD backports-functools-lru-cache-1.3-r1.ebuild 1191 BLAKE2B dac5105515a6920890f616e9c14de7ed2281b61eb849777055a7e5e39b5c24faaeff995dc6c6a2b835ee75a28c256af92175481c6d706287fa547ca21495548b SHA512 a20640c8a0055cb9358303ad9a4e6de3c46ffe712542f1b2458851012969fd5f651ea7864fa906893e6ac59b2d28c5b994e7c8852b1457c263a7592c5fd16dda
-EBUILD backports-functools-lru-cache-1.3.ebuild 1088 BLAKE2B e28da73aa7a242273f06d23e1b336f440943b2829945275a5dbad321ba77319c1f7879b15f0dff60019937c8247160f98cde45c4e9be88d31b80403a80bc1d61 SHA512 6726fcd7dcfed6c4b53589c3ac98d3b9374ea6d43f8ea5d7bb8a4a6753d9d740279182e416b4ff813161dd2e23966a2922bfaf9ef7e998d970d4db67661af43b
+EBUILD backports-functools-lru-cache-1.3.ebuild 1087 BLAKE2B ac86552e0af27134bf1ee6c7e9a5c734b903a7a0a28b8ee173e43e5397bd32294898a808cf083016d088f541d9a30ee2fb052c4017ef5cfdd7982c533e7fb8ac SHA512 7e12c596df474b656f6089bf719b9fa1d4421face8a917343e764eab4fafba734ee0c990e047cf8c98528a856d6ed63de2ff88e94e832601b920d4b7973600ca
 EBUILD backports-functools-lru-cache-1.4-r1.ebuild 1296 BLAKE2B 5f0a89fa594e7bcd8371915acf01497ddcf8f70870836c90710d26bba10b6d5f04c619e6baaf65c64c5c315c69a3abc3df5c8e7e25a71b15ce58047ab9c9b9b7 SHA512 fd3f0c7c92f351d6b0eb7600f6f79c50e93c23d04c8c2fce6561f59b8377edb881c322129b82f8659d7de308b80962b3d69e3748fcca6da018f1fc9692116ce7
 MISC metadata.xml 803 BLAKE2B 1c196916295cc785c25a66f27d8534f4ca26d549a5f7355ddab41d97e04225a18e5fe1b560c9f8a58f5b1c52a26b18f7da0f1aa0879551e5045195096a66d295 SHA512 c8ee92d957a9af691eaf06ba40124ec7ffa668ccd98e77d5cc8972b3d18be145fb33c672b36150cd350274d753bc9a53b8b7d15525fc59ba17ec2235d006b11e
diff --git a/dev-python/backports-functools-lru-cache/backports-functools-lru-cache-1.3.ebuild b/dev-python/backports-functools-lru-cache/backports-functools-lru-cache-1.3.ebuild
index 3454d246d9c4..d8d150a11dea 100644
--- a/dev-python/backports-functools-lru-cache/backports-functools-lru-cache-1.3.ebuild
+++ b/dev-python/backports-functools-lru-cache/backports-functools-lru-cache-1.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 sparc ~x86"
 IUSE="doc test"
 
 DEPEND="
diff --git a/dev-python/backports-lzma/Manifest b/dev-python/backports-lzma/Manifest
index de6468b3ffdb..2a7838f191cd 100644
--- a/dev-python/backports-lzma/Manifest
+++ b/dev-python/backports-lzma/Manifest
@@ -1,5 +1,5 @@
 DIST backports.lzma-0.0.6.tar.gz 34475 SHA256 c9c97b10fb1941abdd896b9447e3745da59b32750b27c015ddb8eaf3654daaea SHA512 6196e64e81c2427d07844dab984113021ae97ba9d0c136cfd20b7213cdb8cda8b9a2643c8df21c799d338031cd49d4cbfd7f9ba9c30efd6cd28e63e8772a032b WHIRLPOOL 3d0f8a5f34d18c2f1e0072a0b6fa4ab22bfd61031ca521d423b4007b8702ec7d901560dc5416389f1e9839590a2326ac7ad2850d1a39e7603cb66f598a2de66c
 DIST backports.lzma-0.0.8.tar.gz 36111 SHA256 200584ad5079d8ca6b1bfe14890c7be58666ab0128d8ca26cfb2669b476085f3 SHA512 bc5e7672a0ac53b7cf97ea52a566e96d92a3dd334a8321699585225e32ad7c723b4ffd6e4b153bd2ae3ead2a2cd6a48678b915257de4952ddca8389032db48ad WHIRLPOOL 1aaa4ac5b0a2d25a932577ed52843a99a92ef152e1eaf5795bbdd9ec13cb048acd0f01a99eef1182392b33ae62aa2b4f61fb0e801e44eb729d665d707ca71ebf
 EBUILD backports-lzma-0.0.6.ebuild 930 BLAKE2B 3caa188c2c895f9d56ea35820a1697c922c0f420653db35ceb17ca7c81bc333bf639d969cebe6d7658d1a9259d45f5f64fab15ccefc208c845014958e46a8aec SHA512 21d6fcaf62639d5109f0531eb5b675b7ace6bea85a9ec5d4a7eb9c1df3e9bb92734350126b481c83a755f2f130421b64f4c2f510b6decd37600ad6a3c3b2ac90
-EBUILD backports-lzma-0.0.8.ebuild 932 BLAKE2B 126c1648a5f77324f1229334d6cac8fc09d48e1dfc3f4d2383d1cc6f364af18e96cdedeff101e9f82b6b24c4166b9d71feb3d6028deff16c61afd3048e2c9633 SHA512 a52fb1f912bf43e69c164d643aa692eb39cecf6aeee4970d64184846b85cccbf8d064e79e34c61de488652ade88bec50e313e5415d09c4c503c7f556b034aae1
+EBUILD backports-lzma-0.0.8.ebuild 950 BLAKE2B 244e21a5cbd072b04f21ea8864c65baba1b91f5854fff97c3477fbc57fe67f0d7d7905726410899eb2de1ea4911b4856b765fcbfeb69484deb6f568c16d0ab8d SHA512 ef0069f192fc6ee3a196e4a8c327c9579624f140f114c06d90acfed078813b54ea242fdce4e8d898483ee2077aa8196f304c3a53de0d4d6f9d41b6354d556182
 MISC metadata.xml 391 BLAKE2B d3837447c0258730ec4e5d45fb0e341494c8b29388d9cdb2e212e1118a9be1ae836cf8b5cc0d7ce652aeef359d6650f562385a884a9698c79518066bd9c9b96f SHA512 382866a463cef16a42a0a89b3f1af18565a8e72858ab1c55d7c89e9c8bf87224b3d5beed52beb46ed83b8e8f55bb02a5aaccf15fe027d21de138fed5f9798cd7
diff --git a/dev-python/backports-lzma/backports-lzma-0.0.8.ebuild b/dev-python/backports-lzma/backports-lzma-0.0.8.ebuild
index 90c977ca8a57..ebecdc999393 100644
--- a/dev-python/backports-lzma/backports-lzma-0.0.8.ebuild
+++ b/dev-python/backports-lzma/backports-lzma-0.0.8.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="app-arch/xz-utils
 	dev-python/backports[${PYTHON_USEDEP}]"
diff --git a/dev-python/blessings/Manifest b/dev-python/blessings/Manifest
index e633853cc883..25a7f38e4d44 100644
--- a/dev-python/blessings/Manifest
+++ b/dev-python/blessings/Manifest
@@ -1,4 +1,4 @@
 DIST blessings-1.6.tar.gz 19974 SHA256 edc5713061f10966048bf6b40d9a514b381e0ba849c64e034c4ef6c1847d3007 SHA512 5d0fc365416bf2b36b6de72f6b8c01bf0ab8df4a0148f492c80056a9ebd5d569e9c01966481e0d70a25add16da2bc3e73be933226369abca533ce019f97479f2 WHIRLPOOL 44dc96c1da174465b5dc3dd38c4d7ccc17408d072d290819c52d33e7e249bbbf428c7ee217faf3ec6acbe1e620b5e0cb2627c4dc3f0162cb21a810ce50e8b1c6
-EBUILD blessings-1.6-r1.ebuild 806 BLAKE2B 88996f1e50de8173eab0d70155b3b130cd6eb81357b96a6c388c561835b58574c9fdee96aa2669fb16dd4c4f0cb1b43167748b4bb2725134d95072d07fbb5ad9 SHA512 12c6fbf795832a7c7beaec8937cc1e42dd9a936d74fbc2c924579af922a25859541bea7d790641dcfd0297727cf226813528c177e2440868d506d2b1af81a21d
+EBUILD blessings-1.6-r1.ebuild 805 BLAKE2B 16376e9d825e08c14eb80a543c91752e925e9df70f3886859f3454a79e360ce6715a353aa3b6a53dcfee5845aed48461e432e70abbcfa2f29337cbbc3522a98e SHA512 c9a905932af36d50bd12d957a0d01d457bb6efce2ecf60547800d17da7c910984391ea10d0e041f0ab01e41f3d5ffd4acd1d1d052b456f4cca53e9c895243405
 EBUILD blessings-1.6.ebuild 758 BLAKE2B a41ea083711e3d15ea331a3ade0abd7d2ed1f7ec5f455ef27fb04618c880577e9757f0f261ae90bf28fe055b0f8d5a4e19c1224df4f9e99cd4512f8359f95805 SHA512 28a4985262effff9489e7d22a2ae54949d5db3e718bcfaa866a921ade80451205346f09f367ede77bb68ad6bb38135636b73d6edd1bf5d32724cb975ea300bd1
 MISC metadata.xml 450 BLAKE2B d5969d6f857cb2ef4927505a351baaa6116bc3b85c1e54a1afd031cc903909ababfa7fd76c01fc9ee4a4bb6ff33552ab984f902932bd8772f11ec931f8fa99dc SHA512 8851fc3ed67dbdbe0efb8fd1712101644793086e6d84fe52fd54d741d81f4c30bb666e1aa82bfc111e2f264e3a238c6059d8be6844a05819b285cc913ade0231
diff --git a/dev-python/blessings/blessings-1.6-r1.ebuild b/dev-python/blessings/blessings-1.6-r1.ebuild
index 359099b28654..8878932d42f4 100644
--- a/dev-python/blessings/blessings-1.6-r1.ebuild
+++ b/dev-python/blessings/blessings-1.6-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-python/bsddb3/Manifest b/dev-python/bsddb3/Manifest
index b40797d633d0..c483ff638e57 100644
--- a/dev-python/bsddb3/Manifest
+++ b/dev-python/bsddb3/Manifest
@@ -1,5 +1,5 @@
 DIST bsddb3-6.1.1.tar.gz 450571 SHA256 6f21b0252125c07798d784c164ef135ad153d226c01b290258ee1c5b9e7c4dd3 SHA512 f5e95edf2d18f04f4a306450a67ad675902b102cde9fdebd870727c2649ba7dd759206708c9225af871e0811e17812ef46c90ea6854eb3209ba36c86900ffb01 WHIRLPOOL c8552008d8de272ef665ca54ec134a8bf64e31c41b4738c9ff461d5d2f6c045f20bc9604bff2acbb86222d838649297d8e96060ec060f2da342ce0314e0b2211
 DIST bsddb3-6.2.4.tar.gz 242397 SHA256 4866aa32ad6ec6d5ff401d9aec8da07c4e84502298dc27f7c758545e243550e6 SHA512 15bb714242b05649a7c40ccd153979e596340ef039c89549b215fc5438a12fedb44150195063d2783c6c06ede3552506e31e8013b6b0431d27dd7e14975c08b0 WHIRLPOOL e835c62753bed8fb26a82452b0b1946be169ea863c3fa532e05e1cbeab21eae34291175fdcc73fa376924cdd577606dcddb5b560b560735cb39a81b3d3e01bb2
 EBUILD bsddb3-6.1.1.ebuild 1949 BLAKE2B 5b06cd8a78f99f8f78d45d1d27d9d0f23e860982257c3000983a1fc90973abcfb0f4a19edb773da660fe405912a6159c3353394572c1ab6aaf7c434ab3182b22 SHA512 4288d31c4c38a8f4d8e2319b6a8a81712fb6fe77f8b4baa87a3d65459abacad1fa8c28b437c9fde8035404c518949f65229e0a545a37f35f21d3ffac2c40febf
-EBUILD bsddb3-6.2.4.ebuild 1939 BLAKE2B e0944683ee70f16e2af0363c554292d96833598bdfcaa825c7ad12b9828b8a137c6c621243ba5657ae4618949fbfce2ee2a7da0835161b45abf79d6e17f7a2ea SHA512 181bacbcbe8e688e007543c09b4166d00f3d21b336a0a1e047d10d1a4d3dab7bbb693f0737ad575adcfb48903305d9424b3daca42f8f1aa7d9f1e588fe39ed91
+EBUILD bsddb3-6.2.4.ebuild 1937 BLAKE2B 5d72a068ac3a01735d857ab02dad69d09c88310be110a929dd0e07253e410602b01d6096abfc55aec03b1e964a4580b87c07bc1dbc21d9cf4cbea5be29aec92f SHA512 c7e1cb47c16c951446f38620e9e9e8e61fb890c86e3906280edcd64cf7d4ef96137b1a068a6619b118db0cc5b8ae8973ffc75874e4c34eb6da34dd53c0d28a45
 MISC metadata.xml 309 BLAKE2B 2a491c74fd8f64d284bbe32aea28da5790bb54ba0105fd61f477f725bb00fa729e976c20d35cfdead53483fef8d711ea0d9000cc2dd9663ec498b02e9e082083 SHA512 edf575ec4a06047d837caffa6c8c8a35d53c5236d806e6d2b4804943617000d8f745f1b94fecfe2af117be823821669e6b7e9aea2a427aa2d97b1eb6ec11eb20
diff --git a/dev-python/bsddb3/bsddb3-6.2.4.ebuild b/dev-python/bsddb3/bsddb3-6.2.4.ebuild
index debbad654805..a98ca0bd1a92 100644
--- a/dev-python/bsddb3/bsddb3-6.2.4.ebuild
+++ b/dev-python/bsddb3/bsddb3-6.2.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	<sys-libs/db-6.3:=
diff --git a/dev-python/bz2file/Manifest b/dev-python/bz2file/Manifest
index 033222e1e12b..f4db335ac7aa 100644
--- a/dev-python/bz2file/Manifest
+++ b/dev-python/bz2file/Manifest
@@ -1,3 +1,3 @@
 DIST bz2file-0.98.tar.gz 11333 BLAKE2B 4ec4687f609521a637c20a512b544cd99d7c334f7cffaeff71d2a893eefe131a10bd548b9f1e829c899cdcf181f5e877e092cf08d709bb3f1ba9901d3386b3e6 SHA512 2d28e71fe71b5fea4008d65a1fa91d5c6fafcacc09f891c5deaaa985661576bd97f2e33fe9f8c5943841f09c153f2079a2511329c066e57c775fb0b089b30b20
-EBUILD bz2file-0.98.ebuild 529 BLAKE2B cbd5c9ce82b4a18d58e2e0782cd2484c665fdf064adde8fa1561458686c4ac5b2451a71b1a9301627ce75d3f890436b21c3fe8ed7fc5046888a8948bc665109c SHA512 4b4f8051db4e0b71dc6eb454867e576ae0529442f1dbabbde611583085b2c493fed68c91ca98d749f096dc208b46970090cc4fab59cfb4ff4055ba69a2bb4242
+EBUILD bz2file-0.98.ebuild 547 BLAKE2B 76f368aaa094c3c54daf0502778a983cd3b0f4d1ec834d2b35a8dddd136d54c31177a543ec299044c943562cf98fe087e39a037528540d98fa4f442fe524f566 SHA512 026f74897e65f2ac5273c030d3d7d78607fe0b6c5fb01061e7c4998145b585c8c57dc291a2d0fd4786bcdcd0f1b727bdcc1a634c051dbd10843a6648dd5f6464
 MISC metadata.xml 342 BLAKE2B 8cd4d551724a069a3668b91bb8218576e23cec6c450baab71b70868670d673d51bc11952b7f077aeb76493cdee5ba20ee4175d091e5ccb995fe3624e3772901e SHA512 e511170e43873344d2652837b823c3207a8da885487abe5bff9a90e0807ae4a7736170759e8e9772957cfb52a9d81e436f19f4327636d411f0f9d73ab31a9d2d
diff --git a/dev-python/bz2file/bz2file-0.98.ebuild b/dev-python/bz2file/bz2file-0.98.ebuild
index 7fcf93002fea..8ef56527509b 100644
--- a/dev-python/bz2file/bz2file-0.98.ebuild
+++ b/dev-python/bz2file/bz2file-0.98.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 python_test() {
diff --git a/dev-python/castellan/Manifest b/dev-python/castellan/Manifest
index 25900d5362dc..ea48d8f80ad6 100644
--- a/dev-python/castellan/Manifest
+++ b/dev-python/castellan/Manifest
@@ -1,5 +1,7 @@
-DIST castellan-0.12.0.tar.gz 50497 SHA256 22194a1f2084b939652b28deca0f62312636442b0ab50511aff69a4902cf77d4 SHA512 9fe47f9678dc2528cbca652029263db89b71939e70c4f5fddffd1769271c04bec3cad0a7c29a800b646098b3df89fc064049c4fe3887695fe0b5dd6b3146835a WHIRLPOOL fe5d0e43dee622ae84210b21f68e54ef4988433a420554a925c465fcd0abedcfb2aa3f50be11085565239c56acb373800759ae3684c4bb53aac3914fa04573dc
-DIST castellan-0.4.0.tar.gz 49026 SHA256 2ccefefc2036ed0d6c76d735fb70b813e2a02f7adb7fd57e0640d064dce1c883 SHA512 2ccb2a757810c6ec125dbb8832cd09f918f9fbf84836ff69c79872471c7e4e40bc8030e305336ad9821de7c3b93617d39917387a6ab8f68443fb09d3f74d4dd5 WHIRLPOOL 972ef43c96356b4dfd69a5716aa996c6b0ac4ab54a989f8e38e3036e63043a33148e0e475224cfc9c4d7e2e5f122af476553015fc840b6326f599bd472f2f936
+DIST castellan-0.12.0.tar.gz 50497 BLAKE2B d5fbe6f0b29ad5dff2031f17d6883715fbf8ab96d3a7705cbb57d5de1c2e13f5f0490893133abc074b91579f6c589939196249553aeb3e7d60a4aca416efac14 SHA512 9fe47f9678dc2528cbca652029263db89b71939e70c4f5fddffd1769271c04bec3cad0a7c29a800b646098b3df89fc064049c4fe3887695fe0b5dd6b3146835a
+DIST castellan-0.12.1.tar.gz 50245 BLAKE2B 93f56301ffb57f44fd89fccafa5a2aaede3a3b8f54bf223e1e2a3cc1f14304b2d153557d62f884140512ef72747268b9f86e1102b067a0810bf8235df2e72a7e SHA512 f5e3a8a6ed6c00caa242d2a2a1431f2ddd56ff0168a62fa825eb90083cc1830fe2d8bc4d21b8ed6d1b5f6d1042cb2ad778d49e6a39b003768a61b9ff4d389027
+DIST castellan-0.4.0.tar.gz 49026 BLAKE2B f5c4854ce4837a33c6bca369799da2f6b6109a1ebb2bebf47ee93f687214f9388039c237d474ef401bdddd3f983d18af6e4d84f3d6fe3418d3f8989c6811a3f4 SHA512 2ccb2a757810c6ec125dbb8832cd09f918f9fbf84836ff69c79872471c7e4e40bc8030e305336ad9821de7c3b93617d39917387a6ab8f68443fb09d3f74d4dd5
 EBUILD castellan-0.12.0.ebuild 1437 BLAKE2B 69aba8d6c23bcbbe7438a5608761ea8ba4a0a0ddb010f5e92ca26c20cc5d9e1fddcdbf9c03e55781ff6b133515652354bf724e22fdc0101d2dafd97e047819e0 SHA512 aa3a0b44173a59d3c44007fe0ad573edc2affd4aeb765eda18bc7d208ef15828a61dca39ff5ad234a4a696cdaf26b45ebce726f15bc494bfca9ced57aac4e76c
+EBUILD castellan-0.12.1.ebuild 1439 BLAKE2B 693be4147a5d7520ac015b9181fe57dd7bed38d62790edc370b7881b2d70c5033d4e4059e71173dae4ab0f43bb4d388ac6f1b8309ab99db542c000bd46ec905c SHA512 acd45fa667e65fe1322725f562d5cd809cc6569209dbe25f0b3022ee7d06ed2f25b9712c5dd1aa9da45d0c16087eb18302d444d71e32cbfb750174c2e144fe35
 EBUILD castellan-0.4.0.ebuild 927 BLAKE2B 4970a777ef6a94cec2def40cbdc097b18fe8f001455d86c55f8aebf973aa7a076bb0f415657862828e8a6d91f9cbe0955de9f973f665c977e1779b096f07a60c SHA512 a7e4cf2a25a51e3b2ddf54a182b229ef441e6c2f5925b62c1efd4a457376cc36c0b8cef52691abe0e113c53913a13a0e649ecc3551ddf8c0ffe2529238a379c1
 MISC metadata.xml 326 BLAKE2B 5ce95fc1eeafa570c9910dd492a822dfeb251bb98c5b341281ee99e7402be32234fc38bbca1b7ea0fbb67f8bc88e9b1a1c85da73f79d2a9ffc3a69289da507b4 SHA512 f8d928ab94ac70a7a3c2548b67a6296b8e86b5e239a9c74cc4b1a120f64c1e2e2084612b025e26fa3c02099f543ce156e5419a5f6ea165eff79b2dd77e9a2d66
diff --git a/dev-python/castellan/castellan-0.12.1.ebuild b/dev-python/castellan/castellan-0.12.1.ebuild
new file mode 100644
index 000000000000..2d93dd3fb60f
--- /dev/null
+++ b/dev-python/castellan/castellan-0.12.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="Generic Key Manager interface for OpenStack"
+HOMEPAGE="https://pypi.python.org/pypi/castellan"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.6[${PYTHON_USEDEP}]
+	!~dev-python/cryptography-2.0[${PYTHON_USEDEP}]
+	>=dev-python/python-barbicanclient-4.0.0[${PYTHON_USEDEP}]
+	!~dev-python/python-barbicanclient-4.5.0[${PYTHON_USEDEP}]
+	!~dev-python/python-barbicanclient-4.5.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-4.0.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-4.3.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-4.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.14.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-i18n-3.15.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.1.0[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index f18de4f49a88..743514b130de 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -2,6 +2,6 @@ DIST cfe-4.0.1.src.tar.xz 10933628 SHA256 61738a735852c23c3bdbe52d035488cdb20830
 DIST cfe-5.0.0.src.tar.xz 11437024 SHA256 019f23c2192df793ac746595e94a403908749f8e0c484b403476d2611dd20970 SHA512 14acdd622310122b544c952ee5b932b7006d9d8424319f0e3974f2503d40a0cec4200fdd3d813a32ce0d877bcfbb9a5bd5c36f6142b4330e6c814f113ca2efe8 WHIRLPOOL 9d2fff35324621be191cc69b45db472681c9ebdf05aead09510f3178853ac8a179f2c454c2e6513e57f84a99980052671cd9a23d38d6d14b42dfda1853a7844a
 EBUILD clang-python-4.0.1.ebuild 864 BLAKE2B 40d3452c9f28d5c154a51258a764bc380addf20f8fb71e8f5e3d9a0fb60822d805df009f58f24457b834870a07abe365bcb6d3ed6557713282129992c1ae1d84 SHA512 d2900dfa55a69965e146800f097f8be256d022aca8d85f54db205f75b30cf72015d27c4e8f4981725d50c7a1c2a14c15454f009b2d8a3636103d6d133b0a2324
 EBUILD clang-python-5.0.0.ebuild 1028 BLAKE2B b271ad931b089143e58cd1b24965ca58e0190b33c8a555690d7a6a193ffbae436f3e8c175e645f774f30ca830e7487d845cd1f13c881ee213d36d14f589e9055 SHA512 7c5a20034ae0deb3820692f651a8a3a69741b00b71f8465656a59fc2ad17009555420dddb8105d2353ffbfdd1a32f4f377ca412fbe3c4f15a0e9b0e1d90b29eb
-EBUILD clang-python-5.0.9999.ebuild 900 BLAKE2B 5342ccdc1beca21688cf0cdacbe6c537485ba6a0b763994ff0ec9cc55d0d3783f45b5c05f413d5ac38d5fecb996828eebe0a2e74bc9f408db4f45df2d07c04ac SHA512 589aabd4f0f8e8adaa54b010c153246bbbd95c0a357f009d94f9127a6a4cdb73e3cd8d2c254119eb3336ab386bc0552dbf1bdb560492cf1086cf2c0a40bc8a05
-EBUILD clang-python-9999.ebuild 862 BLAKE2B fa8582055555d0f7a1f3dc215bb868dde7d154a1039a6e2e6d07a3452936ab98d631c33f27287f32bb95f437b156358aa764ee55931888f378e244aa8b0da14e SHA512 c5496bb5e22c2a82cde4d486b5b723e84c2f10693ac9ef136a4e1dbe4a62218cdbd10c5aadab28fbd9a59f8b85aebb9bf256f409a6ae2bba437b468ad8e5e01a
+EBUILD clang-python-5.0.9999.ebuild 974 BLAKE2B fe803b942f556308676907dbf3e7879c77b5b32d011c150f397cdca32fc9c7b19cb7abd37e7f36c4e7d926654de62938ff69e5ec3e6eab296f298686bfa76c95 SHA512 2ecff7dada9b6f5ac99093ddd0bc7d6782dddc73fe1b073bd32f9a654cb6b782a1a23600985384ed215a054e25820f13950156fda6b42100af4e1009a1bf6d8e
+EBUILD clang-python-9999.ebuild 936 BLAKE2B 2032abda96b9540750f47e26314b8efa027f591c55317ff9f1a8c138de95cba967f5a5031f80e6a93b33e3faaa29cfea97354b2d4cc7265b8fb86759e2ed829d SHA512 defe9f500c577fb6f4d06fcb5725ce9c58b4d872ca614d7513e36f8ac29f42874b27c418754741f29a524e4794adf5acf8b83509dfb6cb6c348043d011c259ec
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-python/clang-python/clang-python-5.0.9999.ebuild b/dev-python/clang-python/clang-python-5.0.9999.ebuild
index 3310c5b2e313..6741f9636801 100644
--- a/dev-python/clang-python/clang-python-5.0.9999.ebuild
+++ b/dev-python/clang-python/clang-python-5.0.9999.ebuild
@@ -31,6 +31,11 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${P}/bindings/python
 
+src_unpack() {
+	git-r3_fetch
+	git-r3_checkout '' '' '' bindings/python
+}
+
 src_test() {
 	python_foreach_impl nosetests -v || die
 }
diff --git a/dev-python/clang-python/clang-python-9999.ebuild b/dev-python/clang-python/clang-python-9999.ebuild
index 854d44c3f77b..d59b5b98bb8f 100644
--- a/dev-python/clang-python/clang-python-9999.ebuild
+++ b/dev-python/clang-python/clang-python-9999.ebuild
@@ -29,6 +29,11 @@ DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/${P}/bindings/python
 
+src_unpack() {
+	git-r3_fetch
+	git-r3_checkout '' '' '' bindings/python
+}
+
 src_test() {
 	python_foreach_impl python -m unittest discover -v || die
 }
diff --git a/dev-python/cloudpickle/Manifest b/dev-python/cloudpickle/Manifest
index b9727a606eb9..c4d8a8d903e0 100644
--- a/dev-python/cloudpickle/Manifest
+++ b/dev-python/cloudpickle/Manifest
@@ -3,5 +3,5 @@ DIST cloudpickle-0.2.2.tar.gz 17020 SHA256 9da26af07a25431d8a3c412d4c8e78823c129
 DIST cloudpickle-0.3.1.tar.gz 18927 SHA256 c93a2684080011bb72fb59210c48b7259da8241bdcc6fa3f425ecca090e8c17e SHA512 81ea17181710f3428bc9c80e2e4b1fa57eadd6781528ed92ce5854ce86cded0b754d98afccd322408786ce4e3a77a1c758be73f197d809dad07c24e9dbb7c68d WHIRLPOOL caa3462abe4b131aed016918525674bd3831910dffcf435f96163573ab19d71b6d0fd671a94e9b24fa1acd97cb7c8a98f2fbc2f9a9c5f16b009d4963d08c1572
 EBUILD cloudpickle-0.2.1.ebuild 652 BLAKE2B d52a8644bc337b2d5e8ab370669b276bfd282b5dd10014bcf66596f99c98c702575bb07c5a0554af5b483946d1e0a639f40ca00b91072a7fcc38a50f344c2bb0 SHA512 26ea3a68f21cdf9c179d1feb96417968e85d4994e52cc361557d736577f67fad65cfc69dcb5619f250170842a5f692f6a5222066be0314cb5f3081203b48859b
 EBUILD cloudpickle-0.2.2.ebuild 658 BLAKE2B 15502a95c26d7a60d1ca3f3c034bfd3f9f7b2a91f02af46a9f67f48eb61265e0058e8fa7424b8de738aaee1392b280c15753b6b304e86ada590a0a4f8a2a6fd8 SHA512 6b1a3466b80b75e801fd08421327933b1b402de789e66ff0b07b8f47c2c69bf76986e5594107fcec3cfabb0f9b9544611cbfa7e8b74ae4449eded5b3c34ac6da
-EBUILD cloudpickle-0.3.1.ebuild 658 BLAKE2B 15502a95c26d7a60d1ca3f3c034bfd3f9f7b2a91f02af46a9f67f48eb61265e0058e8fa7424b8de738aaee1392b280c15753b6b304e86ada590a0a4f8a2a6fd8 SHA512 6b1a3466b80b75e801fd08421327933b1b402de789e66ff0b07b8f47c2c69bf76986e5594107fcec3cfabb0f9b9544611cbfa7e8b74ae4449eded5b3c34ac6da
+EBUILD cloudpickle-0.3.1.ebuild 657 BLAKE2B d1f9a279874075b28845fc9ffdd02334e8efc5e9d09a18dba5eb9729935ce4877a8701b96f58574834756651b66c463ecca2a4b22a8e801a2d5f8ac16fc6f9f6 SHA512 5ab8654a03c202a9bcff94c538569a40c10b836fb7359951ed481b767712a4cb19991a019d9c0e96e3caef26c6c6986d2291d0932f70728df1c2ab9fa03ff689
 MISC metadata.xml 324 BLAKE2B 1c37428b4d95b58077885d0a53a7f016566b0c1f3b6f6f1304f5f70c4ff3e175e4d4e2f5d1c940c7f231cd143f8592af96136fb303c47cd6762108fb393289b1 SHA512 2f331643b833ea7d97a6e24c21c6583e590204a38cb9ce77361ed7833e35e8c23dfc2b1b430d0e0cf2e45c0781b624f31deb4df6df8044b8dd34a5be16c3b3be
diff --git a/dev-python/cloudpickle/cloudpickle-0.3.1.ebuild b/dev-python/cloudpickle/cloudpickle-0.3.1.ebuild
index 3c344a15bc7d..5eaff6b8bb69 100644
--- a/dev-python/cloudpickle/cloudpickle-0.3.1.ebuild
+++ b/dev-python/cloudpickle/cloudpickle-0.3.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
 
 IUSE="test"
 RDEPEND=""
diff --git a/dev-python/configparser/Manifest b/dev-python/configparser/Manifest
index 36a8f864c080..d2717e462b30 100644
--- a/dev-python/configparser/Manifest
+++ b/dev-python/configparser/Manifest
@@ -2,5 +2,5 @@ DIST configparser-3.3.0r2.tar.gz 32885 SHA256 6a2318590dfc4013fc5bf53c2bec14a8cb
 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 651 BLAKE2B aa74cf77abb99b6b43e60fd2603058cf47326384f8da1f007d6e542be559e8f421a2386ed6b0f6371e37e1fd43cd46275c66943a8a51da3a898ac036370ab40d SHA512 5732b02199691c6cd83047ddb47850c48181e48eab4ce512bd58b76b6f96e84f139327617b3973b728e25300eff3976397db76ff9044fbe53705262fba9be638
-EBUILD configparser-3.5.0.ebuild 482 BLAKE2B 1637035ee346fef56bd06456d6481cf73ad9d02ecd69d2e9927fa30ce905d18b6da9d8e09a563d81e3082e0ca457a4533871e10733f37ebd5b10fa7b7b4a3d9d SHA512 a5b0d59dfed354a317c6bd6a01535d5238effa37f939585cf7021c6c2b4944f28384f6b9614d491726db35d9e7d6fef055eec6f2320c278554ec9d434936c5c8
+EBUILD configparser-3.5.0.ebuild 481 BLAKE2B f2e30b2f547e6907ef248c336a3ec6119e8840d0fd136e1f4b0ae9d68c6e77554f1a426c7a0013d605d822cbaefb35d3a278aa6856d3680d38278392c34db8c6 SHA512 ab1da86a7dda7d63fa301adf70106318588137031df2e478f67c8b7b5d789a667863eb8f4921836a8b7ee92bfd2dfaee8a8d2486def28f7b63e08d5bc696e902
 MISC metadata.xml 325 BLAKE2B 8b2c0dc1df941bc82398abee2ba3521a98bf318d2cb7ab34105eae2f10582c94d9d6c14dfc4eb9dacf1a87c0e4e0b80aaedfcf8d172205ed2b945abf1d3578f7 SHA512 84ae4fb022faa7158c67ee9be02019edf93a84b0f97d56e9bc4384bb57abc4f7c93db747627cd87696506383922101f3f5c58ed8509111b75eb6f3574cabc75e
diff --git a/dev-python/configparser/configparser-3.5.0.ebuild b/dev-python/configparser/configparser-3.5.0.ebuild
index 080f22282476..f6da89a86d50 100644
--- a/dev-python/configparser/configparser-3.5.0.ebuild
+++ b/dev-python/configparser/configparser-3.5.0.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 ppc ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc ~x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/defusedxml/Manifest b/dev-python/defusedxml/Manifest
index 688ac3843e5b..8084bdd4486a 100644
--- a/dev-python/defusedxml/Manifest
+++ b/dev-python/defusedxml/Manifest
@@ -1,5 +1,5 @@
 DIST defusedxml-0.4.1.tar.gz 48889 SHA256 cd551d5a518b745407635bb85116eb813818ecaf182e773c35b36239fc3f2478 SHA512 78a7a1f3d1eed9d7cda00afaaccf8153c7f616303c53d3918341d75970d532932b04effcfc8b1b8ed88ba6d730cb56400e9e4ecee8aa7d2181c7577f1d535783 WHIRLPOOL 9f3f51af296e3fd16b2cd94029481fbabb687c986f39810dcba331c9d3e5e30e0b294f9f1f5ce031ea28053f33be1a13e89d65ef7d0c6a3333e81dc764868d7e
-DIST defusedxml-0.5.0.tar.gz 60405 SHA256 24d7f2f94f7f3cb6061acb215685e5125fbcdc40a857eff9de22518820b0a4f4 SHA512 71e1a604df9be41ded454bcdfa63610e897eb405295d7365fcddfc5f50f7572c36f0bd91a4a1fdf47d1b097637bd9fdcf08f1cdb73e2fe64eea0320a7532e452 WHIRLPOOL c215dd919fba36de5e12443d556fb9a9c805d4d9aa3ddc75215c47c1b80861cef4bb564f25f67dbdc91927e5928a27c5585b8635a8bbd7d04c721b4db9b96410
+DIST defusedxml-0.5.0.tar.gz 60405 BLAKE2B bd57b3b705abff71ff99ce4e43fe4c1fd708463546cc5d614dceb56f36e98771ef5c952a1aae010d32e4b557ed687c194c61723a0b3334dc1b0d517591d7c3d3 SHA512 71e1a604df9be41ded454bcdfa63610e897eb405295d7365fcddfc5f50f7572c36f0bd91a4a1fdf47d1b097637bd9fdcf08f1cdb73e2fe64eea0320a7532e452
 EBUILD defusedxml-0.4.1-r1.ebuild 634 BLAKE2B bfa607f44a3a403141d6c1edec56c4c0f8274bbed35f1f7d4b92eb900eb2769e2ea5d3b84beb9556feed9023ebf4d7f89dec1040e7d6f0fb92dba1adbd007796 SHA512 c9fe185beac58bccab22be9c73c8a3afc5dfb74572092e89b6947faa16eff6780e304ad83cf885eac9dd4c5f1c31b14112b55590b608d5e1c0a7caf789cbf892
-EBUILD defusedxml-0.5.0.ebuild 708 BLAKE2B 27847c1d9d33af6ccd1f38773355ce8ef42a6468eb3490acb70646bede23e6441f08d18bbbe817583728fe64fd0cbb644ea4dd1737baf64c8610d7d63968bad0 SHA512 50b052c88289580f4d2f43a4a987caf970bedd73a3050698d6b00ed1ace6530cbedfea0d32f82a4b6e7752842d4cab265f342c7aa4bbc75cc6912b69b7d550bc
+EBUILD defusedxml-0.5.0.ebuild 706 BLAKE2B 1d9ec08c6f1c79ce9d1317065eab75f160e35bdabe9734937d8b39f20a00ca41f535dca2a05dfa8e6a6af54be53c4f73497b04c6fc5ac75bf2c18cd6913286f7 SHA512 fec3686658f227711b2be2c7290e8c999f01a3442b3eaf50c0e620e16d6d07403241da7b0e6eec41ca58cce619e1e95d3cfc5d05ce66bf029e6f4c83efe907f9
 MISC metadata.xml 384 BLAKE2B 27ce5f8830ff4e0646f95d633cbaeb85576ec01fea3bb46d7b54d2be2acd6f154ccfe8455169d61014bce03e5434eb449c2876c53a77f64bf083559985531de7 SHA512 377bdeac0f80c45f6f6f3387182e75c47e8cd526f563a1ce5305119113b4a1c4a99dc3a76bc91d81a967498645c9a23dc2746b62023dd0dc26e8d55d15424b6c
diff --git a/dev-python/defusedxml/defusedxml-0.5.0.ebuild b/dev-python/defusedxml/defusedxml-0.5.0.ebuild
index ae0c36e37a15..45b7b8362987 100644
--- a/dev-python/defusedxml/defusedxml-0.5.0.ebuild
+++ b/dev-python/defusedxml/defusedxml-0.5.0.ebuild
@@ -11,7 +11,7 @@ inherit distutils-r1
 DESCRIPTION="XML bomb protection for Python stdlib modules, an xml serialiser"
 HOMEPAGE="https://bitbucket.org/tiran/defusedxml"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
 IUSE="examples"
 
 LICENSE="PSF-2"
diff --git a/dev-python/dill/Manifest b/dev-python/dill/Manifest
index 03dd48e0a30d..85061ec97156 100644
--- a/dev-python/dill/Manifest
+++ b/dev-python/dill/Manifest
@@ -1,5 +1,5 @@
 AUX dill-0.2.5-avoid-installation-binaries.patch 784 BLAKE2B 74f3c8ac45a1ab97dbbcff9965c7acc0357bd8253cdaf317ccfe54294c35ef08cf328a3be0586b123365811b56546a2190eda4d76702efe7f8e5289333de093a SHA512 cb944c7e4699a99a5040140f2dd1cf6bbe3148b0fe098c536200cddd4ed835545c7e8328072a188fc9a5d70b9b4f5d3a138108f934734ee9c8021b3e95126cc4
 AUX dill-0.2.5-remove-install_requires.patch 906 BLAKE2B b8d38d701448930cf8596be8ccc3fd81f85e4f72dc2a6b64c3003ba3a21f86d41dd16ffda86c89e2e2f2714a96d6b92ebd19d05a40676e01efcf656fefcdae42 SHA512 f984248a8280a1cf97bca6a8ad90f8d648da106a74c67dfe29f62e5d8591d7cfcb608bf827729430f0463f6ad0846dba094a030b5c2c3e3f8f387f39803f737e
 DIST dill-0.2.5.tgz 60572 SHA256 431c9d46e190dcdf1397234cf659d66e2e22e33b0474ed6ee2d0b16c9c0ea319 SHA512 94942a736b4c2e1558eb9475f9bafe3a24f88a976abf9880beec386497a2bc769cb9be6bbfd2baac006c92578c372f5dfcfa165c5649876ea5076a3b207de6fc WHIRLPOOL b0af3e279ad937f36450f25711412b7e48928515e4721fee3d91663c4ec629357b6d8f3c661f1ac56d3f7343a3bef717a368386bd8983991e06a4ce0f78ae1f9
-EBUILD dill-0.2.5.ebuild 539 BLAKE2B 631f997e18c7a3f383e80355524cf6c65f3f99fab94417774e6ecdcd45515c0fcf58b76c2d1a9862519f33a637d48ae3f125311f35e95587f1cc8b66f4611e89 SHA512 9c8527158c526a1f451d3c54382d735fdd49174abec661b62de6f1efe82c6b2322a692b56b52e7db14d7ed724a56472a08891fd88d4f8dc6d44729de39963508
+EBUILD dill-0.2.5.ebuild 538 BLAKE2B a6b5836897287eaa0a56b19c0fc4e945b5dd4e6cca5aa90c888ec0bd3c41220ede36c303789c7a05cc6b47979924f0810f780b0988097ba8335f8f0826375542 SHA512 c2c7165d0290a89e26961c99191addf678716e7a3a7ee1235e4c5374c76b12fb20f089525fb52b9b2258e10e5aaa61922ea218ae7a11751aa1f5d659f79e96f8
 MISC metadata.xml 971 BLAKE2B b81903b1c1e32c039f956d6bbbbd8286edc4a80432ae473d6967c16b397aead0df3746d892ed29e94c55d2e555a14e81b068c1a95bef3e87c4248f8809e736d5 SHA512 6dbac6b4684df0f0ca183d998a8c8aaeaa5557d4f20652de04b263a9195b28e56adb7657ab12aebc63715efd2de242b55f3b17648a0337d689756fc4726e5094
diff --git a/dev-python/dill/dill-0.2.5.ebuild b/dev-python/dill/dill-0.2.5.ebuild
index d13dba401c3d..86628e8b42fd 100644
--- a/dev-python/dill/dill-0.2.5.ebuild
+++ b/dev-python/dill/dill-0.2.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tgz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 PATCHES=(
diff --git a/dev-python/docker-py/Manifest b/dev-python/docker-py/Manifest
index 84a6bc771fb6..d9186750b3b5 100644
--- a/dev-python/docker-py/Manifest
+++ b/dev-python/docker-py/Manifest
@@ -1,9 +1,5 @@
-DIST docker-py-1.10.6.tar.gz 122462 SHA256 dd1aa55dbe507538318e51e5303077d146d5176abd6b05fe9bcde24c289410bc SHA512 6360f9743472c42b3b080204195a0ba62ec85503cc3d4053dca1fb68e8dbed54bd90ed530d9b6ed0b29367aecbe3731d076c89e8d49365c133754bc38c3f15b9 WHIRLPOOL 3f42a0e597e63d0b821c1887b680b2faa8f696b65aa0851acaf00ccbc3ed2b271b1bbcc5390b99f6402b56f6a1a116fe76bf6a5f542b8beb9f8213e81df18f08
-DIST docker-py-1.2.2.tar.gz 69685 SHA256 85284a5b1a965e01a5d0a91f9f639ad5069143a276c123198fdafc3659280b38 SHA512 bf00b19e0ab56e5c0e8459234d09722ca504ecd933bfba61cb4ab4805410f53f6ad6083f2e964ef5a6eded2ea05aa01a89c27621064386bae145c7258ed996ad WHIRLPOOL bd7ff4579f924e02d18581b1aca00790dcb84afda03e4cde70b349bfdb4ad43aa2e06da2bcbe780f6074d98f9af9b14fb9d2ab4da9265e56b73288902c9ede7a
 DIST docker-py-2.4.2.tar.gz 180890 SHA256 53f72ae0c3329f48b2301eb64bc63ca0da2cdc9e8e24c87a76dab91da713ca2c SHA512 3367066b2acd96b85bef28aef00c91d752dc25b3055575b4f2f9c0b981eb4bca81a742bc6da5f97cf039cd9c7d818e3f80101997fe3a2e2c6f3a9c42fd3111c2 WHIRLPOOL f32495086c5b3a67bec365033d54b52ed77b156ec262239b10c5115e88e84be1bdd25562df9e04f93c18dbab68c378ef58e17d321ea54a2a0f8472381266b976
 DIST docker-py-2.6.1.tar.gz 191919 BLAKE2B e8147d83594138d5456fd75efa776b8c69fbca9f9d3959e1e2318dbdb9ae638ecf483785bbfebf58308d237a7b5d6f1ac885489811094d11e0e7270c0555ec46 SHA512 ee5e646e6b45ed9fafd8bd32c4cdeff565988ff77b21303b0c1b4b1ea56a9d51d04c4f8c9595159efff09cfd8962c1a7060c1910d48cbfb4a2024e90b662ae58
-EBUILD docker-py-1.10.6.ebuild 1431 BLAKE2B eb91e186d02055fccfa8dc39d3ca702810b2a5587c55c1a5b38a8bffa149b00fe2a7c420d08e5e41677c86d8f596cced78ae9fec73fb611d4a29eeb8f6210cba SHA512 8e508e96b1271d3ef7f13870d0c1bc4fff322125cbc05ece6c5bf83726f636b102b0d73d5dca17e4cb1b1eef79e3a31848f7f6bc737f4b468302f56f059d6346
-EBUILD docker-py-1.2.2.ebuild 1044 BLAKE2B df69aaef64a2496e964311bdc869067ac0fc53491e24afa1a55aba0748e5bff4d28e421b0764e2998695401f2e015861b5a823588927a4df7d4e38d9c2089d0f SHA512 ed995a7481c4ca7558b6aa7b023b5b07b794f5db524ee6c440c605610db4b5ef26a97c1526f6a9af8ad729a2299bc8a7198ce3561d1af88a36ce25e452f16dd4
 EBUILD docker-py-2.4.2.ebuild 1585 BLAKE2B bc50c495e887bded0ad49dff9d3cf315eb463986811bf970dc5f1700f090c94507082596348fdd65a16e3bdbe411606f80841f504c82cfd8fbf36002afbaab7d SHA512 c9b91f286226af040062ec2be6d30e2960460b3fcf7d06ab0ce38d6364166477b638d29a3fdbf6f99ccd8085627c7fab318689d74b378c9b6acf45c9bf9071a7
 EBUILD docker-py-2.6.1.ebuild 1587 BLAKE2B 3ff41bd27a663fcc91026f847c3210fd23be912bc4081fd35be6ec0707fe582b1673f32a169633c30e6bc09a140d6871faf77db5e7c65eceb92f8f2b64d49fab SHA512 ab178c7cbb9b5266da850c3ea3617bd42e745bbbeda7be70d116ca4c459263b7e38802f30f161eb0e701a5149ab5009dc8f968189f3c23b8b56f8d1e60141175
-MISC metadata.xml 403 BLAKE2B 215820da245d0d06c94c6f96b8d95d4505ee5d7e6e82b16e7c987344804c9fe8cb4d76b8d7222cea3e60c02f42dc102ada5506576d5434e979145a0477d15728 SHA512 3673893aec6cf4535b06c61808862507413fe2715c55da76ff408ac5f8ebc3ed304848190e1542c779ad02f5fff3ca48ff8449dcf254a7b547a00187da053af9
+MISC metadata.xml 515 BLAKE2B 4283ac75c4a68d8704d1368b1f6c953beb6cd271cca4620944e6d254e00fddb130efc1b02a707a05b17d927da792a0544d9f9c834789b334beb516a7bba2e1ac SHA512 5bd90d9576f2e9995f6c69c931236ed41deaf9f817137c29c3a7c476d12a68350e8df5f36a4021a1d6f41c534cf737575f462fc09af90ad2cba47fdb4ff0bb8c
diff --git a/dev-python/docker-py/docker-py-1.10.6.ebuild b/dev-python/docker-py/docker-py-1.10.6.ebuild
deleted file mode 100644
index 33df70bd9573..000000000000
--- a/dev-python/docker-py/docker-py-1.10.6.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="Python client for Docker"
-HOMEPAGE="https://github.com/docker/docker-py"
-SRC_URI="https://github.com/docker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( >=dev-python/mkdocs-0.14.0[${PYTHON_USEDEP}] )
-	test? (
-		~dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		~dev-python/pytest-2.7.2[${PYTHON_USEDEP}]
-		~dev-python/pytest-cov-2.1.0[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	>=dev-python/docker-pycreds-0.2.1[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.11.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.11.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' 'python3_4' )
-	$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )
-"
-
-python_compile_all() {
-	if use doc; then
-		mkdocs build -d 'mkdocs_site' || die "docs failed to build"
-	fi
-}
-
-python_test() {
-	py.test tests/unit/ || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( mkdocs_site/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/docker-py/docker-py-1.2.2.ebuild b/dev-python/docker-py/docker-py-1.2.2.ebuild
deleted file mode 100644
index e86d866ffb3f..000000000000
--- a/dev-python/docker-py/docker-py-1.2.2.ebuild
+++ /dev/null
@@ -1,43 +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 vcs-snapshot
-
-DESCRIPTION="Python client for Docker"
-HOMEPAGE="https://github.com/docker/docker-py"
-SRC_URI="https://github.com/docker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="doc test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( >=dev-python/mkdocs-0.9[${PYTHON_USEDEP}] )
-	test? ( >=dev-python/mock-1.0.1[${PYTHON_USEDEP}] )
-"
-RDEPEND="
-	>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/websocket-client-0.11.0[${PYTHON_USEDEP}]' python2_7)
-"
-
-python_compile_all() {
-	if use doc; then
-		mkdocs build || die "docs failed to build"
-	fi
-}
-
-python_test() {
-	"${PYTHON}" tests/test.py || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( site/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/docker-py/metadata.xml b/dev-python/docker-py/metadata.xml
index def0cb671aeb..4651b37d19cd 100644
--- a/dev-python/docker-py/metadata.xml
+++ b/dev-python/docker-py/metadata.xml
@@ -5,6 +5,10 @@
     <email>alunduil@gentoo.org</email>
     <name>Alex Brandt</name>
   </maintainer>
+  <maintainer type="person">
+    <email>mrueg@gentoo.org</email>
+    <name>Manuel Rüger</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">docker/docker-py</remote-id>
     <bugs-to>https://github.com/docker/docker-py/issues</bugs-to>
diff --git a/dev-python/docutils-glep/Manifest b/dev-python/docutils-glep/Manifest
index 8797a08ec24e..562486e9362b 100644
--- a/dev-python/docutils-glep/Manifest
+++ b/dev-python/docutils-glep/Manifest
@@ -1,6 +1,8 @@
-DIST docutils-glep-1.0.tar.gz 5180 SHA256 5b1e4f7e871875a5239e754728167315d0dbc2f2349b7e948d5fb790219ad06d SHA512 971987452ed8cdffd98121b14d94978e70f4436a1f6cd22c7d491e648859731907f4ed0c073c69d618a95f6c81422c5cb03e0368568224a335876a7f9c8fd89e WHIRLPOOL e2b81d046996d4536503a3c51745399c81406571521acfff65c3a6c626365b11e10995ce85dee0bd9f9462804a14385d8352677caa8a788c972a62b215e43d6c
+DIST docutils-glep-1.0.tar.gz 5180 BLAKE2B 771f09aa90eb4cdafe874b276d3e8ac04a3af67ee0292cb9b41a8a24bab54bd7e19ab2f718a32a5fdd7966432b2c978addbfe3f3d3efb1ca2eef37b1a079d91f SHA512 971987452ed8cdffd98121b14d94978e70f4436a1f6cd22c7d491e648859731907f4ed0c073c69d618a95f6c81422c5cb03e0368568224a335876a7f9c8fd89e
+DIST docutils_glep-1.1.tar.gz 6753 BLAKE2B 93e7fa03e6e5b4f7d7d338b04d906eac630d2a8e179af14c0c3f0d5f9926cc3705dcec84d2b9b2b7b3854bf9de178256ad2c4ef4bc567c6ba0d95d2abc32b8ac SHA512 7b06cbc7bf7a7f9002e1d61fbbafdb7ee6fa804145e7ce7edc547384f22cac8f9a9072bc137e201ab08a49eedb5e4f2ea8a1f02bd806d7d01525bdedece4afb8
 DIST glep-0.4-r1.tbz2 4667 SHA256 d0b421869fb3437e96484687fd57f34d4f5cdd5a1fbdb2314f1474b1f9afa058 SHA512 098d9f5043a60af9dfac63f6472b576e66ffeda924902ca825ed63f573aeb8bad7c9f9a6853fd99e648683488ee6db2ee55c139df3dde06983b72cfb5dd8cdd3 WHIRLPOOL 277cdf4a7fe70990864a4f0fd592561bcf5edc1de8d4830da96c75093d47d8d64214b95ac5ae7960670a8520650a5e23355df248f61bddcd9cd5dc23cab0fe19
 EBUILD docutils-glep-0.4-r1.ebuild 1172 BLAKE2B f24fd73e88f9f598e4db51b58b248096fb472180d752c78bd8f2ff80bad5d9b2222b0ff3a2cf834b4aa61d7f1a1409e4b48c2c6824dddc56eeebeb086c305f2f SHA512 28f60c997dfd07a32141ead50c9367d7448b9fef9056a8e138df28d8ce47fd58961d2bd0521654a6fe31623d85f4ce2cef17d2ae5439a2419482d2f14e1f4a48
 EBUILD docutils-glep-1.0.ebuild 721 BLAKE2B 405f5355f428c8a9c7803f84398fa7ca9c0a4eb8cda4115a53d992ff0bf178014eff359f19a716956e2aea2ab3dc6394efe98d178aa9f038b761b9c437ab624b SHA512 b74fdb33310da1ac3c6cd97e5d5e61f00495a76a56a06bcaabaabf025e6c43741c28eb08f8a6db1d36307cc13e4f6f8cdb1fb0443e12b9a9abd8d087cc015c10
-EBUILD docutils-glep-9999.ebuild 473 BLAKE2B 6b42ae05ab64471acbcc4ac1d03062ad70a66019d944b0ef3e7fd80219f0108df12d39b0e8827e07cfe7511b26e8a4f1003b91c0fed45ba84cf93c8339d011f1 SHA512 800fd67fa88a322b80ddf7cd33f6b25458e5b9f15bbf92c950c57a61be04033035fd244cc899b089f47a257fdccbd49d5fd319558d6124b383b3e5202e976783
+EBUILD docutils-glep-1.1.ebuild 852 BLAKE2B c81d443caefac67452fcda6b69c545f627a7e41b1d7255e5037b093b884edb4bf77634a2350dae42cffb4fc4be745f50a4b276e3b2175fec98bd1cce1833ca1c SHA512 c9ad08e5ea30c2755054e81ba4516b0581ad2b6825906a382cbdb6ca60738f4308aa1f2d639a38e47908a2fa5c47b04b0844c38ae0995f77f1041d02c366758b
+EBUILD docutils-glep-9999.ebuild 573 BLAKE2B 032fc2bb940904ce0602226f004d4d8990bba9ffb35ca3e81774ab101106aaa147ead13d9e6bfbda48b7f48840fb4c0afbe5578a5c8e8070bde87afd9a7e164c SHA512 200f86c1399dda6276e98c83a649be7d1eae49fec9976f1b04234e61aeef73bb6f55a50d50b8add157e844061f7da7092e25e9136eb0acf059d1ab2f32200ce5
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/docutils-glep/docutils-glep-1.1.ebuild b/dev-python/docutils-glep/docutils-glep-1.1.ebuild
new file mode 100644
index 000000000000..76ae3b34e333
--- /dev/null
+++ b/dev-python/docutils-glep/docutils-glep-1.1.ebuild
@@ -0,0 +1,26 @@
+# 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} pypy )
+
+inherit distutils-r1
+
+MY_PN=${PN/-/_}
+MY_P=${MY_PN}-${PV}
+DESCRIPTION="Gentoo GLEP support for docutils"
+HOMEPAGE="https://github.com/gentoo/docutils-glep/"
+SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+COMMON_DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=">=dev-python/docutils-0.10[${PYTHON_USEDEP}]
+	${COMMON_DEPEND}"
+DEPEND="${COMMON_DEPEND}"
+
+S=${WORKDIR}/${MY_P}
diff --git a/dev-python/docutils-glep/docutils-glep-9999.ebuild b/dev-python/docutils-glep/docutils-glep-9999.ebuild
index e6476c34c896..7e55e43f001b 100644
--- a/dev-python/docutils-glep/docutils-glep-9999.ebuild
+++ b/dev-python/docutils-glep/docutils-glep-9999.ebuild
@@ -17,4 +17,7 @@ SLOT="0"
 KEYWORDS=""
 IUSE=""
 
-RDEPEND=">=dev-python/docutils-0.10[${PYTHON_USEDEP}]"
+COMMON_DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=">=dev-python/docutils-0.10[${PYTHON_USEDEP}]
+	${COMMON_DEPEND}"
+DEPEND="${COMMON_DEPEND}"
diff --git a/dev-python/elasticsearch-curator/Manifest b/dev-python/elasticsearch-curator/Manifest
index 9deebb879886..86665c6e3e75 100644
--- a/dev-python/elasticsearch-curator/Manifest
+++ b/dev-python/elasticsearch-curator/Manifest
@@ -1,13 +1,10 @@
-DIST elasticsearch-5.1.2.tar.gz 33299777 SHA256 74d752f9a8b46898d306ad169b72f328e17215c0909149e156a576089ef11c42 SHA512 1867626e8a87f11ed109e1325fd1d16c9e0af06ebe6a30c78ea679ab533ab377f5da8ea55af6871be33af226f02187a2aadd77e5e23c097dd24055be21e9d691 WHIRLPOOL 2e9df71c915343e2cc8ad82c59b877f41f5e093cbeba21f471c32cb51a195eccc6223bc48da48bb4af2e6bea9f2539f2e93b866963148f4ca2940ba4466e614e
 DIST elasticsearch-5.5.1.tar.gz 33476827 SHA256 e0924ae2af5f4435cef009ad3a567169e9653263e7a3b8693dba932698ea7e34 SHA512 9bedd48396cdd6c39c107a7951eba8446b8574493bd44c17a79ba3443670a48b72c053006821cf69dc17bf49ff1c05904db14a07d8a6403b2d2061fc605937bd WHIRLPOOL 770b2eab9d67212fde7bafb5eaa885c13195f3ecb41897c261bac405987397e299d064badda454d12901ed86a8f9a4e87ab0242ccf5f6971005397ad9061f8c6
-DIST elasticsearch-5.5.2.tar.gz 33485703 SHA256 0870e2c0c72e6eda976effa07aa1cdd06a9500302320b5c22ed292ce21665bf1 SHA512 62048f15b43e38a61e3a19a1599c25cd0d9009cc1172db5b450b04dec349ecd313b1f20e3d1c7ed1c101ae3e6f6c6d2cdf004a9713ad803576277f93e3adbdb9 WHIRLPOOL 3a71cef2858b76b11e1693907e745912a83f23e26c35a3456c6324fc19c317c53d4404e20134b034e41e162c1ea8d58c38bbd4afe0394d886ab32f6b698172ec
 DIST elasticsearch-5.6.3.tar.gz 33774486 SHA256 492b7e59d5204b3dc7eb13b611c33b3db36b392bdd6a4c004ba99c6543fc28f9 SHA512 ee57d010e196eb25e5296fe95ab2de5e503d4d66f7eec8c8f6ac2ff9ddbc1a8dc1514202d705e291ee49d3e04650b597a9afc5f92f179b8faa5e2fe3c662f33e WHIRLPOOL bda081e6b91d1076a39e0af75b44d7f877f28178281de1f22c5177abf804c9395dacabb3c93ec93aff65223df42353bc955bbf60e74fb07f99320096dd97173a
-DIST elasticsearch-curator-4.2.6.tar.gz 228342 SHA256 bebc7f6b53a4147e92004dd63d2349bb18170feed12b9219206d0d074b0643ae SHA512 e42d9f3c6122ba9cfc0bc90323f12d7ebf09902d04138472999b63fc59742f2f461b889dd98fca98f321d4975a3c05bc2aae5d211a774abd49b628ea318f5f64 WHIRLPOOL 63eed5c64f3a08f44d6feb8eb56b7698e8081a948b67daae91bb692d69e3ed1166c2fb867cb61f3f114eed74d05251b3aae68a8c475bf75ce318d53435e27b7e
+DIST elasticsearch-6.0.0.tar.gz 28017602 SHA256 0420e877a8b986485244f603770737e9e4e47186fdfa1093768a11e391e3d9f4 SHA512 25bb622d2fc557d8b8eded634a9b333766f7b58e701359e1bcfafee390776eb323cb7ea7a5e02e8803e25d8b1d3aabec0ec1b0cf492d0bab5689686fe440181c WHIRLPOOL 903e2069b6274a47102aa9b3945db545c2b1bf0417747500529439dd70dd98decc953902fd25fb9da8e39d035249927028567caa022942ae2d2295d7dbe33ee3
 DIST elasticsearch-curator-5.1.2.tar.gz 290616 SHA256 e2f4f6db735223b8bf2bf84924b6edb23d1c3b9a6ebd3ad3bebfcc23f38e0434 SHA512 4ac0ae789fe662d352c3d228acc6aaf78873bb02b7108f985fd0a048d0b90cb2b30572eaa5f984025ab0d4209eda9d6fe6ac66cd8cc856f0707e3f12bb2e574d WHIRLPOOL 143f7b8704d73db92524e25a51074dc96385089aac0c88d197b12668afe10eaf7d686a2d03a1c81dc988a158e6d9e9b9e419b50450d474ec75ef90cc56d502b7
-DIST elasticsearch-curator-5.2.0.tar.gz 301134 SHA256 e79e0804b6629fa4669570052379e98d5e10c07879c132e1636f26d6e038c159 SHA512 5aba1c3fb1c76f2389902024190ba23567107e3655987014c9250ae46a9199daaad18cd6e9f2595458bf4abb6ac3d4d76c241907d1c0009eb2a15ef638e99d23 WHIRLPOOL 20ccff30bff5f52d05d5804a660dad35a2908479789bfe1d08052428c7c1352c30cbd11623d603ded8fd37b162252bfc24030731443ae7e120f5de7de88faace
 DIST elasticsearch-curator-5.3.0.tar.gz 292274 SHA256 241dcda173aa3ba79b2b0f8f8ec31c8729fa0448f710f6cba10d2d20fcaaacf4 SHA512 23a94c0a8b78cd0f3a27af76131c267c407dbafb504a4503e8c954e69cdb527ed334fbfcda068b2f1d28479762c430f665f661f827bdf3066f5bcdd50c82dc53 WHIRLPOOL d37e553ad79b79e5b92271ced40534942b2ef6d75ff62afd7903771d41887c17f1f7fd96219942db2d3d7122c92cef6953cd59a57ad61f9af825fd060ec33428
-EBUILD elasticsearch-curator-4.2.6.ebuild 3333 BLAKE2B 94ee83ff8c94243ffa6cf5d95e637ced1c3c1b7b205890e0a6819f75fabd4459a46859a20e089e7c7a789f487c495ffdf9dce34694c4083a890677223343f57b SHA512 e2fae6174588e141c8538c8faa74989fb36fbaf98f656194d514e970265c664b7bcbc1e8ca3fc4fe5397afacc2c46713c63a84e0b424f3b330613787d3803022
+DIST elasticsearch-curator-5.4.0.tar.gz 293915 SHA256 20f15e5ce3448d0505b511813fac3ea82a7665e5a5569522ab1a83b9e8dabf0d SHA512 ce29430e72a5f7d4dce98fff88c4357e3689bf2de3b4d95d56b24908ea9d71d92cdb0be145fa4ecc264b53a5824f2abf808a6b0d82af85967a5d7154e5b1c4aa WHIRLPOOL f944b0a7c0c18cf36138f7994af6365c56ec061a0288c11574d85879061a1fea35d0ddacd0e026d4b3cd8edf348430e1fd34d11b1216dd3d63f379640232820f
 EBUILD elasticsearch-curator-5.1.2.ebuild 3228 BLAKE2B 92a193fc2278315ff7cc67188600a48d3a2ecc98968bcf011b90debd62eb3b2fa728eccaf85d476bd503eaac10e48eeed89518b9db95f299bc980a50858c5954 SHA512 405c09c900b116bcac6ac2936e27bb40e7b97b9e804b30ee55fb3c92b95f61caa607268e5f264eaf941d47cd53857e9e6549922fda9a4da299e079f4b5141205
-EBUILD elasticsearch-curator-5.2.0.ebuild 3239 BLAKE2B ff52ae79cfe2f23355821a76798062f3aed768c0c35a1ef00a0a4c84e64fb928a6bb1b2107214b3f17060be7abc731471d64c6ca758650c1590863f8e6a0ebfc SHA512 bf9f8495476708bc2a52eb26d81e2c453931bfe796d8f3bf3d71b34e196a95c2fc4a0d2871e8a18323151f51fe3f535c22c1d206f5a1ae12287c914ceac701c9
 EBUILD elasticsearch-curator-5.3.0.ebuild 3239 BLAKE2B 9e3df9eb894671207616f4bcea397cbc17b4b4bf9791a97a78115cf859fcfaeb30658077940f717e76b2d829659b6ac125f38425b757bb198c7cf90a5b32782a SHA512 2cd0e8e3ba8a02ee22884f5e7436203cfb386d1be90e1ecb50b5b6ba60f7ef1181fe6b32ae91f2615875f7e8ad1b75f4032e1902644a046585d8d88de8614406
+EBUILD elasticsearch-curator-5.4.0.ebuild 3239 BLAKE2B 4c74fa77917b0cc6690f5e856754480b67de2c6df036f6bb0e4006de1ff954797d2f2563373a775eaa8cdfb2a3204a5445df94a79d7f7879446a0e8106013146 SHA512 4e3c43b510aa37e6d199ec0330e4e50681fa8fc54d9c109e78fc1deb0785db7b7a98c7b52fe5835ee3929037b77424bc11b0f66c9ad3ad1a4872c4d95fd32657
 MISC metadata.xml 469 BLAKE2B 7c08e8c5ee97bee865afa27423349bf1998d868fea946d5d61b3eab77094a782d151677bac74f1b8c7ebbc4d88d323c3806251b463627994fcbda2a812524224 SHA512 38e98a77a6da51e077ac9a0dc77059276c58f56f8e26ca45a26df3ec16641dcb46ca9bccf85fd0dc9a358de1ac1424bfffd4cfc3d8213272ec6193663c89860e
diff --git a/dev-python/elasticsearch-curator/elasticsearch-curator-4.2.6.ebuild b/dev-python/elasticsearch-curator/elasticsearch-curator-4.2.6.ebuild
deleted file mode 100644
index dd682d809f00..000000000000
--- a/dev-python/elasticsearch-curator/elasticsearch-curator-4.2.6.ebuild
+++ /dev/null
@@ -1,119 +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} )
-
-MY_PN="curator"
-ES_VERSION="5.1.2"
-
-inherit distutils-r1
-
-DESCRIPTION="Tending time-series indices in Elasticsearch"
-HOMEPAGE="https://github.com/elasticsearch/curator"
-SRC_URI="https://github.com/elasticsearch/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}.tar.gz )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-
-RDEPEND="
-	>=dev-python/elasticsearch-py-2.4.0[${PYTHON_USEDEP}]
-	<dev-python/elasticsearch-py-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/click-6.0[${PYTHON_USEDEP}]
-	>=dev-python/certifi-2017.1.23[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.8.3[${PYTHON_USEDEP}]
-	>=dev-python/voluptuous-0.9.3[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		virtual/jre:1.8
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/nosexcover[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-# FEATURES="test -usersandbox" emerge dev-python/elasticsearch-curator
-python_test() {
-	ES="${WORKDIR}/elasticsearch-${ES_VERSION}"
-	ES_PORT="25123"
-	ES_INSTANCE="gentoo-es-curator-test"
-	ES_LOG="${ES}/logs/${ES_INSTANCE}.log"
-	PID="${ES}/elasticsearch.pid"
-
-	# run Elasticsearch instance on custom port
-	sed -i "s/#http.port: 9200/http.port: ${ES_PORT}/g; \
-		s/#cluster.name: my-application/cluster.name: ${ES_INSTANCE}/g" \
-		"${ES}/config/elasticsearch.yml" || die
-
-	# start local instance of elasticsearch
-	"${ES}/bin/elasticsearch" -d -p "${PID}" -Edefault.path.repo=/ || die
-
-	local i
-	local es_started=0
-	for i in {1..15}; do
-		grep -q "started" "${ES_LOG}" 2> /dev/null
-		if [[ $? -eq 0 ]]; then
-			einfo "Elasticsearch started"
-			es_started=1
-			eend 0
-			break
-		elif grep -q 'BindException\[Address already in use\]' "${ES_LOG}" 2>/dev/null; then
-			eend 1
-			eerror "Elasticsearch already running"
-			die "Cannot start Elasticsearch for tests"
-		else
-			einfo "Waiting for Elasticsearch"
-			eend 1
-			sleep 2
-			continue
-		fi
-	done
-
-	[[ $es_started -eq 0 ]] && die "Elasticsearch failed to start"
-
-	export TEST_ES_SERVER="localhost:${ES_PORT}"
-	esetup.py test || die
-
-	pkill -F ${PID}
-}
-
-python_prepare_all() {
-	# avoid downloading from net
-	sed -e '/^intersphinx_mapping/,+3d' -i docs/conf.py || die
-
-	# remove test TestCLIFixFor687 as it is only to be run on older versions
-	# and the call to curator.get_version(global_client) sometimes
-	# fails with Connection refused
-	sed -e '122,205d' -i test/integration/test_delete_indices.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	cd docs || die
-	emake man $(usex doc html "")
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	doman docs/_build/man/*
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	ewarn ""
-	ewarn "For Python 3 support information please read: http://click.pocoo.org/3/python3/"
-	ewarn ""
-	ewarn "Example usage on Python 3:"
-	ewarn "export LC_ALL=en_US.UTF-8"
-	ewarn "export LANG=en_US.UTF-8"
-	ewarn "curator ..."
-}
diff --git a/dev-python/elasticsearch-curator/elasticsearch-curator-5.2.0.ebuild b/dev-python/elasticsearch-curator/elasticsearch-curator-5.4.0.ebuild
index 1da556996784..8343120f8454 100644
--- a/dev-python/elasticsearch-curator/elasticsearch-curator-5.2.0.ebuild
+++ b/dev-python/elasticsearch-curator/elasticsearch-curator-5.4.0.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
 MY_PN="curator"
-ES_VERSION="5.5.2"
+ES_VERSION="6.0.0"
 
 # tests fail in chroot
 # https://github.com/elastic/elasticsearch/issues/12018
@@ -29,7 +29,7 @@ IUSE="doc test"
 
 RDEPEND="
 	>=dev-python/elasticsearch-py-5.4.0[${PYTHON_USEDEP}]
-	<dev-python/elasticsearch-py-6.0.0[${PYTHON_USEDEP}]
+	<dev-python/elasticsearch-py-7.0.0[${PYTHON_USEDEP}]
 	>=dev-python/click-6.7[${PYTHON_USEDEP}]
 	>=dev-python/certifi-2017.4.17[${PYTHON_USEDEP}]
 	>=dev-python/urllib3-1.20[${PYTHON_USEDEP}]
diff --git a/dev-python/elasticsearch-py/Manifest b/dev-python/elasticsearch-py/Manifest
index 0aa15aae09dc..0d343aa649cb 100644
--- a/dev-python/elasticsearch-py/Manifest
+++ b/dev-python/elasticsearch-py/Manifest
@@ -1,21 +1,10 @@
-DIST elasticsearch-2.2.1.tar.gz 29424648 SHA256 7d43d18a8ee8d715d827ed26b4ff3d939628f5a5b654c6e8de9d99bf3a9b2e03 SHA512 9254175afff5c002625465fb5f398e4e53d121925a656af13e65d90eb3b3ef7507ef094cf44002f104a84e5147a8677a05f4071248140d6b48179b9057867cb5 WHIRLPOOL a470a663b8ec1b8cb7a8daf6bfc02ed7d5d0f23caab063ac2e6c7456bda449bad3e81237699fa434f077d4f86ee09dac7d007b554acc6428f2b436cf8448b210
-DIST elasticsearch-2.4.4.tar.gz 27343272 SHA256 981092e6ca65ba5560b8b97a74e5ed0eb2236e9128efdb85bb652cec340158e2 SHA512 899a4d2fc64548bcd488ece223f5f189dfb191eceb36390c4b9d8d0d90ef9d2cb67ada475223b9b2e0bd0fb521a4ab978bc7f60781195927e36d027925338c14 WHIRLPOOL 1a90bb8c923a9eab6cc4390b3daaa44cd85d5c1a3a1a5ef7d274050eb25b061a11a91b0f57ebe9f3cb27aafee3267af8f63ca87837f79d622ff362fbc5b6ae1a
-DIST elasticsearch-5.1.1.tar.gz 33291322 SHA256 cd45bafb1f74a7df9bad12c77b7bf3080069266bcbe0b256b0959ef2536e31e8 SHA512 2b5faf97c5ff41a9f12e21749d60f3632b39987d4886713ee9646110acdd17323d263168980d7dd4035732556b604acd68dc37ae7b805d84493075776b9d7bcd WHIRLPOOL ebb46d4a5643f09c0c903055c407a54d46264347924ca37cc73adfee3dd8a9bf2157b1be92b9b1d85636ea92b2d1f89d558c5413c804412996ea9bce42f1c3c6
-DIST elasticsearch-5.1.2.tar.gz 33299777 SHA256 74d752f9a8b46898d306ad169b72f328e17215c0909149e156a576089ef11c42 SHA512 1867626e8a87f11ed109e1325fd1d16c9e0af06ebe6a30c78ea679ab533ab377f5da8ea55af6871be33af226f02187a2aadd77e5e23c097dd24055be21e9d691 WHIRLPOOL 2e9df71c915343e2cc8ad82c59b877f41f5e093cbeba21f471c32cb51a195eccc6223bc48da48bb4af2e6bea9f2539f2e93b866963148f4ca2940ba4466e614e
-DIST elasticsearch-5.2.1.tar.gz 33516684 SHA256 f28bfecbb8896bbcf8c6063a474a2ddee29a262c216f56ff6d524fc898094475 SHA512 aa8734c1e1111987d45e8dd64b5f8a0473955c48e09e6f1875e877090c21070fc18768b413e7b0c20652cec9ebd9bb6836a2c014cf8159b041f0d22b28ad5a08 WHIRLPOOL 3cf8672facaf03149c4c6119d869d12c2f96fa3c4ce413bfd9b0c940cd90a54c1d87ca915cdb5d9bc9a86135d6efe7891fe6932538020488ef6b3bbc3fd37115
 DIST elasticsearch-5.3.2.tar.gz 33704368 SHA256 a94fe46bc90eb271a0d448d20e49cb02526ac032281c683c79a219240280a1e8 SHA512 430021202fd747ea376e36e9035f05eaa27f06c25f2f8616e218a248f0aeaaffd8577d689c790b618e3fdbcbae23b7bd664d4380d0e323483f6e158675a4bc00 WHIRLPOOL 0fee048029880dabe901c0f9842ac331ef78204a70d0c71993cddbb8e76b7614af0e4b8e8181b36b9039b64093c9fd0720f5c8a2e7c515fc6634ac465c5f283a
-DIST elasticsearch-py-2.3.0.tar.gz 74954 SHA256 3610d3a2d2f4eb1906794276ac6fca1ad801067e0f36d71a8a11c2c9112ed120 SHA512 53ffc265dc2c42ef983bf12a6d6bfcb96a378da97c58b52ff872968e50f01936815f2d28d667d44a647174d90b55fbe6855ebeac6f86248adb4db4ba951facb1 WHIRLPOOL 836ea86fe64851eb1c8891f70ee8502bb2ff76c919536a3f57f06880dfed96626a658f3a722622ac49deb6d55ca9235755b56c771ed55d298b993c009c283b48
-DIST elasticsearch-py-2.4.1.tar.gz 77420 SHA256 673cdc861d2fd0cd9d1de5be80239dab01340b19e549ff2cbd65058bdcd86d54 SHA512 39eceffee56a4b7ed242c8edfc9634f31041d630e9621b8418a298ea3b32c3dd50a19fda0901e03823ed8dc1dc2c528d9526329ade7755cbed4b1510cc3a50db WHIRLPOOL e6771c722d6670d51fc01c5687ebce6e0b036ddb3aaee2b64238d8ed1ea64a7cf58fb0685af715ba91bb9bc4256dbced7952b016ceb95bef09d2f4be3fa97f4a
-DIST elasticsearch-py-5.0.1.tar.gz 79648 SHA256 b4e17253b950f550c8fb53a68f431abc0a67131154aecd3a1dff19e955c3345c SHA512 a10483c853b3b1b6a9a250ceb51738b5351764cde18140b0b754f6563aa5ed8d3095063e85524968adc0faeb846acebedeeab7a29533e3025db698db228823d9 WHIRLPOOL 109890c3c6a408a700e9d03265308b3d33910a8883e2ec48657c0b2f0c0bb48349067ad19877d76f27945b5712e373db669bda7f74128e077198853f18397a5f
-DIST elasticsearch-py-5.1.0.tar.gz 79933 SHA256 6d2c06607dd1c27842e25552878c2d45a345dc27946e8819588bcacedbe3c5f8 SHA512 a8b34c767247c906e7b602161adb94614b17f293e350908b375ae9c1a4f835914b3f4081cab20f958976c8b355189f1b4d3afa88dc66277773cf944fa7bbaccb WHIRLPOOL 9c1b8635220f24e4954d3464facff32a8d71e8aaef05062a8bc9e9eca369b179a9b50309558f1a199abb97bbadfe80e5344038015a54477664a9c8ea1e5ca500
-DIST elasticsearch-py-5.2.0.tar.gz 80317 SHA256 47725bfb394d40198ef8cdf254f2ded87970c87282e1b09510de0406ebbf5476 SHA512 df03879c981361b55f0c12ad7bbc9a123b49d9a6b351aa18840858f4ac43b9ef11d8a9a8b3200e295e461438254bf95c4f233a50752f917aa31392be5cd3b7fc WHIRLPOOL 7ed9f9af2d4c4cc4011454f3e9bfa8121e375d017d2a23ef3420cb3b02c054a9976438eaa4cdd3cdeda39602d14941376ec2da65b839858229cfd9274893f6d8
-DIST elasticsearch-py-5.3.0.tar.gz 80767 SHA256 f0b8a33a81b12a5a1b2bb603093a63a39e9e1ca116e56f85d18c02c2e93d6173 SHA512 2479b5be237f4ba4ca87997fafa92041fba1fe49658117515d70ae5d551e4da11d4556b3ed23f7b7c8907606b6b1f76b024a0293fd58072cf9bf650a902e5f06 WHIRLPOOL 4b17838d11d33edb389fc864f7aba0e07f4c766bc5197d19e029c05a304b2e9ac1b42d76ce4948b51e093bfbd90b1d8366725d48f6546b783b32afed65afeb64
+DIST elasticsearch-5.6.4.tar.gz 33776770 SHA256 1098fc776fae8c74e65f8e17cf2ea244c1d07c4e6711340c9bb9f6df56aa45b0 SHA512 37730f39cf1711b6a20861370ef7aff4b48e7f90ad82cb1c8c92643179194c4dcdf0180691d8065304bf61e7f5a2fb1ed5c84c384e0b2ff7ad0dc58ac7352f47 WHIRLPOOL 37f1a615a7916738bb8f4809213edced96aaecf3d93df8cad0bc175c71191a6f1d3d616fc40b71e647b65e4c2e03f4f6ab9a4ff333b55d3728ca100b2181edbc
+DIST elasticsearch-6.0.0.tar.gz 28017602 SHA256 0420e877a8b986485244f603770737e9e4e47186fdfa1093768a11e391e3d9f4 SHA512 25bb622d2fc557d8b8eded634a9b333766f7b58e701359e1bcfafee390776eb323cb7ea7a5e02e8803e25d8b1d3aabec0ec1b0cf492d0bab5689686fe440181c WHIRLPOOL 903e2069b6274a47102aa9b3945db545c2b1bf0417747500529439dd70dd98decc953902fd25fb9da8e39d035249927028567caa022942ae2d2295d7dbe33ee3
 DIST elasticsearch-py-5.4.0.tar.gz 81286 SHA256 a574eea0032b73765efc6072f7e2b87a6a64cda08c23559ad46b7f3046d5a217 SHA512 9d30ffa810f495662769e6d2f2627f9ef6aa3849bc2eecd09df28c05a036b8fb15ae465914c38eeb3d854683bc150a3c56425388312bcd112bd5cc7b33ad41ae WHIRLPOOL 83e1076ace42ab73d6ca6502b7c0608b226649c82523b7779cbf76da90027cd36f9dde9ad022dba96f3c429b94e489ae0194d92549450838d21d8040985563b3
-EBUILD elasticsearch-py-2.3.0.ebuild 2445 BLAKE2B 7892c2ea1545dc526011337abd9ca0629df3a715c10bbb2f7e34a2f75cb1c783e3eb482e29539276e0f240de70b243a3117c602cb29b8b7235cd6e39e72cb91b SHA512 0c530d4a11ced51f0f5539dc5267306acd84c8451ccbabc30d6e41722b855b99006c16ee96c295af3b27f940fd9fa393c04eca3aaef7e8ae64776553d931248e
-EBUILD elasticsearch-py-2.4.1.ebuild 2521 BLAKE2B cf296faf58c28ae088f913bd5bec4685698092042764dfd23e5b084f7fcc85b9591f5b2e98a715b2152821a07af1302d45b99464ce6db9317f9f17348ba5ef32 SHA512 43b58f4ddfd9739e61f8c27841b8264bb60639f0db7b6680a5b54a4492da36fa4a715a9315ca0bea2340e59910d8f8ede7cd91dc4786f4edd31d31011fbbcec6
-EBUILD elasticsearch-py-5.0.1.ebuild 2449 BLAKE2B b7daf3c6f62fdc9b16c6760bedddbd63289ee8dd159bbdc6c7ee89f6170468dbd1918e0119a8d042dc12a9da472c2d3f9400265c37a09cd808e515516694b7fc SHA512 ae90b001085f5cd2e1c4f13ceb9ef3a9a00965341a4fcba2bd1794f2cc58675028b15b6045fe905491b4b0d44bb9544df5e9f9259cb630f0047ce3162e8a0765
-EBUILD elasticsearch-py-5.1.0.ebuild 2479 BLAKE2B 87b58ff35f5789c99f794d3bad86a7acd9a857e78613c6ee1cdced7d317907144de1d0b1bcc3db6a0ea73683e11aef1e25c10160327295dc460350f281efd3c3 SHA512 1c20029ec3e00ee3cf88bfefb5e2c89ce1120e44582248a37abac1880412ace851b7798c800c8560387423ec1454e06f8c75d3f8b70415e83e432a4d928fdabd
-EBUILD elasticsearch-py-5.2.0.ebuild 2647 BLAKE2B d572a4f8b10b3c5b7fd80c8d70046719526523b33f850d06544ec012e1cc99f1d224a949f94c7c1a5d19e9fa9546dbecbea47e0d5331a10a221cdbcb3632d937 SHA512 23a7b210f8931c84b781f3aae9f5dc362735d094a67417877a89d40d96b8d1da310ec1bc0c4d3d86f2d055a3891a9bfe2be0056081712850d7f3af34700f3a1f
-EBUILD elasticsearch-py-5.3.0.ebuild 2648 BLAKE2B 4990e36203d2d2670ed2264fd452f56d563738440efde8cc5d79ce8a26ef79026a97f3a105c4c1ab8bb92983505fa63f5abc478e58ee8ec625d5f8a67e686f4b SHA512 866f43398350a4943d8be34f1f731d168aebd21658d69b0c47c0f9ddad840f0dd8ca94d51259c94dbafdf021ff2fda8c5b204a4dfaa21d0bc7bbf4c7ef8bb34f
-EBUILD elasticsearch-py-5.4.0.ebuild 2646 BLAKE2B a7b87c9033b5868fb08877df9517d79681f9ccf6ee873bfaa1479f54bce9c95f27a7715e62990688d71bb759f28be38b0ed3cb4da95a92ef4d8e51ea782f4913 SHA512 528796f89aeaf53b17b33aaea2dce31f45196f5ae8efbb2141342af2b9a04b10e1cc176945e26a1f5329d90ec48c730065debaad3bee534cc87e93d1cc74e3a8
+DIST elasticsearch-py-5.5.1.tar.gz 83543 SHA256 da5605ee82b61a815524df596a37d1fe926a0f5b571ab7197d9cb7097e8c43e4 SHA512 ac6dbbedaacc1bf3653edeab7c87885cc11682753ed8c51d82109cf24ba0b7ffb36b809eac7cfddd8c5bf37647c2d7c30a129f65748d5795459850e6fa0dd3dd WHIRLPOOL 80ecbe6064b4413b7e3a66760f418d73bf3a9671958feced8e052fc743f05fed01933a228ca284fd385dacf4c73f136bfe2d30556755690bd172d28950f6b24b
+DIST elasticsearch-py-6.0.0.tar.gz 83197 SHA256 5409d1e7b12190e852f6e8c9190ab00b015ebc951a152a65fe6a5ebefc76cc14 SHA512 1d6c27654f9470837e9cb9866cb6f5305d63cac9dc6bddc06309e378a5e7b7fe3d21cae5ffd115685fe8ddcfd8cbbe1457d74799dde0fc7427f90fc870f1c444 WHIRLPOOL 011570a8f4b09fd324339fd92814e6b1b63961547826ebfc0b53759c1d8e0d6c230279b77547d0cca4e73dc42c9a1264493f47e069331c1652afd489567b40be
+EBUILD elasticsearch-py-5.4.0.ebuild 2656 BLAKE2B ff39bd1fa8148c07781624d47b1c27765b9f8f19ced76bf6815edcc2e8be9ad4ce43d0da49e850e70d246e56f1eddd7ebff3e3e075fd0d7893c12cc9e46a4868 SHA512 5b757f21244c74c522ef2cc6533f788c031d4de915c1658645bcc87020089c196822ba6d5918ca90063f98de9d037abfcbbd737093dc436620e64ad90e4cd03f
+EBUILD elasticsearch-py-5.5.1.ebuild 2654 BLAKE2B 409849cec594d97e2da84196ef1b16f11c05beea137e533c34f0baba9ea31b7b4dd015b106ec2c739e0213bf72ab48407a3d50b55f3afe7efd0c00924e09ac15 SHA512 330d2ebd23ed98ea7f6f1eb8ec748edfc2082bd0adccf151045ee357352597661643deec454517b9074ac4b70ace527a06f70b29537fb52af8e3f6486e4de95e
+EBUILD elasticsearch-py-6.0.0.ebuild 2654 BLAKE2B be5df0d1a970c545b5b17f7721e770e944a402e397ddb22247ebc45eda8bf0d6a9fcd0f9bb50b39031b90661720553d3d7262663fe6e14bfbddcb90441d40d9f SHA512 6194cf33918d1a382e21ed5d568015e28c4fa6bae3597e2750455d2a8c18d86e36486b4b5e2cc9d0e7fd12e2a1ba32327034f5d47bda33e40fd20f51c0d4d15f
 MISC metadata.xml 592 BLAKE2B 3535c37456da9c7904e88e5921c6fd27bf6790178a0f847d0a302aae76e4c68889d31337383ac1d0a1dbb55d7f37bc056bced2f2de29c4d85864b881feeb3405 SHA512 752265ff356d02b2825ac2ef5e5177649cdcdd31b5a3738e3638af89a7bfef8b16fef8332e67c3ac03285318b22e455795c75d408a1abfc99068a1d4015eade0
diff --git a/dev-python/elasticsearch-py/elasticsearch-py-2.3.0.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-2.3.0.ebuild
deleted file mode 100644
index 0bee6f546f28..000000000000
--- a/dev-python/elasticsearch-py/elasticsearch-py-2.3.0.ebuild
+++ /dev/null
@@ -1,89 +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,5} pypy )
-
-ES_VERSION="2.2.1"
-
-inherit distutils-r1
-
-RESTRICT="test" # fails to start in chroot envs, unreliable
-
-MY_PN=${PN/-py/}
-
-DESCRIPTION="official Python low-level client for Elasticsearch"
-HOMEPAGE="http://elasticsearch-py.rtfd.org/"
-SRC_URI="https://github.com/elasticsearch/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-		test? ( https://download.elasticsearch.org/elasticsearch/release/org/elasticsearch/distribution/tar/elasticsearch/${ES_VERSION}/elasticsearch-${ES_VERSION}.tar.gz )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="examples doc test"
-
-RDEPEND=">=dev-python/urllib3-1.8[${PYTHON_USEDEP}]
-		<dev-python/urllib3-2.0[${PYTHON_USEDEP}]"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.3.1-r1[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
-		<dev-python/requests-3.0.0[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pretty-yaml[${PYTHON_USEDEP}]
-		dev-python/nosexcover[${PYTHON_USEDEP}]
-		|| ( virtual/jre:1.8 virtual/jre:1.7 ) )"
-
-python_test() {
-	ES="${WORKDIR}/elasticsearch-${ES_VERSION}"
-	ES_PORT="25124"
-	ES_LOG="${ES}/logs/elasticsearch.log"
-	PID="${ES}/elasticsearch.pid"
-
-	# run Elasticsearch instance on custom port
-	sed -i "s/# http.port: 9200/http.port: ${ES_PORT}/g; \
-	s/# cluster.name: my-application/cluster.name: gentoo-es-py-test/g" \
-	${ES}/config/elasticsearch.yml
-
-	# start local instance of elasticsearch
-	${ES}/bin/elasticsearch -d -p ${PID}
-
-	for i in `seq 10`; do
-		grep -q "started" ${ES_LOG} 2> /dev/null
-		if [ $? -eq 0 ]; then
-			einfo "Elasticsearch started"
-			eend 0
-			break
-		elif grep -q 'BindException\[Address already in use\]' "${ES_LOG}" 2>/dev/null; then
-			eend 1
-			eerror "Elasticsearch already running"
-			die "Cannot start Elasticsearch for tests"
-		else
-			einfo "Waiting for Elasticsearch"
-			eend 1
-			sleep 2
-			continue
-		fi
-	done
-
-	export TEST_ES_SERVER="localhost:${ES_PORT}"
-	esetup.py test
-
-	pkill -F ${PID}
-}
-
-python_compile_all() {
-	cd docs || die
-	emake man $(usex doc html "")
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/_build/html/. )
-	use examples && dodoc -r example
-	doman docs/_build/man/*
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/elasticsearch-py/elasticsearch-py-2.4.1.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-2.4.1.ebuild
deleted file mode 100644
index f5ddcabcdb2b..000000000000
--- a/dev-python/elasticsearch-py/elasticsearch-py-2.4.1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
-
-ES_VERSION="2.4.4"
-
-inherit distutils-r1
-
-# tests fail in chroot
-# https://github.com/elastic/elasticsearch/issues/12018
-RESTRICT="test"
-
-MY_PN=${PN/-py/}
-
-DESCRIPTION="official Python low-level client for Elasticsearch"
-HOMEPAGE="http://elasticsearch-py.rtfd.org/"
-SRC_URI="https://github.com/elasticsearch/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	test? ( https://download.elastic.co/elasticsearch/release/org/elasticsearch/distribution/tar/elasticsearch/${ES_VERSION}/elasticsearch-${ES_VERSION}.tar.gz )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="examples doc test"
-
-RDEPEND=">=dev-python/urllib3-1.8[${PYTHON_USEDEP}]
-	<dev-python/urllib3-2.0[${PYTHON_USEDEP}]"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-1.3.1-r1[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
-		<dev-python/requests-3.0.0[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pretty-yaml[${PYTHON_USEDEP}]
-		dev-python/nosexcover[${PYTHON_USEDEP}]
-		virtual/jre:1.8 )"
-
-python_test() {
-	ES="${WORKDIR}/elasticsearch-${ES_VERSION}"
-	ES_PORT="25124"
-	ES_INSTANCE="gentoo-es-py-test"
-	ES_LOG="${ES}/logs/${ES_INSTANCE}.log"
-	PID="${ES}/elasticsearch.pid"
-
-	# run Elasticsearch instance on custom port
-	sed -i "s/# http.port: 9200/http.port: ${ES_PORT}/g; \
-		s/# cluster.name: my-application/cluster.name: ${ES_INSTANCE}/g" \
-		"${ES}/config/elasticsearch.yml" || die
-
-	# start local instance of elasticsearch
-	"${ES}/bin/elasticsearch" -d -p "${PID}" || die
-
-	local i
-	for i in {1..15}; do
-		grep -q "started" "${ES_LOG}" 2> /dev/null
-		if [[ $? -eq 0 ]]; then
-			einfo "Elasticsearch started"
-			eend 0
-			break
-		elif grep -q 'BindException\[Address already in use\]' "${ES_LOG}" 2>/dev/null; then
-			eend 1
-			eerror "Elasticsearch already running"
-			die "Cannot start Elasticsearch for tests"
-		else
-			einfo "Waiting for Elasticsearch"
-			eend 1
-			sleep 2
-			continue
-		fi
-	done
-
-	export TEST_ES_SERVER="localhost:${ES_PORT}"
-	esetup.py test || die
-
-	pkill -F ${PID}
-}
-
-python_compile_all() {
-	cd docs || die
-	emake man $(usex doc html "")
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/_build/html/. )
-	use examples && dodoc -r example
-	doman docs/_build/man/*
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/elasticsearch-py/elasticsearch-py-5.0.1.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-5.0.1.ebuild
deleted file mode 100644
index 53a18e947df9..000000000000
--- a/dev-python/elasticsearch-py/elasticsearch-py-5.0.1.ebuild
+++ /dev/null
@@ -1,92 +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,5} pypy )
-
-ES_VERSION="5.1.1"
-
-inherit distutils-r1
-
-# tests fail in chroot
-# https://github.com/elastic/elasticsearch/issues/12018
-RESTRICT="test"
-
-MY_PN=${PN/-py/}
-
-DESCRIPTION="official Python low-level client for Elasticsearch"
-HOMEPAGE="http://elasticsearch-py.rtfd.org/"
-SRC_URI="https://github.com/elasticsearch/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}.tar.gz )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples doc test"
-
-RDEPEND=">=dev-python/urllib3-1.8[${PYTHON_USEDEP}]
-	<dev-python/urllib3-2.0[${PYTHON_USEDEP}]"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-1.3.1-r1[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
-		<dev-python/requests-3.0.0[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pretty-yaml[${PYTHON_USEDEP}]
-		dev-python/nosexcover[${PYTHON_USEDEP}]
-		|| ( virtual/jre:1.8 virtual/jre:1.7 ) )"
-
-python_test() {
-	ES="${WORKDIR}/elasticsearch-${ES_VERSION}"
-	ES_PORT="25124"
-	ES_LOG="${ES}/logs/elasticsearch.log"
-	PID="${ES}/elasticsearch.pid"
-
-	# run Elasticsearch instance on custom port
-	sed -i "s/#http.port: 9200/http.port: ${ES_PORT}/g; \
-		s/#cluster.name: my-application/cluster.name: gentoo-es-py-test/g" \
-		"${ES}/config/elasticsearch.yml" || die
-
-	# start local instance of elasticsearch
-	"${ES}"/bin/elasticsearch -d -p "${PID}" || die
-
-	local i
-	for i in {1..10}; do
-		grep -q "started" ${ES_LOG} 2> /dev/null
-		if [[ $? -eq 0 ]]; then
-			einfo "Elasticsearch started"
-			eend 0
-			break
-		elif grep -q 'BindException\[Address already in use\]' "${ES_LOG}" 2>/dev/null; then
-			eend 1
-			eerror "Elasticsearch already running"
-			die "Cannot start Elasticsearch for tests"
-		else
-			einfo "Waiting for Elasticsearch"
-			eend 1
-			sleep 2
-			continue
-		fi
-	done
-
-	export TEST_ES_SERVER="localhost:${ES_PORT}"
-	esetup.py test || die
-
-	pkill -F ${PID}
-}
-
-python_compile_all() {
-	cd docs || die
-	emake man $(usex doc html "")
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/_build/html/. )
-	use examples && dodoc -r example
-	doman docs/_build/man/*
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/elasticsearch-py/elasticsearch-py-5.1.0.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-5.1.0.ebuild
deleted file mode 100644
index afdb6da6dce7..000000000000
--- a/dev-python/elasticsearch-py/elasticsearch-py-5.1.0.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
-
-ES_VERSION="5.1.2"
-
-inherit distutils-r1
-
-# tests fail in chroot
-# https://github.com/elastic/elasticsearch/issues/12018
-RESTRICT="test"
-
-MY_PN=${PN/-py/}
-
-DESCRIPTION="official Python low-level client for Elasticsearch"
-HOMEPAGE="http://elasticsearch-py.rtfd.org/"
-SRC_URI="https://github.com/elasticsearch/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}.tar.gz )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples doc test"
-
-RDEPEND=">=dev-python/urllib3-1.8[${PYTHON_USEDEP}]
-	<dev-python/urllib3-2.0[${PYTHON_USEDEP}]"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-1.3.1-r1[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
-		<dev-python/requests-3.0.0[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pretty-yaml[${PYTHON_USEDEP}]
-		dev-python/nosexcover[${PYTHON_USEDEP}]
-		virtual/jre:1.8 )"
-
-python_test() {
-	ES="${WORKDIR}/elasticsearch-${ES_VERSION}"
-	ES_PORT="25124"
-	ES_INSTANCE="gentoo-es-py-test"
-	ES_LOG="${ES}/logs/${ES_INSTANCE}.log"
-	PID="${ES}/elasticsearch.pid"
-
-	# run Elasticsearch instance on custom port
-	sed -i "s/#http.port: 9200/http.port: ${ES_PORT}/g; \
-		s/#cluster.name: my-application/cluster.name: ${ES_INSTANCE}/g" \
-		"${ES}/config/elasticsearch.yml" || die
-
-	# start local instance of elasticsearch
-	"${ES}"/bin/elasticsearch -d -p "${PID}" -Edefault.path.repo=/ || die
-
-	local i
-	for i in {1..15}; do
-		grep -q "started" ${ES_LOG} 2> /dev/null
-		if [[ $? -eq 0 ]]; then
-			einfo "Elasticsearch started"
-			eend 0
-			break
-		elif grep -q 'BindException\[Address already in use\]' "${ES_LOG}" 2>/dev/null; then
-			eend 1
-			eerror "Elasticsearch already running"
-			die "Cannot start Elasticsearch for tests"
-		else
-			einfo "Waiting for Elasticsearch"
-			eend 1
-			sleep 2
-			continue
-		fi
-	done
-
-	export TEST_ES_SERVER="localhost:${ES_PORT}"
-	esetup.py test || die
-
-	pkill -F ${PID}
-}
-
-python_compile_all() {
-	cd docs || die
-	emake man $(usex doc html "")
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/_build/html/. )
-	use examples && dodoc -r example
-	doman docs/_build/man/*
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/elasticsearch-py/elasticsearch-py-5.4.0.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-5.4.0.ebuild
index 9cdf3bbff42e..b0206130984c 100644
--- a/dev-python/elasticsearch-py/elasticsearch-py-5.4.0.ebuild
+++ b/dev-python/elasticsearch-py/elasticsearch-py-5.4.0.ebuild
@@ -16,7 +16,7 @@ RESTRICT="test"
 MY_PN=${PN/-py/}
 
 DESCRIPTION="official Python low-level client for Elasticsearch"
-HOMEPAGE="http://elasticsearch-py.rtfd.org/"
+HOMEPAGE="https://github.com/elastic/elasticsearch-py"
 SRC_URI="https://github.com/elasticsearch/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 	test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}.tar.gz )"
 
diff --git a/dev-python/elasticsearch-py/elasticsearch-py-5.3.0.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-5.5.1.ebuild
index a25ac2a625df..e6383930c480 100644
--- a/dev-python/elasticsearch-py/elasticsearch-py-5.3.0.ebuild
+++ b/dev-python/elasticsearch-py/elasticsearch-py-5.5.1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
 
-ES_VERSION="5.3.2"
+ES_VERSION="5.6.4"
 
 inherit distutils-r1
 
@@ -16,7 +16,7 @@ RESTRICT="test"
 MY_PN=${PN/-py/}
 
 DESCRIPTION="official Python low-level client for Elasticsearch"
-HOMEPAGE="http://elasticsearch-py.rtfd.org/"
+HOMEPAGE="https://github.com/elastic/elasticsearch-py"
 SRC_URI="https://github.com/elasticsearch/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 	test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}.tar.gz )"
 
@@ -25,13 +25,13 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="examples doc test"
 
-RDEPEND=">=dev-python/urllib3-1.8[${PYTHON_USEDEP}]
-	<dev-python/urllib3-2.0[${PYTHON_USEDEP}]"
+RDEPEND=">=dev-python/urllib3-1.21.1[${PYTHON_USEDEP}]
+	<dev-python/urllib3-1.22[${PYTHON_USEDEP}]"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/sphinx-1.3.1-r1[${PYTHON_USEDEP}]
 	test? ( ${RDEPEND}
-		>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
 		<dev-python/requests-3.0.0[${PYTHON_USEDEP}]
 		dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/coverage[${PYTHON_USEDEP}]
@@ -54,11 +54,11 @@ python_test() {
 		"${ES}/config/elasticsearch.yml" || die
 
 	# start local instance of elasticsearch
-	"${ES}"/bin/elasticsearch -d -p "${PID}" -Edefault.path.repo=/ || die
+	"${ES}"/bin/elasticsearch -d -p "${PID}" -Epath.repo=/ || die
 
 	local i
 	local es_started=0
-	for i in {1..15}; do
+	for i in {1..20}; do
 		grep -q "started" ${ES_LOG} 2> /dev/null
 		if [[ $? -eq 0 ]]; then
 			einfo "Elasticsearch started"
diff --git a/dev-python/elasticsearch-py/elasticsearch-py-5.2.0.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-6.0.0.ebuild
index 3d0a9b8b6551..66f5a9007525 100644
--- a/dev-python/elasticsearch-py/elasticsearch-py-5.2.0.ebuild
+++ b/dev-python/elasticsearch-py/elasticsearch-py-6.0.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
 
-ES_VERSION="5.2.1"
+ES_VERSION="6.0.0"
 
 inherit distutils-r1
 
@@ -16,22 +16,22 @@ RESTRICT="test"
 MY_PN=${PN/-py/}
 
 DESCRIPTION="official Python low-level client for Elasticsearch"
-HOMEPAGE="http://elasticsearch-py.rtfd.org/"
+HOMEPAGE="https://github.com/elastic/elasticsearch-py"
 SRC_URI="https://github.com/elasticsearch/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 	test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}.tar.gz )"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="examples doc test"
 
-RDEPEND=">=dev-python/urllib3-1.8[${PYTHON_USEDEP}]
-	<dev-python/urllib3-2.0[${PYTHON_USEDEP}]"
+RDEPEND=">=dev-python/urllib3-1.21.1[${PYTHON_USEDEP}]
+	<dev-python/urllib3-1.23[${PYTHON_USEDEP}]"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/sphinx-1.3.1-r1[${PYTHON_USEDEP}]
 	test? ( ${RDEPEND}
-		>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
 		<dev-python/requests-3.0.0[${PYTHON_USEDEP}]
 		dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/coverage[${PYTHON_USEDEP}]
@@ -54,11 +54,11 @@ python_test() {
 		"${ES}/config/elasticsearch.yml" || die
 
 	# start local instance of elasticsearch
-	"${ES}"/bin/elasticsearch -d -p "${PID}" -Edefault.path.repo=/ || die
+	"${ES}"/bin/elasticsearch -d -p "${PID}" -Epath.repo=/ || die
 
 	local i
 	local es_started=0
-	for i in {1..15}; do
+	for i in {1..20}; do
 		grep -q "started" ${ES_LOG} 2> /dev/null
 		if [[ $? -eq 0 ]]; then
 			einfo "Elasticsearch started"
diff --git a/dev-python/future/Manifest b/dev-python/future/Manifest
index ab20f5e948c8..07f5a40915e1 100644
--- a/dev-python/future/Manifest
+++ b/dev-python/future/Manifest
@@ -1,6 +1,6 @@
 AUX future-0.15.2-fix-py35-test-failures.patch 2339 BLAKE2B 737ba57bc09a141ee2fbfc7339350e3bcf1a1e7feb96cbd8d54bda1e630fd5ef431c0814731d6191618ae88481d39faaa9716ece98c6a481a293cbab95df5ad1 SHA512 816a3d30461f6e0eed0106bc46952e3f6d98323d03ff3f212332871b7eaf7d3b9817ee2043110bd004152c4239bfa427d9ed74f1dc7166d41534ba0fc76ad055
-DIST future-0.15.2.tar.gz 1583441 SHA256 3d3b193f20ca62ba7d8782589922878820d0a023b885882deec830adbf639b97 SHA512 24a0eaf70795efe1644b098c5abbcb0103d9172a5243721f0d26b1cbd108872b6c0616180da8f5507855ddfc7b26bb10a606a64e59d307d39042b346700f77ee WHIRLPOOL 557b53495033d4586dc0f34837cc7f0cab12fb770abda56049fd90b5bac3e36db561e185d86e8a08b153869f0f692ccf0b305f5edc20871edde487faa1b1fc4f
-DIST future-0.16.0.tar.gz 824484 SHA256 e39ced1ab767b5936646cedba8bcce582398233d6a627067d4c6a454c90cfedb SHA512 41c795cd1746a76df84de2da9fbc611fc6164322c1c712ec9e8a8626c21c2717cb4899ec150d95c5e0c037270e6bb71e099edd169609369aae619daea9df2e5f WHIRLPOOL 744ab7e228c608f49308609e18778e198804a7b6fea3a6285efcce14a4ea8d114e146e94779e084ac91916fb7cc560be2178806378305b40568d6bb7ff448951
-EBUILD future-0.15.2.ebuild 496 BLAKE2B b138b05494a5bfbac6814ee4b15b4cf6b26b3c81105bc0112ff264202de874b593bb523d9306639d6b2b55c2ada93b4f9acc8befc94954e87e597a86bcf938aa SHA512 673c6e67a56de5324b91be86b99f510095fba1f79c6e236da9eaaa58531b4a461698217c3a2a03bfd279fb4ab3f3d7f765a01cb05e3634004a7e32877646027c
-EBUILD future-0.16.0.ebuild 568 BLAKE2B 5adf17aeb1bb9dab57038ecf3c210fe5d4783426e0de62d68839536d99aadb64775625b5fc894b6ad579c3184c61c745921663d70d574031fbe7f39dd3f30fe7 SHA512 46f474ab76bbcc6063724c69829e9920b0637a03f17370764f41bbb075d52b531dd46744f4bc11358b289c42734053cf5fcfd328aef297d53929fb070299a82f
+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 567 BLAKE2B 6122fe2a57fc8875abd46ff94312fe791c2748dd6fa64d38a112f38456fb037eb99d3e7031ad818cd193fc00994de76955161b526e66fdcb4f312498a438a6fb SHA512 25a068c71e5b3d5fad9862b2f1327a94d1b0d97cee23d9cc9a00e6e810f2509111a12718bb912feefd557e1b76c31550cb4b097b83e64cf18ebc8200a18397b6
 MISC metadata.xml 309 BLAKE2B ac0715185226cea8e3c38698ed3e494b6464d86dad0211e4d0583e3ceb6634c2b1ec230d9dff659d5ef47208b6f3358c701a0c42e49848816ae99703cab82f46 SHA512 e01e3b2733211e1eb6aaef4da19265c7165411a46fde4c2156118700c315bc2ad52cd87de1b90355741de77d91aa22eed5f9e5847d45186bf7138d246cd775e4
diff --git a/dev-python/future/future-0.15.2.ebuild b/dev-python/future/future-0.15.2.ebuild
index d8e02163af82..32698b14b9d9 100644
--- a/dev-python/future/future-0.15.2.ebuild
+++ b/dev-python/future/future-0.15.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa x86"
+KEYWORDS="~alpha amd64 hppa x86"
 IUSE=""
 
 PATCHES=( "${FILESDIR}/${P}-fix-py35-test-failures.patch" )
diff --git a/dev-python/future/future-0.16.0.ebuild b/dev-python/future/future-0.16.0.ebuild
index dcfecd04272e..27f85e700738 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/gevent-websocket/Manifest b/dev-python/gevent-websocket/Manifest
index 21ea4966b014..dc04f8b57b75 100644
--- a/dev-python/gevent-websocket/Manifest
+++ b/dev-python/gevent-websocket/Manifest
@@ -1,5 +1,7 @@
+DIST gevent-websocket-0.10.1.tar.gz 18366 BLAKE2B bf811eeabab247f97946c971aabd3e4a5cc6034f0874bdfcfbd83ebd08a276d72f70c97694da5fbbb96c988b288d45f55970949d9f4f75bbcb62c027f13aaed2 SHA512 4f25ec1646c223b89ddbb7cf4decae72cc4baa6e872443dc05994987f509068a806c8b5e135c433d631e35b3902227f0e4c89d8071aa74e24c06b0e543e8df93
 DIST gevent-websocket-0.9.3.tar.gz 16463 SHA256 6475220340f9f8895a0f51bd2b9df3511bc7765dc055f49e997584bdaee3381f SHA512 71d6a81f04bae36e7122890b37082df188c28f5901bffcd8c774b2bf1cbcc603ff7ff9f854ab17ef00564d36b19787e3a9267e6e299f9837c1d682e63acadb73 WHIRLPOOL 27f84f0452b5be4cc0da03fb5e38710ce7fa3be052c1e41c4b9bc87a7aef40a13c714c24444a681b755eaeaa91e614aff92cb95b49fb03e004f8d44751a5737c
-DIST gevent-websocket-0.9.5.tar.gz 16970 SHA256 0091d6e6aa7298510cadcccb8068e1097a50d4e19090d0c055a93068d4530056 SHA512 fdaa8c704e1d0869700cf67c3a1c04246bfd816f98beac9c755b723a2074aa26344991c924ebdd7de5661065cde48ad412685014c53fdb92df12401cad3c358c WHIRLPOOL f566ec09f2d7739b0f70600c684471b768756c4b94b0462979ba770c5a17bc984b47e2ceb7ca1c0cf2ad26fa9fd9284326294450f013cd43fa243e7140aa7285
+DIST gevent-websocket-0.9.5.tar.gz 16970 BLAKE2B a513cc1869c86a26bc3090dacba359d31b0dbeb1cdc897ff46f80e7e30015a817e6f99102198300dc5fd5cf6485f73c5d30442d8f72aa387c5c6fef8772f48be SHA512 fdaa8c704e1d0869700cf67c3a1c04246bfd816f98beac9c755b723a2074aa26344991c924ebdd7de5661065cde48ad412685014c53fdb92df12401cad3c358c
+EBUILD gevent-websocket-0.10.1.ebuild 536 BLAKE2B a855c9065a63c28a10216716409fc768a4f3f66f0575aa8b7d1c8c360f4b315ff088abd3c36f2539640371175627233b511e8be6509a91271a0c11bb3e29f711 SHA512 fc964b23394a4e97b8c0c9d924ab6104ce37f12ffad0d3607a5711c68fb66a62402ffa7672d60a8cd46e6b9a8374ee267b02eea5ed6a969471581029c2f68bcc
 EBUILD gevent-websocket-0.9.3.ebuild 518 BLAKE2B e45f390de7695514365f7901091f219e91cf053b9584b59ae378e3be40a1d8efd7220c5a7dda4ab22e68f39491a16490264f3415698a8cef2e79cd12c0504ba1 SHA512 4073362fa970ba73dedd7a2da8421f0a447dbf71a354bc2efcbcd24ea64ab8c561d5075fab1e0de09998e03b313d22b61abc8d771c5374837c30196ab4f836d3
 EBUILD gevent-websocket-0.9.5.ebuild 520 BLAKE2B 6b604b521964cbd06d7ca8abeb1dcd046fa116b754cda803ec4a4a54d6f32fe8d7e2a442214fe6d1d057f2df58afbf175bbff5b5ede806121eedccff0fd7bd0b SHA512 4038497a6dbfe23f401fe42ce025c5c4610cd68a0e4d474510a55e1279a5fa100e19db20da34f73d32e6e0eb127ea78a0633961da463616496855bc033a8ed7b
 MISC metadata.xml 820 BLAKE2B 11073a77d288c0147cb1aef5bc278d1fc9b3d121dd62b0f0cae09912d02beb5955ff29af9f72819edb4194d81307c73c5560550940c4706c1ecd2b8e7b423bdb SHA512 60a1d9bd86378314c37895e21d329a63b74d2f31dea971e9aa8ad320d7d8ccfc1d14a638b3881e1c942aac435d6601f89100526f2f25c44bd7717a8553f6bb5a
diff --git a/dev-python/gevent-websocket/gevent-websocket-0.10.1.ebuild b/dev-python/gevent-websocket/gevent-websocket-0.10.1.ebuild
new file mode 100644
index 000000000000..aa464888f765
--- /dev/null
+++ b/dev-python/gevent-websocket/gevent-websocket-0.10.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Websocket handler for the gevent pywsgi server"
+HOMEPAGE="https://pypi.python.org/pypi/gevent-websocket/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="dev-python/gevent[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/gevent/Manifest b/dev-python/gevent/Manifest
index fce51d549407..e8ee4c09d549 100644
--- a/dev-python/gevent/Manifest
+++ b/dev-python/gevent/Manifest
@@ -1,5 +1,7 @@
 DIST gevent-1.0.1.tar.gz 1455636 SHA256 4627e215d058f71d95e6b26d9e7be4c263788a4756bd2858a93775f6c072df43 SHA512 4790e06b49536ad15856cf551c7ad4d717be2ceda8bc7d39fc35a0132d21f302e033f3294da426be4f6c0476554163776e5ffd82d89962503a720c453ff96461 WHIRLPOOL a1d552f89e9d3db1720fd0db1dbfb6ffc7ed4db87ee5816e5c44843f3c5bba9afbfc21ab2cfcf5bfc84ea70fea3caf6f8fbdbc2807c868b27105bce7e58d6290
-DIST gevent-1.2.1.tar.gz 2808619 SHA256 3de300d0e32c31311e426e4d5d73b36777ed99c2bac3f8fbad939eeb2c29fa7c SHA512 22740e8e114869c1f53bcfd6796226927a3a726d4fd49d104b947f0c97546c7490eabea98b4492db794e21d26d0aee85f1e40b01d386a47063b042a719e61726 WHIRLPOOL db0055610130df7d5c4e914364a2bacedb2f3567db0bff730ebdc285cdb45c5409da5bea665d6776c92299eaa0b189a8815b57eafd5ce44e853ccfa20824d7b0
+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 1458 BLAKE2B 8443a76ae89721fa963bb7e5ef70977d79ab3f60dffd8938d5cf2e5e3f85ffebd5bbf76d568396375dbb0541d44e9adca9cdd2dd65311bb2415a428fb434c2fa SHA512 02942b4376c8ec3a387005a4c5b20cf3611b25710ffa3c74f8cb0e929a72da51bf5a721ab091cb2b4ad6370d4b2405ce0750905c8d325042e4111dbd18d4f0ea
-EBUILD gevent-1.2.1.ebuild 1857 BLAKE2B 0df00742063c72e16aa132bc1340d5083ff85b7d7e04b001764d00c6867c62a398d7a92f04b55f046287e0957b824cc630826fc700c1e8f0d8c992fdde3a5f07 SHA512 a62a64dc4ffae21c853f90660d854cb013363a656c4e6b9348e7a45ef38481e2e30b3fd38fef74990f377c3411b51f2a7f90fcf902da220cf46e06e9c1c5afa6
+EBUILD gevent-1.2.1.ebuild 1852 BLAKE2B 38782ba2e3ee371800cb7e3f4088f6777e2c39db428607df9ad4b44673193739f867b047386567f6437631525b13c5ad74ccb04580a7031a50154de2e5c08df0 SHA512 339a7194eaa0d72bc8fbde32b426d44ea52a5d176c62f865c4be446ce86f38261194ce0d6189b185ff8d81698c7440c990dc723e139a501f5031179e19125428
+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 8d9af07ca111..ec83f1c297d7 100644
--- a/dev-python/gevent/gevent-1.2.1.ebuild
+++ b/dev-python/gevent/gevent-1.2.1.ebuild
@@ -53,15 +53,15 @@ python_compile_all() {
 }
 
 python_test() {
-	cd greentest || die
+	cd src/greentest || die
 
 	GEVENT_RESOLVER=thread \
-		"${PYTHON}" testrunner.py --config ../known_failures.py || die
+		"${PYTHON}" testrunner.py --config known_failures.py || die
 	GEVENT_RESOLVER=ares GEVENTARES_SERVERS=8.8.8.8 \
-		"${PYTHON}" testrunner.py --config ../known_failures.py \
+		"${PYTHON}" testrunner.py --config known_failures.py \
 		--ignore tests_that_dont_use_resolver.txt || die
 	GEVENT_FILE=thread \
-		"${PYTHON}" testrunner.py --config ../known_failures.py $(grep -l subprocess test_*.py) || die
+		"${PYTHON}" testrunner.py --config known_failures.py $(grep -l subprocess test_*.py) || die
 }
 
 python_install_all() {
diff --git a/dev-python/gevent/gevent-1.2.2.ebuild b/dev-python/gevent/gevent-1.2.2.ebuild
new file mode 100644
index 000000000000..bb595bf37c28
--- /dev/null
+++ b/dev-python/gevent/gevent-1.2.2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# http://www.gevent.org/whatsnew_1_1.html#broader-platform-support
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+PYTHON_REQ_USE="ssl(+),threads(+)"
+
+inherit distutils-r1 flag-o-matic
+
+MY_PV=${PV/_beta/b}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Coroutine-based network library"
+HOMEPAGE="http://gevent.org/ https://pypi.python.org/pypi/gevent/"
+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"
+IUSE="doc examples"
+
+RDEPEND="
+	>=dev-libs/libev-4.23
+	>=net-dns/c-ares-1.12
+	>=dev-python/greenlet-0.4.10
+	virtual/python-greenlet[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+# Tests take long and fail terribly a few times.
+# It also seems that they require network access.
+RESTRICT="test"
+
+S=${WORKDIR}/${MY_P}
+
+python_prepare_all() {
+	export LIBEV_EMBED="false"
+	export CARES_EMBED="false"
+	export EMBED="false"
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	append-flags -fno-strict-aliasing
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	cd src/greentest || die
+
+	GEVENT_RESOLVER=thread \
+		"${PYTHON}" testrunner.py --config known_failures.py || die
+	GEVENT_RESOLVER=ares GEVENTARES_SERVERS=8.8.8.8 \
+		"${PYTHON}" testrunner.py --config known_failures.py \
+		--ignore tests_that_dont_use_resolver.txt || die
+	GEVENT_FILE=thread \
+		"${PYTHON}" testrunner.py --config known_failures.py $(grep -l subprocess test_*.py) || die
+}
+
+python_install_all() {
+	local DOCS=( AUTHORS README.rst )
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+	use examples && dodoc -r examples
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/ginga/Manifest b/dev-python/ginga/Manifest
index b2dbeb377c6a..34067ff6f6f1 100644
--- a/dev-python/ginga/Manifest
+++ b/dev-python/ginga/Manifest
@@ -1,6 +1,4 @@
 AUX ginga-no-roboto.patch 597 BLAKE2B f3e688971c9d3920be0813a3815f36a8c766194b8116d1fe1f1a4aa986d5f5ee69aac13edcb961638d65d4f7bcd2e906ddff3402e95fbaa41dd6473a52b18f60 SHA512 e4e03b31ef61b3c71f5a049d23e721634d5c54646abf35d13df05423f2f215ff50aa7c867077bdb0216e2e8482e5a2bd75d24c505fcb09cb4ce96ac21d327c0d
-DIST ginga-2.6.4.tar.gz 19971195 SHA256 25d3435af454135c3539108ab41d4a55169e939739e0a947f12643dce16aa16e SHA512 79c471ee3fefb6dc03c90538147b8fa8606b37b7747712f9a69163870e6ae460d259f0ea08388a07163ea8b588676d0208fcdd51577d04cfc334aacbd0c01599 WHIRLPOOL 7ab2c47015446aae322f5a167a4054f40e601f2d0ace9b164a87bf4cf1f084765d7cc05592a69847010fee20b780e47a4532defcd5acfbdf6ba74568dd6dbc52
 DIST ginga-2.6.5.tar.gz 19969984 SHA256 0a8000a2e872d10fd05368cf3fa9d48d67c9191877998d764cd681f3f88b0e25 SHA512 66c55662a8ce1fe683cdf6a83511f39146fadf10d1fedabd6d6c5c46662a3abd2496bd1f0200612a84bdad246f960990e242bccee7a8a13e3aaf88a4884ceb80 WHIRLPOOL 76284b1ada78ff60bfb7e350f71ed1d6e81f73704757574864a64fb437d80fd1ab011fa50daadd231dae75dc3d22efb76d48f14678538e7949a7f56a6f44412e
-EBUILD ginga-2.6.4.ebuild 2374 BLAKE2B 729b474e702f9dd857e4ff7b1b086c0baa8d6a0c733818ca7e375d582730921fdb90c8159d57c7bc9bb6d16b1560a4da57d3d0856d1a938c47dba32cf77b67a4 SHA512 aa59af7de073aff58f64322fe267aef777cb57eb90f9cdc703b09641a493c16332dca948eb56735de899c64963d9268f1740fbefc69e297fc8737593605f3ee6
-EBUILD ginga-2.6.5.ebuild 2156 BLAKE2B 236b8c7431ed8e9df36041e34d4ca09dc063c70adcf4b6fdb76ed5893352f8dc1789886c2f7ad8c242b0b4267f87819ef382ce7d76ed6ef2e70592672c3ceb40 SHA512 07b85cab2aead0c4d34130977cd741dadcdd9e137c7503fcf3d7643c93e9b16bb5462fab272fb1b58bf3da2dd3444389ab5a1e4414262568d614686898833890
+EBUILD ginga-2.6.5.ebuild 1989 BLAKE2B f271965692f4acf712eff58eb3212d29c26fbec35d8d66c75daab2d4485cd82a0cbcdf5182f5463fb063076391dbfd2ba5fbadf2a7bd630294d3db89b96053bd SHA512 6190fe210a7f5a31067f92ea877a09f65a9261a58fdc97480766a1e395ca57782922d04ff1bc0df12a81bf6046239877ce30bc2ad028430dc37bd130310e53bc
 MISC metadata.xml 849 BLAKE2B fc93ade01d6eef46d4e72f2031d96523fdf12bec759525fa7e750d60d4eb6e619253678c58821dbad6510a18f68827dfd19e8b3334f7c5e0c1e5aba283575f17 SHA512 50343b22bb87eb298d17182553ddbbec417198e65f6c86177760e3fdc1c117f2e40dce6b539831d6dc85f820efa13b0b4e739dc40222c7ad2f318c81b78a2d33
diff --git a/dev-python/ginga/ginga-2.6.4.ebuild b/dev-python/ginga/ginga-2.6.4.ebuild
deleted file mode 100644
index 69fd1a42bc64..000000000000
--- a/dev-python/ginga/ginga-2.6.4.ebuild
+++ /dev/null
@@ -1,91 +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_5,3_6} )
-PYTHON_REQ_USE='tk?'
-
-inherit distutils-r1 eutils fdo-mime virtualx
-
-DESCRIPTION="Astronomical image toolkit for Python"
-HOMEPAGE="https://ejeschke.github.io/ginga"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="doc examples gtk qt4 qt5 test tk"
-
-RDEPEND="
-	dev-python/astropy[${PYTHON_USEDEP}]
-	media-fonts/roboto
-	gtk? (  dev-python/pygobject[${PYTHON_USEDEP},cairo] )
-	qt4? ( || (
-		   dev-python/pyside[${PYTHON_USEDEP},help,X]
-		   dev-python/PyQt4[${PYTHON_USEDEP},help,X]
-		  )
-		  dev-python/QtPy[${PYTHON_USEDEP},gui]
-	   )
-	qt5? (
-		 dev-python/PyQt5[${PYTHON_USEDEP},help,gui,widgets]
-		 dev-python/QtPy[${PYTHON_USEDEP},gui]
-	)
-"
-
-DEPEND="${RDEPEND}
-	dev-python/astropy-helpers[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-	  dev-python/sphinx[${PYTHON_USEDEP}]
-	  dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-	test? (
-	   dev-python/QtPy[${PYTHON_USEDEP},gui]
-	)
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-no-roboto.patch )
-
-python_prepare_all() {
-	# use system astropy-helpers instead of bundled one
-	sed -i -e '/auto_use/s/True/False/' setup.cfg || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		python_setup
-		PYTHONPATH="${BUILD_DIR}"/lib esetup.py build_sphinx --no-intersphinx
-	fi
-}
-
-python_test() {
-	virtx esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-	distutils-r1_python_install_all
-	rm -r "${ED%/}"/usr/lib*/*/*/ginga/examples || die
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r ginga/examples
-	fi
-	domenu ginga.desktop
-}
-
-pkg_postinst() {
-	optfeature "Pick, Cuts, Histogram, LineProfile" \
-			   dev-python/matplotlib sci-libs/scipy
-	optfeature "Online help browser" dev-qt/qtwebkit
-	optfeature "To save a movie" media-video/mplayer
-	optfeature "Speeds up rotation and some transformations" \
-			   dev-python/numexpr dev-python/opencv dev-python/pyopencl
-	optfeature "Aids in identifying files when opening them" \
-			   dev-python/filemagic
-	optfeature "Useful for various RGB file manipulations" dev-python/pillow
-
-	# Update mimedb for the new .desktop file
-	fdo-mime_desktop_database_update
-}
diff --git a/dev-python/ginga/ginga-2.6.5.ebuild b/dev-python/ginga/ginga-2.6.5.ebuild
index e08f9fa4c1f2..296a6bb9c94e 100644
--- a/dev-python/ginga/ginga-2.6.5.ebuild
+++ b/dev-python/ginga/ginga-2.6.5.ebuild
@@ -15,24 +15,17 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="examples gtk qt4 qt5 test tk"
+IUSE="examples gtk qt5 test tk"
 
 RDEPEND="
 	dev-python/astropy[${PYTHON_USEDEP}]
 	media-fonts/roboto
 	gtk? (  dev-python/pygobject[${PYTHON_USEDEP},cairo] )
-	qt4? ( || (
-		   dev-python/pyside[${PYTHON_USEDEP},help,X]
-		   dev-python/PyQt4[${PYTHON_USEDEP},help,X]
-		  )
-		  dev-python/QtPy[${PYTHON_USEDEP},gui]
-	   )
 	qt5? (
 		 dev-python/PyQt5[${PYTHON_USEDEP},help,gui,widgets]
 		 dev-python/QtPy[${PYTHON_USEDEP},gui]
 	)
 "
-
 DEPEND="${RDEPEND}
 	dev-python/astropy-helpers[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/ipdb/Manifest b/dev-python/ipdb/Manifest
index 53b9e5c1aa75..c7ab64efce7c 100644
--- a/dev-python/ipdb/Manifest
+++ b/dev-python/ipdb/Manifest
@@ -3,5 +3,5 @@ DIST ipdb-0.10.2.tar.gz 8827 SHA256 fffc45b615e46eb75becbd88a30c69c75e7164ecd012
 DIST ipdb-0.10.3.tar.gz 9356 SHA256 9ea256b4280fbe12840fb9dfc3ce498c6c6de03352eca293e4400b0dfbed2b28 SHA512 5f704222ea4d6877bbf6a83cb528e0e975ceebd7ee0838cd7a01f167381b80c48d3c8fc06d13a718a08ec619bfe984fd258e86ce93dba571ebdec2539db543f3 WHIRLPOOL d627ca29f75a2779ff1923e88dd8b558948781e6df52b727df085fc2c6868ef481a2f77afc5d464c12339d464c79249ba806a17337ede214f9a4df3344ed41e6
 EBUILD ipdb-0.10.1.ebuild 651 BLAKE2B d953767f3c0bd5985915a17c916e0ac12a7a8ca34c9bf3c2214871cdbe00eae511e38915a3cdbe6e35d1a0b2549a07b34729898bf56da20f922797c0f40fcf45 SHA512 a32c3f0f1f5c332da3526f28c6a09798d30b04628ec937e914a48a5d695212c9d9a77d185db4dde7d3247af7ffe1029264f819e07774e3773f7543c04ba77bb4
 EBUILD ipdb-0.10.2.ebuild 673 BLAKE2B e636b867ea4999da2c73c70b99cc702fcbad76660cd30ac33fbdb3f8e843bf0f670aec755a638291422eaea9dbd6b891326223e3df91b2cae6ac90deb11f2ab0 SHA512 b75d622cb243649d7657aa0beb918e73045d5f223b744c2faa79f37706db67b62e4822257efaf6181f57e41ff09a8657382d09c2c70fe9b7a31734ee9539de90
-EBUILD ipdb-0.10.3.ebuild 674 BLAKE2B b986ffed1ec69767497ca5748d5032fe132d01922aa68f57556f301adb5c20cb9ff641d2bcd5599e989f984714eb3626046203a32b7a28653a04ed01a7e129c1 SHA512 84ce629266f18cf3ce56098dac7f86ffff6d5732769d58d8346dfee3df5073371cea889978dea6c7a8040d477ed12a7e530001543140ed4d9042a92c9ae0d7b7
+EBUILD ipdb-0.10.3.ebuild 673 BLAKE2B c8035e4465135bdbd36e6d61361f329ff5e8454edd3c74c80c5ec7d2b3f94ff2dd22ed1a5d7217a6a09b3aa6c6051762d6f90998cad4cafaa27d6c13b5f75f84 SHA512 4f7160e9063581b2d7046d7e68abca4458afaf99d13180b7f8dc292fb96a7ccc2c6d29f9c79322d927a2cdeec262279aba2466276c94c0e53ab65a570f1132b5
 MISC metadata.xml 307 BLAKE2B ec524a1b59512e5f70c0d7138fb3d5ec9f8116cec0c22a3b37c335c99766c3ee338949c4dfca60f78249610cac48f4d40bc80da68ba0b5efbcb3c2d8eca3f5f8 SHA512 debb6af292a4b01925b248df604776ec21fafc3d3dca20373399a1481061392aa8e5313b07b586af6a9c2f429474d2b07fc1115e9c337c19fe0c38c489e774c9
diff --git a/dev-python/ipdb/ipdb-0.10.3.ebuild b/dev-python/ipdb/ipdb-0.10.3.ebuild
index c71a75ece88d..54268005b6cf 100644
--- a/dev-python/ipdb/ipdb-0.10.3.ebuild
+++ b/dev-python/ipdb/ipdb-0.10.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
diff --git a/dev-python/ipynb/Manifest b/dev-python/ipynb/Manifest
index ffefbc80cee3..8dc6cd0d6742 100644
--- a/dev-python/ipynb/Manifest
+++ b/dev-python/ipynb/Manifest
@@ -1,3 +1,3 @@
 DIST ipynb-0.5.1.tar.gz 50890 SHA256 f84fe867bd34662793e54eeca203320cc7e9859d596205236b3a62ce112f55e6 SHA512 30e4755661795401b6139e79b8046cf1d157660cc1effee4c19fe62fb1b0daee4daacbea3a6e7cf0c16d7efa6d82d83becea11894bfae6557a1d6cb04efd18e2 WHIRLPOOL d8d69085eaec6aeb1a84d1bee9ba0043a92291621c4446d3169cbeedbaa383a435a61216a346538c68196ff3ebc21a08337fedcc0272def1e9f552f481f110c1
-EBUILD ipynb-0.5.1.ebuild 421 BLAKE2B 6ff4e877b74e6c759bf90a148272cfb5f18218e4939d9627619a14f91408b460610c36463563778aadca2cdbdd7a8029c0b976f5fc93c3c3e914f1a9792e482c SHA512 7c987909fac51ce8e2a13bea04615a6fe70984aec19ae3f12b8e06ff3ff1b85715e94ecf82deac09dce2dae892e73cb34a6ee57f506d57bc393c8b3bd2bb32b4
+EBUILD ipynb-0.5.1.ebuild 473 BLAKE2B 7b447759a091daf5ebcc9d04e692b6b8937ef944c2882f3ee3c0035186973a9c2c15568c9cf8162952f2bb0a0bfb3744724c9cef0c188f96cb46343c4ea3c49c SHA512 873dc6f9d6de8604909d8d46407b65b3755466cde4586e1beb5451facae476c5b9c378b6cc645d8cf7f33500232f8999ecde9d5ee7f986c64e5c6437095f2641
 MISC metadata.xml 667 BLAKE2B 5a5af7df22273f550e9d2bd7eebf7f2bf4a00903949f3d0be67f38d57896a86051595ebde9310cbf4bc25d103c3be8b1d7388efbc3b72faae51d835329bfc027 SHA512 d248835afd2ab8ae67ef01fbf340ad06739c962efe9efa2a64565d7e189422d8b435514ceadd848ed4d70cc086b14f4b7ec0ea5c0e5cd0da306fca7e924bcf12
diff --git a/dev-python/ipynb/ipynb-0.5.1.ebuild b/dev-python/ipynb/ipynb-0.5.1.ebuild
index e995d8d88f5c..629aabfd99a0 100644
--- a/dev-python/ipynb/ipynb-0.5.1.ebuild
+++ b/dev-python/ipynb/ipynb-0.5.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{4,5} )
+PYTHON_COMPAT=( python3_{4,5,6} )
 
 inherit distutils-r1
 
@@ -15,3 +15,5 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/isort/Manifest b/dev-python/isort/Manifest
index b264b781e726..70b0fda74e67 100644
--- a/dev-python/isort/Manifest
+++ b/dev-python/isort/Manifest
@@ -1,3 +1,3 @@
 DIST isort-4.2.5.tar.gz 36361 SHA256 56b20044f43cf6e6783fe95d054e754acca52dd43fbe9277c1bdff835537ea5c SHA512 ddc8e859bb421e4179315d74896958c8279394d42a75494db5dc22c58422994aa249b63c03645626a021ccf9142941bde51ad400256ab1c6be29da8110375f40 WHIRLPOOL fb94f6a82329a5d7715762590995e3ffe1f7b9fd31f81ff898c87a65c47d6371b96a29a57f6a42ecc05b1795ca59239eacd0f273e3e5ade85d621160bcffdcdd
-EBUILD isort-4.2.5.ebuild 478 BLAKE2B 254d745efa8282044026a835792e72baf131af79648c2670b724d3282e82a7cd1704e131a907201fe348878e0e54d130bd569984298a62db13feef7e14614c04 SHA512 76a938b88677f4819c11c98860223d5b9684f0d553be95b8d5ead73537dc09189ee979bc3f83f09b81373ea60542365252fd7159b7f32ee46516933c0f4126a4
+EBUILD isort-4.2.5.ebuild 477 BLAKE2B b9f6c83b21d5f0588d8f6d7a56d86d5c439694b808e4621af2a9d5dbc40cebfb6d279c590580d9ef3cd9700498793527449e22c9316e331680bbae8db5bb5cbc SHA512 1c38076bb39d95a077aee0c5254dd485d94c84aa7c357854c4372cbbbea2367b113599a4a22ebbb81c4b39ed42ebf352529f74d6d090d578e7619504f59f483b
 MISC metadata.xml 395 BLAKE2B 2fe78f812b341093dab53962f6c02a341b9c32221d3d318ce839f38ad2280369ca242f831cff95d18120a8104bd5cadfb1e77123872228411514a993b086772a SHA512 27076ca449e7effce88a4295218f20fcf89ba36ca0df51951f50d25b4f8b76945282136b6e972c0220567df3249c2c1fe2e956acfd36a5cf249401c88c721d4a
diff --git a/dev-python/isort/isort-4.2.5.ebuild b/dev-python/isort/isort-4.2.5.ebuild
index 42781932f934..57cf7ce352e0 100644
--- a/dev-python/isort/isort-4.2.5.ebuild
+++ b/dev-python/isort/isort-4.2.5.ebuild
@@ -12,5 +12,5 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index 59e0849623e4..0f1f87c7fa37 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -4,6 +4,6 @@ DIST llvm-5.0.0.src.tar.xz 23411980 SHA256 e35dcbae6084adcf4abb32514127c5eabd7d6
 EBUILD lit-3.9.0.ebuild 778 BLAKE2B 7f9d3a51fc7fb8a55a240cb1eced1e7ba92c4624e91098b7585cec9bad86c81bbe9b0c325bab0963b1bb3fa5e0df1e9f6e60c8efc1fb0e74f99bd17ed3cfe197 SHA512 016f2dd37dc1d09e7ab480a9e6c0373a3c76266c5d68ccb9f98f249f82ba1b3d3f9a86359f9bcb41e9dc71f3ba82a4b81b9103d33bb07b16acb825ad71d3a3c6
 EBUILD lit-4.0.1.ebuild 813 BLAKE2B f7abe7a9c89456e829bcf6f623397c67f844fbcd983121e86ca428861b00277c316de49d42311a22ed10fb8379274d5e36758e1d196ee5498e58e4361576f0f7 SHA512 c4c218edcc07d56913d8db443f03cce7192bcbbd695837c16b7c1570aa0a4f8be2c777b964e03207ed3cf7021bc0ff10fe2bf6e73a91d2c682f41be85b5963cf
 EBUILD lit-5.0.0.ebuild 762 BLAKE2B 8e101bd1c8987452fdc9f77fc03c61188076e70c3fad22f2cc9adc4874c7072e5a3c964c66365c61adef6336a52865d4dd4a30aecc57d9b335b18c6629f63ee4 SHA512 47e1442c6ec4005737145556d900fe0bb4e763c1042cc3014c7374b6dc9fd88b5ffacb50211f0a833de5b0dd7d2b869cb293d8da72405a4f827dfe59663c1fec
-EBUILD lit-5.0.9999.ebuild 782 BLAKE2B 45c23d094f4a88ed1ce243e23cb22cbd36609e797eb57bb0be6e0a101a1a4bcb9ec362aec60f8bff4b487fcb888b2bde1dd930afd31290289f22d2634d9b2c94 SHA512 e9657bdfc870359ff803e6dbd4670cadbd5f5bc474941b598aef3c96183a02da7d02a69afb46c2763674bc5193ebadfc4d5c3a8c026adec48fc4aecf0a0e079d
-EBUILD lit-9999.ebuild 757 BLAKE2B e8f60d7d9f1cbac12a3317c4a5aef30fd5c6420aafd4c15d911528b2ba020e393e8eb37e7e6ffc216778599492703bb5f9ca0cbbd5c21f918a15992b80ea9d52 SHA512 3a4bdf72b99ec4de11874d8757ed75d3dfc0072dbcb441aff1f27c0c663a24e6e7063e0ed3a77a372ba177d3e7a0cccbc388361e8c46b52c66e08e8fca338460
+EBUILD lit-5.0.9999.ebuild 850 BLAKE2B f0246f716ba99660e500f296de9d66f049fdc80b4953a37739a72d8f3ad0cb5b734db2905f43b9b5c2c646cbcd2c7c0b1083266a3279a5039fec3af1adae1019 SHA512 283f04a823667461300591b23bd53910b5908493c8ab2143a13118068e19e6c76dd681aa892a0da1107843867555609fbe65ee6441c4d1a56012b79ece82b88a
+EBUILD lit-9999.ebuild 825 BLAKE2B 3230ba990c48b6248d105cc686f61732f016faeff0d60b51b6fd2c17230a36fff985be2f7cb841bf05d618f2e4b690e526d858f6c28a2a5365bc2e18c1eeaed8 SHA512 a577f9ad3ec2f639fe05c14a5bfe4d132df4b5257ddb07eea15719dcd66a29cb7460af644a6e838249f32337565dc17c1ce0c8370f8c7bc559051360dfb53353
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-python/lit/lit-5.0.9999.ebuild b/dev-python/lit/lit-5.0.9999.ebuild
index 61b9ce3ec021..6d9f12eb032a 100644
--- a/dev-python/lit/lit-5.0.9999.ebuild
+++ b/dev-python/lit/lit-5.0.9999.ebuild
@@ -29,6 +29,11 @@ DEPEND="
 
 # TODO: move the manpage generation here (from sys-devel/llvm)
 
+src_unpack() {
+	git-r3_fetch
+	git-r3_checkout '' '' '' utils/lit
+}
+
 python_test() {
 	./lit.py -sv tests || die
 }
diff --git a/dev-python/lit/lit-9999.ebuild b/dev-python/lit/lit-9999.ebuild
index 063e1421607b..d8c140474d8d 100644
--- a/dev-python/lit/lit-9999.ebuild
+++ b/dev-python/lit/lit-9999.ebuild
@@ -28,6 +28,11 @@ DEPEND="
 
 # TODO: move the manpage generation here (from sys-devel/llvm)
 
+src_unpack() {
+	git-r3_fetch
+	git-r3_checkout '' '' '' utils/lit
+}
+
 python_test() {
 	./lit.py -vv tests || die
 }
diff --git a/dev-python/llvmlite/Manifest b/dev-python/llvmlite/Manifest
index 73c594e3aa31..3d5208563e6c 100644
--- a/dev-python/llvmlite/Manifest
+++ b/dev-python/llvmlite/Manifest
@@ -1,11 +1,9 @@
 AUX llvmlite-0.15.0-use-system-six.patch 1274 BLAKE2B 366bc8425139e8b56d4bae78e21088b49d1bab059c2a246497f45ea377aefd3df1bdfe3dbc9692eb5d00538466aee689118b907d01a45f211ea26ed6c7215992 SHA512 5db6b819e0a9e0d6b7963272ef7fd9c9fee778cb4c2d577325de6602e7a283a98752e870b83df4978d063c84b73045e2f65bc9aeb482dd487255efe24792db69
 DIST llvmlite-0.12.1.tar.gz 88271 SHA256 3ce71beebd4cbc7a49abe4eadfc99725477fd43caeb7405650ebb746c7a1d0df SHA512 f5b448f0ae3d84a0d3438dd7bb4c7f87055e551191c4fefb6282539029d25e8c5e1cca9dec5b90c0d99ec0a720719133b2ccf8b9551aa818c3b4626cc522d8d9 WHIRLPOOL 82b3e60520eda83d0e4082d75ca377bd34c9baf7c67688814e6dd3a7ae687b1eacf7ddd9758254e0c61f39ea5af77c847a15f1f8071cf030d9dd07bb2b1020a5
-DIST llvmlite-0.15.0.tar.gz 95009 SHA256 c855835537eda61f3a0d19aedc44f006d5084a2d322aee8ffa87aa06bb800dc4 SHA512 db49ed82eae989e7e7abbd72f1c1da5129887f7fce447c684085f98ae2aaf47d24e73b79c5916802edbb8dc55dda92efeac833cb903300560b1aa89f2aeb5dca WHIRLPOOL 66336fa610ae2706c9281f5e7febc8e76e0cacf8cbc151952f6978adb104bcc6b98ac65d9661c7289f258e1e63a1e6e4a139f93efc45cdfd2a26f50c35bc03fb
 DIST llvmlite-0.16.0.tar.gz 95284 SHA256 ef3bae32482f91742d91571b5225a6943804291eb9405b98090a7b50942ec5e9 SHA512 97a251ef9d840fc5a25bd673c644207750f2e653ccad5850dec0a7f1bc77170c6ce85d5cd663ab5c109cb1b51ced9545493d35ef81dfe04a3696b5a0c37fa768 WHIRLPOOL ab629a507c2cc27756109162469a0eed8f4dbb059b7c3957df65e059c6e613581fed6380b58686812ed5378a9d2ebe5f754e6de1a5132c89a323b221da203e91
 DIST llvmlite-0.19.0.tar.gz 97109 SHA256 fbaeb3d584e0f6bac82a33776e9b5f0b5b4a3415a03edeff5d66f6176f0edbe2 SHA512 93551bbab519021abdc66ca099b9090b3af54b048adbce8d16f3700c066bbc4f5c24e5234a8a1ac4bfcdf8bf74d0ac52bb7023251ac948af6ef99fbd5a5324c8 WHIRLPOOL ee6170c09ac897862fee4705b8131f6dfb97a980c8aec73a9316f7d0d57dfeb4a0e3bd629f536cfeb51df682b4838b1c4e267ff3ebaf54f2f5db7193062014f5
 DIST llvmlite-0.20.0.tar.gz 96753 SHA256 b2f174848df16bb9195a07fec102110a06d018da736bd9b3570a54d44c797c29 SHA512 c2e0918e7acfba68922f60889180ec660da13ea199c9e8dfb3ac075c295baeb8c90784a6acc3c463cdd696f8f61c42226548d38db5bd8c4397a23cfa7c7ff764 WHIRLPOOL 8eae219cce74a106ddf48b771b210589775a4fea37f8267ed7e496b078d92503fe955edc371326cf3261d9707461f996585209cd30183cc81f5b6f204b1aa293
 EBUILD llvmlite-0.12.1.ebuild 1083 BLAKE2B f1758cd7dc79ed61fa8d21011fe78e8caa3a81cb562c124031e07665a15a19ecb18f342c39f4ded973c555aa6130b94a50c7bf32c6c75598b79c59c8c167f2f5 SHA512 304d08d1a6842102692a288fc0cdb47a88f94ef07a05e1903d6acc07950eb2a936a206355c244bd9628c564a9da6bb8d42f2fefe9472782cae9022a08f37a660
-EBUILD llvmlite-0.15.0.ebuild 972 BLAKE2B dc777d6819994488afb6be4259c3df7099eb8d27b1a64e767df9b19dde1b11678342333553fef004b89a5520bc33f551dfd692cc76db51e06777b8a7b01b2dc7 SHA512 3d44e8322b75d9005413c580075b05e26c9bdaadd3b36fc31da80d3cd9db6091905bae3cf1215cb63c0017d66ae02775391c873129a223acef6c5013de804137
 EBUILD llvmlite-0.16.0.ebuild 1198 BLAKE2B ffb0a83bb6605d3fbdee9d320007b9b7184e9dba38a423129585ebbbb71e6a205d6b2497f1733cff782df9f032392f72f3ba286ab8728c68c050a065ef5106aa SHA512 79b761d1c155eaa10b123575908b66d78797e7265c78a8bfdd81963fc53396f6e47ffdb39d57f64b781ab2d6e55a3fd628093bc68827ea2845a107f9262ef40d
 EBUILD llvmlite-0.19.0.ebuild 1288 BLAKE2B 27924c47e881063a44db3fce338e5240ad739d8e0283791a623f5ab91fa788e1ae5bf9526adf89153bbefc368166f78aecffbfeee8ba0ccc74c6f43d812b7a49 SHA512 81f241338e6d2e249b8ee7a9b9dbc184f47ed6c461259437f664400f49b2ebcd45c5434dffbd8781f0f6b34e93a8ceaf1394353df5ccb67a19158c72ff5d0db4
 EBUILD llvmlite-0.20.0.ebuild 1288 BLAKE2B 27924c47e881063a44db3fce338e5240ad739d8e0283791a623f5ab91fa788e1ae5bf9526adf89153bbefc368166f78aecffbfeee8ba0ccc74c6f43d812b7a49 SHA512 81f241338e6d2e249b8ee7a9b9dbc184f47ed6c461259437f664400f49b2ebcd45c5434dffbd8781f0f6b34e93a8ceaf1394353df5ccb67a19158c72ff5d0db4
diff --git a/dev-python/llvmlite/llvmlite-0.15.0.ebuild b/dev-python/llvmlite/llvmlite-0.15.0.ebuild
deleted file mode 100644
index 9649c7db2954..000000000000
--- a/dev-python/llvmlite/llvmlite-0.15.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python wrapper around the llvm C++ library"
-HOMEPAGE="http://llvmlite.pydata.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	=sys-devel/llvm-3.8*
-	sys-libs/zlib:0=
-	virtual/python-enum34[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-PATCHES=(
-	"${FILESDIR}"/${P}-use-system-six.patch
-)
-
-python_prepare_all() {
-	sed -e 's/-flto$/-flto -fPIC/' \
-		-i ffi/Makefile.linux || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	"${EPYTHON}" runtests.py -v || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use examples && local EXAMPLES=( examples/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/markdown/Manifest b/dev-python/markdown/Manifest
index 62672345ae9c..5b36670df6e9 100644
--- a/dev-python/markdown/Manifest
+++ b/dev-python/markdown/Manifest
@@ -1,8 +1,8 @@
 AUX markdown-2.6.8-dont-build-docs-default.patch 387 BLAKE2B d3ecf07d57d8aae13ecb686ac289d4938ec8e50d643020ccac13b147a5b018a75b32f10ead2dc2bedba309ab6ae3107346ff43155959fdf3e1053e0a9fa13cb8 SHA512 71f7534ce557e061c4f09b9a78aa05fd1e3f16f44c55d5597fa4901c0349f7ec7d0093eab655950812e2cab6d607377d2a15a6583009cb90ae32659c6949cfff
 DIST Markdown-2.6.1.tar.gz 298074 SHA256 b5879b87e8e5c125c92ab8c8f3babce78ad4e840446eed73c5b6e2984648d2b1 SHA512 53e11c5d4feacdb8210427da65b6b09453e8c904e86b42095a80132a4b67e926ba974458769e5227bfeaddd3bba5f6bd7ca7e3385951982ec982f63989119d78 WHIRLPOOL 58b6d87354ee19aac7ad1567e10f2cdc99c1aa980d3bee2fee81a5ccb5e70f43d13750dfaf1df9a42c00f3d35664731b52bfa1246271907f5a3422281ede1cc6
 DIST Markdown-2.6.5.tar.gz 301781 SHA256 8d94cf6273606f76753fcb1324623792b3738c7612c2b180c85cc5e88642e560 SHA512 d966136a7184ada4eec70af661aba441694a8c4f59e57d59a28dfbc1649ca1e90cc1e4a29b354b3caf35362e1e0c96eeb3f46c68f82d7a898b76c08866d459d3 WHIRLPOOL 752414989f7b3ba04f4f4d8b9f855c9d64f816c61b4d6333e1b3c15b2aadf6579f1b1f0a686ca3eccfc3fcdaac8007c6655a0f331d795a8a0b07ef83dda2465c
-DIST Markdown-2.6.8.tar.gz 307330 SHA256 0ac8a81e658167da95d063a9279c9c1b2699f37c7c4153256a458b3a43860e33 SHA512 85c1a16ebb50af79f378eb2fa936342df6174a4f597a74fee6d0495ef2bc4c7c8337463799e427cb6788b3429e400309958b5c4784f536593047ab2e47ac7c23 WHIRLPOOL a7472b1feb23db0b6fbf8826979d1f82ad6e84dd6d33b66e4bfba9c2914ff10ec278d444aa8ab740d1d290cb1bd6682cb4f6e9cedf66c5cae8d0a5f96cfd4804
+DIST Markdown-2.6.8.tar.gz 307330 BLAKE2B 6867f15425bd84bc030ab52000dc2f83bff0c9885854cec4a2a785f80b18129160bc57da30226fe17f42043b4938482e2e4eff9cdb3d4370b0146cc09f1ff576 SHA512 85c1a16ebb50af79f378eb2fa936342df6174a4f597a74fee6d0495ef2bc4c7c8337463799e427cb6788b3429e400309958b5c4784f536593047ab2e47ac7c23
 EBUILD markdown-2.6.1.ebuild 1262 BLAKE2B 00d62a618cca711ddeb1979dd00c5d486382d16c46d213d23fd8e9f764e75294bc4a04667dd16ecfdf25aa7a7adccbada7adb8623e7a7ebf6b8aaeacacef4bbf SHA512 ddaac99dd6fc3f2dcf1f2cfd14d8401058fe729fea31bc82f949cfe168fca6d093634b98eef3868f80bdb7a5386e2b6b1e87eccab17f969c60dcf365398ac41a
 EBUILD markdown-2.6.5.ebuild 1413 BLAKE2B a58769e42e854c1904f23b3a6dc72465d330c453a3f40737df17e29e98c3d7478352c106d02a97d400ae95e8c70cf8be34b6591f79a9665d3ec36cc9a9172c31 SHA512 0447c35221a7aaa7ea6a2d9f82a6114811f6c468bd6d6d09e3faf788b696c69ae39253e1293b2a1b44d6a72a53b2e203d8280780706b37258980094c0570d3ca
-EBUILD markdown-2.6.8.ebuild 1457 BLAKE2B 26ac9f0d4bdd215823e4720004e790afcdee9490799558716455aaccaded34623ffb6873cbb7bd2e7a999ec13ff4c07db08c98abe72f5efec6176b3b6233d695 SHA512 740194f42bd3ea464ec647b747c652a6449bb4b551dfea577e6767b49c9cf43cd45b8958394cd598f284c459f30be4b7f0c1550790ec5cd9bb62f691df9d95d0
+EBUILD markdown-2.6.8.ebuild 1455 BLAKE2B 4326c9b9d3e9acbd528d82ec37f1f81eaec307f9639ae215246e3ae0253976a251d458407e60360652dbfcdc7b76c8e2fdfbcd5e52c3f8f8f1fb5416f3a3171c SHA512 aaaa73a8dbb1ddf8b17f50919714ee932d346ae0397d7459153aeb32a1d3618cb65c169075150bbc2fa5b05c26092bcaf0ca0b65879571a0591e577a795c8429
 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 79a73dee4fdf..bc09e02e4591 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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc test pygments"
 
 DEPEND="
diff --git a/dev-python/more-itertools/Manifest b/dev-python/more-itertools/Manifest
index 06239b634c24..7087597f4185 100644
--- a/dev-python/more-itertools/Manifest
+++ b/dev-python/more-itertools/Manifest
@@ -2,5 +2,5 @@ DIST more-itertools-2.2.tar.gz 19807 SHA256 93e62e05c7ad3da1a233def6731e82851567
 DIST more-itertools-3.0.0.tar.gz 37622 SHA256 8b791474073fbaef17fdcd148e33a62fa80ad6edd6eb3f61470e1ccdd30fa182 SHA512 575de991b6337e6416489d92b41201536397d84ff41030a2cf09ea57cc994e03dcb4dd19eda321243ceafd49c11271da43a4c4ed5a9261cf771f0b7f8e40345c WHIRLPOOL b420ef8fffa4751a811eedf456e83812016d16f3f30ca63073bfb3f602b5f8caadc8f556105b63abe057252952b938f6db1e6dbef89b008d61c4c45b8a063941
 EBUILD more-itertools-2.2-r1.ebuild 847 BLAKE2B 7e930048017e959f7c560d1c5c06d63624752dc140d191ea2704e3d7eb8f50cf78c6f14bb7355af26ec788198082024773345ef5cc9028a7140c339b78934a3e SHA512 c67d4cbfc5ae1a47108ec059f1889bd051b9234b8403ab1a98ed61423e7e6312733fc3398c4039d75775295e682e8e212f887943395016ecfbfa9fd844a06845
 EBUILD more-itertools-2.2.ebuild 435 BLAKE2B ce5021e3d905d6ed1a1c61f2a3f75a47952eee45c9114476be79ff6f94fe4795f0872cb1cc396315c50d0be946b6499a3682117b2cab7291edf978a545389e33 SHA512 c7fd58b1a94f6fbe85f94ce955b07dae86f8310d22d9307728cb6cb7c812b821a57735e409722c4aab2c7cf79b16433691f08e3d86ec1353ada87c2cc3dc04ed
-EBUILD more-itertools-3.0.0.ebuild 929 BLAKE2B 34d90b7bafeafc1b922bc8feb3c9b776d545514f7df4bcab571b8a0560590cdcd9f58c145011b67b0037cee705c2a0e91b7b125e4ffb66851e30791ed3be186d SHA512 a0e2d0a0af269e738b25afe7357fe8852350f5adb125bf3973dc34d3796dca9012858658244f332b1df9271524e0aee6f5f442104e08a4b3528795b246cd7c76
+EBUILD more-itertools-3.0.0.ebuild 928 BLAKE2B 801f2ae31e48d7eea8b2f226a3859deb661dc81d2a3ff7fa832647d87db3d60463f2e2ac3dbdfe4fb02f77917be868cabd606f93478c9dabdaad952cc2214bd4 SHA512 b4ac506b68698e1f6177823a0be9b7a359f0ba0872ea69a6760d0ac8225de9c9e5b129fa7196eb791c0021e60358432ac53f313893f41d96bdffd50c43d39bdf
 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 3c7a53ab430e..2c99e4fdc761 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 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="doc test"
 
 RDEPEND="<dev-python/six-2.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/mpmath/Manifest b/dev-python/mpmath/Manifest
index d1be0cad645c..baeaf6276cff 100644
--- a/dev-python/mpmath/Manifest
+++ b/dev-python/mpmath/Manifest
@@ -4,5 +4,5 @@ DIST mpmath-1.0.0.tar.gz 511349 SHA256 d32ba7afffbae688229a15f54fbc37c11f4989e4f
 DIST mpmath-all-0.19.tar.gz 2123129 SHA256 21a824db176799f42843e4510da4bc6db36ef92b5a43fff70fad7e29bffb9c86 SHA512 5a6ed0b5fad84c1e8399467ea7a1295f9b77c8e673b821c11e3298e88df6c48d9967eed84e2979bf12868e2f9b42bffba01a0c1836a6d82ac42d5f423fed6580 WHIRLPOOL 360fedc4d6942a138b33c63867f8a5e4ce4c101a8f7221c61503933e75073807676cbb240c9bddea765159cb134efd608256c9b921b7d282763b57d2897eefdb
 EBUILD mpmath-0.19-r1.ebuild 1384 BLAKE2B 6aadcbff6fd2a2907c345a6d2e1025a3f6669b416e19ba06f355df8ab65cd71b2ed3f316a87295ce50a3b38f8974153634d83adeac8033b33bf4473df0e22c4c SHA512 a250ca3659c948dd59a4f3151ee06fb5e0f4b9c9e51ef3edb757ab9f743d4f2ab28865531bc2db486333ddfda0fe0e69184c58af8a33bd8352327849ff0824ef
 EBUILD mpmath-0.19-r2.ebuild 1390 BLAKE2B f820b249bae5761a167af070fe0a3255698ddbccc47eef896db7666aba22f606c7ac975e88bccaa853ebd5bd63a31a12fc08f2089f48fd03f65d43b23aef3015 SHA512 a4128b69fea1a8f4d936645fe9bee6d19e5c9077b088cd377c32c1541d140f1f2da42051fe194abaa914c2d1cf68cdb0e36df71ed09a0b56e6ad42f8ffc2c6a7
-EBUILD mpmath-1.0.0.ebuild 951 BLAKE2B 6fcf23642b2cfc79325d52e1b084bac816afb9ad668babaffb326be3ff57ad1e6dcc960f43e85ee198fe2907edb59515532ed47114835735f49de7b5b2d3152b SHA512 ccff02e86e1abd6e55cfe688a3dcf712686bda56497aef450be9e2e79532b5bfbedbf3c1ec19b7b0d6e27a32ed4eda0171a179e2e8e2b9d32271b85ff7b945e3
+EBUILD mpmath-1.0.0.ebuild 950 BLAKE2B 04ccbe11aef942a46a988b12ca0f98d55dbdb102248be56fa467e8c8fffdad515388283d352991953551013b63c9dd8a0286d2fc32064085b15022897f2de09f SHA512 aa8ab23422f1112237157e92364838c580469abe4a6f4d7a61aacbb0ba38928f5abd700955449cd586104500d3fa6d26d59f62e89e86c6ff018281105c1d8501
 MISC metadata.xml 650 BLAKE2B 520b0399fbbae4307a4b3979202b4d5c8d1b06f739e0c0460a9a0be63b78152b50ab3f7fdc9b46623cf7afaeabbc57cd35f3865462f3b16ce2beeb0b8f8659a5 SHA512 0f999aeb354c73658f916cb8d3a80dcd216f50f77839c0c854e9235566cb197a7d047ad51045996fc0b9e1c47f55e934be9dd52597fee16fcce6360bfcbe8f08
diff --git a/dev-python/mpmath/mpmath-1.0.0.ebuild b/dev-python/mpmath/mpmath-1.0.0.ebuild
index 06c4d2848519..5188ea6aca99 100644
--- a/dev-python/mpmath/mpmath-1.0.0.ebuild
+++ b/dev-python/mpmath/mpmath-1.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://mpmath.org/files/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 IUSE="gmp matplotlib test"
 
diff --git a/dev-python/namespace-paste/Manifest b/dev-python/namespace-paste/Manifest
index 601bab42d5a4..2daee07d3b7c 100644
--- a/dev-python/namespace-paste/Manifest
+++ b/dev-python/namespace-paste/Manifest
@@ -1,2 +1,2 @@
-EBUILD namespace-paste-1.ebuild 806 BLAKE2B 2520862ce0ae8be37ae591ccaba6952d542b0a726c7b42f9c8688dfcc2159030291341e2d420475a66a7637e9a57854c20d833b321b4827bec7400d066ab13e3 SHA512 a3e48f755ca7ea41d10533308c73a7db27026e24b52ed66dc3ce26afd118ee8e16e894e7be0b88ad4eb0305bf3ebd2a02596cf470fd0610c351010a18cb04e6c
+EBUILD namespace-paste-1.ebuild 812 BLAKE2B ebc0b7c3fb76789b916bfd672d9bd074fc6d99eff1444c1a033bbe7688993ab5a39dc1e250cf630c8712073b6f66614de6e9349f7e75a081212d8150db79ac14 SHA512 d786c0289090e0683de33f333630ce30fcca55d0ed4afc21eaed10a8d1ce01b704700dcbe8abc11afe799c14936e8aebdbfbbceac4bd805704a14b4b83b447e4
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/namespace-paste/namespace-paste-1.ebuild b/dev-python/namespace-paste/namespace-paste-1.ebuild
index 1c1cb2a9b69e..a0103b102dc0 100644
--- a/dev-python/namespace-paste/namespace-paste-1.ebuild
+++ b/dev-python/namespace-paste/namespace-paste-1.ebuild
@@ -12,7 +12,7 @@ SRC_URI=""
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE=""
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/nbval/Manifest b/dev-python/nbval/Manifest
new file mode 100644
index 000000000000..b750769bbd9a
--- /dev/null
+++ b/dev-python/nbval/Manifest
@@ -0,0 +1,3 @@
+DIST nbval-0.7.tar.gz 51805 SHA256 1f009c45ce38abda6b3c1b755cf080f7cd25526721fe3f0060fce89f2a9fb861 SHA512 f146910d7fbd6a1f18b3d9ae006a1b252cc2e038f8a316463530b564e007b4b4e0b2daefbed7ae9ec7e14280f6f004b437c9570fd4d1e959c53165dcdf3cac5e WHIRLPOOL f3b74fd8668315946510b263eba99ec252d3c512fcfb9d60cdecc1b9c32a72445b4243073f3d0eeabbcecd5be8f12d21e639beccb7fe6fd9b383b12890d2d5fd
+EBUILD nbval-0.7.ebuild 815 BLAKE2B 833f4d635e0abb96d4ece255a38beddecfbc98cfa0c811b0d5a8991af5201f5e6a0a91bd4cce9e3a48b30d57ef20b221d1fed2f544a0b01a549789043bac0a8f SHA512 eb4a8c39e73420999de1341b488b9757f56aa5402aa7ffd72ce23593be4dc73c61b91070983dcc315afedb9ee426369dff5c756c2f766b17fa0dc105fea88bab
+MISC metadata.xml 1206 BLAKE2B dcac4a50dae5beebee0b8af144a0666c87f43474464d06a7ffb5a3c5f02501f760d346f9c10768a7065e6f5a054f2aa8e664a6f5f259306a6db691d90446cd53 SHA512 2408122c980076cea7021853c320bb48b93bae5cf20b4101c07681ee0ddf8e741ca39789b884ed04f9ab0ccb2817e9610387e6efc1dac512dc05c9c9126e2e36
diff --git a/dev-python/nbval/metadata.xml b/dev-python/nbval/metadata.xml
new file mode 100644
index 000000000000..19121442841d
--- /dev/null
+++ b/dev-python/nbval/metadata.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marbre@linux.sungazer.de</email>
+		<name>Marius Brehler</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Gentoo Proxy Maintainers Project</name>
+	</maintainer>
+	<longdescription>
+		The plugin adds functionality to py.test to recognise and collect Jupyter notebooks.
+		The intended purpose of the tests is to determine whether execution of the stored
+		inputs match the stored outputs of the .ipynb file. Whilst also ensuring that the
+		notebooks are running without errors.
+
+		The tests were designed to ensure that Jupyter notebooks (especially those for reference
+		and documentation), are executing consistently.
+
+		Each cell is taken as a test, a cell that doesn't reproduce the expected output will fail.
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">nbval</remote-id>
+		<remote-id type="github">computationalmodelling/nbval</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/nbval/nbval-0.7.ebuild b/dev-python/nbval/nbval-0.7.ebuild
new file mode 100644
index 000000000000..fbb65c03f937
--- /dev/null
+++ b/dev-python/nbval/nbval-0.7.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A py.test plugin to validate Jupyter notebooks"
+HOMEPAGE="https://github.com/computationalmodelling/nbval"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jupyter_client[${PYTHON_USEDEP}]
+	dev-python/nbformat[${PYTHON_USEDEP}]
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/sympy[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+	)
+	"
+
+python_test() {
+	emake test
+}
diff --git a/dev-python/nose2/Manifest b/dev-python/nose2/Manifest
index 9a6bc9873706..be8b562c80e2 100644
--- a/dev-python/nose2/Manifest
+++ b/dev-python/nose2/Manifest
@@ -1,5 +1,5 @@
 DIST nose2-0.6.4.tar.gz 134636 SHA256 56831c4caa47e2939f555b33e2c44170c1fab4d13526af838d9d80bef9e091b6 SHA512 4161231ecf195a3c5172f8bea2002f9cf4d55ee4f976f512b1ae758ebe8389f41520594da7ad2b21cfbf998be388993281e126363d24ee00c948d6c57278333a WHIRLPOOL 2905a358ec07d67ff64882f73527044a6bfbd70cb11865ee274b91675c3939b7b018d8dceb667396afae9ed425c14bd6ae3317d97fc2e35931302e6965054c6f
 DIST nose2-0.6.5.tar.gz 134808 SHA256 13c00fd49fe2057688a68860f5de195e50ec85748f102346c74e7692b36d2c23 SHA512 fc84aa19d486ff1441dd43666182212e4a05b3be054f3c8967e36e624c08ee6eb10b01bba45b5f5dbbd38cfd057d53877e0bc0d9aba59b842688a5d4ec944b40 WHIRLPOOL b08589fe1b1467d11f31b702f6dad4c2212e7a47f370138a110ee109d0c078a38a137ef0b21afc6d8e718074c662d28ded8ce19423df4357ade771af3238d229
 EBUILD nose2-0.6.4.ebuild 948 BLAKE2B 8d7b5deef1ca019a1a13f71d0111d054fb533794e06927d778d0617003e968228d7c498836ab5e621e52b87f0006f76c9a7c57ce8c43312cb7871594d2e89088 SHA512 23adf77ac73ca1511351d451bc27c2651a094c266c64603ec78b7bd047bb6845f5e12271f7d7ffe4f39aa0dd1fd03f7eeceedc1e7338d837503100e7d8837368
-EBUILD nose2-0.6.5.ebuild 948 BLAKE2B 8d7b5deef1ca019a1a13f71d0111d054fb533794e06927d778d0617003e968228d7c498836ab5e621e52b87f0006f76c9a7c57ce8c43312cb7871594d2e89088 SHA512 23adf77ac73ca1511351d451bc27c2651a094c266c64603ec78b7bd047bb6845f5e12271f7d7ffe4f39aa0dd1fd03f7eeceedc1e7338d837503100e7d8837368
+EBUILD nose2-0.6.5.ebuild 953 BLAKE2B 80b60f0d34bfa41412680a5ec8c21ea04447215e43439cca9d297f38c0e21941fc15978e424ffb227320fb3bc9b438bd3d972a7f5de56d0096157eba22b424b4 SHA512 628d564dac82c332405a3e5653a39f1510ab3f7f01a41c24740963025354059a3a9e8b16794fc8d83f3f882cf357438b17ab4362651714b3581c10afcb8ea147
 MISC metadata.xml 326 BLAKE2B 04adc5544d7eee934704c013ffd0cae436b8f2a650b29c11efbdbb0859387d981ad3f769258311c6ab78848975197aac5b571bcdc15f09a357afaa85005e1d4f SHA512 f33cbd667bbf3fca39922cc1a57a50fe1fc7cc3b5a5393220d99a1e2a4fa14c90b2cddc4c9fcdd7e472920a2441c5de60deb53b7caf5ecbe2050b7480fc954eb
diff --git a/dev-python/nose2/nose2-0.6.5.ebuild b/dev-python/nose2/nose2-0.6.5.ebuild
index aec771d0b8ee..dc4f735d26d2 100644
--- a/dev-python/nose2/nose2-0.6.5.ebuild
+++ b/dev-python/nose2/nose2-0.6.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/nose-devs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 
 CDEPEND="
diff --git a/dev-python/oslo-cache/Manifest b/dev-python/oslo-cache/Manifest
index f5ecf81d4bbc..570e66698035 100644
--- a/dev-python/oslo-cache/Manifest
+++ b/dev-python/oslo-cache/Manifest
@@ -1,5 +1,7 @@
-DIST oslo-cache-1.17.0.tar.gz 47178 SHA256 bd74257b5bc781112af8862ebd6d41cf58359bc78ccd421cc47f0a79d5337c64 SHA512 0ae55959a46624bd0b50cc8161f9428b3f61669f726ebc05d944f7e049c5172a1d9c83778c9632e8b2a21f047884d90d15b95c0e23a0dd19cb78f8d62f06d00e WHIRLPOOL 28c346d092cf8538a0408e4cd60d48959432090cdbb4bb00ea43524b49dceb84afa786b5456aa71a6938d99c195f940a6741ef3d06e380c5c3fe2607223a5ad0
-DIST oslo-cache-1.25.0.tar.gz 51267 SHA256 7b2e17bfb7f5de8fb7836a9e2311044cc62d904486e1cc2ad3b8182ec75e1d65 SHA512 3c21736c864cd63f3a55fe06cedad54a877970d3ede70fe9259cd549fb2a81d425547445238f8c8f9e42929b775216c79b34eead8655588ef8e1c2617bbae6a2 WHIRLPOOL ecc8bc414de18dbcb1911b3d33997884f38aa7470c537a6fc83bc8519e3d110388dee023b79d13f2b0eee300f8b144c2f0c0386023bf92af4bc71a61406a2bbf
+DIST oslo-cache-1.17.0.tar.gz 47178 BLAKE2B bad4a005255a03cea4552b18adc242123923c3e5f8dfc73085ed8b0e600fa4c2c8420f0b5a4959d6272e8425b07da95ee77293bde486edcefd40471ff4fca439 SHA512 0ae55959a46624bd0b50cc8161f9428b3f61669f726ebc05d944f7e049c5172a1d9c83778c9632e8b2a21f047884d90d15b95c0e23a0dd19cb78f8d62f06d00e
+DIST oslo-cache-1.25.0.tar.gz 51267 BLAKE2B 7bdf6a38aeaa296bd87b965551eb57523d653aae247d3381af402bfbaeebaa0ff66b21b0ede30e3ab00f957bc36936484552996d30048d42224268ac1b59243c SHA512 3c21736c864cd63f3a55fe06cedad54a877970d3ede70fe9259cd549fb2a81d425547445238f8c8f9e42929b775216c79b34eead8655588ef8e1c2617bbae6a2
+DIST oslo-cache-1.25.1.tar.gz 51049 BLAKE2B 24e229d7c7a03fc244fe257394fcff1dc55509c6ed6a60ef8eef49c1a7660972a8412188ca96902b61463dd452bc63fed890ba27235d93dd620a93a52de706a2 SHA512 bc5b6502c6f310670ffae9b70b232ff90f0d0c04b75ba14aa4d528634f912efb243b89e229b8277e86ef3d7cbe2e81e69996c80f011d8ea4e1050646f074b297
 EBUILD oslo-cache-1.17.0.ebuild 1049 BLAKE2B 03dfb73c16f74235614ef5fb65b22ccf3c7c7bf981ac0c2db7beae7d00bb33aa5376071195848c6a068b99c89fcf7329d5b1e39378671972fb19a38b282fe632 SHA512 b23fe1da5ce175391e582189a6494e0fdbfe7c6cdd351ed33d53ad161aebf7fb905978f479530f69722ae4756fdde1fb6e50578848cb7c8c6f0dd666293d2d2c
 EBUILD oslo-cache-1.25.0.ebuild 1190 BLAKE2B 97e324d523d406a006a66c30afe34673b7e38f8032ca070e2ffe65f8e3de794debc745d78f71fb600f324ceb2c62586e282c89f5e2c8897f2b93a307f741de75 SHA512 bb2a6e3313fb504275a7a3ec56dc60f8f94b03db0e20b11248e89464bf38502cfbc125528c8f42fb096dffb2965fe9ac16edb392ee3761f0946d01b9481e3a6d
+EBUILD oslo-cache-1.25.1.ebuild 1192 BLAKE2B d87477ad9e4476368b85798b0f1ac0ac85a97d11800b44bfa880d80a39e8bb1f810a97338bf9a76a30cabae162f21109e383f2b994fac8a054c0be081281cc98 SHA512 ebd7a506113f6e73be88ebe29d860e66e294474639a75e125feab4e078d74ad284baa86393874ff72d1d88d0b941df1c0f8b0a461232f11d469067605265b04a
 MISC metadata.xml 457 BLAKE2B 09e44ecf9952f5bfd930616506874014a267d8622daf6c22b3da4856d9f4bbedcb3e4e72285972da026f310c47973c0bb70c222292caf877d4f9ab6d5166955a SHA512 f98547e9de8c502afabf7c53409df90ec687159b5160c8ff2166acff4d6bce0fe69c8eec78d50f52919cd75733f44f82dea5f9cde362d22ed69200d332b9d6b7
diff --git a/dev-python/oslo-cache/oslo-cache-1.25.1.ebuild b/dev-python/oslo-cache/oslo-cache-1.25.1.ebuild
new file mode 100644
index 000000000000..b655f5a5bee6
--- /dev/null
+++ b/dev-python/oslo-cache/oslo-cache-1.25.1.ebuild
@@ -0,0 +1,42 @@
+# 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,5}} )
+
+inherit distutils-r1 vcs-snapshot
+
+MY_PN=${PN/-/.}
+
+DESCRIPTION="Oslo Caching around dogpile.cache"
+HOMEPAGE="https://launchpad.net/oslo"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/dogpile-cache-0.6.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-4.0.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-4.3.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-4.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/oslo-privsep/Manifest b/dev-python/oslo-privsep/Manifest
index f52c7ad395d2..a02c461693eb 100644
--- a/dev-python/oslo-privsep/Manifest
+++ b/dev-python/oslo-privsep/Manifest
@@ -1,5 +1,7 @@
-DIST oslo.privsep-1.16.0.tar.gz 30448 SHA256 bffc4ea46cf6e19c84dbc16f3b1fc7a78fae2480c7609bc97e054a88af7d6773 SHA512 223cb4a32a9a8545833621c7a6e3a9ab5acf84a188f2a6f45df4311e02ec64cef8d7150ddde89ca3c207f5aee599ed655b1f9a5fbdec7f55605d4d3aa251edd5 WHIRLPOOL d6666f7326d83dd64e418b433c0064bbf239c77a09aaaf378e6188f75d5d9ed75114f3eb285c203f1cf816bbe1c7e21f631b74ecbea033a196e7581169c2afca
-DIST oslo.privsep-1.22.0.tar.gz 33179 SHA256 cf088141fd2067afd9549b05adc9744287768d03da4879afafe8cb71253a2029 SHA512 ba4bb9b4fae1dae029a72f1216c23eb7c3ec0d9376c6c1b6ac864b56d3a942e4774ef95830f451c6d2c11cac5089bbca3c7c1cc47f7efd9dc5be58a3bcdf76e5 WHIRLPOOL 4754e89c59f99aca7897cb16076bd49c8cda5f78c761a719dbcb85fda7e3e968650437ea1c6cc9a869a2e2774f4d5b82999bd66181e217302c1f93d987031b64
+DIST oslo.privsep-1.16.0.tar.gz 30448 BLAKE2B b1bdff6d168c4215728e8a3e84df9973bdd066882d8409d12fc736861f9a796c5591b1ea4d4f6397ba742e0a2e0b4cc731058e8e8924f0c8598d315b43fb72ca SHA512 223cb4a32a9a8545833621c7a6e3a9ab5acf84a188f2a6f45df4311e02ec64cef8d7150ddde89ca3c207f5aee599ed655b1f9a5fbdec7f55605d4d3aa251edd5
+DIST oslo.privsep-1.22.0.tar.gz 33179 BLAKE2B f89c44deb7bfc7531063731db9a6eb2f92a85f686c8ae5f117068eaddee1ff26d45b14a2c7c0a65e8071f238e9239c98fbe20a2a524fd10a511f2bd71dc13794 SHA512 ba4bb9b4fae1dae029a72f1216c23eb7c3ec0d9376c6c1b6ac864b56d3a942e4774ef95830f451c6d2c11cac5089bbca3c7c1cc47f7efd9dc5be58a3bcdf76e5
+DIST oslo.privsep-1.22.1.tar.gz 32602 BLAKE2B 1dff51174aaf3b8b8c2c5006e476f8b6f386f071cffd5038c9261af3696a7ab1e05e8ab400a6c15a1dc050363e991587d8234ee6a99dfacd20f10162779766df SHA512 fc71b92b9a73e9de5003bf3e9288eca6a128c8d98abb51e5e372823a8ad549aa484bec3ab2bd0ccffe527282f96f12dd02c0bdcd0680b123649ac452ad4c0a7e
 EBUILD oslo-privsep-1.16.0.ebuild 1569 BLAKE2B 6e3cc5258fe489407beb7c661c89e491e10bf1ac991233baeabc6f84569b8b605be6228ff3bba07df8e7949b9f9232323b4ff897af583ac3e5858dfc81b78435 SHA512 74b826948de43144eb62e8221a2e15ce37f10a436975faaa287d8d16d6d28d570467256c7202ac7965f622011c9b593879e09f9c1d0898cce4b400fc333f11d8
 EBUILD oslo-privsep-1.22.0.ebuild 1794 BLAKE2B 93e0ee8b4cdfd90f7cc4013a3dadb140582576b4a31394c691a12d17ade417e5f5dcdb0eafedaca6d0ab7d43cc7c81ef830d6e8328a84763185bf8f31284ab02 SHA512 e46645b4149348dc6fe59c11e6fea184e4e3f51ad3e4634bef267591184da60f8ad35965f381ed578ca7328509445ac151e573b49dee6d918e4804b9e7f470c4
+EBUILD oslo-privsep-1.22.1.ebuild 1796 BLAKE2B 1176280a1e7d5ca019c2aac7b062efa7271af2617e91950f0a85a00a23d9377298372b6b516eaf41e0c7b6e64c85f0b1460c5b7071f301f27b31458fa6541377 SHA512 9e7b7a35ca35c17189920600188d7e8f52eb0cd212cd36f92d99e5775f877aac632429d0a61025bd1ac6d49c514b64240e094fbb0b44f396078bffed9f867a71
 MISC metadata.xml 544 BLAKE2B a76322f18a6f2b32d17934a5d8c747963f5bf647cae027babcc4508c4b15ad6c958baa30399247302aa696dcde2ade3a9ae4552de7c1538d4b0af79b3da2ce69 SHA512 f7f8a7194b5439872af70f9ae742bf8cb6e338b8100e3cddbdea34be89c187c5475d6e0523dac5cc886a85133d18bb8669ef9292228e4351d31122c73561dd30
diff --git a/dev-python/oslo-privsep/oslo-privsep-1.22.1.ebuild b/dev-python/oslo-privsep/oslo-privsep-1.22.1.ebuild
new file mode 100644
index 000000000000..7e62a26bbdd3
--- /dev/null
+++ b/dev-python/oslo-privsep/oslo-privsep-1.22.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="OpenStack library for privilege separation."
+HOMEPAGE="https://pypi.python.org/pypi/oslo.privsep"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.privsep/oslo.privsep-${PV}.tar.gz"
+S="${WORKDIR}/oslo.privsep-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
+		>=dev-python/openstackdocstheme-1.16.0[${PYTHON_USEDEP}]
+		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
+		!~dev-python/reno-2.3.1[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}] )"
+RDEPEND="
+	>=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-4.0.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-4.3.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-4.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
+	virtual/python-enum34[${PYTHON_USEDEP}]
+	dev-python/cffi[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
+	<dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.4.0[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+# python_test() {
+# }
diff --git a/dev-python/oslo-reports/Manifest b/dev-python/oslo-reports/Manifest
index ee023d061086..327b3ec8d0ad 100644
--- a/dev-python/oslo-reports/Manifest
+++ b/dev-python/oslo-reports/Manifest
@@ -1,7 +1,9 @@
-DIST oslo.reports-1.17.0.tar.gz 47891 SHA256 0f1b825ff32d0b36a1823116a2bddece1bbd17d8f85d8e8e5f8274df80d16852 SHA512 1fded7c8d6149dbbe11fb6fb28f6db656571519fcc093bfa7bf85a8d998c6cf23f28512e0658c9f8f547185f10bfb3b993fdc52942eac5ba884d2ee15556ad20 WHIRLPOOL 61f29933952e474aaac19f77a2165c14db0fc416b2d8e7d38351143dd4ca8af78f9652b099f18fa64ce898bb83a1bb217b97a7985b52dbd451f2cec297e32e77
-DIST oslo.reports-1.17.1.tar.gz 47828 SHA256 dbfc364f7d36065cfc369d98c01101f0833ef47f1786e1184296219067044792 SHA512 2ed6d69c8643901a185f38de34cff663160daa246d372503f17e2102634c6634dfafeaa7d6474b7bd702f43aece27a3e4d16c06ccc0a9f6bee1d79a2204ec704 WHIRLPOOL b10c8c8514963df3e87b4993d8419e48f065a1134ea938cf5f3d7e16b9cbea36e97209c1966def6ca79a43f77744a6a3760028a8ea7235531ef8241522f741c8
-DIST oslo.reports-1.22.0.tar.gz 48141 SHA256 2bcfbe73dcd10c04c44aaab2e1579342fdf00652c236c78a0f168069c0cf4cec SHA512 fa4d6f08531c383fbba3fc2785db0c22a21226d477faebe65ae6ede5e2c7db7fbcbb6edd793c38e6f862679e13f2e7e5838ee48784ae554f18ba9363edbbee54 WHIRLPOOL 35a8b605ee86b4d791961f0d02aa8fcd6c87fee97da12384cc41819b41a447909cba122c6e44e71090eb5ed21b12b0b49db9f810c833e2ef3180467a0fe37a36
+DIST oslo.reports-1.17.0.tar.gz 47891 BLAKE2B 8f39a955585baf10a8bff017c7cd652f511e97061705ca63671522cd40da7d4c3d1b8f3d2aa3da69257b3d7c9a57a6f0f8d4bba12d7439edbb91af5f81733399 SHA512 1fded7c8d6149dbbe11fb6fb28f6db656571519fcc093bfa7bf85a8d998c6cf23f28512e0658c9f8f547185f10bfb3b993fdc52942eac5ba884d2ee15556ad20
+DIST oslo.reports-1.17.1.tar.gz 47828 BLAKE2B 414020c3ec934fc32132837b1af16a5f4ad481b392237a930370111e0930d18681c1fbd9d969ad5207966856caaed4c94c3dd89e63849ca042acad72cf3440e4 SHA512 2ed6d69c8643901a185f38de34cff663160daa246d372503f17e2102634c6634dfafeaa7d6474b7bd702f43aece27a3e4d16c06ccc0a9f6bee1d79a2204ec704
+DIST oslo.reports-1.22.0.tar.gz 48141 BLAKE2B d7b0518cde504152336451fc73dd9acca1fc5fa44717eae358e8065051944ea25e6624fedd4795125405cb423f099f1cd2f63a127e2fada9928b34baa386a4e2 SHA512 fa4d6f08531c383fbba3fc2785db0c22a21226d477faebe65ae6ede5e2c7db7fbcbb6edd793c38e6f862679e13f2e7e5838ee48784ae554f18ba9363edbbee54
+DIST oslo.reports-1.22.1.tar.gz 48151 BLAKE2B f3867bf3c6c7fd207b1e730e8c96098d74b42239107999194bcef295ae0a86048bed7f47498a5d4a0186d15d48f97d897850fd2558eaae7bc386b9401c01155a SHA512 c2c7f35fe80df9393cb1d9add59a7be95586ee078074548795f881c8515073946bcf3dfda02536850b943f346a6b81bfffa1d9f461f0cafdf6163da09b6d07d4
 EBUILD oslo-reports-1.17.0.ebuild 1216 BLAKE2B 9a68f2237752bedaaaf13d7197f33eac27d92a4481458ee9b994fcda589edd39b95590e8e386a0b05a2c843e203d2235942f4cccee49b0572b1b28bd32a36ded SHA512 0ef892ee3ef4fc5c114c623d8a44fcf48276089252182d22e81d6807500efaf121b32523b5907ece493e878443574813380111a7fe16183bd03062bbb85b6008
 EBUILD oslo-reports-1.17.1.ebuild 1218 BLAKE2B 919082da9506e999e1e5b290f10ea6bb242042b93f0326e66e89387090ed781a9953af8b43f2eb81b84c9742921db10161d75f25c5616feff76efc421e5a7c0d SHA512 c9874eac382be979797970151447313943d6fde38afc3919d1a402824ee92b5214d56e94eef848f35df8d266cb84595d6414f42c0f701d69846bb09c790c475f
 EBUILD oslo-reports-1.22.0.ebuild 1349 BLAKE2B e6e3c2cbcf89616d6ea7a30ca9e0a622cfde35683209f7cf56aec7afb718699ea5d0cf3fa276eb24ba5cd9dc111cd6ae5784b0542f6f4510f9cc81cfc3af7527 SHA512 34a44e0e2b3feda056aaec1b61996cd7bf7838b9a98304bc74565d543f2f013ec90a2b37181884b61020f16f05d20a365326929b2b717ea84e3a3798c527828e
+EBUILD oslo-reports-1.22.1.ebuild 1351 BLAKE2B 83367cbfd28d874984e164d4f8b15ccbca009d4270d2947ff1141c3160999e6d9ae4aa3ba53b06a7b25d8419f0699026799078d6378ce16550c78a39201ed680 SHA512 084554d3cbf8e69dac1c5ca62f78f98ecb9a2e0dbcc38be10e1774e3a60aea77037211654562e2e1539e93e0b95e06aa3f7b074c0258b0732f52fe8af41f29ae
 MISC metadata.xml 329 BLAKE2B 431c4b925c3e743ab9f24b399affb6c0debc3c81f2dff9fc3e30c04af99b1984b8b8ee56d143c5f130a2c77f3bcecc0ff905d07fad2e3301ce5ca1b7920715d9 SHA512 61b44fd1704b8cee9c664efea764a36fc32e5019e5b9c7fca107b8a3a3272a7f97c525827b6ea918d0f91e9098f19fa164df62c83cf617b8125886aee633c1ec
diff --git a/dev-python/oslo-reports/oslo-reports-1.22.1.ebuild b/dev-python/oslo-reports/oslo-reports-1.22.1.ebuild
new file mode 100644
index 000000000000..ad722b7e1add
--- /dev/null
+++ b/dev-python/oslo-reports/oslo-reports-1.22.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 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="generified reports for openstack"
+HOMEPAGE="http://docs.openstack.org/developer/oslo.reports"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.reports/oslo.reports-${PV}.tar.gz"
+S="${WORKDIR}/oslo.reports-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/jinja-2.8[${PYTHON_USEDEP}]
+	!~dev-python/jinja-2.9.0[${PYTHON_USEDEP}]
+	!~dev-python/jinja-2.9.1[${PYTHON_USEDEP}]
+	!~dev-python/jinja-2.9.2[${PYTHON_USEDEP}]
+	!~dev-python/jinja-2.9.3[${PYTHON_USEDEP}]
+	!~dev-python/jinja-2.9.4[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
+	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/oslo-service/Manifest b/dev-python/oslo-service/Manifest
index 756828ad2168..d4c52db82168 100644
--- a/dev-python/oslo-service/Manifest
+++ b/dev-python/oslo-service/Manifest
@@ -1,7 +1,9 @@
-DIST oslo.service-1.19.0.tar.gz 74937 SHA256 4c4e0198b6d87b6566f48c8e89cbe87386d4b44ba03159f28655f911a65dbff8 SHA512 d9f8c5d07d418ab2d0234299071e4ff129ec4af4bf8f2973f7899c1a7636fc67f1ce16e770ada7c7fe8a19f28a156536e1c159546a0dd708f26404dffceb5c70 WHIRLPOOL fc413ac2f7e3acff1664b1a98aeebeac6a2e42b2e82f276f628386754f962542c7c83edbc026ad66ad93067e1c5368f52bdf3bc3c8cb9cf222a2c0ac551cf215
-DIST oslo.service-1.19.1.tar.gz 76246 SHA256 b7106bd22a092b358f929f28b2e4726b42c470b32d3e146d9c69e05661e0c37d SHA512 3298ba9e0dddfe477c324b3eb55d4d20ab5da6231488658b78290d1e9e9eafab758885d350471d1c87c24d01551a4643c1f748323a8455d743f0dbe74d4c5d68 WHIRLPOOL 748820fb92e5a273ff2dcf9a20cf040c30e965ce2dc8743a74679ec961fd7d46325de3c5923949fa60f49f98ec160d568bdfda04ebb06c8fd74270b127fa3d39
-DIST oslo.service-1.25.0.tar.gz 76400 SHA256 6de577c01866c970abd00bea1d6cd03eb8adaea86667ec8accfdfb3f1076e33b SHA512 829c9be54813900c4bce0072e408a4c996548ca123524c76b4a3b99d7bc940d22f7d4a0a1d6e02ce88b252fa34bdedf26129bdfd4894c4b5b14c8ec71b85629c WHIRLPOOL 3b56c1693cbf417e27ba0d02ee4d5ea06018f2fe39ed6f5481d5a70971e37395efd2ecbe6c0899adf3fe643098686ac4e0a232f57949c0a8d9ae78b774da873d
+DIST oslo.service-1.19.0.tar.gz 74937 BLAKE2B 0459f16c7eaf75c3df5a58eda40fb5b9cb3831662038c5ee19e6049fad940474a65e9003641f6ba4755b918d1d7f6333fd60670c672b30339b6b7339ab5275ee SHA512 d9f8c5d07d418ab2d0234299071e4ff129ec4af4bf8f2973f7899c1a7636fc67f1ce16e770ada7c7fe8a19f28a156536e1c159546a0dd708f26404dffceb5c70
+DIST oslo.service-1.19.1.tar.gz 76246 BLAKE2B fb5355d058459da0be54f1d208201f130a20a1a59c90fc15ecb4e748c8cdd5174410a521ad05bd125b3f4ada673d1ba2ad7c7a2565a2d0821e2ec55a50e7e61c SHA512 3298ba9e0dddfe477c324b3eb55d4d20ab5da6231488658b78290d1e9e9eafab758885d350471d1c87c24d01551a4643c1f748323a8455d743f0dbe74d4c5d68
+DIST oslo.service-1.25.0.tar.gz 76400 BLAKE2B 09dda44cbe2633efe149b552b9d2c484f1f63f085d2772e1caac9adc38246b5ccb5fd04c3d94b717b1c70f620898ca686ae72fb306b5236232902578ed2ae456 SHA512 829c9be54813900c4bce0072e408a4c996548ca123524c76b4a3b99d7bc940d22f7d4a0a1d6e02ce88b252fa34bdedf26129bdfd4894c4b5b14c8ec71b85629c
+DIST oslo.service-1.25.1.tar.gz 76864 BLAKE2B fe4c8ac0f52ad7dcdd5240716030cd807d7755bf6f39d949331d18c1d0ce30563609f15db0db10824712b0a22cbd5ee9d6985fa5c9a51e734b000382d0ca7501 SHA512 2632ff6ce079916e44d6250487e202a7e1590cb0ba094868bd9d8e01cea9f89f22a5336edeb74aff2fa0f6aa017aefd454159511134670cceff5112b9957ce81
 EBUILD oslo-service-1.19.0.ebuild 2062 BLAKE2B c08d9b2a29cc5596e4254eca16e8c9ee9da9a6e9ef9a785ef400632a5e198462494d74d0f1217d625f5285752198014dbb175ab14cb04ba89301defe7f70c26e SHA512 7b50b5098986b4bb794c201fe10182ec2f2078a9ab328f193684f526b71c28fc94186b4dfd28645d31ce4fedc24e81510bf3fa5c5a1ef5a846d546a15d5cd41a
 EBUILD oslo-service-1.19.1.ebuild 2064 BLAKE2B 87c27ff38449f2f1f6dca056162db9de081b93423bba9702c7aaed572233df87ed4249a219a2d1a0c251fa2230f85545f6c918b445d2d53774b73017d1751fc0 SHA512 32a3713312f0332458d112ca5504a1982c22534ac973a0ce773f5f7eb9ed3ba21cf3c9617f1f0a9aa66117b4f444bf7862312e87e22dd522876970b4f30c513a
 EBUILD oslo-service-1.25.0.ebuild 2207 BLAKE2B 413d64c460fcb44bd70704262cd237fc852201f417d203dff5b6e283918e939fb270cd7268e00391d79192bccd868ea4ef261cb8f54fb6f2fb6c3b715133d420 SHA512 30109f79017401d8b966283c1a99b3b55b287e4275f057f069fb6c7b66b785c2d5a5b314fc0a8712776e30be11bc3c37ba2782efec80e29131da8fe9b3f3aa43
+EBUILD oslo-service-1.25.1.ebuild 2209 BLAKE2B bb9c522991599ea1a3b333b565b8d4b8c788abffc97193094d9706581328e64d6306eda3f40983d3e79674b1845b638ad8b28f2609ffaa28b3d73dbf9ff29920 SHA512 b884733ccb9a5e9ccd993ae639677c1300d62304bed0f9638d68896734f8dfae4e5859a3d49f60a67f0b1434aa68fd639a3c7e6cdcebc200600dac25fbad4486
 MISC metadata.xml 329 BLAKE2B 2ef43d1bf3df7be8c2e2b08bf7cca10d1bc23235111bc74bf0b23ef6f9c5ac3ad05a1243b518c0d8b703e4815ec7fc92ad01c907baa77d9c4dbb622a1288aaf2 SHA512 c02f0b4e37e3dabe1dbc10ca6b5e08627d8e7df5fee71573cda34338249508586bf068c56711521aa20bf80a1fdcf94a1e89df5d17cb5eb21a07b996a071d1ae
diff --git a/dev-python/oslo-service/oslo-service-1.25.1.ebuild b/dev-python/oslo-service/oslo-service-1.25.1.ebuild
new file mode 100644
index 000000000000..729b8faae141
--- /dev/null
+++ b/dev-python/oslo-service/oslo-service-1.25.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2017 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="Library for running OpenStack services"
+HOMEPAGE="https://pypi.python.org/pypi/oslo.service"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.service/oslo.service-${PV}.tar.gz"
+S="${WORKDIR}/oslo.service-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
+		>=dev-python/openstackdocstheme-1.16.0[${PYTHON_USEDEP}]
+		dev-python/doc8[${PYTHON_USEDEP}]
+		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
+		!~dev-python/reno-2.3.1[${PYTHON_USEDEP}]
+		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
+		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
+	)"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
+	<dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
+	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-4.0.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-4.3.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-4.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
+	dev-python/paste[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests tests/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/oslo-versionedobjects/Manifest b/dev-python/oslo-versionedobjects/Manifest
index a58f9f48ec41..16c0c10124d6 100644
--- a/dev-python/oslo-versionedobjects/Manifest
+++ b/dev-python/oslo-versionedobjects/Manifest
@@ -1,5 +1,7 @@
-DIST oslo.versionedobjects-1.21.1.tar.gz 145514 SHA256 36b8ae529c6415580a9f17ce22cc20af991c4a544a9055e5c4b22360bc32bd05 SHA512 e594d77a923c588a7ca1bc4f1faae4532f28cc2306d548235e0bc3cf0c6c16a5acb54f5b82b97f4ead165bbbbb29982d0f96f20357b1fa0a1b2fde3445ecdc15 WHIRLPOOL 9bcce0de81242b6ec990fb8a7160cf57b015fc5e477f0d496d620f252ef2b72daa67219776acfd4ec13efae9ba2ac35ebc99e5cb0740e07f5e4e19dab062a4f1
-DIST oslo.versionedobjects-1.26.0.tar.gz 146388 SHA256 18d9a5861426d05878cea7db4af2f2057b5b67a27f0673e1d7f776606edfa3de SHA512 633389177b0f4d62e77e5902011bc783f1e7d2993a3d8dee693526c8af435764b1a86e383f861192dfac8d93da7c49b11e16b08485027470107597804c72a81f WHIRLPOOL 64075192158eea536f6d4bd328b53670d91b10bcaddf4c8afa4eadf08d98d60b6678e7bff2566ed1c5b2d6c2fa742606c3dd2d15400ce3bef10a36489d81f6a4
+DIST oslo.versionedobjects-1.21.1.tar.gz 145514 BLAKE2B a5cc7b4a814718cd24c460b2b39af381c55fba94d363ca8ebfb096386261ac86f0f18a6aafb78b032e454c7fcdc4ce7c3d9ae5a9348036283fa61eed98b05e27 SHA512 e594d77a923c588a7ca1bc4f1faae4532f28cc2306d548235e0bc3cf0c6c16a5acb54f5b82b97f4ead165bbbbb29982d0f96f20357b1fa0a1b2fde3445ecdc15
+DIST oslo.versionedobjects-1.26.0.tar.gz 146388 BLAKE2B a3c2d6effca31525c33631b40abe0c0507155106b3fc9917b2c13e8f2849036fc57a16075d06999a6212a11f7ea653c9a2c9d0fdc7d9b42e9bcef4b81253398e SHA512 633389177b0f4d62e77e5902011bc783f1e7d2993a3d8dee693526c8af435764b1a86e383f861192dfac8d93da7c49b11e16b08485027470107597804c72a81f
+DIST oslo.versionedobjects-1.26.1.tar.gz 148214 BLAKE2B fa449b57db3ae4148fa431616b49b83d6a1424cc5f1845546fc945270bfa1b470f376a52edb0426f1fd86783cfe25906f476fab3417b3944c5f3074548704c77 SHA512 13962e9cfd5c63d9691bef0e1b31aa1751a506dc7a8aa3031612220778ba887d3122eea205456809bed9cec12c8fd5debfdce827d59ad8fc991ff85de7f841a1
 EBUILD oslo-versionedobjects-1.21.1.ebuild 1377 BLAKE2B bcb8d5fffbf2eb745ed2c4291153546a0d0328fd87e80482175e14defddb6bd951b8758b5ecbe08a27aff3f173939c53e055b1853c7ab5c13a6e8d105f44bb99 SHA512 bb959ddf306a4ee951b118d14959de291221b399dd2f1bfd3754be1db9cb805cb8d8a41280a3c654e499686b4215052a6949f1d3d8a6f0b7dd3a6efb0d00cefe
 EBUILD oslo-versionedobjects-1.26.0.ebuild 1611 BLAKE2B ea80caa853b82ab0ae6c723488c95190bad1304c3a945a1c9acf13b28161bc180a5c3933095036b3cbf5162287b66c98801c22f31dff7d908bc46abf386eaabb SHA512 87011ad8ffaa7b9cd17c6ebd1c021d262e9cb8bcc69b5a338ff39f5cee2bb92a7013315e0d8fa2660dc3a636ce158e4b805479d6f8ea42aa103e3a3486745dd9
+EBUILD oslo-versionedobjects-1.26.1.ebuild 1613 BLAKE2B a7a68d5ce1f68be1da166650d7cd0f8600dde81a087c4e21c5680d3a4f54e6ed787244f6d86be0d4fbf5c82b39522b7b6539555083381a57b6b15c0e08e03d60 SHA512 9998ac410a9dfe0d93c8fb61fe1c194cb5bf1d2e59303fd0bdc957b427cb23721c7378c430a8d59b22c6ff2b39650907eb5e1f24bb09c6c142430eec5d301177
 MISC metadata.xml 338 BLAKE2B fa5249011cbd669973d70ec877cb0d59e5d8e6f25ee0e8f704024a879bf9d151d2425b8b253ba102a5290d9175816831e3423f77f9b53aa3dd95d11bd64a80b1 SHA512 6e0c4816549dd4f80d8c344f68148c2815afff2f84714cb570e4199c1bd6bfb4f9c5e27d230478e37890b0617fbd62efe472b37e043d8f8b2cfbe8912cb36fe0
diff --git a/dev-python/oslo-versionedobjects/oslo-versionedobjects-1.26.1.ebuild b/dev-python/oslo-versionedobjects/oslo-versionedobjects-1.26.1.ebuild
new file mode 100644
index 000000000000..6120b8f21bb6
--- /dev/null
+++ b/dev-python/oslo-versionedobjects/oslo-versionedobjects-1.26.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 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 library that provides a generic versioned and RPC-friendly  object model."
+HOMEPAGE="http://docs.openstack.org/developer/oslo.versionedobjects"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.versionedobjects/oslo.versionedobjects-${PV}.tar.gz"
+S="${WORKDIR}/oslo.versionedobjects-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-4.0.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-4.3.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-config-4.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.14.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-5.24.2[${PYTHON_USEDEP}]
+	!~dev-python/oslo-messaging-5.25.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-1.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-i18n-3.15.0[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.13[${PYTHON_USEDEP}]
+	!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]"
diff --git a/dev-python/oslotest/Manifest b/dev-python/oslotest/Manifest
index 96dfebc77e15..fd5566fa90f4 100644
--- a/dev-python/oslotest/Manifest
+++ b/dev-python/oslotest/Manifest
@@ -1,3 +1,5 @@
-DIST oslotest-2.4.0.tar.gz 26392 SHA256 cad9a20b4c26a691e947b826c37ea393c35384ff3d9091ac83c8ad4201795b0d SHA512 20dfbf555741e72cd9ba41c0432e8c8af01ae7c07a9a740f71055f900a994790b420aa062313a59cdfddf4c80b7ca2aa0ee9ae2ee645ad525cbafeae3db68886 WHIRLPOOL e8a5b8dc30bf2aa68e58c07d3a9e2067aa8d037022d22bdc9351950d70f922b61ec7e907652ae04886cd918bccf84ec4f409dc0604cb2a34af87780f1912fba2
+DIST oslotest-2.17.1.tar.gz 32166 BLAKE2B 49922cedc32bebda867c6633118cbd8258a08048c510333d04e0b2f8f5efd4e5dde802bfb8910936dffca76823771d3e83e78528b5fd045ae4380e02f92cf809 SHA512 558d2c220a6b1235112022b495c77881f52895cb720d67090ad096576b4e81044b228bd95b8303779bf8cca2e1205ef912b1fedd1916a34130f4c68ef69fcc0d
+DIST oslotest-2.4.0.tar.gz 26392 BLAKE2B b34d478f9d18cf6582544499555c6daae5cd47e47731b17c835833b7cbbb65c652602c6642c0c682b0690dde495f5014b454a3c9e0a56b2f69b278935ebadd7c SHA512 20dfbf555741e72cd9ba41c0432e8c8af01ae7c07a9a740f71055f900a994790b420aa062313a59cdfddf4c80b7ca2aa0ee9ae2ee645ad525cbafeae3db68886
+EBUILD oslotest-2.17.1.ebuild 1843 BLAKE2B 6bf2f9e54eba4cca61ca56b52349235c1af84f3b7347cffbd2ed1830fe9b47af27ea9eb7c47a6b4d45a734181716eb525c7a23d260c1300c1d02c30cd78752be SHA512 e50284b6546017119d3c8b53063de09f90ef244916ff457c23f9b87e0ee5d3a5c8b2694cf6a37deed4e313698b4d069a63d6b93f68dc588bafb6526c00166bc2
 EBUILD oslotest-2.4.0.ebuild 1720 BLAKE2B 7d9c6693e8e416509829a3e670bddaf35437f3a7534e4dfd955a3bcb80ecc002154c92cf813f5a5c8a3b2794799de82fad7cfa950010016cafd6793f7d5b25d5 SHA512 aca409a3cfff3da8358de290b7bd119a2a13a9b0e4c142cefd8ecd29230dacf4e84fe70f196bd0e4e415f8e263b300210d56c0dae057b2ea68ff030549fe86f1
 MISC metadata.xml 828 BLAKE2B a328982018731cc93cda675447ce2ba308e9164e8762df10a267c6b82389a717f16b5ba6d9843503e12a458f3ad5a726ce648f80e9ff781aeb429bd9034632f6 SHA512 48a68782c8ef2a15db7c73f03dbd4670b8ca25a6cfcf0c15d4585a93a75cc4591fb6edb70f7176cd72c97d1205ef8e5e898eafa9fca41ed0b00023bff93f966d
diff --git a/dev-python/oslotest/oslotest-2.17.1.ebuild b/dev-python/oslotest/oslotest-2.17.1.ebuild
new file mode 100644
index 000000000000..b030faf9630f
--- /dev/null
+++ b/dev-python/oslotest/oslotest-2.17.1.ebuild
@@ -0,0 +1,68 @@
+# 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="Oslo test framework"
+HOMEPAGE="https://launchpad.net/oslo"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/oslo-config-4.0.0[${PYTHON_USEDEP}]
+		!~dev-python/oslo-config-4.3.0[${PYTHON_USEDEP}]
+		!~dev-python/oslo-config-4.4.0[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/openstackdocstheme-1.16.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
+		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
+		!~dev-python/reno-2.3.1[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+	>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/mock-2.0[${PYTHON_USEDEP}]
+	>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
+	!~dev-python/mox3-0.19.0[${PYTHON_USEDEP}]
+	>=dev-python/os-client-config-1.28.0[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+"
+
+python_compile_all() {
+	if use doc; then
+		esetup.py build_sphinx
+	else
+		esetup.py build_sphinx -b man
+	fi
+}
+
+python_test() {
+	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPYTHON}"
+
+	testr init || die "testr init failed under ${EPYTHON}"
+	testr run || die "testr run failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	doman doc/build/man/oslotest.1
+	use doc && local HTML_DOCS=( doc/build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pastedeploy/Manifest b/dev-python/pastedeploy/Manifest
index ac9765b5c7e6..f13a471f6f5b 100644
--- a/dev-python/pastedeploy/Manifest
+++ b/dev-python/pastedeploy/Manifest
@@ -1,6 +1,6 @@
 AUX pastedeploy-1.5.2-py3-tests.patch 606 BLAKE2B 8f7d5a9f8c517e14a1ecdcbfa040977ab9d3c8e7a072eef3c31d50ac74c02b377ea25fa965d36a89f3c9e0fbfed63364447cfe5525468766df976445d9cebe9c SHA512 0301653864071de976bae24a945ba6d8499aaf21d41c5117ad922254055ee8a3b975cdadc6590677cd458a233ad115647a01a05d52feb0dd40d16bcf4de8f5cc
 DIST PasteDeploy-1.5.2.tar.gz 24006 SHA256 d5858f89a255e6294e63ed46b73613c56e3b9a2d82a42f1df4d06c8421a9e3cb SHA512 03147b2e735f4504b928066d35f46e7d19a49b85afc506b793fba69c8827a4d5b8185074bdd4a963ac392cc104f5a608d1db9a3538d7d3239da5febcbff4ccab WHIRLPOOL 0a48c72278c71376f8b4ddc708c1b6c3370b13f66fc3d438d1a485e69d413814ca37cf580d8e09e0d49a8a35f7e6e0104744440a3fe6b1dfeb5914d3a0557793
 DIST pastedeploy-1.5.2-r1.tar.gz 29528 SHA256 041a5d524ceb45b5677e0d7e0d94d01c14dc8bca51d35266497532299d9fa7f0 SHA512 5d9f648d4bddb4fa0b018f5e1c100d0899ff9e6a429a0a54aede69800fa13b7bb0d606ff454c516b36c3b056320bbda4581de9d57a154e71493a8bd6208fb3ce WHIRLPOOL a5938beecf0845e31a97f292fdc4ee49bf6bfd23a349a857c19269355e6f2c1b79cfb5b31ebdc7e29494054b94170cfb511530c054e070eebbf373cfee954bf4
-EBUILD pastedeploy-1.5.2-r1.ebuild 1054 BLAKE2B f52ae4002ce723968888d23b1d8f34925075a3b87a8136532dff973a5b6cd1bbb37179b66795ae8d3047b2c9da661f21d6a9858479f9c697b00edf3f7f6154d7 SHA512 c9146508fb21311bc63bfd2d1f5bdeac7960d0e6295d16cc18ca142d448f5f97ffe7ba3498d2ff73997fa37d0d2ebea753461a41848fda75fa3e4f271abf0ab1
+EBUILD pastedeploy-1.5.2-r1.ebuild 1060 BLAKE2B d5eea46b4cf16bccc772ea77df8b72e257277254887d61c2998ca947c9e371ddcffb545915cf95006738f4ff5249c1f8af41c57cbd8bfcd25b708d65b9dfb2db SHA512 4134b510de0a5e4789173cff37fffb90dea3d0cf9b91bb50f54c77a714463865a50bbce673df67daa62d1e67bc61c915bc3db9e7bc0adbcaa03037cae992bbfe
 EBUILD pastedeploy-1.5.2.ebuild 756 BLAKE2B b3120edf4162540cad0940cc076b7edbfe426bbc383d6ca62510aa9b354fd1789c0280b94d56fbe4e81f90edf062daa98b513fdcead777e464fa8b8e9ffe5c38 SHA512 d8dfb64442a57535b875302f9e0d7d95a81353c7cc3909c92160842648c08a27e3cb4ddbb62ed4dc3454d30033f9d4c537e6884e0cc7f3fa2c25ade913d51032
 MISC metadata.xml 806 BLAKE2B f945ec7a43dac81abc59fa63d078872fe4bbd9bf3945ca0f03b4d78bb2511bbe137ef8d01424c5c54a55b73f22778dbd9efa009ab64ef41a20d55bd71bb15e99 SHA512 da770a4fe1f5918391fa4861dab525dcee34d5aeb362a464307c6c8b32edb4731effd22339056f01d77eea8d3729d3ca57572d1d95ebab8b786cad9029250f7d
diff --git a/dev-python/pastedeploy/pastedeploy-1.5.2-r1.ebuild b/dev-python/pastedeploy/pastedeploy-1.5.2-r1.ebuild
index 094cbe4b67ee..35d062b44501 100644
--- a/dev-python/pastedeploy/pastedeploy-1.5.2-r1.ebuild
+++ b/dev-python/pastedeploy/pastedeploy-1.5.2-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://bitbucket.org/ianb/pastedeploy/get/${PV}.tar.gz -> ${P}-r1.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="doc test"
 
 RDEPEND="dev-python/namespace-paste[${PYTHON_USEDEP}]
diff --git a/dev-python/pocketlint/Manifest b/dev-python/pocketlint/Manifest
index ba30800e5484..41269d10d4c5 100644
--- a/dev-python/pocketlint/Manifest
+++ b/dev-python/pocketlint/Manifest
@@ -1,3 +1,3 @@
 DIST pocketlint-0.15.tar.gz 22334 SHA256 f2e98e64316a38b56100d2427ca8f9c7ff168b1b08016dc6c10e8a35574ed10d SHA512 0d3e3061635c8d88f4e31aa11f3cbb85a1d9acd3064c17b7bd3c50eb90f824f17a903c55bace8033bdecd626d792ffee091b8b5719b2993f475a4321f033c66b WHIRLPOOL 3aa30bbf687c372adcdeef5c98a50232ab20e916fb7f9ea70d5f56fee840b30245a802c84145ce19549ad1ecbc133bfad31455d673ad7da2a15d990dec025e26
-EBUILD pocketlint-0.15.ebuild 440 BLAKE2B 8737d7ba5747cb29f4dae58025dc1fd70715cedfa8d79aa6ada00aba2b3774935325fc43ab6cbbb0e98a9257ce98037309484d13bd75900dc07861c162a1cdd9 SHA512 51a8113c7fcdbd25146407225c3ef2dc52b4f66ccbf9db85dbd2c10652012db66461f31ed4bba1c49814c236dbe39420fd46e4db37bc2df5797eef5486acb2f6
+EBUILD pocketlint-0.15.ebuild 439 BLAKE2B bfd5512b3e734298636ae84d88d66a2112b05e3701e2cfa54b3f268f67b2fb210141c28611b0502b4bacf260f14b440750d1fc706e9ccfd8479ca82516ceedbb SHA512 05dca28c415db46e527180963c1f6d8a6d85410c353dc748413dc3c565e5ecae272ecca63a544408cf9c533035be2a134e6f421e16c62e650fcacf5058f075f0
 MISC metadata.xml 348 BLAKE2B 832ec69373391ee6c884d446b58ccfb07de61b7519b34be09e3e592ea061c0cf0a10203a5c69bd05e2400366891fc9c74a7b1d74f4a7f268839aeaeb5781602b SHA512 925fd532aab036f7bb18011abfdf98daae08e648aa8b64853d721396dedc431254f54ae2168e5572e2e1f101c6e5ffde2b08a26e423407d84e0e849bd7d4d38e
diff --git a/dev-python/pocketlint/pocketlint-0.15.ebuild b/dev-python/pocketlint/pocketlint-0.15.ebuild
index 09a825f63aee..703506549789 100644
--- a/dev-python/pocketlint/pocketlint-0.15.ebuild
+++ b/dev-python/pocketlint/pocketlint-0.15.ebuild
@@ -13,5 +13,5 @@ SRC_URI="https://github.com/rhinstaller/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
diff --git a/dev-python/pretty-yaml/Manifest b/dev-python/pretty-yaml/Manifest
index 8885d6807c33..11a6c068ab4a 100644
--- a/dev-python/pretty-yaml/Manifest
+++ b/dev-python/pretty-yaml/Manifest
@@ -1,5 +1,5 @@
 DIST pyaml-15.6.3.tar.gz 14459 SHA256 2df761472d0974205b779dab469903cc9ddf257dcd126acc4a97b9d4c970e662 SHA512 9d0789342f59adfc415bef54cdc52b75cbcf1fa71940e1b9534ea0c141c5737449104e45fb0feea968e58d0886a74d9a5bbec0ba05b7d72cf5d93d3a674b5868 WHIRLPOOL 7c2e06dedf40c7c13474824090bf1f5a0453d2d955d446053479be93388c55b30480dc41eaec32a31a2303ae1971de5902922776a48c6d54cdb107a2356a1786
 DIST pyaml-15.8.2.tar.gz 16544 SHA256 9c54fb5f17b58572c4cef50affea60bb73f445ab153580dac07a12383712b5b8 SHA512 74f1fdacdd601f0b6f710457627e4dcbc42e7301fe5faa061d3e8d593842d6e5dd85041625aba576bba9cda2a713ee07ca3067221a720cbddc6dcd417fccee64 WHIRLPOOL 8f443fe904e1da77a78a3a2b8591cd5526b4bd7a07e736d959ad842aede43d31c96391389f666796ec4497b03cd79e72582b5f4b4bc6385c5627ab65ba8df09f
 EBUILD pretty-yaml-15.6.3.ebuild 742 BLAKE2B 048510603225c8cd10a58a9abfd808928b4da56276fc598bd3cf142c327a44efe433400065fa309658ff9505be937d7f360e5d614295217720a2c8676f5eee36 SHA512 8dd9b33127109b69e409eda665707a7a78a79ab03a0fdbcbd9ea18c976441102ad4c41a0d0a854db74409d9df305f10808c014eec1c7893766c8bfa0d2d9575e
-EBUILD pretty-yaml-15.8.2.ebuild 763 BLAKE2B 86c574b3eed9841c1bea72054b6425dee2fe0ac8573cdd5637d0697d4dedbfe3890f1e8581ed1f878c58e179933849342d745f15676e4470c73dac5413444c51 SHA512 903185a2df6846da63e2fcedf9f7f44e9b6ffa820c628fbc4d4afbdb03dab5799fce2dc9effe23959332b2dcf5dd2d2a807224517d5b0c3654bc57b201d6b00b
+EBUILD pretty-yaml-15.8.2.ebuild 762 BLAKE2B 7c8f755a7365e64732138697da20be2bf54822df8ea120aa2014979476418952c0087b09b47a09e23dd90b5a7e42b4ec15816a800bb010d19cf383ce24db00aa SHA512 2f2ecc6e9060767b47fb2077c287978016cd1bb5a81685baba6f01cfb1ac62725bebc5d6aefa472f9cd43ab4954ebd5a5959b69013ff3b53306b73d75af4cc09
 MISC metadata.xml 444 BLAKE2B 522c0c3698f3c35b698b255504afbcda02c321e542ba7013fb0e3de4f57334b31ee014dbfdc8914dd2760a621ab1724a9142029d506d8fa44831726ae7c2b6a9 SHA512 70aee75c33eaa54fc003d6879ada0d4fc772d00619273c7b0e7c5829dcffb8ba23171c563e6e922504d9256f53ee207b36b98240bec3d084a8e6de15e0013732
diff --git a/dev-python/pretty-yaml/pretty-yaml-15.8.2.ebuild b/dev-python/pretty-yaml/pretty-yaml-15.8.2.ebuild
index e8078513f8f9..b0fe54c3d392 100644
--- a/dev-python/pretty-yaml/pretty-yaml-15.8.2.ebuild
+++ b/dev-python/pretty-yaml/pretty-yaml-15.8.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="WTFPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm x86"
 IUSE="test"
 
 RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
diff --git a/dev-python/pyblake2/Manifest b/dev-python/pyblake2/Manifest
index 8b0290cc4366..d48d61040729 100644
--- a/dev-python/pyblake2/Manifest
+++ b/dev-python/pyblake2/Manifest
@@ -1,7 +1,7 @@
 DIST pyblake2-0.9.3.tar.gz 130641 SHA256 626448e1fe1cc01d2197118954bec9f158378577e12686d5b01979f7f0fa2212 SHA512 6336a7f7e79bd3e6ff7f8ff4d279ae170e86f1464b9fa9e7ea7f0dbbac6fcc044caf225111e065f9cd9cdeea0f81fae8d373e1f65be3e418929f53fad063205e WHIRLPOOL 0d8f2aaf35a5eb0ebdedd9219a0ee8b126c93b11ae3e406ef637d8930a34783886b212ce50a33d677b0a19289cd32f40dc3da22a9a9fec108b481268f153d45b
 DIST pyblake2-1.0.1.tar.gz 128037 SHA256 c969e13d0a96c6fe843bc0b94302f7a90d66c4a5df09d7f3593edb0a9c23749d SHA512 66311aa1cd60942d395c1cd8b996f66f1cb2380f36be471244152a885cee115a8e341a34309520d8b1254eb30d5e1b39b83f89d7eace9353c8ee9e919f4a3881 WHIRLPOOL 613e2706701085e2a7895a02d08235ceecb8313f719ac88ed3beb12a59ad7483061ccb9bdba3ce8b270f973dbac9302def423037608312648fe2b3fb6d672667
-DIST pyblake2-1.1.0.tar.gz 125855 SHA256 3a850036bf42053c74bfc52c063323ca78e40ba1f326b01777da5750a143631a SHA512 e13c7e4f3a35155cbf531e337895349ec01f0ac36908a4e746cecec063601adfc8a73a7961a9c310d01d3231f44f08d2cc92e891e9cb87659bc7170b9fee6102 WHIRLPOOL 48e030a35024f4dd478607d2301d53ec2e3635fe0f5e0899270ea41dc01b3f85afc4bf01ab4d2bf44c7ba1e35c88ec94f7e975d27c37e42527320fa09d5a761f
+DIST pyblake2-1.1.0.tar.gz 125855 BLAKE2B 46af4c24882040bbdd221f90e06652918798e4555c0a7307a596ca4c9ed3147f00297269a44d174782c2b0402eac03ecf5387b1c5a16efb57d036730b58b2630 SHA512 e13c7e4f3a35155cbf531e337895349ec01f0ac36908a4e746cecec063601adfc8a73a7961a9c310d01d3231f44f08d2cc92e891e9cb87659bc7170b9fee6102
 EBUILD pyblake2-0.9.3-r1.ebuild 1485 BLAKE2B 9249f9d8c7802c08c01e726f552532bdcf6fc072f5f826f919d8c3411bf2e7e80ba780f4b7a517e9609dcc98f9e9f1105134df19f36e52660f409197887d6f4e SHA512 840f62b6ea7355b97f7898f94ef88392f0dff8e909a5383a5d601d6c5a013a1cb9119e6af92033e6d28bcc62a7745f0ea98377a18c63e6d1ee3ed75045cf5749
 EBUILD pyblake2-1.0.1.ebuild 1471 BLAKE2B 294227a89b8516d8362e67ff714bcbef947e80eff9a06ee56a60464d4889d33eb15a28a943f94490f9dcfb38c86c01ca7b5dba47e31a92ec617fd39c8799f913 SHA512 c687fbce7c0b625fa1d03cb5a63a494baf1f3fb0a3471875a7fc91c84ef5e50946ef90119f916d0219683f2864662a7c52be564fe739ca0f269961c926116511
-EBUILD pyblake2-1.1.0.ebuild 743 BLAKE2B eba170421fd3b4ff57896f2e66b68964e49d29da0eb17ac4e362c27da9d56e996ff94da00a692707a11315f2787fda543966454c9ddf83207eb243002a119adb SHA512 504287156ab6463d51072f6315b5cf4e214f7b574f31ec466e04b68dc426299cc4bddcd557bd9f974ade02aea23748d82d9008c6e6cb2959367a22aebd2d86fe
+EBUILD pyblake2-1.1.0.ebuild 748 BLAKE2B 045460299681dcf8f1ab3e669a400f8fd26bc5c4590d8370075d4e67e506eef3d69452b0380ecb78c13ad569ea187756a6ce0fe5f61569bf2eb4629a3dcaf82c SHA512 b01597bdb86068691b3ea4a878ed5581645ae84c100d90b32979c40e8fa3d55af7f4521668c63574a424579759666e265ca415aca414c035abfa1c983e607889
 MISC metadata.xml 452 BLAKE2B b5539d95846469f07dc0ec47d4c34f4ae7fa950c58d728f5ba92efb3f74d849598af1eeb7c3d3ab90a41591746e94b3d4c3ea5330c423fb340cbec4a1da28e80 SHA512 28acd5472435f8832eb8cb7587e651f428309e9a37c17cad378fe8f01c47896115c4d42ace1c6125eb99ddd30de562d42503b6dac42432b55b37775cdde7c1ff
diff --git a/dev-python/pyblake2/pyblake2-1.1.0.ebuild b/dev-python/pyblake2/pyblake2-1.1.0.ebuild
index 82867beb0ce8..7a1eb73024a3 100644
--- a/dev-python/pyblake2/pyblake2-1.1.0.ebuild
+++ b/dev-python/pyblake2/pyblake2-1.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 # pyblake2 itself allows more licenses but blake2 allows the following three
 LICENSE="|| ( CC0-1.0 openssl Apache-2.0 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 python_test() {
 	"${EPYTHON}" test/test.py || die "Tests fail with ${EPYTHON}"
diff --git a/dev-python/pycups/Manifest b/dev-python/pycups/Manifest
index 330472dfe399..bce3142d31b2 100644
--- a/dev-python/pycups/Manifest
+++ b/dev-python/pycups/Manifest
@@ -1,6 +1,6 @@
 DIST pycups-1.9.72.tar.bz2 52687 SHA256 7f635cb95149e2fab6693ee0261a4491f3f9521549652a9fdcc9654978037ca7 SHA512 db8b06378bf398073e34c89d62aa64cc8e56e93553346484c2e5dd67d046a3aa2f44020b68a7d479203fb2eeba005f8860ad4cebf72f8d7aa9aa15952a36d816 WHIRLPOOL 03b2f6d12e366961745234e9105337d18e543c31b5f80eb77641dbf01e9d1ca60e988a4ad793dccbee39daca725afe32ff9c1a265eec0773a5275add8a47b104
 DIST pycups-1.9.73.tar.bz2 52732 SHA256 c381be011889ca6f728598578c89c8ac9f7ab1e95b614474df9f2fa831ae5335 SHA512 ee893d64f1645b71805ac358c4a3cc594f6285f04272ff0558aa60cbc90fafdbac30b623ffcc3a6b739218d9fd7a6a6e1d8cb186a5582f2cc30a518ed4dde810 WHIRLPOOL e19ccc7ab6a2e8f9364b5428eeddf365e9e6d34c2b94ae767543f5f3f81de3f6ac539ea6ba58c13cf34f639e7ba9a0ba04c53c7e030647c63085090ae185b3ca
 EBUILD pycups-1.9.72.ebuild 1264 BLAKE2B 68ac947a52b8cbca7efb111469b44572445ffd5941bc236c634d67efc8308396cedf0f6b294c76a9ff6f1714642478fc2e0e8fdf6c736a15d9ffa6494be91215 SHA512 d3e58b4896c44361a5bc5b9138c68e8ffc7aacf70b98f75e2c4b8423daafe433cfe4a3ba48c68691cffbcffc1497cabcc5243d02a2041dfb4c48c7365956e9a0
-EBUILD pycups-1.9.73-r1.ebuild 1427 BLAKE2B da396d62615d31802d59793c4adb4f07a9caadce0893e39477bbfb7fbbe47947f3694e8710810a5b72f76ba95557a71093879f0b6deee00fb16731a0c49719e7 SHA512 4d3fd1fc31dbd7572f6b00d764d39bb6357a007f05436dcf4e9829bee3179e5e0779a6bf72d6da9e820ae0f32fab3e1e83fd24115bbfbd44638c138a4674f47e
+EBUILD pycups-1.9.73-r1.ebuild 1426 BLAKE2B 0b1374dae5348ecad4e6df71e2b09d28ce4da1a8225e5e728c4f9b08a0151238b518592cc961ba73076c3c4029398b0a5959d9e91e1a29c468ddbc06c9599410 SHA512 b65b4ce8a110d1f803f7413c95b9aadb07d5081c765c1dacc84d314c10730220cb01de3beffbc53aedf30f7cef44b44377f2a5b15d3152960a8bf09496a5d73c
 EBUILD pycups-1.9.73.ebuild 1336 BLAKE2B 76079e9ec2f11d4525ae709b40a92514bf932f0ab209041b282be9573effcd173c51a6dd3ac1bcbb8c046b3cb19684bbc7773f4f82a88ef83ee46b963ed1195b SHA512 7a32df04d155db38401f6dcd8ba6041f8c33c85b7a81da58620def7f18e6b36053bdc79f3400192eac82766cc4aedfb5ed957a8a4ca17b6da97b9c84743cc86a
 MISC metadata.xml 456 BLAKE2B ea7d7af9ed2baa3cb5270b3da9c5e1c6dc64d1391e0b280ddd1a6e3e8f3317808eb3906e1c9551615ac2218b89685b9ccbfb4d4656e80eeb54cf2d8dec2149c7 SHA512 c8318d150b07e8a369037201bcb9a99a7bc8c406a2a2889f4a1af62166313d4db740e8546f78f0de1e80cddf774f8818e49a4d3e99e906456ffc2f46a562e7ea
diff --git a/dev-python/pycups/pycups-1.9.73-r1.ebuild b/dev-python/pycups/pycups-1.9.73-r1.ebuild
index 6822b5b92eee..fa90b1628f32 100644
--- a/dev-python/pycups/pycups-1.9.73-r1.ebuild
+++ b/dev-python/pycups/pycups-1.9.73-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://cyberelk.net/tim/data/pycups/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86"
 SLOT="0"
 IUSE="doc examples"
 
diff --git a/dev-python/pyinotify/Manifest b/dev-python/pyinotify/Manifest
index 0552f19d3687..b632c17c31c5 100644
--- a/dev-python/pyinotify/Manifest
+++ b/dev-python/pyinotify/Manifest
@@ -1,5 +1,5 @@
 DIST pyinotify-0.9.4.tar.gz 59604 BLAKE2B 1e4674042cd55fdcdcc36bce33c53db4ea91577077be3af6d69a959e3fa3de630ee7ec00c9a3f8caf3c008afa6249cd3057598adf99d5c6caa83064b2f42199d SHA512 cdaf9f239a43e3889cdca0ebe1e3559bf6411e4cd829120cc2199cb91122bfe4af62f61a9bf297de28036716f974abd4d7bbeb210e22e96245781fbad08a2b75
 DIST pyinotify-0.9.6.tar.gz 60998 SHA256 9c998a5d7606ca835065cdabc013ae6c66eb9ea76a00a1e3bc6e0cfe2b4f71f4 SHA512 b52de43293b06b32236e90b7c33fac061f3095cd7d4aecec89a099d56020db1a85440ab9dcc8b521238c001fc49a1f37d1b16d621bc1acab4d7273aebcaadbc5 WHIRLPOOL 19e5c96528e3092d9a0e08e4853afc1765afcb0b286875e9583c703dda066c8372def076416158a740b248ade21b14314464232bdc70f210f306f3d3ca5c4a7f
 EBUILD pyinotify-0.9.4-r1.ebuild 688 BLAKE2B 500836670d33d73af939f342ac3b30fa0552bfeb102c9d7908f3b50f060929fdd5afe826dc03ced8b13dfccb4bc68af4077965b7a778a11c71e40d36e3690bdb SHA512 000640c3eec6e793aaf07be397dff70db879dd3940abaf3bca24cd3fc8f47d0b7f26e597984a76be775bda8372855bcdf2e23ce524bb40290b86960f393a55cb
-EBUILD pyinotify-0.9.6.ebuild 771 BLAKE2B 1ff5b0d9147f13eb4edff00dd8ab7383e6e0c686a8e2ade0978a2bd83d576ed85b4e48102eb4eb758cd88da866fa03bdb1efe7798d5b304ccab50b6b1a26f12f SHA512 13f42994592a41753597223db7975d693d512bfbad71eb04b540d2a05b712fc3e75d0f8775362670d87552273ebe1e42ed3a54c7423373a88d79bf3a07448f9c
+EBUILD pyinotify-0.9.6.ebuild 778 BLAKE2B 58518f24d74b39c52d2d7f71f553851dc5afbc6dfe109b3470d2acd3f4b2560431bed9ef17a1c967c54fce66d625041e942397129ecdafd277b2e9917744df7b SHA512 8aebffc1c5fcb814a5f12a2ad4791f25b38204b61b29ae8b679ef53dc7cd751acfbcb360d762e2ecaa957d5c62558054ebc725ba5ffd60b31f6880d20dd7719c
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/pyinotify/pyinotify-0.9.6.ebuild b/dev-python/pyinotify/pyinotify-0.9.6.ebuild
index bf3d28daddf9..a9ba5de1c1c8 100644
--- a/dev-python/pyinotify/pyinotify-0.9.6.ebuild
+++ b/dev-python/pyinotify/pyinotify-0.9.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://seb.dbzteam.org/pub/pyinotify/releases/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 hppa ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pylint/Manifest b/dev-python/pylint/Manifest
index 47aea8f7a8b2..dcab6d0d51da 100644
--- a/dev-python/pylint/Manifest
+++ b/dev-python/pylint/Manifest
@@ -5,7 +5,7 @@ DIST pylint-1.7.1.tar.gz 489108 SHA256 8b4a7ab6cf5062e40e2763c0b4a596020abada1d7
 DIST pylint-1.7.2.tar.gz 488628 SHA256 ea6afb93a9ed810cf52ff3838eb3a15e2bf6a81b80de0eaede1ce442caa5ca69 SHA512 268f141f017fa4df6024596bcf1dfb32a578e9459864e2ace8c2725c8f5e117e0b01d9d745f1632bb43102a01f7075dc3fb69b839b79371f7df47740a56fc1cb WHIRLPOOL afe7fea97b32669012d85bf3797a8fb93b93c42f41ebd244c8c783245c5b3674fcbbb9ce43eff2110e74ad4d87f92bbf7877dbd7fd471b4b16595536efe5254c
 EBUILD pylint-1.4.4.ebuild 1756 BLAKE2B 21ac6472c49de347165dfd75e9f950ac4e0ab82497253bde66c0efc248e4e4bb2e8df26e438fe2999ecd19e96eedf6f7681754ef8bee0e91d3cabb27a5c9e9c0 SHA512 1fb393fb79a0a38a121a0fa7949fcfc44fe9e41a9cbb49829f000d680d2d42a583d5b7385afb809fea7c42b7eee79168531b52e02e87095e04b735b26f2918a0
 EBUILD pylint-1.5.6.ebuild 1671 BLAKE2B 2d216c6d5e454280d9537a5aaf3296333a3cba446190a1742f07dc265aa756d3c7ca6511b55cf1d48da0caf7d67c0e9b89a2e0063d674342b5c55d62b41a6d26 SHA512 834efffc0438edd33dd05ce00ff34b7c92f3b3296b4fbf1709b87e622bcd6e7908d04fcbc731d70c92b9c1c30e09305fa62511ee85b1e876584740b4b21434d6
-EBUILD pylint-1.6.5-r1.ebuild 1809 BLAKE2B e0aa4cdd7ccbcbabf1551a19aaf45587ad2f819bcd825fe376f108b1e0219e3ac3bf14eac69999a96fd57855844fd8dc00c4f56a967c25602f6c212231ec067c SHA512 c44d885cf295353c2c0f3af8219d32caed5bdaf227b404066e32c4889dbcae02c946979d9455fc8486241b1bb2c405afb28e8c9476dc728ade14381e7fad6c67
+EBUILD pylint-1.6.5-r1.ebuild 1808 BLAKE2B a1db2fcb6e86958263388212da4e34773d91e9de7de8eea08dfeb63d932f9626e809990782084c98cc52869a85ab7375ccfcf8cd44318e892bc3f8468a2b3ae3 SHA512 30c46db64c4bb9b9d5998812a4ed6141806f3f65bb9db6337dec2b8a8bb2370c683ca63bfc61b6024bf382daeab1f04c780285b58bd530037c92b22bb38e9119
 EBUILD pylint-1.6.5.ebuild 1720 BLAKE2B c6c27066f1fe15e279539929b102f689ccd863cf18b13ccbf83dad02705aec3fed0311bf995986ca62da2ebe3e880c531e53d342b1e62c038b37c9d1b77a412e SHA512 30b539c069ded628fcceec28fc83969109b02ec8c4619c03fd0bb44176cfb184b7055d4b0fbac3f0bcbe6fa3fccf4f3f3eb5694d77b31b823f0502a959bbc775
 EBUILD pylint-1.7.1-r1.ebuild 1822 BLAKE2B 3cea5b3d56abd739b0cf26c29e3bc919a8622fbc5460fc71b93886d09c689356ffca9d17bae7f5d89e5e6d906b8f5eb09fc0b8d7f8ce3c60661d6f28ca6da2d0 SHA512 d5bc3bed59b7566bdbe499608240f4f429f9d08a4ff053c85000e2f7f3ef4d616ebf9a169784a03abbe8128c849fad3e3e34566401711706d6aeb9e43cc08356
 EBUILD pylint-1.7.2.ebuild 1840 BLAKE2B bd68f993a6ea3b622b3739cc7fbc86e5a03e583ef945dc78fd1c4b18e3a35f0eec45fe4b67cbcc526e2d9ed0fcd0c255dd0c34f2473106a94d85261e082763b6 SHA512 2638f2d63f7ae074e313707f7c26938468524a057c7c4c36996b8e062d790ef4ac35299b49a6701dcf42ad6aeb0a3760e0cdda32bcf2a42c1bd41cd9e6454f8b
diff --git a/dev-python/pylint/pylint-1.6.5-r1.ebuild b/dev-python/pylint/pylint-1.6.5-r1.ebuild
index e0d2cfacbd79..7d05bfab47d4 100644
--- a/dev-python/pylint/pylint-1.6.5-r1.ebuild
+++ b/dev-python/pylint/pylint-1.6.5-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
 IUSE="doc examples test"
 
 RDEPEND="
diff --git a/dev-python/pyopenssl/Manifest b/dev-python/pyopenssl/Manifest
index f8e6ab17b0b8..f529dbe5b623 100644
--- a/dev-python/pyopenssl/Manifest
+++ b/dev-python/pyopenssl/Manifest
@@ -6,9 +6,11 @@ DIST pyOpenSSL-16.2.0.tar.gz 167305 SHA256 7779a3bbb74e79db234af6a08775568c6769b
 DIST pyOpenSSL-17.0.0.tar.gz 167121 SHA256 48abfe9d2bb8eb8d8947c8452b0223b7b1be2383b332f3b4f248fe59ef0bafdd SHA512 819be95f920a70b40ae48ed6740bd1d8cd3bf2fc080f682db8978946929994cb87ac467e220267dcdafc40aa7ed2cce51a334a49b06c1e2665d295157181ddad WHIRLPOOL 8256ad13d35d7c7d1678bd6c35140e13a1f601f149bc38633b3f04eaec7e302853abcb5df857a04fd04dc8ac3feeb35d4247dc979cee0969dafc538ec9b70d5c
 DIST pyOpenSSL-17.2.0.tar.gz 170816 SHA256 5d617ce36b07c51f330aa63b83bf7f25c40a0e95958876d54d1982f8c91b4834 SHA512 aef1628665353445760a0c869c5b88ba1f61a3ade7471bfd1ad9e57672573501574dab5a2491aaac1dc283893fcac1a81dd9b972f43d53fe7ef1aa48e3f0e88a WHIRLPOOL aab3617e825237032efa44d5b89603bcd6b33095f76bb04b53140138066d9c6e96b64bb6def4425b3cf3aa279691142c66bf5c6b9a89ef5e5c64eb83459dc5a9
 DIST pyOpenSSL-17.3.0.tar.gz 168119 SHA256 29630b9064a82e04d8242ea01d7c93d70ec320f5e3ed48e95fcabc6b1d0f6c76 SHA512 2b58a652b8d6e2adadbc620a6b3411cd44169940ef1839fd3365cd343ebe1e630ddbb580d8d4dc79e738e0b4f91db0bdbbaecf18aea74204499c737eebb3fae8 WHIRLPOOL 154cb8beedd57c24aced9c0a37b2395a9c25a0696b803c70d40bc4df98802587e73602c7c74aebd03c60dd54849c293eede1366c0b2f5ccb0967331235754bc0
+DIST pyOpenSSL-17.4.0.tar.gz 169362 BLAKE2B 87a51efaa157b4a91a48edfcd9348402b6734e1c9f78e7ed638e3d245ae3922083c625e3d967e7513c588e131f96b06f110ae528cccbbb820f685afb9dda72ef SHA512 c3c791b15f2245d3c1381f84471f9e1b07b4a01c318a5a4012ec70193ba055fe948ba150f9c88d2dabe30b37f2025fe26ffb95c01682ca656d561014d41cf965
 EBUILD pyopenssl-0.15.1-r1.ebuild 1416 BLAKE2B 907829d0c84e39a0791b77251c93a834d50b63795c7ffe33a9fa654e98d34d137f92aed2662e91b5a28b48bcd1816aa9753504dd9a34e1c7ba13ba745e46a09a SHA512 1f86106bd544bc70483c805ac7a20e17f09237d866d36101c627426052e69bc6e5beb92712b7bc6d1eecfb1cca84e782ed7a6f8dcba07f1138a1c6acb1509436
 EBUILD pyopenssl-16.2.0.ebuild 1596 BLAKE2B 2fddd33669aa0bec3680851737fef5be19fdfef10dce644afe2b3e07c8e1bf452263555fb4dd6e21759e7416fabdf7e470bd3a8c7a255d96feb10401d3f52bc0 SHA512 f91345bef67ef4d002828b6db8cfdde9ea1bd2e502672e2c29be7cedb814127a0d7f08ac0ab1c601b7056a406020bc3569c5a6b163fd3b13d92b6290afeccc2b
 EBUILD pyopenssl-17.0.0.ebuild 1606 BLAKE2B 170a0d141beab15e063bf6137e7ffb052265676e9ab9134748f9cd608a1af8c1c30354e0b9f29ccb576a7449ba7f96bde4900b93a220ef04d7e9c31110e152bb SHA512 e8f73d81532e7ccecbd96f6958ed65ebae636efc703bb02543ed27e136f6a48b086b5e3a230685d1ea8a7b19ddbd29340b53e908b9eb8756644645a0fef2fb5f
-EBUILD pyopenssl-17.2.0.ebuild 1587 BLAKE2B d28d499f3079a94d8362bf90a97d7e3ebc1adfd0bfa586adfcdc0f170bb5b8aeea05b7f0a6b5cd46741f4674befaf64a36204db3ae2c8e0b95e7c513a5dac8d8 SHA512 83f26644e5f8010cd148ca721575fc791b7818bda57db5c8e2138ee8cd734f47d97a7f2db9a61ddb6f0eceb81ea1435ad2a04dae3ce0e5c03fdbece785aea9d0
-EBUILD pyopenssl-17.3.0.ebuild 1596 BLAKE2B 7b0b308213478532b39893db7f45e78231942331fc9cfa07bb5473e19b28cdb82fbe6461ae96c0fed623ca57ac3c01933f09f18ff10aac68929e70f3a1089684 SHA512 8c78ae11c0c3855a95d4e49fb0d207baeb17671512a77a2d95ed321eff15da62008a0ec9b1a9dc49d810538fff8fe0592de4466bee49b93455d1be4302d22f94
+EBUILD pyopenssl-17.2.0.ebuild 1572 BLAKE2B 7275d0930b1816d76ad8afa99384eb50b8d68d705e6b5a5dfed999a592a92840e8140eee12447eba6637f169610b4d0a2ffd2069c04e3dc8da62a971b5afbf76 SHA512 ffe07c7353cdc75044cd5460cca76ecc7a73dfc4c4b942cbbd409612f61e58e05e2089b7ba9b02176e7db33479a849740320c8bdae0104a630aca59807322f80
+EBUILD pyopenssl-17.3.0.ebuild 1581 BLAKE2B c47967dd1ed4946e54f04e71a81b153519d6fe00374102c6ccd8b1e26704282028da7f262f8456496b271d777503adfb2fbd5dfc6eae6357860dd41453a23155 SHA512 11704f1b6207285e3fb3b58ac3d8591b96093eb3a669631d057f9fe5d2322a681efa46129f5c10ce0be20ad614fc758f5dbf80f86407c8bc0f5ab2429e0d7733
+EBUILD pyopenssl-17.4.0.ebuild 1581 BLAKE2B c47967dd1ed4946e54f04e71a81b153519d6fe00374102c6ccd8b1e26704282028da7f262f8456496b271d777503adfb2fbd5dfc6eae6357860dd41453a23155 SHA512 11704f1b6207285e3fb3b58ac3d8591b96093eb3a669631d057f9fe5d2322a681efa46129f5c10ce0be20ad614fc758f5dbf80f86407c8bc0f5ab2429e0d7733
 MISC metadata.xml 418 BLAKE2B 69f135bab3b0cffa47cc8e807e1f537f7fa0bd599bf3309ab92ddf41f894c21ab0e3f793ea4caa65d272043d2dc0352fc54c7160b31fccabbeb165775a895d97 SHA512 5cd4b0381e79245626500a2a38b9f7bedcc8e4742445ac16f12a96133f1291ec49592f2259294f153d5f1b27969cd6f7f364d49f32d0793b12b2ad38b824f441
diff --git a/dev-python/pyopenssl/pyopenssl-17.2.0.ebuild b/dev-python/pyopenssl/pyopenssl-17.2.0.ebuild
index e417175b253b..16630e5d7b90 100644
--- a/dev-python/pyopenssl/pyopenssl-17.2.0.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-17.2.0.ebuild
@@ -51,8 +51,7 @@ python_compile_all() {
 }
 
 python_test() {
-	# FIXME: for some reason, no-ops on PyPy
-	py.test -v || die "Testing failed with ${EPYTHON}"
+	TZ=UTC py.test -v || die "Testing failed with ${EPYTHON}" # Fixes bug #627530
 }
 
 python_install_all() {
diff --git a/dev-python/pyopenssl/pyopenssl-17.3.0.ebuild b/dev-python/pyopenssl/pyopenssl-17.3.0.ebuild
index d873a6b97ce3..bd636d9c7a75 100644
--- a/dev-python/pyopenssl/pyopenssl-17.3.0.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-17.3.0.ebuild
@@ -51,8 +51,7 @@ python_compile_all() {
 }
 
 python_test() {
-	# FIXME: for some reason, no-ops on PyPy
-	py.test -v || die "Testing failed with ${EPYTHON}"
+	TZ=UTC py.test -v || die "Testing failed with ${EPYTHON}" # Fixes bug #627530
 }
 
 python_install_all() {
diff --git a/dev-python/pyopenssl/pyopenssl-17.4.0.ebuild b/dev-python/pyopenssl/pyopenssl-17.4.0.ebuild
new file mode 100644
index 000000000000..bd636d9c7a75
--- /dev/null
+++ b/dev-python/pyopenssl/pyopenssl-17.4.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 flag-o-matic
+
+MY_PN=pyOpenSSL
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Python interface to the OpenSSL library"
+HOMEPAGE="
+	http://pyopenssl.sourceforge.net/
+	https://launchpad.net/pyopenssl
+	https://pypi.python.org/pypi/pyOpenSSL
+"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="doc examples test"
+
+RDEPEND="
+	>=dev-python/six-1.5.2[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.9[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)
+	test? (
+		virtual/python-cffi[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/pretend[${PYTHON_USEDEP}]
+		>=dev-python/pytest-3.0.1[${PYTHON_USEDEP}] )"
+
+S=${WORKDIR}/${MY_P}
+
+python_prepare_all() {
+	# Requires network access
+	sed -i -e 's/test_set_default_verify_paths/_&/' tests/test_ssl.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	TZ=UTC py.test -v || die "Testing failed with ${EPYTHON}" # Fixes bug #627530
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+	if use examples ; then
+		docinto examples
+		dodoc -r examples/*
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyro/Manifest b/dev-python/pyro/Manifest
index b139dd346c09..24df81ab6f54 100644
--- a/dev-python/pyro/Manifest
+++ b/dev-python/pyro/Manifest
@@ -3,5 +3,5 @@ DIST Pyro4-4.41.tar.gz 502294 SHA256 3af4749140e9d4032632277ac19e7fd4761856d2df0
 DIST Pyro4-4.56.tar.gz 455253 SHA256 a80c27e1debbd8d8725ee4a8f0d30cf831dde5e80b04bfa9c912932c4c13d6aa SHA512 88805f5d7108432f98d38267a7a881e35fc1e34ae32cc7a1640f4b6e0d69718a86bf195fb4e4eecbd53075667521585b7006cd5c5736e5ff1ed39b5212b91bef WHIRLPOOL 0e82a13c2bf5e23c5fcbf844417888fd2e02270a12d465c6388397c913bbb06ebdc770d3744593d66b9b30ffc30aeda03a50dd934db38840ba1baeeb80961ff7
 EBUILD pyro-3.16-r1.ebuild 742 BLAKE2B d17dc38fda6791964780cbafdf563e6c57a17cece50be875cf1458f4683ef69c2589784a71257ed78d6e149bfeb3c78ff6db09d3fcf88806b8505f697c338985 SHA512 5bde2f3ac26eeb775f29a368f1ff5dcb19d12a82a6f627041aba861bc20125c64c0fb483a9e5c158ac7f6b3544eae029a77961aac5a3c00b13f0c23aa89e80dd
 EBUILD pyro-4.41.ebuild 1915 BLAKE2B ba21ddef6f94dbf5b10460e734302c96e2fbab47a7fbacd1bc270ff2fb31ab364b513576f8b0a771888abb9ddfd7c89805d661ad1cab1b1a6db72f458ff4e297 SHA512 92ca5686041d64ec368ec7f8d31b6560f04c55d4f2ccc8e1f462469e1c44fb8a0850b9c7f33af29c67740da03687a59153933548bfc4cf5c116b789ea0b19a9d
-EBUILD pyro-4.56.ebuild 1917 BLAKE2B 2d03c129bdd5005866969387d39adf1b5e26c575142850d2a9a30247d77ae6e73f4a0f8644a6b10ef43b6043831321f50179454a5371ba017b35ee08d432ad13 SHA512 c4c2e325879f0b3fa77d191f34cf2f16a63517f7141f60078c8747f36473d2a1345d7cf73bba3f12a32d44eb9052d78ff95ff432e43567c938b13349a935d337
+EBUILD pyro-4.56.ebuild 1916 BLAKE2B e7497ccf2248c3ce733c817886cb9baadaca67a4957db733108df817dcb7f56bb8f29b883b5eb88e98d745cf38d44cd48d7141659c2a7c0ff1a4eac4a45ffa56 SHA512 906cfbbe2f4524a5ec626dd4d6dc8d7cbb902862a19d1599b82da1a420dc20f0326c4779ffc5e92b8deafd2e3e04450cc42f473717a88c6bec4255fdc16d967a
 MISC metadata.xml 370 BLAKE2B bf0ecf2b63d7e544a1193349f0d171d107d23e66a067012cdd0ecbc4b736631e3c78fabc0745e88efe711219e8c3ce187da3ac67f4477f8bcf4996546a56a94d SHA512 59ce12c791648049dcaac68c75f9d8af472635442b25c4ba81b37e89d913b5b1954dbc40eac44694e5093008cbc41256ef2a177de1906598bb876ab0ab17d544
diff --git a/dev-python/pyro/pyro-4.56.ebuild b/dev-python/pyro/pyro-4.56.ebuild
index 60026395443a..20fa5b7ebec2 100644
--- a/dev-python/pyro/pyro-4.56.ebuild
+++ b/dev-python/pyro/pyro-4.56.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="4"
-KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc x86"
 IUSE="doc examples test"
 
 RDEPEND="
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index f2f5bde87fbe..4a0fb88c933b 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -1,7 +1,5 @@
-DIST pytest-2.7.2.tar.gz 532836 BLAKE2B abdb179ca82078ecf081055484d7fc1f1d63f7f3ce58b19ed27e10da25e163a24ad89e4afe8b7e5af0d5fa14ace6eb18c6dbe302845fb6bbf0a545a443fc7847 SHA512 5474a4fe58437a4971fb21b1b37dad3c08e18e5d154931ff23e597f881100a3515bf0cf71d06b143465594ad2a91a96f84f4836d84c39691143c8d88ca7a4360
 DIST pytest-3.0.3.tar.gz 731934 BLAKE2B 7fb57d75bd54eb8a31d9701fdf739119715c475eaaacae3cd038057c1d2bf43fa86ccdc45b3c84962708ef606976ab39ad41e0c3690c8b5f4c04d870579a384e SHA512 ec0b4a5f0d6673a339c5a70b402c004c23db7001005454329eeaea15d890f53b8f2740f6c6254499d0f915b9058bfdfa535d9f22847bb382a060d65204fce4af
 DIST pytest-3.2.2.tar.gz 786396 BLAKE2B e669da930890e902b0323ec3a6685080ddd889e74655f7b4cb08ec421651f987597021a31471aab5a32d637b99620ce7792cbdf8f85561db3bb10ff06a446ba1 SHA512 6df3a50e7d1efeaf7a283920b16d1daf800798f422bc851b0aacd2bbd5cb0a88c95f9057fae49943b9dfe6527ed552cdf8d983b944ab91d0af252ee4f6eb82db
-EBUILD pytest-2.7.2.ebuild 1889 BLAKE2B bb4200ec7f71244afe1ad7fa37d2672ddc4533de2b208f86edd4f1ee26c59586fd6ed642771a7e10afa72d06d45006bb334f67bd3473a6eaaaa31732021b7140 SHA512 696c2aeb44dea0987c1732331bbb90703aee1b3b4a918ca198e1f68e0d7dfa509bdefc26bb80df8b0af2f2412126eef2db96e3d63701552a261cfc367a064c4c
 EBUILD pytest-3.0.3.ebuild 1962 BLAKE2B aa795a89cae68897eb2ebecb511240a456cb14c2c09aa05f28483af496cec60c5a0383909336c0e3da1ee05ab1c34a1e3ea261539bc0499f9026d04942ad9a66 SHA512 daf2483c38abd8fa13fcd1a86d8e5f6c1e9ecf8b551fb12a1f2a45cb77cd2a8c9c820cf42f964e31ab03c9ef8a0f59dff332ea84000b9c35f4dcfc7f86165d64
 EBUILD pytest-3.2.2.ebuild 2091 BLAKE2B 75f73763ecd35f76eebbbe3a6bbdd1fe61161bc65ac8db6d8aa19ba47ebdea8cd81907b100152d83da16353787ce83df573e016435f2980dcca652fde186b59e SHA512 2cf8176362bfacec42cfa581ef1036951c2b45eb4eb77f8a68f227aa3914a71c14a8e80a9d1f1f19f9d00afc3227322dee1e2c9970a82de435d1516555f0183b
 MISC metadata.xml 309 BLAKE2B f29391c5f96f44f6329d3665346a5d46ecb4a86d103ae8008769af86126756e76bfa89cfe462e9c219e5f70b64013f662d020c7a2f6015d8cadd0eb25a7614eb SHA512 ba53c13ac716488e3e5dadf5dcfcb697dc9bb13f89e9d0fb98b9a5a6e36cafeeb64d1348008f42497117bf46fb6f3bc288c10a68c4d5ab53c9c02a3ae61b594f
diff --git a/dev-python/pytest/pytest-2.7.2.ebuild b/dev-python/pytest/pytest-2.7.2.ebuild
deleted file mode 100644
index ce6683f5f930..000000000000
--- a/dev-python/pytest/pytest-2.7.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple powerful testing with Python"
-HOMEPAGE="http://pytest.org/ https://pypi.python.org/pypi/pytest"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc test"
-
-# When bumping, please check setup.py for the proper py version
-PY_VER="1.4.29"
-RDEPEND=">=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]"
-
-#pexpect dep based on https://bitbucket.org/hpk42/pytest/issue/386/tests-fail-with-pexpect-30
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (	dev-python/pexpect[${PYTHON_USEDEP}] )
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	# Disable versioning of py.test script to avoid collision with
-	# versioning performed by the eclass.
-	sed -e "s/return points/return {'py.test': target}/" -i setup.py || die "sed failed"
-	grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency"
-
-	# Prevent un-needed d'loading
-	sed -e "s/'sphinx.ext.intersphinx', //" -i doc/en/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		mkdir doc/en/.build || die
-		emake -C doc/en html
-	fi
-}
-
-python_test() {
-	# test_nose.py not written to suit py3.2 in pypy3
-	if [[ "${EPYTHON}" == pypy3 ]]; then
-		"${PYTHON}" "${BUILD_DIR}"/lib/pytest.py \
-			--ignore=testing/test_nose.py \
-			|| die "tests failed with ${EPYTHON}"
-	else
-		"${PYTHON}" "${BUILD_DIR}"/lib/pytest.py \
-			|| die "tests failed with ${EPYTHON}"
-	fi
-}
-
-python_install_all() {
-	use doc && dohtml -r doc/en/_build/html/
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-editor/Manifest b/dev-python/python-editor/Manifest
index 7a53ac6451d9..bca2f0d2bd4f 100644
--- a/dev-python/python-editor/Manifest
+++ b/dev-python/python-editor/Manifest
@@ -1,5 +1,5 @@
 DIST python-editor-0.4.tar.gz 6516 SHA256 4421a7116bf3af957266f225bc79ad25b92839cc7974c8335bba5a6582edd3bf SHA512 f1fd4660e67e8299a6f9183e85a1e213e1156542d84eae6644e4f42e5e2804f813857ee50bd8833728b320415ee6f2be5df4ca69acb10a709f20d2306eb5e7ad WHIRLPOOL 2c68e5749bf7955315888a3bed45d3f3b68ef575804342e1391269a9f6f05ddce43242dc988dd29e805f9c165e06731b857238bdebd94e2e5c1f2f7181da24d9
 DIST python-editor-1.0.3.tar.gz 6975 SHA256 a3c066acee22a1c94f63938341d4fb374e3fdd69366ed6603d7b24bed1efc565 SHA512 258d1ea17ea1c09d8ef52d3b624cc17710559f4a8db3c64696f72aecfcc0830d3509dcdcc9d1ac272155b2aaab432edb7142b0a37f2c3263a2505bff940a3cab WHIRLPOOL e0bddecfe9c818916b306aab9c4acaf4efa5c1b2e405b221203939d3c01ef5bcc3ed8c2109a45dedbbe447ebeff02c3d17fe23dc8e40698e5206b19dd3ee5337
 EBUILD python-editor-0.4.ebuild 514 BLAKE2B 0f72425b8debd774f375cfbc524d1ff25fb8b019774e7831b2b1fce8630720efb6cd64640814f86388667e81f9bbaf6139a770ccb1fe48e3bace7791b7eb3e37 SHA512 b2bd4956d1dbddcba3d4ee673488aa92a2023b297d2399d83ac92077819b487d79059fda255d6d70acb378424e049c36607aaf018fb61204e02664b265000fae
-EBUILD python-editor-1.0.3.ebuild 515 BLAKE2B e06ca5d1b9e3682c6d8d8d508405145a484bf7a336f58b86b240e1d543a6faa1e7e1813d9050dfa790728d14a05d5d3a9ce91c8debd043f3a2c118a41141cfbf SHA512 d234c0ce062b3eb29324cc21c8ab091e1bd3a9c70408c97d226dd20dac2d938072385fb917f61c984df811fe6a269d162f94433ed748ed9aa9ecaafc858e2e58
+EBUILD python-editor-1.0.3.ebuild 514 BLAKE2B 8d1a6574a3d1d1a334511c9ebda00ae0bbec3fa35dfdee1df1296577d3fea3ed0cdb2e5636bb684d69a033aeec6c6e9253a558ec0ace05aee4f1fb6dd43cf028 SHA512 f16ecc1e683f06461aeda9f26f6b20b4c160e6a73a35090ef25d89d298e2d8450a15cde8cc21cd9fbd07193ea36d06e1d24cd587a4896ad17d564607dc72a6a6
 MISC metadata.xml 454 BLAKE2B a005031053af09882cc6f9e0a928d371d118cb44207567094e570b65a7cbc69c210ae2cdf6487473ab7d12793126953ef9fdf1d2954d9c31b58a2e783b563378 SHA512 2a75117477ebfe097dc4791d65581ccfd010406eeb3d5145c237edcee0b3af409ccee45abd83b18798ace1196206343a94032058f53e20a708c30ddcebe6b432
diff --git a/dev-python/python-editor/python-editor-1.0.3.ebuild b/dev-python/python-editor/python-editor-1.0.3.ebuild
index 861c2a058204..69eee823a7fe 100644
--- a/dev-python/python-editor/python-editor-1.0.3.ebuild
+++ b/dev-python/python-editor/python-editor-1.0.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-heatclient/Manifest b/dev-python/python-heatclient/Manifest
index 5b6d462941c3..0af305b42681 100644
--- a/dev-python/python-heatclient/Manifest
+++ b/dev-python/python-heatclient/Manifest
@@ -1,5 +1,5 @@
 DIST python-heatclient-1.11.1.tar.gz 166963 SHA256 fa40709b7c7e13c4434dbf42db47dbab2980fbe4ae0066e03a5e3d488b364c28 SHA512 f4ffc4706a2630753c11423270ef18a344603ec6b1d5afc550fb8f3cfeca1bf4fbd0c32670318eded6b81a810fcdff68faf9039c6290c6a106bf8618502efe78 WHIRLPOOL 75fbf67bc46717ecd4208331eaf867d6fa1c8140bdac092339cbfa27e2720f75bffeba467939f2a45f8f9005cc7a325f88322b49771ec2ecbc360e1e1269728b
 DIST python-heatclient-1.8.2.tar.gz 165073 BLAKE2B 32f09850f2da3ae3235dd8a7f683529189db6a97712374bb2a387c87fe61a74b132d7b51c3fc77e0fffbfd6d8f2596ee097102f034d5fe029b8a08ceb0e31500 SHA512 38c27dff97c8bf9826e57c02fdd5edb4c0410ccc041b7b1f2e95aa16b22d46cfd9a8b728bbd371e1dee0664aa1f8e14b4eafc6bbaab92a038abbb821e3c8dd34
-EBUILD python-heatclient-1.11.1.ebuild 2668 BLAKE2B b6b2bd6c8e2e610b6d0c54ee4dbc7c9bc9583c9882e8afc1a76ad074a3d4bfdd0f49843a2e71f760253ad2f329f073df0ba2cf7aab8ac8c9f035f9abb99743de SHA512 bf32c34539da22786ea75ce625962356307ba5ce2017a54ec925c372949742cca78cd9c5adafac94b67acc548691687e5c5d6f622a90de4d00dbe631e166c916
+EBUILD python-heatclient-1.11.1.ebuild 2666 BLAKE2B bdcef0b5c887d66f4c24bee403a42f9b562e5c653804f814f3ec436de32d1898748a4ff4faab2108f130fb1f2f0b23ae0bdb47044cd59f28cdbeefeaed95d902 SHA512 d7b460fe6f96a467d1b9c9f699b68e173a1e8cd1dfaafb982eb3718ec9f0fccbf4c8fcea1883277f18af211f7e2f666a2d764c97082c5eda39b3301eaad16d44
 EBUILD python-heatclient-1.8.2.ebuild 2410 BLAKE2B 9c0c211d7e2fb0187a8f1f77c5aa1960c76a3254e470147714a9707960090608b6c740189b831d085621278e154a5e9cc30009a39381b2e7dd87306b85a6e0e2 SHA512 95f5ecea31d0160089447e68d624dca7b8ba4c7f0c669847c4dc046feefebc7fd5db9e235bcc3ffccdf36afbe90b11b2f30785663d95b7341d88181e4a998bed
 MISC metadata.xml 582 BLAKE2B 51e093bfad4008e3d662b8eb5d3714815f7ced2ce68867b2b4dddceff4cad927a60b84706dbb14a36609720e96259a744460a3cd82a068810e1de6173bcf7dc1 SHA512 b0af42a00c8e7e226f912a056edf53b3fdaf356457fd76edd34cb243d45e7f6427fac8bebd39e1aad57c0d16da8e222b3c6414fa9c5b85728294032afdf5804c
diff --git a/dev-python/python-heatclient/python-heatclient-1.11.1.ebuild b/dev-python/python-heatclient/python-heatclient-1.11.1.ebuild
index 34409536762d..fda6e1051e2b 100644
--- a/dev-python/python-heatclient/python-heatclient-1.11.1.ebuild
+++ b/dev-python/python-heatclient/python-heatclient-1.11.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-mistralclient/Manifest b/dev-python/python-mistralclient/Manifest
index 2bdd3f7013da..60409e8a67b7 100644
--- a/dev-python/python-mistralclient/Manifest
+++ b/dev-python/python-mistralclient/Manifest
@@ -1,5 +1,7 @@
-DIST python-mistralclient-3.0.2.tar.gz 78255 SHA256 65371935b8e884de349d30b62e2528655335230a5c6244fdeff02dc5bbac623f SHA512 3f2bcdf7723e3acba9c34947fb26c2ad3814b89ee43a26d3779f4ac7ae0845c4129c98d1a5b6deca2e2dcf77aec128639af4e8e650863cc19b7c03864bae7ab4 WHIRLPOOL 3a7c7c8b59a97453abf01a43a37f5e69c4b051505e778837e54bc60ab42fd2962517951d1e635a466eb935e1e766f787fad0a0017ecb4e7920c435f7778a9828
-DIST python-mistralclient-3.1.3.tar.gz 78743 SHA256 1fff20fe8f7f32e4e00adcd486d0d2548534ae17286256930705c66d5d460816 SHA512 d18c8ed486e83e91904a0bb0fe0cce21d4a603d383d309efa249f145cf89aff5b980828eb928d6cee92184e0444e49ac9e3aba0a3095ed9179c67cdbf82dd243 WHIRLPOOL 7e7190ec1bf11ddfa98916706691a1d31648eb4deb203e256714d425d5c5858757f1c3a5c13c40e442abcda1b6ead227ba58d8222455b952753cd041e1440836
+DIST python-mistralclient-3.0.2.tar.gz 78255 BLAKE2B 58d9fda6ac9b87493008ebc809ae128b2e71443af854b7719928134f9802b0da7877eab79ad96b60e47f222815b4c4476ff93f43af557e79dc88c2f714e0eb3a SHA512 3f2bcdf7723e3acba9c34947fb26c2ad3814b89ee43a26d3779f4ac7ae0845c4129c98d1a5b6deca2e2dcf77aec128639af4e8e650863cc19b7c03864bae7ab4
+DIST python-mistralclient-3.1.3.tar.gz 78743 BLAKE2B f219028c563fe219c0715174cb53abb482732c74712eb7e89b129a001cd46e4e166bf557faf7a7c06036df9bf5d1804cedda334793e41cc1c66133a411051ac1 SHA512 d18c8ed486e83e91904a0bb0fe0cce21d4a603d383d309efa249f145cf89aff5b980828eb928d6cee92184e0444e49ac9e3aba0a3095ed9179c67cdbf82dd243
+DIST python-mistralclient-3.1.4.tar.gz 77670 BLAKE2B 37184cf32606affb1e08381c1a6f4d47a68d0dfc3abf4276110c7c667b12f8dc57f859f47561ff3368ccf36e684d63570dc1a82325f62a0d8e8e59366c7ba9e0 SHA512 dc9d79e79bf0f1829b218db43deb715ab000eb2dcf6d8cebfec912acac3b111d4dee9101aae7868d631a87fabe6014048709585e6817071c73ee95a8cd7f6baa
 EBUILD python-mistralclient-3.0.2.ebuild 1176 BLAKE2B cebc424d3ac9810ceb3ad4385692829e7f64b9919e2a2a85b805794c5d9b9d008aaec97714ad107ff7ab27c4460145056578a8e0afed9179db4c93cea87f5756 SHA512 eee25284ab2e9e244149e45ffe9b6f1d91f5e3f4098e687cbdfca2e15fe4cfeba4e152943b525a29a4b76e822f57f411fd35acccdc6d88f42234ef5b6536d3ad
 EBUILD python-mistralclient-3.1.3.ebuild 1203 BLAKE2B 9dad4d40f01ab134417386f34fa64ce911f6955f83b47bace58210077b863bebc31129b8f438346d4807e41daf2e77a256d9c9b262014261094d009aa6a80a78 SHA512 3e69628018dc33bc83d8fcf20715812ec8d96d6b4e78d6e13eb8c95dbc081ffa78df6f4e2969965807b7b97b4ca1f91b8ac911b6189bbd9d2033818b44356c86
+EBUILD python-mistralclient-3.1.4.ebuild 1205 BLAKE2B e2cf623468ffdc8f22c41bb644368b346e5c5b2a5499fe6884889cdd6e4434e3f778ee75cd71dd734ff59596eeb2bbb21082d090f456f613e7daa84566720215 SHA512 262ae2d7a96201121f40a5f945292ed8286c267f397ed061f5c2d11139671fa83803a4c94a85f0bafaa5562df7893547fc6231e5d181467c805a80d6749583d1
 MISC metadata.xml 635 BLAKE2B 7d074b84873590ac98f48bfde93536bca796bf1544ee050a900f0e6dcaf9fc4f48e47dae31201e530cefe1cf58343d4bd13a07c0cb4314b05636c732e2ae47c1 SHA512 f3e92e2bb38afdbfc7605c5244d6f60b0c72843617197e7bdb08031d69ca283b544b88af340ce75382bf2135150f9314eaffbf1b0e45c16a9434e15c89131622
diff --git a/dev-python/python-mistralclient/python-mistralclient-3.1.4.ebuild b/dev-python/python-mistralclient/python-mistralclient-3.1.4.ebuild
new file mode 100644
index 000000000000..c1efe1be05ad
--- /dev/null
+++ b/dev-python/python-mistralclient/python-mistralclient-3.1.4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 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 client for the OpenStack Mistral API"
+HOMEPAGE="https://github.com/openstack/python-mistralclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/cliff-2.8.0[${PYTHON_USEDEP}]
+	>=dev-python/osc-lib-1.7.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-i18n-3.15.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	# built in...
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/python-zunclient/Manifest b/dev-python/python-zunclient/Manifest
index d3bf3520bfb4..04dae4145ca9 100644
--- a/dev-python/python-zunclient/Manifest
+++ b/dev-python/python-zunclient/Manifest
@@ -1,3 +1,5 @@
-DIST python-zunclient-0.4.0.tar.gz 81489 SHA256 e9c52c6160af6dd52478fbc4b0bed019df1c8130f4a6423afe6c82b5865abc46 SHA512 f8ba7ac60fe81c7d1deb7e5f758a7d7554c9f3578a4f84b4d38ff6b6514e846c18d0f92ef494e5257cab8eef981aef540440dfaa0c28348a8adec18c8c6007c4 WHIRLPOOL 84e4cbc6b4824da466aff6a685332b2db16aef4725e026d0d26da8c1eef482e056e7ff28893835e0b62a29ddc6e0112b73eacbaf0432cb985247208db2a5fa2f
+DIST python-zunclient-0.4.0.tar.gz 81489 BLAKE2B 20d2a22ac8b8319d8701c2a7021de28040b8e26e8d23351099025978a734799483b326015083d26a59312215d29330e10a1258b73d29bbefbeffc9bc5debedb0 SHA512 f8ba7ac60fe81c7d1deb7e5f758a7d7554c9f3578a4f84b4d38ff6b6514e846c18d0f92ef494e5257cab8eef981aef540440dfaa0c28348a8adec18c8c6007c4
+DIST python-zunclient-0.4.1.tar.gz 81441 BLAKE2B 9a8f1b21b9906d1b3e0cecf9525a6d5e8eae05aa8999a191625aac2701dc6997f53f2320f214e8e62b6be6357cc00945792ae7baf19b4be85499c5b1099259a2 SHA512 4e32f569d460fb1ef9eb0faef278b0842907103e6a56a951caec04b3b1544b093261db303d7f62b429c3dbfff7a97b9349b709e7cf62fbff9ca90ca9bb098ca1
 EBUILD python-zunclient-0.4.0.ebuild 1127 BLAKE2B a40ff93241c3329188a9f350f246691a86c815d5739d00b27259ba6a83646106d4dbf0843d363c627bd3ca5b9127ca78cc340e0b5870f18881382874f729c44f SHA512 03c17c9925ead1cce714de10f3db6b73c0100a639695f638e158a27ca7c4fb1de65678a9bb2821eb924abba68b46aabcfb96d42c3622887d1e5e3fa4a3673b82
+EBUILD python-zunclient-0.4.1.ebuild 1068 BLAKE2B 0a88e830c7010575b20f07545e9cdc19d26657d05ce9824e60791fb2afaecb63eadb7bd094fde14da7910401cbe0a2234989a9b9e171380acd81ef465729ad0a SHA512 340a5a7d377e86ca8488268434bd78ce6b1ac661367eefe11b470c284c46a2031e732fca04fd5f73d1248830d88c1b49dae6bcdf5b747e2aefd4e734ff36f84e
 MISC metadata.xml 333 BLAKE2B 1a681ac99aee289a919b530bb87037df6fe53b044ce14ce3a9da3cec54a73d7fde58cf01f12678f18397d16b56c9e5bf88d289ddec4469e343d7193502124124 SHA512 a73512d246562e6591eb9c8d13759352cede7f0ae978d02c87bd72b1fe2c9b155cc3908e8489b136387bada61f1257d8e0771e01e26d998b51f9ce13c087ec41
diff --git a/dev-python/python-zunclient/python-zunclient-0.4.1.ebuild b/dev-python/python-zunclient/python-zunclient-0.4.1.ebuild
new file mode 100644
index 000000000000..cf67595f79a1
--- /dev/null
+++ b/dev-python/python-zunclient/python-zunclient-0.4.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 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 client for the OpenStack Zun API"
+HOMEPAGE="https://github.com/openstack/python-zunclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/python-openstackclient-3.11.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.1.0[${PYTHON_USEDEP}]
+	>=dev-python/osc-lib-1.7.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-i18n-3.15.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
+	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
+	>=dev-python/docker-py-2.0.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/pythondialog/Manifest b/dev-python/pythondialog/Manifest
index 854c6af69db6..c2299519df27 100644
--- a/dev-python/pythondialog/Manifest
+++ b/dev-python/pythondialog/Manifest
@@ -4,6 +4,6 @@ DIST python3-pythondialog-3.2.2.tar.bz2 1412368 SHA256 bb104bd0512f9eda046b0cda5
 DIST python3-pythondialog-3.3.0.tar.bz2 1827891 SHA256 e4ace5b09d712992b7327249e375e49608127666679b2ca9fd48141e218ec998 SHA512 b651593f077f6679be030182ac5f14a02d8bad86206c2733ba8b655d346809a32ea391de91e35101d400c55d9e8ecefaf6f1ba25fec036246186e13530f43a1f WHIRLPOOL 267a2ee4215fd53d7faaf88a02ee544e88eafdd5b1f4c45c4ba535fe46dbed41a1ebae72b0dae00fedb30cfb1fcd245e0439077f538d128137e8c8caca6bba70
 EBUILD pythondialog-3.2.2.ebuild 887 BLAKE2B c4f781b01a4ab36b9dcca8f908c7227d481f25eb9cbe344874e9c605f30c879450a3c2e9153c04607f6730ffa9003bb8f9e76a61ca898721b1ac303ca721c342 SHA512 e08875187db07029da90bf2fdeadd4cfe2e351a290c2bb5ebcbc790340c9181951bc6e1a27329b039e714508370b67448c100639723ba55d1359e15c6f89a2d0
 EBUILD pythondialog-3.3.0-r200.ebuild 972 BLAKE2B 06e244c9a8e6ca2e73cc8e9ad1d1651cfa2d69c19896ab99342bc8bdd81acd2b41b4deef957dc35f1a994e351be750f1aa3eeb0be8adbaf3a5ede7efa13d146d SHA512 65068ffed61eb8415fbac853cc0dcac3ac414eee181188dc3b65525a72c745f69459c013023d1437b497a8475374e6ded8443f59095a2ef03dbaacf2279cfe04
-EBUILD pythondialog-3.3.0.ebuild 894 BLAKE2B 58acd42677fb91b5a45b8cf915f97afec4069e93bd1f99149373812608a845fec587d32ea34649efc67fa8e7e6848220b8b0314d6992970c3a4b1357049549fe SHA512 8c665063eb6c203fcb9918b17cf815166f5b84e948b821c226685dc408b8c4e61084619e3a554497f8dc175a456b5960d3943d24ff4d46d7254cb78e3952cc7a
+EBUILD pythondialog-3.3.0.ebuild 893 BLAKE2B ee783b2698e86dc24e504069dc15aa91bf64e53ef90c20298faef43c3c42d607a66f241c80e00cf1aa2f21ec515dcddecad536688e231cca7c7805ec04266882 SHA512 1087dbcc93a4a2b40ccc70a7774574ce143fea57c897fe81ed3a9083be62b8f5147a10c68c68dd0ad0689d9611b6bb665fe8e970f02b2cc7c15a34d883516d80
 EBUILD pythondialog-3.4.0.ebuild 1108 BLAKE2B d7f768cb5b2e3fd78479196cd724797f71ec6e06d53f3f0f65d071e9a4ff5716f06dfecc1c7db42a9c2b71daa4294f2cfbbb680c3997ceae92fce63b19647032 SHA512 a225ad37f1b5529deb4f7f1186ebb325694b9dd18b6e782fd90c487728cb38d11bdcceca28f8e9863db471a3e307221ea78a1919a6c813447ba1298357981fae
 MISC metadata.xml 380 BLAKE2B 184ae9fd2e4ea5b2591d87ad0f5ff4219bf853ed0a71ce7e027bcd9b53ae80c2141fb0674d8fdeb3527c368d75b8a8c84c2ff4bd6e136ad672d97277dda3eb13 SHA512 d806bf2a24b109013cc0dcebbb9bf17a21f0db4fab5a66ac16315c985178de28d0659647d4535123279b2b4ad36f7ee9a9ecf40d2cbb9bb06fbe054a5cfe21c3
diff --git a/dev-python/pythondialog/pythondialog-3.3.0.ebuild b/dev-python/pythondialog/pythondialog-3.3.0.ebuild
index 22abfc45710f..7c6d8ab69f1d 100644
--- a/dev-python/pythondialog/pythondialog-3.3.0.ebuild
+++ b/dev-python/pythondialog/pythondialog-3.3.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/pythondialog//${PV}/python3-${P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ia64 ppc ~sparc x86"
+KEYWORDS="alpha amd64 ~arm ia64 ppc sparc x86"
 IUSE="doc examples"
 
 RDEPEND="dev-util/dialog"
diff --git a/dev-python/pyudev/Manifest b/dev-python/pyudev/Manifest
index 90559eb58edf..e36dc885e768 100644
--- a/dev-python/pyudev/Manifest
+++ b/dev-python/pyudev/Manifest
@@ -2,5 +2,5 @@ AUX pyudev-0.19.0-skip-non-deterministic-test.patch 3497 BLAKE2B bfbbd7bcb401d80
 DIST pyudev-0.20.0.tar.gz 93217 SHA256 14d85bc9611dbf798732996cb7107858f58a3a1b9d246e4063c7a20ade65842a SHA512 e86a776a2b6d29f206cdd0057c6f9b1e705d981ec8c2de49259887647856531af68238b80751102a3ffc8cea6f234cc520d62c8bc2da686e453ed010da3ebb02 WHIRLPOOL 8344c668c1cc2e7971a67d0e628e3ce96254648ad06b48f260dd4ee54e3e205e533e59b692169b38dd656c08d8cd615d0c7c518b5c2a785553b8c6468e70520c
 DIST pyudev-0.21.0.tar.gz 89469 SHA256 094b7a100150114748aaa3b70663485dd360457a709bfaaafe5a977371033f2b SHA512 ba5b6156768b65b9655d809b14378b01173643781b9c4017271e880cdfed442c44ac49eb26c970e4275b820e01678e3001870591fccf88dc713ec941e2b85d11 WHIRLPOOL e69865d8b33ab103e0ff6371df4e05617c3907cbfc98d508285c7464065ccace6dc7d4e963035e19392e6ab39881281e684ddd4f7765fc599874411204ea825b
 EBUILD pyudev-0.20.0.ebuild 1667 BLAKE2B 6b20c4b6ca9e7d6436bf661df661825c22bf8aa6eace1b48d42a75cb5fa235187675ec91899c5f8b8aa33fc795ee476dfb23dedb78ffa22fe7bbad4b3e730093 SHA512 592c4d063140a2946bd029d1a6df488e839b9ea75b506266f21f1d5d394487db5e41a5b6d0d3f06ae96472982affb342de65d0f7e810a94d9a895447369dce2d
-EBUILD pyudev-0.21.0.ebuild 1576 BLAKE2B b1325ff62ae3cfe8f0b7e3dcab1772219e38da5315be0ba5dee8feb4f3c298710db065b8c4ff39b5233c37e2d03c2df482e30e339815470bdada5e2eacda9abd SHA512 c3fe3e8221ad9945d3f5de545ac29ef2ab3f9910f998368da18fa00c6bd1095bee8b53b5a39726591b5de908c51288f1d0b70e7139e28d34260fd88540018c15
+EBUILD pyudev-0.21.0.ebuild 1527 BLAKE2B b408efe6dd485304ad25b9d78489a044cc99a153134db84bd5aee19b006175c8d26151bc95ee006cd12e20f2065335d81ad3f2e877b665e996c700a779edbc76 SHA512 bd0178b21797241b7920d461afb15a4dc834d36641999496dd001ee723f3699751f7002a1fd8c632b414eadc5ca5cf71cd31f06a8775b454df331df824ee71bd
 MISC metadata.xml 754 BLAKE2B 2a6915fed8464e9c8d64d4ba8c4bb70201f4d06b1d442149476a212bc3fd94a9144f5a5f08ba01c8878004bbc752e4dd374000802c894f8d13138159457f97e1 SHA512 e0ed712734759c1710ea8bd2cd9ba1c39801a4355da7ec53a5cc0cec2ac375ee19ca557fb3a13895a2ea7d6ce56b216501106e3fd216281a4f60776aca020170
diff --git a/dev-python/pyudev/pyudev-0.21.0.ebuild b/dev-python/pyudev/pyudev-0.21.0.ebuild
index ac3b0ab16602..234a751f550e 100644
--- a/dev-python/pyudev/pyudev-0.21.0.ebuild
+++ b/dev-python/pyudev/pyudev-0.21.0.ebuild
@@ -13,13 +13,12 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="pygobject qt4 qt5 pyside test"
+IUSE="pygobject qt5 pyside test"
 REQUIRED_USE="pygobject? ( || ( $(python_gen_useflags 'python2*') ) )"
 
 RDEPEND="virtual/udev
 	dev-python/six[${PYTHON_USEDEP}]
 	pygobject? ( dev-python/pygobject:2[$(python_gen_usedep 'python2*')] )
-	qt4? ( dev-python/PyQt4[${PYTHON_USEDEP}] )
 	qt5? ( dev-python/PyQt5[${PYTHON_USEDEP}] )
 	pyside? ( dev-python/pyside[${PYTHON_USEDEP}] )"
 DEPEND="${RDEPEND}
diff --git a/dev-python/qscintilla-python/Manifest b/dev-python/qscintilla-python/Manifest
index df48b729d489..19e572c2b93c 100644
--- a/dev-python/qscintilla-python/Manifest
+++ b/dev-python/qscintilla-python/Manifest
@@ -1,7 +1,5 @@
 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.9.4.tar.gz 2557199 SHA256 8b3a23023e9f0573caed6f9cee86f898d87b768ee15b8c211a423783a4cfa4e6 SHA512 5a2eebbe523a0f2f1c7bc63ce5ee9cb8793a597d00eea5b638f18f90d6e798e92c281be23ee5e7072d5afced9e1fccb6ae51526a3623d373d57c3db64d026b16 WHIRLPOOL 68aacdcd0fc7102494ccae1f0ea3e222845bdd3f9bef603d89fe50d50dba6ac77471228a84c1c281a46ccf74bdb6902aa3bb21f89388ec5408bdde5876cf8655
 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.9.4-r1.ebuild 1772 BLAKE2B 76cac4f3b2e35358c77bc6f97529331330c3d85b99e6e07cceb8629e3ad47971ce12773460fe926c8503a8118f580aa54b9ac1568fa7ec1e8f4668b36f25fe2e SHA512 7e171629e9f4e52c49a9254f8ab54dd4d27088b19adb5a59c78de4b47646d1cb2149272f5d34e992ce35b40291e7fc7f7c598942e4f13a1aeab3bf8616861698
 MISC metadata.xml 666 BLAKE2B ca3cfedb72c4bc624270f669034a78c1fd41ed48a261b6d2fd84ee9994d130d1b558578925028eed57a85db021f3cfe4b70e51eeb9a42f4f71392994f7bade82 SHA512 f78ce18443d32b17307e96f8177bc5fb46f5b9f6b4d797e79dcacb6eb76bba578f7d666469576bd5e326717bcd9167fe34a5e1bd1ead5679619816ef8f0363da
diff --git a/dev-python/qscintilla-python/qscintilla-python-2.9.4-r1.ebuild b/dev-python/qscintilla-python/qscintilla-python-2.9.4-r1.ebuild
deleted file mode 100644
index 91014991d9cc..000000000000
--- a/dev-python/qscintilla-python/qscintilla-python-2.9.4-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-
-inherit python-r1 qmake-utils
-
-MY_P=QScintilla_gpl-${PV}
-
-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="~alpha amd64 ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="debug +qt4 qt5"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	^^ ( qt4 qt5 )
-"
-
-DEPEND="
-	${PYTHON_DEPS}
-	>=dev-python/sip-4.19:=[${PYTHON_USEDEP}]
-	~x11-libs/qscintilla-${PV}:=[qt4(-)?,qt5(+)?]
-	qt4? (
-		>=dev-python/PyQt4-4.11.3[X,${PYTHON_USEDEP}]
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-	)
-	qt5? (
-		dev-python/PyQt5[gui,printsupport,widgets,${PYTHON_USEDEP}]
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtwidgets:5
-	)
-"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}/Python
-
-src_prepare() {
-	default
-	python_copy_sources
-}
-
-src_configure() {
-	local my_qt_ver=$(usex qt5 5 4)
-
-	configuration() {
-		local myconf=(
-			"${PYTHON}"
-			configure.py
-			--qmake="$(qt${my_qt_ver}_get_bindir)"/qmake
-			--destdir="$(python_get_sitedir)"/PyQt${my_qt_ver}
-			--sip-incdir="$(python_get_includedir)"
-			--pyqt=PyQt${my_qt_ver}
-			$(usex debug '--debug --trace' '')
-			--verbose
-		)
-		echo "${myconf[@]}"
-		"${myconf[@]}" || die
-
-		# Run eqmake to respect toolchain, build flags, and prevent stripping
-		eqmake${my_qt_ver} -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/rdflib/Manifest b/dev-python/rdflib/Manifest
index e1b2a53549e9..03b42093ee79 100644
--- a/dev-python/rdflib/Manifest
+++ b/dev-python/rdflib/Manifest
@@ -1,5 +1,5 @@
 DIST rdflib-4.2.1.tar.gz 889467 SHA256 eb02bd235606ef3b26e213da3e576557a6392ce103efd8c6c8ff1e08321608c8 SHA512 49145f80a9e027847523faed059c16ec1de358bb9d8fc3ab4fd3bf95a88dd181986b1785deedf6e837cf0b064bd74ab8e27fbb5581e33310353da3546ae7b016 WHIRLPOOL 010bb4cf7c544b9a3f28636182b6c1821f390066bfe3de59f58fb7cfd8d809d8b0b5f256134b9c5091327c7ba6319be02135d6ea8a6d8b37772e212f000c3ba7
 DIST rdflib-4.2.2.tar.gz 905094 SHA256 da1df14552555c5c7715d8ce71c08f404c988c58a1ecd38552d0da4fc261280d SHA512 efc24d8ce1080e59950cecc9c779ae0d63673c8690f74db1772f6c2dbf24d6f4de5214d5870a074bffe549b42d8d5f5d131df29bbfd174b763ae1f843aec7d5c WHIRLPOOL f270e89354e601b17a91fb415a01f44ddaf90fec71e71997007f72db15275cae17bb4f2e45e2aacc852d748beda2907e5dc48c930c12632bf5846af335d7ac09
 EBUILD rdflib-4.2.1.ebuild 2687 BLAKE2B 28a7f358ea1c1ce4785f9d374aff553021147376a05c62a99600263a10df6159b3a5814bcc9d8bdf0909e45d727244088da219974fd3c9e1f7844e620d19f393 SHA512 86091ab53bc5103f5a673678504e8b99520e314c0b290240595f34df13740a4fca2e580082f9cf8fa18c517a220d87eb87c87e8edca97e2d4373ac177a2147dd
-EBUILD rdflib-4.2.2.ebuild 2719 BLAKE2B a5f8078e79f00042c9828befdeccd9f567aaeac0a6d7fefd5a44dcde2a1ed7f9bc3df546b3589498c3dadf0a84c66b2a02576ff8ac58d342f112a82c676cfdf8 SHA512 26b31cb0f7c476e8be2ffaa18679ee8a195781a1ccbaa1c57925d69fff15cb8fd622ee130578468d14705b22c0197b8dd072c9bf81f48fe5481c288dc08f7e19
+EBUILD rdflib-4.2.2.ebuild 2717 BLAKE2B 9d87eb483a2b49128afe8773c87ab2ab8e69e6ac81eabf4286a7185cef357178bab531c73e15157ffcbaefd5e94518ce9ea15e47c6fd4d8072ef7d707f4d9b45 SHA512 5b4479ae6312393f3919a38f2038ac0e499cb27332480487b17e5abf2d2d8730f38f86a68eb27375de03f3b5efe65fc826014c6ba8817e26fbd0db2e11c3f79b
 MISC metadata.xml 462 BLAKE2B a2b02fb03f0966423a2354b593cee26c55aca5d28df913d6bbe9ba0731b093c5499568829736b86d8440c173f40059041905fe49e0a7de3cc5df32ae186241ff SHA512 d9b717e12472862a9071d3d2ad3efffcc053f6890a9a307f882040f77e7304addf30fdceaf94b9a752de5daaf7eae21a68d39311f9997bc1e99c598b5093fd78
diff --git a/dev-python/rdflib/rdflib-4.2.2.ebuild b/dev-python/rdflib/rdflib-4.2.2.ebuild
index 1347cd05994a..2f6c4963189c 100644
--- a/dev-python/rdflib/rdflib-4.2.2.ebuild
+++ b/dev-python/rdflib/rdflib-4.2.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc berkdb examples mysql redland sqlite test"
 
 RDEPEND="
diff --git a/dev-python/regex/Manifest b/dev-python/regex/Manifest
index fd35e02b8297..a7aa8ef5e642 100644
--- a/dev-python/regex/Manifest
+++ b/dev-python/regex/Manifest
@@ -1,5 +1,5 @@
 DIST regex-2016.01.10.tar.gz 574017 SHA256 02a77606e3f4a0a16a2727ed8f067681635a56221e8fca863ff64b196d5d79e0 SHA512 4f4700ca746763f857449003d32d56b5aa8069e3b71b160e719633b0cf00f80efc0766d8e1e193977278f91bd3e73c87aab31bee23aec77557ac9b3652ff6a2f WHIRLPOOL 9d493c0695b5920dfa71d94636d9f2952cbd5db97f60ae68c30fdf81fdbdab05c4726a41dae036541de694ec1ca688acdb20eaa48e514865da26c9a9569e30a0
 DIST regex-2017.04.05.tar.gz 601638 SHA256 d811874ed669165fe1059a54f860db5c6ab5f48100bf4945d915fd2f877b2531 SHA512 4c3e440e11f57e2323892e10fbed7f2c89b35771fdc970164ba69bb154dde535f6edb51a0997c924eb776c61e5efd1d04001abd343110518a89b5b7bf148ae49 WHIRLPOOL 52f9f16312efb2f9a7c3d8995590fc240e4a4c8326db04eea4d45cfcf49e255d273ed78013f1736d35366e97adbdc8388816d24c955935a1ca941a09680f4435
 EBUILD regex-2016.01.10.ebuild 1154 BLAKE2B 4f4270fd08b90a31de9186fcb448f822db9ff5635f88b514e3368bce6e4f81c06254137e30ea512c9db6eec580fe26bc4a9b18dd79b9853d845d84a52798c107 SHA512 aebd29d84c8a237ef3d544ef777be950232aedcb9b9a6c48482eb03cb4c991e56dc911f75c1da1849cc42239eea06f2e968573aaf03f405f60a50daea11e0d39
-EBUILD regex-2017.04.05.ebuild 1202 BLAKE2B b2c011f6d25431b6c1cd863806314fd9e6e02798fd2fdc9429ab2671899c37ba4c74e9a78f8cb63a958ad61a9208fb1b4a84db67fcf4e947546c2c2c4869e9b4 SHA512 67cf74abd813efe63c2b8205a96ba8aa6815cd3d55908f0dbc6aab5fe5d1ad0c82334b35adc8abd0d90711081ccca6b1a239654c4f78240db23a841432d42072
+EBUILD regex-2017.04.05.ebuild 1201 BLAKE2B 8197b5cfcaff8fd95c0dbaf4c5fc87ec20a5c2a473d546ef13110cce840dfafce30bed21187b9c9488919ec566a823915bd40367d3ea61613c34e36207633e63 SHA512 873d6ab81fa380071c130e68fc1732366571a3cf1c1c1a2a7122b81497705471a3e0a168a585a39fcab5e08e8a9b687359f0dacd428692d1c909321c64445f6d
 MISC metadata.xml 384 BLAKE2B 4928f66b54b5e4de6a8b913207ec6e46c124e55510eac304a7fd46c6ca63cce60704757e9289bf35d2d58e9ddcd4aa98d751a079c79f09dda9206553096e0561 SHA512 3db0a8abe7036cd9d0fd8b1450598436dbb30581806380ad51c3d0f49d129325aba1bad9700d14adffc7cfd199c4ec3377e6eb0225244bfc82368bbb50548e07
diff --git a/dev-python/regex/regex-2017.04.05.ebuild b/dev-python/regex/regex-2017.04.05.ebuild
index b18fe2176113..21344a7e622f 100644
--- a/dev-python/regex/regex-2017.04.05.ebuild
+++ b/dev-python/regex/regex-2017.04.05.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE="doc"
 
 DOCS=( README docs/UnicodeProperties.txt )
diff --git a/dev-python/requests-oauthlib/Manifest b/dev-python/requests-oauthlib/Manifest
index d23f9ea03aa0..7c4ccaf36818 100644
--- a/dev-python/requests-oauthlib/Manifest
+++ b/dev-python/requests-oauthlib/Manifest
@@ -1,5 +1,5 @@
 DIST requests-oauthlib-0.6.2.tar.gz 40307 SHA256 29ad3c4cb1e880713a54bee17c6345ccf8be047544429ee62237843f5ec73323 SHA512 da188c6a6449ffa201fae6e2f0a0e5474b140efc55a00dfc31483726cfd860fc22cad654c4af0a4b81144100678ddf4c082f54fc9098a6a99e0a4857f22aae62 WHIRLPOOL 7d2cba69eb5be9205fb0f18fdc696e26cc223e09765dd31f6ba402e498471678baafde067c2f1d709b4d38b90e4957549c714752d658e00abe9f2203ab7d189c
 DIST requests-oauthlib-0.7.0.tar.gz 40641 SHA256 525c56e6cf42e7388e8657b78ceb860f3ab6d2bca966a020c740517c6621b631 SHA512 9de7f3e2f67507acbd6a711d7c3bc4d598214ab658e7e331f2c56d7a6d084e11df8bfc2449c3ec5e985016404a5e7920e26081bcc3af52d6c91b28d1a69f6ed2 WHIRLPOOL 71f3840a5a61154f38595204701fe3bb3ecd5c556f6f75ec237b4308f2220731096e42822bc32c0765a0c69168a9dc0ecade0cca03fbbab59533473b9fc5ea77
 EBUILD requests-oauthlib-0.6.2.ebuild 798 BLAKE2B a401db0b74659e6fcdac8d14f0a0184e7d047004014a5a03d498b64a4c35e9f7f8f9be09984168c2dfd76aacef41650c1e77a6547df1245ed1554a5311f98e7d SHA512 2b667d3f8df4189756ee6e4b1981adc4c2fea38641dd7a9aed066b88b1d4c206729952a18c5380bbda46b2e866acd97740c1d12c2a5821495d734daa8ec689bc
-EBUILD requests-oauthlib-0.7.0.ebuild 802 BLAKE2B ddaa450c5c6d0ee169eae1cbaf5abc93df4ce18ae4e5e2f7f62fd5b70fc088da055b588be3673e9973b9b6f178c6aa14a287927534cb9601da43d937927d5302 SHA512 0c150723baf5eb2425cfdc114280d437983de59505612a582b4238d22e63c575c4ca2f739fc64b4778c4b240f7e4c2e35c02060029b9f5de2cde1d3d5ded1f58
+EBUILD requests-oauthlib-0.7.0.ebuild 801 BLAKE2B 50563744015b9e6132cf51f30d6b72526eb4363b160dbfc87d5e6a00e26c6458bfbc21f54c5f0adb62ecb1b44b7c42bafb3de4cb79e12b5d5edca2904f929b53 SHA512 a2b9c9973901367ce761b9598ed3161efbba9638fe35d1fe99fdc2334813e25f61b6403a38f5fdb5f671916d45582b9a57f6055b7d6f02701fed78d44420a37e
 MISC metadata.xml 438 BLAKE2B 899572e284dc1b2082630b305e207c6bd3c9a4416da0ea77564c033fdba8f69f53ee05bbb4e3a8c753bdec208b0c0871126df9d2d174122fcb360f3e019c288b SHA512 f78e511b9b5cc184a02ccb68db830f2cbf086e58ecace1adc58fce46c4c324aeadf736026596b6c9596f429b03badbbe1e206f61d8f7aef60e952366680e3217
diff --git a/dev-python/requests-oauthlib/requests-oauthlib-0.7.0.ebuild b/dev-python/requests-oauthlib/requests-oauthlib-0.7.0.ebuild
index 8fca85bbe7a4..01ba330d72c0 100644
--- a/dev-python/requests-oauthlib/requests-oauthlib-0.7.0.ebuild
+++ b/dev-python/requests-oauthlib/requests-oauthlib-0.7.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/requests/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="ISC"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="test"
 
 DEPEND="test? (
diff --git a/dev-python/rst-linker/Manifest b/dev-python/rst-linker/Manifest
index 716b5f6165af..8daaf81b28e0 100644
--- a/dev-python/rst-linker/Manifest
+++ b/dev-python/rst-linker/Manifest
@@ -1,6 +1,6 @@
 DIST rst.linker-1.7.tar.gz 6798 SHA256 59038b0dce170f7d6459132a1b7358b01f71f372afbf5b1c07d0862ba4a5042e SHA512 380cd1b36a1153a6512144b7c83be75dfa95ce397437d34cb76c4c41de6266c77cf1f811f4fb0576838e10bd78e1f46394df11b0f7dc5e3fafeef36b6e8c9ba0 WHIRLPOOL 7d323528ed0c7bba5db1159eb18063a4b191d81d400c1e8d02d0dcff3265183ca4ca0d56de5c674883dc1d02ea77eb7ec83c1b08d4622f4d820f5a1702a5833b
 DIST rst.linker-1.9.tar.gz 7618 SHA256 4de05e547d14ac16599d6379a73d394b8eba03afb1f16b6bdb400013957d9999 SHA512 b3e39b025f75bb6ff670f23ee7abd48dcc4e19343626c1ffadd2304a7e3285fe0b7369ace96e47094606e864672c8aeea967a02217b110762e53498dde64b8a7 WHIRLPOOL 15cef12c451a8bffec7303f2909e173993819bdb3d214c07f2b606464fa0ff6d222b33bff3df44a2a1652f2b144f85a11e8dbb4b9a82257bca6123f1944eb828
-EBUILD rst-linker-1.7.ebuild 1201 BLAKE2B 1d8fdcde6e8943552e5c5b9216889f21b817c87dc912477d80d1e09ee02e3604ab5c15ba58fa967ef004501559122b0872d0b6d2af8f6f744f6773e295492c88 SHA512 820770954b0434011803926bf4ba55f71df966ffa5931dde1307a90c693056b25f36f7c799c85d1379e77296931e524f2d06323a09e080edd950812f0486f795
+EBUILD rst-linker-1.7.ebuild 1200 BLAKE2B ca7f649fd76bb08cc7122d237cae9f977f415ecc03028bbf200fe40d37082b30c65a8a98581ed97f525ac8df39949779c67e7f62f1f027925021832b146ced7f SHA512 e0946205ec855c47207e25223cd60b8b41545a22cc57ff1db55c2a06d3bcc68e4435ce142836dd4c270761cf3e829a108b81e7d2d454312b40934d68d150fed4
 EBUILD rst-linker-1.9-r1.ebuild 1382 BLAKE2B 8a45239fd2bf60c595ebf2e8da35a5e1c3fb86ab397dda00c162b91be1c6ef142ac4ad26d006c1b882cde9de45d72233c70d70530ba6c107ce0ed9ed71e301de SHA512 cf23915be6e38d956674e8980ba825a6fcbd830b35f9fc9fb8ff0735d725664a40340fe97b22a5efa0a65710172e8331fe3273a4a53a3268ab8f953ea33b42e2
 EBUILD rst-linker-1.9.ebuild 1212 BLAKE2B 228c9a5950824db8f05e068316043538d1558b85dd01e96b6c1ae9b1d6db073d71b53cc0bf9a162a97919f4db5498e212ad05873a74fb345e0bf2c50e734f512 SHA512 ae2b09ff33aa50441528eeed10bb62a2a6d69a746fcd73462e133ea2b7a2bf0944880066511bf3167cf3ec416c8df9333222ffa25265bc81871edceb161612e6
 MISC metadata.xml 564 BLAKE2B 1d04c02d9c845bf6b6d1a69d1ee34dd4835b3f8ae8662b8fec9ba17d33f10a307293b78da6223e0385c35ce9d716c5f0545bbeeda89cc3d0925b454b1c0c7943 SHA512 c3fbcb945acb81c57e91ea8b26c797b71e959c2f3d9f0eb7db696e4ae26b9004bb3b6f554740169b9a2c96cde3fbe8b30721b285b82e07ed193a2117e0436f36
diff --git a/dev-python/rst-linker/rst-linker-1.7.ebuild b/dev-python/rst-linker/rst-linker-1.7.ebuild
index 217bfc609234..be8cc3d60e62 100644
--- a/dev-python/rst-linker/rst-linker-1.7.ebuild
+++ b/dev-python/rst-linker/rst-linker-1.7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/dev-python/sdnotify/Manifest b/dev-python/sdnotify/Manifest
index 5e19ae27ff3c..f4ed25925870 100644
--- a/dev-python/sdnotify/Manifest
+++ b/dev-python/sdnotify/Manifest
@@ -1,5 +1,5 @@
-DIST sdnotify-0.3.1.tar.gz 2513 SHA256 e69220d4f6cbb02130f43f929350a80cf51033fde47dcb056fbda71e2dff2d5a SHA512 765e75e727ad5128269bfffd4d3f64666df654adc50965a54f3cd622933aca583faee5453f7fec3a23b6f754f4475522dd96a86ba643984cd72a575ec082709c WHIRLPOOL b43831604022cdd5f605138324cda4e43ee7021993e66afaa73b82eff98c11dc087d5f8f5d1b62073d750cfb84ac9168eca12640dc6149df68506826fcbfc0c4
+DIST sdnotify-0.3.1.tar.gz 2513 BLAKE2B cbce1d3c2bae3b3a02102cfea9ac104e7c2839b784a78309cfad0a66fc8b13bba66ae4bdb8dcf1d2171378e04f2c18e3697b22545a3e3f0593edff8adcc19dc3 SHA512 765e75e727ad5128269bfffd4d3f64666df654adc50965a54f3cd622933aca583faee5453f7fec3a23b6f754f4475522dd96a86ba643984cd72a575ec082709c
 DIST sdnotify-0.3.2.tar.gz 2459 SHA256 73977fc746b36cc41184dd43c3fe81323e7b8b06c2bb0826c4f59a20c56bb9f1 SHA512 f7e7d38c8d7f56ebad8b0343361a0bf6177208b94916430343a0a392015622d7bb62aa391e17956e5aa9a0d7189c79268cb86c46bb52b36488df5aebca5cfbd3 WHIRLPOOL 4885e8381f83db3901553ea6ab7c49e4c7b64aea73d5ac75fd6ff42c8acf4db578b0f211c6535bd868ff4fc968ace1c94d20b1f6297fea458abbbbcc794e5c9a
-EBUILD sdnotify-0.3.1.ebuild 494 BLAKE2B 883a946a2f2e9dd4ffa324c7d36d6ad445ca69f152f3ec5ebfeff24fc19da08c5fc6f7907e9fc63de63235a27661666fd94d52d400284cf82f32ddb23ecdeac1 SHA512 84b03e6a9a4a2c0d6bac5ace9dbb999b7d1c422bd94968140ba239949d2d1c939661d047b522439ecdcb93f0af2dbcb80bbc59c7067f739580e37932b1840e23
-EBUILD sdnotify-0.3.2.ebuild 492 BLAKE2B a6dfd7d39b627f857e55dbea432b7600f10b84fed0dd954b3fdf975313527303efee9993ff5fe5a0bbeb1965d3b5958afe77271b0732a934da5fc907e2b8d8f1 SHA512 f50b40a7a074ba0e3c16360da19d90d4c26b15d91f66cfa93e77042ad95296c239ce962e306a340b617287da4e1f21dc8eaa59829ea67068330cf591459d222b
+EBUILD sdnotify-0.3.1.ebuild 533 BLAKE2B 49712555ab61bc59c0511a54f6d3a16426c69d54f909fe35b7d5f074fca72824b197e62a59cad59033ab36b60dae24b67c38514b6d249d76451c6de7eacc08c2 SHA512 2bb2133e449d2a9323f76aad4f882341e3ef1d53be6423006d27713779d8772216e855e59fc2146885c2e1b7e2aabe9ab812405d2abd405b03cc03d4dc322a18
+EBUILD sdnotify-0.3.2.ebuild 531 BLAKE2B 44ec0888dc6a01aaa1ec8345dac69d35443ea2d436bf050bd8ba4d1a602b6b7460441fdc4998029b098e4ae680542a07a9db37b457359f181e9f34d8c09051ae SHA512 87485c39b9fc7f9fa9659e7f0442ac5b9a00521fc06f7b224c157761dc04a5d8cf17fac0057b607f1d5d087ee2e78546dcf3178f424694d4133b965e3992ce9f
 MISC metadata.xml 898 BLAKE2B 3c224da6c24ee26da62db111db3007eb541b09789558838e890bb7817996d41a34df145c62cb28e8f7271cd6631170c60b4a4b91dcecde3c8650c6888161731d SHA512 3bec05dec5e31a37d823081ff5b30fef06ab6a793801e1163d296d8c6b637dcc964379d53e77fdaaa6c55ccd5095018cb5f14c3252f575ba90eeeb93736ee986
diff --git a/dev-python/sdnotify/sdnotify-0.3.1.ebuild b/dev-python/sdnotify/sdnotify-0.3.1.ebuild
index fe6f98641f01..c037e2b33e9c 100644
--- a/dev-python/sdnotify/sdnotify-0.3.1.ebuild
+++ b/dev-python/sdnotify/sdnotify-0.3.1.ebuild
@@ -18,5 +18,5 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 
-RDEPEND=""
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/dev-python/sdnotify/sdnotify-0.3.2.ebuild b/dev-python/sdnotify/sdnotify-0.3.2.ebuild
index 4d0b1c61f19e..41b30305da7d 100644
--- a/dev-python/sdnotify/sdnotify-0.3.2.ebuild
+++ b/dev-python/sdnotify/sdnotify-0.3.2.ebuild
@@ -17,5 +17,5 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 
-RDEPEND=""
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/dev-python/selectors34/Manifest b/dev-python/selectors34/Manifest
index f471d2d98dfe..c754f98c08e8 100644
--- a/dev-python/selectors34/Manifest
+++ b/dev-python/selectors34/Manifest
@@ -1,5 +1,5 @@
 DIST selectors34-1.1.tar.gz 10525 SHA256 84b3743b9046461aebbcd13c15e79ab91e79acfb6e030b54a0ec6360ae0bbc52 SHA512 3c9cae461d7bc629a5ac2f17e7a5967d4a2865528b34e94e1164521e9d720381cca2c395ba62c0f67a4b9db34644dd031c2576a5017282bf4791c805c467408a WHIRLPOOL 67d07956c9c35e3a43e41033254b4ddff86271376f9d72a2503d9bc5e1f8ee5900384a5a71472a77c5c51e9025d7873d57c8f4797ab2035d7cd22e7ba99c0af8
 DIST selectors34-1.2.tar.gz 10145 SHA256 09f5066337f8a76fb5233f267873f89a27a17c10bf79575954894bb71686451c SHA512 66fd545d5163ee3cf7e160e428a36f70d43c5a6a8a5adcd6a3028fe67ca818911bc3de934d862d06806dcf051516856baf34b99d9e2a062c214eca667fdff65d WHIRLPOOL 22f8eb70e2fb5d2ae7fb6abea45faa7e41a6d2f9f2a2f98754c7415831b7d8becf08c6c06d45497bde4c0dc07951e14745c0b5b5b74f40a19248c6d5a2aa7ada
 EBUILD selectors34-1.1.ebuild 496 BLAKE2B 206b20de5795f5580d581261fa66c92d2ae40c7be8c7c385d2520dc72871f78890204d501f03740328496bf4115ffbe1943246b6ab667b5c75827706ba643ce0 SHA512 c0f0bf429a01bb9f90a8b99ffbdc606649b7ab569645791fd77e8719cadefbee28a13ecc7eda1672e8f208e99c9acaa0e075ae48a8baaac3ddc79e715b68aed6
-EBUILD selectors34-1.2.ebuild 496 BLAKE2B 206b20de5795f5580d581261fa66c92d2ae40c7be8c7c385d2520dc72871f78890204d501f03740328496bf4115ffbe1943246b6ab667b5c75827706ba643ce0 SHA512 c0f0bf429a01bb9f90a8b99ffbdc606649b7ab569645791fd77e8719cadefbee28a13ecc7eda1672e8f208e99c9acaa0e075ae48a8baaac3ddc79e715b68aed6
+EBUILD selectors34-1.2.ebuild 495 BLAKE2B e91cd21437135967627211e80e222eb91a8847b117320166253b047c1ee0898d13570a1d74586394d85d01a55ff8bd265ee37ff2660bd5cf1bab21b148292bd6 SHA512 e1f47c0ace2b2274afb42d4627ef5136dc759330a6b8a7f5b1b0b3b054165ebaad8bae645779da0128efeae0bbf4cdeaaee3fa1df332aa2e58605b50a3bb43b8
 MISC metadata.xml 378 BLAKE2B bdc18fbcccd0582723bd2806e6f749aad2735cf55d6a82b88d2141b92de24c0c63a0bd55e2b49613fe91406c4fe7d35c1e7cc7e23ca0064ba0edb797b59e4fc5 SHA512 3aa7b7ec03e37413a17323a3db7633f05044d958b1547c3dd420588ee3056c8b938d30f23b69fb7584cffa9c59d7ee69689be9c5d0d4f248fc9b3a093191d297
diff --git a/dev-python/selectors34/selectors34-1.2.ebuild b/dev-python/selectors34/selectors34-1.2.ebuild
index 67bbcfc2fdc6..1d51c9fcc7de 100644
--- a/dev-python/selectors34/selectors34-1.2.ebuild
+++ b/dev-python/selectors34/selectors34-1.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-python/serpent/Manifest b/dev-python/serpent/Manifest
index 73bfe3b12e88..1a35ecb30f82 100644
--- a/dev-python/serpent/Manifest
+++ b/dev-python/serpent/Manifest
@@ -2,6 +2,6 @@ DIST serpent-1.12.tar.gz 11003 SHA256 1221fc402ab7aa3c3bac85a27e30df2c08658c7bf7
 DIST serpent-1.19.tar.gz 12055 SHA256 946b2c837f889971df3575af9dadd8f09bfe48549ebc1b9f6434263b653707ce SHA512 9adac06bb63dfa73ca0043a3ddf868e0afebc81ff7d637e41667314cbe8e0ecb2af807db6c60f5a5a6a6ff8fa11ac42063d83a7376c7e8bcac22abfd3ba5b1dd WHIRLPOOL 61e064006ea9f4f09dd4bced3b494cad8ca243cd7bed76ba25308809e962c8072cfff3b6371fd727fb6ddd5473a52775b41f85dd02e70d7d3b1ca8d824e2cb0e
 DIST serpent-1.7.tar.gz 8799 SHA256 5345587dff787431df668c19de56b74ada02fb893c2d9687572ffecc63d4d33a SHA512 2e885fb06404915506665b2ba6c7fa6dd7a74e31f814fe88f21c847eade5c307f932d45371252d7b690bf95677031a5b5128d9cc5974733dba127e0eab222fa3 WHIRLPOOL 4c3a10fd2519be1ee2d60ae204d949b899e8d77627084ad3ea2eb5b23002a6529cf490ff0503cd5479261ea2fe617b3056518bb6fe838ebc84c008225b9ff10f
 EBUILD serpent-1.12.ebuild 551 BLAKE2B e4af0b2b0ad655f0b8cd54ee628ca50e372bcde12d81816c4af6fe16395cbdd2499586b2f056fecaf23baddda154dcbb31c4c2d15f7a4bf76e23c2fe9476b05c SHA512 87d7c6415cf79d7bd550260cd67a19569d69788fd7c35228f88e6585d6ed4cc066f51548d76043a4a6190fa2dda7f928a992fbb9ff9f8ae901b56af76099bb8c
-EBUILD serpent-1.19.ebuild 616 BLAKE2B ff997ba7880810a420f7ed345fc0cc0a72cd7973ca6224d5f70247a664aa6eaf116913e8b5f59bc65ca1000a0c54e8ab33259d0254754822f272d2069afb4808 SHA512 bf8891ce95390c5a42713c774f4ac8a8324f7c49efbdb1e1bf935ef717dc59785f254e9672f05fc8a18f3c35979a138691bae2cb608244a73849dc9288c24cf5
+EBUILD serpent-1.19.ebuild 615 BLAKE2B 8611ca644f613d5b398ffaf6364d2d986ae54383ecf4cd84058d9c98b2d30475ab6c4623a6de5472ff0beadd6f0d8adfab2341637ff156e855e9618300768f73 SHA512 e42845e9cbe5e032c90606cde744c35773945b4beb4dcda4d391085ec9c3c4787fca0d0b39b4c1d768a2bfd224c30ece2dd0be6106655ab88e2328f68c1901c1
 EBUILD serpent-1.7.ebuild 444 BLAKE2B c2a69335d1671fb30fc20b4ca98fe42cbb865016d84df55f7e4db9fc66b42e2280cae10abb9666f4b6f70e32bbbe2844d82a00bfda7abeb9c6a88478f7fea430 SHA512 70ee391f6b8ddda30bd93a43302121ae589a8892b0358b36782214a7498afcc0039e0f35b35c4e21f2c351d12aa46ed1ed35089bd760e294dc1bdc3acae4dacd
 MISC metadata.xml 363 BLAKE2B f40df45db2fe2c0b0a35e6a9554ea3d39f25575e6e83dce3fb235a72bd1cfc3bd07bb106661470fe3f01f79bcae06d0e70ac8213cffbc9119bdbf4a3c4475eda SHA512 c0ecbe2e072730e43679dd09334c4fa300c1660a740cdb7071d6d87f112c25493b169f0ca7c5a99fe4a978a8d81f87a409519170cbb69430994f16a8bb193500
diff --git a/dev-python/serpent/serpent-1.19.ebuild b/dev-python/serpent/serpent-1.19.ebuild
index 27e5ec56cd3d..ac5161ade565 100644
--- a/dev-python/serpent/serpent-1.19.ebuild
+++ b/dev-python/serpent/serpent-1.19.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 x86"
 IUSE=""
 
 # not bundled
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index 41a7af9393eb..092b68db96a0 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -3,7 +3,7 @@ DIST sip-4.19.1.tar.gz 1000644 BLAKE2B 7cb0362a60184ef4e5ba2b53d29c5ca70babd4e81
 DIST sip-4.19.3.tar.gz 1007481 SHA256 740df844f80cc45dcc9b23294a92492923bc403ce88e68c35783f27c177c4b74 SHA512 b2dea0cb5e1b23531f35e94bd604ec9874f0875badb5b20eb5abd2732a1005b2dd15bb42e0007b65053a2153b50659f24671abd83a434991661168a5778b94bc WHIRLPOOL 6283491e6baf6b7806a9fd68e77463983c475f7ea721832e573dc86158e226428d5bd9da084a554180ac4308ccf23d98f4c51f9af11fcfb5ecda8bf4dee028f7
 DIST sip-4.19.6.tar.gz 1019295 BLAKE2B 107bc63b8c0f200c292bbf465507602904383a1d3fd0b76da907cda2dcf0e79edb9cbf835bc15dbefd991db6a7eeff97462965d88704e3c926ce9e0dd5af829f SHA512 1bfd2da8b0ece6156aa94713d5e9ced6226b7f49427ca4a11b65452a67e9c740b93a1f90c00a0636d4eef8a31324988a84373c15194f64774b6f8c084d0464f7
 EBUILD sip-4.19.1.ebuild 2113 BLAKE2B 24d83915451e1c3fddfdce81a571eb4f2422908f1839911d994cce96d03d067e9c7f21ba3a930cefb6a434561506b961bf1710100a98ee175ab2d09d907ebcda SHA512 ce4a55289b9b1b53d2c48803e4b9ff013fe8c9fc577af73000aa6d39b1bbb0fd5f83d808743d44a86949183d2621bfc7d8ac072eb7ffd341971ad8aae4eef1aa
-EBUILD sip-4.19.3.ebuild 2126 BLAKE2B 58cd0bda08b86e7d24174568304a71e9989efa2bff84638f1c1e72116e0826253d84a98a0063aac5a029c0ad1bd04cebcc3a46f3d72152d36ff0f9408eaa7666 SHA512 3c2e333cee3a85c6064211d7cfe5ea9dacacaed14c87a0248f55d5217dd031575e3f7e6d1c0fce3a395af0282284e0eff00600112f2b835a5a40ac3b6a369640
+EBUILD sip-4.19.3.ebuild 2122 BLAKE2B 2a7c595e935af1dd8389953ddf49fa86b0f36d48f1a135e114a715592823abbb63a992e242faef0210715ac9b42d99e1e13381bc1ce27c2ef273bad92b0c3078 SHA512 8b4ece66fa988ba29aedb1db3c02b9c7a06569be37a9459caef0c29b1b17e3574d8480b5fd15a4a844f60b5d5eedff9ef9f55d65c9a94ebf557289abc374d453
 EBUILD sip-4.19.6.ebuild 2776 BLAKE2B d1fbabcd47a7b90975c684020df39eeeb5b5975e541249046bd297a8b42895415bcec6390886e9b88c747354cbe1cdb8293a895f9aca32a2fa91036d4b8ce0b1 SHA512 3ccbd79cd1a8004364afd688b22a7920fc58ec9bb9271555c1ffe26fddbf97b612a4bc0e614b6797d085584e780d55e25b10603088439ccb302c67624b4b91ff
 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.3.ebuild b/dev-python/sip/sip-4.19.3.ebuild
index 03af916e9578..3a4e22f19fb6 100644
--- a/dev-python/sip/sip-4.19.3.ebuild
+++ b/dev-python/sip/sip-4.19.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/pyqt/${P}.tar.gz"
 # Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h.in
 SLOT="0/12"
 LICENSE="|| ( GPL-2 GPL-3 SIP )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug doc"
 
 RDEPEND="${PYTHON_DEPS}"
diff --git a/dev-python/snakeoil/Manifest b/dev-python/snakeoil/Manifest
index 7c304ff67468..f789826a4ee8 100644
--- a/dev-python/snakeoil/Manifest
+++ b/dev-python/snakeoil/Manifest
@@ -1,4 +1,6 @@
 DIST snakeoil-0.7.4.tar.gz 301878 SHA256 67280c86e4b02c34100603d7525270c0017e0d182df54ad31ec2e5c145e69ceb SHA512 b3ae2223a267fa74699664470a4c4f6888cf2b68e688fe61d3acca85e00a138c3a037482ef304ee26f326cba252b473d265dcd72d0e0ab5723f4b0ed6e5e04ce WHIRLPOOL c76905b7540ad1ab2186d2ce9a75a55660eb343a1cfefc835f8012f3cf10ad706ee837a995085fa327f38de8f790cc2155c540e5b0d2a6f90a0aebbf7198c7bb
+DIST snakeoil-0.7.5.tar.gz 303270 BLAKE2B 66d00cf50c8efd73d765904b9c7e8ba725caef9608e68f5707ddc09358507fe64214af73b333ec5bee2ef950d8dbad474cb5d9e4412757bc3c82d75909f6fc23 SHA512 b9f6efce2e3f5df83248b1faa84493aa11d8a08935e3991a56daace96e0de39dd5c7d25a69a4394f7ba163de78ed56a2619ef64c33114128fc02052d676a86a5
 EBUILD snakeoil-0.7.4.ebuild 937 BLAKE2B a69adf1930195a590dd831129b17f20cb80584772bec618793af405bd2e7f1d13f267db3e6634846d5d88db1692e77e3bf5d4c9dba08e5845d9ce228ee501894 SHA512 f47c6e9dc49a0221c082da07d2e69e00bf1a3ddf3ad59afbe82087369bd9e3e9bb4ef0b99c5871d9af6a122ca3b7ee24b10ad8d1f31c52bdb5c356960c65c76f
-EBUILD snakeoil-9999.ebuild 937 BLAKE2B a69adf1930195a590dd831129b17f20cb80584772bec618793af405bd2e7f1d13f267db3e6634846d5d88db1692e77e3bf5d4c9dba08e5845d9ce228ee501894 SHA512 f47c6e9dc49a0221c082da07d2e69e00bf1a3ddf3ad59afbe82087369bd9e3e9bb4ef0b99c5871d9af6a122ca3b7ee24b10ad8d1f31c52bdb5c356960c65c76f
-MISC metadata.xml 337 BLAKE2B 8ed9f4186003b16379bc9ad442d4b3233f96406b7ef5e2383963ff70f0ffbfc499aadeb7b8aa2fe29b91256da19166241e7426968eda1d696d07ff435579dcb3 SHA512 3b9d2eb9da814c4143282cfd1ef4384ac5ab09324c1f83d0ce7caa1d1897d2a46b30964a0fa42d4690d975030abd6d3fd5bca761db4c2cf2caec549a94a8ef83
+EBUILD snakeoil-0.7.5.ebuild 968 BLAKE2B 0f23a9ca7ddd281cffcdfdd09ac5e92dc6b37076520c91a54c6749683a5469212ef51517708ee13c7f79a81df8a6089b3b0aef528702b597e409d93e0134f1c3 SHA512 30a47abfd5d4261430028c92897866894de48cea1cd973190342fdc3fcc300aee24f1579c85825c1aff6ef385ecc3577c61a0e56b6db165773ec38177d872f0f
+EBUILD snakeoil-9999.ebuild 968 BLAKE2B 0f23a9ca7ddd281cffcdfdd09ac5e92dc6b37076520c91a54c6749683a5469212ef51517708ee13c7f79a81df8a6089b3b0aef528702b597e409d93e0134f1c3 SHA512 30a47abfd5d4261430028c92897866894de48cea1cd973190342fdc3fcc300aee24f1579c85825c1aff6ef385ecc3577c61a0e56b6db165773ec38177d872f0f
+MISC metadata.xml 385 BLAKE2B 7e7195d4876c5cb5db98288566121559c8bd9208138fbd211edea15b324acb11d09a2bdd96c0200554d7e9c734202c7fd341f0d134f271c82dbfdfe75e5774f5 SHA512 32645380ddb0bd1edca1895714aeaef3e0c61c04cbacb50a414c2fd26b6978c8ea83b3c420538cadebf3a631b5aec2e9e3fc0dab98d1e1a99cfbad33b8d58715
diff --git a/dev-python/snakeoil/metadata.xml b/dev-python/snakeoil/metadata.xml
index 632e3554b912..9defaede9abc 100644
--- a/dev-python/snakeoil/metadata.xml
+++ b/dev-python/snakeoil/metadata.xml
@@ -7,5 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="github">pkgcore/snakeoil</remote-id>
+    <remote-id type="pypi">snakeoil</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/snakeoil/snakeoil-0.7.5.ebuild b/dev-python/snakeoil/snakeoil-0.7.5.ebuild
new file mode 100644
index 000000000000..38a023db443b
--- /dev/null
+++ b/dev-python/snakeoil/snakeoil-0.7.5.ebuild
@@ -0,0 +1,35 @@
+# 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} )
+PYTHON_REQ_USE="threads(+)"
+inherit distutils-r1
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pkgcore/snakeoil.git"
+	inherit git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+	SRC_URI="https://github.com/pkgcore/snakeoil/releases/download/v${PV}/${P}.tar.gz"
+fi
+
+DESCRIPTION="misc common functionality and useful optimizations"
+HOMEPAGE="https://github.com/pkgcore/snakeoil"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
+[[ ${PV} == 9999 ]] && DEPEND+=" $(python_gen_cond_dep 'dev-python/cython[${PYTHON_USEDEP}]' 'python3*')"
+
+python_configure_all() {
+	# disable snakeoil 2to3 caching
+	unset PY2TO3_CACHEDIR
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/snakeoil/snakeoil-9999.ebuild b/dev-python/snakeoil/snakeoil-9999.ebuild
index c037456a6ebe..38a023db443b 100644
--- a/dev-python/snakeoil/snakeoil-9999.ebuild
+++ b/dev-python/snakeoil/snakeoil-9999.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	SRC_URI="https://github.com/pkgcore/snakeoil/releases/download/v${PV}/${P}.tar.gz"
 fi
 
 DESCRIPTION="misc common functionality and useful optimizations"
diff --git a/dev-python/sparql-wrapper/Manifest b/dev-python/sparql-wrapper/Manifest
index f16535c3a407..1b7108a79e91 100644
--- a/dev-python/sparql-wrapper/Manifest
+++ b/dev-python/sparql-wrapper/Manifest
@@ -1,5 +1,5 @@
 DIST SPARQLWrapper-1.7.6.tar.gz 26597 SHA256 dccabec900eb9c97cb47834bd4b66ceaeb4d9ea11bae24a24fe734e9f48522f8 SHA512 cbaafe8986f7da88efc383ee7e694559c9314244a03f616e5f2afd186205ad625fe0601a2316013add4c11621fc697aa6d4672f8bbabdc485c11e873ca6342cb WHIRLPOOL 818cd215224a1d362c1e03286190e5ec8b7f465cbc837b136963e70948272450fc99dbcf22b065101546664dd5a7c1088703a578a2b8e0fb378dbb74630ef254
 DIST SPARQLWrapper-1.8.0.tar.gz 28775 SHA256 3b46d0f18ca0b65b8b965d6d1ae257b229388400b06e7dc19f0a51614dc1abde SHA512 bdfa3d5efc2deb8202a27e8a4770cb69ce57c1a71133788fe7acf8aa4cbc2d74024fd5f7fe5188a0fbebd399d31f62ca23d85f7ebae5562046b5b782311d8907 WHIRLPOOL bb925f312aa94c081eb3129348bc79b3bf7a3cabadfee8ad0929e8aa0b9e7d1a21679411f5043464b26ef32a65ddb258d8d5d3e96347740a1d3dc2620828e30b
 EBUILD sparql-wrapper-1.7.6.ebuild 607 BLAKE2B 8b2f8eea948b345e3246d41a30e50edf3c2576eb6983da169fe00cfccce538c17b7cc1982d23153211ad7f2ba2cbfbde8e7ccdb8bc303092cc25d0d2aa6c1e41 SHA512 cbe8508cfdc3eaac33ba07cee40fe8410aeac49d192e854854dc865af61cadc6a9b93bad42d12458b283638c2eea074ce3617db5bf4aac4de47a654d09711016
-EBUILD sparql-wrapper-1.8.0.ebuild 619 BLAKE2B b36b626542b54db8b662651fce0561bdb16cbda0e46089ab0172b5849a2ccdd5ef7b0e72db02a1925f3a780272cdc4d90a9364d5c603aad50367bd09b2879ede SHA512 afc4f31832d006dbc21a21312839204cb31b4da59ac2bb49d0df34167e3a282554d0dc1476667db92cefac06fe87b0c781b4b789d69f7994902512cc505e15df
+EBUILD sparql-wrapper-1.8.0.ebuild 617 BLAKE2B f829c09f2e4e7f5b56249e079cef4144dea4187b966701686c89576b5d3ef317a5a4c59665eea79949b2b24456d4cf19a1abe62f0d2e2a43184258658b74f585 SHA512 7fae0836ecc422388d1302f260d5483fdd471a06f020e6fe58f6a957e1869c3ac8438ca333c9e6f14c51fa6fc8e069a0d6642bfa581a4b1ddd1befabcb9a44be
 MISC metadata.xml 326 BLAKE2B 0c3bfdc601d5e93c90d7966cf8b7de667f7c71b2353ea1a7c28ac0c52028999484f4cee8601d346d78e963055df1bfb115a1acb79bf0a07e8de6df600b63c83d SHA512 9cc7b41b1ba7fbcde0ecce7638a3b2df50d6290d65d9854ae6611ed144220d9b292235ab8916330c828a4f9a1c5605de6d0d71d1a08fb0f6ddf37f7302c03e40
diff --git a/dev-python/sparql-wrapper/sparql-wrapper-1.8.0.ebuild b/dev-python/sparql-wrapper/sparql-wrapper-1.8.0.ebuild
index 179b9cf30636..364fc9c676fd 100644
--- a/dev-python/sparql-wrapper/sparql-wrapper-1.8.0.ebuild
+++ b/dev-python/sparql-wrapper/sparql-wrapper-1.8.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="W3C"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 IUSE=""
 
diff --git a/dev-python/sphinxcontrib-github-alt/Manifest b/dev-python/sphinxcontrib-github-alt/Manifest
new file mode 100644
index 000000000000..fad2027f4690
--- /dev/null
+++ b/dev-python/sphinxcontrib-github-alt/Manifest
@@ -0,0 +1,5 @@
+AUX sphinxcontrib-github-alt-1.0-init.py.patch 255 BLAKE2B 7451f0920d802bdb06217323719ba0b4cfb5d64a2309c7a051df58a2e83ce22ac1515176fe3b1a3af060da11e4a5031250f13c5530119e3dd63c32b16c0ba9a7 SHA512 2f84e82bfa6fd24fe0707af174773348b23aa7591e5c6ac9a7335e2b87721586e4f84157b33a4421c15632ae6a890c5c0c55090fb403bba6927a4d36bc1377e5
+AUX sphinxcontrib-github-alt-1.0-setup.py.patch 598 BLAKE2B 7a4e2a1692368334ce0d1d3e13b98a5e21f6e1b1775c2bf99abbbdc2b6a68a1ca301e2d3a237a8ff45a53f1ee54c5788367a69844381c043c635f3106d3fc663 SHA512 0159cfa1a416e6d9b150eb0245dcec65e8e69cf2c1d4e69808128f4046d3ea13952feb60ef8b3b628e6e678ef03bcf04789c30a45c829e9d6ebe2014833376b7
+DIST sphinxcontrib-github-alt-1.0.tar.gz 3213 SHA256 721efe70ec7ab9be12a929af01242147e1d4a05921103d38c0bc207db3b70aae SHA512 57f5ab3a5d679634ce0c2ea8c78069f37ed5a5d3c32fe6cf61851ed4a9e8b6b9b6c882f486eb84914153b4121dacc25fd4b11edee111630001ae9bc324f2250e WHIRLPOOL a0e470f10a51e4f592dd441a58d13c5f1ada87e09840e44c768240863615128a4ac9e9ec700a3553145fefb28faddedecf61522194dbe823cfea762b02da1ff5
+EBUILD sphinxcontrib-github-alt-1.0.ebuild 914 BLAKE2B be6d8fb0927581e2398e0e5a77dbaf4d6482ba671b09f777c4dc6cc5b1f4954e18d743cff6975fe649b4c1f116f886bdd5543bc821723cb8257ab5a30cff8b34 SHA512 0480882b37361577bbc382bd9b3e096b587c9f966af09f0dda9a03fc3a3e6ec24054624627af85b11bad6092424b6fba9aeb43bf28cd7a0f5edf022c3fbe2dbf
+MISC metadata.xml 659 BLAKE2B 60579ae24985d8227bdde8c0fd62b1deee92cc7e20875c1e20b54815e0f4c987040cff79c8bc5dd0ad8e0413d70bb4401b696c70626f217c0f637886855f1745 SHA512 4daa112e2ff34c558e96bf4bb6684df4a49ef670d6fffb9176ee2a9370ad878a75041aea9eaf8222794e53bdca7f16201c9c68623c53a43af5f4e80c8426cf3b
diff --git a/dev-python/sphinxcontrib-github-alt/files/sphinxcontrib-github-alt-1.0-init.py.patch b/dev-python/sphinxcontrib-github-alt/files/sphinxcontrib-github-alt-1.0-init.py.patch
new file mode 100644
index 000000000000..e4274fd429ae
--- /dev/null
+++ b/dev-python/sphinxcontrib-github-alt/files/sphinxcontrib-github-alt-1.0-init.py.patch
@@ -0,0 +1,8 @@
+__init__.py for sphinxcontrib_github_alt by Marius Brehler.
+
+Patch by Marius Brehler <marbrbre@linux.sungazer.de>.
+--- /dev/null
++++ b/sphinxcontrib_github_alt/__init__.py
+@@ -0,0 +1 @@
++from .sphinxcontrib_github_alt import *
+\ No newline at end of file
diff --git a/dev-python/sphinxcontrib-github-alt/files/sphinxcontrib-github-alt-1.0-setup.py.patch b/dev-python/sphinxcontrib-github-alt/files/sphinxcontrib-github-alt-1.0-setup.py.patch
new file mode 100644
index 000000000000..2bc518c2cafb
--- /dev/null
+++ b/dev-python/sphinxcontrib-github-alt/files/sphinxcontrib-github-alt-1.0-setup.py.patch
@@ -0,0 +1,19 @@
+setup.py for sphinxcontrib_github_alt by Marius Brehler <marbre@linux.sungazer.de>.
+
+Patch by Marius Brehler <marbrbre@linux.sungazer.de>.
+--- /dev/null
++++ b/setup.py
+@@ -0,0 +1,12 @@
++from distutils.core import setup
++
++setup(name='sphinxcontrib_github_alt',
++      version='1.0',
++      author='Jupyter Development Team',
++      author_email='jupyter@googlegroups.com',
++      url='https://github.com/jupyter/sphinxcontrib_github_alt',
++      packages=['sphinxcontrib_github_alt'],
++      classifiers=[
++          'License :: OSI Approved :: BSD License'
++      ]
++)
+\ No newline at end of file
diff --git a/dev-python/sphinxcontrib-github-alt/metadata.xml b/dev-python/sphinxcontrib-github-alt/metadata.xml
new file mode 100644
index 000000000000..33f8e973dab4
--- /dev/null
+++ b/dev-python/sphinxcontrib-github-alt/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marbre@linux.sungazer.de</email>
+		<name>Marius Brehler</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Gentoo Proxy Maintainers Project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">jupyter/sphinxcontrib_github_alt</remote-id>
+		<remote-id type="pypi">sphinxcontrib_github_alt</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.0.ebuild b/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.0.ebuild
new file mode 100644
index 000000000000..f34c1f9ae534
--- /dev/null
+++ b/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6}  )
+
+inherit distutils-r1
+
+MY_PN="sphinxcontrib_github_alt"
+
+DESCRIPTION="Link to GitHub issues, pull requests, commits and users from Sphinx docs"
+HOMEPAGE="https://github.com/jupyter/sphinxcontrib_github_alt"
+SRC_URI="https://github.com/jupyter/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]"
+
+PATCHES=(
+	"${FILESDIR}/${P}"-setup.py.patch
+	"${FILESDIR}/${P}"-init.py.patch
+)
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	mv "${WORKDIR}/${MY_PN}-${PV}"/sphinxcontrib_github_alt.py "${WORKDIR}/${MY_PN}-${PV}/${MY_PN}/" || die
+}
diff --git a/dev-python/sure/Manifest b/dev-python/sure/Manifest
index 9965a164ffbb..edc70bf8d72f 100644
--- a/dev-python/sure/Manifest
+++ b/dev-python/sure/Manifest
@@ -2,7 +2,7 @@ DIST sure-1.2.24.tar.gz 28089 SHA256 5c0456a0bfec40ffe57bf9f1f1d4f6cfd4b92848b8c
 DIST sure-1.2.3.tar.gz 16921 SHA256 f6200277de5b63094f2d1d384967e19a95be53ba664bb7a748b3b183e5cfadf7 SHA512 79f9e7639e468e61858d70cb3184c44e9de30d1ecefb4701e3a305b9fc231b9a4df27e795f8b31da6ddc221ba002bc83dd59621e7f364598c80b831a4bcc9fa9 WHIRLPOOL 1c2d5d58b2765e1ea89bb27d079083479f4460a01ae735268fbc82148643348a8796ec6142b39e4a188fb6bad16a130578b66ae52bd2ebe112bd2972cd6cc54a
 DIST sure-1.2.5-r1.tar.gz 52128 SHA256 8a77c1372f3bf9784310b3cf0ab66e86190b531a2b68e47616bce0e4e4983fbe SHA512 733df3a9482cc23e5f078b554a80a726ed87f4ac307b00166d5ad7d8d40de47fe7d77a7373b213d75fc78849a2ba0dbea89f71c6f29449f52eab448fdf847c45 WHIRLPOOL d466c9a6016f636f2b388ed001c12f7e050184b2b54507e1ef5ead4899b2ab8433022254645bd7a989f15105d768902e18289c8f23cff82277d422811f1b7cfb
 DIST sure-1.2.5.tar.gz 19048 SHA256 63f9861f607c5a27d090edaf91e6c93421a11ae1c011171f7394f44ccc391cdc SHA512 41f097318093b7e1683c38cae7aad3551bcc4e82918d3005388ce660c81a014b0939d3ad9dc12905c50892c82282c3e90aadb01ca7600b593d09afa2549c7135 WHIRLPOOL ea3bb51d9f0b375656b248c80c0a381fc026347efb0a94c856fb319c1e6f1e7d9e6e5a665f57e835a4fdb50060f3b2fa4c9168e8f61ae01af5a05bfc337a9481
-EBUILD sure-1.2.24.ebuild 906 BLAKE2B fc6bb16f9515fe789a456f035ce1768670da6465e9f1c46e4fa54e69b2e370c8fb5b0d61ddf45a96b23741cde36c64bf542c2aaaa1f7943b0c11d830e15d7e01 SHA512 309ea5ab70035eeb265f0d3c00f3b2a550c92884dc20ae2d863021a4766c63879dd2e9c5f47b147edbb423f4f9887ef9adb1bada52a295944c3d87e77a1e3d9d
+EBUILD sure-1.2.24.ebuild 905 BLAKE2B 2a07e7c9721893aba10c0c45f0700ccbce39adec021f3f8f977a6ec744cebe6afd4bc0cbeef09bdcdd128866988c72dd67a18da7264fd6c0f97a9159c7c0cf73 SHA512 6f2a1ecef4d787855dc7e1f2c733a8a7b6c1059bc7dd68e599a33db4af1c5a2022a3d1f8ffe2a00421cb1e87d237d7c2d57f69242b99563481b50cd9fa08d49f
 EBUILD sure-1.2.3.ebuild 462 BLAKE2B 742545bb12249769c4ce0b2a247739bcd07d6a108d993abee31bc7344e8283d01a9447b2484986ea17569ce04816b46b10a5b26fc39c4d544f0a9f67d240ace7 SHA512 20aa3671374141221a822ce12bce5dec56b8b5bfefab1e15ccd9b85c33dfddcc89c43fd87078c5c0ea9597e7f33c382ac04b4aaa5aa3fc04f6d8f19174678116
 EBUILD sure-1.2.5-r1.ebuild 904 BLAKE2B 5b3f02d28199cedaecc74d96610f8619149be60c61c9086bf39c9492a37a522e703b1ccbabd62a72a12f732f02b601b0e377e874fb9a0ece8f560de6ffb68faa SHA512 ee29b6d960a543ca83f959e7f6943f14272dbcb5a5934b993c7bd532bbf6022c897aad282e30cc444604c4511f9eee7eaa57c82800c27e504acb298c8edec064
 EBUILD sure-1.2.5.ebuild 462 BLAKE2B 742545bb12249769c4ce0b2a247739bcd07d6a108d993abee31bc7344e8283d01a9447b2484986ea17569ce04816b46b10a5b26fc39c4d544f0a9f67d240ace7 SHA512 20aa3671374141221a822ce12bce5dec56b8b5bfefab1e15ccd9b85c33dfddcc89c43fd87078c5c0ea9597e7f33c382ac04b4aaa5aa3fc04f6d8f19174678116
diff --git a/dev-python/sure/sure-1.2.24.ebuild b/dev-python/sure/sure-1.2.24.ebuild
index 66ed053658a2..3bedf40c6b13 100644
--- a/dev-python/sure/sure-1.2.24.ebuild
+++ b/dev-python/sure/sure-1.2.24.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ppc64 ~x86"
+KEYWORDS="~amd64 ppc64 x86"
 IUSE="test"
 
 CDEPEND="
diff --git a/dev-python/thunarx-python/Manifest b/dev-python/thunarx-python/Manifest
index e44dd0d7e414..b86a4debb505 100644
--- a/dev-python/thunarx-python/Manifest
+++ b/dev-python/thunarx-python/Manifest
@@ -1,3 +1,6 @@
-DIST thunarx-python-0.3.0.tar.bz2 303035 SHA256 5650e045565af82f3a5f67bbecb46182b502a37f94d08c23adac697dbb4ce258 SHA512 9be3e8b50cd668e0b63fbf54da5dec3685dde40528067b35bd1cfa87db7e037962baafce3059818a7de76101472a2b07ae209c590f2f143dbc71646e8addb28f WHIRLPOOL cfcf986b7ca9bc2fd50d4d5bbb80c6df7ac557e3ca15703eada5c71a302d4275cee7972d13cb3d746e064caeb9e90f366819045bc109d761bcc898ce5a70d577
+DIST thunarx-python-0.3.0.tar.bz2 303035 BLAKE2B af0193a3bc97c859ba98f52c612d5af81c5b7a0d8142a8283cf2b308fa183ac57ac1a2163cd882749b6fd33e0529f20f1f9e2db2dcc1aed26cb40cd5995780fb SHA512 9be3e8b50cd668e0b63fbf54da5dec3685dde40528067b35bd1cfa87db7e037962baafce3059818a7de76101472a2b07ae209c590f2f143dbc71646e8addb28f
+DIST thunarx-python-0.4.0.tar.bz2 332620 BLAKE2B 768a2a236e12d298efb3abc86f4a339548248f5f88366ec7d956249c028474612b15c340976ac2c2ced806a89517278c70b50069d76b2eee6af6dd097789e275 SHA512 fb54f83c11857ec2236a249895954efc29446120c192b8d19794b7e8145836969f87d1efa524bfaa4c9d31ee08a2c17a57d7210ce4a3a4982780d128839d02b1
 EBUILD thunarx-python-0.3.0-r1.ebuild 945 BLAKE2B 6e21b84d4696ef1a37125ffe6faf0a99747d4a86a4e8632fd46c567240dba91500d7dfe1fc2248e454f0451cda3de091efd5551b3be7115facab3cbf5d4d9ab0 SHA512 aedb93000543f01385a0044f5c1af7b95240bb7131c6239e1297f31ef3a8d8b23c271d1011371c603c260f26b5c46eb4eb519377441f646cbbd4a187b1201781
+EBUILD thunarx-python-0.3.0-r2.ebuild 772 BLAKE2B ae1189ce1ed8d56f8f88d260913451c21a8e74942fa6239cb1545148f6e773b3eb0ef488c64ecf4114bbbb81af6e76d118af2d4ccf84f903a2c7187841a7d94a SHA512 b07942f687325fad89861bcc745623d2e8cc23a0bcc087f5a56924780bac33127af57069d02f8f24cb138a7f7422966c68fffe1a6dc143b1b65089dd304dc83a
+EBUILD thunarx-python-0.4.0.ebuild 753 BLAKE2B 271f58f98f3b0487625d72e037cd5fd6470ca5fc282ad510e89e75e9fbb970101faf830c0801be1b3113e0bc7cc6b99eb07fd0d6195a267d45029e79727bc403 SHA512 c054426c2f48de127413768a92774c8da2ead3a66c111863e71b7a14853190b3af7bae4d33db26aac18e0d935bfc86c78c05392e4834f5f9ad6fee19b7997f72
 MISC metadata.xml 357 BLAKE2B 48cf41f710ba774f8adaea9825d2b72803e19e55a76afea97cec934449c0723d7ca411ee20297652179abd621bd6bbf533aaed3ebe0d6601b13ad26840d225c9 SHA512 f707818cf1217c314e8c0a18c990f4b1e65b358e7fefe68490d59956c97aa40a2f2b0130d89a54a658dc2caea11e0c5a01f04553faab53dd32513bc299e90b58
diff --git a/dev-python/thunarx-python/thunarx-python-0.3.0-r2.ebuild b/dev-python/thunarx-python/thunarx-python-0.3.0-r2.ebuild
new file mode 100644
index 000000000000..437e445d932b
--- /dev/null
+++ b/dev-python/thunarx-python/thunarx-python-0.3.0-r2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1
+
+DESCRIPTION="Python bindings for the Thunar file manager"
+HOMEPAGE="https://goodies.xfce.org/projects/bindings/thunarx-python"
+SRC_URI="mirror://xfce/src/bindings/${PN}/0.3/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}
+	x11-libs/gtk+:2
+	dev-libs/glib:2
+	>=dev-python/pygobject-2.16:2[${PYTHON_USEDEP}]
+	dev-python/pygtk:2[${PYTHON_USEDEP}]
+	>=xfce-base/thunar-1.1.0"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+DOCS=( AUTHORS ChangeLog NEWS README )
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-python/thunarx-python/thunarx-python-0.4.0.ebuild b/dev-python/thunarx-python/thunarx-python-0.4.0.ebuild
new file mode 100644
index 000000000000..5f2803170adc
--- /dev/null
+++ b/dev-python/thunarx-python/thunarx-python-0.4.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1
+
+DESCRIPTION="Python bindings for the Thunar file manager"
+HOMEPAGE="https://goodies.xfce.org/projects/bindings/thunarx-python"
+SRC_URI="mirror://xfce/src/bindings/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}
+	>=x11-libs/gtk+-3.20:3
+	>=dev-libs/glib-2.30:2
+	>=dev-python/pygobject-3.20:3[${PYTHON_USEDEP}]
+	>=xfce-base/thunar-1.7.0"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+DOCS=( AUTHORS ChangeLog NEWS README )
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-python/tinycss/Manifest b/dev-python/tinycss/Manifest
index 567ba5942cce..20d043d76859 100644
--- a/dev-python/tinycss/Manifest
+++ b/dev-python/tinycss/Manifest
@@ -1,5 +1,5 @@
 DIST tinycss-0.3.tar.gz 72860 SHA256 a4adabd1c417080372c789220f7f9985995e74f2fb612848306872a232862cde SHA512 1fdf29777ee7b3ef39cf2169d8f464a7e5aea850de8a7976acf3ed9e73e831ea0d7ee52b4c8c9979b2263509cbffe1bde85cf6da178ddeaac9009ace7a2b4441 WHIRLPOOL 2fc7433e2410e8641f2c939f2d22ba3ab423908e20213559b34e8fb5002776a9ddfe7640c8a68c59af05b1c0e1493481c315011bef8055afd858e7a4c66ebdd4
 DIST tinycss-0.4.tar.gz 87759 SHA256 12306fb50e5e9e7eaeef84b802ed877488ba80e35c672867f548c0924a76716e SHA512 13a50332cddc28026fd7ecc007e14085976284e69de6ea93d1013502fd9791694092c010947b13dcd23f3a2df65f277f62410abd90d03eac16fa5af913673b0a WHIRLPOOL 4770396bdc4798ff06252cd11f2723211a1cdf7789c735b270af4bd00d96c5d1d71b4d42d3ad7f597f92575bc6ed26d7c6238186afb655e6b30d85f61e82af40
 EBUILD tinycss-0.3.ebuild 650 BLAKE2B c3c4f42436a3c714ed90f10a7f32c3931dd6cac79f521994597725b551dbc33002532b7e24b3f997fd73aeb87de93d43b458facbbe98d6964eeab652a7ce1c93 SHA512 3643d2c38c0b308d5d2d8eff65700f5fbeffe3d5f9b47fbdb1c04f22656862e04deeb5b5bd919d8c4b34ee3e4fb6eb56127259e7dda7b14bae26b90f815249bc
-EBUILD tinycss-0.4.ebuild 811 BLAKE2B 19b519a9f2e565c876730b57cdb7f467aaa362428d937ea975698a321d213e458458461e848553a1e33c43aebb08ba53b1460dc8fded5c6b99f2ccec4685a91a SHA512 c12027dc010798df8bfae8f3970883af24fc17504122247ad3311f716028c767d00ec73e8e39e81f3e85c79286e4c6b999350a87a3b96153acc1ed2843923c70
+EBUILD tinycss-0.4.ebuild 810 BLAKE2B ad9ebbb5d15d8cfc1f194c67c6a2bd9f8a4e33529ebfb0ee721c5a701b764f52b2e2023e9d5e270dc97b9a50f916acf00482c87d10988dcd1d8320ac19dd53db SHA512 e4722180287b4d4e4ec7a6a7fdfa510fd63a6b8c2203f0700308e88a04481c89dd3edfded27aaa0eb716ad5a1e24c747ca753c33f3a484458ab047361becbb30
 MISC metadata.xml 380 BLAKE2B f32bbbd80838a147ab80701c03462b8949aa987f47fc7bb8cb2127720937888f484b7f1ceb9cb490901d07782c2c0c261e42277b55e39d78c44a05173391282a SHA512 b5e7005f5f93ebe86cac3643711928d83456e5ccbfcccbc3dc008daca1e341285342240cc032f69042bc5a19739679ec0ae5e2e2d83c46dd57395ab9e1c12bb1
diff --git a/dev-python/tinycss/tinycss-0.4.ebuild b/dev-python/tinycss/tinycss-0.4.ebuild
index 594f08dc3b2e..bafc7eadc439 100644
--- a/dev-python/tinycss/tinycss-0.4.ebuild
+++ b/dev-python/tinycss/tinycss-0.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="test"
 
 RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
diff --git a/dev-python/ujson/Manifest b/dev-python/ujson/Manifest
index b0e1ecee3ec5..4556c0bcd3d9 100644
--- a/dev-python/ujson/Manifest
+++ b/dev-python/ujson/Manifest
@@ -6,7 +6,7 @@ AUX ujson-1.35-standard-handling-of-none.patch 2563 BLAKE2B 55a2ad075f7ed348ec4f
 AUX ujson-1.35-test-depricationwarning.patch 369 BLAKE2B 9fbc92d557049d8790b664ef60a908b99f6cd657c5ade674979f1b05e4c61dbb514eba09d3727c6c61eddc5b08fde5043cdd2af0477c996d9fe9bb43a4838380 SHA512 71fc8012f1701a35def3d7533d8d8d4133550dd57bd22b11e1dcd2806d25e185678f047cc1fe61a35132ed1d546d1411d452bb0e7af66aefe9b53a99b5ef3c66
 AUX ujson-1.35-use-static-where-possible.patch 19904 BLAKE2B dcf5691a43dd068635f6be23b9dc5c3a7ff2d9a66c836dc75954f7625f7aef4d55e06e90f3c030f8bc2f4db80b34cb540e09183939880bbf32225bc23c58f3fa SHA512 fe96f88cde477bfdc63ad5cf360ab6c63e2cf00c192a8d70d80340b7e39820ca53554a775c8f32b7ca43259e9f299fe38ebaf4aa64ef12c035bf23085f5b5789
 DIST ujson-1.33.zip 197034 SHA256 68cf825f227c82e1ac61e423cfcad923ff734c27b5bdd7174495d162c42c602b SHA512 0f1f66212fbf94c03e048ba64c3bd817c50443d1a29b87f6a3a38f697a050f38821be4ba36a3b17a96930c69ee92973ac31bdd41851dea071af14cd4bbaf8480 WHIRLPOOL d3080fcf3e979b43deb8fe099427a8311c55e7e54105626bf12b3b6fe9e8567f70501884bd24b7a26d53ddfcd98f535de4aa708801106aa4a1b76e543217835c
-DIST ujson-1.35.tar.gz 192027 SHA256 f66073e5506e91d204ab0c614a148d5aa938bdbf104751be66f8ad7a222f5f86 SHA512 931d8f574fc4920c9ded48369774666060e951f40982606ce9f1d9de3420004042af7d797075a54d92a2b25c4f313572a5e1a30f3bc8ce387ef8f3881193eee7 WHIRLPOOL aff7a034304366e95ec51164de78afbee8daa496022abdae1b9928ea90928758e675027f2202ca77790788a3057c978d9ba9348684bc087843aa2e16932a1144
+DIST ujson-1.35.tar.gz 192027 BLAKE2B 320058e7142f2264bee8b02a411bedb3b32d1c2fc86157eb47272f75cb401e6c75ce7d9e3dba5092cd1db99dbded8804347d4c7be11eaedb47bc8b4b8125fbd3 SHA512 931d8f574fc4920c9ded48369774666060e951f40982606ce9f1d9de3420004042af7d797075a54d92a2b25c4f313572a5e1a30f3bc8ce387ef8f3881193eee7
 EBUILD ujson-1.33.ebuild 1144 BLAKE2B e703deae7eb92e1b7c06c6180c29197ac4b8da8c02457f2c5c0ca7200a32ff6056cebc182c5c1953bcb756e81439ea4ae835fd944be2e4d1f0ba50828aa181d3 SHA512 c36504fe05d23c5b17278fbf0056e7aaa07ef66cd589693e81d1df0c83af3ad5b142fed7b2e15ec33853b8046992354a54adebd94a1443ee6503ecd2e6263eb9
-EBUILD ujson-1.35.ebuild 847 BLAKE2B 7ba28f486a653032c88e4bacb37c6dbdec822efee086d90a35c41f7a9527f566ec64c6e220fe452c230df88b38e5187c6bcdc2c3f86ff2ca11699a6eb67da38a SHA512 79109e0a3085a5e74deb1cb919015b616c1c724a314e5f7d00b217bec1f01635f63cc0c032fcc2bc8787db29f98d86d098d6bc40d82a3468f75e02e2744ea4b6
+EBUILD ujson-1.35.ebuild 935 BLAKE2B f45d9b803b43b53247befe6a9cf1a1bb50fa61b865f55da989aed70bae96d3a7025d64c62d7e5c24dced1af367a1afda3dac95c5e9f2fb27993909e5dc91b765 SHA512 69224d45121d8ecf7020e6880f52eaf395a92e3ba9ed5024089147a9aaad37fb9db72d29869bbdd795393af27c3f13d0d046b40536870ab9b2029d6fd83766ba
 MISC metadata.xml 432 BLAKE2B 9218fa7b4dcf0c44ae1d5b30869a2f8981dc03714245aa258de0552e5f27de7cc359acdcb8d22da82069bcf465a91ac7d4401f111cf52abedbe4451e08d67153 SHA512 485e866809b2704a344436f956dd242b8720ecf46daf53a7a64fcf8a5edd3b3915faf59d48da4224b361ba35f7ab8c346e16b0a037cf8846d663d175486bed8f
diff --git a/dev-python/ujson/ujson-1.35.ebuild b/dev-python/ujson/ujson-1.35.ebuild
index 19d94beed916..d4bc42da494b 100644
--- a/dev-python/ujson/ujson-1.35.ebuild
+++ b/dev-python/ujson/ujson-1.35.ebuild
@@ -12,12 +12,16 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		$(python_gen_cond_dep 'dev-python/unittest2[${PYTHON_USEDEP}]' -2)
+	)
+"
 
 PATCHES=(
 	"${FILESDIR}/${P}-sort_keys-segfault.patch"
diff --git a/dev-python/waitress/Manifest b/dev-python/waitress/Manifest
index 5288f5547495..02c6a183c185 100644
--- a/dev-python/waitress/Manifest
+++ b/dev-python/waitress/Manifest
@@ -1,5 +1,5 @@
 DIST waitress-1.0.1.tar.gz 123934 SHA256 2daacaece189ede6a23440afe03bda58089a6207f1d80a1e9497f979dfb741fc SHA512 0205a0a5fc9e65e20370fc1e97ba456337313c93817e9b2b283610e5045eb32de80f45d19ee0cfb9469a93e4fc9267b785feacedd70b362474f4af5c05a3ab21 WHIRLPOOL 0eca4eec79b894fb561a894f26de1adbe45c70335c66f589d66b26d9c68a708c443eaacded46099d23401390ee45743b8fa2bc39e744f61a988f6695e8c83ea4
 DIST waitress-1.0.2.tar.gz 124685 SHA256 c74fa1b92cb183d5a3684210b1bf0a0845fe8eb378fa816f17199111bbf7865f SHA512 b7000e1198ac306ce189f70c5dcfcf41318e5ec47c8d6183cdbc360c8759ca726405d5da70f1c7fe3cfeb39d528af94d693767c2a7a1a7fe460c6407857ec6f0 WHIRLPOOL cb8f6c3602540e5978c10218eef52c88a711855097f2ea646c8ccdc12c89b9df642dce994b17b1e8bbd9bbf8b18d6be2da506eebe3201e63b895207c1af9407b
 EBUILD waitress-1.0.1.ebuild 797 BLAKE2B 67eb57070f777a7bd54d72b92578970f88f28d0eda42e8790628328a9a82e4f9e9f6c3bde9bfc0359a0260a2fac5ec058fe22db12a2916c562ccfe6781276e67 SHA512 a9b6288942450bafe1f52f8e368d19492feb50db0f29df91853498e4836450b5feec1db4c390d5265752bb0b76bbac5f1f7388a0e7007ed2b267a722d7599060
-EBUILD waitress-1.0.2.ebuild 794 BLAKE2B 42a876b287d1c8a3154e4afd11c386fc425a7de289d4b94b8b8af6d7b31716ea40fe9b687bea785fca71e6dc25c7c085e6b50af4b8bfbcefbfdd320bc7b05a52 SHA512 4dd63a8529ac3d41d6432a2311c73201463c527e6f5a72da9a4d1bf4e833057a3961ff6e1e2ebc667e66eb78f324b45091c7befc53b0745b20bad4cffa817a89
+EBUILD waitress-1.0.2.ebuild 792 BLAKE2B 82607e0fbb41336b835211fc020be62e135686ec408c418a95221a5178b653538e68613ca9726b742a4570ef39ed989426fe3a340ee76e15be9e3537c7414377 SHA512 de120146ccc9d4082c7e9cf55618416cab664b42388bd3929dbc1a264b8dad7212a6585cbce56d23545b2755f3288c700957b3155a1a924635a07125b3a6ebf0
 MISC metadata.xml 378 BLAKE2B ce0ade449ef1c9d58ced1c883c0adb2a27573bd74f5299bdda36ee60fe073a56e8c44f5a81a36bdd7fa2c595c1a2f55abd3eb876fd5d0909256bff4310fdaabc SHA512 02bd27d7e984ce3ca047d34dd5acfe9c0b23e9d8fcf59484262e19e9df1206939fe2837a58ac00fe58575c2db4abe28b89a5a1c8a8b887d346c30635ee2b10fe
diff --git a/dev-python/waitress/waitress-1.0.2.ebuild b/dev-python/waitress/waitress-1.0.2.ebuild
index 7d407a99d663..550e02402a9c 100644
--- a/dev-python/waitress/waitress-1.0.2.ebuild
+++ b/dev-python/waitress/waitress-1.0.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/wcsaxes/Manifest b/dev-python/wcsaxes/Manifest
index 8b84e9c578c1..f5a4c0e71067 100644
--- a/dev-python/wcsaxes/Manifest
+++ b/dev-python/wcsaxes/Manifest
@@ -2,5 +2,6 @@ AUX wcsaxes-0.8-disable_mpltest.patch 366 BLAKE2B ff4f6d28225fbfbc5df0c7c6214157
 DIST wcsaxes-0.8.tar.gz 226456 SHA256 3ada54586add52e70ceb5aff9257ae9c38a71d1889fe335bce3d219c5a03c672 SHA512 77a08a99b4b3fd4f08633a10d4a3dfd6726bc1433aca2c2bdb505fd93c79a5ba3735523697c11084f0044a22a5bda345a946f5770185815f92b71b59c7fc0769 WHIRLPOOL 3acbba0c1c93f4d2ceeea3d4f236f7294e3eb306b7f3f8be7244aa5b7f35452cc21c072a5f054a7608238262f6cc0dde19b40f02cd9705182430fa0a6e9b0470
 DIST wcsaxes-0.9.tar.gz 213306 SHA256 fd1897f611c48edee00b05bdd7bb238372843b9a8b8f7592cb0d5a7ed4d15b53 SHA512 ae5a69f6f7ab71d186a128d902ae2f6d2d1d8a8b3358af88da120815493d24ffdc5d7a07ee96efe5adc91f68822f070b3d667e52e7cee5ac501abe62a468e2c4 WHIRLPOOL 1232bc214082c1e7ed0bb362758e84b2f3601551b3f120cc6451f1e7b4e211d959d515f089c7b50fd505ff7e3c037bbe9138c117576ec69151f0dc7de5e69e1a
 EBUILD wcsaxes-0.8.ebuild 1369 BLAKE2B c356fb25dc454b118b91d85a788335c783ab0c805ca6d4084c452a74523727df5c4e6b2c062ca7929e041ac62e2ae6dfdc916473f9aa23da8a19af8eb16ade6e SHA512 24778db90866580198e3edbc77b07c46c7f66ee32ac77e6b005f7a9e4831538c6ca1395079465e439cb6345f5fbac1989491c9278ec6aa80c340447742778efe
-EBUILD wcsaxes-0.9.ebuild 1495 BLAKE2B 27d969595a4e4af6f81e84c19572d97076a2fc1380395cd8aad4a0259c005d41f852d1de998a645f33f06be1b762fe336b6ff3ee7140757e34792a770cc35aec SHA512 619dcdb539f744d75a32f29306446a8f1a81acf03b6adc0a9734c9faa69059747544bab6823b73d8bab9f26e75843ab4395dfdb2314018faf7e8fa92a3be9289
+EBUILD wcsaxes-0.9-r1.ebuild 1496 BLAKE2B c311ca021fab17c812ce1019559d8264cc5342d03a62e7ae9a196f5da0db1d038a6e85f11863a2edd094a21e0f86edc6c8e360f32f517f76dea535a037786243 SHA512 a7b11fb8c9126097effa7e81499b2c5ae80379b519331beddcb5d4a60a9bb710e75f30d4ef6a2600b0928cf9c818d13238293b41cf552d56c0ce43bcf2e4c07c
+EBUILD wcsaxes-0.9.ebuild 1491 BLAKE2B 5942bb5f77e1e1d317409f149a852f64fb0d8d1a0df499fb74d8c97010dec4e8a8e1fe4756afcc18d1c0779f612be463968cccc6e821bf239dfa1009d19251d0 SHA512 6c0b57603ce96b54728322a01b0022bae4fd45489ee503388820fdb18aff62576baab99743a90ed219a0907471b5bd89c3e9a0d9a7968c89ff83b5b36a5f9366
 MISC metadata.xml 442 BLAKE2B 37a185bc318660ebf74b6fa15580a1935b1c305de8f1ba4fa19f47a0ce359012ac81ac4b00e683cc50a7b4098f3bd9961a6e1cf5e3af182b1c5c59ae13e6e180 SHA512 15756a6d3a6b4496eb16e989953302f3e61fc8547154b96b6dd63bb72cb0cdbf366ce9d4e3cc9efc1577c665ede63052a330e41d9421b3664112dcd5bd2a4859
diff --git a/dev-python/wcsaxes/wcsaxes-0.9-r1.ebuild b/dev-python/wcsaxes/wcsaxes-0.9-r1.ebuild
new file mode 100644
index 000000000000..73dbb6fafe0b
--- /dev/null
+++ b/dev-python/wcsaxes/wcsaxes-0.9-r1.ebuild
@@ -0,0 +1,59 @@
+# 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 virtualx xdg-utils
+
+DESCRIPTION="Framework for plotting astronomical and geospatial data"
+HOMEPAGE="http://wcsaxes.readthedocs.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/astropy[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/astropy-helpers[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+	  dev-python/sphinx[${PYTHON_USEDEP}]
+	  dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.8-disable_mpltest.patch"
+)
+
+python_prepare_all() {
+	# use system astropy-helpers instead of bundled one
+	sed -i -e '/auto_use/s/True/False/' setup.cfg || die
+	echo "backend: Agg" > "${WORKDIR}"/matplotlibrc || die
+	export MATPLOTLIBRC="${WORKDIR}"
+	xdg_environment_reset
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		python_setup
+		VARTEXFONTS="${T}"/fonts \
+			MPLCONFIGDIR="${BUILD_DIR}" \
+			PYTHONPATH="${BUILD_DIR}"/lib \
+			esetup.py build_sphinx --no-intersphinx
+	fi
+}
+
+python_test() {
+	virtx esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/wcsaxes/wcsaxes-0.9.ebuild b/dev-python/wcsaxes/wcsaxes-0.9.ebuild
index 898e26934a0d..8a811819eac3 100644
--- a/dev-python/wcsaxes/wcsaxes-0.9.ebuild
+++ b/dev-python/wcsaxes/wcsaxes-0.9.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 
 inherit distutils-r1 virtualx xdg-utils
 
diff --git a/dev-python/wcwidth/Manifest b/dev-python/wcwidth/Manifest
index 9c0aa62ddbec..df4daa0c0557 100644
--- a/dev-python/wcwidth/Manifest
+++ b/dev-python/wcwidth/Manifest
@@ -1,4 +1,4 @@
 DIST wcwidth-0.1.7.tar.gz 22884 SHA256 3df37372226d6e63e1b1e1eda15c594bca98a22d33a23832a90998faa96bc65e SHA512 5bc9625fbd10721a50a3ac7d7f91012cca8e4f83533f265cf56890498bc52a53b155c82e67d6bc5523a5593c8d7992a1dec2a0f590318170eddf987c56f9c368 WHIRLPOOL 3e45d689500952b69fdd78190454bae95b0f124206ad43d3bad9aa1e41d54885c326de60b67290e8ffe60dd4330a65b286f534d0bbb52572da30c958a9dfe10a
-EBUILD wcwidth-0.1.7-r1.ebuild 673 BLAKE2B e2f874d8ade5a4ec784869f53713330de2c0699209f975f202ee920a125e9c4556633ea4d8ca161a3b4c6c9bf5ecf1aa63aa8f04b68d70a7225898ee49f6d67d SHA512 9a019e231d131f10403a63d752b8e5a1c97a35b5f920d7fe50e3c8c3e944c7b04325f0fd76ee48df4246994dc744eaf8de0271638e70d424c3ca19a7ef56082f
+EBUILD wcwidth-0.1.7-r1.ebuild 672 BLAKE2B 90c9cdccd6312a307008fac347980b367de31b55defa1b08a1ec6140cb5e1f80332941cb124a65ff9a872f4ff06e7050cbc9ad7bf25bbe0d66b336cfec8ddf3c SHA512 741b557a20e706c79afd7691b1f449a8c670356795bbf31ab1bb336e0466ef75a57c113aed6b5c79d6a3fe63a00bf86a7f29f16305e53487bbe89f1369e05906
 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 f53458451d05..867250748498 100644
--- a/dev-python/wcwidth/wcwidth-0.1.7-r1.ebuild
+++ b/dev-python/wcwidth/wcwidth-0.1.7-r1.ebuild
@@ -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 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/wstools/Manifest b/dev-python/wstools/Manifest
index f0bac161968a..2bfabaa9a64c 100644
--- a/dev-python/wstools/Manifest
+++ b/dev-python/wstools/Manifest
@@ -1,5 +1,6 @@
+AUX wstools-0.4.5-setup.patch 1874 BLAKE2B e23a2b8b183079bdc72a7304d0df03b4884c277f287b2444e2bfea9db8fa0344c8817d2316d17cff3d654c3eec3fed448ed200d1f873f6b8f85add6b81ca60a0 SHA512 ee0e9523de4f31bc98a993561e55004a9f877160c1f7a83b9ec83d0654a770972cdefe67692dbd01e322f507370aeee8c2927326ec1797c9c81ff52e085955fd
 DIST wstools-0.4.3.tar.gz 148878 SHA256 578b53e98bc8dadf5a55dfd1f559fd9b37a594609f1883f23e8646d2d30336f8 SHA512 e735e2ae63aa410a56c79bef0bec7196393bb8f52d8521001d298b6290a75662f7262b6cd3c3238eeaf33263036cc6dabf8435ebd2fd1c98481cea524d0382ed WHIRLPOOL fa5ca24db23d99337cb08f3317327f6076f230c787477275e54d2322931d4e86831357043df6e8c12f3a62bac95eda13f614120588e9d3265ba40251c68b2881
 DIST wstools-0.4.5.tar.gz 201047 SHA256 499760d87d9bb62fb937669bb9acb2de8a6393dcce3c5fbd3bc693b4a7bdd4ba SHA512 24779bc2c2f3e32a515bc5690038e3f8e487fd45c1b7822d587e1bfd0bda660b837e3d5cbf8248459e06d7606e6d1c404dcee4de35b1f0d353bd5213e197d83a WHIRLPOOL 80341b7e7756cd750ab97983b9175ed6ad7e482c9d3ca5d2a34a3d9166ec68bca107fbf741f4b18379e3b958b4b1872c32ce3274a859bfbc58c16735f749c652
 EBUILD wstools-0.4.3.ebuild 596 BLAKE2B 784ed1f5f0b24e28d76e88ecd6099dfc6ea6040ba4e1e5ab65ff8610951ca98ac686a226a8a11453c3689fafb33a9772425c428f73e209fcb7a1d30315e60432 SHA512 4a25ec83bcbdde5259b17e94939896bc1c7f229cd1183b4e3faeb18864f0e0d3cf5129696ae0c658e0a587c8804eabb6a8e0ac161ae3b7944934dc952e8c6d0e
-EBUILD wstools-0.4.5.ebuild 936 BLAKE2B 29864ad003a5bb5b14998a707f48ec132e6478d088114bf502d89db35ba11bccfb65eed211d09337d1dea4ee1e543007373c5aee2a3eecfeec49356f4302acfc SHA512 dc9308d3e66cf66f9b501b29bffdbd6387f7b9016ce31659a280ee4789fbe9bf3c123433dfa884f381335cf259b00f42ad7ec663854446e7f8d7007085bd1a2a
+EBUILD wstools-0.4.5-r1.ebuild 797 BLAKE2B 099782c313be5b97ff12ec4c790034c97a44c47077ed2f6967c4c6f32189c963836093ed8fd9ce3dd5d9e6f8e88c9bbab4885c2b0f31b6226b7c9dfc4771887c SHA512 e2358aac3e37833028bb268e6a232fc01b68df37e8529ef2c71d4290ce9ab074ae3768857f4051bd00d0da3c6ed2365bd1d47932fb18cfbb3fa0701e506a4c48
 MISC metadata.xml 376 BLAKE2B 4bee67bc37a09d4b34b1f67902a820f63563f87d9771eb462eb7f098955806e025196082a7e6c118e5ab0638c7ee70d1a63c8183f607d1ff9a26f1b0c16d5206 SHA512 fe2f379a3d41b128b1c817d4e56fe92b72541bcdfff4e40e05da8a661ab30b5eb623421ce6ec366cdb8431c924f6132a9d15982f1182f6a1f4c71f8301d954b8
diff --git a/dev-python/wstools/files/wstools-0.4.5-setup.patch b/dev-python/wstools/files/wstools-0.4.5-setup.patch
new file mode 100644
index 000000000000..9de7c159c972
--- /dev/null
+++ b/dev-python/wstools/files/wstools-0.4.5-setup.patch
@@ -0,0 +1,46 @@
+Avoid pulling in a lot of unnecessary test and setup deps.
+
+--- wstools-0.4.5/setup.py
++++ wstools-0.4.5/setup.py
+@@ -9,7 +9,7 @@
+ 
+ from setuptools import setup, find_packages, Command
+ from setuptools.command.test import test as TestCommand
+-from pip.req import parse_requirements
++#from pip.req import parse_requirements
+ 
+ NAME = "wstools"
+ url = "https://github.com/pycontribs/wstools.git"
+@@ -55,13 +55,13 @@
+ 
+     def run_tests(self):
+         # before running tests we need to run autopep8
+-        try:
+-            subprocess.check_call(
+-                "python -m autopep8 -r --in-place wstools/ tests/",
+-                shell=True)
+-        except subprocess.CalledProcessError:
+-            logging.getLogger().warn('autopep8 is not installed so '
+-                                     'it will not be run')
++        # try:
++        #     subprocess.check_call(
++        #         "python -m autopep8 -r --in-place wstools/ tests/",
++        #         shell=True)
++        # except subprocess.CalledProcessError:
++        #     logging.getLogger().warn('autopep8 is not installed so '
++        #                              'it will not be run')
+         # import here, cause outside the eggs aren't loaded
+         import pytest  # noqa
+         errno = pytest.main(self.pytest_args)
+@@ -136,9 +136,9 @@
+     cmdclass={'test': PyTest, 'release': Release, 'prerelease': PreRelease},
+     packages=find_packages(exclude=['tests']),
+     include_package_data=True,
+-    tests_require=get_requirements(base_path, 'requirements-dev.txt'),
++    #tests_require=get_requirements(base_path, 'requirements-dev.txt'),
+     setup_requires=['setuptools'],
+-    install_requires=get_requirements(base_path, 'requirements.txt'),
++    install_requires=['six'],
+ 
+     license='BSD',
+     description="WSDL parsing services package for Web Services for Python. see" + url,
diff --git a/dev-python/wstools/wstools-0.4.5-r1.ebuild b/dev-python/wstools/wstools-0.4.5-r1.ebuild
new file mode 100644
index 000000000000..9a3d508f201b
--- /dev/null
+++ b/dev-python/wstools/wstools-0.4.5-r1.ebuild
@@ -0,0 +1,34 @@
+# 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} pypy )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="WSDL parsing services package for Web Services for Python"
+HOMEPAGE="https://github.com/kiorky/wstools https://pypi.python.org/pypi/wstools"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-macos ~x86-macos"
+IUSE="test"
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=( "${FILESDIR}"/${P}-setup.patch )
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/wstools/wstools-0.4.5.ebuild b/dev-python/wstools/wstools-0.4.5.ebuild
deleted file mode 100644
index 50f2db48e105..000000000000
--- a/dev-python/wstools/wstools-0.4.5.ebuild
+++ /dev/null
@@ -1,33 +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} pypy )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="WSDL parsing services package for Web Services for Python"
-HOMEPAGE="https://github.com/kiorky/wstools https://pypi.python.org/pypi/wstools"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-python/autopep8[${PYTHON_USEDEP}]
-	dev-python/execnet[${PYTHON_USEDEP}]
-	dev-python/pep8[${PYTHON_USEDEP}]
-	dev-python/pytest[${PYTHON_USEDEP}]
-	dev-python/pytest-cache[${PYTHON_USEDEP}]
-	dev-python/pytest-cov[${PYTHON_USEDEP}]
-	dev-python/pytest-pep8[${PYTHON_USEDEP}]
-	dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/pip[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/xapp/Manifest b/dev-python/xapp/Manifest
index 44d3ccf7d850..056b8f1f4429 100644
--- a/dev-python/xapp/Manifest
+++ b/dev-python/xapp/Manifest
@@ -1,3 +1,4 @@
 DIST xapp-1.0.1.tar.gz 12327 SHA256 da2ec46dc3fce97accd0ee6d9bd9d71d26c953b01de1a5336ba2b4b60f2f3b6b SHA512 7dc4db03476f6972f6452800d2ea58d7f78d0bd5dd6719f2b49d1c2e3315c3fa09c294b1195bebd26357c30b4c43d7e5c01d160708dd17ee488b823344895e25 WHIRLPOOL d8862e41677fe03ff9d4881f19b484cd8b46582de0f03e1a9aa556c2d72a386ac4a6807ea3ec09578af3e390e44df9ba355e7ae667bce51fe2fa1e109ce78cac
 EBUILD xapp-1.0.1-r1.ebuild 535 BLAKE2B bf23bcdb498a22afa47cdfbafd61f2f6474512337e894274bfb078902b62365a17474fc36ae4b851316c9b45fea3e8e1dedc78b7ba0130b7830dbda626b2c257 SHA512 131ffa68263374b5726774799516c78c5ac3a6a61bf1447f70c7b8cc974d9b41829959438e709259502447ac63ee75730f048d96deae1bfae4f3a2bb1e2c3de6
+EBUILD xapp-1.0.1-r2.ebuild 550 BLAKE2B 6ac0054452376b5a8856937fb22100dad8b00ec4d9ba496483cc72fdeb85040848e9413ce2e4d5334f5956203e972a3aa96cc2904ccfb2c57c919d4010c8f824 SHA512 806b450fa6e7228787f4c0cb21886b9d2bd6bbea6077ca870b5116df7cb02e537f896f6073b60e7ff7976a20f3a80624ed7a721c0d866490e47d96907f076a73
 MISC metadata.xml 220 BLAKE2B 3d3008b71006a64b0bc1899c37b1ea3c2048806badd09c02be51a29f1481475c704c5561d84f7caa1905c57e94e2ebe787839bb23b647a42543f31a9d8bf869f SHA512 1aa3933bda5909c7e7907b7c5218f4c214f5ba411fb8fc373e35ee2f490e4ab8a7813549c127b916e3c8b9527853a502fe298af1aa7139c213c2f31847120364
diff --git a/dev-python/xapp/xapp-1.0.1-r2.ebuild b/dev-python/xapp/xapp-1.0.1-r2.ebuild
new file mode 100644
index 000000000000..5e6426fce4e9
--- /dev/null
+++ b/dev-python/xapp/xapp-1.0.1-r2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 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="Python bindings for x11-libs/xapps"
+HOMEPAGE="https://github.com/linuxmint/python-xapp"
+SRC_URI="https://github.com/linuxmint/python-xapp/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="x11-libs/xapps[introspection]"
+RDEPEND="${DEPEND}
+	dev-python/psutil[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/python-xapp-${PV}"
diff --git a/dev-python/xlwt/Manifest b/dev-python/xlwt/Manifest
index 067cbe9aba16..a60658bd17e3 100644
--- a/dev-python/xlwt/Manifest
+++ b/dev-python/xlwt/Manifest
@@ -2,5 +2,5 @@ AUX docbuild.patch 568 BLAKE2B 372adc29b0f7c8f8cb840979f49c555b87ba1e5f7801d5c5f
 DIST xlwt-1.0.0.tar.gz 129588 SHA256 ac432939eec8daa9f88af994ff53f009e607a4e1102772ec0be0b2a86b2c1cf9 SHA512 45788a506635f1ef6380d46aa0af724e511e401e8347dcf48dbf4e2d90e7f4c7f66838cd9616cf58807ffb939daba1f47b0d2cf449f8cb528db41fba84cc8866 WHIRLPOOL d3d344faae89fad012f05fe5b19e5ce16dd144016abf7ea15123a9725c77a732e85d93131c692dbcaf306cdc8d1b06efcaf39227265c612200107d2c20541132
 DIST xlwt-1.2.0.tar.gz 153909 SHA256 505669c1eb6a60823fd3e2e723b60eea95f2c56254113bf163091ed2bedb4ac9 SHA512 e0be61f6a54ac39c91cf03a1a7535c464045539f6a040f000921815e3280bd341770d72f4353891a10dde7c1b51eab4ccb1ae1c10bbf779108346fba8484eef8 WHIRLPOOL 645746c311d8d2b55022368fd8d5baedf4771d66000baaf0f3eda57241c8c1c1d51bed9fb33e85398d9b79803b8a6a350a10d3abb74bdafc8de0e4408771a38f
 EBUILD xlwt-1.0.0.ebuild 1211 BLAKE2B 61c36564af78d4170de883dc283c51ac7e2e4d6f325a515c866421b6e416a3523900080b1ffc6e976f53f0a76a0046695562e9df9d1dc15dbbbaf5eabc175453 SHA512 0d88f97ada93c26eec18880f9e6bf43e22f33b6545a934d550da3719ac9ff2e84f0279d4a3eccfce44a88d30201360777549a2cbf99e724eea66faaf5cd411c4
-EBUILD xlwt-1.2.0.ebuild 1262 BLAKE2B 0ba6abbd3fbea6e540dfbafc143cae43d61f4bc5cb38ef10dff829bd13ab33d974c049697b4e7c5d6abb25733e4eaa847476b0aefb61495a0bb0a72dd33687b0 SHA512 7a0a2de0063f75d3f99e9bca626cea8e7856bd42cc2d74c2688f3d719cfffedcb83541a1fe76869797edb2939360a1b886004407d55ad0d4a62e32f13697859c
+EBUILD xlwt-1.2.0.ebuild 1261 BLAKE2B c17d11c88f4b197a518a35f46656b0fe9037f3c6693b002b94d1c1416fb643a27c4bb11f3bb7ae9fdbaf9ff8c974989134a05049d882d563b143e889962738ed SHA512 d8fc3f213a98f57b2fa7c66d073bd4ed235670ee2ea567c8cef359dee7feee10c48b70f9afc2ce78f1dc40fc5ef6ab13af67c06f51d2d5cf29a1b3ad4e0f3cf7
 MISC metadata.xml 659 BLAKE2B e2b6dbf5e4f15d1c105a7d4e6d6e9014feaa235b203818d0d6bad64e9156bbad060e02d3e7e54bebc44e5e6a85d6c10e516e0793dcc0dbd48738ffa4e63ef069 SHA512 eb8056746b86c2e29196ab25a01cdb899716b4a76f6dab5134e863d43882df8b68ad1374a6c81733560612c187beeeda5106bfbb3aef3881c3b7a476db91921c
diff --git a/dev-python/xlwt/xlwt-1.2.0.ebuild b/dev-python/xlwt/xlwt-1.2.0.ebuild
index f2f6f8804d9c..1142f09ecf41 100644
--- a/dev-python/xlwt/xlwt-1.2.0.ebuild
+++ b/dev-python/xlwt/xlwt-1.2.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples test"
 
 DEPEND="
author	V3n3RiX <venerix@redcorelinux.org>	2017-12-01 03:04:39 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2017-12-01 03:04:39 +0000
commit	407525b571b48cfd65e1ad7a02d250a927c967c9 (patch)
tree	844bea44d85dc7218f54970af1c42cc9d55c3f1a /dev-python
parent	89c6c06b8c42107dd231687a1012354e7d3039fc (diff)