gentoo resync : 15.11.2017

author: V3n3RiX <venerix@redcorelinux.org> 2017-11-15 17:13:45 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2017-11-15 17:13:45 +0000
commit: e2d84e38284aeb9d522a7e935554340ddf0e4a6f (patch)
tree: 5a7444ee5f2af59431481999f729676090b1e0f3 /dev-python
parent: 519e4d5d99fc43d5c9a038098c029dc4ef9d6792 (diff)
65 files changed, 932 insertions, 208 deletions
diff --git a/dev-python/PyQt5/Manifest b/dev-python/PyQt5/Manifest
index 7527802cfc79..f0d70ed391e1 100644
--- a/dev-python/PyQt5/Manifest
+++ b/dev-python/PyQt5/Manifest
@@ -1,8 +1,8 @@
 DIST PyQt5_gpl-5.7.1.tar.gz 3733746 SHA256 be849f212a074049b9ebc10b6c07dddefb86e6d30e8df8a5c715cbb2cf7fad14 SHA512 7498713f73807522e58ae38ff58548cf80c2f2c418d6c55e20ce613cdc997e4ee7139076f1f152c7c3edb970bde14febc3496009f934e31ff71f01a1605f558f WHIRLPOOL 9322ccaaebf78a9e177703bae26f002cdfe9ad3ba45a9c7b9ccdd3b73cca96550e479b243b302d59eefdc1520a6e5b5f18ac5fabc1f8eff36f7f76d71b7dea11
-DIST PyQt5_gpl-5.8.2.tar.gz 3744907 SHA256 ebd70515b30bbd6098fee29e6271a6696b1183c5530ee30e6ba9aaab195536e8 SHA512 8b765b9ae6210b7312a2dc6ed94d2664ae569625fe8a27443bae4230d9d9c00e0cf3b4be6904c66ebceff5cd5bbd19a5a9794a0b3222c8098a55f0b94fc8d89b WHIRLPOOL a2cf7d65f73b0cba7d37339e22b4bb8d3a4a924dbbd4d093943e299cf4d96dfd66e81ecfc4a5bf570f37f33eaad458849d7ef93ea22b115eece88866067f2e22
+DIST PyQt5_gpl-5.9.1.tar.gz 3101819 SHA256 5fc009448ea78c8fd48eb7083a7b93734dbd61290a9a21dab674096a7762b4ca SHA512 1c7d00dac5329296dd205eddeeecfd29495c4746791730056d143438871eb64a5d9827dcb1e28a78e8746218908e0e72374bd686a21b631b9aa1aa1c67e61eac WHIRLPOOL ab538dbe7eafb07db918c4aed6a701a6c791487181088fa6bd91daa8d90708921a9b1fbc85c80c97e7d65ff6e2b6c15e22f662f4dcb78ee091d487964bc7ef48
 DIST PyQt5_gpl-5.9.tar.gz 3097557 SHA256 ab0e7999cf202cc72962c78aefe461d16497b3c1a8282ab966ad90b6cb271096 SHA512 6e925dee751d6b2ab97b3614b0150f305798b89920e11db7a2cbef579e4c21839a38f4ad7eee5828a0c28942999955715a265e043004ee7838d376025d32e4aa WHIRLPOOL b92833ecc97638c8dac5e35de155ddb9d5783925aa8ab50bdd823b793675354b37edc29e17396241de87b25ae142c37a9cd1c215ad57c25b928ec0af3deac8aa
 EBUILD PyQt5-5.7.1.ebuild 5612 SHA256 9cc63dfe3053a665263019919056c4ff654e97483fac58f7b4ce6bd9cdb12c45 SHA512 1bf9de7a46d07740e91d5497767b226435d20bc98eca0cce901e5b7f2e7de3f41a4e34b073f4d3280e0184387d8d07d06f7e0a002196659c1a9da8e3745dd366 WHIRLPOOL 36494a100fb28ba04e7de4dc80dc53f48efdb05eb0fd3aa645d82ffb90369a577580d7397cee2edd36cb245aaabb5b5d42d5de86ea05c5b8d76893fe4bd83823
-EBUILD PyQt5-5.8.2.ebuild 5636 SHA256 5d636464a9dbcaebfbab6e0b1032400f92b85882dbe2e9a7a7dee21a589c16d1 SHA512 71c23f5ce7c44be2252cba0efd8687591ac6e4980626d9d880a5a54a31d8b721697ca9a80990ac38481d54ab12036457e020cc7afca7e01a265472a05e106f5b WHIRLPOOL 65e2a1c3988004e80b8a308f2463629a323a6ef3cb056a3cf9b7bbce23ba452220da3fd7fcc5f0b13aed029d1dc09b91ffe334821e0a1e1d656ba2b1aa6f8dbe
+EBUILD PyQt5-5.9.1.ebuild 5691 SHA256 43c25b394ffd26950a495981f2acf506a2a27cd96e2e70c74a1677cb726bd348 SHA512 19633d4a855751e67fe8280f4e4c2364b6de9d9e4237cf77938f2714ac0efab3010f6d05972e21e7f31ac5d7958693f03eb2981dd7210fbbeb76cfa99aeeeba3 WHIRLPOOL 6201540fe8240dda6f8bb6ff3f64907d4445742256c01de722b09c5f677ff078bb354047ac0a2a7d091aaf3df03cbc58ddcf3ea4ecdb0413f2fcfde8a4ac749a
 EBUILD PyQt5-5.9.ebuild 5666 SHA256 230e1343e300a481f3d3c132337a05ed6db9878b0f7b2a167f7b05363b1ea31c SHA512 eb8eb4bcd242d8f69ae4215c9f56f95edb6bb93024ed98805544bb16a5a792b2de3b9ac5b1d899cf82fdcff402cf11ccae0679da21edae5b21863d18cbe8d1f1 WHIRLPOOL d1d73074b13a8720ba8e25b2d5c24d3c145d429cf5b53cbb48b2e8dd9c3244081f440efe3bddc2dec7b0f24fdf978b2e7aa739082cd2a0918e43fcfd186a6ac8
 MISC ChangeLog 5945 SHA256 bc33b54e774fca6c280fea23679a5e301d9b0e579000bc279fefa1e6cd4e22ae SHA512 36ca5033cba177eaac511fb501a9dc7db91ea8ed00ba412b93611261546c1b1c73d06e9fc65e20d76f1043c3ef73c776d9674f57ffc4b465efc979ef09ee6714 WHIRLPOOL 6261d3e758bb7fdc5e61df408f408794036b05116d4895492d5e1d5e59346996d788b49fa6da5a3e8453f87df8d1f04fa388bf1b1e9b0b0822354268b544afaa
 MISC ChangeLog-2015 2530 SHA256 c0f5fb7e518d57246a272e1850019d5c6b17295aeb6be532c3ea0531993066ce SHA512 e84858c3d2dfc44e35eca767822dbdf42396f0df1c2b6676bfcd624be232ec4ead7daadc71dcadf204ac10bd91dddf0c37decea272f3e6130ae2b36aad6cb18f WHIRLPOOL 67f2ecb4cd02db99f6ffc1e0e1bb404c5067015cb85846704e285122c5074b286103ecaf9ef17e9874afad4784d18492808f192e60e363438f375408c1af45cd
diff --git a/dev-python/PyQt5/PyQt5-5.8.2.ebuild b/dev-python/PyQt5/PyQt5-5.9.1.ebuild
index 3eab65c36a65..fa923f28b100 100644
--- a/dev-python/PyQt5/PyQt5-5.8.2.ebuild
+++ b/dev-python/PyQt5/PyQt5-5.9.1.ebuild
@@ -21,7 +21,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 # TODO: QtNfc
-IUSE="bluetooth dbus debug declarative designer doc examples gles2 gui help location
+IUSE="bluetooth dbus debug declarative designer examples gles2 gui help location
 	multimedia network opengl positioning printsupport sensors serialport sql svg
 	testlib webchannel webengine webkit websockets widgets x11extras xmlpatterns"
 
@@ -42,9 +42,9 @@ REQUIRED_USE="
 	serialport? ( gui )
 	sql? ( widgets )
 	svg? ( gui widgets )
-	testlib? ( gui widgets )
+	testlib? ( widgets )
 	webchannel? ( network )
-	webengine? ( network widgets? ( webchannel ) )
+	webengine? ( network widgets? ( printsupport webchannel ) )
 	webkit? ( gui network printsupport widgets )
 	websockets? ( network )
 	widgets? ( gui )
@@ -56,7 +56,7 @@ QT_PV="5.6.0:5"
 
 RDEPEND="
 	${PYTHON_DEPS}
-	>=dev-python/sip-4.19.1:=[${PYTHON_USEDEP}]
+	>=dev-python/sip-4.19.6_pre:=[${PYTHON_USEDEP}]
 	>=dev-qt/qtcore-${QT_PV}
 	>=dev-qt/qtxml-${QT_PV}
 	bluetooth? ( >=dev-qt/qtbluetooth-${QT_PV} )
@@ -108,6 +108,9 @@ pyqt_use_enable() {
 
 src_configure() {
 	configuration() {
+		# Fix out-of-source build
+		ln -s "${S}"/config-tests || die
+
 		local myconf=(
 			"${PYTHON}"
 			"${S}"/configure.py
@@ -143,7 +146,7 @@ src_configure() {
 			$(pyqt_use_enable svg)
 			$(pyqt_use_enable testlib QtTest)
 			$(pyqt_use_enable webchannel QtWebChannel)
-			$(pyqt_use_enable webengine QtWebEngineCore $(usex widgets QtWebEngineWidgets ''))
+			$(pyqt_use_enable webengine QtWebEngine QtWebEngineCore $(usex widgets QtWebEngineWidgets ''))
 			$(pyqt_use_enable webkit QtWebKit QtWebKitWidgets)
 			$(pyqt_use_enable websockets QtWebSockets)
 			$(pyqt_use_enable widgets)
@@ -187,7 +190,6 @@ src_install() {
 	python_foreach_impl run_in_build_dir installation
 
 	einstalldocs
-	use doc && dodoc -r doc/html
 
 	if use examples; then
 		insinto /usr/share/doc/${PF}
diff --git a/dev-python/aiohttp/Manifest b/dev-python/aiohttp/Manifest
index a5bc236abe6c..6dc59df8f9c9 100644
--- a/dev-python/aiohttp/Manifest
+++ b/dev-python/aiohttp/Manifest
@@ -10,6 +10,7 @@ DIST aiohttp-1.3.3.tar.gz 526273 SHA256 103433f594442b98ed4af9db02331e548a0ef2d4
 DIST aiohttp-1.3.5.tar.gz 527432 SHA256 cd14a45da385b5e860849ffaff3ecee56f9b37bf9e7f3f7bc5ce3f17556cf842 SHA512 b99630fa9006163d61e0e010972aee8daad021c5ad0152b04fb6f8b661f18ea03fcfa8d35603ecfcdaef4ecbaff0159b49e2f40164241bb5def48b2847e2d966 WHIRLPOOL b39e5a5081cadb497aa982b8bee1a24615a2e382071755586c52855529c7984c9140c04239fe9ef81e51f3e11a1ea7b1c021f6b8a4dd58c4d826f934394b5576
 DIST aiohttp-2.1.0.tar.gz 748642 SHA256 3e80d944e9295b1360e422d89746b99e23a99118420f826f990a632d284e21df SHA512 bd8eea366d380b88ba2c88d2aab722cd0970d2239dd0057cf4596f472a1b1bf38aebbd6cc707379ad9b5f901f93a56c1c4dd32584cb2636af0e013aa11388e25 WHIRLPOOL 45cf17ea7db2eb385d922cd4cdf5aac40244939066a6632f453fa2545fe1a73dfe0d0c43c3dcd60936a403174a69a8fd027dae2e55fc901594d388bd4b5c4cc3
 DIST aiohttp-2.2.0.tar.gz 781951 SHA256 1558ba6896c2ed4e1b3cbdc4ba479b4a03a0c1433af2fe23704d2959a0c5191e SHA512 547f7484651aa5df43174cede2537c120ebf10b913ab506cdcbbe8d8702492a9e3374cf772c5d11969ca7a7e3d2602d794e98878ed43d05ae4a8324613138ea4 WHIRLPOOL 5c97f0ccbc2015e6fb7ac31ff0539d123c445673b4444d7ab3b5098c94496b42b8880b8612e6bf3ee0604309aed4ec5d80c3020ed940cd28df0adac5cff28720
+DIST aiohttp-2.3.2.tar.gz 841030 SHA256 42373fbdbe8f09233c17e74f53cee877bc7d5b495b4fc14c32a119255e85e736 SHA512 e481787fec8c9f21d49978b378fb5ef8c06d06cd7a6625fc36c5d4a035e9047f4ed0e38b25b613f1b685ca40e18c796376750f4ac0970fcd1d72ca7fbe31d13f WHIRLPOOL 58da919519c67c084528a059ab3c0d8b577ac0eaaa50a8783842d390a5bb274eba14f11a8d86ded7cc64be2e068e05b6513a4249b000926cd0e3fcc040000f0a
 EBUILD aiohttp-0.21.5.ebuild 1286 SHA256 5f73623fe551d536bae6ca6c2031b5c300c5f022b4e825cbefe5ee61422d900c SHA512 1bbc7803a1576871d0f7f81407088ce4e7af0b4f8b9efa9118644fbce529da054a8acc3d351d07f5f5d242acda22ddf4fdbcf61c6ff676c9739de33467a8df18 WHIRLPOOL 01489deb900df7e3c5433eb819d4e9d6eec3625e66877148bee5cae0fc5213bda44ba4854eaa10f4b5e0b99c0cfb86fd28c4e353aa93973cb19ad13283a30c9d
 EBUILD aiohttp-1.0.3.ebuild 1481 SHA256 335156de0c2f255797dea89a56c6732acea15f0269302b1219ef9bb9bd5ccae8 SHA512 3a95a6d6a2cac5bedccec21e7536584fd08862897659a4bc1e4e14217498df0776be24ae399f79bb751a58a36157aaa217c898dca2b08574dd2f9861d3aed91a WHIRLPOOL 3fab61c6e6d94cfd8faa7993764c0c99d3194699179de496eb72107c6f31385c388e6e7e0316fa397a6ea4ae1418ffde3901e056c40f629d340190889918fe67
 EBUILD aiohttp-1.0.4.ebuild 1479 SHA256 38c3e3aa827fe5ffaf08339c4b6c8d18bdcf62f66c60e115d3fdb693e6aab0cf SHA512 bb4bc3db386e769cb4035bb12fe676b43c69224a6269ca3f0da97f8212f90f07428557e9c21215cbafa70085c7f30f45f90bb4fba98a112b77ffb6ac07d8cc62 WHIRLPOOL fc7ddeb9f5fbe0367cdea62f4637ef5c82b6a7dffcc44995951ef3f08cd67e3063d444c9cd5d88f7df41dbe9c60c458b43ef77ea4b33e114b6c42e756ca7b30c
@@ -22,6 +23,7 @@ EBUILD aiohttp-1.3.3.ebuild 1546 SHA256 b45a351a031b21163e58b3db13485b66c50c62a0
 EBUILD aiohttp-1.3.5.ebuild 1546 SHA256 b45a351a031b21163e58b3db13485b66c50c62a0651b3c217b4ab128c1cb6f97 SHA512 8b12d96faa49923a7ad541b5de41dc8cb2aa47ebff0b7203d422f6b0f7fe0ef2ab2dfa2d04e74aa03aed99833c202c3fa99f56fe35e6e762c5bf03dab048037d WHIRLPOOL 6b793e3fd6441504a5efadcf169bacb2e315c59c1edc7c33c07689f9576c214b4430dd0b8be1edc78e31ea03d099da523e0a298ce21e5ca045c8af71da6a638b
 EBUILD aiohttp-2.1.0.ebuild 1504 SHA256 bda72186dc2db4565b9f3f270a853f5689f2e139a11d1eb15e4d83b9c92aa7f2 SHA512 8206f8ac9e70b3674aebe3ab5dd4e970e97e3ed8cf93cf23e4279a7c0a149e3f536d502b2ef78dea83fde3b0bee2088f2ce8f923255bfe8082f7261f05929f54 WHIRLPOOL 76dd81f59c2fe2e815954e7a26817d7de8cb1a282c6a12173c97601e6daab97b1df2ff01767141bda1a7fc5fc246ebb49bd8d6c6a677deb3ace3a366bc8df547
 EBUILD aiohttp-2.2.0.ebuild 1504 SHA256 bda72186dc2db4565b9f3f270a853f5689f2e139a11d1eb15e4d83b9c92aa7f2 SHA512 8206f8ac9e70b3674aebe3ab5dd4e970e97e3ed8cf93cf23e4279a7c0a149e3f536d502b2ef78dea83fde3b0bee2088f2ce8f923255bfe8082f7261f05929f54 WHIRLPOOL 76dd81f59c2fe2e815954e7a26817d7de8cb1a282c6a12173c97601e6daab97b1df2ff01767141bda1a7fc5fc246ebb49bd8d6c6a677deb3ace3a366bc8df547
+EBUILD aiohttp-2.3.2.ebuild 1591 SHA256 40007601b166584128ff98051715639853608f4bf41e56687d82690d3e32aa12 SHA512 5d9bd5ccdb55ad9ce780f94c9e346f9f79cbc53cb76cd18aeefb3624f3c418a5856593f57effe1b7f1765a3cd2ae454d499a7d553f14937f9a23406dc9caffc5 WHIRLPOOL beb1ece140da0d587c9a0efd315cce677bc6924944ae9a3347f6fbddb169715cfde5f1d0eb224582d9d0f67e56931d864053c6cc03abf2d71498d56d75817950
 MISC ChangeLog 8010 SHA256 fd1c0233f840c348bd2f34553a22d51399fea4045fe10e4b4d406d501cb75be4 SHA512 f489d81b008a861b88362489800d7781c524d0e7d350dbd78634585902c241dbb2d5dc4fef81b55167a238476a5ae14f2d2279c684c005e309a237c0d2e135bb WHIRLPOOL 083d50e94337b9f00e43784540f256528ff33a2b3b693a62a583caa4463f45ded5ec6bd361edbffd953e13759beb03ffaea5bfe213386f1cdaf8e862035ca776
 MISC ChangeLog-2015 773 SHA256 d43f314774d7dbdd4eceb98ac5ff6be35cae9a05255707bd0750b3fc4858f205 SHA512 ff5e07adfbf1d13edd6dc91154cc7f012b34856b73805db577691c8c804e29feab3e4ef855a19427ba8371dc387dbf62b8f3f451d4c10a35823bedaaf538cd91 WHIRLPOOL 4e4526554a53a38bc1b88243db60b7af3168341dd35e9917b6ada7bdc9ea1a9d3aa540f5581d50e6ea4a6f8e8216b43761b9cf636a8d7d18e7aaa11629a89baf
 MISC metadata.xml 384 SHA256 a9033b04e31243c4ff866b401304c2c79d2e62d0d264c59010e975ba61428445 SHA512 847d38f07065fd335d999121a723660f1bf04b434c4796d8a468a30af5ea9bd82f3f7ea1bfaebd19ea5820e3a90c3b2daa0ed0d967c831de75c988cffdb4bbce WHIRLPOOL b91a1c989de44971fbd550e812b60f5102641076a23bb4c025b62aa48f4de0c54a460aed3955fdbd5c333c972fd972afa1246cdd5d05cd3c3faeaae739492110
diff --git a/dev-python/aiohttp/aiohttp-2.3.2.ebuild b/dev-python/aiohttp/aiohttp-2.3.2.ebuild
new file mode 100644
index 000000000000..669641f6390c
--- /dev/null
+++ b/dev-python/aiohttp/aiohttp-2.3.2.ebuild
@@ -0,0 +1,60 @@
+# 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 vcs-snapshot
+
+DESCRIPTION="http client/server for asyncio"
+HOMEPAGE="https://pypi.python.org/pypi/aiohttp"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz -> ${P}.tar.gz"
+EGIT_REPO_URI="https://github.com/aio-libs/aiohttp"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+CDEPEND="
+	>=dev-python/async_timeout-1.2.0[${PYTHON_USEDEP}]
+	dev-python/chardet[${PYTHON_USEDEP}]
+	>=dev-python/multidict-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/yarl-0.11[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/alabaster-0.6.2[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-asyncio[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-newsfeed[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	test? (
+		${CDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		www-servers/gunicorn[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="${CDEPEND}"
+
+DOCS=( CHANGES.rst CONTRIBUTING.rst CONTRIBUTORS.txt HISTORY.rst README.rst )
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	PYTHONPATH="${PWD}:${PYTHONPATH}" ${PYTHON} -m pytest tests/ || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/attrs/Manifest b/dev-python/attrs/Manifest
index 5458bc207ecb..fa80f35d58ff 100644
--- a/dev-python/attrs/Manifest
+++ b/dev-python/attrs/Manifest
@@ -1,7 +1,9 @@
 AUX test_funcs-too-slow.patch 735 SHA256 08e952c2959186ba8f1734ba49428e1c0ffb941e439dc64fc4596c304b992678 SHA512 b6fee394c95a9c46dd822c8f36261b909a3a3de905e5b057d5026b9d204c01edc01f566336f3c06ee4f5b85da32f2dcd30fc73849d454c6446c63a0b08413140 WHIRLPOOL 2e222af72ee1c5cd46b4c80ac15e001c1533738e2e7f7eb5403ef26bbd8bfd27effb9e36d259821f3a386ff3f5115e1108f794aa325a435c945c8070efb2bff9
 DIST attrs-16.3.0.tar.gz 57512 SHA256 80203177723e36f3bbe15aa8553da6e80d47bfe53647220ccaa9ad7a5e473ccc SHA512 1a91e6f27ecaf20c409c3abf88ffed5c6cfdbba8cff44637399b713271ff838a054f5859dd29440b2780d81b40673033e3f8e43dd491bece72e0a4f08c4ef688 WHIRLPOOL 85d53df74265b6db36171ad84c21321fd8f4b3c345ea65c46b627a25e586399c8cd7d3231417c7450ea9bb8237286434828f1c795759bdcf4d459f63555c8636
 DIST attrs-17.2.0.tar.gz 73733 SHA256 5d4d1b99f94d69338f485984127e4473b3ab9e20f43821b0e546cc3b2302fd11 SHA512 02243e59ff417deddb330e841d42c0f43d3bea4435f114d3a9a8f4c3bd424c2ef565c630d179db7b3687d22091bf6e619de661171248c0ff0a0e5ec5f9bf7e21 WHIRLPOOL 422abbabec76ca9932f071c5f8ca77afecbbbc08b0cc7e199588a945afe215aa9509922a667fd1a2da7e8fd79b8abd29c366c42c4dad2d538f2487729c4450bb
+DIST attrs-17.3.0.tar.gz 89046 SHA256 c78f53e32d7cf36d8597c8a2c7e3c0ad210f97b9509e152e4c37fa80869f823c SHA512 69a104a0a00c13946ca61c5e21a6acd4e75a43c775d54f270c9da3fd9475df54997c32a25a5c47a24012daac2f525457b1727fb2bb7291afb90627bf87d818ee WHIRLPOOL 4bddc25ea332001058e4f81f8d8eda8aa42fa7a5f6614c43767fbc0151f697fd97f8201e28da2ab7c9b9056420d7b1fc50f65f00f799131a2ec84a1f48cb2fe6
 EBUILD attrs-16.3.0-r1.ebuild 872 SHA256 95308a7dbe1139d29ae178ec834c2e12c862c004008bac34bbfc908a71c67894 SHA512 0dc1492fe4e01f0ea6296b2ec19dd0f231b47967a00623a38e2f53d0ee92c1bda8fbc8fdd46662aa2acbe43ac4f656cb067c7186f73e80dd57ec0963c42c4c89 WHIRLPOOL 21faf80f7748d0c93b52490da178748c4873ddb6af23bfebda863bf8071b85c4a83c5047f88c3b418e9ca2c201200f8de421ac9064b8bec0a6ecd03e26064c77
 EBUILD attrs-17.2.0.ebuild 859 SHA256 bede9e2a834db58302589c420fc72296e82a3de2e456af4ff25982dd9ec52eac SHA512 3e563089041386f811f779bc7d5178df7c1fd8409749bdd84fa6efe04543c24cf61d4da231fd658f0a8b74c332b8c7ff8f6482c868986e14e13dca6e051f0d69 WHIRLPOOL 4d88f62dd2134196bd6cf98e441082fde1de2e6796092c241503ffdd478534421c811e828f616528da5276b2388677e6fa40626c58fbedb06a6dabc028faaaa5
+EBUILD attrs-17.3.0.ebuild 860 SHA256 8d5b3293c1f46cd8382e0b7b061d97b00c22a94fa0ea747183a2366fb2d0ee75 SHA512 499bf2c529600c5fa958267b9539213ff36f08481531897290b9545b99ce45e5cb7a7d27f8779778753f8b6a11bb7dc60f9b4ab15d81f76244fa9d945e262396 WHIRLPOOL 4a3f68dc0eeb75819880e0f5647fddfb674fae48abe0be15d2802e60d1474c6e70aa76915941220bde4ea21fdb9a8dc468e43a409ae7db6daa05d7c378482007
 MISC ChangeLog 851 SHA256 fd78a5f76e806dadc226c364b7164813c830812f3e2bb4a8990b0384a500fee3 SHA512 70095dfa30df08d05f372b239ce7771d827e88ed50ff7dca81c305d3838b91bd76f2f34d9b46c7e5a0a0d3e08509cb3cb3294f54818c2aaf9473e7a87331cc8b WHIRLPOOL 4ca24ac7b1454cfaa3d1b75bc1baad322856f63f4afbcdf4a8191b4bda70f7f2f907d2c3742e54a72463bc4c442c5a635c11ffda372dcf8510745dd0dc1fcd9a
 MISC metadata.xml 488 SHA256 fb0296355f64263cbd723fb549bb4c95ab2ff9588270c72771a581871788a676 SHA512 d8336a60cb0b2b8d51a9833c0ba3d47acb29ec4942b2f03b750d407bcbb65461d867470226bee962a8e585cfd4ff11bfff67b66ed2270f9efbf35d3c46bbdda1 WHIRLPOOL 2d3ae426ddadf78cc86918259522e47ad71e763c45b215056e5f249be52d78ef8f0cee9e0947d3f37c2674938fc204a9f8479fdbf8b1f4df190058897a1525cc
diff --git a/dev-python/attrs/attrs-17.3.0.ebuild b/dev-python/attrs/attrs-17.3.0.ebuild
new file mode 100644
index 000000000000..109789e5fabb
--- /dev/null
+++ b/dev-python/attrs/attrs-17.3.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 python3_{4,5,6} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Attributes without boilerplate"
+HOMEPAGE="
+	https://github.com/hynek/attrs
+	https://attrs.readthedocs.org/
+	https://pypi.python.org/pypi/attrs"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="dev-python/zope-interface[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-lang/python[sqlite]
+		>=dev-python/hypothesis-3.6.0[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	py.test -v || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/click/Manifest b/dev-python/click/Manifest
index f88d7f89d23f..42a06f699aaa 100644
--- a/dev-python/click/Manifest
+++ b/dev-python/click/Manifest
@@ -1,7 +1,7 @@
 DIST click-6.6.tar.gz 283420 SHA256 cc6a19da8ebff6e7074f731447ef7e112bd23adf3de5c597cf9989f2fd8defe9 SHA512 5650cfe6c8b55a7e823e22248964143278d61383dac63497508a864807f1950f9dd5d76ce6a501e589dd81fed6e2a1248d3f8973be25a91950896b7408dc88bc WHIRLPOOL db9f36bb86599599b95ae350659f75f387d15196261acaef1e069769ca8e2f29be8dc3ae5cdd94d8303907f94b90ed00209a3410da863afcce74d393a2f48d3c
 DIST click-6.7.tar.gz 279019 SHA256 f15516df478d5a56180fbf80e68f206010e6d160fc39fa508b65e035fd75130b SHA512 d454369fe1acb01c2210a61e15f45ac9cc77102c93345257f4ef3090bd8f31f1ccc49d9fd6ea670cddca9f715ad5db29368b4eecd95abff50d1033c4f7a967d6 WHIRLPOOL c85fd3d8dff735eda63ca78cbd7bb09e8bd11e237d681f9d07cc3788e05191c4fc81a05ac813c176ef5966fa3cbd7d4eac0391633d5672b1ace8581663bef7d6
 EBUILD click-6.6.ebuild 1195 SHA256 e6a31154a8b9ed69db05564bd0c143bfbee390dcc66ce932742f9c818c190d88 SHA512 bf17a9ef65d5dc3b31a46f76282b7a860ac4689590e3836517fd74e81763731ad890f7084b397b453242f136604901c1f38cbe1214d314598239e34d0274c221 WHIRLPOOL d0d9bdc109c9a661a4a8f7309e2251b5460879003b7a897df32fa265eb966e3b41748c986615e04f67347c817cb921d63d845c270c9486eb91548e8befe8d8ab
-EBUILD click-6.7.ebuild 1204 SHA256 990729f9e4905b34049b74c370baf02847c7b07102aef7a05557a27c692f58aa SHA512 43c2626c48e7a118d303fbd0004a219841184c4e503a20eaf9a43fbe775915cd7e8b2a07e5e8238c80234e82d65d3ac834b7c2f2d1667c0372b2128dad04eca5 WHIRLPOOL 25032735b9cf7120fc0f46d8c84f784f50962ef8361160f7f5abb11c4ad533e34ccda34b30827da7d463d9bf6d40b26b0a1e12ef8769580fe5468b36f35c6f15
+EBUILD click-6.7.ebuild 1202 SHA256 77454326f8214e76bd81a13443cb151855305ce22f43559f6e4611f9f0c5b551 SHA512 396ef91155601dcc5ba1cc6dd2287cb120587a2f2fea77597a6841f44fcb3916bf84f89621edb65c79f89a47d514db725246b356489c7c28dca8c2d78bb04b53 WHIRLPOOL b9ea5971e6b1f3abd09bc9139d01dd97b90d35425ea4a3f1827c7e8f900f4fd795765abf9cf3c64e86a1216eedb8b061add04f99d2f69ef84244fd7c12ccf7dd
 MISC ChangeLog 9247 SHA256 f669b485c4ab68582e0facc8b30d034ee97c3d92043300967f036b8d8895b5c4 SHA512 d99b2ba2d3be44309cb1656ae6caee2e203fd5134a16d3a723e624239f2254b931c0c81202d31ee02e54643d784b1e90a8c3b4a981d511271342028cbafde193 WHIRLPOOL f1c4bb1cd89fedea81c875d829d32c82c4104f721221ae8155deedede1c8f33f10bae838a5883332d1a40f4d0e5063c15591010f994826d5c9397504039f66d4
 MISC ChangeLog-2015 2454 SHA256 8e8b700763da2a86efa78490d2cfa400c822455a26a0be9325f7f831dc20ff33 SHA512 8cd0b1cb292676f013bf614c93a2f165402e481630fec94dbaf5488cc3fae1ccfbf0cad485ad10ec11ff0b19f27a8fbab67eb311bf1aaa4a3b98a655459deef2 WHIRLPOOL 03c10ff8974fa6ad444d9ab4de78e57a4631687a97da9ffeea9e85ad2cee6b4660795cba5dbffc7abd6915e4712192e3e8129530e44718bed8c468b7bc079a90
 MISC metadata.xml 308 SHA256 0a69e4d88f2e5aa6e415b5645e1e1763045c392c8308bc7272a1f856d167b1d9 SHA512 6dd2c4334b6ad8b0942f5cbd443e7bd5cefdcadf2541d341f46fa153a28a6ab5f074270638796efe6a7df48a20be9abcb3f41bfa19c58b1e30ed13fe56b1d6d1 WHIRLPOOL 994c1bda36ffc3bf80501cd01f53cfb86cf04402848a8d09f37e43acfb7801e0f1ca01c6015cbf4af87d243bc13f47990f8e24fd3a86163bdd8c7105e4b98edb
diff --git a/dev-python/click/click-6.7.ebuild b/dev-python/click/click-6.7.ebuild
index 7a06b0569c36..4f917b6649b6 100644
--- a/dev-python/click/click-6.7.ebuild
+++ b/dev-python/click/click-6.7.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://click.pocoo.org/ https://pypi.python.org/pypi/click"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="doc examples test"
 
 REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*') ) )"
diff --git a/dev-python/collective-checkdocs/Manifest b/dev-python/collective-checkdocs/Manifest
new file mode 100644
index 000000000000..e7b610e7c246
--- /dev/null
+++ b/dev-python/collective-checkdocs/Manifest
@@ -0,0 +1,3 @@
+DIST collective.checkdocs-0.2.zip 10865 SHA256 3a5328257c5224bc72753820c182910d7fb336bc1dba5e09113d48566655e46e SHA512 c234a365d3e89cebd467a42f98be256e8e24e42c88e5aee71556d165deb8d7d54d4b515fa6fdf70bd24e7727e083f3b6fb061aa304fa7a72de7e8612ad2fc2a2 WHIRLPOOL 9764295b52a4e875793ff7351bbb98fe388787164c82adea3d049945a0efd6b390bc06e11ddbb0448203b6783ff82327b02e3a3407a0367fccd5433480b7a5e1
+EBUILD collective-checkdocs-0.2.ebuild 754 SHA256 40402090f4d4e426b76017fd38598873d7acc83b6063b49929d2af9593ea1dfa SHA512 570bf1a8c020756fdccd56c472e624aa4a9fc42af088e2a68aeea73af6cbc85edfe105d27c51c3e39bad15d19b789463f85daa50d3b5ca4828599ab0e6cd41d4 WHIRLPOOL 69e3fc4053556ed1f4cf954b6e515603e818ef11f1f64e8d84c8e6ced964f6936d0e166d6b985976b093565963f2c35791ce25817fdcbe18175d70355b583366
+MISC metadata.xml 606 SHA256 73971c50a09430a7b850c39b6e2c728bb5a4255f9f487057a2c4b09f3cd969aa SHA512 197107242cfa084e5b1e7cdb3b2b16bf493891156b8e478dffaa40215e2a7a2edb4115101df22889901abb71a23faca6d02ca7720af76a968a60b52eefd26913 WHIRLPOOL 148ac38be1982ba563b447cc80d104cf6fc4702825e3e488bb81395054a3425103eb4335f9facf901c1cc029cc9d120aee45f1b0d177db97ed6a6dfd6047353b
diff --git a/dev-python/collective-checkdocs/collective-checkdocs-0.2.ebuild b/dev-python/collective-checkdocs/collective-checkdocs-0.2.ebuild
new file mode 100644
index 000000000000..fa048c9bfe24
--- /dev/null
+++ b/dev-python/collective-checkdocs/collective-checkdocs-0.2.ebuild
@@ -0,0 +1,21 @@
+# 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 python3_6 )
+inherit distutils-r1
+
+DESCRIPTION="Distutils command to view/validate packages's rst text long_descriptions."
+HOMEPAGE="https://github.com/collective/collective.checkdocs"
+SRC_URI="mirror://pypi/${PN:0:1}/collective.checkdocs/collective.checkdocs-${PV}.zip"
+S="${WORKDIR}/collective.checkdocs-${PV}"
+
+LICENSE="GPL-2"  # until https://github.com/collective/collective.checkdocs/issues/8 is fixed
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	dev-python/docutils[${PYTHON_USEDEP}]"
diff --git a/dev-python/collective-checkdocs/metadata.xml b/dev-python/collective-checkdocs/metadata.xml
new file mode 100644
index 000000000000..b7deeb302f91
--- /dev/null
+++ b/dev-python/collective-checkdocs/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<longdescription lang="en">
+		collective.checkdocs adds new distutils commands checkdocs and showdocs to validate restructured text in long_description field of Python eggs. This package aims to make Python egg help page publishing and editing easier.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/docker-py/Manifest b/dev-python/docker-py/Manifest
index 3a66105ebfa7..2d5b0d363a5a 100644
--- a/dev-python/docker-py/Manifest
+++ b/dev-python/docker-py/Manifest
@@ -1,17 +1,13 @@
 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.2.1.tar.gz 174907 SHA256 b84cda631daeaad532143b439af0235923647ed30da5fc4427e6929a637af122 SHA512 9eda776d0055587e68a8933969d0b540c6439dd26fe4dfc13ee50c46ccf55294c130d625f235a74bb48bc58aff93e0371b79cfeb971588e9f7d745a3b6930dc5 WHIRLPOOL 3e0b80cd2af690ed47010bd6cdc68b01b6e4e0d294f49326e3e51d6ab38c0d0fd159fea3d1e44b1f8ab31f591b33c136064b68aa471dadd66a693105bba55a1a
-DIST docker-py-2.3.0.tar.gz 177920 SHA256 56ca8acbe7f7e9cffbfc8e1a2a256ec0fbe322130b1d1ba432865c707fc9f33f SHA512 61800bfb9377abb6d59cf394902f98f51b374b3752e6c151b801d014090801559b6bb64e1da9081a2516076bbc41a47987013a1e98fa37771cf5e97f26f2737d WHIRLPOOL b5e0d89dc70b2944dbfb1cba7c324c80c0655276c5ad27e4c5590170481201248934c99f044473648dd81d4ae866ed267704b33778c9a4d5a69bcadd3acaf378
 DIST docker-py-2.4.2.tar.gz 180890 SHA256 53f72ae0c3329f48b2301eb64bc63ca0da2cdc9e8e24c87a76dab91da713ca2c SHA512 3367066b2acd96b85bef28aef00c91d752dc25b3055575b4f2f9c0b981eb4bca81a742bc6da5f97cf039cd9c7d818e3f80101997fe3a2e2c6f3a9c42fd3111c2 WHIRLPOOL f32495086c5b3a67bec365033d54b52ed77b156ec262239b10c5115e88e84be1bdd25562df9e04f93c18dbab68c378ef58e17d321ea54a2a0f8472381266b976
 DIST docker-py-2.5.1.tar.gz 183413 SHA256 136338dbe7b9d8d1c24a6f968f43566e23b79ce1dfbcd33c6a201985b702c4e0 SHA512 5862589fbb831c6960ce5e6d256c716b64c2ad28d9c3542fd290f80b0deeac3a4985a96f3a9e04f55b184b03498900d8d520085cbda223b54480db4bbf977d1e WHIRLPOOL 52a0338c4df311cc1d01194f2f50fb02fa6aba8dc818f1caffffbd0fe686a2e8ac8b0646c93d7ad5911129b24ade3fb3847eea3609b9aef188e7601596e6fe34
-DIST docker-py-2.6.0.tar.gz 191901 SHA256 fc6e4b80c05a9c3cf5010facce3a48a1d87c2f30d234c3799c0a3a94ded5ec1a SHA512 4b574510ad57ec3b9853b42d36fc1870b093872ed02f339cc5de1d7b0687196c00fee3d8b7182d06800e49eaff71b5942537290526590288954c34b7b8ead331 WHIRLPOOL f07bcdb35a8ede05db81b4363b437db6938df519562e2d37f1b224dcf93b49c5e614280f7a6cf4e148af795af380538e9cb409c7923b3125e23a38ed4e20243e
+DIST docker-py-2.6.1.tar.gz 191919 SHA256 6cca44a1f8fc449769695d2bc85be2971d1f12e34588e326c54c2593fdff1b01 SHA512 ee5e646e6b45ed9fafd8bd32c4cdeff565988ff77b21303b0c1b4b1ea56a9d51d04c4f8c9595159efff09cfd8962c1a7060c1910d48cbfb4a2024e90b662ae58 WHIRLPOOL 78cf714976128bcf15abd7235768f813f344cf898caf6f5dc46dae117f420262b8d87a57bfe33f7b5a05bc16e41828aa409709b34a7e58a48af1fbc41e416b8f
 EBUILD docker-py-1.10.6.ebuild 1431 SHA256 fcf0e900da089e0fa97a9223ff58e0ead3a59cf680f7a09000fa7e0cc88f15a7 SHA512 8e508e96b1271d3ef7f13870d0c1bc4fff322125cbc05ece6c5bf83726f636b102b0d73d5dca17e4cb1b1eef79e3a31848f7f6bc737f4b468302f56f059d6346 WHIRLPOOL 0bd697c409c99b1befe623950fcac1ac0263b2b67d93ff47d4efb5f6306d49916a4f9a4043a497a4be5601f6a9e00437c4e9e6b330278181c756892deb376580
 EBUILD docker-py-1.2.2.ebuild 1044 SHA256 54ce3bde579c56c76cc80cf2471549ddec2bfb39d2eaed8825bd0bb6db6dd40f SHA512 ed995a7481c4ca7558b6aa7b023b5b07b794f5db524ee6c440c605610db4b5ef26a97c1526f6a9af8ad729a2299bc8a7198ce3561d1af88a36ce25e452f16dd4 WHIRLPOOL aee0d022a1cffded10101b2c44617ab7ff26d33dae16d24c277b9afd0aca5f4eba24384f480618e00aca1e1c7b92e9e0bccdaafef234b83eed1db8785ea1ed9e
-EBUILD docker-py-2.2.1.ebuild 1526 SHA256 0901fbd6a7470a0a1441bd467e3e0eaebfc6a1e33a772a5b4c85a975b7edc5d7 SHA512 3d613687822437c99a3252bd0a5717e61175660378af8a56ce6996741af5767c09b16afae8174b106bcbeabd5bf8ecbacebf182fad4457fec9f889e3d9d5ea60 WHIRLPOOL 76667d5ef999a2850f2e07fa91b3e023b5a12c4533a864dd372d8da595378e0e3f4b431577ccda953bc9ce02245adb82b7d7b5d7c3641c518743634258a20e63
-EBUILD docker-py-2.3.0.ebuild 1527 SHA256 92ad3af090c55e6a5a233278add313ebf4cff2f517807de2ba1147a94deb639f SHA512 de9dd2a1aebb1938ed1914dd7087a3c23eef92e3e9eb572edd581400d5f0a8123162ce63575070c8fb5ea8feb80cfb58a555725e95cb3a1b8716c135c1aec38d WHIRLPOOL 00f67f0d99d2efde216b968f7f46b964161dce4adb857122036d07aa53a53b453cd7a80195bb17aa072b6c43895a0026e3e6499561210387a254fbb9c3604644
 EBUILD docker-py-2.4.2.ebuild 1585 SHA256 60d403023461cd28c224bc786781864746d938c39ca6fd8d6c12dd5ba42b082d SHA512 c9b91f286226af040062ec2be6d30e2960460b3fcf7d06ab0ce38d6364166477b638d29a3fdbf6f99ccd8085627c7fab318689d74b378c9b6acf45c9bf9071a7 WHIRLPOOL 17d809eb7f0d4797cd770c9a5a8dec5a095915f0e3fb5698eb22014ca028f27092f09381585e398f6d6a39ae96d693bf2c2208893b86655bbbfc8e7775656637
 EBUILD docker-py-2.5.1.ebuild 1587 SHA256 7a9d032df51e31130cfdab41c6e746dcbbfddbdb3ecdca129bc27b9da319cf94 SHA512 ab178c7cbb9b5266da850c3ea3617bd42e745bbbeda7be70d116ca4c459263b7e38802f30f161eb0e701a5149ab5009dc8f968189f3c23b8b56f8d1e60141175 WHIRLPOOL 5ba6abfb92c3794281fc09a99a9c6084c814aad39a0de6ee997087575d11a2bebafee0ac314eaccd672c1f0417288dc744f1951cb982a9bde1c7214ac4cfb81a
-EBUILD docker-py-2.6.0.ebuild 1587 SHA256 7a9d032df51e31130cfdab41c6e746dcbbfddbdb3ecdca129bc27b9da319cf94 SHA512 ab178c7cbb9b5266da850c3ea3617bd42e745bbbeda7be70d116ca4c459263b7e38802f30f161eb0e701a5149ab5009dc8f968189f3c23b8b56f8d1e60141175 WHIRLPOOL 5ba6abfb92c3794281fc09a99a9c6084c814aad39a0de6ee997087575d11a2bebafee0ac314eaccd672c1f0417288dc744f1951cb982a9bde1c7214ac4cfb81a
+EBUILD docker-py-2.6.1.ebuild 1587 SHA256 7a9d032df51e31130cfdab41c6e746dcbbfddbdb3ecdca129bc27b9da319cf94 SHA512 ab178c7cbb9b5266da850c3ea3617bd42e745bbbeda7be70d116ca4c459263b7e38802f30f161eb0e701a5149ab5009dc8f968189f3c23b8b56f8d1e60141175 WHIRLPOOL 5ba6abfb92c3794281fc09a99a9c6084c814aad39a0de6ee997087575d11a2bebafee0ac314eaccd672c1f0417288dc744f1951cb982a9bde1c7214ac4cfb81a
 MISC ChangeLog 8132 SHA256 3555bd18e5edce1bff98dc5c88d70f307bb43d2ec66435a6cd075b801d223d55 SHA512 14de0270d6d1026a905bb2d0c885d9bbc50493a8ec06740416c6062998cc8b09ac299548b7f826fcbc0fee751bcc024b4eb06446afe56b4f58b9a48d9bedde06 WHIRLPOOL 153c688188e10ca5db74f1ba3f2bd27eed57821b25e63afc8fd0317d82d7379810efb2d262ad1a4da55d5e9180c23d2ac09578b9a677c45cdea40fcffb070569
 MISC ChangeLog-2015 4931 SHA256 bb731371f5f8ff069b2d9288af740c946b96e808c6d886195594c75630002789 SHA512 0f3f52ec356ee461622bf9d1dde2ecfb636670f3905ae3d065b225be16d0912772c3fbe1adb6774dceacbfac8d31a14d14dfdf130aafc64e2105f1de2e070fc8 WHIRLPOOL b1614d7bbd5572b94d73ae05e2058b7b629223b214541792b2c5c76967a8cc8b534159aa6243a79d1e8fbf014e4748201e74a6fa06d4bbd8d201f636691df988
 MISC metadata.xml 403 SHA256 0410b5390159fa509e847e16878de2588f109c22a22df1650d50b28cfbca597f SHA512 3673893aec6cf4535b06c61808862507413fe2715c55da76ff408ac5f8ebc3ed304848190e1542c779ad02f5fff3ca48ff8449dcf254a7b547a00187da053af9 WHIRLPOOL 725155b52cc47d22d95412895e46dcb0d5e4acad30b50d4295761ad1eadbdc9846832df36a93c471cd8f36ccac9851565acb03fa72991857904ca1abaa8a5571
diff --git a/dev-python/docker-py/docker-py-2.2.1.ebuild b/dev-python/docker-py/docker-py-2.2.1.ebuild
deleted file mode 100644
index 6de9858dd974..000000000000
--- a/dev-python/docker-py/docker-py-2.2.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="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"
-
-RDEPEND="
-	>=dev-python/docker-pycreds-0.2.1[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.12.2[${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' )
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.9.1[${PYTHON_USEDEP}]
-	)
-	doc? (
-		dev-python/recommonmark[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.4.6[${PYTHON_USEDEP}]
-	)
-"
-
-python_prepare_all() {
-	sed -i -e "s/import pip//" -e "s/if 'docker-py'.*/if False:/" setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build docs html || die "docs failed to build"
-		HTML_DOCS=( html/. )
-	fi
-}
-
-python_test() {
-	py.test tests/unit/ || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/docker-py/docker-py-2.3.0.ebuild b/dev-python/docker-py/docker-py-2.3.0.ebuild
deleted file mode 100644
index 1e772e7721ca..000000000000
--- a/dev-python/docker-py/docker-py-2.3.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="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"
-
-RDEPEND="
-	>=dev-python/docker-pycreds-0.2.1[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.12.2[${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' )
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.9.1[${PYTHON_USEDEP}]
-	)
-	doc? (
-		dev-python/recommonmark[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.4.6[${PYTHON_USEDEP}]
-	)
-"
-
-python_prepare_all() {
-	sed -i -e "s/import pip//" -e "s/if 'docker-py'.*/if False:/" setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build docs html || die "docs failed to build"
-		HTML_DOCS=( html/. )
-	fi
-}
-
-python_test() {
-	py.test tests/unit/ || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/docker-py/docker-py-2.6.0.ebuild b/dev-python/docker-py/docker-py-2.6.1.ebuild
index 559c7b0e68d7..559c7b0e68d7 100644
--- a/dev-python/docker-py/docker-py-2.6.0.ebuild
+++ b/dev-python/docker-py/docker-py-2.6.1.ebuild
diff --git a/dev-python/elasticsearch-curator/Manifest b/dev-python/elasticsearch-curator/Manifest
index 6cbcdeb24364..56b2224928ea 100644
--- a/dev-python/elasticsearch-curator/Manifest
+++ b/dev-python/elasticsearch-curator/Manifest
@@ -7,7 +7,7 @@ DIST elasticsearch-curator-5.1.2.tar.gz 290616 SHA256 e2f4f6db735223b8bf2bf84924
 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 SHA256 674a9cac7acf44b0d5197da32b433ab1709c13f8f37d1c62613868aa48e9ed6f SHA512 e2fae6174588e141c8538c8faa74989fb36fbaf98f656194d514e970265c664b7bcbc1e8ca3fc4fe5397afacc2c46713c63a84e0b424f3b330613787d3803022 WHIRLPOOL dcd998067add00ce57a637d563c5c79d42c1e15f5d644091ebd635aea817181b7288b199a00597d6c4f99c26519bbd2fdbb81769940f2e56bef6276abedccf6a
-EBUILD elasticsearch-curator-5.1.2.ebuild 3229 SHA256 d1606dd62b4b62d44e5043ccef9d31586002c0f9b2cec4a03b97a13706322740 SHA512 76cc7d83d14a4c1bc6f09220b417ab747f237bd01ebf09c216fef229dcdc2517401406edcc86da47dde514703516c397913f24759e2936e3fac8282c0fa836c9 WHIRLPOOL e12b0185f66a67b8628aae039a132d39b0daa44461beb002b7a23d4a30caa6b8c27eb14044828c9d75d1c5182f82220689b107a632bce5f0e0defbfcd0b341f0
+EBUILD elasticsearch-curator-5.1.2.ebuild 3228 SHA256 ab5e6330a4c62f48a12d6cac93c014342ea20cde3191c159dbf497caedbcd333 SHA512 405c09c900b116bcac6ac2936e27bb40e7b97b9e804b30ee55fb3c92b95f61caa607268e5f264eaf941d47cd53857e9e6549922fda9a4da299e079f4b5141205 WHIRLPOOL ab48a7c6a180a028c99187a6a4ad33b1113840477051fd9b418f5ba4271c53d7ec640210357c1b625abf4251b6d0aced1c1fc6ea97368e5504537f7c2673e19c
 EBUILD elasticsearch-curator-5.2.0.ebuild 3239 SHA256 d24d2f83720cdcb458a1fec7117b35e5a4caaac5a6adb9bea6a142b640185e96 SHA512 bf9f8495476708bc2a52eb26d81e2c453931bfe796d8f3bf3d71b34e196a95c2fc4a0d2871e8a18323151f51fe3f535c22c1d206f5a1ae12287c914ceac701c9 WHIRLPOOL f1278611e5431a143fc240cc33887ecf5f8eb923aa20acdbfea17d77f98e35438c520851a9b14c799b1a9b110fce16f3c26a4df420fc9091a8fb8ac9555e1d52
 EBUILD elasticsearch-curator-5.3.0.ebuild 3239 SHA256 5af8dc0f699fd779efe7d343012c1070b611d3b4b4348236f0ab5ce48453608b SHA512 2cd0e8e3ba8a02ee22884f5e7436203cfb386d1be90e1ecb50b5b6ba60f7ef1181fe6b32ae91f2615875f7e8ad1b75f4032e1902644a046585d8d88de8614406 WHIRLPOOL 05d4a584d6ceb30926a494cbb81e8df586882f18f160e8f9be9702068a81fde143408e4d72fe5e3ed555f46c6d695f43fe99bd0cf9fa1c48db194b44a7264c46
 MISC ChangeLog 7404 SHA256 784e287cdb399e760c0a989b0bd71f6388f8eba046d318a31637c7112d48c570 SHA512 9cc466c383c51c0ab85aa32d0fa443cf0149eaba3ac29e4b7757c9a8b2f4ebb6eb5d05cb785ec5e76c8fe7d0c1c3082bf3f30d39ba36e4d9e5ec7a5ca1c3819b WHIRLPOOL c595d57ecbac5eb1c167e77aaca8eeafa2071833c44da1c7b10431ab02a0ea717fb8c478669e402db47f1dcaadf5e4c50a285e9cac665a77952682d5dbccdb10
diff --git a/dev-python/elasticsearch-curator/elasticsearch-curator-5.1.2.ebuild b/dev-python/elasticsearch-curator/elasticsearch-curator-5.1.2.ebuild
index a3f1f60f5220..91d448a28e3c 100644
--- a/dev-python/elasticsearch-curator/elasticsearch-curator-5.1.2.ebuild
+++ b/dev-python/elasticsearch-curator/elasticsearch-curator-5.1.2.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://github.com/elasticsearch/${MY_PN}/archive/v${PV}.tar.gz -> ${P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 9992a2f37bd7..e3d5753b802e 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -1,10 +1,12 @@
 DIST hypothesis-3.31.1.tar.gz 464365 SHA256 b2e5413e5424b433f013f4c7c5308130a55fa7dde346ffad2e0868139d442e57 SHA512 2bb0bcf1030374a17d0002901a9ffeb2bd522917428989206a3398e13dc0523703b9b39331cc503ee4d815ad48dca4826cc49379434767803373aa7b81a2625d WHIRLPOOL a46599f7e1a5c93e2de4dff00f3b40f75972cdbbab3ee943e1683774cb9dbbb5e7c6cfdbd700e08c72c772b13b21789ee39d6ee954ce47f77ee79a477ae5e5f2
 DIST hypothesis-3.33.0.tar.gz 467424 SHA256 cd10a68b65b160da6c957557255dc2aa89c8967c21169a79d765d4aae1d2a929 SHA512 3e89fa183381f2df556016ff4af17d2731685b019aed74d5f8dccd53ad262dce107f83f105b7e950a579ef247cc9b8336f15ee321292522118fa4c3487a21138 WHIRLPOOL ce1d30d72880d841c116dc2b8edd700fa483c845d7c7271efeceb94ba3336e5ed9493d0032c8aa4efb15d67a95490f3bb556b63a4be6168c53ed06406558808b
 DIST hypothesis-3.34.1.tar.gz 468030 SHA256 331a185a60bb4321073219b73516435923744c07f06c4bed188ddba8078bb247 SHA512 d061c67551c7f877fd7b046ab8164fd01f73f8b013f257817a4e85177f0b8b1782d333d79b492e07771ecdb54ca4451fbcc6271cae19f9a9040160cc45db0644 WHIRLPOOL 7b33284a141b1f8e75e225a82cffae71621a946e48c9d48818fa3870d584347d6b0dcfdfb12b45700970a7ff1400e26fba4e9ff8fbc422b472d11eb1a21798d8
+DIST hypothesis-3.37.0.tar.gz 469019 SHA256 335d18ee7ccecd5e883b4b54b042d65d25b13b76b96eefe1e6df473f99b8c841 SHA512 41dae6f4d9bbddc89fc174e3cb3a9f09d16bfc1903ab75980a243614505eeb792bb00bc2b803e2272b2d6fce901f250e0f82ea9ea647ada868019ce01aa98618 WHIRLPOOL a1a21aae82c51164cedacad039e9ce5480977d5d82cc07468dd086f4a94048833a336b4dd09f39d22ebf53c5c0757abe28654ae75b95a0b20547e8905b21fcc1
 DIST hypothesis-3.6.0.tar.gz 73586 SHA256 ecb0e711ab83032c54605d88fda1e07ca5c6025bdb5e91deab96eca29491f678 SHA512 cb885628e5c38ab9312cfb177ebc3c014617d21031737f5fba343ba485c1b8ff82b1302e7bc1d3e79192bfd8324fd0501498c968f3ac8343829f8965f6354389 WHIRLPOOL 189c788fdd0a326879a468061c271b14056da5f7dc1d5975e8f360cd5a91957eb8f79c26a045fbe49d7b11f7cc09024d3d09a353321b1dda1d4d96b452fd9e7b
 EBUILD hypothesis-3.31.1.ebuild 1100 SHA256 fda1923e9047ae3efb96595e3c8ae3305e2e9b17d207022640360d1c26cdac0b SHA512 695fb455580fc5d752e8b8d2be0f9110fa4074c027f660de11cdccb2877d112c2d853ed0f3e2ce982abc59916f4e25869c1f217051e4a07a1dec39e920d23b3c WHIRLPOOL 230386cb9b6ce4ca94a88a5bd3f0066117da91da0bafcb43ece9df1fbfdc214f318ad49f3e1184f4c01604dbddcbf90aa6c331efa41f2d9d688e9581b5dbce6d
 EBUILD hypothesis-3.33.0.ebuild 1100 SHA256 fda1923e9047ae3efb96595e3c8ae3305e2e9b17d207022640360d1c26cdac0b SHA512 695fb455580fc5d752e8b8d2be0f9110fa4074c027f660de11cdccb2877d112c2d853ed0f3e2ce982abc59916f4e25869c1f217051e4a07a1dec39e920d23b3c WHIRLPOOL 230386cb9b6ce4ca94a88a5bd3f0066117da91da0bafcb43ece9df1fbfdc214f318ad49f3e1184f4c01604dbddcbf90aa6c331efa41f2d9d688e9581b5dbce6d
 EBUILD hypothesis-3.34.1.ebuild 1100 SHA256 fda1923e9047ae3efb96595e3c8ae3305e2e9b17d207022640360d1c26cdac0b SHA512 695fb455580fc5d752e8b8d2be0f9110fa4074c027f660de11cdccb2877d112c2d853ed0f3e2ce982abc59916f4e25869c1f217051e4a07a1dec39e920d23b3c WHIRLPOOL 230386cb9b6ce4ca94a88a5bd3f0066117da91da0bafcb43ece9df1fbfdc214f318ad49f3e1184f4c01604dbddcbf90aa6c331efa41f2d9d688e9581b5dbce6d
+EBUILD hypothesis-3.37.0.ebuild 1100 SHA256 fda1923e9047ae3efb96595e3c8ae3305e2e9b17d207022640360d1c26cdac0b SHA512 695fb455580fc5d752e8b8d2be0f9110fa4074c027f660de11cdccb2877d112c2d853ed0f3e2ce982abc59916f4e25869c1f217051e4a07a1dec39e920d23b3c WHIRLPOOL 230386cb9b6ce4ca94a88a5bd3f0066117da91da0bafcb43ece9df1fbfdc214f318ad49f3e1184f4c01604dbddcbf90aa6c331efa41f2d9d688e9581b5dbce6d
 EBUILD hypothesis-3.6.0-r1.ebuild 915 SHA256 fe23c94089626188676ac9fd4874aea2b85a13034602f30f4e846a5ea0140fef SHA512 83ab953c3eca8c1e3672eec5d4acec86566cd2eb6151f7304ad57f8dd9ff485e40322ef4dc30b9b7444799bd919be9b3b5d8165c663a0f4e10d0e69e90eab6ba WHIRLPOOL 446636ef0dc735872fa2bed6a8d8a97ae7ac737ec04091020be3e576531b1cd863e328bf60de19e7d8166ee7ab21beb8d43da4d2bbc4a44e63e01cb557b7c870
 MISC ChangeLog 10982 SHA256 16d4bd011e6f9233e9a02424c453a1fba9c516f65a692d81536359a53af2407c SHA512 c393ae1550bc62ff5562fd28c91ed27b79455f199d77c6b1f61d7b554fb5f8f73f66b9b494536d119787c4764d24d3d3bd99eeea78ce9f25af1f223582170375 WHIRLPOOL bed69f6e30e34dec48e08e15e78921632389b7e8185d8db7f55a8c78b5956e6c0a1a661351f4f731681406588d1627aef3a44f98bc1e6fb711d4d9476310330f
 MISC ChangeLog-2015 643 SHA256 8bd7afabf7b29c9cef84286964de6f612b036e52c56234c7daf0ef38463425bd SHA512 6d0960bab281c57ff2ed827062421fd636f8dfe1b388530fe02858883158d2a47cb95521736d23799f8928e2d7a8c108894dd05b8725531da9156df850bac405 WHIRLPOOL 40eb3e014b2dac792d9668b27c1281f7044878bb26224141a030a92f265d3e83a651c3faeb4c92e3655502f1205f53e9bc7fd7afc8059fb178fc808670a00cca
diff --git a/dev-python/hypothesis/hypothesis-3.37.0.ebuild b/dev-python/hypothesis/hypothesis-3.37.0.ebuild
new file mode 100644
index 000000000000..4869c0b7b9eb
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-3.37.0.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 python3_{4,5,6} pypy{,3} )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="https://github.com/HypothesisWorks/hypothesis-python https://pypi.python.org/pypi/hypothesis"
+SRC_URI="https://github.com/HypothesisWorks/hypothesis-python/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-python/attrs[${PYTHON_USEDEP}]
+	dev-python/coverage[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' 'python2*' pypy)"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S=${WORKDIR}/${PN}-python-${PV}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/keyring/Manifest b/dev-python/keyring/Manifest
index 4da4e84fafab..cf2915af2fed 100644
--- a/dev-python/keyring/Manifest
+++ b/dev-python/keyring/Manifest
@@ -1,7 +1,9 @@
 DIST keyring-10.3.3.tar.gz 39531 SHA256 86a7db0ed1026853d1235f4901efbcaafdba52357f2a0b0347ec1adbdc9b9026 SHA512 6087b9553d3a8df4abbcc0bacc18d769fda04c092781bd79817ceb5984a2548b5c3a4a2bda15a95040b9db59750a91d8eebbc2420d5f9dbd2fa3d6f10884e26a WHIRLPOOL ca25219e54280a75c08147baec88e795d23bca18f9ddc8b5e562dcd70635c61d4cab7e354eb04417cef6b2c9dfbd1c29ab3f5c4e53d4a0fb859e67415272ecfe
 DIST keyring-10.4.0.tar.gz 39632 SHA256 901a3f4ed0dfba473060281b58fd3b649ce70f59cb34a9cf6cb5551218283b26 SHA512 34b1503588fedd480b2031d5557349bc6cd70108e68205a38338e091d2865df512f9a9aa3525fb11fbbb9bc06b2cfa759685495ca94b4044ec034070aa3dc0bb WHIRLPOOL 87dda84b89dd6823b161898be8656cc0bd6ab2a549238193f24fcd27fd4b7fae73e77005fdb56b259c2eec3fb0b8f38e856b749ca313cf1b465cebb7804b6721
+DIST keyring-10.5.0.tar.gz 40664 SHA256 0e6129e8c5bc80da34cc1942d30daad79ed40419fcaaa538278c3b2ff235b313 SHA512 da1cd064ae896458b1bfc6906a3d40abaa45b6e69f5760fb87d7f7176eab2c909515bbf6e3f01ecd821e340fd1f967ef2aed02053d4211e87533ea4fd6b4e08c WHIRLPOOL f338c20379ad51a21b85bb2aa9d00f19854258044d1536f1c4c382a607a2abdced168ca68bf88f65963efd531bc6d5375e14580e99f7b54214016e2683e9fb6f
 EBUILD keyring-10.3.3.ebuild 761 SHA256 ddb60f53201f607df0926d50dbfb8a6e051720dff88c45e348409e1c47e914f0 SHA512 09240d0c2463587ec9656e61e2db74d7efcd2c79fa8bc9428e191e0220cc4edde49092fef638ec74abdf924daeb6c5420b8e28d15e4e34972f7feecc19c3fe9a WHIRLPOOL 2404c64ab1dcd5d55295bdaaa7d59ce267ac6fe39b4cb1195379f7ff604b57005e9db3b857dcc0b1882cc156c126e4ded1e00e5966d67314a7480e6bd70972d1
 EBUILD keyring-10.4.0.ebuild 880 SHA256 d64ebfe1b0be22dd2f65b8b348ca921f49605c1f3ac7714a9e52f2a59a5e4a17 SHA512 a6d152bc4446e1a4d37e152c2bb1011ce7225c2fd3609533b73abf33bed6f18a5a0f38dbecf765e91f40cdf47fe126e34bf6c4730b926cc3c3bc21978847a802 WHIRLPOOL 706e276f8e9acf2dde39337fafab2fc7b71123fbf68b733a1d735011b7769ec99daa1189927c2aa36294f810546a0311c4fef7c68e286b8feba99a297f84a54c
+EBUILD keyring-10.5.0.ebuild 934 SHA256 bcd0c60b47907145f0a7c1f2c1878c1824ffc4593bea090d0539a4347ae42c64 SHA512 c3a3870be3dc46da5733db046740f735bdf6a0808335371ab29c32566143bb4fb7e9ab90846204a727a3aa4c783ab16c40a8aa7416f9ddd03c007de30af79a23 WHIRLPOOL dc94ebba4f757581c1750edb708b734705ff9c769ca58cf2affa36f887f23687bfaba930f786e9e626408d89f41690d71e0d47b3408511d9d8efbd12e19ffd55
 MISC ChangeLog 6541 SHA256 2164587edfc3bd92ef721d5a4b2010d432f2f8e311f9224f5d9f365343bce0b4 SHA512 03107c0af2cf5ae7e82b1300e9618f49053dd1fd83bf6f487af26ebe170b081a991669e731a071eb9e9d2b89722f36233987d3866e912ee3882de6efe1e25c49 WHIRLPOOL 2d90400d7c74506d0463e7b33b09574a79984b98949b3281711ee8b2d9ceba96cedae4119433b79a4632da0e3843d5fac15c61a8dc57d07c8a5b5b1e39e3a40a
 MISC ChangeLog-2015 3476 SHA256 9e3e504467d5b4b3d18bb5cc12358b59087f7484d612d56ed0d82c069c58ebf8 SHA512 81e4fbb0ef294c4b9a4a812ef92f85fc7a7557219dabe2cc60bb025c54eb8a6c7cc3b4b0e68592590064a6282965180c2bdd45f98832e606bfc908bd95e610a7 WHIRLPOOL 63f15f3b64efc5facb2c7e27d2c0e270ba15ee67a14722758961624e0505616f873d4bb5e367b461861d4a7a34c841a90265c33fc09b86e995230a79c9832c4c
 MISC metadata.xml 672 SHA256 41442668784a3b88b529375ee741626a20f694a7b3cbb8072f2d08a0c793cde8 SHA512 19e907e069f6e6092791babdd8b914791d1c52c32187747edc127ce4c80ecad2da1edcdf6e6387c15f9c2b041767b9072668197087afc3644b7713837d5f2ac9 WHIRLPOOL 0a8f161f3c7afd8a6990a44deb9767a41f96df4a0bf70d237d36b330d5190480ba7927148e8bbd0c66144a82b84c703cea6578d2b313640ce6af0e15cfca243a
diff --git a/dev-python/keyring/keyring-10.5.0.ebuild b/dev-python/keyring/keyring-10.5.0.ebuild
new file mode 100644
index 000000000000..fa82fef2cc57
--- /dev/null
+++ b/dev-python/keyring/keyring-10.5.0.ebuild
@@ -0,0 +1,38 @@
+# 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="Provides access to the system keyring service"
+HOMEPAGE="https://github.com/jaraco/keyring"
+SRC_URI="mirror://pypi/k/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="PSF-2"
+KEYWORDS="~arm ~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+	dev-python/secretstorage[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+		dev-python/collective-checkdocs[${PYTHON_USEDEP}]
+	)"
+RDEPEND=""
+
+src_unpack() {
+	unpack $A
+	# This is an interactive test.
+	rm -f "${S}"/keyring/tests/backends/test_kwallet.py
+}
+
+python_test() {
+	py.test -v -v || die "testsuite failed under ${EPYTHON}"
+}
diff --git a/dev-python/libvirt-python/Manifest b/dev-python/libvirt-python/Manifest
index 87c0e13ce075..c5f4a2bfcd74 100644
--- a/dev-python/libvirt-python/Manifest
+++ b/dev-python/libvirt-python/Manifest
@@ -1,7 +1,7 @@
-DIST libvirt-python-3.6.0.tar.gz 181778 SHA256 ecb9cbc8b1f33b245b04e3a937d8483584ab7a18258b217be96661343a4b1ad0 SHA512 333f991fc69b509b2eda67ee70dea39cc9d1ff36b1abb6a881296313ffebfb5ed41de8443534f19b27a70271548214fa94a12e7f59dc217492edf0bb5555ede9 WHIRLPOOL 6f13ee521713c3540e649c9c9edf6fc0427e0c4563305a42366796352fc99867bc79dd5ce61db0d7b79dc02957f8854c5664f5b5952a402c614e19264167546b
 DIST libvirt-python-3.8.0.tar.gz 184346 SHA256 5fcba9ca645b01a8d970da84f7f95d54b0e8e915739d06b5e6d86ae626ea570b SHA512 40fcc67bf793b298016171751f207d65d98c8fe3e04d72bf4a815aab3c2f91a624fde1e0f1a420a67f4cf330874d7dd91ae46c3118e75067030ee551957a8178 WHIRLPOOL 15d815b5f6086e0ffc0f2688aef517c8a62fb89dfb123b6ce3b63a6190b885ef918e16e42fb9dd4d4f2178cf16777be6fc8aeba8d0115d8b3cac3f3a32f8cab4
-EBUILD libvirt-python-3.6.0.ebuild 967 SHA256 ed96a152932adcdd77b623742dd386bb4c02e60bb6e1e177add0b12cc8c7798a SHA512 342912f6f1aa4a8f2c7f7b5df2413490d9d5e9b19b959a1b339d5b6e617ebfb76aa91a6bdd363bf4d9b842e2113bfa7ae5d235d8da4787ef3f07959cc0334e8e WHIRLPOOL 973315859bd2aaac52fb24bc5af7cdfd6f388488a01e6e1fa860a2df2875184df4b78f73c9cdce38219b995e0d9162dff0e5fa0eacc70f6f86cbb9172a9076a8
-EBUILD libvirt-python-3.8.0.ebuild 964 SHA256 92bf9bd371325bd9cba38a138cfc10544bd566f7e69e58918b3f142b326c7a9f SHA512 5067c0583c8f3042ed13b6afb53d9aacca76305650223d318b5d82013b22bf0320069ac26efee4713376d01a75b9e2b797588d2bb5696b3815a74218c651072b WHIRLPOOL 6cf9c76a3dd05b31aa6b46c5e3ecfa89fb3b9ad39927917f379b6a4af5746d941c63c0b98e7d92252f4166eab136d77298d5ae0c327d30d4f3cdb6588bfda52b
+DIST libvirt-python-3.9.0.tar.gz 184365 SHA256 d721c812e002eb784a4b66fbe698dc70e8f42c9b7cc3a96f5b01e83ee7951850 SHA512 fe30d308fb81e08600adbac4ec80e28c24d012ee578686506e5615f22b716067795a76b3c37c4a951ca53d9d6642d2b43636924b2d256480dc24eb660a0225a4 WHIRLPOOL 8ecaad10aa557ffecaf22b6ec1eae2698cec7c126765c20ce3033ba5cb8569ab2b737a48e5532f254d65e5fce1f055f02ff5662ae28718118edbddedda784210
+EBUILD libvirt-python-3.8.0.ebuild 971 SHA256 7210e162b0b4ed2ff74c605d610ede241a9a1e9a7e9a64534e9c8ccdf60b0ec1 SHA512 be12b7ea11f13b9ca7554d4c577cb82aec98008781868a8ab0f4a7d6632d48f47bc89b4702c349dd7d968a00fb647b515eb4606af35c21a5d1be6f839d25f648 WHIRLPOOL 364b0e2d1717c12139c8784a4e2920ed3bdff1e5ff08cd555033c5b5152d8bfd7f854d5569f052cc8b81f1ab15491d2ef6d06dceb99224e9f973dbb63c98e024
+EBUILD libvirt-python-3.9.0.ebuild 964 SHA256 92bf9bd371325bd9cba38a138cfc10544bd566f7e69e58918b3f142b326c7a9f SHA512 5067c0583c8f3042ed13b6afb53d9aacca76305650223d318b5d82013b22bf0320069ac26efee4713376d01a75b9e2b797588d2bb5696b3815a74218c651072b WHIRLPOOL 6cf9c76a3dd05b31aa6b46c5e3ecfa89fb3b9ad39927917f379b6a4af5746d941c63c0b98e7d92252f4166eab136d77298d5ae0c327d30d4f3cdb6588bfda52b
 EBUILD libvirt-python-9999.ebuild 965 SHA256 07d0fd1b274ae7c25e9401ea7b6d1215874c903197890b336b7ea18bd5ac47da SHA512 031a6875c7685b942cc444faa1a175cf44ac2700de9611920eeef03ba771c87be449b4dbdb71fbad7348cf69ba3c475516d41bed874b7f672b14b7c7d56a0156 WHIRLPOOL 219d268e84d8eec062cae56e7c67e812422dacd0350e68322b31a6db6cf55d1a54c393c777b728e37acb2bd1f3390e9f3735559f03d123bdc9a50b543fac3366
 MISC ChangeLog 10187 SHA256 4c9e3a534260ccab329ff53474e2106cc71eaa205c7114f8fbd25650f2b32fec SHA512 0a2c23768c88fc676d6acd30edf8851daccd7892611ca3713500a2c8996af454a577b23788588ddffb2c9a8d260c474acdd63645cbb2d49110b28baf070a8aab WHIRLPOOL e91ce13a2048f101f238ab8523afbb6493c62ebf6fa8730c1c1d96640aa1b50eb292cb214bd72158b2c993c6ff52906056d39953e24c4a6d1a7f7faad43e418a
 MISC ChangeLog-2015 6687 SHA256 8fa4074b08dac5640b998739c571b9580a1b5e658ae416a53bf8188eb57dc6cd SHA512 f8d3531e978480c684badb7e914a4b2bf3039c3030bc610cec26ff83ae60b64e42a68fcfcf3182d0f175dd8e1de71c27915cfcd9da42d1b41a8af2b10feb10c6 WHIRLPOOL 1a6eb42d21b6758105aa72c56bcdb1c268be5bea67e1a66ebea21354fc60637719a1adb8a33cc163d57502217122da1ddbe48056b305d5d73ecece4bff2aec00
diff --git a/dev-python/libvirt-python/libvirt-python-3.8.0.ebuild b/dev-python/libvirt-python/libvirt-python-3.8.0.ebuild
index c16440985c37..f0a6aba3d07a 100644
--- a/dev-python/libvirt-python/libvirt-python-3.8.0.ebuild
+++ b/dev-python/libvirt-python/libvirt-python-3.8.0.ebuild
@@ -13,11 +13,11 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="git://libvirt.org/libvirt-python.git"
 	SRC_URI=""
-	KEYWORDS=""
+	KEYWORDS="amd64 x86"
 	RDEPEND="app-emulation/libvirt:=[-python(-)]"
 else
 	SRC_URI="http://libvirt.org/sources/python/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 	RDEPEND="app-emulation/libvirt:0/${PV}"
 fi
 S="${WORKDIR}/${P%_rc*}"
diff --git a/dev-python/libvirt-python/libvirt-python-3.6.0.ebuild b/dev-python/libvirt-python/libvirt-python-3.9.0.ebuild
index 4262eae37256..c16440985c37 100644
--- a/dev-python/libvirt-python/libvirt-python-3.6.0.ebuild
+++ b/dev-python/libvirt-python/libvirt-python-3.9.0.ebuild
@@ -13,11 +13,11 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="git://libvirt.org/libvirt-python.git"
 	SRC_URI=""
-	KEYWORDS="amd64"
+	KEYWORDS=""
 	RDEPEND="app-emulation/libvirt:=[-python(-)]"
 else
 	SRC_URI="http://libvirt.org/sources/python/${MY_P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
+	KEYWORDS="~amd64 ~arm64 ~x86"
 	RDEPEND="app-emulation/libvirt:0/${PV}"
 fi
 S="${WORKDIR}/${P%_rc*}"
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index 765c68749d38..ac1a9b6ffddc 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -2,7 +2,7 @@ DIST llvm-3.9.0.src.tar.xz 18235716 SHA256 66c73179da42cee1386371641241f79ded250
 DIST llvm-4.0.1.src.tar.xz 21065652 SHA256 da783db1f82d516791179fe103c71706046561f7972b18f0049242dee6712b51 SHA512 16adc39b34ddb628f81b171119a8e2a0e9138b25011e803ef0b688e2fbea116fc4953d3a1b61b90a98a75e33619f81566b7cb06a9a2ea4d04ac5e0eb303a2d1d WHIRLPOOL 1626ff270f7ce4801d02a0797b227fda9314ff5c0c01d653111599e9a4d2854c4d9edc3c698a7abee8d79d6bce8b18dc619fbced3c07ca610d44a248d65830cc
 DIST llvm-5.0.0.src.tar.xz 23411980 SHA256 e35dcbae6084adcf4abb32514127c5eabd7d63b733852ccdb31e06f1373136da SHA512 e6d8fdcb5bf27bded814d02f39f69c6171bc3a512d5957c03e5ac2e231f903b7de87634b059bd5c5da670f7c3a8f7a538f6299225799f15f921857f1452f6b3a WHIRLPOOL 6a99edbdc3e6726dc8ff9126b110fd7560faac46601407722e6dd80b5d894ff242521dc8fda7f4d879de83dac51c65645a37224f7e8def0d8d2f1e564b0531bb
 EBUILD lit-3.9.0.ebuild 778 SHA256 d0350f0c473c5dbc586a547de40e6844abc0bb1e04ac7d90f4fb35d525c6eeeb SHA512 016f2dd37dc1d09e7ab480a9e6c0373a3c76266c5d68ccb9f98f249f82ba1b3d3f9a86359f9bcb41e9dc71f3ba82a4b81b9103d33bb07b16acb825ad71d3a3c6 WHIRLPOOL 00f5c2edf5e98f3043bcb4f476ed9085753155cecf6b5957099ea992ea0c6c7d2d2d44a57a51901f95cddb9431b203b345d4dfb6107cd679c7f6964454a50270
-EBUILD lit-4.0.1.ebuild 746 SHA256 465dd81a9c08c27df9eeecbb60b9230cd7e17b2f18adbdf5c98852d77b708d02 SHA512 806d2a845240d2544c5550a9cf2f67846961b9cf70cd4e780ca4281ae88e000769e5b74e8cc40754ffe2615cc916fa9e1c4f254268e0a027876c8ddc96c4de76 WHIRLPOOL 370e50ff8976dc4d676a261cece8d56ee41072712419881e0d89d17a2b63efaa67622d56507f71ebcad9486a4d20b6b47e5c79a1c7b52cc90128036532d6c0f9
+EBUILD lit-4.0.1.ebuild 814 SHA256 b96d9cc8db0c4640aee83aab4fa4e54aec6691e03bd6e96efd1f7e65363ae8b6 SHA512 bdfc43eceada04077482cb5e2d0eefaa94212429d54632c71fc4b66a2e6b97c0e9ef98efca40d963757b4e1fbb99df0e7e01ad611e4437d610dd22ab151cc13b WHIRLPOOL dff5861625cf17945add4956117e73fd86f3406e5d8dd9386cbbeac4b413084eef6a840dec704710da08357c897da0140a0a6c1ea9a36e389883e4114f4c2483
 EBUILD lit-5.0.0.ebuild 762 SHA256 fe797ddc5c2eb90c351f087a3f74678ad4bb7bf374b59d387250e47edaa62f45 SHA512 47e1442c6ec4005737145556d900fe0bb4e763c1042cc3014c7374b6dc9fd88b5ffacb50211f0a833de5b0dd7d2b869cb293d8da72405a4f827dfe59663c1fec WHIRLPOOL 2d071210031fbe086c031f8385242834ba68c6e2532c0f6358269265355f5970aa503133dbb5c9795617e9fb3ed6b2ce882924c9f0a3c705606de006f4f805bc
 EBUILD lit-5.0.9999.ebuild 782 SHA256 b9099610c0b9d57e497489bd91654ed44e86378595f2e2a1ad3b6a2e28886927 SHA512 e9657bdfc870359ff803e6dbd4670cadbd5f5bc474941b598aef3c96183a02da7d02a69afb46c2763674bc5193ebadfc4d5c3a8c026adec48fc4aecf0a0e079d WHIRLPOOL 509acd253b366646193bb7f8406ac009fb4a1253ca7d0fd6d3e2843a6dc5907c161b193ced31f23f61f976ee122a26d79b2407c44a8c030255baa06aeadf7815
 EBUILD lit-9999.ebuild 757 SHA256 92267bfb77662b054ce90d845348d49ddcad5706602a0d3043e5a6b70fc488e0 SHA512 3a4bdf72b99ec4de11874d8757ed75d3dfc0072dbcb441aff1f27c0c663a24e6e7063e0ed3a77a372ba177d3e7a0cccbc388361e8c46b52c66e08e8fca338460 WHIRLPOOL c9d48d9e499a16a21f38a18f59e0929e9629f5c499801772a6217055be4e18b46c6fdee8b0d68fd5bdc35b86e8f4bac6e419c2a8571e35ad7276daf202722cf8
diff --git a/dev-python/lit/lit-4.0.1.ebuild b/dev-python/lit/lit-4.0.1.ebuild
index 0531b4bca56c..9ef5c2139edb 100644
--- a/dev-python/lit/lit-4.0.1.ebuild
+++ b/dev-python/lit/lit-4.0.1.ebuild
@@ -25,6 +25,9 @@ DEPEND="
 		dev-python/psutil[${PYTHON_USEDEP}]
 		sys-devel/llvm )"
 
+# Tests are broken in this version, fixed in 5.0+.
+RESTRICT="test"
+
 # TODO: move the manpage generation here (from sys-devel/llvm)
 
 python_test() {
diff --git a/dev-python/multidict/Manifest b/dev-python/multidict/Manifest
index 22767e4f04d2..61f20916b258 100644
--- a/dev-python/multidict/Manifest
+++ b/dev-python/multidict/Manifest
@@ -4,11 +4,13 @@ DIST multidict-2.1.0.tar.gz 28131 SHA256 91c1b57f79a391cc8efaf6ada7b2a84c3954249
 DIST multidict-2.1.2.tar.gz 28193 SHA256 f258814a672d093e062bb2fa3ebf007db3a542bc55785f25942b0728418feba7 SHA512 7debfe3c0abb3323a5ee82b7522ab86162b3d44333ea7dcb26c7c87d24fb4c4c062095db9603ac4a757d507971fff6252f4b3dd9d2183ea167caa5ae80ae3b33 WHIRLPOOL 6d1a9a66b753c05b430aabc21301576e2b19bde9713be8cb9b25781104c655effcf485cd64b472e82d4568cb06ce92ca3a158b22a547918ec2f44bd2d5068ff6
 DIST multidict-2.1.4.tar.gz 28395 SHA256 4116a99f024269210bc5629661e55f5f613e1b11016b3bbf4e0ba453b02a65c1 SHA512 1806f21a528f907ba16cada2eda05c7387d63bec45b7906a5a37eba834a87553c402766f4e50425a41414e93e2fc202d18ad9e6aaf02742fe06899e6a18109c8 WHIRLPOOL d889866bd3b82f7d4c4da963d6a74234f7e161a1d654b1fd5ed5a9ff0e35f1a3ac4d46f4a1ddd6a907abfbd1a29dcc630e0c4463b5252d30357b152d52d516d9
 DIST multidict-2.1.5.tar.gz 28497 SHA256 f3d8f71104d2084cbdb51158ac5eeb6aee0907618a59fe7cb97b2b139d58abb6 SHA512 927f2e0c175e52edbf3a5385957e5988a08061160488df70f7431520ef75439011986365dfebac80e8da6e1874232c532ea96c53081c65c74c04f0e307db6729 WHIRLPOOL 01d2d270571424b01877fee60e84f412f08cfb9371428d20731cc1a1af600fd7f9519d193a37d49bfdc4ecdf572a43ff97903b22d073df5269cf11f03ba91d45
+DIST multidict-3.3.2.tar.gz 40083 SHA256 f5b1b427791dc2fbbe7c79a4c9ad6824c139531176f685c01d30fc5b7573964c SHA512 d44c8b00ab7823b8840665aa1462ed547aea48874a408b2af8f1cb455727896cd77ef2201e8f234bcb3f2781599ffe931a5884fc55fc1f7286da29185c4d88fc WHIRLPOOL e6a4c93e51f776300d0f6af58f2bbfcf09771d90d00981b00ba0621589d15265b80db92214f4265bc9c74a8620109ade0980fe7a666c15efb08a90bbce28fa67
 EBUILD multidict-1.3.0_alpha1.ebuild 869 SHA256 9ae316cc549e169f7ef5e174795aebd8df21ec7e6e3781f2166a313a7432ac71 SHA512 b558ad47531db3d3497adaba4f0fe7b620ef481cbaf44f94d17f23118fcd9a363945c7ea7b98340d9bef387e8720fc43697b34b2c140a13c6c0c806ed252d4d4 WHIRLPOOL 556a875022e853e95a5fa2f61c3f112a879170c45102c69e9c484db87ec2f9ba8882fc6037c127a771c42bb582f6db92c3ab380fe051df0a6e8286a447288ae0
 EBUILD multidict-2.0.1.ebuild 878 SHA256 70940af3aa043bd51c36da5d9215c84824042f24175253dbffa240ae440d6e1e SHA512 564b1022e58f1c404f53942fd2e11f0628849a4841670bf486bcbaabe36b07ca55182925c0958d9f889cc11743778b09995fe730b86d28b48564d4faad982672 WHIRLPOOL ec7c83fc73324d42eeb4c311be8ff92a09865f3fd042441583da204039f1edd38361622ac273b64250105a59301853b8eae1de73f7504c57b4b0132e8043c833
 EBUILD multidict-2.1.0.ebuild 878 SHA256 70940af3aa043bd51c36da5d9215c84824042f24175253dbffa240ae440d6e1e SHA512 564b1022e58f1c404f53942fd2e11f0628849a4841670bf486bcbaabe36b07ca55182925c0958d9f889cc11743778b09995fe730b86d28b48564d4faad982672 WHIRLPOOL ec7c83fc73324d42eeb4c311be8ff92a09865f3fd042441583da204039f1edd38361622ac273b64250105a59301853b8eae1de73f7504c57b4b0132e8043c833
 EBUILD multidict-2.1.2.ebuild 878 SHA256 70940af3aa043bd51c36da5d9215c84824042f24175253dbffa240ae440d6e1e SHA512 564b1022e58f1c404f53942fd2e11f0628849a4841670bf486bcbaabe36b07ca55182925c0958d9f889cc11743778b09995fe730b86d28b48564d4faad982672 WHIRLPOOL ec7c83fc73324d42eeb4c311be8ff92a09865f3fd042441583da204039f1edd38361622ac273b64250105a59301853b8eae1de73f7504c57b4b0132e8043c833
 EBUILD multidict-2.1.4.ebuild 874 SHA256 6e152e167b93ca02c5b7ba76a73b6d7597c96c168c02ad22f97b384afcf7d11d SHA512 b3a2970a265bf709e95a975ba31f7006ae1a1ce261b555495eb5770b81e76ce3af31fe4e0749d769ea70ec8c222ae6e21e30843a9feab9d82424371d33259cb5 WHIRLPOOL 910c017fb33cbd1155fb7d83fa64dc483f1564303b9a1e695d52c969c9d24cb1f75ee8f3e0471bf43e9446fea8266a4ee2da4199a2b044caa14d58696217740f
 EBUILD multidict-2.1.5.ebuild 1049 SHA256 c918352b24170d5ac7b75add2a596154971757305be383f9817d82165d9e2593 SHA512 e96c235ad7a272127d20107d5eff61cd840d35173c0b81d63202532f0e7a1e3d81b4dd880c0bbe744a2b4de3abbf8a2ea0bd15977489f3173fbc8a70f81e5a0c WHIRLPOOL cfa56e646c5b5ba6a7f101ef374da1bc09fd87a1cac3184003e8900efffb58d8b937003750ed77a2745f831df2b908653373623d6fc826c7bd6735f1a98a9ac3
+EBUILD multidict-3.3.2.ebuild 857 SHA256 fb7d18e076926f0088b1c2deecc7f4ac4a0a2c224b914077546b82329d6370b4 SHA512 6fd7be5f8772ff2d1a17a25dc38dd161dfe791b36ed19fcfdcebff48960145ddc0d6b6a5d52936e9bd99803725d944d70b9ddf6073e78c46ad84486684b47dbb WHIRLPOOL f3e2c2439b76d9f4baadb9c12ff6aa9c12f91dcac5db761a8574e2bbf3e1e5d84e19dd98d235985b7de21ad27a02b63474751b64e8b9638fa0ca4159b5a63cf8
 MISC ChangeLog 2503 SHA256 89e05281402991fd242ef1cc5e36f5c4418eebb319facefbf6c7dc068b091a83 SHA512 0c33729c79cf2a80aa2ec86912907c44b6fbbea704e552fef47af5e927faf968914c18bbb991bbefada856e72cb6f6a7c012b04892285ebca00b0ea7fefa36c3 WHIRLPOOL bd4b68b0b80910bc39060a757cd21a6f9e14e28c992e431c8aa1a62594357577e4d2626580a07c575f6a0d34eac6859501d5ced70e78ee564c0496852c54637a
 MISC metadata.xml 329 SHA256 e11ad5dd63503c827654c24462c1716628f3cdea4146dbf54615cffe3b70a45c SHA512 df7e3fd8d30523b4c4ff3d7eddf58f358a8950e371ed74146af2ae6301c069014e1e8f0e4eee1f01138eb15cd10304367dcf5f4acc3caa23437a9a47cc35778a WHIRLPOOL 504456ca9a5948c7fbe7d910e91b270673a6fc3e95eb1a6170b80ef20b0ecc08cf0db0c68a7bedd663facc3a9f1c69526e440091722e05b2581e653711603281
diff --git a/dev-python/multidict/multidict-3.3.2.ebuild b/dev-python/multidict/multidict-3.3.2.ebuild
new file mode 100644
index 000000000000..5cb0c245bb31
--- /dev/null
+++ b/dev-python/multidict/multidict-3.3.2.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=( python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="multidict implementation"
+HOMEPAGE="https://github.com/aio-libs/multidict/"
+SRC_URI="https://github.com/aio-libs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND=""
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/os-brick/Manifest b/dev-python/os-brick/Manifest
index 6d651eb66759..42fb10cfdab1 100644
--- a/dev-python/os-brick/Manifest
+++ b/dev-python/os-brick/Manifest
@@ -1,11 +1,13 @@
 DIST os-brick-1.11.0.tar.gz 140220 SHA256 e8b6eca245b0391475cff31f1fdb85904981846b3da492c29ae1836b8054aef4 SHA512 69eeaa6b1fec9732e07ad2527fec2e624ed352bc18fe6d96546e787869d3d388113bea378e64a1d346be2dcd93eb8f69f94655f0fa8d9230fa8fc8e9a1e48847 WHIRLPOOL a72f406a54ca700bdbfa2ced008f5c4b620e1d50454d6a86a12bd5c392c2f31627b4ed8ca4cb32f4277b5aef8ec7387d07ef61c8e50940a64215a52fe792db29
 DIST os-brick-1.15.2.tar.gz 159500 SHA256 a3937aac00d6f43405576c4dabd1231495c0e4737630166b7ebdd6b4dd3068b3 SHA512 055353f53c3ba27e68d13ffac462a3ff5030dee445e37165319a98bcb76a54cb192df466847ad4e6812027532fd654a177fb8acb5a39a59d2d865e2355a09f7b WHIRLPOOL 4fd1a584556e64209f0f8b2de38b4239b7d2d74b7784938f48e803988b66a256134509b8b179f0ccd6a7d1b1c2e24a90f70e7c6200ea610bd97ce6e33a762bba
 DIST os-brick-1.15.3.tar.gz 160889 SHA256 7c646ddbdb12856574b20b83c6ae180f8ac818fc64224f32a4b9e4aa75d1cca3 SHA512 d8a1eda3f51f4b1051bc42c132b8bdf054c5550b9bd80883eaa97102e6ef5f7c1e1ba55d4facde47061f801f358dc4a4eeabe8f31544b3d2dff1cf83ea5d3aa5 WHIRLPOOL b7dde6d3ace8fca983d2ec284e6e5875b85e6435a09521df173d9b368cbf9ac6a6731791cbb7807c56f9a7c46ccf1c899b90f78f0c936b346d199365cbaa3e9d
+DIST os-brick-1.15.4.tar.gz 161212 SHA256 1f05dddb807dd439b8cb31f74184cdc17cd836f2a6249ead5b925c0764baec08 SHA512 9e13e1d562eb62ef393c531dff27d7d2623f9843deb991fb1be74a42bb5e558875d7195c1499f147426734bad3c4b3907c65f036ffa65f23ab6585d206bed696 WHIRLPOOL 1e33b84094cc1d8917cbea13b605c3c1df9e0de1c83cc1c46733b19878efc6d2e9f21db240bfd1555557936154e6a1e1583345d0d8c4a3d4e7915f9f789468b6
 DIST os-brick-1.2.0.tar.gz 90245 SHA256 e8c5931d2a5115a7c484276add6be6b5e3ba13402c8a71e32b2313448010be30 SHA512 9e35d4244f53d495824d7da5dc7cde117b78d0bdbf1bed6234848ce6b965ddb0fb88296a54f76915bbdf1cc337ca308c46f48814c5fa6877979debae3ab58628 WHIRLPOOL 7b7e1bf264313db1d8cc9c2e1966bce7872e755bfa043c38d81a54436ddf3cf0b1362618d4131f1cf947823c775286e32b9adca2b14887e679ff8def35c1fe72
 DIST os-brick-1.6.2.tar.gz 137155 SHA256 47f83b4fe5e06a720481ae0f0a45fb14040c2319465f7d7df9825002bf18e709 SHA512 b7d91f3ee5f86b559326ad8ab354bc107c39f04773fa18a508e46289341ffb47703ff0a7a48b285dfba5a27954fc24c61ba5543bbc121a5d171674aa706d10aa WHIRLPOOL b73ae07c596ffbd1856a6df7b417f691467c132b7cb7c3479e8699e257b49a840448a202d694b549bf8721fde86d185d129b4b56982a7792819513eed00050ea
 EBUILD os-brick-1.11.0.ebuild 1407 SHA256 fcb3e9780886b153ae0015e20f28d324f563effc9b73d812fa5dce9553686db6 SHA512 b4d4f88a23981167a261796ac783333b15ad3462f735b30d76e2d6c6505a57bc4f79cc817b32750a14de6cd2a7480b294f9efb530508a11ae7aa95e3fb9814f1 WHIRLPOOL dad0029580a065cc0b745007e0248df2c8bb8d295c69f59ed6d6824a8e61cb2a4941f228f6abb72211f0c7bd2b22c6d56f31880846b6a04f3124b0be319ffb4e
 EBUILD os-brick-1.15.2.ebuild 1578 SHA256 5770442795011ef0d254c51a3d333f157364524e052fe333bb9aa8ad674ebc53 SHA512 7502e9f117844eea49f3eda936da04156e5168214dc20073c1eed6011db4540fed1c5ad9469ebadfbf8c7a42de9eff745270ade49f6d346314c985c24219c92e WHIRLPOOL ea663505ae584b05131c151f43efa7ce83463c8b3119940103fdf8e46a7c389eb4bc5cd984f8ac08ce64a347efab1df1a61f252a04f7c65051c6946ac3c40fdd
 EBUILD os-brick-1.15.3.ebuild 1638 SHA256 8f7ba6ab11e76dc4a977c71d48aaf9c4e4afbb5e615c6c9d4c70cdbd82132ecd SHA512 ed4d64a43bd92f027d89417a5bb1ea6283a5fd120294633b983ed60cb31f4db23169d273a4224c9dfc48b452c77c64564dc6ddc36ec5064e02e9810bacf7ba50 WHIRLPOOL ad347532543f138e912ad47b07cde423ffc39e4ec4d5adae6719fe5c7450d70ee373dd4de2d3d66f12a7a9014051954997a9e78a4f50680a750a1d2328c08678
+EBUILD os-brick-1.15.4.ebuild 1638 SHA256 8f7ba6ab11e76dc4a977c71d48aaf9c4e4afbb5e615c6c9d4c70cdbd82132ecd SHA512 ed4d64a43bd92f027d89417a5bb1ea6283a5fd120294633b983ed60cb31f4db23169d273a4224c9dfc48b452c77c64564dc6ddc36ec5064e02e9810bacf7ba50 WHIRLPOOL ad347532543f138e912ad47b07cde423ffc39e4ec4d5adae6719fe5c7450d70ee373dd4de2d3d66f12a7a9014051954997a9e78a4f50680a750a1d2328c08678
 EBUILD os-brick-1.2.0.ebuild 1307 SHA256 603bc18989b8d09f0aba0aa09ff8b26882875baf1c42679343d11c23f92a3fce SHA512 17630aebdca5e96724189375b2091df6fe7e1418c9661100a6eab51eb79233d97d61d6b2bbeb1e1107eca4f51b404f6d0a6fbed7e69796295a6d601abdb3561b WHIRLPOOL d4645bcd71ddcf9e7794a159b48238096a826037d93407663d1289d99de7d76c46b4122f088b477af3c5d6978979d6ec2de83cea3eb2f0c88a31d90facf27e82
 EBUILD os-brick-1.6.2.ebuild 1409 SHA256 3441d514dfaf651e61a0cad8a4259a89080cc02ce9e86b3fefdbf6bed5f21a4a SHA512 c0c4abf599f7e2d02752785dbb6ef6ec72b4c85262ebb286dac2be7c868e71203c9f221878b61a10be2398b33441ec216099a2a20a208f2a23519f6c0eb0ba7a WHIRLPOOL ca9f0215075a950ee456b1940abc39ad6612bc1a5e1bec239b484cebb03730b979f747f5d6bff86569c42c933a930fa2140a08f23707ce839d1ccf66269ae5aa
 MISC ChangeLog 2547 SHA256 95a434e8aa6544ec585e142e3aa2f11c51638756c2b7288e88ee949e20d75d05 SHA512 b8506db5d84d071b825f21a1cb465e1f63389ffe1c2b969aff7ec8a845ed077e60449e8a65835da914f230adf3dbf03e7d74b5d49695692f1640517d27ee5571 WHIRLPOOL 3229c1179cc07403ce3f9587ccd2861257e55876455b75b05625a8aaab33411eced59360b6524c47687b93602492ebef35944309da09cda25c3e8b9615ed6a4c
diff --git a/dev-python/os-brick/os-brick-1.15.4.ebuild b/dev-python/os-brick/os-brick-1.15.4.ebuild
new file mode 100644
index 000000000000..9b4821f3c90e
--- /dev/null
+++ b/dev-python/os-brick/os-brick-1.15.4.ebuild
@@ -0,0 +1,47 @@
+# 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 Cinder brick library for managing local volume attaches"
+HOMEPAGE="https://github.com/openstack/cinder"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-1.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-i18n-3.15.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-privsep-1.9.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-privsep-1.17.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
+	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/os-win-2.0.0[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/pilkit/Manifest b/dev-python/pilkit/Manifest
new file mode 100644
index 000000000000..fda63e5b1317
--- /dev/null
+++ b/dev-python/pilkit/Manifest
@@ -0,0 +1,3 @@
+DIST pilkit-2.0.tar.gz 160077 SHA256 01a1c3b920f4a0f73d4f0ddd252031eba78697c7af8ba5f94e43c8b2fc7a07cf SHA512 7732c67bc00db53c6849c907233381cca7f9055d55d479958a7b97db277524ac280753fd40c0023fe2b34f98b7261134f993585e658275ccd4c67f357c13de51 WHIRLPOOL a99362e2bbdab5c96e8d39a367f98a9cd7947cca18e68a3b903f2a5cc9b5279fdf4fd1f489073e594823def31e4e2dc02c256e4834a7bc4e889550a9cc978f8c
+EBUILD pilkit-2.0.ebuild 681 SHA256 9d85748bcea1ad381cd0f13c924fac26a70c8a4e5ec62bb9d19989435b571a2f SHA512 cac22400b70066fca9f0160781ac62254604d48d9b36b2f71df093eeed9364110cce2c475288c1d70a3430f3f14bae87c7b0fc7a851eb99f0d7daa67b12fe96b WHIRLPOOL 7a97c0b97f38722c8672ba6d784466d1989e7c6e891df6601ec78fc9b76b5496e5a87fd34c5fec4dbb4abb9f5dbc63cd3d64fab6f17b59e132f494b92e6efdab
+MISC metadata.xml 707 SHA256 8d419365a0cd0d00a3a7f57cf4fe1073165190a20d67054caddefd0f76c1778b SHA512 32ae881094153b9179401cc55abc4a03469d9004b121afad62bdcbe80725c687f5779fcb3e2286c051f6038e98f7838d89308f12fba4c0fb15e5abe6e27df556 WHIRLPOOL 04810feb2dfc83882a8b61feedb87cc9468c649edeb6aee4f03a9b204b842fd25c3ee5b8d1ab469f85df7a49b53031a748914d20367f85372c1138739523faa7
diff --git a/dev-python/pilkit/metadata.xml b/dev-python/pilkit/metadata.xml
new file mode 100644
index 000000000000..b4d5770a92d6
--- /dev/null
+++ b/dev-python/pilkit/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>thomas@gstaedtner.net</email>
+		<name>Thomas Gstädtner</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pilkit</remote-id>
+		<remote-id type="github">matthewwithanm/pilkit</remote-id>
+		<bugs-to>
+			https://github.com/matthewwithanm/pilkit/issues
+		</bugs-to>
+	</upstream>
+	<longdescription>
+		PILKit is a collection of utilities for working with
+		PIL (the Python Imaging Library).
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/pilkit/pilkit-2.0.ebuild b/dev-python/pilkit/pilkit-2.0.ebuild
new file mode 100644
index 000000000000..b55d51a92e54
--- /dev/null
+++ b/dev-python/pilkit/pilkit-2.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="A collection of utilities and processors for the Python Imaging Libary"
+HOMEPAGE="https://github.com/matthewwithanm/pilkit"
+SRC_URI="https://github.com/matthewwithanm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+CDEPEND="dev-python/pillow[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+RDEPEND="${CDEPEND}"
+
+python_test() {
+	nosetests --verbose || die
+}
diff --git a/dev-python/pyblake2/Manifest b/dev-python/pyblake2/Manifest
index a7d5ad4d4afe..982fa86ef685 100644
--- a/dev-python/pyblake2/Manifest
+++ b/dev-python/pyblake2/Manifest
@@ -1,3 +1,5 @@
 DIST pyblake2-0.9.3.tar.gz 130641 SHA256 626448e1fe1cc01d2197118954bec9f158378577e12686d5b01979f7f0fa2212 SHA512 6336a7f7e79bd3e6ff7f8ff4d279ae170e86f1464b9fa9e7ea7f0dbbac6fcc044caf225111e065f9cd9cdeea0f81fae8d373e1f65be3e418929f53fad063205e WHIRLPOOL 0d8f2aaf35a5eb0ebdedd9219a0ee8b126c93b11ae3e406ef637d8930a34783886b212ce50a33d677b0a19289cd32f40dc3da22a9a9fec108b481268f153d45b
-EBUILD pyblake2-0.9.3.ebuild 1355 SHA256 4bed48011be9b979c2a70a85b6257d518bb26c2b0165aff3fd5467a85e3b4faa SHA512 0601740ff2ec9d5a537d17465c1ed51a550d352a855f326d0f78190ecf8f3eb185537dd9de1b829a9152ff198d9fc574633f7cd9e626189cd1b390bbad5f682e WHIRLPOOL e2a454012485164cc3c3cdc7a961aed5f05885262da76573ad4b89fb6ebea06c113ea559b9bc6cf4ed969be5959c4562983ec9695a9d9f0f281e74c6e91caf2c
+DIST pyblake2-1.0.0.tar.gz 128016 SHA256 aa280dfee52397f3be7dfd19b84283e1e2c97917ef10cb1322d4c41b3a15a7e2 SHA512 b7117e61a138f94c03d89749215a8f9401709a9218b5333b0ea4cf34bbe5f37b0837ed734a1799b8f3f6e4df9d5dcef98ebe59747fa0ab53d87a9e9b7e6824ce WHIRLPOOL 35448a42fd2ca1a42475b841b7299203d59ce42f72104bb0707f3c464cfdce76a18f09020778b033f09a8ae36372a8efbea0717420d53a5b00476ff5c50d2e4a
+EBUILD pyblake2-0.9.3.ebuild 1357 SHA256 749587ffda9f05307762a98d3b85553343b3f2d4ad2af84ce34ba5716fd79043 SHA512 9f286f18431f06e82f3a1f6e4460af19be253107582408e83853fe2b6638427db8c38eed02353f2938fe9257053b812d937a3b1e6a147cfe132b4d07da1e50af WHIRLPOOL ad81289f9217cb989acb5e8477954e9803b21f5bf53631f635930d882533aeb8d1a376aa89fb408d0a2e63fa08aa36e69163454c4ae86a71054f9ecb1f5ebaf4
+EBUILD pyblake2-1.0.0.ebuild 1471 SHA256 487074b78adbcb9c4cbc8c129ceaf3b1e14538dc21079ee1e7e6ca4f78b3f486 SHA512 c687fbce7c0b625fa1d03cb5a63a494baf1f3fb0a3471875a7fc91c84ef5e50946ef90119f916d0219683f2864662a7c52be564fe739ca0f269961c926116511 WHIRLPOOL 21c98e4a4139b6f5ebe90a322ca63ef810f10c13ec0a357e591da9db1bf7880998ef1231286583cecaa10dad10b20de86251d3b2ea62ba5c189c12bed346954a
 MISC metadata.xml 452 SHA256 327935068e4b2311b5db81380ca0323b5bcf8b0769fce733e0407500bcdd58f0 SHA512 28acd5472435f8832eb8cb7587e651f428309e9a37c17cad378fe8f01c47896115c4d42ace1c6125eb99ddd30de562d42503b6dac42432b55b37775cdde7c1ff WHIRLPOOL afc476bc3e3dd531ec5e886e0180bd8a3a78bc274b410c6f54fbb24ab761c0e9bd95ba7bb5507aff0c162fc69c62a12dd4858e688aa21bca0e0b48509f87c3e1
diff --git a/dev-python/pyblake2/pyblake2-0.9.3.ebuild b/dev-python/pyblake2/pyblake2-0.9.3.ebuild
index 2b9c9f31ba3d..623a0808b9a2 100644
--- a/dev-python/pyblake2/pyblake2-0.9.3.ebuild
+++ b/dev-python/pyblake2/pyblake2-0.9.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="CC0-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~mips ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ia64 ~mips ppc ppc64 ~sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 blake2_impl() {
 	local code='
diff --git a/dev-python/pyblake2/pyblake2-1.0.0.ebuild b/dev-python/pyblake2/pyblake2-1.0.0.ebuild
new file mode 100644
index 000000000000..6fa0b27728e1
--- /dev/null
+++ b/dev-python/pyblake2/pyblake2-1.0.0.ebuild
@@ -0,0 +1,52 @@
+# 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 flag-o-matic toolchain-funcs
+
+DESCRIPTION="BLAKE2 hash function extension module"
+HOMEPAGE="https://github.com/dchest/pyblake2 https://pypi.python.org/pypi/pyblake2"
+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="~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+blake2_impl() {
+	local code='
+#if defined(__XOP__)
+	HAVE_XOP
+#elif defined(__AVX__)
+	HAVE_AVX
+#elif defined(__SSSE3__)
+	HAVE_SSSE3
+#elif defined(__SSE2__)
+	HAVE_SSE2
+#endif
+'
+	local res=$($(tc-getCC) -E -P ${CFLAGS} - <<<"${code}")
+
+	case ${res} in
+		*HAVE_XOP*)    echo XOP;;
+		# this does not actually do anything but implicitly enabled SSE4.1...
+		*HAVE_AVX*)    echo AVX;;
+		*HAVE_SSSE3*)  echo SSSE3;;
+		# note: SSE2 is 2.5x slower than pure REGS, so we ignore it
+		#*HAVE_SSE2*)  echo SSE2;;
+		*)             echo REGS;;
+	esac
+}
+
+python_prepare_all() {
+	# uncomment the implementation of choice
+	sed -i -e "/BLAKE2_COMPRESS_$(blake2_impl)/s:^#::" setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	"${EPYTHON}" test/test.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/pycairo/Manifest b/dev-python/pycairo/Manifest
index c04ba2cb81b4..dee060aefd43 100644
--- a/dev-python/pycairo/Manifest
+++ b/dev-python/pycairo/Manifest
@@ -2,8 +2,10 @@ DIST py2cairo-1.10.0.tar.bz2 402070 SHA256 d30439f06c2ec1a39e27464c6c828b6eface3
 DIST pycairo-1.10.0-gentoo-patchset.tar.bz2 9669 SHA256 31b5aef32b5d2fb3d8e1c6f9629e6d78e6b3928a3a1c7e44af2120f38490d00e SHA512 c367a7d8fa771ac900ca3363cb7dfd50de045cf67c73c6e552d05018c6933b13dd5660b033be59e1acf8af79f16253a8e56aaa3f135a262a8148711ae8b7a587 WHIRLPOOL 65890911ee35568fceaa5146bf5e4718011eb2f606dc6c180e7ce612fe2351488c7ad2ea2322ec1ca55eb0f8b6f4fb3fb759152be525d20f80922d707108bc9e
 DIST pycairo-1.10.0.tar.bz2 246556 SHA256 9aa4078e7eb5be583aeabbe8d87172797717f95e8c4338f0d4a17b683a7253be SHA512 a03db6f04cea504985f390b0734042390f491f32ae2bee1299dabbafd369fde36bb506ebb941d22bbc11b0d008c4f758baeacf309a7336880529455092db829f WHIRLPOOL e779d56d67ef18bbd052d81acb38d8b610ca4bbf787f4b0e3982633de55ff54d6dfa3e5ce1957321fba09f0ec2d12ce12057335de9d5ff3f84c2bc0530415e76
 DIST pycairo-1.15.3.tar.gz 177056 SHA256 8642e36cef66acbfc02760d2b40c716f5f183d073fb063ba28fd29a14044719d SHA512 1fc75d193eacb976f2e5a594aa07409a0f80ccb21921065c1794961143785eed48be1966d2d2d3e2d0428f9b4e956994dd851d21f3c3cb91fbc27b007a901ce8 WHIRLPOOL e9248366c8eb541bc70ad73c9c6eea995a2527d189584a1ec6f6b835fdeae57d1aa63e2deaa9f790042d0670e7d07af8867b111ac107b53befd354c3cfc70ca1
+DIST pycairo-1.15.4.tar.gz 178436 SHA256 ee4c3068c048230e5ce74bb8994a024711129bde1af1d76e3276c7acd81c4357 SHA512 7e785d23393a8d0c5aca9a4440eb64b0eca9a60c1a18b0dc8452edd6de9422c743d082530387bcbedd34d52377d0892ad395998e9467ba08e22c318684cbee34 WHIRLPOOL d7d9e72bfd33f144423a39ed410251351fd1e32b432fe321d30ff384f05946e353d3159a6c9d8e79b6eb3ff34911bc473222ffe37816a9a2981d1e8e6bc88be3
 EBUILD pycairo-1.10.0-r5.ebuild 4801 SHA256 1933c92394e858f016a9a85ce19cd4a49743fe4271300da987ae8fcc704ad2dc SHA512 0af881180b25a67fa8102bbdb03d0fce758343f251b970da05dab48df024e0e46ec35c1d42288a68004d5bde66c925b6f734f985022e404c70b4ece014a3768a WHIRLPOOL f297032c612fc23b3a48bbc169babdd9c6b5c68c37de47bad4b49b2f22c5d71da232e357aee4622ee0821864a78ce7f79fcf1aacf51b0a6b782adce7c2c35daf
 EBUILD pycairo-1.15.3.ebuild 1610 SHA256 969413efe0f7cee87653897a175b8fb1796fed45e9191d3b5a12c1cb29d48f04 SHA512 1f26cdb5991073636cce6eaf3b21ef5f21ad1911ed6ee20d61d625552b691250ca0af4144eecfc3f9d21e42c2b2c029682bfb9650d0faaf46c4fff29991d9447 WHIRLPOOL 3894651926617a24608a1ce2916bd2aea5ebf2de8e8d6a4b066103e9ca3f0ee51c80942e6846206acb78add0c4636a8d88d383e9d728a756b28998068831a98e
+EBUILD pycairo-1.15.4.ebuild 1616 SHA256 583f9673168578eb903c857d0b57ab5e38ca22235df654e3f4a0f9edce611680 SHA512 f8fc6a76feb2a2544c558965a2004151e8a259de7466195c02a18657e614fd956b94b21c1038a5868a74c904f8fe20f3eb06c9c352b73a83688d6fcf8ff57c0b WHIRLPOOL 1bc5c48d88fa2cb6fb677bc6e0f69fa9097e18c5d327c7d89b3b709bd5a44f65e7dbdf17e7ae44263b53bfe7dd7e9072d50f645f1dc4a9c18ea1e3e10e22d3df
 MISC ChangeLog 4405 SHA256 0290ffffd0f0c4c7daa5273929bff3e300f971663f78f268b7e6bcc8fff9b321 SHA512 15f3867446f2e1c27cdd63624c4f8014623162394982fdd10d11176118f099522963cddb461f62a6e2c240de8403dadc1a465ee795084b954f728452b55de8f0 WHIRLPOOL 689ea1a3fdbe13cd1253ff04895afddb70ccc278a7e98de65732bbff55564192bd0811ede6dbdf2f1840ec38bd35367d6864a26dfa20eee9ae68ec108538ad0b
 MISC ChangeLog-2015 19702 SHA256 fe08ff0a819ad0b3a356f5f40a1a41df91a1f23b724a40d2f918629c722daccb SHA512 d5a3f9c9798f2a90ddb9ebcaf3883222d2e56fa8836a120ea8ff63890ce46aeeef7dfeb45e0a8c94d93e76aa463c65ca3a965db2a04917169841673eff2120f2 WHIRLPOOL 01e7b92dfefbb54123b9329c032657fc6e63d592b7d6b4d68a4e2a9e506ef0a50c2d680ee16c518d4e07858254a6ed2933260e891da934e3426ee0546fcc9f4e
 MISC metadata.xml 246 SHA256 634432e12556106844e569b7ff16962881c6e70887e6fc9650bdd82deb51a834 SHA512 3245fb694492b2f698fb63aac02e66fb8a94fe35eabda45df4790bec043a1ea552e112315334001902f070093bb73e7b741aa3004757404aed97ebdb86cc9fbc WHIRLPOOL 869ef1c8e23bdae0a11b44ccf38ddec23f0dc0ae2573bc83ccbe2d8a2c6bf5a3f9c3c52149aa2e3690dd66f7fc7ec498f2eb6b9d338440fb54c12d5ac0b9fb7a
diff --git a/dev-python/pycairo/pycairo-1.15.4.ebuild b/dev-python/pycairo/pycairo-1.15.4.ebuild
new file mode 100644
index 000000000000..77146c084dc0
--- /dev/null
+++ b/dev-python/pycairo/pycairo-1.15.4.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,5,6} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for the cairo library"
+HOMEPAGE="https://www.cairographics.org/pycairo/ https://github.com/pygobject/pycairo"
+SRC_URI="https://github.com/pygobject/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc examples test xcb"
+
+# Note: xpyb is used as the C header, not Python modules
+RDEPEND="
+	>=x11-libs/cairo-1.13.1[svg,xcb?]
+"
+DEPEND="${RDEPEND}
+	xcb? ( $(python_gen_cond_dep '>=x11-libs/xpyb-1.3' 'python2*') )
+	doc? ( dev-python/sphinx )
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	# Fix pkgconfig path
+	sed -i -e "/libdir =/s:\"lib\":\"$(get_libdir)\":" setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	local enable_xpyb
+	python_is_python3 || enable_xpyb=$(usex xcb "--enable-xpyb" "")
+
+	esetup.py build ${enable_xpyb}
+}
+
+python_compile_all() {
+	use doc && emake -C docs
+}
+
+python_test() {
+	local enable_xpyb
+	python_is_python3 || enable_xpyb=$(usex xcb "--enable-xpyb" "")
+
+	esetup.py test ${enable_xpyb}
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/. )
+
+	if use examples; then
+		dodoc -r examples
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pypy-bin/Manifest b/dev-python/pypy-bin/Manifest
index 8a65c7dc3ea1..abec603ea3fa 100644
--- a/dev-python/pypy-bin/Manifest
+++ b/dev-python/pypy-bin/Manifest
@@ -6,9 +6,14 @@ DIST pypy-bin-5.8.0-amd64+bzip2+ncurses.tar.lz 7617650 SHA256 3b8b42a1bc0ca61295
 DIST pypy-bin-5.8.0-x86+bzip2+jit+ncurses+sse2.tar.lz 10744836 SHA256 9d943e832695ec4d66b07ed9a6dc5e58885ea671d96ba7b728d03b18686111f7 SHA512 bd39bad8f292eabae37b384b9f9f36bc221606b1d2d4aa3df8a45fb1f7ad94755d5fe5dbb7983a49c4e44df87f745ce00691bcb3a5b6c197509c360d9b24d24c WHIRLPOOL b473572a5a84b1ab0510f7274038546836ef3f61ed3cea3260f7ee4e4086093555673064f9fd58c2510b2d80848ec276ca7069372826ef466408c6cabdc74424
 DIST pypy-bin-5.8.0-x86+bzip2+ncurses+sse2.tar.lz 6493961 SHA256 41d51005cf935ab395f318d88f0f80dfaf42d9e6c766f1e65bbfb6af0b25f586 SHA512 97075ef6589d4671dd8ea79fb87c42842023b3f9b5539b3aed8ed90785e001d9725937fb21cf1339df6425ddb50e1e9aab42630770ed39bbd96e953c6369c249 WHIRLPOOL a562152061ee390e033e69fda6508d04e53a5ca6f051a49dd14d78021bff4ed9cb4070bc36f3e175c10538246cdb1bf5cc63f5f70daa50ee079d4cf8ead1fde9
 DIST pypy-bin-5.8.0-x86+bzip2+ncurses.tar.lz 6489741 SHA256 6146c19101d34c1ee8dd03b652f34495b816b93ef5bd41332afd5a302e9385c8 SHA512 e15572f318b0c1f1d68cdb8c1068de853443c7b350b8aa25b41db50d075e2bb6c53530a035c31c98b530e96742c10d0e92ca20081ffefbe475d00e0974aa8b85 WHIRLPOOL cd682aafe11aeed7571186fe99b544f8ea7a182b35c2685d09418df7abe05a49e86e8385d909a1627a2e3b30c9c1e09526de8ef45f69d5ca5e0080a4726a6950
+DIST pypy-bin-5.9.0-amd64+bzip2+jit+libressl+ncurses.tar.lz 12726957 SHA256 1af915da859932b30f410e1513eca042b954c81eea2a011ec126b8fef8e86d39 SHA512 25256218106fc71f0179fe5b175e780be200a44bf500a5814c05c767747201370b19943d76f4859d780c9799d583d809c8c6ba49423ddad477b974b927625d3e WHIRLPOOL 562e092e1566fc40ac28ce5d8a7975bd71d5da441a693f32c98b0b519ebe1ce9f07ae1022d283f48d2cb0030430b1cddf5408e6dc05b26a8d1d5040f012897b7
 DIST pypy-bin-5.9.0-amd64+bzip2+jit+ncurses.tar.lz 12849816 SHA256 37f8ed931123477aa9ecb350b72b671ee2c14149328a7c90de8c2b9dc314fbeb SHA512 d4d67f2281d01ecb19602fdaf1149e424e6e331d9e98278ed5f0a948e7ef8b6dc0307accc5d924cb9491f789cea2285cdc9e16f0e9f0c1b76804d259ce5df6bb WHIRLPOOL 8971d32afe20dd73703498c0e47386d89b87f934b89a70979152d39b0537e4a3ce655536acb81aa9f4a02cccb72434261368e50cf6a1cb13a88a4c3bc161451b
+DIST pypy-bin-5.9.0-amd64+bzip2+libressl+ncurses.tar.lz 7419957 SHA256 6fda9227171b6ee79f59acead9e6be7afe24020946463cebfd8191ac7faea150 SHA512 a0be5a190fc3f71291a65a14a5993fd95f4f077070b812d0aff7b0110bc5dacbd2e005476f97d6b386f2093086621609a64b2a728d9d3d0e70948caaede53292 WHIRLPOOL 537858ce5c5c805cccb5b5efcf95ffcfdf406cf1faac7bbf421d0fb72ab5994b18032f5b2c057803b818e793af336e7b576f7dd5171fe95661ff6f17ddc8babe
 DIST pypy-bin-5.9.0-amd64+bzip2+ncurses.tar.lz 7452420 SHA256 a7ffddd40bb61c18f0d0bb8e82cbcdce7ca6e435c0ec7c0daadab38daecb9223 SHA512 caaa9fce43e67055b75bff059e288124cb5ac7a2d34f512e613b083ab7ee42bc07b26f013250f74e361bcf79498c2cba0277c1005ba1ff9d7cc7b24e18d40475 WHIRLPOOL 0fcb9a19d1ac788eff3477d0a6df3e3801a240f88a7f66a64e8fae3d63711d3a0842bb0acc09fab12c7765b69e56897d99fecb628041060504bfe30b91da4a3b
+DIST pypy-bin-5.9.0-x86+bzip2+jit+libressl+ncurses+sse2.tar.lz 10264806 SHA256 951b59e314897ffc51364e76bcdefd8a15187f686163baef6a9d8906268c36fc SHA512 c5187e352948d4581e6c7b52077d9d431dacd4202ad3efddbab35ad04cc50f5c6ea290f540a11d384d5aabf5b636879efb7eb954d416323fa745a4744c2fb5ff WHIRLPOOL 9c1bf501db350cfbf6a148513eb396f51a8e7b757478de37c8f40f5ca575e3e8f774d349512f920b608d391b47ed7ad607c5dfbc6096737feb06ae1cdcb51779
 DIST pypy-bin-5.9.0-x86+bzip2+jit+ncurses+sse2.tar.lz 10218708 SHA256 c3130b6d01b03521e0333a3d90be643b1ce16ebdd207122d959eeb146377d8de SHA512 b2a4169dc7ad8216f754d1245283024d0accc0543d86acf6452a19e67051482ac4cf5b3cf4ae20be7c865bfdb1515b75030a5d4a02b8965252e7810baaefcff8 WHIRLPOOL abf4276d93be4b8e9370969ca6d8a730a3337ace944fbe1eb75b54032fcf1e2bcbf081dd820918afaadd416ead8cd10797735606d948c17b4bb676adbf358e52
+DIST pypy-bin-5.9.0-x86+bzip2+libressl+ncurses+sse2.tar.lz 6261405 SHA256 a25ef75551226952b2475d5b692b286cd73b63ed38d5e903051a393029b073cd SHA512 e51e97e42e591d87ddfccc4f6348fcae12b80aa48fde626a25c28611bf53ae5eaab649809a4ae0536a24c2cc0b2c2308cf9bb2eb9f8bc9ae6f822a994f3424a3 WHIRLPOOL a938ee5dbcf7e934b14d627c4628fead9d14f520828f55b67a94ee37a4c9202414eb5d9578e2c27cf1564f1912108480e5246acc2df4b7e96f34e3fe27040cf0
+DIST pypy-bin-5.9.0-x86+bzip2+libressl+ncurses.tar.lz 6262511 SHA256 3703c0c09fa5913cfacea16a8c2b336bda5d1c37b0dbeeadb0df1b128c1935cc SHA512 376f801dad960b3e36cb401d8221596e93248abbc40b1118e1e2f3f79009a44866612df931c3b91b1b72059f48512bf3a5dd0d58a21733380937577851e5dc92 WHIRLPOOL 00f8d1c023f95f0d9c0f89a3b3bfabfe6abed3a8c51a4a477ed295cb082ae418ac921dcfb3375438b537aeb87fc8b1a2537d52d87a4ede6ec794dbc532f8db02
 DIST pypy-bin-5.9.0-x86+bzip2+ncurses+sse2.tar.lz 6269532 SHA256 8d28e152919e01b6cce9aa9350107972307fc63918bec3d24408bfb1fa92f2ad SHA512 ee447e8b03733b41f92625a02653ed70a9f4cb3866a27bcbdbaf1383a00551c5f4617540eea227b120a7adab5cf87afddffde663c7cb79abde852e0bbf18d622 WHIRLPOOL 9b484c003485daa36a5ecfb5aade84b431d692aeaa73e604868934b27e7006b530f7d6661aa580aaceafd1e52ff5573627ed8dd6c3c18da001c20eded9af21dd
 DIST pypy-bin-5.9.0-x86+bzip2+ncurses.tar.lz 6261498 SHA256 64207bf1703e3a3666c60effed55fa176e6be0282504db3271121616e81df8d8 SHA512 6151ed379dc3dd4d9eda892718a5cdeea55386251c27230cb4606fd0a16589035de332c549d108d699c506f8ff46bed3cec3edb960155550a9746ae2fc0d2349 WHIRLPOOL 5e84a4ab7cbe3efff867d9e11c758e4e0ea0d9585745966fb29fea399fff1dc0dfa5dc727a21e84b6100cc659b6bc658a4a574d4e7e89607e3fe8fc90f4873fb
 DIST pypy2-v5.8.0-src.tar.bz2 19163498 SHA256 504c2d522595baf8775ae1045a217a2b120732537861d31b889d47c340b58bd5 SHA512 222c6ce11b00830e310b766df4c145b7f554f23b87fc6146f214d758d7a6159c5c00af475aa7fa630ef4c37b52cdf2fd73049b6ec3610715b6abc0a925fe1365 WHIRLPOOL 775fbe656996e80fce9cb9a4d4f44fe1b87f0b22f18f74940d5824143337773bb5e3a4d23564bfdc22d010693010f31689026432134a8a2e30ddee670dba1b6d
@@ -16,7 +21,7 @@ DIST pypy2-v5.9.0-src.tar.bz2 19175394 SHA256 de4bf05df47f1349dbac97233d9277bbaf
 DIST python-gentoo-patches-2.7.13-0.tar.xz 13292 SHA256 271835eb36125d09cc5e904ef23a5263acd8e5f513202a8d4f8a9a0f64fc80a8 SHA512 d70f6baba1a465a752c515e33dfdee2a5cc75400fadfb8ea0bd1e82d50089abdf02d7726c697850dc47de2054aa494bbdc08de2673c260b54e609f29dab259ad WHIRLPOOL 6a6d8b099fa814839bf5b3455b3889205c649ef522b35c3a501831d63d0e916d7747b83ac9b8991f8f8c34b328478d84cf7a12a32161ce0fec37204f9c019e2d
 DIST python-gentoo-patches-2.7.14-0.tar.xz 13428 SHA256 3567feeb8f0c66161efaea1922bbfe4e71f6051533ef5f54a74b6ccf9e0359b6 SHA512 6da5b52065752b54e9215d0f0809c75167dc3690d0e94fa21dd7595626925bc5c1dd065d31b3bd696d7087f3986de145d3a335a29eb7bd77442637a7ec2863c1 WHIRLPOOL ab77023ac66def132d1dce72f98add3108fd7be303ef5b167a2374df3a94949c75f089dcfdd84ed05a5eb813d6c22cfecd0de03b5819817a20b04f30030f5f6d
 EBUILD pypy-bin-5.8.0.ebuild 5819 SHA256 a328766890d2a892513e895518884de98f67d3cf7429aaf18bcd7e182fcf872e SHA512 8ba2d88b641b86a6b7a64f271b56a80aa98139307bb4e294cba6f4ed34a0821a7fae66ec037cbdbf6a6fa00b2d381044b81b24c3f805345c2de77bac0e60b7cf WHIRLPOOL a877c7eec69b9020756a8e0addbc854e2656f897adf476f3fca341a7ed8e24061476843a551611dc6df6b5db1808a5692aaf9e99a50c65855317ad519ea9af3a
-EBUILD pypy-bin-5.9.0-r1.ebuild 5622 SHA256 dd4770fdd799f326064f30aebe63e32bef85d8e99a07216ba28aaed0144c6479 SHA512 c45a9028cad1fd61259b114713f05122ab4e3d99fd8f9a77a1f9e506b07eedea72590cb16b1b808b6be618c978e4885b41ff3f46a35ac9d9c4007905f3f1e803 WHIRLPOOL 091bd654355eb810f1ef943f66e96611ea308c7fbae32f9394d1dd9885696f20479be8e706b5c1021d619cb2e87b51aa93b20f90e78740a7634f3ef600d46ec6
+EBUILD pypy-bin-5.9.0-r1.ebuild 6166 SHA256 6559d0ab8668ec842327150c6a4583fa5f1f3761a05a84b14669b7628f59da38 SHA512 ac83cbd506c6393afc4070e34e8ba4f1a2f28033d2fe59ce77442083ecfc7620907ff765dba75faf58d7f57a6731c8a12471c996958f8dedddb95afa4f9d533b WHIRLPOOL e579e93f5a0000b71fbd7da096b4674fcb181cfa7281b46f6260ab1808b975b021e2d6a53a01c390279d592eb121cf7ac9538f8f595943da6fe8c36f5f5c21e1
 MISC ChangeLog 9199 SHA256 9c47a49b40abc59f48abeb8422551c11d6fd22baa080d4748c480f998e4ab4b9 SHA512 f29475889f803f8e330e2811bd96aebb6bb829ca8043056ca539edacb6d513f772dd4b192a85b995caa626f468ce5bec3f98acbc8dcf41f54f16cebaf6783325 WHIRLPOOL 4231ef2b20556aa4e6853f40f1f89f58205206ea069204efe33ec2a2a5553e3e03d83c3e21b55226b64c4ee377d747b0e6352cc37f0e3b7f93c2862bd3c6ada0
 MISC ChangeLog-2015 7187 SHA256 ea84ecd028b95b790792d4f80386a8c5884a667de5de21d37747412ac6868d66 SHA512 afd832969505f5ea599a10a629fe0e068c3282d5b8f3d880dc04818e25034c9df1821b0dea2b623b91ae6561ca82ec9de6c4907badcc2befc2230dec986c9302 WHIRLPOOL 05c59d774d47ac5eabd74c1af2044ba0c2d2fdd0f4b3bb8f4cc9914c65a8133dcf59ee047c13d676783a84b28a4ea9c2fcbd9c910ec6057581b9c3ca227ef410
 MISC metadata.xml 317 SHA256 2aec924d1dd9649258f8fa5468e176864976d3516e72cd7a5828a485f30931a4 SHA512 65d1795605d0120c94911b2c295d8da13e01f9ac6b0750a7d536be64bf5244e20e2bb7286b33e75346e0dea333dc8970c4dcf0e98842e28f5a202ee2ddbba294 WHIRLPOOL 9f43842af1bdced8a7ba6b47f57def4960f066272a625063b508431c007ef51bd13149afbb3f1a136160778ee3dedb4f5f4b98f43e0edc22c7c714ba2b3481cb
diff --git a/dev-python/pypy-bin/pypy-bin-5.9.0-r1.ebuild b/dev-python/pypy-bin/pypy-bin-5.9.0-r1.ebuild
index 4ef3618ccdbf..b33c85d2d303 100644
--- a/dev-python/pypy-bin/pypy-bin-5.9.0-r1.ebuild
+++ b/dev-python/pypy-bin/pypy-bin-5.9.0-r1.ebuild
@@ -15,16 +15,33 @@ HOMEPAGE="http://pypy.org/"
 SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2
 	https://dev.gentoo.org/~floppym/python-gentoo-patches-${CPY_PATCHSET_VERSION}.tar.xz
 	amd64? (
-		jit? ( ${BINHOST}/${P}-amd64+bzip2+jit+ncurses.tar.lz )
-		!jit? ( ${BINHOST}/${P}-amd64+bzip2+ncurses.tar.lz )
+		!libressl? (
+			jit? ( ${BINHOST}/${P}-amd64+bzip2+jit+ncurses.tar.lz )
+			!jit? ( ${BINHOST}/${P}-amd64+bzip2+ncurses.tar.lz )
+		)
+		libressl? (
+			jit? ( ${BINHOST}/${P}-amd64+bzip2+jit+libressl+ncurses.tar.lz )
+			!jit? ( ${BINHOST}/${P}-amd64+bzip2+libressl+ncurses.tar.lz )
+		)
 	)
 	x86? (
-		cpu_flags_x86_sse2? (
-			jit? ( ${BINHOST}/${P}-x86+bzip2+jit+ncurses+sse2.tar.lz )
-			!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses+sse2.tar.lz )
+		!libressl? (
+			cpu_flags_x86_sse2? (
+				jit? ( ${BINHOST}/${P}-x86+bzip2+jit+ncurses+sse2.tar.lz )
+				!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses+sse2.tar.lz )
+			)
+			!cpu_flags_x86_sse2? (
+				!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses.tar.lz )
+			)
 		)
-		!cpu_flags_x86_sse2? (
-			!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses.tar.lz )
+		libressl? (
+			cpu_flags_x86_sse2? (
+				jit? ( ${BINHOST}/${P}-x86+bzip2+jit+libressl+ncurses+sse2.tar.lz )
+				!jit? ( ${BINHOST}/${P}-x86+bzip2+libressl+ncurses+sse2.tar.lz )
+			)
+			!cpu_flags_x86_sse2? (
+				!jit? ( ${BINHOST}/${P}-x86+bzip2+libressl+ncurses.tar.lz )
+			)
 		)
 	)"
 
@@ -35,18 +52,19 @@ LICENSE="MIT"
 # pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
 SLOT="0/41"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc gdbm +jit sqlite cpu_flags_x86_sse2 test tk"
+IUSE="doc gdbm +jit libressl sqlite cpu_flags_x86_sse2 test tk"
 
 RDEPEND="
 	app-arch/bzip2:0/1
 	dev-libs/expat:0/0
 	dev-libs/libffi:0/0
-	dev-libs/openssl:0/0[-bindist]
 	sys-devel/gcc:*
 	sys-libs/glibc
 	sys-libs/ncurses:0/6
 	sys-libs/zlib:0/1
 	gdbm? ( sys-libs/gdbm:0= )
+	!libressl? ( dev-libs/openssl:0/0[-bindist] )
+	libressl? ( dev-libs/libressl:0/44 )
 	sqlite? ( dev-db/sqlite:3= )
 	tk? (
 		dev-lang/tk:0=
diff --git a/dev-python/pypy3-bin/Manifest b/dev-python/pypy3-bin/Manifest
index 76885453146f..d6f17d4c2360 100644
--- a/dev-python/pypy3-bin/Manifest
+++ b/dev-python/pypy3-bin/Manifest
@@ -12,7 +12,7 @@ DIST pypy3-bin-5.9.0-x86+bzip2+ncurses.tar.lz 5640443 SHA256 13c47cdd603d647e8a5
 DIST pypy3-v5.8.0-src.tar.bz2 28986883 SHA256 9d090127335c3c0fd2b14c8835bf91752e62756e55ea06aad3353f24a6854223 SHA512 d78b4c899a5643028664365ed973a7b292a8e5b3989cc75203cd381ea3cda7dd73121c574726e23dca86e8364fcfcf42c372c9deee438c805f30d6e1c4ac115a WHIRLPOOL b7567fa21e3ded400a72ec06197184df37e0b5893adfb55622ea9afb668bfbda7ebbecd9b80660efef42f160838966d103c4181a9b07355e873981b35f4bf104
 DIST pypy3-v5.9.0-src.tar.bz2 29055111 SHA256 a014f47f50a1480f871a0b82705f904b38c93c4ca069850eb37653fedafb1b97 SHA512 3d5384d644fdd1bc8b95f5747dbd1771ae06eb2cfc7b57be359b8bf40177676afd097620d0cb9d9000c40d8cce075cfa6bfd92de987d3dd927c04d7d595dc5bd WHIRLPOOL e0936d56c64c3c077910c4713295010ec3e0fabebe654115ddf07407884d1564db7de2f85bcedf1226449c516085f3e4814a2c523f0d48e3ad8ac21150a93a72
 EBUILD pypy3-bin-5.8.0-r1.ebuild 5345 SHA256 8737f3cd44ddfcab4482136f839bb9ac57c6a141b5200ca3e50efde9151bbca9 SHA512 e3d34a52716a66b42e37c77dc7d4b3f98ac7a80bc511156fd63ce47c65f549441a1b96667df58d9c2bb51e3b7280244c8619744ba9ccfccc06b73df365cb2d1b WHIRLPOOL f0afc372fd717f09023b650bb1bf5babe775a121357f986683b47add213aad924436cca6243b916f4dc68dff096f1d5cd1c30fb1d4917556aa613d5b433f2aae
-EBUILD pypy3-bin-5.9.0-r1.ebuild 5674 SHA256 ef69ff2e49e8323996c492b857e8cf7ce25cc1595080d590c70865c547fe940a SHA512 401d081d0b073b8edf1799c73b4355755097dcbc4e048e7b859b4db84923e6f4f6dab5fc16565f9165719ed03d5901736a066105b2434283ca22dc42a6a0dfe8 WHIRLPOOL 3fa5b54c68972808d72df3475f0d14bf247a3dc86069a7e32ab02a2504e79360b840a50628f4036d0edd94b61be59b922d87e6cab79cfe97e7a6fcbb8d649323
+EBUILD pypy3-bin-5.9.0-r2.ebuild 5672 SHA256 9c9135263ac244dfd83e6a681f66bab739dc605211a4e93d99af74c3080dd613 SHA512 923b36fbb49d7569c32856d0b0472b77dad95b2bd46babcd6ebb156bc1cc199f56be557be1da3fe6ce1c83c5c074031f8b93c59783a0cbdb70d97a541e072d84 WHIRLPOOL ef5a67c3300e26214766ec25529b99c0e07bea44ee601af85342fddf7101bc36bb0e9ffa39bb91d1ee1a60062297831499f27bee55dc54784cb2b664f1e37053
 MISC ChangeLog 7700 SHA256 ba2326f1007aebe17871ea81213c69cc07c7dc334bbc267a50353ba79c0c4197 SHA512 e8b2817533bcacc09d120de24278ae3731235f26ce7120fb3f247fb202657667cf4b056e005786b40d2462d6e65f74dc94175e242f209725d24285192b64c2ac WHIRLPOOL de020e520c4befef4ca2bdf167d28ec7bd1b5ced194ecfb58c05d086e77c35abe0e17a20f4a65750c221aae0d1ca76c1cbbc524b9251a97584096aa5cd92ec65
 MISC ChangeLog-2015 975 SHA256 9ec6d637bd1373be724ded99f8deaa041e5587508f68cf15c8537f25235709fb SHA512 58290569acccc81298a0793b797e858365767629c94bc6d8b08790341cfa0c3efd6116c6c54e4585d65d158256767dd762a3eae431b8f3c0ca6571a98bb0bf34 WHIRLPOOL c52470823ec3e6e5b639fe454c705de58d02fd32155b72e49ae8cb94775839d9aee7b0b096f7128bde80f43a78dd6590a71daafc9bf52524161bcd548fc50947
 MISC metadata.xml 317 SHA256 2aec924d1dd9649258f8fa5468e176864976d3516e72cd7a5828a485f30931a4 SHA512 65d1795605d0120c94911b2c295d8da13e01f9ac6b0750a7d536be64bf5244e20e2bb7286b33e75346e0dea333dc8970c4dcf0e98842e28f5a202ee2ddbba294 WHIRLPOOL 9f43842af1bdced8a7ba6b47f57def4960f066272a625063b508431c007ef51bd13149afbb3f1a136160778ee3dedb4f5f4b98f43e0edc22c7c714ba2b3481cb
diff --git a/dev-python/pypy3-bin/pypy3-bin-5.9.0-r1.ebuild b/dev-python/pypy3-bin/pypy3-bin-5.9.0-r2.ebuild
index 9f1abcf1f689..0f0e4bd042db 100644
--- a/dev-python/pypy3-bin/pypy3-bin-5.9.0-r1.ebuild
+++ b/dev-python/pypy3-bin/pypy3-bin-5.9.0-r2.ebuild
@@ -98,7 +98,7 @@ src_compile() {
 	einfo "Generating caches and CFFI modules ..."
 
 	# Generate Grammar and PatternGrammar pickles.
-	"${PYTHON}" -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
+	./pypy3-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
 		|| die "Generation of Grammar and PatternGrammar pickles failed"
 
 	# Generate cffi modules
diff --git a/dev-python/pypy3/Manifest b/dev-python/pypy3/Manifest
index 683bdb925fc5..be8fc2aeaef2 100644
--- a/dev-python/pypy3/Manifest
+++ b/dev-python/pypy3/Manifest
@@ -7,8 +7,8 @@ AUX python-3.5-distutils-OO-build.patch 3627 SHA256 9b0b86d8424304fe87a460bbf5ab
 DIST pypy3-v5.8.0-src.tar.bz2 28986883 SHA256 9d090127335c3c0fd2b14c8835bf91752e62756e55ea06aad3353f24a6854223 SHA512 d78b4c899a5643028664365ed973a7b292a8e5b3989cc75203cd381ea3cda7dd73121c574726e23dca86e8364fcfcf42c372c9deee438c805f30d6e1c4ac115a WHIRLPOOL b7567fa21e3ded400a72ec06197184df37e0b5893adfb55622ea9afb668bfbda7ebbecd9b80660efef42f160838966d103c4181a9b07355e873981b35f4bf104
 DIST pypy3-v5.9.0-src.tar.bz2 29055111 SHA256 a014f47f50a1480f871a0b82705f904b38c93c4ca069850eb37653fedafb1b97 SHA512 3d5384d644fdd1bc8b95f5747dbd1771ae06eb2cfc7b57be359b8bf40177676afd097620d0cb9d9000c40d8cce075cfa6bfd92de987d3dd927c04d7d595dc5bd WHIRLPOOL e0936d56c64c3c077910c4713295010ec3e0fabebe654115ddf07407884d1564db7de2f85bcedf1226449c516085f3e4814a2c523f0d48e3ad8ac21150a93a72
 EBUILD pypy3-5.8.0.ebuild 6832 SHA256 355980a2bb1518191b5d5b409095b331cad0704b92165a5d5868fa0e34dc0e7c SHA512 30b57bc1d62d7e30938243ac4d4970b29d41423d6bbf0ef8430e96d038a4c1ef7300294af1e83f6450f3e5fc0f1458dff25bd554aa82ab4de1f585a6d4185186 WHIRLPOOL 9a39782805102c41558015cbcb6a13d745af5191ac2fa8fedeca0d7d43ebab2d47ea0a88338b9f12f041ee576486e3a52198382e9d33399ae69d67e616b0e6c5
-EBUILD pypy3-5.9.0.ebuild 6987 SHA256 78d170540c0e99712ff10789b1f70ec2c9c7f37c1f4ca8933a2137e13a8c8a56 SHA512 1deb6b852c20211d754c4a0216de596b3118a0b5189df18fad82a00701209610b2253089257160cc3b7cbb2655b22f7e6add4e57c8fbf8bfc88f8cd17acd3725 WHIRLPOOL e9e370000f73ac91ad338e20582fa8ef6f39607376667e74ce224c2db44608c253ad12316584fe87e4f62439bedd984500600b4a7589ad53ba24626ef1150f02
-EBUILD pypy3-9999.ebuild 7577 SHA256 182cbd59a5befd025d3ef047d151deb51fe351ab216b204be76e4cd9e5dd8679 SHA512 e484c243b4790b59015aa2ed088a50557bb5cfa476520ed503147e6372ab0cb7598225b5d6ab67d3dee57c8266eef431ffbbc06c645f9135afb880bf1aa0fb6a WHIRLPOOL 4eec41db0738524ba106d3db4d77abdeda805c91fd3bcb063876e7820bb1616fded5981fd68fa588acee225e8633c53dfef45b67f1ecd26980ae3418baa97f26
+EBUILD pypy3-5.9.0.ebuild 6985 SHA256 810b1678f0a5446b93899d4e3ce96a0ca8b2220b95e62196954a432d2be14534 SHA512 b1adf73bcaa5b1ac8c7a53074b081ba276e1a8a5c77a363a8cef0929be0e3f086563937970a7954ce1771b279d051d8e11b585df4bf6d984206cb74b07f37373 WHIRLPOOL a8eb79ee98624ce3002a196928be03d2aa4a1e0d4e94e878ddfe6086c4efa9ca4017e1a6578fd26eb7bdc71e3aa392259ef2527fe94b4e3f49bf33e1fcfc771a
+EBUILD pypy3-9999.ebuild 7575 SHA256 3e18f246735614874317b0bea28fffc19284a316eeb6bd2957b0f711ef706662 SHA512 e1bf89746b10e8392ac38be885413eb30cef8a72a8a55ba0083fabfd97a11b91c91a9c76501f8af301ed20d40f16395dcb9863c60a3bc08c245530f3459c9406 WHIRLPOOL a441772e51fb3c0077f720ab50aa8eedb33fa790e1f7f149864bafe9850c226ee5515d5a0db267a70f8d2d17703da875ac8c71d44411dd7cf2a9438ef2a60da7
 MISC ChangeLog 7714 SHA256 43954837f6d63a6ac2fa2e265b67bbda3937f9279620f08c62d8b6453ee63969 SHA512 6d51ee24600930fd9788432e3ace144e3699858fe1e3a6ddbb0076f7fff291b9792e581b6e2afc48e81868d43132bab96271a0397511afe03ce8a4c6bb54871c WHIRLPOOL 2c54a361b9007165f2b2ebd0e097fb040d539ceb27ee88b672654631070145645b445f697ee206463b1c80b85022ce52854e1d1f31941dc74a57051e72d401a6
 MISC ChangeLog-2015 1344 SHA256 7977d9be34ce1b3faffeb354d9a2acded00259e353af50632e071b43b026d8e4 SHA512 49ed62552780d9581a2cfe1b78a68d1a3ed4de603729fac05346148c00de9ccf66f4b2aaee38379f209a1ad8dba23b3a0fd773aa315a50e01258960f29796b28 WHIRLPOOL 95cf929498ad50c099b66f6c7b5f036d15ffc53b6c1a69fd60f0a529b104ec018ac2f676fd62b6b7cee4a7fa7fa99389437edc1cdd5efe3c2cbc4df957f6d4bf
 MISC metadata.xml 636 SHA256 f73161c46ef3c8187a80d861f0c29e04816b04b2f5c7fbd56b8b7ff140459c9f SHA512 c52d59231928b12da09c2c7149afbb852ceaf1342a2747d85493c9abc15b8d68fd24495349e583aee5cea18799bd4dada3943bc523a4e18745e2036446cd0841 WHIRLPOOL 8eb2d191fcbb21aeb2e8bb10672a066165c809aedc45cbe4e7cbe00ed75db009cb95c16d57d7e87d80e6de5c3953e4742bd68a21a58367ae92f4efd9b8a8e794
diff --git a/dev-python/pypy3/pypy3-5.9.0.ebuild b/dev-python/pypy3/pypy3-5.9.0.ebuild
index d81c5775b403..1fe12fc2c523 100644
--- a/dev-python/pypy3/pypy3-5.9.0.ebuild
+++ b/dev-python/pypy3/pypy3-5.9.0.ebuild
@@ -157,7 +157,7 @@ src_compile() {
 	einfo "Generating caches and CFFI modules ..."
 
 	# Generate Grammar and PatternGrammar pickles.
-	"${PYTHON}" -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
+	./pypy3-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
 		|| die "Generation of Grammar and PatternGrammar pickles failed"
 
 	# Generate cffi modules
diff --git a/dev-python/pypy3/pypy3-9999.ebuild b/dev-python/pypy3/pypy3-9999.ebuild
index 5be752f1fc4c..1369c84d3fc9 100644
--- a/dev-python/pypy3/pypy3-9999.ebuild
+++ b/dev-python/pypy3/pypy3-9999.ebuild
@@ -184,7 +184,7 @@ src_compile() {
 	einfo "Generating caches and CFFI modules ..."
 
 	# Generate Grammar and PatternGrammar pickles.
-	"${PYTHON}" -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
+	./pypy3-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
 		|| die "Generation of Grammar and PatternGrammar pickles failed"
 
 	# Generate cffi modules
diff --git a/dev-python/pysctp/Manifest b/dev-python/pysctp/Manifest
index 03b02d4432c9..2e6016899729 100644
--- a/dev-python/pysctp/Manifest
+++ b/dev-python/pysctp/Manifest
@@ -2,4 +2,4 @@ DIST pysctp-0.6.tar.gz 29611 SHA256 4c2b8863a18695575460e432a7386b90be464a94585f
 EBUILD pysctp-0.6.ebuild 598 SHA256 8aa0b74c323a970298622ec247c6f282c88434f6f2b4b98aea5c2900d43a58cb SHA512 b46e1af44eee7a14679319c7864b7724f0238b88197191918aeaabdf1a22b86dd864e6bdcfd0864117fc9384ab8973e04f201526730c6ed7b087a29a606c4927 WHIRLPOOL 35a8eb04ff200ee9de4d20e36885cf68d442eee3c6db4dbaf2a4118b20f03c4180510c56c1374d9f05b2a7bf1f7e6ca243b6623e2f2d5ec3fdf497b822b11b9e
 MISC ChangeLog 2422 SHA256 77fcb5e1ea56576cc2f122aed02cc1f6c6a17965b2a332df36fa322fe36e0075 SHA512 efca23fdbb796841fc76eda534eacce93025218adbb4023a644d4550fdecd70fc6a8eaed1340e6477291f7fc50a9e9dca373d1e844c7de2a17e3830514bae68e WHIRLPOOL e6ef327e718bcb0104aff4bb007cade52417c7100cff334a54e001f7a7820e4cd33b5df0704f26b1f8a0628b18c5788073f29136b26769956b4c529af8c1d620
 MISC ChangeLog-2015 1153 SHA256 e6c6885b20241d1629f8b954c09077a8313f59490adbeb7dbaf80a9a20defc7c SHA512 c25645a1ba1f40a8430f385245c3a8dd4b07b6d4df82feab31968bd1388af5cc35dfecf975d913092fc9851d65789180b2cddf11529ecc6f84f05a31e96ac0a0 WHIRLPOOL 456611429ffe4ae8ff8c1c4472ed45cf56fc38fe9353bb7ea2854ffa199a7e24e50122ccd5d7445b1e0a5b9444d900af428491a4d87de75c76c5836f057374c6
-MISC metadata.xml 579 SHA256 e8bb867dd5212a66895417071cda148c2836132fb27672d78f487d4157ca8d5e SHA512 f15238f6e01b4f585bf3da4a0ab705b7997e907897bca5e113e757a68a9d59bd2cd742c30782153835a198140caf4ebdc4cacfaaa84d655e1d252b5c3ae15404 WHIRLPOOL 44d56437ecb857c6b8f483f10f71fa7487dd4d8675e52c74074b75ebb2f405fbaa52d6cd8c2f8dacf97dd11bc12960b99603418b0ebd842a8e2c6a1c2c255a03
+MISC metadata.xml 465 SHA256 5b328105d91d1dbdc2cae4bffcb3adf8f8619ab18d5428afb34a4afb947c3894 SHA512 2aba6873ed7c795955ba5b2815dfdb5d74d03b0973630483d95e3ed2d2e7b8495f94cbb2eddc9c4c445bfa924fb3213a92f59d8e5beb211a0e72db729eeda207 WHIRLPOOL 613df000bbc008487557d4af15b7fcb47e56a6d954bb22e750d8a9c605c9241c84181d613e38fcd533b8d95e2bbcde02bb9f60532d582d0c19bd0991e3607bf4
diff --git a/dev-python/pysctp/metadata.xml b/dev-python/pysctp/metadata.xml
index aaa3e499de86..4419d8d1c343 100644
--- a/dev-python/pysctp/metadata.xml
+++ b/dev-python/pysctp/metadata.xml
@@ -5,10 +5,6 @@
     <email>zx2c4@gentoo.org</email>
     <name>Jason A. Donenfeld</name>
   </maintainer>
-  <maintainer type="person">
-    <email>phil@p1sec.com</email>
-    <name>Philippe Langlois</name>
-  </maintainer>
   <maintainer type="project">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
diff --git a/dev-python/python-debian/Manifest b/dev-python/python-debian/Manifest
index 5889121a6c31..623657a8e3e4 100644
--- a/dev-python/python-debian/Manifest
+++ b/dev-python/python-debian/Manifest
@@ -1,5 +1,7 @@
 DIST python-debian_0.1.28.tar.xz 292404 SHA256 355edeaa0e2d5a46e4b12c83c7a17386526af4fee34c1d4054fc03bd4f0adf00 SHA512 ffbc924fe2dfd5790d49aacf80109bbaa18126bb8d6c9b8ffa25e9ed8b1cdeb28024a8dc202587682088e2e558da1642385faa4afda925cbb2edf6f304592a0d WHIRLPOOL 6f1778dd6839459e86179f5f02ba0a6e69154efcfc034c1d554d940409e974b57c73839853c86b14d840f27c6a0666a11618f51a125922e58596f28aa888c8ca
-EBUILD python-debian-0.1.28.ebuild 983 SHA256 e8438a343a8832e4f888cdbc005c8e11ebea16a718db39e8b2c664a9ac849a4d SHA512 4c23d9dd33e82dd8a89f2b6aecafe14491024d9d22cd7142cc93382d47119bb8542f7cc7b17e44031838d10e4681965bae3012c05363bac1c91e06d805c7c48f WHIRLPOOL bb8cffad818d65b6fb8695e8d61129cf0921760c52bf5f5a6f84b752e9d88795ff8ea4b6b7f4e95530e72e9abda630d91391979b18fc75f3e475523d64000461
+DIST python-debian_0.1.31.tar.xz 295720 SHA256 942968340c5b8fbabe89f1081940ec7baeca0cdbd7f82bdcbda98da511ce35b3 SHA512 d2bf071b088e53ac132f91e5983c092bddb9736b3fd1394dfd2654fb8b6af7f89982af8debba8c4af21086d4f8a3ef86393fdef25ef18bcf71dcb00a60a8ae5b WHIRLPOOL 1edd2ac1d1aa3d45d591c7f1a40f02243b188f4299cd781aa043168e9cf05ffa3dcba3ee742446835eaaa35a3cf8b4a42a3e0d39350ce99ee24f4d3b3055b779
+EBUILD python-debian-0.1.28.ebuild 984 SHA256 9ceda70ccc1e224338222533189a3b19307585fa8fdc9e46558eeea7e3bdce9d SHA512 365ceb69505d32076eb84ce231049ebedb06e79a34d69ebd9658ad515ff9148f874e03b00a07604dbc425fc66ff661e465dfcb19931c058f17b1fe3a429b394b WHIRLPOOL fd87dda4f3f68b8494b83b277b77332c28383236de0f9dbf9a45970da6ebf8d77fd6096492a484c188c9db2f48c0ce0b058adca5b5087cd8abb0516ab3b77365
+EBUILD python-debian-0.1.31.ebuild 1014 SHA256 2fad95b07d00e09d8ef81d291e4242f9c1ffa8fdbe7bd42f7947068bb58fac02 SHA512 4161402726f04af0c2f836e8a1d2a87bc03cd10501509a06b15753c87326f0d9b2375f0178b05cca842234c56e25dad1c5a2c9b2bd72867ddfb1e1a3ce273edf WHIRLPOOL 32559d0a50e35cf039317335a75ce041a14a77a44e654845cf67c103436c2703ef9b0044e38dbcdfccfc6cc9703372e38e0ebce261a0432b87d296d317efcbb0
 MISC ChangeLog 3426 SHA256 97c7cd8e4e9db63f44eee89c344efeacdd8028135d0b799bba41b88ec1e34847 SHA512 3e5b3061b1a1860c476e2b88c1ebc4c1bf4a9e84c76774c1f398b708d7b0d87c39b913e8024dd7791f3b9090cc69d10f917b9542a05dec05f74701dd551fedc9 WHIRLPOOL 77b41e162f247253dfef91bc3960a26758c843a4bff5192aa10677de1d299db1e72377d0cf738e0bc4fc6417007a2c4db058103e29c4ef9c1dc5806dca384f31
 MISC ChangeLog-2015 2057 SHA256 6291b25829b72f62e2636a2dae06d2f8fabf24f4e1b8730eced736eaf59db0ef SHA512 313296b453b36e0f95b78324104cdc0e45617fdeab076d3ee8e72505b93d991e8410a2fcaa8ed0e9185546592b446d8c4e47e03c686b60d694cde66abd5b03ec WHIRLPOOL b609ab8cbeb6619fb68e7ac7793b19be413e62d5708e91230ff23a3a183b6bc40a45b93f4f5aec8dd7c2413dfd26098eecac5985b8e9bfebb7527478d85bb738
 MISC metadata.xml 357 SHA256 95dfb9f3359ea566680dc61c7e47ac1f757ba9da96506c4004ce92f1baf306ef SHA512 452510eeb22c1db33118dfcd518488f42be0789b5607c9b76d316b14c6d1a474b6bfeddfc4034389a136c408bc4180ad704b6e1b0eac1381f9a77284b7016e39 WHIRLPOOL c3d60d51c48100d7ef6ee3ba1d5bdc5ce872e81f397127ba0a6612cc2d85d45c4dc42764f8610ce583d76f4d43d080afe1ff966457b4144e9c7c67b585d33ac6
diff --git a/dev-python/python-debian/python-debian-0.1.28.ebuild b/dev-python/python-debian/python-debian-0.1.28.ebuild
index ba4f1f045850..427a310a47e1 100644
--- a/dev-python/python-debian/python-debian-0.1.28.ebuild
+++ b/dev-python/python-debian/python-debian-0.1.28.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="6"
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
 inherit distutils-r1
 
 DESCRIPTION="Python modules to work with Debian-related data formats"
-HOMEPAGE="http://packages.debian.org/sid/python-debian"
+HOMEPAGE="https://packages.debian.org/sid/python-debian"
 SRC_URI="mirror://debian/pool/main/${P:0:1}/${PN}/${PN}_${PV}.tar.xz"
 
 LICENSE="GPL-2 GPL-3"
diff --git a/dev-python/python-debian/python-debian-0.1.31.ebuild b/dev-python/python-debian/python-debian-0.1.31.ebuild
new file mode 100644
index 000000000000..d563a839202d
--- /dev/null
+++ b/dev-python/python-debian/python-debian-0.1.31.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,5,6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Python modules to work with Debian-related data formats"
+HOMEPAGE="https://packages.debian.org/sid/python-debian"
+SRC_URI="mirror://debian/pool/main/${P:0:1}/${PN}/${PN}_${PV}.tar.xz"
+
+LICENSE="GPL-2 GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( app-arch/dpkg )"
+
+RESTRICT="test"
+
+python_prepare_all() {
+	sed -i -e '/import apt_pkg/d' \
+		-e 's/test_iter_paragraphs_comments_use_apt_pkg/_&/' \
+		lib/debian/tests/test_deb822.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	"${PYTHON}" lib/debian/doc-debtags > README.debtags || die
+}
+
+python_test() {
+	"${PYTHON}" -m unittest discover lib || die "Testing failed with ${EPYTHON}"
+}
diff --git a/dev-python/qscintilla-python/Manifest b/dev-python/qscintilla-python/Manifest
index 8a9a345136e9..20996bf809b3 100644
--- a/dev-python/qscintilla-python/Manifest
+++ b/dev-python/qscintilla-python/Manifest
@@ -1,7 +1,7 @@
 DIST QScintilla_gpl-2.10.1.tar.gz 2663446 SHA256 97f98a9d91f908db6ce37fecc6d241d955b388a1c487173b60726cba9a3dfa64 SHA512 ea9b95ca371a8af9262493ab59ecaef77e1697ba21d1d594aab39e836917884fd829aa4f6c4e72cce60b0d3f40eac654157cc507d027945f0034881855123ccc WHIRLPOOL 96261f2c2c38458891afad057716bdfee05f74e9f15a8b8ce2eab4445b8c56256cbcb33326631ac1f3624e2c998d490f5e057c348b3a3eb44a9260c938beda61
 DIST QScintilla_gpl-2.9.2.tar.gz 2491222 SHA256 f2c8ccdc9d3dbb90764ceed53ea096da9bb13b6260da1324e6ab4ecea29e620a SHA512 28f88111d7eb6a016a4b87f04d2b7f5d6481b521a3361a526b3b45a56240f5c8de10310e819234fcba773c6df73bf398ae2dce622976a8e760f506be1defb7c8 WHIRLPOOL a04420c66fd417e5304c92a1ee3c1998f6849bccb9088dae96ed48c06cab0a9b1c012f073aafb1e05aaee46564de9ac89ae07145f3ded35cf47beac78065650a
 DIST QScintilla_gpl-2.9.4.tar.gz 2557199 SHA256 8b3a23023e9f0573caed6f9cee86f898d87b768ee15b8c211a423783a4cfa4e6 SHA512 5a2eebbe523a0f2f1c7bc63ce5ee9cb8793a597d00eea5b638f18f90d6e798e92c281be23ee5e7072d5afced9e1fccb6ae51526a3623d373d57c3db64d026b16 WHIRLPOOL 68aacdcd0fc7102494ccae1f0ea3e222845bdd3f9bef603d89fe50d50dba6ac77471228a84c1c281a46ccf74bdb6902aa3bb21f89388ec5408bdde5876cf8655
-EBUILD qscintilla-python-2.10.1.ebuild 2009 SHA256 e617dd930958dc41cd6756969690935e995906d9dea69662abfec1efbfe5182a SHA512 484429fba716b797321836e25c8cab3e2c503af1e1dcde7cede601a385f930714e1abed28de797922caac8f37c5d4db74754b36f587ded7f9984be212554b217 WHIRLPOOL de1f15741a550e6cbc8312934253f8646f4988f7cb022e8d0b77970a235e392ece81d9ea4e706338150a3c11fbe775b81ea6af980f7824c3a069f8f203310fca
+EBUILD qscintilla-python-2.10.1-r1.ebuild 1978 SHA256 10a3f0135fc4ed9be84e27b6702fe24c97250c42f191a3b6165626d36200d04e SHA512 2867912eae3e2139be2c698002cca9b2d76a95cde93b8d8da84723143895141830ed6835d18f477d914d5500df531e43bd32d85748fe2004f72fb203c683cfe2 WHIRLPOOL b6fe367256d2aa8ec4ec4af6ce6884f3bdee9f1ad7a3c0cefce52bf6c5610533d5c2270a10c3263e2059fa5c274e53455eedba4aff69a3c309e8b4937eb420eb
 EBUILD qscintilla-python-2.9.2-r1.ebuild 1486 SHA256 221fd6bf46fc651d78697c0749328df376d3a64e265270b82bbaf7086f10f398 SHA512 f51fe63953aacd8a8652ccd11dbf5a4875ee9c826b70ca2a751d77777570e2993ddb5bd58570db3d617e51b5d97722df7ee3c9be656bb6f343e997ada9cb5e64 WHIRLPOOL 3a062ba5e21dcac3c9ba41a7c124b072b3cb78177ea9cd5c5e5f80b5173c2aeee447a0730d8ce62a9fb057698fd7f53c2509a7a7432d7d8c39f72b44896518a5
 EBUILD qscintilla-python-2.9.4-r1.ebuild 1772 SHA256 2f06475354a779482882b5a454ca35a4b6e87af9a614376118d73cbd7f888a4b SHA512 7e171629e9f4e52c49a9254f8ab54dd4d27088b19adb5a59c78de4b47646d1cb2149272f5d34e992ce35b40291e7fc7f7c598942e4f13a1aeab3bf8616861698 WHIRLPOOL d51876de703181df2e5dd09bfebf39a7119f37c0e75e8cd674f057e9489ae0cc32d636261a85cd98ca413af0e2bf0a6d1c1faa3689bcfff087e458dfc2daed5b
 MISC ChangeLog 4331 SHA256 299e9fb37d9733ff48a9cd13e087fb962ae1afdb0d742b6f2842e2ac5076590f SHA512 db72b669de88184af4c10893459716edbf7aa357825c838d22f8bcffecd48321b2aea0a29df796edd3847adc2dda43046f315ad225f85452411dca4c61332bdb WHIRLPOOL 3ce85eea261005cce24ccdec913c14aa1dc2fc85f97ceaa6829e2edd44e8235b1c70c63686d5481b23c7ea7bdca10d7b88b181b7677a74bb167e6736950949e1
diff --git a/dev-python/qscintilla-python/qscintilla-python-2.10.1.ebuild b/dev-python/qscintilla-python/qscintilla-python-2.10.1-r1.ebuild
index d1fb97c65ed8..81b2ca3d0362 100644
--- a/dev-python/qscintilla-python/qscintilla-python-2.10.1.ebuild
+++ b/dev-python/qscintilla-python/qscintilla-python-2.10.1-r1.ebuild
@@ -43,17 +43,15 @@ RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${MY_P}/Python
 
-src_prepare() {
-	default
-
-	# Fix out-of-source build
-	sed -i -e 's|sip/qscimod[45]\.sip|../Python/&|g' "${S}"/configure.py || die
-
+pkg_setup() {
 	MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
 }
 
 src_configure() {
 	configuration() {
+		# Fix out-of-source build and installation of .sip files
+		ln -s "${S}"/sip || die
+
 		local my_qt_ver=4
 		if [[ ${MULTIBUILD_ID} == *qt5* ]]; then
 			my_qt_ver=5
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 957ee4b785c5..7aabb5fd5d35 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -5,6 +5,7 @@ DIST setuptools-35.0.2.zip 624829 SHA256 1e55496ca8058db68ae12ac29a985d1ee2c2483
 DIST setuptools-36.0.1.zip 711296 SHA256 e17c4687fddd6d70a6604ac0ad25e33324cec71b5137267dd5c45e103c4b288a SHA512 cbcd2591d0d8a7591c5d9a1d4173814afa0b984af29f2e34d26a37c357474b043f371978ac224cea12f50834d91babd9f14b137488c4edcd62594e91aff903d8 WHIRLPOOL 9818d419a11ab6493027fcf27a48b087c80a10fe2bf3b0539893bd57b33be23ed5b90572682f0a27850044482f03d299905e04cc890f724d3cf719d34bf36464
 DIST setuptools-36.5.0.zip 721505 SHA256 ce2007c1cea3359870b80657d634253a0765b0c7dc5a988d77ba803fc86f2c64 SHA512 e61c2f9ee640bf5dd8ab7c7a7c29667d91aa2498a7b027e387493ad7bcc9b56927e6fa63cdb4e083333c57eb355a670ba3df861ed5f8447b216fef0bc77c8b43 WHIRLPOOL a18b45eb750bc92579d0179d0d5797d4cf949c20ab4e6cbf0b4ae154d351285983505829a1f0f0ee71b5b4aa3793bd3306ab3a9c44ea42b8306cb80cf3d273ec
 DIST setuptools-36.6.0.zip 725173 SHA256 62074589522a798da243f47348f38020d55b6c945652e2f2c09d3a96299812b7 SHA512 b1b7fbff45db72e24ffb0aef41509a8f49c3911f20e6dfa7335aace22d0b2c533615edd1626c6b58602960644d1a3ad7b2e6899efeec4138aa58a187d063c319 WHIRLPOOL 62e0e32eddd56b758dcd4da415a422e78f51acc58f83dc887d6ca67d7836cfe28dc1bdf4acb423b5e1f694c79ab4a392dbdc5f8ccb669e641f70f8c6f37f62b7
+DIST setuptools-36.7.2.zip 726758 SHA256 ad86fd8dd09c285c33b4c5b82bbc21d21883637faef78b0ab58fa9984847220d SHA512 746dce135dbacb65565787a20a2611388605e2371c94f0f8803e7712e515e69c270751d16a21f381bf6e8ddc0a1b39494db7d0c67bb32e6230a90c5d517e78f9 WHIRLPOOL 4000d4657f39ccc63dbaa98a3ee695d63dabfca361b574bf552393e633be4ce31b67489a3eea5b780b55e7385da220d2b3339fbacacc776eba379a13732724aa
 EBUILD setuptools-30.4.0.ebuild 2058 SHA256 aff2e283d8acd9268d97a81fd7c22106760294a2652f4e03e7a4b0effb9bd727 SHA512 c14b6452d4e7084e3b645981b7b615d223b97e3fd50d75341e27274154d0f2e9362ca6605cc20a4a83dceac26dc65d018400606a43455aa292778911ac9f6cbc WHIRLPOOL cccce3eb867fad9608dfe120dcdd8d022a941fe2dc0747892fc54dd6a3da9abc936f1254d4874d13b44fac7a62e2216a586d97d1ff291db073cf4eec5b3a72af
 EBUILD setuptools-34.0.2-r1.ebuild 2041 SHA256 71c95e890e3b1e9159538ac9e74e619a89f8f87a2d0c28b8e77a586611fdd770 SHA512 8a9db9943611582d5276ed7f009cba5ae5c839b49d21e95ece52d94da6508a70811117e3aa1774f195f976428667d5b3872cc2192f78294456eb83fc50addba2 WHIRLPOOL 68aecc5618c6558a5bcaad96baa99fd3fb582679bf224945831c1c2dff68b65a61d3821e46e8c8ead7b86787381ae277120e5997b18c96730bfecbbbdbb63c2d
 EBUILD setuptools-35.0.1.ebuild 2035 SHA256 0168ab06838a36702973806762e30cbc72a2a4bd55662898f0cf7af8f9175cc5 SHA512 bf2b6cc66a48202471b0c904075376993d26edb0fe4cfeaa56c44d4610019f359404810d4bceff35fb7cc3f5e7dbeb469f69dfa911ffa223cfad51c8e6d18eb4 WHIRLPOOL cfb66cd81c642f03546f01395b2ad1e67a5797c0a97fc701ee2602520ef827aaee7b344bacc79525edac4026120610c5def45768fcc18e388642391e18d10f3d
@@ -12,6 +13,7 @@ EBUILD setuptools-35.0.2.ebuild 2035 SHA256 0168ab06838a36702973806762e30cbc72a2
 EBUILD setuptools-36.0.1.ebuild 1902 SHA256 21e17a1e229890cd6bb9e86c9c33bc16fc04fb0e9196341d7d1b1eb1b11bc521 SHA512 b205802dbfe7a2c0962b3399b4cae6fce1437f3922f2f138c5055497e514dd49a52d1513dad9d2323eb2360c4d59f37607f24dfe17176cd1c6f136875198827b WHIRLPOOL c45c02f0e4ee088e6e44fa076abb33ad2317f2344777247eaeb9b33cf3af5105c9b45632644769da62d1ea00cc9865d264ac15b70121b3aea015c6dc9802abb8
 EBUILD setuptools-36.5.0.ebuild 1791 SHA256 bd91c146723054ebfb78d33811b3f998b08ad52c002af6f37205dd0b00e94fba SHA512 3b85d8349146d3f82e0c589934784c96b6f24cf3a1f4ad09eb05cb07ad18ae250dd2daf01816fbbbe2e7c285534a58690e8f5f359baa1c0ea9557acec142fe03 WHIRLPOOL 3b9c38ac6cf7b1ffca735c5c566b96fbcf1171097f244477ceccd22e2d4970017ef00d512c0525ecd1500f056b2b3789788ef096f0fab5e08ccc9add98441617
 EBUILD setuptools-36.6.0.ebuild 1828 SHA256 439ba0542110b7a37f7c67f997c9f9ac3d84bca817c0e1e8b01b467bbefeeb5e SHA512 fe855fbf0f1012ae83b82c138d1fb8f2822d09285b0dcfe5a31e430922878da217549943e868c0a96493f83d4b26d9e47312de7639edb329eacaf9e13d9d532c WHIRLPOOL 8ee243dd3d9de88589dbb07b8bccbaf3669ed3bd55090f2bca3305209c02dd066fa3e592e014ed9f908e88b5d81f2b3f6632ac8a7c63781ed547b7e38eb88e79
+EBUILD setuptools-36.7.2.ebuild 1828 SHA256 439ba0542110b7a37f7c67f997c9f9ac3d84bca817c0e1e8b01b467bbefeeb5e SHA512 fe855fbf0f1012ae83b82c138d1fb8f2822d09285b0dcfe5a31e430922878da217549943e868c0a96493f83d4b26d9e47312de7639edb329eacaf9e13d9d532c WHIRLPOOL 8ee243dd3d9de88589dbb07b8bccbaf3669ed3bd55090f2bca3305209c02dd066fa3e592e014ed9f908e88b5d81f2b3f6632ac8a7c63781ed547b7e38eb88e79
 EBUILD setuptools-9999.ebuild 1828 SHA256 439ba0542110b7a37f7c67f997c9f9ac3d84bca817c0e1e8b01b467bbefeeb5e SHA512 fe855fbf0f1012ae83b82c138d1fb8f2822d09285b0dcfe5a31e430922878da217549943e868c0a96493f83d4b26d9e47312de7639edb329eacaf9e13d9d532c WHIRLPOOL 8ee243dd3d9de88589dbb07b8bccbaf3669ed3bd55090f2bca3305209c02dd066fa3e592e014ed9f908e88b5d81f2b3f6632ac8a7c63781ed547b7e38eb88e79
 MISC ChangeLog 17985 SHA256 b31d25f57897e897354a84f36573decb09bf17e88b4f8ceb1fe0cb8cbef64a3a SHA512 099eb73daea0a5a0035af624f7c59dc7ecdd77523df9de74741cceb01b64514d8b58ce98c13b58729d900f680416e97408a19e46ddca1c9c34f1a845af86ebc8 WHIRLPOOL c5e8a538a838684f6c57ac9eb516b36572c7ca62697ea12b59a9db6c89c7fd555f6af6877aa24761c6ee6fce5b262c4ba31cd9c03b44378532773653164262d6
 MISC ChangeLog-2015 40164 SHA256 688e239d071bc1023126c3f0bb1e62c72a1c217a7290312441ad91829ee51d84 SHA512 d009c942ddc4d8beb2ba9f756a0f00d292c1accd029288727ef23811dba8854b0cdffc4b753883975adaa1572c4cd15e5a1e14d9fb2afb50e852cb14e71b635f WHIRLPOOL dfe2b05139f33b1b94481d040c5b58cd687331b3d96f7d0cb6e49d28574c3b0f4325b22aec97cd5ba138ee7caec989f18c94456cdb0651bb19611328623e11be
diff --git a/dev-python/setuptools/setuptools-36.7.2.ebuild b/dev-python/setuptools/setuptools-36.7.2.ebuild
new file mode 100644
index 000000000000..b9335a39d953
--- /dev/null
+++ b/dev-python/setuptools/setuptools-36.7.2.ebuild
@@ -0,0 +1,70 @@
+# 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="xml(+)"
+
+inherit distutils-r1
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/pypa/setuptools.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+	KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="https://github.com/pypa/setuptools https://pypi.python.org/pypi/setuptools"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	test? (
+		dev-python/pip[${PYTHON_USEDEP}]
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+		dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
+		dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
+		>=dev-python/backports-unittest-mock-1.2[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+	)
+"
+PDEPEND="
+	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]"
+
+# Force in-source build because build system modifies sources.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+DOCS=( {CHANGES,README}.rst docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} )
+
+python_prepare_all() {
+	if [[ ${PV} == "9999" ]]; then
+		python_setup
+		${EPYTHON} bootstrap.py || die
+	fi
+
+	# disable tests requiring a network connection
+	rm setuptools/tests/test_packageindex.py || die
+
+	# don't run integration tests
+	rm setuptools/tests/test_integration.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
+	# It tries to sandbox the test in a tempdir
+	HOME="${PWD}" py.test --verbose ${PN} || die "Tests failed under ${EPYTHON}"
+}
+
+python_install() {
+	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
+	distutils-r1_python_install
+}
diff --git a/dev-python/simplejson/Manifest b/dev-python/simplejson/Manifest
index c72ac3fe6c0d..0960c2662f0a 100644
--- a/dev-python/simplejson/Manifest
+++ b/dev-python/simplejson/Manifest
@@ -1,7 +1,9 @@
 DIST simplejson-3.10.0.tar.gz 77953 SHA256 953be622e88323c6f43fad61ffd05bebe73b9fd9863a46d68b052d2aa7d71ce2 SHA512 c8782fe434f3f1e29562092fe81f46fc272f0b83fdb3ca31fc03707fe09f4d30696ad7ec07a33de873bd08a41b19f97b9d09e3079658952e5110cf8f68eb53c6 WHIRLPOOL 53458b102f64e2fb841bf8c57b56bc0f9ded3d968eecad47ab184eb17be35ff2574ea8abe70867438e46f3f946afc17f7ef9cea3b66d300355e879531dfdafc1
 DIST simplejson-3.11.1.tar.gz 78145 SHA256 01a22d49ddd9a168b136f26cac87d9a335660ce07aa5c630b8e3607d6f4325e7 SHA512 f4cdb6a77b39d099630e1774cf8bf33b9d138f69d4e766bfc70fb710e24ace00d7a92b4b30b3047e361212a030864055b9de4cc5f78d231cffd930284b209377 WHIRLPOOL d9d5e9e4fcecc8f11b334e48502b258016a09e4b794bdf91166f06f22dec1da78bdc1931f1e42eb5e3e843f49a1e2204dec7a3dc104871958107c22f96c81a44
+DIST simplejson-3.12.0.tar.gz 77969 SHA256 df5e38f5e0a24abe0e02276aa5c3f8504150047a51c0b6b848b8153e6e6d395e SHA512 65b41f00a503ebdca169428aacac2f431e50099b6ac4c732cef769e17d3419d00f8ac40f9834d827a2f33391e6799d3af892e63e2a853ef1294b2ed8466bd7d8 WHIRLPOOL b319a7206544be28f3765c7c6a41111dc77d33e1937afd9df69e14d6a5b79b249390b10096a6c93289a79ce67756d80026aa8707a9069a02bfcab9bbad9d7247
 EBUILD simplejson-3.10.0.ebuild 874 SHA256 8a482f6f49c6075a04ca72886d080859ff0fac934df806a5633f11b1ece89c59 SHA512 726a6de9c147987a57f9c9378c1815b0f7ee66395e09baffdc15e00619a2ce6bbfece3b7b24fda4900002e877a84b08b1770655b8ac801dafcd709968d306ac2 WHIRLPOOL d05f481352c6a9b28fe6b55d733467c49619b2d32c02ef5242226fe35df000c7bc3a68b52021f68b3e4a99b5ad1c5f81caa07521ebd8b7920876d3645380305c
 EBUILD simplejson-3.11.1.ebuild 884 SHA256 e0a414108d970a67e5294de6a3f3ad5c2b3583d760b77ad5f03f0093441a3405 SHA512 1bc29bebf6acfa9abe94b3fd5bf25e043dcb952336fdd202d0d35e8cf80fd7444a7c8bcbff74d00bc609a124d82dc54d9700fd2f7ee7dc4dcfabd9d04311e8b0 WHIRLPOOL e7fb756c912f7be316963ba75897ef49c841363ef9c7b698add77aa2534d3a002957674fb40f05b9ca4e2101f95bfd5eac735134da6f5fbf95787463dd777ac1
+EBUILD simplejson-3.12.0.ebuild 884 SHA256 e0a414108d970a67e5294de6a3f3ad5c2b3583d760b77ad5f03f0093441a3405 SHA512 1bc29bebf6acfa9abe94b3fd5bf25e043dcb952336fdd202d0d35e8cf80fd7444a7c8bcbff74d00bc609a124d82dc54d9700fd2f7ee7dc4dcfabd9d04311e8b0 WHIRLPOOL e7fb756c912f7be316963ba75897ef49c841363ef9c7b698add77aa2534d3a002957674fb40f05b9ca4e2101f95bfd5eac735134da6f5fbf95787463dd777ac1
 MISC ChangeLog 6088 SHA256 91b20329601d757ddf56e50a9521a3a8ea11c05d282170eb395bb172f36a2074 SHA512 2190af7c271646d6174e4c0cd74c3659befb21f328d8ee38343f1672ef0bc3d5f32faf8481aa13e558f086e72c49bd31eedb99aa20d73dadb48685483e3b039f WHIRLPOOL b33ccca86a1ef76f9779d32e46cb94acfa6e852c6f77d82047e46e65e52be012a13bc2d186286be281f87f3a01da2023eccd23f9bd07dd5680d9c5892d598abc
 MISC ChangeLog-2015 20012 SHA256 e39d4c6cd4cd924788d2bd4049fedd1b381afcd33616a7895d9cdf02f65e7345 SHA512 9fd0346a823a3c1ae7e67455b7ef6ae3feca5efcf28d96415cc26e7bc33da53e9c9c1a08427b700341c0745a4466dfaa7bf03630a5131ae0e45bd85b3fef2240 WHIRLPOOL 8dd15b3b94a879cad184e28e4a5a8d5c88c6580408f4a4fa5e36d7fb9c1c717d8d8cc1e6298911b0c8fc0d5196f9781df91f26f6edacb7ef566fa5db3208953a
 MISC metadata.xml 323 SHA256 6f1563c9361d4418d81507f4bdd861fcbb2114298178840a07e9bba23335ea0a SHA512 7db760ee80a6281bcc370303bafc40aea566465bf3264381336222c6f6002f573bfac205f2e42cca557c7b31855f082e1ed29ec9ab3b1125e455cf84bdaf54ec WHIRLPOOL f03d961cb2dd5366d3280d1edb1b4df127ad2ce83ea55b31650e7e8a6c4c997b3d6e138ed2ef13dfe9fbc27797e66342fad7ada6ccf279663f87fc2372948776
diff --git a/dev-python/simplejson/simplejson-3.12.0.ebuild b/dev-python/simplejson/simplejson-3.12.0.ebuild
new file mode 100644
index 000000000000..63006c9caf2e
--- /dev/null
+++ b/dev-python/simplejson/simplejson-3.12.0.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,5,6} pypy pypy3 )
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Simple, fast, extensible JSON encoder/decoder for Python"
+HOMEPAGE="https://github.com/simplejson/simplejson https://pypi.python.org/pypi/simplejson"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( MIT AFL-2.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+DOCS=( README.rst CHANGES.txt )
+
+python_compile() {
+	if ! python_is_python3; then
+		local CFLAGS=${CFLAGS}
+		append-cflags -fno-strict-aliasing
+	fi
+	distutils-r1_python_compile
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/skype4py/Manifest b/dev-python/skype4py/Manifest
deleted file mode 100644
index 034a5d905f0c..000000000000
--- a/dev-python/skype4py/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST skype4py-1.0.35.tar.gz 143453 SHA256 47b61664a47d29f3d5d4a3d6f01a7c5c13c1610767b6ed9e48c07439003533b8 SHA512 daf07b08e5a3dda47f1e643ebbf6d8d01175e7f3a23cf6daf852c75f4b2552b8c68f255e27c89ea8773836b2b154193fed1b3b5e28ed07b503b5c2f95ee4314f WHIRLPOOL 567aa5247959881277449a49f3250831fbd3ce416eadb78f3931b6b2a6a6812dbf2bfbf4cff3a1bef2a53791aaecf124ef152146de0f1c1c22f62047ea6da964
-EBUILD skype4py-1.0.35-r1.ebuild 638 SHA256 4d57130ae86d4a4b73f238f2350aac4658a67f78c585e66d301a45d0011ad979 SHA512 901228add45e877b9a8478860f947c289d6e89bdfb46a9086dfc9985069a084af5c2831cdedc88adc5dce182ef65dc4bcaccce8698a4cdc922f8ce01fb4c8618 WHIRLPOOL 69288692efd09121fea2ba1fe9f0aceb5c6d0c60aa09236b73b71f5bdc8ae68d1d8c93ae73720406afcbdffdff28b941b947004d3b580dcea646b3c4cb2e5295
-MISC ChangeLog 2683 SHA256 6a830f2e10e92ce7c06be00432a0d5546f08378f5de5ab52f4850312da7d6ce3 SHA512 ba9692e8d8f2016a98796f44c0ff5b870d8d086ee6d0d00a95db95f5eeafe4f9f458d70911b03b1ade9480d541ffa3d444a71ed35108b102fc373c1a1ee87935 WHIRLPOOL 8e2ea01a3f51ef085291e3393e1d3e1dc2c16888a82bb5ead1008ad524501972ed62f1fc99134bfd8a6639c5ae95f7db1b8fed43f91e729126fc78051db9e9d6
-MISC ChangeLog-2015 3514 SHA256 3be41d4723c90aa54baab05b1557138283c654243707c8a187a1730c88de6667 SHA512 537718ce4b5382fd3513a7e20e1d07acd2976d9892a806b94548214ef8bee4540fa21cf0c241d6be5adea51b5c800b109d10f2d8642ca60a487ea53f603537d3 WHIRLPOOL 98343d6e0718a6a45e64d0c80f95a77a5b86f3fb89201d5adca4e328bb1eefd87d8a11a102717466fc8901a9b0c2dd08de6314d186bbf7b59081093a9ef6195c
-MISC metadata.xml 301 SHA256 2c550e3d24685d9e232c9c7dd7bbe6f8e0398dc8304b0765401324ef2c85a1fc SHA512 0a9e882437820758d7d0895a64f4b1e2865f80cd14ceddea77db1d54bbff48be10df376a0942449b439776401b302c80d1ea0492fdeb257811985e51cc300b66 WHIRLPOOL 162e01691b7d3ad5e1d870921f53195fd38b447bd897419e2c03a7926dd8fa80d87ae6fe389ff565dce8e61dcf4b2fe829159261e7a061e1629e3e05b26d42d8
diff --git a/dev-python/skype4py/metadata.xml b/dev-python/skype4py/metadata.xml
deleted file mode 100644
index 5d1b574dbf17..000000000000
--- a/dev-python/skype4py/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="pypi">Skype4Py</remote-id>
-    <remote-id type="github">awahlig/skype4py</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/skype4py/skype4py-1.0.35-r1.ebuild b/dev-python/skype4py/skype4py-1.0.35-r1.ebuild
deleted file mode 100644
index 244b3299f346..000000000000
--- a/dev-python/skype4py/skype4py-1.0.35-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python wrapper for the Skype API"
-HOMEPAGE="https://github.com/awahlig/skype4py https://pypi.python.org/pypi/Skype4Py/"
-SRC_URI="https://github.com/awahlig/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="net-im/skype
-	dev-python/pygobject:2[${PYTHON_USEDEP}]
-	|| ( dev-python/dbus-python[${PYTHON_USEDEP}] x11-libs/libX11 )"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-DOCS=( CHANGES.rst README.rst )
diff --git a/dev-python/spyder/Manifest b/dev-python/spyder/Manifest
index b2caa4ec3ef9..b5cdfb06d2ef 100644
--- a/dev-python/spyder/Manifest
+++ b/dev-python/spyder/Manifest
@@ -1,9 +1,12 @@
 AUX spyder-3.0.2-build.patch 6024 SHA256 e13de17f2700fc98df2bb391e6fc6fbc3a87070de1e33855f1a37854ca68ec3d SHA512 7c743a086f8abb99757731ef02c90042c57475c8ab07239ae75ddebd1aa1b1573dbd4e050dff4710fed38338687ca4be9d5eb0e7277c41334e8595d9a1907e41 WHIRLPOOL 952a98088ae1f7d93886666d5279d6a3abd0c32e7a94d464fee99ac3020391414412f32101a715ef1dd69adf1a043b8e90a7ebbc8f8908b7ee43ad4a8dca94d2
 AUX spyder-3.2.3-build.patch 5706 SHA256 1ab0ab394d37f5d7f450cdbc929e52b875549af879cd192bdd51e6950c0dce25 SHA512 41fa116652af0b2a93e25e1c39c450c9bc5cc7bf76afde75e8b53845d7fa8be822c6763ca48ea4cbcb64e72cac927c832233bb681c9950a272da517234464123 WHIRLPOOL 2b7c4cd9a40c0b13b8f74b468b6f0ddc569aefc38424cdd88d54a0fcec110a91302a3c81c95993d5e5ce530dc9e3ea35dc499ef8c0456556ee3286a90f40a9a5
+AUX spyder-3.2.4-build.patch 5706 SHA256 1ab0ab394d37f5d7f450cdbc929e52b875549af879cd192bdd51e6950c0dce25 SHA512 41fa116652af0b2a93e25e1c39c450c9bc5cc7bf76afde75e8b53845d7fa8be822c6763ca48ea4cbcb64e72cac927c832233bb681c9950a272da517234464123 WHIRLPOOL 2b7c4cd9a40c0b13b8f74b468b6f0ddc569aefc38424cdd88d54a0fcec110a91302a3c81c95993d5e5ce530dc9e3ea35dc499ef8c0456556ee3286a90f40a9a5
 DIST spyder-3.0.2.tar.gz 3207709 SHA256 c308cae5d963a7332548db2dd91ebf105263eb493ce208221a59ad77592399c1 SHA512 7f3723bd98876aa4769877327a93aa02510689708012afc72148c67acd91ab134501ae57471d9cf0e17c9e3892a541b7730a2392ace3c6525443058d0ed01612 WHIRLPOOL 5f1f278fa3c6a98b8d7050bb32e9186cd7053e21d9050bf92b29088154ea3494995bf9953e04d63db4c71ccc37d3a2cdd7e38222b1f82decc2b763144cdf3642
 DIST spyder-3.2.3.tar.gz 3342954 SHA256 714c9b9941c1883c810bf87f34d6d46fc4458053e3d138d9e12435ea236b0dd2 SHA512 873a1a0c319fc6580dfbe7370dc5ca132d973b5baf75ba0b6cda228adb7fe7baf4fbdebf4d1984ed6f204c7d27b1bfc2c449199ab02aeb8caf9ebded738f3491 WHIRLPOOL 49729a844157bdd75ced53c1cdfea87cc5366590821f732334dab81bebf094f0d7f09095e88fe584b0d65434f61c71d2bcdb8da29f6af91781bcab1fb2e951e4
+DIST spyder-3.2.4.tar.gz 3345797 SHA256 638310e720248255395df0fdfe010d51f29509858742c8e9cd5e60f7c2791009 SHA512 46e89c68545695d1e64aaafdd2ed724b152a41088f1bfa645b8c66d8ae6bcc2d86e9830cd3f16edfb8027aad5786dfb67f2a8371839dd515df8ebe34446716e6 WHIRLPOOL 1148413058abf2f5d876eb01d8e6b07d79d038cc6c9ff9471c86b38a6b4f7f3d36688a0516ffe8d020463152a9108e7be507cf950cef500263ed7c98f1426554
 EBUILD spyder-3.0.2-r3.ebuild 1677 SHA256 3fb3d64b911193d370daca27320ec78c7a069d05f6b6b796cb69cbc802bfa00e SHA512 94b33f77268021422d49b5022000f9589eeb5d4bbb8675bd5d4066e3577995df9802137914db06d9366d01cf7cfd7c1d0b3ba8b078b2035f7f3ecf50882dcc08 WHIRLPOOL c0bd49b0842cdda07719d8743e38fab14a0c14a86002f9b5ac0113ec1d34de56912f8cbd5e335c1971ea4d63a85d89618f22598b5b336038ecb9e84b176159d4
 EBUILD spyder-3.2.3.ebuild 1721 SHA256 83d1a986f83e14b13563d2377c70ce3d46f1cb04bf4cd0be73b805a69b6da481 SHA512 e7dd7d4a25b96314e02f6b8c1d2e5928f7c9100444165f9c1303e67c14c7a164e0754f728d9521f5c324f815b20a9079727f00b7501e836b3ea97ffe5828cb4f WHIRLPOOL 29da6561bbd68515bba8dfa73bf318c31f041c33acad0884313a5591b20d33f2ed18226283c0298d00adf4a2a8bdf573eeae463bb54d5c46e2ca7ded2e14ffff
+EBUILD spyder-3.2.4.ebuild 1721 SHA256 83d1a986f83e14b13563d2377c70ce3d46f1cb04bf4cd0be73b805a69b6da481 SHA512 e7dd7d4a25b96314e02f6b8c1d2e5928f7c9100444165f9c1303e67c14c7a164e0754f728d9521f5c324f815b20a9079727f00b7501e836b3ea97ffe5828cb4f WHIRLPOOL 29da6561bbd68515bba8dfa73bf318c31f041c33acad0884313a5591b20d33f2ed18226283c0298d00adf4a2a8bdf573eeae463bb54d5c46e2ca7ded2e14ffff
 MISC ChangeLog 4375 SHA256 dba1984e7377b06138f3a7ba2757fa996f97afef197ebaf9f03976c5f572cfab SHA512 6adef23f4811e6da6037b36bfe90878b080dafe5bcd29d61abb644cb7fd3ecd3023cd3571157af408d96038496863a8f0da907473b6345e7c0071d2de24ba6fe WHIRLPOOL edb3c2c76d70b2ddb086092fed1196a2181fe18fb15aae3df33d7ebd5885e549010784f4c893476ce3291762b3edf1e701c09e3b7683c642869d599ef544268d
 MISC ChangeLog-2015 7476 SHA256 f3322b577b0921df14db830283d466d9b801eb3a7a48115be0f2f967cc59bf3b SHA512 6bdec9455aae1be9144ae996595bcfcef91625bcafabd258c284cbc1469702098cdd84fa1442b25fed46eb1ddc2334b51f29a2947b4affbd5453161e4e6ad5fe WHIRLPOOL ad22b78763a665246a3c1de099512889d1d4286a8a345acf41f8335fd17536d8cbb5cf9f57946f1ddde921a73b392acd149c449afccc8850cf9bf9e1c0349932
 MISC metadata.xml 825 SHA256 61551f0b10689505fd8890245cd36b1ba070f985cab0b102baf13066ae6a1d59 SHA512 d15dd90b0db7e1ee2718dcf4cf3aff509775bc72b0352ef401308b7fd78063792c02596e1f8fabbfc2f19e9016f670e396589411e5fe8609f020222ffa9ac4db WHIRLPOOL 94038d2609a392cde8b10507402ad9849c81abe6899d760197e00201f3e1112ec808707daa2da7c1f1abefbdf60e7aeba74bdcc95d0fdfad28b301a7ca2debdf
diff --git a/dev-python/spyder/files/spyder-3.2.4-build.patch b/dev-python/spyder/files/spyder-3.2.4-build.patch
new file mode 100644
index 000000000000..2a1fee52131b
--- /dev/null
+++ b/dev-python/spyder/files/spyder-3.2.4-build.patch
@@ -0,0 +1,130 @@
+--- spyder-3.2.3.orig/setup.py	2017-08-29 00:42:56.000000000 +0200
++++ spyder-3.2.3/setup.py	2017-09-16 20:57:08.610147911 +0200
+@@ -77,13 +77,7 @@
+ def get_data_files():
+     """Return data_files in a platform dependent manner"""
+     if sys.platform.startswith('linux'):
+-        if PY3:
+-            data_files = [('share/applications', ['scripts/spyder3.desktop']),
+-                          ('share/pixmaps', ['img_src/spyder3.png']),
+-                          ('share/metainfo', ['scripts/spyder3.appdata.xml'])]
+-        else:
+-            data_files = [('share/applications', ['scripts/spyder.desktop']),
+-                          ('share/pixmaps', ['img_src/spyder.png'])]
++        data_files = [('share/pixmaps', ['img_src/spyder.png'])]
+     elif os.name == 'nt':
+         data_files = [('scripts', ['img_src/spyder.ico',
+                                    'img_src/spyder_reset.ico'])]
+@@ -106,102 +100,6 @@
+ 
+ 
+ #==============================================================================
+-# Make Linux detect Spyder desktop file
+-#==============================================================================
+-class MyInstallData(install_data):
+-    def run(self):
+-        install_data.run(self)
+-        if sys.platform.startswith('linux'):
+-            try:
+-                subprocess.call(['update-desktop-database'])
+-            except:
+-                print("ERROR: unable to update desktop database",
+-                      file=sys.stderr)
+-CMDCLASS = {'install_data': MyInstallData}
+-
+-
+-#==============================================================================
+-# Sphinx build (documentation)
+-#==============================================================================
+-def get_html_help_exe():
+-    """Return HTML Help Workshop executable path (Windows only)"""
+-    if os.name == 'nt':
+-        hhc_base = r'C:\Program Files%s\HTML Help Workshop\hhc.exe'
+-        for hhc_exe in (hhc_base % '', hhc_base % ' (x86)'):
+-            if osp.isfile(hhc_exe):
+-                return hhc_exe
+-        else:
+-            return
+-
+-try:
+-    from sphinx import setup_command
+-
+-    class MyBuild(build):
+-        user_options = [('no-doc', None, "Don't build Spyder documentation")] \
+-                       + build.user_options
+-        def __init__(self, *args, **kwargs):
+-            build.__init__(self, *args, **kwargs)
+-            self.no_doc = False
+-        def with_doc(self):
+-            setup_dir = os.path.dirname(os.path.abspath(__file__))
+-            is_doc_dir = os.path.isdir(os.path.join(setup_dir, 'doc'))
+-            install_obj = self.distribution.get_command_obj('install')
+-            return (is_doc_dir and not self.no_doc and not install_obj.no_doc)
+-        sub_commands = build.sub_commands + [('build_doc', with_doc)]
+-    CMDCLASS['build'] = MyBuild
+-
+-
+-    class MyInstall(install):
+-        user_options = [('no-doc', None, "Don't build Spyder documentation")] \
+-                       + install.user_options
+-        def __init__(self, *args, **kwargs):
+-            install.__init__(self, *args, **kwargs)
+-            self.no_doc = False
+-    CMDCLASS['install'] = MyInstall
+-
+-
+-    class MyBuildDoc(setup_command.BuildDoc):
+-        def run(self):
+-            build = self.get_finalized_command('build')
+-            sys.path.insert(0, os.path.abspath(build.build_lib))
+-            dirname = self.distribution.get_command_obj('build').build_purelib
+-            self.builder_target_dir = osp.join(dirname, 'spyder', 'doc')
+-
+-            if not osp.exists(self.builder_target_dir):
+-                os.mkdir(self.builder_target_dir)
+-
+-            hhc_exe = get_html_help_exe()
+-            self.builder = "html" if hhc_exe is None else "htmlhelp"
+-
+-            try:
+-                setup_command.BuildDoc.run(self)
+-            except UnicodeDecodeError:
+-                print("ERROR: unable to build documentation because Sphinx "\
+-                      "do not handle source path with non-ASCII characters. "\
+-                      "Please try to move the source package to another "\
+-                      "location (path with *only* ASCII characters).",
+-                      file=sys.stderr)
+-            sys.path.pop(0)
+-
+-            # Building chm doc, if HTML Help Workshop is installed
+-            if hhc_exe is not None:
+-                fname = osp.join(self.builder_target_dir, 'Spyderdoc.chm')
+-                subprocess.call('"%s" %s' % (hhc_exe, fname), shell=True)
+-                if osp.isfile(fname):
+-                    dest = osp.join(dirname, 'spyder')
+-                    try:
+-                        shutil.move(fname, dest)
+-                    except shutil.Error:
+-                        print("Unable to replace %s" % dest)
+-                    shutil.rmtree(self.builder_target_dir)
+-
+-    CMDCLASS['build_doc'] = MyBuildDoc
+-except ImportError:
+-    print('WARNING: unable to build documentation because Sphinx '\
+-          'is not installed', file=sys.stderr)
+-
+-
+-#==============================================================================
+ # Main scripts
+ #==============================================================================
+ # NOTE: the '[...]_win_post_install.py' script is installed even on non-Windows
+@@ -261,8 +159,7 @@
+                    'Programming Language :: Python :: 3',
+                    'Development Status :: 5 - Production/Stable',
+                    'Topic :: Scientific/Engineering',
+-                   'Topic :: Software Development :: Widget Sets'],
+-      cmdclass=CMDCLASS)
++                   'Topic :: Software Development :: Widget Sets'])
+ 
+ 
+ #==============================================================================
diff --git a/dev-python/spyder/spyder-3.2.4.ebuild b/dev-python/spyder/spyder-3.2.4.ebuild
new file mode 100644
index 000000000000..485bde91fcf7
--- /dev/null
+++ b/dev-python/spyder/spyder-3.2.4.ebuild
@@ -0,0 +1,60 @@
+# 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 eutils distutils-r1
+
+DESCRIPTION="Python IDE with matlab-like features"
+HOMEPAGE="https://github.com/spyder-ide/spyder/ https://pypi.python.org/pypi/spyder/ http://pythonhosted.org/spyder/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc hdf5"
+
+RDEPEND="
+	dev-python/PyQt5[${PYTHON_USEDEP},svg,webkit]
+	dev-python/QtPy[${PYTHON_USEDEP},svg,webkit]
+	dev-python/qtconsole[${PYTHON_USEDEP}]
+	>=dev-python/rope-0.10.7[${PYTHON_USEDEP}]
+	dev-python/jedi[${PYTHON_USEDEP}]
+	dev-python/pyflakes[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/pylint[${PYTHON_USEDEP}]
+	dev-python/pep8[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/nbconvert[${PYTHON_USEDEP}]
+	>=dev-python/qtawesome-0.4.1[${PYTHON_USEDEP}]
+	dev-python/pickleshare[${PYTHON_USEDEP}]
+	dev-python/pyzmq[${PYTHON_USEDEP}]
+	dev-python/chardet[${PYTHON_USEDEP}]
+	>=dev-python/pycodestyle-2.3.0
+	hdf5? ( dev-python/h5py[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+# Courtesy of Arfrever
+PATCHES=( "${FILESDIR}"/${P}-build.patch )
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build doc doc/html || die "Generation of documentation failed"
+	fi
+}
+
+python_install() {
+	distutils-r1_python_install
+	python_newscript scripts/${PN} ${PN}${EPYTHON:6:1}
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/html/. )
+	distutils-r1_python_install_all
+	doicon spyder/images/spyder.svg
+	make_desktop_entry spyder Spyder spyder "Development;IDE"
+}
diff --git a/dev-python/yarl/Manifest b/dev-python/yarl/Manifest
index f51b415d3654..ecb06b8f1053 100644
--- a/dev-python/yarl/Manifest
+++ b/dev-python/yarl/Manifest
@@ -1,8 +1,10 @@
 DIST yarl-0.10.2.tar.gz 127679 SHA256 a042c5b3584531cd09cd5ca647f71553df7caaa3359b9b3f7eb34c3b1045b38d SHA512 b385a4165b7d095e4d6e2ec5c808c6536e044fb7750000d917370ca4ca66162ed60b142e33eedb02f608bd8b005f6d1f18304992fe00702ea30dd746a0ad9a88 WHIRLPOOL 4d64a9051b00eed92b48afa2340374f125ac4de05c6886bc7dd706734518308cbf7c29086e9f812331831800bda659f027cf4c4a1b91a80d1762387a55d3d175
 DIST yarl-0.10.3.tar.gz 127867 SHA256 27b24ba3ef3cb8475aea1a655a1750bb11918ba139278af21db5846ee9643138 SHA512 61df025fb906ecd95b8360bda224801baac5268215f6957837415cfe56a64c90e29bcd0b6a2dd7f253d1142643058301d362952cd3c8f8dd5f5a78a2da413177 WHIRLPOOL 911bd5861e6be7657fe62c0fb02b0fb70a1f5582ac45de48fca7aa5ca07502ea890c5999c2a066e2a87157a6452e42194235c36fb8177b563f9787007ce1db1a
+DIST yarl-0.14.1.tar.gz 134863 SHA256 9980ec589b5c72d0fc0683a7fbb321196c623754c18fcd4174f2296401b423cc SHA512 d48292616058731bebb9370f23a892072afbbe8c3c720d920c7b9bb1554d91b02d2c9669662bcff0c1efdc7d519145e214a1440622c03e05c7a9b910d69d69da WHIRLPOOL e117f32150dce0edea863e74c84e5afe379abb0ad1acbf13cd9a73649990749dbc2dbdb1060fcb99fdcbf9c95c8e121b542c95ee71c6ab06f37f6492bd2f307f
 DIST yarl-0.9.8.tar.gz 125806 SHA256 a7818b0654265623525b56e78b901315a9ffb7ef0bf21b4af7e0e27572d54dec SHA512 67446ca618a2539f8c1fc8a7a96d1ce50a924ece0479e01103347f73a7bd75b0fbdd0ff5c007529195c3f12aa62d185563e761557fcb95b3226eaece65c0be9f WHIRLPOOL 422cdd47982e44a64f89d689882a31038728dab0e827f5d44b7e25e81fe2a89f888f060f7971a4b6ff901627596d65da73035be8673efcd186d5af25da01cd8f
 EBUILD yarl-0.10.2.ebuild 598 SHA256 edd93f42821fbe5a96e9cdd3c2553bdc760b95daed6cf05c1e02983de45b0deb SHA512 a1fa1a4053d0d7e478fc0cce51da9e83ad41dbb1b114f2f69f0ecb2aa8b4379d765f2533f221c33216df3667f5e37331c5481b900f3c4bbba57d344f41767957 WHIRLPOOL b6572b13ee1d549889ce8cc9af435ae07a9151e30189e5913a60b564721d20667def5b1a644f3a796cb763356ac52b47ff2810b111eceb0904ac91bab4360694
 EBUILD yarl-0.10.3.ebuild 598 SHA256 edd93f42821fbe5a96e9cdd3c2553bdc760b95daed6cf05c1e02983de45b0deb SHA512 a1fa1a4053d0d7e478fc0cce51da9e83ad41dbb1b114f2f69f0ecb2aa8b4379d765f2533f221c33216df3667f5e37331c5481b900f3c4bbba57d344f41767957 WHIRLPOOL b6572b13ee1d549889ce8cc9af435ae07a9151e30189e5913a60b564721d20667def5b1a644f3a796cb763356ac52b47ff2810b111eceb0904ac91bab4360694
-EBUILD yarl-0.9.8.ebuild 519 SHA256 ed5f34f7a7e0ee024b587a9ed1d8bb19ffeb1d0785985191b0c5596e77ecf1d6 SHA512 3e62f98940b12431ef051de7bcfedbe089502d98143d8dca9215b298631ff25dae1749dee73b9b8a0280757b99e2bd0c8976dc0a5eccd5594085f7002a0f2770 WHIRLPOOL dd587f6c8907b1180a08de34f740a46c49528e1233cec0c82c27fd2eadf5f100ce1fef172c30f4cc1ea60497e6a6bbc8291e2c12880f7e40ae004c4852316163
+EBUILD yarl-0.14.1.ebuild 620 SHA256 f48612acdb995ee37753713385ada17e044ce40e74cbdc4fa62f6e3bf229b93c SHA512 ef6fbb052c0497bdab78c87aea57ee81b4724c4dafb8c197f413ccf92349947c9e382a8ce362ea7d5502b0a4d5b1e4c43813526cd831ef8b9d3954b2bd04c875 WHIRLPOOL aeff9739531857741b8fde010cf3aace115a7acc9e887b0db67d4b393c3a599c19775b3c97942d1ed613417bee1a00f9aa5578d2deb915f3f782dd422fd12762
+EBUILD yarl-0.9.8-r1.ebuild 580 SHA256 48567b4e4d9c61f71daf4366e70a469939b740f224ffc7f2820db808946429aa SHA512 a223d7ffc84d391979807702196f17435a7577bbceb6584f1455a88ca99dcddda2f70b4e8c77a83dbf6dc51cfa1c04655e6f0dc2b6ef7593d2e5889f8fce82e4 WHIRLPOOL 0656de1db4ab2be927f59de028d334f530f31a65d17046f6dbed997195bc0645a4906f268f496ab070fc66de54b10bc553bb944d9170c6b1752f90aa5186b50e
 MISC ChangeLog 445 SHA256 b0349d4f27394eaf18cd5f90469b4be3fe751ed132b175ccf8448f311b487adf SHA512 adade23d704d3460b26b505839e05a63818f3a8fe091423cb681ee158e333e73d26b19527db3c7b02a71642864ad5bddada3a38aeb845bebeb222c09a382d119 WHIRLPOOL 5eb1b866893d600e92e1c4656ab24f87d2894069406855def06e96dc326717c4d523b4beede124032827e70458a1721c4898a01a42f9bf89992d2bf2e806733e
 MISC metadata.xml 338 SHA256 035dc8be77356ab2d96c9223833c1657ed663d62b1c21e13df8fe3eb155f935e SHA512 a3b4df627bc1c726d84bb0cc0f4c1faa658b42a23e0b2777c95530234e3b3466004eea62b54058c530a99cbdd3eb9775dcbe605767710c57f198e7816122baf7 WHIRLPOOL 52b3f6571de9e571f30917b27fce8d11b5ee2bc4d3e8ea20f16c07b053a94864c13ef0da6dda237051957e26d03c3ad20b420ea968e9d49ecee0b77839be181e
diff --git a/dev-python/yarl/yarl-0.14.1.ebuild b/dev-python/yarl/yarl-0.14.1.ebuild
new file mode 100644
index 000000000000..e1b4bc79d0d7
--- /dev/null
+++ b/dev-python/yarl/yarl-0.14.1.ebuild
@@ -0,0 +1,28 @@
+# 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="Yet another URL library"
+HOMEPAGE="https://github.com/aio-libs/yarl/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-python/multidict-2.0[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/yarl/yarl-0.9.8.ebuild b/dev-python/yarl/yarl-0.9.8-r1.ebuild
index c94d4ffb50ed..cbc00b0b70d0 100644
--- a/dev-python/yarl/yarl-0.9.8.ebuild
+++ b/dev-python/yarl/yarl-0.9.8-r1.ebuild
@@ -15,8 +15,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
-DEPEND="test? ( dev-python/pytest-runner[${PYTHON_USEDEP}] )
-	dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/multidict[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest-runner[${PYTHON_USEDEP}] )"
 
 python_test() {
 	esetup.py test || die
author	V3n3RiX <venerix@redcorelinux.org>	2017-11-15 17:13:45 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2017-11-15 17:13:45 +0000
commit	e2d84e38284aeb9d522a7e935554340ddf0e4a6f (patch)
tree	5a7444ee5f2af59431481999f729676090b1e0f3 /dev-python
parent	519e4d5d99fc43d5c9a038098c029dc4ef9d6792 (diff)