gentoo resync : 10.11.2017

author: V3n3RiX <venerix@redcorelinux.org> 2017-11-10 00:43:02 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2017-11-10 00:43:02 +0000
commit: a5332b59346f7cbf0fdbd148b54aa8a84aaf8190 (patch)
tree: e6d8d3589fcd01fbc3f1286185639163daa81424 /dev-python
parent: fceeaf01a28ee71065cf3798b70b77d3bc4ef199 (diff)
106 files changed, 1980 insertions, 388 deletions
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index ef50dc31fc50..7d13633c9a4c 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -2,10 +2,14 @@ DIST boto3-1.3.1.tar.gz 176717 SHA256 b3dbde6445ab04c3d0de9b962a3cc8ed9bc22ccce5
 DIST boto3-1.4.0.tar.gz 183263 SHA256 8fdd3743e34a32e5cb8636fb33dafe7336b7a341583653f52c6c20f7fe764472 SHA512 9e678b26993f48f156a5acdb33aec3488d263230517e6b5e1e608cb007fbf4f29a3c33290e460eb7cf1031f87894f3daca03bf80048139435979f23dd2fd61b8 WHIRLPOOL 5eb3703b11b4a0b3a4c873aed78f9c8b6588b5a83cacbd673f27cc4460822772745abcbc6698f680968ed37318d76bd812a491a83caa7b04b1e4a663def4a271
 DIST boto3-1.4.1.tar.gz 188341 SHA256 a7f10245b3ff947019963963b73911c515debed89709740586503ac22f5dfb97 SHA512 525f2db50d0a9d6f452c0261e934ecd9f06b576154b128d209a729b0fe96190e641369c00e13700f2aba5fe4a0c02f80248e25bc3d716cb72752d645e880eb23 WHIRLPOOL 195e5dcd59152ef09ae1f32aa9f321ea1f57c2ac20f7a233673c4f2a4529c062f78af0641efe8ac0632188e8e85e1e687eeb7c6932de89d3c49e110df2958eb4
 DIST boto3-1.4.4.tar.gz 194721 SHA256 c760ca47a34fb54e44b90fc28d87a50353df527b39e815f399c481bab7d351c6 SHA512 948d753809e41bad39fdf3da9646b62ff2fbc9d23966cdd0e46b2df18b07ff8c8af11bb777aa0cd1fea5bcdbc2d43f3f3d06012e30327e3c55b36f7bba815a61 WHIRLPOOL e650e194d507dd405034ffb7907ab4a7e22765f290bf0bd8d866bbd0f94afb5fb64a6395aef24ea2196700be3d893bcf6cc86223a5073577875e451aed75724e
+DIST boto3-1.4.6.tar.gz 217110 SHA256 457ac301b28addece2914da6fc4207146a0f4393f8e94888315b1611a4f43270 SHA512 194be548af8b11fa14721a23934a811717c6e8a70178682c392626aaf97fd5738c7aeb83366d7951c2b69d63acc83f26059e3f0cb0b26f5d412ba606e02315e7 WHIRLPOOL 842a3f65f4a733f3e66cf66fdf45d4ca0a83d9d01164a5ed784f2a3328229471487f1ec67c82a7732d9196907859046b7246586fae64ecec4e2ec4565fe70fa9
+DIST boto3-1.4.7.tar.gz 217171 SHA256 b4952103bb0a1e0d9c1d3a06f51674bb2f1b3914cd667070fede5662ff5f381f SHA512 db87ce873ba3d7d12c9e77ce329db3fab25328407ec5ba7fa1e7c94351285a84a3baf0f71721ee6858761743736497ec35b03e8d5e9a59da8daa176596f1a1a3 WHIRLPOOL 2e2a79aaf5cb5525c1b15348baeb8001795ca08f1a932cc8f9874eda41e3527c4887e0e1a67d42e9e30cb703eff468d380d921fadf514d91983629854158f32c
 EBUILD boto3-1.3.1.ebuild 1440 SHA256 4fa2e0db3fe091f69320d7c04ce10a141daf47c14ac45bf647900869fb3a8514 SHA512 db1347d961624cb0ad838d7bf23f1d54ad9b7743c0e75b203c0d32c25689eeedbef9c400f04d5b7e1759ffebdc9d3304cdbf479b5ef3be947f819173ae8154e8 WHIRLPOOL 6cd84dbd47f4725a30342c99b5c0e4918189558e6f9f8c8de55b4151d53ae09f9293a6f571eb2eb0159c9b48f97898fc37a1e48672c646f12fd55e06c457cf60
 EBUILD boto3-1.4.0.ebuild 1372 SHA256 bcb68a53ef3fc481b72f4242c5abefd2a09adffb75d41fb9f39d7f8243cd32ef SHA512 8cb149b97b7acf75c8543ef8969b8d82fec5a4b4b2cc624e179fd5fd0f08bb2db6084ff78bb945137a9fe3a7580f4d42305786fabca9454472f5926548e6c1c9 WHIRLPOOL 0fb57461b6683c9539b7d09dff2c9c857d3355a05e6ff492a327f4d136836fe96ece26636c7e4c47a16658b36a7c8f2688befb6f4d70903a0f12621113b73535
 EBUILD boto3-1.4.1.ebuild 1372 SHA256 bcb68a53ef3fc481b72f4242c5abefd2a09adffb75d41fb9f39d7f8243cd32ef SHA512 8cb149b97b7acf75c8543ef8969b8d82fec5a4b4b2cc624e179fd5fd0f08bb2db6084ff78bb945137a9fe3a7580f4d42305786fabca9454472f5926548e6c1c9 WHIRLPOOL 0fb57461b6683c9539b7d09dff2c9c857d3355a05e6ff492a327f4d136836fe96ece26636c7e4c47a16658b36a7c8f2688befb6f4d70903a0f12621113b73535
 EBUILD boto3-1.4.4.ebuild 1413 SHA256 d96efb2b2a1c2ff43983c70cc8eb904c86a165685cc079f7521cd62d8299cd82 SHA512 4dfd9bffdc5e5be744fc636748be1f67f0ca75931960f4f23217f2fe0e96976573a24d3d8fb7dbb043e549f27c42a4a3d08fd879dd6af5707e1fa5ec184f6881 WHIRLPOOL 34b6f04a3380c6f2d7165ce4e6370302dfd2dfbf8845b0a2bc22988878311bc0672d894f1968f931c68ffb183861c681a454d93a14094e4aea579a08aa9d2939
+EBUILD boto3-1.4.6.ebuild 1415 SHA256 a3a9ce97fc32cf8674c0522cb5edf3d29923b8c88ee53c9749c535e02f3116bf SHA512 e68589c48a61e2a27a3ce83aaf6daa1707585f4846cbef34381be505b26ae8c63eef8c4574f8de5c2cf78161b7f19c704a03a382ca167b360403fde6cf43bdc3 WHIRLPOOL 471ce738e14be82356c39acbe42b5f4368abecf9a40a9a6a36c664ee8dea5eed17477d8764949fb44ee0a781b1f4cdaad1b20e548b4d2899c109cf5025a2693a
+EBUILD boto3-1.4.7.ebuild 1415 SHA256 fa3bbab86259ee9853474b129601cd72b71aef4dfe0203ed4e040b948bc282b3 SHA512 5251623dc50e535c84ca8c764371e2990fe005739ef0bf07327b660e819939e1086b2f8afd115e9d21289f0d770ff4e0b7cb787eb192cbcb35704a5762704b68 WHIRLPOOL 67165717c0391316e00407112d560bb3b9b96bd662074ecf57cecf94f091b5798ed6d9deab6c2889e6d7379b8d652dd523f5ed90236a49d4f3b19c82abfa0283
 MISC ChangeLog 4860 SHA256 02976b35d1af10396e395af30890f1f2b86108b0a89db760ca9e1bcbab56acbb SHA512 c3bafc46ba2dd2d7a99a886a29299c95c98d5137224c51851571ee857a287caa1e9074ed633beacb37e2bf5934598475692cf954866ed7d35eb02cae037075ef WHIRLPOOL ee447d852385e9fe6278804c7d51b64fa9ebefd75b94d534ac2b8a449b6e90d87039fa59796f33b46f2d5940c788e97f18faa4a064c59b5d3376d2e27bb6f0bb
 MISC ChangeLog-2015 342 SHA256 5dfd8461e6063ffa6ec58951764580c8b0f60f141a4a6af67edb963248d95ef7 SHA512 2ab699aaaf13ad684c60f36042e139757ae6d547ad46282a2c4435448fef9f7f56427ead687c5e904a8373dc5b8bf2c2fbae1c8df8ca6460d50841b444bf1f97 WHIRLPOOL a2bc6090846e26bc92443834a3d1995a85ca1a267cdb5c99de839c0c7b0e35ebddb0a4cdce3d091743606398f2cf11630d67747be434d02c40f87096126bc89d
-MISC metadata.xml 321 SHA256 bae86fd8bc5622bea90c01eb1e558b0489e01ff5e00f0417edd3d0c2984372ab SHA512 49dc710da53307ae5c4d7680ee417c52937587fedb2e0f8d23a88ad55b7aed030db1079db16625efcc28f79303c324b94c749a6edbdc37893c2a9bb04935840f WHIRLPOOL a269d8bef3f279bb5b38a340b5053b87d0d43a1a8091175f235fa6bdff93569e4302bd71901f434c734bf8454c2a4087f530d02f351b165c1e8c308d67e2ad67
+MISC metadata.xml 433 SHA256 cd0fa4000f58a358853a2b956317dbc034657ee6f96a03d87a0d8d0dc4c62c0e SHA512 b85e30e557a6bc3432c4bfb53e882f6652de9a68ec1e2ca157bfe27234e2c79f9a68195234e0dc631e3ee19a5331e547af40d09ea1d3acd095bf35eb108af3d5 WHIRLPOOL c990ff7cb760ee3b6264d561298c5213e2e3624659413a244bf50f4924f7e9c99abd71525e5c59d4b0ce33f7da56a108aa03c9715bb2ba515a330ac33e37107c
diff --git a/dev-python/boto3/boto3-1.4.6.ebuild b/dev-python/boto3/boto3-1.4.6.ebuild
new file mode 100644
index 000000000000..aecf34edcf5a
--- /dev/null
+++ b/dev-python/boto3/boto3-1.4.6.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+CDEPEND="
+	>=dev-python/botocore-1.6.0[${PYTHON_USEDEP}]
+	<dev-python/botocore-1.7.0[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	<dev-python/jmespath-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.1.10[${PYTHON_USEDEP}]
+	<dev-python/s3transfer-0.2.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/guzzle_sphinx_theme-0.7.10[${PYTHON_USEDEP}]
+		<dev-python/guzzle_sphinx_theme-0.8[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.3[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.7[${PYTHON_USEDEP}]
+	)
+	test? (
+		${CDEPEND}
+		~dev-python/mock-1.3.0[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="${CDEPEND}"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/boto3/boto3-1.4.7.ebuild b/dev-python/boto3/boto3-1.4.7.ebuild
new file mode 100644
index 000000000000..8e084dd56f4f
--- /dev/null
+++ b/dev-python/boto3/boto3-1.4.7.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+CDEPEND="
+	>=dev-python/botocore-1.7.0[${PYTHON_USEDEP}]
+	<dev-python/botocore-1.8.0[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	<dev-python/jmespath-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.1.10[${PYTHON_USEDEP}]
+	<dev-python/s3transfer-0.2.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/guzzle_sphinx_theme-0.7.10[${PYTHON_USEDEP}]
+		<dev-python/guzzle_sphinx_theme-0.8[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.3[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.7[${PYTHON_USEDEP}]
+	)
+	test? (
+		${CDEPEND}
+		~dev-python/mock-1.3.0[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="${CDEPEND}"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/boto3/metadata.xml b/dev-python/boto3/metadata.xml
index ae5159bc61bf..5c082b3905bb 100644
--- a/dev-python/boto3/metadata.xml
+++ b/dev-python/boto3/metadata.xml
@@ -5,6 +5,10 @@
 		<email>alunduil@gentoo.org</email>
 		<name>Alex Brandt</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>andrey_utkin@gentoo.org</email>
+		<name>Andrey Utkin</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">boto/boto3</remote-id>
 	</upstream>
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 18bee4347a13..bb6838583fce 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -4,12 +4,18 @@ DIST botocore-1.4.65.tar.gz 2946032 SHA256 9b4e2d54ad89294e3866888b9711b58ad9923
 DIST botocore-1.4.93.tar.gz 3306809 SHA256 3954b0c3bf67473181e9f6e3347154ba8ac6e66fab9bc07a25bb9e4e165d9726 SHA512 ce4ac735e5413932d5545b6319f63e6080cee8f4e511e3886bd47a6785bf1986236eb8ed48248836b29fc433a015807fae8dfbc3b6dc1f7e94088e380c7b0332 WHIRLPOOL fd29a6ad15ddd8a7dfe6cffafc72b2a83b7b45304bd122d7ddde26f4bb529805396bad3dd261fefc977fac4c004991b03553792a11fa78dc1197107a1892182e
 DIST botocore-1.5.52.tar.gz 3606403 SHA256 bd232581d8720f87d49d14c134b2f563dbb7c4fa887467720bff76e08858a01b SHA512 f8a1ed1b768cbe26e9fc75a81b08dbb012b37576342452acde21f48e9c314093ce1dd7ec8eabcc8c8a14e2209d809450bd4798eddb55215dcc387130243d8bf4 WHIRLPOOL 0c719fb1e7be68f59a76e7394615b836df9ebcf9ac1dda7c2fee1ff468437f6e33d34f5fd2b809680158bf32f0eebf63c8a90a10ed90883354347a8cc758280b
 DIST botocore-1.5.90.tar.gz 3707524 SHA256 675f894c0ba91c8bb94be6954a40272e8c9d1ac9ddab2bee33acb1576fcaaedd SHA512 2a241c29c4874f632932f453954ca15469087b467ed36453db05fa219e81b6aa924aca672f01747de071091ffe6d55fa731ec124f7b47783176c79cf141dc82d WHIRLPOOL d42ec9a4d167d31edd9e65ee6a2cfa65c1ed80d8260f3fbe2fafe2e66f28d0d28f363f0b311e275589b065d2d43151381090b16d61e13aba1d4f4dac487cca35
+DIST botocore-1.5.95.tar.gz 3712795 SHA256 26917b37fe993dc23dd1eb69c3208500fd057dc8b2e18b7c97bb26ae08ce7aa8 SHA512 872fac30476e3f05fa065ea2963b2221046d0eb7cd91267b0f9209fcd05b81b29eba99c439ad220a81c98a880b4087d961667d8a27c560cd9ba4481b8bc703c9 WHIRLPOOL cff1d6eb9c8a1d42c639da312500d1c23fae2c4c90afbd06c96345a20d6b3ef3f439f9d13f56962d208c4f6ae52fc27e3b48dcf276475e1933209ac5c9b8c0c4
+DIST botocore-1.6.8.tar.gz 3769332 SHA256 2e679f2327b1064dc74b5a62ce71a725add031b8e539668ce666da3a857a1b63 SHA512 2565127620793eb94ef817a4295af3484aa7f30268fa915d37b82c5dc240ae2d74eea60bf68bdaf3d180648ff4225455e9453d75454d5a6d5ffadd19f2a2bd05 WHIRLPOOL 28f10e78fe29e6cec7e40ab837b4b49ce2b53d2d40788877da37a0f31ca89401e04a31d9341a8a48993634f413ebcf8d7655a34faf67f63984767cca172c245c
+DIST botocore-1.7.39.tar.gz 3838231 SHA256 28168c86cdb8847eaa0d53551ce9cbcac83f0d59d225c4281f43515b7dd1980d SHA512 0a6031315356f43e00ba5661020890478a589f0524bacd22fd24a9f8da147761f70d7b7fae9aab887301e78a392bc12dc7067174af9a07aac346d11a4cec9a22 WHIRLPOOL f3fc9a47b413e869b6cdba94cbf2ce99f2d39259a23e7aada6b2cbbe4a1f95e1136cd4cbf27b3d541c9edd383b53a88d44aeea6b92f9bedaefb71287b75a0754
 EBUILD botocore-1.4.60.ebuild 1297 SHA256 6f2e65401af74097b89ebd7a8661a53f7cb6c258d84c2e51860e20091a7ca8ca SHA512 d5594eb19f14c93b9abe323629c0f1befe84e51070f46e311ec7c7fe9f71d1f44b24d07766f959d04dc997890c93648925e07043e3ee3481ef29089f628c4f85 WHIRLPOOL 72d62985323a85c11a0bef5b9f9055c19fb81255d7b959c912d9b3b4e88eeb944d4ac789e6b00a052fa41d5f565d61b112c72eb448bb22da4a06568e177ea144
 EBUILD botocore-1.4.62.ebuild 1297 SHA256 6f2e65401af74097b89ebd7a8661a53f7cb6c258d84c2e51860e20091a7ca8ca SHA512 d5594eb19f14c93b9abe323629c0f1befe84e51070f46e311ec7c7fe9f71d1f44b24d07766f959d04dc997890c93648925e07043e3ee3481ef29089f628c4f85 WHIRLPOOL 72d62985323a85c11a0bef5b9f9055c19fb81255d7b959c912d9b3b4e88eeb944d4ac789e6b00a052fa41d5f565d61b112c72eb448bb22da4a06568e177ea144
 EBUILD botocore-1.4.65.ebuild 1297 SHA256 6f2e65401af74097b89ebd7a8661a53f7cb6c258d84c2e51860e20091a7ca8ca SHA512 d5594eb19f14c93b9abe323629c0f1befe84e51070f46e311ec7c7fe9f71d1f44b24d07766f959d04dc997890c93648925e07043e3ee3481ef29089f628c4f85 WHIRLPOOL 72d62985323a85c11a0bef5b9f9055c19fb81255d7b959c912d9b3b4e88eeb944d4ac789e6b00a052fa41d5f565d61b112c72eb448bb22da4a06568e177ea144
 EBUILD botocore-1.4.93.ebuild 1310 SHA256 023c230a2cd4a80a83811c9c038642fd9bc7a05edbde42dd557fac9f28104ad6 SHA512 095a3b695c6e5d0fdd4ab7068804eb0beed585f1881992afea50123288493f0476b3b8dad18e9e1d6277b37232aa5ca55404e40e15537ddd57b6a509af7e543d WHIRLPOOL e7ef9bf63ca3260d839865153c76793bac1f2330527dd9139a800f117174b60140006d1aaedf0c283c2cc3ff301ad1c90cd72dcb2952c7cd2587f0445f0daee1
 EBUILD botocore-1.5.52.ebuild 1310 SHA256 023c230a2cd4a80a83811c9c038642fd9bc7a05edbde42dd557fac9f28104ad6 SHA512 095a3b695c6e5d0fdd4ab7068804eb0beed585f1881992afea50123288493f0476b3b8dad18e9e1d6277b37232aa5ca55404e40e15537ddd57b6a509af7e543d WHIRLPOOL e7ef9bf63ca3260d839865153c76793bac1f2330527dd9139a800f117174b60140006d1aaedf0c283c2cc3ff301ad1c90cd72dcb2952c7cd2587f0445f0daee1
 EBUILD botocore-1.5.90.ebuild 1344 SHA256 4b09109964c05f1fd36fa5501f77133dc020ff7fcc1004180419d1c8f2191bdb SHA512 dd834f7e2462a374ff49fa07398679152e02e01f61432332f22b9275e239577481573ccebc79db7355281b66deb3445c97d2f88187784a6328da39b07b9375a2 WHIRLPOOL 925c09e6f5039eb709171ffde518cda5635785fc7c4350c775fee8ae30a71a6f58e1685dcd3a00580250e71843e4bcaf1c3ee24ae686649475f67d30ac9204d3
+EBUILD botocore-1.5.95.ebuild 1346 SHA256 6ce0e76ff0e4f5e7c2bddc24fc3d4235e67727382f6e1157c4ece4a07e0ba59f SHA512 1957322e6cc847171a101ab2fdc90464e7197e720b649b6b408d15eac44a5b03a24b8ff1ff43da50d526e438f3846d029a210c53a05c32dd84d5d9ad3c3bf03f WHIRLPOOL 2ac7121bce6f3e4d365e3510249d03d1485b7ff408b7f3599006be7d3afc5453b13cae641e10e15cda57e04b3b6046ff353b21351ad43734d0b939a61bf61485
+EBUILD botocore-1.6.8.ebuild 1346 SHA256 6ce0e76ff0e4f5e7c2bddc24fc3d4235e67727382f6e1157c4ece4a07e0ba59f SHA512 1957322e6cc847171a101ab2fdc90464e7197e720b649b6b408d15eac44a5b03a24b8ff1ff43da50d526e438f3846d029a210c53a05c32dd84d5d9ad3c3bf03f WHIRLPOOL 2ac7121bce6f3e4d365e3510249d03d1485b7ff408b7f3599006be7d3afc5453b13cae641e10e15cda57e04b3b6046ff353b21351ad43734d0b939a61bf61485
+EBUILD botocore-1.7.39.ebuild 1346 SHA256 6ce0e76ff0e4f5e7c2bddc24fc3d4235e67727382f6e1157c4ece4a07e0ba59f SHA512 1957322e6cc847171a101ab2fdc90464e7197e720b649b6b408d15eac44a5b03a24b8ff1ff43da50d526e438f3846d029a210c53a05c32dd84d5d9ad3c3bf03f WHIRLPOOL 2ac7121bce6f3e4d365e3510249d03d1485b7ff408b7f3599006be7d3afc5453b13cae641e10e15cda57e04b3b6046ff353b21351ad43734d0b939a61bf61485
 MISC ChangeLog 15229 SHA256 ad4ef5f6ea2181365fbe8d679dbcd2734e77d25d1fbaa3402a146add5500f017 SHA512 2d23d22a0016dd8afe1f7d3b8639c5ffe1ee651a7c46e7749425bdf0d5cf0a9e3dcfd8b20a30ad9ca53cda5aef0c5714f0a90db67c08e8b7c773ba4f32923455 WHIRLPOOL 7700bbf842bb82b2efec114ec1cdf5977e577123110589b592615e17b36f9b419f89db2952b253fbb7e7deaf42f5624daf64c46dc818aa560c59fbc0a16015b0
 MISC ChangeLog-2015 479 SHA256 3e53c9fa4c06129b6bcab3ffdbc61c3a57b2efe4e07d3b4ecb798cacd4d72f2a SHA512 2fa2e5d33cef27149e736e44651b86b46c94c1b8df8b8c12f89bc4a7ae8df6d14e7f3556e1083210bb0e93be5298d1906eb065b6aeb39ece66f2fbdb227a8597 WHIRLPOOL f7472f145114fc9323e8a8c3064cd5efe78020aa7f6812620495d4642e3835e6ddd893c49d4a38f26768b53aab9bb49ad3068f03ef973bc73b09621aada99815
-MISC metadata.xml 370 SHA256 f02aa751bdf1340a1fd7d97fe1e5576a1d5526a7f46372cc0d162034a3a3dd2a SHA512 a5f40ad748a356a1f97cadb153c81a3bd1cf1e31b0e3cd98ff808ae1f4be1a7a9425e89340ad4fb4a5de8969be30d9c8c39b518ad50d68d1f757373d80b91abc WHIRLPOOL a2ac4006829209701159a69845ea5a1df9294535f816362d51c8766bad5fdd78c7bc57e53cfd6ebcd033f0065deecaffcef5ddefaf9bf7c445d6812e6215f367
+MISC metadata.xml 482 SHA256 14823f539a28339c254915604d3177b337f838bb6cf2d84f1037a7c616e92ac2 SHA512 bd927bf8ede2a9746b2d91f84e98d9678641662a23a7d43fbc804b4b54fe4adde8efe742d129cbc35e7d33f05dbc5e66d9d03b4268b11902c74aff8be6da9a59 WHIRLPOOL a56ab81caf0223d4a3408f206d75f31249846f31415edbe1bdc0603cbf4756a9973ab012030276d48ff6ecfa97c8afa7e8baa001e79cf94e98dff4dd77613319
diff --git a/dev-python/botocore/botocore-1.5.95.ebuild b/dev-python/botocore/botocore-1.5.95.ebuild
new file mode 100644
index 000000000000..f4df2f35b9af
--- /dev/null
+++ b/dev-python/botocore/botocore-1.5.95.ebuild
@@ -0,0 +1,53 @@
+# 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="Low-level, data-driven core of boto 3."
+HOMEPAGE="https://github.com/boto/botocore"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+CDEPEND="
+	>=dev-python/docutils-0.10[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	<dev-python/jmespath-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
+	<dev-python/python-dateutil-3.0.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/guzzle_sphinx_theme-0.7.10[${PYTHON_USEDEP}]
+		<dev-python/guzzle_sphinx_theme-0.8[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.3[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.7[${PYTHON_USEDEP}]
+	)
+	test? (
+		${CDEPEND}
+		~dev-python/mock-1.3.0[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="${CDEPEND}"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	nosetests -v tests/unit || 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/botocore/botocore-1.6.8.ebuild b/dev-python/botocore/botocore-1.6.8.ebuild
new file mode 100644
index 000000000000..f4df2f35b9af
--- /dev/null
+++ b/dev-python/botocore/botocore-1.6.8.ebuild
@@ -0,0 +1,53 @@
+# 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="Low-level, data-driven core of boto 3."
+HOMEPAGE="https://github.com/boto/botocore"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+CDEPEND="
+	>=dev-python/docutils-0.10[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	<dev-python/jmespath-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
+	<dev-python/python-dateutil-3.0.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/guzzle_sphinx_theme-0.7.10[${PYTHON_USEDEP}]
+		<dev-python/guzzle_sphinx_theme-0.8[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.3[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.7[${PYTHON_USEDEP}]
+	)
+	test? (
+		${CDEPEND}
+		~dev-python/mock-1.3.0[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="${CDEPEND}"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	nosetests -v tests/unit || 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/botocore/botocore-1.7.39.ebuild b/dev-python/botocore/botocore-1.7.39.ebuild
new file mode 100644
index 000000000000..f4df2f35b9af
--- /dev/null
+++ b/dev-python/botocore/botocore-1.7.39.ebuild
@@ -0,0 +1,53 @@
+# 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="Low-level, data-driven core of boto 3."
+HOMEPAGE="https://github.com/boto/botocore"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+CDEPEND="
+	>=dev-python/docutils-0.10[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	<dev-python/jmespath-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
+	<dev-python/python-dateutil-3.0.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/guzzle_sphinx_theme-0.7.10[${PYTHON_USEDEP}]
+		<dev-python/guzzle_sphinx_theme-0.8[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.3[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.7[${PYTHON_USEDEP}]
+	)
+	test? (
+		${CDEPEND}
+		~dev-python/mock-1.3.0[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="${CDEPEND}"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	nosetests -v tests/unit || 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/botocore/metadata.xml b/dev-python/botocore/metadata.xml
index fcdd4a519ecd..5a6cec5f67ff 100644
--- a/dev-python/botocore/metadata.xml
+++ b/dev-python/botocore/metadata.xml
@@ -5,6 +5,10 @@
 		<email>alunduil@gentoo.org</email>
 		<name>Alex Brandt</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>andrey_utkin@gentoo.org</email>
+		<name>Andrey Utkin</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">boto/botocore</remote-id>
 		<remote-id type="pypi">botocore</remote-id>
diff --git a/dev-python/catkin_pkg/Manifest b/dev-python/catkin_pkg/Manifest
index 90c308f38125..a2c8e0758abf 100644
--- a/dev-python/catkin_pkg/Manifest
+++ b/dev-python/catkin_pkg/Manifest
@@ -4,8 +4,10 @@ AUX infinite_loop2.patch 1274 SHA256 545df24d04998671cd82ba130f8a1d69cf2576a3515
 AUX ros_packages.patch 621 SHA256 950e261d19b15444034c1984e14878eb11ee9df5d6d6291d2aca2dd8347dd123 SHA512 446c19801306f2f0116a4bdfe228ddc192a84458fe0803bd5ce9b99d58620bf2c3bf31bcc3f078a4c18281f64f7e68cbfb711d683959e71457b05b7aa63a6ecf WHIRLPOOL 4052d22449e7f8ec48946a030c15a998fb724c2b25de727235e673618d4616edaa0d184c1e59edc291f3deac613bf3b632c61cd113ccbdab26aa860f8170f0d9
 DIST catkin_pkg-0.3.6-gh.tar.gz 47637 SHA256 b05797352a89986a6c637ef33685a8cd004a8e5138b553f42a82065bc02f808b SHA512 191ed93271c9e592040110c92a572570fa8dec328ae3203dfea9e1fb6a1cb906350c436d3a9416d6826e57a1d59ef42200797d6a5bdc390aa77d352f716e0cc8 WHIRLPOOL 83f73ddaad17b5cfef4945a4d0c900855586877c47962b903e68f821772f4281f7658d82c4adfdf8067889e82f1264d843f1c4f336876ac8afa1bdfe48edeb37
 DIST catkin_pkg-0.3.8-gh.tar.gz 48281 SHA256 5d478ca6df90d7360a3ee4ba14771e64bc4692620cf3909eff838d886f190ae3 SHA512 3e20a8ab807158d6fb6a1c32737747db373824eeb085a6af2fc586c08e9445b40f118f56c3765512b5e6cfe25e2f875bea4d408cbe61a994cebbc3fd1342c024 WHIRLPOOL 0921c0df706c692ab79696fa7d703840dd75a0fbe2d6f45337869994be2e50a8eaff4dd43582021ad3d8082d4a541ea74b45f85128819731a04db7c665869be2
+DIST catkin_pkg-0.3.9-gh.tar.gz 48290 SHA256 29e53d4ab57a9e13bd5909611d447a4f8a22217f8e4fad61723ec8663939eb7d SHA512 39c7dbd7b3bb7d0fd7f37e6931e5de8c76c28ca329db5783d1cf0b01e9a7f58079c45434d937a8edcf29cbdebdcfb4b18480508d688dcefdf58c218838af65c8 WHIRLPOOL 13c0c5e50eac01f573ea812ea50289c835e0eb1c1a09a9e017d24fd246684d8c735da03566cf07c7becdf71fcb144055c65aacc70a9ca856974a1c66f0fc2012
 EBUILD catkin_pkg-0.3.6.ebuild 1106 SHA256 bcc9ad16fdf1f91c3d3012202a17eba9b7333a293da9d1e293182c181310d7bb SHA512 98685de96bb42b0c36173fb4a03d2a28709469a9d63a6923beb1caf14e07fcd6e881511e79bb5f453558975b4fbe5d284d1ed2e8c965da4ab4beb3e97c54aef6 WHIRLPOOL 6df237d8c380e2c5f8fa545adb50f1b9fba07a41f868f98abf59d5c56b3ca4de65fff4924a150366fde9a5fe6413cb5ac0fdc8f300af97a27c43e7f40d841947
 EBUILD catkin_pkg-0.3.8.ebuild 1106 SHA256 bcc9ad16fdf1f91c3d3012202a17eba9b7333a293da9d1e293182c181310d7bb SHA512 98685de96bb42b0c36173fb4a03d2a28709469a9d63a6923beb1caf14e07fcd6e881511e79bb5f453558975b4fbe5d284d1ed2e8c965da4ab4beb3e97c54aef6 WHIRLPOOL 6df237d8c380e2c5f8fa545adb50f1b9fba07a41f868f98abf59d5c56b3ca4de65fff4924a150366fde9a5fe6413cb5ac0fdc8f300af97a27c43e7f40d841947
+EBUILD catkin_pkg-0.3.9.ebuild 1106 SHA256 bcc9ad16fdf1f91c3d3012202a17eba9b7333a293da9d1e293182c181310d7bb SHA512 98685de96bb42b0c36173fb4a03d2a28709469a9d63a6923beb1caf14e07fcd6e881511e79bb5f453558975b4fbe5d284d1ed2e8c965da4ab4beb3e97c54aef6 WHIRLPOOL 6df237d8c380e2c5f8fa545adb50f1b9fba07a41f868f98abf59d5c56b3ca4de65fff4924a150366fde9a5fe6413cb5ac0fdc8f300af97a27c43e7f40d841947
 EBUILD catkin_pkg-9999.ebuild 1106 SHA256 bcc9ad16fdf1f91c3d3012202a17eba9b7333a293da9d1e293182c181310d7bb SHA512 98685de96bb42b0c36173fb4a03d2a28709469a9d63a6923beb1caf14e07fcd6e881511e79bb5f453558975b4fbe5d284d1ed2e8c965da4ab4beb3e97c54aef6 WHIRLPOOL 6df237d8c380e2c5f8fa545adb50f1b9fba07a41f868f98abf59d5c56b3ca4de65fff4924a150366fde9a5fe6413cb5ac0fdc8f300af97a27c43e7f40d841947
 MISC ChangeLog 2147 SHA256 04a5fa7473218dc80a59d3d87d86663506564c00ca736c2a00be0756a36936c5 SHA512 1312dcb18e7ae5c84a8654fa8e336b34baa98492ce58fe9c790daff4522bc303ce4661e3561cc175790c1cc66dfb94cd11ff622f421d4c81d2e9e2c2f158dd16 WHIRLPOOL 1da74529ea3775f1eeed4cc6bf764777e95aab26acfa86e2e110b66d822e61b725720bf455495194eea8b90b31ca95bf9c49461fdb58882f1cf08486d470ca21
 MISC metadata.xml 343 SHA256 8e283f2089b6cb4306afba398198483765592713058d3ecffcd44157015973ee SHA512 3ca5d78edb7c7dd2283944af93b7a8b6b3bb176ffa9e0df31881c8b5d66a4abc7e080e11f25f285e0b8735b16ed1598cf032a37d62b7fbb0b5adb3296e9b5862 WHIRLPOOL 99cc69cbf235b08f27c40b2409ea3216a71d1cf9d663b5f3683d2e38e0828fd04468886d99249b0722a98bef55d67252d4cfe1ab49f6286afe7cdda136742f52
diff --git a/dev-python/catkin_pkg/catkin_pkg-0.3.9.ebuild b/dev-python/catkin_pkg/catkin_pkg-0.3.9.ebuild
new file mode 100644
index 000000000000..0967bd6ff8e6
--- /dev/null
+++ b/dev-python/catkin_pkg/catkin_pkg-0.3.9.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/ros-infrastructure/catkin_pkg"
+fi
+
+inherit ${SCM} distutils-r1
+
+DESCRIPTION="Standalone Python library for the catkin package system"
+HOMEPAGE="http://wiki.ros.org/catkin_pkg"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/ros-infrastructure/catkin_pkg/archive/${PV}.tar.gz -> ${P}-gh.tar.gz"
+	KEYWORDS="~amd64 ~arm"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-python/mock[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] )
+"
+PATCHES=(
+	"${FILESDIR}/catkin_prefix.patch"
+	"${FILESDIR}/argparse.patch"
+	"${FILESDIR}/ros_packages.patch"
+	"${FILESDIR}/infinite_loop2.patch"
+)
+
+python_test() {
+	nosetests -s --tests test || die
+}
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index eaeb1cc50efd..f7fafbe53fec 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -3,5 +3,5 @@ DIST cfe-5.0.0.src.tar.xz 11437024 SHA256 019f23c2192df793ac746595e94a403908749f
 EBUILD clang-python-4.0.1.ebuild 864 SHA256 17b2d7993fa0e03dcc678c9813e2e67a14b49ab9b6b96846dc797809e1c384b4 SHA512 d2900dfa55a69965e146800f097f8be256d022aca8d85f54db205f75b30cf72015d27c4e8f4981725d50c7a1c2a14c15454f009b2d8a3636103d6d133b0a2324 WHIRLPOOL f773ad78a27d8b899d5c25b9280bb9c33b5f3b39645aad364becf7bda4794369ad866e37859ae83aa20bcf2a682b6c8cd3bb2b14dbeb33ed7feb3e5b774c1fdd
 EBUILD clang-python-5.0.0.ebuild 1028 SHA256 4c25f18e595adbb7031d2b89cf7d98a59806cc228c8a1d204a411daae3bb5a03 SHA512 7c5a20034ae0deb3820692f651a8a3a69741b00b71f8465656a59fc2ad17009555420dddb8105d2353ffbfdd1a32f4f377ca412fbe3c4f15a0e9b0e1d90b29eb WHIRLPOOL b625cb854b1e5a3e03db98e5b53b04a031934d6ae12d592d14c6ac28dc88fe32cad6f63d44dc362ebc3168b1158302e53af87071c9e1c901556daac4c302ac6b
 EBUILD clang-python-5.0.9999.ebuild 900 SHA256 315c3e1cfba2b384853cbf4e0e97070bfdc437cfdb0c73c377046693a1b5916f SHA512 589aabd4f0f8e8adaa54b010c153246bbbd95c0a357f009d94f9127a6a4cdb73e3cd8d2c254119eb3336ab386bc0552dbf1bdb560492cf1086cf2c0a40bc8a05 WHIRLPOOL ccc8c8644a1ae3003c96e8f0cef5b55668312a669b38e41787b771b111f291e10264cd7b4aaea7bade2df55a8dd86fbb71ba309aa772c1cdf3d8d5b37a960aa5
-EBUILD clang-python-9999.ebuild 875 SHA256 5bd7c93dab13d30f1e419a08c1aba8c35b89d73c5bb59f619d4fc879f7b829f6 SHA512 629ae85fcf4e451fec077d5f42aad97409e28153e038c53da57edc98d0d93840525cd4d57ec76b51dd7069e189978cc0bbbb1fe0d0f166abd83a1bdb75f7cfdf WHIRLPOOL 6e106b5dd241b4a192853e71180affd26f0663c45d66ccf1414cfe3cba27d614355b7ff6a87026713cb51dab2fa31a01cc0faa734f98e05943b981584c8fd0dd
+EBUILD clang-python-9999.ebuild 889 SHA256 bc8aaae237f284e53047359b1f971227f9b16cc931c20099d3666845af9f2f7d SHA512 23ac21ac5e0023aa9eda71f4e686eb818078c26eca56f8431db0ff519b5661856ade2c40ac0c7318ada7e027e9ca90b0b8bfc1a29086895ef5e6f41c51bacaef WHIRLPOOL 8e3781f8e2ac45cf5345a04b7671d9db84b54a8dccd2f68087222e177dbd73c434b6d062e38d7df30b9e086f1688f8ba46aa6ef24199abf9e4c3f98ce50ce592
 MISC metadata.xml 216 SHA256 e94ba81dd2791908508a3993afdebf723cc617314c53c273b9bcca15a9c48327 SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5 WHIRLPOOL 29145f5721e079e0548c5ef22424c65e6a5b2bfc4428918e923fcfdfc37e9b8749fb63e3c2eb5773c17fab276f7513dd66e326b906f1848911dceba7ae4b419a
diff --git a/dev-python/clang-python/clang-python-9999.ebuild b/dev-python/clang-python/clang-python-9999.ebuild
index dbdb74a06f05..9e661ff1a4b7 100644
--- a/dev-python/clang-python/clang-python-9999.ebuild
+++ b/dev-python/clang-python/clang-python-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit git-r3 python-r1
 
 DESCRIPTION="Python bindings for sys-devel/clang"
diff --git a/dev-python/cli_helpers/Manifest b/dev-python/cli_helpers/Manifest
index 4fdc27d479e3..1426e3d7d6a0 100644
--- a/dev-python/cli_helpers/Manifest
+++ b/dev-python/cli_helpers/Manifest
@@ -1,4 +1,6 @@
 DIST cli_helpers-0.2.0.tar.gz 33855 SHA256 cbaeaf5da217d5cbc53d7750aaec75eab14410510c3c4afefc2d809015af4fab SHA512 7dfa9791f472ccba3d49d0e87daf859257e74349cfbd8920a624f3e8d6905d8c8b7fa7be70eda97091963e548fa16dfbb1171e198cbbaa9d7810bff2321ebe54 WHIRLPOOL 8c73ff8f3fe4f248bd90319519928ecf76582a69d5f68b7cee4c15cf2deefbafac612107602af55d83362cb35bd18c4a015aca9045df367dd035ea92f1b1e0f5
+DIST cli_helpers-1.0.0.tar.gz 23269 SHA256 eb584402ca198c4e442fd7e80d586ab361a25f613be8c7427c741d8a41c87b6e SHA512 8137b081cfe3d226c63cc7c17165f884a42147ea184d11a1e0ee5805f2d22bce37ded580a0c15566bcb057df4c39f2685595d74b2e21d46932e2e635f77eec68 WHIRLPOOL 5d003965be32ea79172a665d8a11eed2887f2492d5407e6b8224519e13c02c59bdb9845f45e4eece5bbc1659ace8e982a1dc92bf65a054fc19381ed2ad6d1154
 EBUILD cli_helpers-0.2.0.ebuild 553 SHA256 948dff95608ec67dd1c24e8c7ad138f81df5af5f67e71ff2c6701352ee893fe6 SHA512 a89d1c2935ecb3ca96757e2c553e1db960af6452a214245ff426335a134e66bc082831d2d05af3df7f096f918969b472255eb42185f087e9ce5a67737e51d65c WHIRLPOOL d4cbd6584a22b27f29636fd133337076a93c78f24c082cc7ae6202615f8bba1ee352b40638e9c3b1b710fa7dfa0bfc8b311a18f20a4386f9102c303d34a40b2c
+EBUILD cli_helpers-1.0.0.ebuild 606 SHA256 89654ea96296ed14c98e7cf411af758d380bae4f205e30e55bd495e36a8b169e SHA512 d8f0abe5209659609ada8ec8c9bf1a868f87648cda9a4f0d553b724e8d76ce39ab32ce68a289ea0e770e69b6b536b1289e08745a768b74c7f51357e53960b22d WHIRLPOOL 6049b938bd0b9e06197f01c8b1d34510eca86e380794a9ac67eddb5d1910185262d8e75e6817688cb4e089fe298ac889c97b9e3186d26ed390923ea6bfed41cf
 EBUILD cli_helpers-9999.ebuild 533 SHA256 0d00037327619fe1433bad170b913868ee1d04e4800620ca9ffc26322a2df227 SHA512 84351878f15a177bbaf1a0eccbe8c0020c494d401c6f1e233d2360a6dacf97875c01b44edb7aa9255336a737c20da5e276bfa379909e371c71b95846469cb015 WHIRLPOOL 4f342a61fc92076f21ad7d11f215eac25e21c516c0ce763731585e1cc4f4d55f1698d28faa2f97e217fae145bd62f164a79b8d173d6a55b9869e10b218e9333f
 MISC metadata.xml 322 SHA256 d4524ef56bca926d08996b7a59b54e4f92ea2b658fe09c0343733f2db112272e SHA512 ae5215f13b457aa43dc95d67bacc371292f0c8f6540dcb49633f0120232dbde7fe12479c3ff16c203b20ac96700be12c187444a768f50e319320684553509dd1 WHIRLPOOL dbf5fa6725d51a3f584dcb8d8088688ba546b7f4e6e132c50c9748c3abaf2634ea123aa3a54b5c0a71c4b5a9432ad82957892fb9ab4e72e602920a85bc585834
diff --git a/dev-python/cli_helpers/cli_helpers-1.0.0.ebuild b/dev-python/cli_helpers/cli_helpers-1.0.0.ebuild
new file mode 100644
index 000000000000..08b9d0efe190
--- /dev/null
+++ b/dev-python/cli_helpers/cli_helpers-1.0.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+inherit distutils-r1
+
+DESCRIPTION="Python helpers for common CLI tasks"
+
+HOMEPAGE="http://cli-helpers.rtfd.io/"
+SRC_URI="https://github.com/dbcli/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+	>=dev-python/tabulate-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/terminaltables-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/click/Manifest b/dev-python/click/Manifest
index 838174230a0f..f88d7f89d23f 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 1205 SHA256 55dd3fcbf17813c87566d11871a184db736fc327bdbe1184b7972aaae7fd6cef SHA512 ef027c7795056d153ae03c7058cc3e33f12ba82d8c0931d0db2d18296d03c52081ec14877867c8151746e936cb5c5e25fcdb33cae78827ca03271000fd47dfbe WHIRLPOOL a636f66e3d51e2ded3a36399ccb46f26402d883c84beed6a3188c72e803a202c0cbe4bd73d41fb8c0d19ab4caba3bf566123a90396779e6ef925224cff094a51
+EBUILD click-6.7.ebuild 1204 SHA256 990729f9e4905b34049b74c370baf02847c7b07102aef7a05557a27c692f58aa SHA512 43c2626c48e7a118d303fbd0004a219841184c4e503a20eaf9a43fbe775915cd7e8b2a07e5e8238c80234e82d65d3ac834b7c2f2d1667c0372b2128dad04eca5 WHIRLPOOL 25032735b9cf7120fc0f46d8c84f784f50962ef8361160f7f5abb11c4ad533e34ccda34b30827da7d463d9bf6d40b26b0a1e12ef8769580fe5468b36f35c6f15
 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 ab4e48c92c2a..7a06b0569c36 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/cryptography-vectors/Manifest b/dev-python/cryptography-vectors/Manifest
index 2afd5d2049f8..2fa7a0108623 100644
--- a/dev-python/cryptography-vectors/Manifest
+++ b/dev-python/cryptography-vectors/Manifest
@@ -6,6 +6,7 @@ DIST cryptography_vectors-2.0.2.tar.gz 27011827 SHA256 512f1e699dfbb41376e938e6d
 DIST cryptography_vectors-2.0.3.tar.gz 27011810 SHA256 beb831aa73663a224f4d7520483ed02da544533bb03b26ec07a5f9a0dd0941e1 SHA512 a944ca7781d47e6e81d69c32a717a19c2f461412e38f4d2b93cb02309bacdf01d766f7227a20b520faae2db20cf3dca194ed3c34363dcc70866d9ef6200f65cc WHIRLPOOL c2f35a4421fab2744daa3be10a2eedb461bd8db148b088df94fa3a473bcb4df46312a3e88dadac9df7ae1276e1fe16c38788b946cae2789c093b04ef1aea00ff
 DIST cryptography_vectors-2.1.1.tar.gz 27255936 SHA256 92f1300dd2b0a5812ca5d28003b7a11eb9eadba8c1c8c2b5150a0132d4a1fd64 SHA512 fa32a52a3e187d62c3a8eb4262795d0a9762fe8bb5d8464bc9bca7b1a56c6e19a3a14bfd0b2f56f4a048a8cb4dd05e105a90925dd4ee0697a76de3577faf88a3 WHIRLPOOL a6fdc7e45f1f514b787ff60db3d9e399fa9bba7aa128370995a885b66362f5bbf7436f81937fe3a9edba3abc8294f3b155570fe7f5674458ddd1d128ece3e98c
 DIST cryptography_vectors-2.1.2.tar.gz 27255884 SHA256 1d3829bdb7b7822cee85a829fe2e0d2455d69e242186705ef1a9d4d1ab6337df SHA512 e12c52b501e3f9974237e6b02b79e602e1c44c97928304560c9d68beca68be07acf2bb3cfe111d1cb0357ad0b9e458fec241463e63ec65fb223b65e1dbbeedaa WHIRLPOOL af1e8de02227289dc963e1e3ab8e2b9a4969c914861d3fb1d40ec636b2ddf5bc829d56906068a06877d851e40d59b0965c7e89e9c290f02580aee03b74cb888e
+DIST cryptography_vectors-2.1.3.tar.gz 27255719 SHA256 2de4957fdfd567d69e179d6e9ecf54a085387c953e20abf97a35a5c313aa3053 SHA512 09b7040bc5ef0d0c888ac3dadc325e76c8156f3b6aedba1298a07156471ce08f093ff953be413a9dde66d7db9d2c8ae22d0f94e323d961a0eb99fdb022f166ee WHIRLPOOL 693cc33ad0189c50ebc769d5c5b0a586a0738f85dab5ed8e77c1850586d344bcf127315b25e22df04de52e6a80f59ec71cef54480f198fe5878be63a16a9bbdc
 EBUILD cryptography-vectors-1.7.1.ebuild 632 SHA256 fa053ef9730cbb0999a32412179d0efef2d776236695ffdac57a385b2cb314f6 SHA512 652b04cd22ce0aedac1904acbb292355622fbee31da765b4acc2ca7f2e8de577e196acb935eb1335459d11a9fc7367c8ed448eec76538a22ac6151f5b152b27b WHIRLPOOL 9b01cae34ee2785f33740b35316de23ade23fee07f601f3830a032a5dbf84e39c91bbbea14992b4fb3f65df86aad1cc0e798729a5b46c1a738bbb3052593bf20
 EBUILD cryptography-vectors-1.7.2.ebuild 642 SHA256 1c37c9c1ce3dcf6edd4e680d4b62e3e589db298126645c2328b7b5ae2b73e7c4 SHA512 53b66c690c62327685f0dcf6e59172f284130278d03a9398aae9abddb7bee913b60592ee2131f8521e8aca75b78b19ec0e4e9ecabd3d46866ac64659839c4f8a WHIRLPOOL 4ae022051d04c53286f8e5ef103cef460d13caded51fb19eda3bf7ea5b73da74de99b401f30f3e9eeaa186f68475dd0a48d4ffb128790a15530b5b571f89806d
 EBUILD cryptography-vectors-1.8.1.ebuild 642 SHA256 1c37c9c1ce3dcf6edd4e680d4b62e3e589db298126645c2328b7b5ae2b73e7c4 SHA512 53b66c690c62327685f0dcf6e59172f284130278d03a9398aae9abddb7bee913b60592ee2131f8521e8aca75b78b19ec0e4e9ecabd3d46866ac64659839c4f8a WHIRLPOOL 4ae022051d04c53286f8e5ef103cef460d13caded51fb19eda3bf7ea5b73da74de99b401f30f3e9eeaa186f68475dd0a48d4ffb128790a15530b5b571f89806d
@@ -14,6 +15,7 @@ EBUILD cryptography-vectors-2.0.2.ebuild 633 SHA256 a4d7596ffbd52479423f10da1e30
 EBUILD cryptography-vectors-2.0.3.ebuild 642 SHA256 1c37c9c1ce3dcf6edd4e680d4b62e3e589db298126645c2328b7b5ae2b73e7c4 SHA512 53b66c690c62327685f0dcf6e59172f284130278d03a9398aae9abddb7bee913b60592ee2131f8521e8aca75b78b19ec0e4e9ecabd3d46866ac64659839c4f8a WHIRLPOOL 4ae022051d04c53286f8e5ef103cef460d13caded51fb19eda3bf7ea5b73da74de99b401f30f3e9eeaa186f68475dd0a48d4ffb128790a15530b5b571f89806d
 EBUILD cryptography-vectors-2.1.1.ebuild 642 SHA256 1c37c9c1ce3dcf6edd4e680d4b62e3e589db298126645c2328b7b5ae2b73e7c4 SHA512 53b66c690c62327685f0dcf6e59172f284130278d03a9398aae9abddb7bee913b60592ee2131f8521e8aca75b78b19ec0e4e9ecabd3d46866ac64659839c4f8a WHIRLPOOL 4ae022051d04c53286f8e5ef103cef460d13caded51fb19eda3bf7ea5b73da74de99b401f30f3e9eeaa186f68475dd0a48d4ffb128790a15530b5b571f89806d
 EBUILD cryptography-vectors-2.1.2.ebuild 642 SHA256 1c37c9c1ce3dcf6edd4e680d4b62e3e589db298126645c2328b7b5ae2b73e7c4 SHA512 53b66c690c62327685f0dcf6e59172f284130278d03a9398aae9abddb7bee913b60592ee2131f8521e8aca75b78b19ec0e4e9ecabd3d46866ac64659839c4f8a WHIRLPOOL 4ae022051d04c53286f8e5ef103cef460d13caded51fb19eda3bf7ea5b73da74de99b401f30f3e9eeaa186f68475dd0a48d4ffb128790a15530b5b571f89806d
+EBUILD cryptography-vectors-2.1.3.ebuild 642 SHA256 1c37c9c1ce3dcf6edd4e680d4b62e3e589db298126645c2328b7b5ae2b73e7c4 SHA512 53b66c690c62327685f0dcf6e59172f284130278d03a9398aae9abddb7bee913b60592ee2131f8521e8aca75b78b19ec0e4e9ecabd3d46866ac64659839c4f8a WHIRLPOOL 4ae022051d04c53286f8e5ef103cef460d13caded51fb19eda3bf7ea5b73da74de99b401f30f3e9eeaa186f68475dd0a48d4ffb128790a15530b5b571f89806d
 MISC ChangeLog 14548 SHA256 c5f2de1c17990451376eda24dc0d0e9a1b45819c8c8a11cc1de604740f47bf7d SHA512 1e2c9f6273ffb60905f5dd30dcaf94a4c37c32a20af4807acec00593062f14c89dffd48f0f75fe7c5cbd9d91a33ca8051119c7e62e0a99539aa9c0fe4e216918 WHIRLPOOL 0a784e2f313a5d0a8bafea45048c6f66bf50c17cd9490cde8da997f742fd9203bd4f881ca7d280cf519964db5591e3ae002c64c5025860de0faa0ba2e64e33fb
 MISC ChangeLog-2015 5384 SHA256 7e6854358fbe448569b7ef469923057f58b6fa344e315581578f0e209422be36 SHA512 c727701a17221d31216b7e8f3f83349f778630571ec8807c4da9e5a9daa611fbdc932ce94566bdf2c45879158b26201f3d03ae5bd5a806c4f153f387f9d0e719 WHIRLPOOL 1e5323c11ada642b1e86995b5b5b53d8aac94355ca2df42e3b97b56ac0077f7ea6696d66ce19c7c0eacc6690295883438ac673c21d70cb2a288f8c7e07c325d5
 MISC metadata.xml 333 SHA256 bc80b1372c77a6b09ebc055f777e2d16f12b51f439489abeebddd4929a7fce1a SHA512 d65176e5ea86d82a13687d70fb2f29ca046bd71526752fb3583be9b0507b124363f271d697cfe6724245d6863c5aac36e67b1e50808041c52066d66e1f8b586a WHIRLPOOL 71727a286773144d80ff7fdcb1becf6326e347382c6f07dc44598770628ba5f174e9dcce2f25d51f0ec9e22d2e28634d0f3df45bc351b7a161d121adb017ccf1
diff --git a/dev-python/cryptography-vectors/cryptography-vectors-2.1.3.ebuild b/dev-python/cryptography-vectors/cryptography-vectors-2.1.3.ebuild
new file mode 100644
index 000000000000..711276fa7749
--- /dev/null
+++ b/dev-python/cryptography-vectors/cryptography-vectors-2.1.3.ebuild
@@ -0,0 +1,25 @@
+# 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
+
+MY_PN=${PN/-/_}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Test vectors for the cryptography package"
+HOMEPAGE="https://pypi.python.org/pypi/cryptography-vectors/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 BSD )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+S=${WORKDIR}/${MY_P}
diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest
index 4941afe87b48..1d390bd16dcf 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -7,6 +7,7 @@ DIST cryptography-2.0.2.tar.gz 427303 SHA256 3780b2663ee7ebb37cb83263326e3cd7f8b
 DIST cryptography-2.0.3.tar.gz 427544 SHA256 d04bb2425086c3fe86f7bc48915290b13e798497839fbb18ab7f6dffcf98cc3a SHA512 fa569c4f5a994e2bd90810649fdf48115bfd5ff46790c849991e8f7a7c8b5435402f92453e4365426ee645623b3bb509c9bb781657c4b4e81e3a36b58ba5461c WHIRLPOOL 4bbbfb4c57a5c4de7c84654d6474bd9b7b0d1eb9ed1f63d91a360b2987187f7bb1910ff4ca540b37fd3e98a00b37d5963a92b2d6ae0acfaab1636f512e887ca3
 DIST cryptography-2.1.1.tar.gz 441477 SHA256 2699ed21e1f73dd1bdb7b0b22a517295de07809d535b23e200dd22166037fe6f SHA512 d021f7af1cb4c6430049d2213405b7bea84bc0bde9e9f92c99c87dd835b2f28eb28024d65090756d2cc72b63510f25d71c55e473ce00e1d24736c15037998adb WHIRLPOOL 1095cc8698775904019744bb7c7410f405183fa4b497f2a1a66bb3922176e2dacab3c050eb9d081fa0bf07aed268782950e9953d10582e4d57e953d30d93618c
 DIST cryptography-2.1.2.tar.gz 441439 SHA256 d7f348e4f5df146a0e75998544bab6d42313cf19a81a6e49990ab7b27cc9c73b SHA512 a5a1bf7ea60f172ae72816965a471be00ee092151c02d9d792579a4457cceddd181d5d95fb832752981f9bdd3cfb88a5d531562845b0b70f37b39fb0fbcafe85 WHIRLPOOL 49c543b80c09f77daf2a49a784bb2132dfadf07dde5b1f7e5c9174b215dda7113ab8b90a5cac386010bcc5fe0c012f55b601b895087f4c0bcbb126b8435cf440
+DIST cryptography-2.1.3.tar.gz 441502 SHA256 68a26c353627163d74ee769d4749f2ee243866e9dac43c93bb33ebd8fbed1199 SHA512 04b340550955ab177e3ca3b63ad39f903cee8ae12d3dee1039507e09b9257210ea4474265cb521b8f93a5ccda8dd829640ed04bc16bb7e3663651e64a5bbe8e3 WHIRLPOOL 16fdd77eb60bd46331add278e8cd15a8a8f2d45c482d671997c1dac1835db39aba4812c21df9a0203a62b2cebc6c130c57a6760e0167a7dbaa1518d427087045
 EBUILD cryptography-1.7.1.ebuild 1666 SHA256 07c512a796db87de7a6e3ee3fdd6425dd9574478c64ddf9088bb11d67ec5b42e SHA512 d30f513b2b76fb1fa100b9c9a06adf3330e66f6fcc18ca62d01dc493fa70aa6e84e6cc902e0d2d537d456c8fe8b963b25142bedd5d1185d476c032d0c50b7950 WHIRLPOOL c778fbf6714de843212ce33b5233647ae4d2859f41270eebd4c06b353ac383bb873e18fde0102eacb1acc37343ad0cf0ca0b6da8e7f61333a80a9f5befec5a94
 EBUILD cryptography-1.7.2.ebuild 1748 SHA256 d186c9abdd5f89e682598e1c2f6166fbc4041be7d71402f2d88317835c241036 SHA512 f6d6768259d982e8c2f933bd61fd103384110258bb7133184f54ec48a6c91593a6261cef15b4208330192a7678be45e53170ecb16ef3f64b761ae9d258ef7ae9 WHIRLPOOL ef1899c94574e4011964b1bbd6f3a70fe0c1a80273b63b818c8fa9cd36d365c94a92d6c28e398fa9212fe01fcfee8863dd34ae8dc4209a0801aaccd9eed6ac15
 EBUILD cryptography-1.8.1.ebuild 1675 SHA256 653083b45ac8b5e11eff9a8b5742d67fe5b55f45282ea462699d9db62f30291e SHA512 dc74e12777b873ebad3a97d7f8b205e0d200fac1479bc0d8c7e5b13aa8714d3d8866f42380540b6c81e48d83640abbe87582694097f8145e4c88ad0da314ca4b WHIRLPOOL be672028ab6564197e73d618879ea9c5d7015152ddc8d6d67ca5abec972498b2061af21f9216d2a5b8868d5831d46d67b6e197ed86dc72341245ecb2b574d1ee
@@ -17,6 +18,7 @@ EBUILD cryptography-2.0.3.ebuild 1646 SHA256 948a31ec4b78bc9d00a228eadb1ecaa0616
 EBUILD cryptography-2.1.1.ebuild 1646 SHA256 948a31ec4b78bc9d00a228eadb1ecaa06161704586292f310e70cbf23b711907 SHA512 7d11e6ddae039e21eb205d5b4f71e56bd0bbf57670166afb57bcea711adb360653e4337a83a826ea11d1a964153b767fe05c7a8b00f16798f581e9c2de7ae966 WHIRLPOOL d0d674f90374d32f515895ebc09e3db92c58b07e9ca8a083f90b0e624ac204a45cbcddb8dc673bfdfb0c9233d7aeaca5f2b942a1d9efb916ac50a9051a4b4cad
 EBUILD cryptography-2.1.2-r1.ebuild 1748 SHA256 da5b11ed7397a0652930f6fb83cba4b9d77b7e85f975f52f20c7ae07ec56dbad SHA512 4fadc4dfdbd084efc7d375adf8e11b2b4cb429e26bda0ea9227298d30b1879d8e3609208afc7395af0370b072f334ac00ba7e172fa095636bda249e0e62441a1 WHIRLPOOL 321d50c048e7493cf9038482eb523fd4941168a30e708be480fd1a02872252ebf1b920e6947d1ce8c901c677f223bcc6bee46bf74223f7fd09c0484a68a1ea74
 EBUILD cryptography-2.1.2.ebuild 1646 SHA256 948a31ec4b78bc9d00a228eadb1ecaa06161704586292f310e70cbf23b711907 SHA512 7d11e6ddae039e21eb205d5b4f71e56bd0bbf57670166afb57bcea711adb360653e4337a83a826ea11d1a964153b767fe05c7a8b00f16798f581e9c2de7ae966 WHIRLPOOL d0d674f90374d32f515895ebc09e3db92c58b07e9ca8a083f90b0e624ac204a45cbcddb8dc673bfdfb0c9233d7aeaca5f2b942a1d9efb916ac50a9051a4b4cad
+EBUILD cryptography-2.1.3.ebuild 1748 SHA256 da5b11ed7397a0652930f6fb83cba4b9d77b7e85f975f52f20c7ae07ec56dbad SHA512 4fadc4dfdbd084efc7d375adf8e11b2b4cb429e26bda0ea9227298d30b1879d8e3609208afc7395af0370b072f334ac00ba7e172fa095636bda249e0e62441a1 WHIRLPOOL 321d50c048e7493cf9038482eb523fd4941168a30e708be480fd1a02872252ebf1b920e6947d1ce8c901c677f223bcc6bee46bf74223f7fd09c0484a68a1ea74
 MISC ChangeLog 18416 SHA256 1c2c81e70a455fcf401bb7c0d61cf38f3de9e7a2cc5ba5c18865038dfd43cea2 SHA512 b327d91034d2141d3c39cc406a0d74ff019994a92dd8f35e8b1715d5f0ba00930a15f42e601013dd7d14a81de0a30fd3b0dbf66a00a2c555f6015b8a6eea9943 WHIRLPOOL 5f09b6aa83487c428ced79af0f2c4d5d85db223f74298a1216b3cc248494f0c7f85ef98aa8461666420006fed1caf61f18679985b75998cfd4dd8ed82be8d1a0
 MISC ChangeLog-2015 8237 SHA256 c22eb0f4c94dd39980a8ce9b7d3b7149bc4ce59a7496f87c7e34951715c94e4a SHA512 b11fd6ecb95dd1265087e007ead9245b577ae76591343ed8f9bbf7c730344f0f31e3562edb87768a4a4dc3ab78a982b31bcbdae52b0060f805a7c4d0d64ec798 WHIRLPOOL 5e148ed158f1a68f8c1580c0ed5ccd3b50a6c88ce2a6228c80f5354eac95f8cfbf31ea6c2e2cc65633b1ef7332eb181efac8eaeb1a954a3004b081b3ed162286
 MISC metadata.xml 384 SHA256 1eb9fe441314061b742ab80221c14c78f22fb93cb64f7eab4f3c89c6b95eadcf SHA512 c2806f846608bdd0720b589494e13f57ab2d64026747f2b13f412c9a0e9d2bef6b16fc357e4d16b74ad7a2a2af8daa5e28d0b6bfe4d2141ce68881c724fd24c7 WHIRLPOOL b29d989556a30a69dd73203ee4fb22e15cefa78d441e10f153e0924f4666817530c703e44047f551379c5fa31666d5856c4b3684883064d130913fa9732f6c92
diff --git a/dev-python/cryptography/cryptography-2.1.3.ebuild b/dev-python/cryptography/cryptography-2.1.3.ebuild
new file mode 100644
index 000000000000..70a0e57999bc
--- /dev/null
+++ b/dev-python/cryptography/cryptography-2.1.3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Library providing cryptographic recipes and primitives"
+HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.python.org/pypi/cryptography/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 BSD )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x64-solaris"
+IUSE="libressl test"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= ( || ( dev-libs/openssl:0[-bindist(-)]
+										=dev-libs/openssl-1.0.2l-r1:0
+										=dev-libs/openssl-1.1.0f-r1:0 ) ) )
+	libressl? ( dev-libs/libressl )
+	$(python_gen_cond_dep '>=dev-python/cffi-1.7:=[${PYTHON_USEDEP}]' 'python*')
+	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7 pypy{,3})
+	>=dev-python/idna-2.1[${PYTHON_USEDEP}]
+	>=dev-python/asn1crypto-0.21.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
+	virtual/python-ipaddress[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
+	test? (
+		~dev-python/cryptography-vectors-${PV}[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/iso8601[${PYTHON_USEDEP}]
+		dev-python/pretend[${PYTHON_USEDEP}]
+		dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+		>=dev-python/pytest-2.9.0[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)"
+
+DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst )
+
+python_configure_all() {
+	append-cflags $(test-flags-CC -pthread)
+}
+
+python_test() {
+	py.test -v -v -x || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/docker-py/Manifest b/dev-python/docker-py/Manifest
index 3755c6a1d099..3a66105ebfa7 100644
--- a/dev-python/docker-py/Manifest
+++ b/dev-python/docker-py/Manifest
@@ -4,12 +4,14 @@ DIST docker-py-2.2.1.tar.gz 174907 SHA256 b84cda631daeaad532143b439af0235923647e
 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
 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
 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.6.0.ebuild b/dev-python/docker-py/docker-py-2.6.0.ebuild
new file mode 100644
index 000000000000..559c7b0e68d7
--- /dev/null
+++ b/dev-python/docker-py/docker-py-2.6.0.ebuild
@@ -0,0 +1,56 @@
+# 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 ~arm64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	>=dev-python/docker-pycreds-0.2.1[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.18.0[${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/dulwich/Manifest b/dev-python/dulwich/Manifest
index 4d071fa520c6..1fa038f7a55e 100644
--- a/dev-python/dulwich/Manifest
+++ b/dev-python/dulwich/Manifest
@@ -4,7 +4,7 @@ DIST dulwich-0.18.3.tar.gz 328891 SHA256 d34c2628f89a5ac632fa462b2edd5afcfbf5127
 DIST dulwich-0.18.5.tar.gz 330097 SHA256 838bac318fd0ed79e0eedb6cfd53b6424dc618fec6b99dc959881b12da7bd6e0 SHA512 4ba0f70ebddf4c7f4e71721812e228f820226d4ea42bda4d5f06a0720a029d4dddb800cfc05b2610525922c5fcef1020edd1485105706d9ef3fcf810e6381035 WHIRLPOOL 7ab826c3d294ca17500de5beeb18e70cd912d468361e9972800ffd54768751d84c9f26e99871e2ba760a91d78397db786f0db7a2c3d16f4c301f8961138b3566
 EBUILD dulwich-0.17.3.ebuild 1092 SHA256 e9b94ee590481f98b70098de750ea8a0836a1c7fa01b461722f474c30ce74ddd SHA512 939f40f9ad38434cc478523124f95d962bcaee47d61d96b29e061dd21322e5c153cbe5113b2edf7d5246f6b4304b1525972e4dd540ad08dac05f7fc2cdce019e WHIRLPOOL e4558d89d2e7168946fa03825556fa2d4e98342a05f422d79ffb05a6f2b5691cd9435927f173d8d2a41fbe59e70c577943bc8612fce8df6a1f461f3d5536c7e9
 EBUILD dulwich-0.18.3.ebuild 1317 SHA256 79ed3c2a37021a04101c82144cfeb6758eb5464435755d5e5f51e0e7e173025a SHA512 d950082e949531b0b147583c21ed64a830cf3af169aabf124e95e14ba79df263f654c84cb1f2baea2b0737e34efc71146169d52e6c79dfbd3bf845bed1623d11 WHIRLPOOL 3f390b430dbc5b94a4c7ddf325b51f12cf5cbafab7ba9309bc594bbdcf5ac6d822d2169ec8f7541936d7d8dead7573ca924d353b40a18bf400de45fbeb19ba63
-EBUILD dulwich-0.18.5.ebuild 1325 SHA256 5ff069d37216fc2aef7be7ffb261c54c88e62c1fbad85a8ed583d1c42783df09 SHA512 9b51e78a490ecb8720580ded874c03894fafb581333c85786bed30742dc9d3938819d72ee29442af8ddc86b44c35b871044841d3694716673c9b350d7297f72b WHIRLPOOL 12d24f3ebb26581ec5afe9ade9725a1718a7e4535a71c850a5805ad212116fcb77d4ef30b7d83eab30b878024abfccce8c5c426c0c9bf78815ed9ac24ff6ea5e
+EBUILD dulwich-0.18.5.ebuild 1324 SHA256 7f29e37ccca6ff8c9f004690177a382dbab0b159b5c9c5e395bad2839cc05d7d SHA512 11a49a6f2488adc7012cbc060d28490a7e7986992f0e3262074da45523690a06bee630bc3a52d5f1b84d488f5feb3f98f71e396c2df56f48789b89175605a832 WHIRLPOOL bf4accd032f2b19edbdbf3f5dc40b09000b7f1c0471d48ebd09246e9d48d536eb651154ce41739dae87b9bf4040617e9550bcd600602e9fb30c8c42c2ea8e119
 MISC ChangeLog 5566 SHA256 456fe5a3fe54213a797a8719b7bd05269e501dae63561ffc72d8dfdf59a59e52 SHA512 211a71ba199cfbf8747c91115e3238f0d8fe68d9b771aa021918d1a84681e7d0b069fbf010451690fb98f3e295eac8deb4ba515586d143a39a16e18d80e88186 WHIRLPOOL ec2aa403a347a077e8df0c6c9906174871f15895f21388d853801a3083ed81bcee2c182c873d7742ad23b4db30d07a85c109ffda4f2a832133882f72e35bb60f
 MISC ChangeLog-2015 11626 SHA256 8a382497fec7ddea5941387fdd95109637f5907f6bac863f71d1491cc0522704 SHA512 ce06bf2988c44d4792625fdc8005e8ddd965cb24ddc8675ea16cc508879e3ab509d097376bce072480aa615ae1828c0171ea3b6d56f3f904bda16a328615e4df WHIRLPOOL ac50f0042c1d1e69009548ce47309daddf6ffe35243d1f2a409ed94d689a35e80fccd1529af1a93b039553c741dbcd4a21865a82d07d0c6d5b803c366425d9a2
 MISC metadata.xml 555 SHA256 b06e339e494957dad20ecd074e962e13d549cf2aa143b2b7a625a602a4cae2e0 SHA512 1f48222049a8ada15172ca0868c6b3f2eda4f465409cd1058ab6b9e498a521ac52d14f1bc2f2265c588f0afb9d874f4a45e6effef40e022f9bf8f6c7e4e38353 WHIRLPOOL 3ec89f1f7eb465e8a53d09b7e53e7037fb2f542ae805fb99bf0be77aaab819d623fbc36b1acc87f45215463b547585978c60e1b50c8091163441b37f91cf25b4
diff --git a/dev-python/dulwich/dulwich-0.18.5.ebuild b/dev-python/dulwich/dulwich-0.18.5.ebuild
index 2a3bf41392d3..dbdb64b670c3 100644
--- a/dev-python/dulwich/dulwich-0.18.5.ebuild
+++ b/dev-python/dulwich/dulwich-0.18.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples test"
 
 DEPEND="
diff --git a/dev-python/elasticsearch-curator/Manifest b/dev-python/elasticsearch-curator/Manifest
index 90a1fd69adb1..6cbcdeb24364 100644
--- a/dev-python/elasticsearch-curator/Manifest
+++ b/dev-python/elasticsearch-curator/Manifest
@@ -1,12 +1,15 @@
 DIST elasticsearch-5.1.2.tar.gz 33299777 SHA256 74d752f9a8b46898d306ad169b72f328e17215c0909149e156a576089ef11c42 SHA512 1867626e8a87f11ed109e1325fd1d16c9e0af06ebe6a30c78ea679ab533ab377f5da8ea55af6871be33af226f02187a2aadd77e5e23c097dd24055be21e9d691 WHIRLPOOL 2e9df71c915343e2cc8ad82c59b877f41f5e093cbeba21f471c32cb51a195eccc6223bc48da48bb4af2e6bea9f2539f2e93b866963148f4ca2940ba4466e614e
 DIST elasticsearch-5.5.1.tar.gz 33476827 SHA256 e0924ae2af5f4435cef009ad3a567169e9653263e7a3b8693dba932698ea7e34 SHA512 9bedd48396cdd6c39c107a7951eba8446b8574493bd44c17a79ba3443670a48b72c053006821cf69dc17bf49ff1c05904db14a07d8a6403b2d2061fc605937bd WHIRLPOOL 770b2eab9d67212fde7bafb5eaa885c13195f3ecb41897c261bac405987397e299d064badda454d12901ed86a8f9a4e87ab0242ccf5f6971005397ad9061f8c6
 DIST elasticsearch-5.5.2.tar.gz 33485703 SHA256 0870e2c0c72e6eda976effa07aa1cdd06a9500302320b5c22ed292ce21665bf1 SHA512 62048f15b43e38a61e3a19a1599c25cd0d9009cc1172db5b450b04dec349ecd313b1f20e3d1c7ed1c101ae3e6f6c6d2cdf004a9713ad803576277f93e3adbdb9 WHIRLPOOL 3a71cef2858b76b11e1693907e745912a83f23e26c35a3456c6324fc19c317c53d4404e20134b034e41e162c1ea8d58c38bbd4afe0394d886ab32f6b698172ec
+DIST elasticsearch-5.6.3.tar.gz 33774486 SHA256 492b7e59d5204b3dc7eb13b611c33b3db36b392bdd6a4c004ba99c6543fc28f9 SHA512 ee57d010e196eb25e5296fe95ab2de5e503d4d66f7eec8c8f6ac2ff9ddbc1a8dc1514202d705e291ee49d3e04650b597a9afc5f92f179b8faa5e2fe3c662f33e WHIRLPOOL bda081e6b91d1076a39e0af75b44d7f877f28178281de1f22c5177abf804c9395dacabb3c93ec93aff65223df42353bc955bbf60e74fb07f99320096dd97173a
 DIST elasticsearch-curator-4.2.6.tar.gz 228342 SHA256 bebc7f6b53a4147e92004dd63d2349bb18170feed12b9219206d0d074b0643ae SHA512 e42d9f3c6122ba9cfc0bc90323f12d7ebf09902d04138472999b63fc59742f2f461b889dd98fca98f321d4975a3c05bc2aae5d211a774abd49b628ea318f5f64 WHIRLPOOL 63eed5c64f3a08f44d6feb8eb56b7698e8081a948b67daae91bb692d69e3ed1166c2fb867cb61f3f114eed74d05251b3aae68a8c475bf75ce318d53435e27b7e
 DIST elasticsearch-curator-5.1.2.tar.gz 290616 SHA256 e2f4f6db735223b8bf2bf84924b6edb23d1c3b9a6ebd3ad3bebfcc23f38e0434 SHA512 4ac0ae789fe662d352c3d228acc6aaf78873bb02b7108f985fd0a048d0b90cb2b30572eaa5f984025ab0d4209eda9d6fe6ac66cd8cc856f0707e3f12bb2e574d WHIRLPOOL 143f7b8704d73db92524e25a51074dc96385089aac0c88d197b12668afe10eaf7d686a2d03a1c81dc988a158e6d9e9b9e419b50450d474ec75ef90cc56d502b7
 DIST elasticsearch-curator-5.2.0.tar.gz 301134 SHA256 e79e0804b6629fa4669570052379e98d5e10c07879c132e1636f26d6e038c159 SHA512 5aba1c3fb1c76f2389902024190ba23567107e3655987014c9250ae46a9199daaad18cd6e9f2595458bf4abb6ac3d4d76c241907d1c0009eb2a15ef638e99d23 WHIRLPOOL 20ccff30bff5f52d05d5804a660dad35a2908479789bfe1d08052428c7c1352c30cbd11623d603ded8fd37b162252bfc24030731443ae7e120f5de7de88faace
+DIST elasticsearch-curator-5.3.0.tar.gz 292274 SHA256 241dcda173aa3ba79b2b0f8f8ec31c8729fa0448f710f6cba10d2d20fcaaacf4 SHA512 23a94c0a8b78cd0f3a27af76131c267c407dbafb504a4503e8c954e69cdb527ed334fbfcda068b2f1d28479762c430f665f661f827bdf3066f5bcdd50c82dc53 WHIRLPOOL d37e553ad79b79e5b92271ced40534942b2ef6d75ff62afd7903771d41887c17f1f7fd96219942db2d3d7122c92cef6953cd59a57ad61f9af825fd060ec33428
 EBUILD elasticsearch-curator-4.2.6.ebuild 3333 SHA256 674a9cac7acf44b0d5197da32b433ab1709c13f8f37d1c62613868aa48e9ed6f SHA512 e2fae6174588e141c8538c8faa74989fb36fbaf98f656194d514e970265c664b7bcbc1e8ca3fc4fe5397afacc2c46713c63a84e0b424f3b330613787d3803022 WHIRLPOOL dcd998067add00ce57a637d563c5c79d42c1e15f5d644091ebd635aea817181b7288b199a00597d6c4f99c26519bbd2fdbb81769940f2e56bef6276abedccf6a
 EBUILD elasticsearch-curator-5.1.2.ebuild 3229 SHA256 d1606dd62b4b62d44e5043ccef9d31586002c0f9b2cec4a03b97a13706322740 SHA512 76cc7d83d14a4c1bc6f09220b417ab747f237bd01ebf09c216fef229dcdc2517401406edcc86da47dde514703516c397913f24759e2936e3fac8282c0fa836c9 WHIRLPOOL e12b0185f66a67b8628aae039a132d39b0daa44461beb002b7a23d4a30caa6b8c27eb14044828c9d75d1c5182f82220689b107a632bce5f0e0defbfcd0b341f0
 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
 MISC ChangeLog-2015 911 SHA256 6f2af6e82f6f117247a783b711378598aa316f1bc5733d83248949a96f197d1d SHA512 bc50115d94906909c1325122edcf10ac3a4844676958522286fe7f80e230ef83bc5f349877c3fc2b5a55c6f24043b1a92b6b753c35a7b6aa0de8919993186576 WHIRLPOOL ad452ba3670c5fdcd739b0afdd2411c2303c42940649e047af4cb28cad95be6c9d50bf4e03fb05fdafda8cafb0b944a3fb81494a5dbcc05ff4fd1e889de46d5c
 MISC metadata.xml 469 SHA256 ba02bfcc11d9e765164b3e47f308401fc23226ac7095f4adf0f6144b132c0e23 SHA512 38e98a77a6da51e077ac9a0dc77059276c58f56f8e26ca45a26df3ec16641dcb46ca9bccf85fd0dc9a358de1ac1424bfffd4cfc3d8213272ec6193663c89860e WHIRLPOOL 571df8e48c1eff216c0b5809e1a107f34feaef499b492526a8699079d789bad1b94d99da752580b3d1d2eefb2307e24dce48ba83c8b2721d48bf547cf940c9f6
diff --git a/dev-python/elasticsearch-curator/elasticsearch-curator-5.3.0.ebuild b/dev-python/elasticsearch-curator/elasticsearch-curator-5.3.0.ebuild
new file mode 100644
index 000000000000..01cb9487818f
--- /dev/null
+++ b/dev-python/elasticsearch-curator/elasticsearch-curator-5.3.0.ebuild
@@ -0,0 +1,120 @@
+# 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} )
+
+MY_PN="curator"
+ES_VERSION="5.6.3"
+
+# tests fail in chroot
+# https://github.com/elastic/elasticsearch/issues/12018
+RESTRICT="test"
+
+# running tests in non-chroot environments:
+# FEATURES="test -usersandbox" emerge dev-python/elasticsearch-curator
+
+inherit distutils-r1
+
+DESCRIPTION="Tending time-series indices in Elasticsearch"
+HOMEPAGE="https://github.com/elasticsearch/curator"
+SRC_URI="https://github.com/elasticsearch/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}.tar.gz )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	>=dev-python/elasticsearch-py-5.4.0[${PYTHON_USEDEP}]
+	<dev-python/elasticsearch-py-6.0.0[${PYTHON_USEDEP}]
+	>=dev-python/click-6.7[${PYTHON_USEDEP}]
+	>=dev-python/certifi-2017.4.17[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.20[${PYTHON_USEDEP}]
+	>=dev-python/voluptuous-0.9.3[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		virtual/jre:1.8
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/nosexcover[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_test() {
+	ES="${WORKDIR}/elasticsearch-${ES_VERSION}"
+	ES_PORT="25123"
+	ES_INSTANCE="gentoo-es-curator-test"
+	ES_LOG="${ES}/logs/${ES_INSTANCE}.log"
+	PID="${ES}/elasticsearch.pid"
+
+	# run Elasticsearch instance on custom port
+	sed -i "s/#http.port: 9200/http.port: ${ES_PORT}/g; \
+		s/#cluster.name: my-application/cluster.name: ${ES_INSTANCE}/g" \
+		"${ES}/config/elasticsearch.yml" || die
+
+	# start local instance of elasticsearch
+	"${ES}/bin/elasticsearch" -d -p "${PID}" -Epath.repo=/ || die
+
+	local i
+	local es_started=0
+	for i in {1..20}; do
+		grep -q "started" "${ES_LOG}" 2> /dev/null
+		if [[ $? -eq 0 ]]; then
+			einfo "Elasticsearch started"
+			es_started=1
+			eend 0
+			break
+		elif grep -q 'BindException\[Address already in use\]' "${ES_LOG}" 2>/dev/null; then
+			eend 1
+			eerror "Elasticsearch already running"
+			die "Cannot start Elasticsearch for tests"
+		else
+			einfo "Waiting for Elasticsearch"
+			eend 1
+			sleep 2
+			continue
+		fi
+	done
+
+	[[ $es_started -eq 0 ]] && die "Elasticsearch failed to start"
+
+	export TEST_ES_SERVER="localhost:${ES_PORT}"
+	esetup.py test || die
+
+	pkill -F ${PID}
+}
+
+python_prepare_all() {
+	# avoid downloading from net
+	sed -e '/^intersphinx_mapping/,+3d' -i docs/conf.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	cd docs || die
+	emake -j1 man $(usex doc html "")
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	doman docs/_build/man/*
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	ewarn ""
+	ewarn "For Python 3 support information please read: http://click.pocoo.org/latest/python3/"
+	ewarn ""
+	ewarn "Example usage on Python 3:"
+	ewarn "export LC_ALL=en_US.UTF-8"
+	ewarn "export LANG=en_US.UTF-8"
+	ewarn "curator ..."
+}
diff --git a/dev-python/elasticsearch-py/Manifest b/dev-python/elasticsearch-py/Manifest
index 17dba44e4244..84241ff52734 100644
--- a/dev-python/elasticsearch-py/Manifest
+++ b/dev-python/elasticsearch-py/Manifest
@@ -17,7 +17,7 @@ EBUILD elasticsearch-py-5.0.1.ebuild 2449 SHA256 6c912a46c37ad636b478b65c6f1a94b
 EBUILD elasticsearch-py-5.1.0.ebuild 2479 SHA256 0869cdb7ada38443aaeaeb0b8c2c438bb7cda6f7b316130fcb9b5a464f7b204e SHA512 1c20029ec3e00ee3cf88bfefb5e2c89ce1120e44582248a37abac1880412ace851b7798c800c8560387423ec1454e06f8c75d3f8b70415e83e432a4d928fdabd WHIRLPOOL 12562ebf7206d6611e0a8aadbbbf22f2aa136cd7f943ee9625390b440da64779e55477ba10bc2136aba199ad03ee5d0c830f242dc7b1458717094d794c375505
 EBUILD elasticsearch-py-5.2.0.ebuild 2647 SHA256 6abe303159ef0f4dc5e21c3ad0965cf4d536b45d8963566e6c6fd1e7c28a3dd9 SHA512 23a7b210f8931c84b781f3aae9f5dc362735d094a67417877a89d40d96b8d1da310ec1bc0c4d3d86f2d055a3891a9bfe2be0056081712850d7f3af34700f3a1f WHIRLPOOL 41d12a6aaf2a9509241c14cbf588bd517926525cce67ac197475ab310d76fed0d2999d46712833f2dd972976d0ce222c17ea90e5db2da32c61c1a5c9476a2786
 EBUILD elasticsearch-py-5.3.0.ebuild 2648 SHA256 64a6738b69aed853763c58234761852add4a734f3e01fd976440c7036bf51d35 SHA512 866f43398350a4943d8be34f1f731d168aebd21658d69b0c47c0f9ddad840f0dd8ca94d51259c94dbafdf021ff2fda8c5b204a4dfaa21d0bc7bbf4c7ef8bb34f WHIRLPOOL d53887f81562dc82b7851aa387f1c80df0a63a3e0e431d9083a74655f5a1879180ce30ac6c2d7e80f618aa74513a4a4c618a7976c16c7ff97af1ef19b84f605a
-EBUILD elasticsearch-py-5.4.0.ebuild 2647 SHA256 6e384696864fae130f1a2c5b8dc5da21c4896f94beed3c90166bf0712f15f5e6 SHA512 7d315550be9d3379c932d3f5af4aafe844d803b5a85c9abdcafa6088a6d347f3c66ffc4ad5503c57a21834904404009bbdce1165adc4322ddc8ca173cbc9cee6 WHIRLPOOL 333147e132702aa7d82c417dec26a9853e953d4f794d9053728ffaff3a11f9b14eee67cd98f806df75123fa1a88f1e737ccec8345a9e00be0a4a1a124f05e98c
+EBUILD elasticsearch-py-5.4.0.ebuild 2646 SHA256 9cd1ff53aa8df3139448542c6e9190576fbf3b69f512e3942ccdc2a057a6392a SHA512 528796f89aeaf53b17b33aaea2dce31f45196f5ae8efbb2141342af2b9a04b10e1cc176945e26a1f5329d90ec48c730065debaad3bee534cc87e93d1cc74e3a8 WHIRLPOOL c34d30f96201b76968d817d01a40e94f7b4d5d6a05a45c4bfc51883e3fc41a3586442333b6b66d2ca8be1681fff3897e6d7a0113af505b958ac92f4add98d8a1
 MISC ChangeLog 8192 SHA256 fc93966f91813cccaa40c65a6a256be7c81d637c78964d7b1828e17bbe9b96c7 SHA512 8e87101afeb610339f1176125f239fa0a0909d404371c559e3dbabb38097e5b1ba867ccf2e9ae2b2e10ad85ba9a9c878852984f8f083a63b5bad240bb19096bc WHIRLPOOL 877d346ff67b54e5a20c17dd237518d2530af34d0b14d0f1f9232254a940a5be8b01672d9e51e6ca57ad3c901825c2b8a0a4d3dcc0d52341f6e3f2a2a8bc3a14
 MISC ChangeLog-2015 1593 SHA256 0924eded2c64c97712c377b21b1d6999f9bf643b4eae250024a5fde81da2c76d SHA512 b68692be8d5681896cfff01a25ed6a9da49a105f93f612ed0e837ecf399288d1d678bd88141706872e1196b03801c4ee16a02b667ab8c4729892ae1eb4fbc940 WHIRLPOOL 43325bee35de57306f1215724c38cdc6c6c1cbcc81c6d36c437e325255ef2cad1e25d1738fa5abd7dcb3682ea19a4af58830ab5ef465e198ce293172c8e2e295
 MISC metadata.xml 592 SHA256 6d0efc689dd219716d43b2af82e47edc018d27761db793a1f55db81ca3e2303f SHA512 752265ff356d02b2825ac2ef5e5177649cdcdd31b5a3738e3638af89a7bfef8b16fef8332e67c3ac03285318b22e455795c75d408a1abfc99068a1d4015eade0 WHIRLPOOL c01227aee8ff53b986654cda00807ef8b4658ca21d5cab8aad1b11e9400dea722244c8cca3434692529eadc963d4203eeebf07417da2060cc07152d8f16fbb76
diff --git a/dev-python/elasticsearch-py/elasticsearch-py-5.4.0.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-5.4.0.ebuild
index 464ae3bc53b8..9cdf3bbff42e 100644
--- a/dev-python/elasticsearch-py/elasticsearch-py-5.4.0.ebuild
+++ b/dev-python/elasticsearch-py/elasticsearch-py-5.4.0.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/elasticsearch/${PN}/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="examples doc test"
 
 RDEPEND=">=dev-python/urllib3-1.8[${PYTHON_USEDEP}]
diff --git a/dev-python/fabric/Manifest b/dev-python/fabric/Manifest
index 091fc2a9af54..95749f7ad94f 100644
--- a/dev-python/fabric/Manifest
+++ b/dev-python/fabric/Manifest
@@ -1,8 +1,11 @@
 DIST Fabric-1.10.0.tar.gz 208969 SHA256 edb2702b4655600f0a49a97e654c79f5b21490ce30f77d1313dd851f0b60335a SHA512 991341dfb3f71e938c2a2e30f5bc158be84cb1600ab64c4f7c5c49decd0a38bc57615f9e07edfbed70d9ca796592d7c1a4f7f3e25a40c4d31049015df928b2e3 WHIRLPOOL c07ba33bd6e7832fd5527ec14e206d74a6a2b983dbb49a43d972f31e15e22f9642df4809adff72f43f92fca5c1d758a4ac540ed87e22f46adc25094b2aa4ccb3
 DIST Fabric-1.12.0.tar.gz 232840 SHA256 fafa17d69a15fd6ae5f82d28acbf90e1bf15e3d7438fbf0e8691868164c0e9dc SHA512 cc07e811873c296c7e33ddadb00af3b4cbd1a87b2617b82505758e6b646e20e55edafe76cd969f3b2a7931a2deb4daefe8e44a7d6fe6ec67e5d9923d6c64e95e WHIRLPOOL 454cf9b2f7eb2c74ca2e6eed349600d37d4306c49da098e46442001e2f720f2df46f4c2eed973916ece7cbffe1c54100dd3571a8696463e10aa3b0ddde0455e2
+DIST Fabric-1.14.0.tar.gz 219294 SHA256 81572002a562b26df657ca10d06b5bcfc6fd56b53374037392c83d4a2158208f SHA512 3bb90597356ac033e5a9bba668ec8b080ee10cac31f54b1e89b6e2e21550ba5f2341e774ed9ff52c3a4ecbc3bae3206d155c6bfe6678576caca8e439c7810ed9 WHIRLPOOL 83506d93fbdc31a2fc27defc5856c0273be404fca0441f3f7164c2243d071cf955c4a10e9373ea43f4c5878f99809cbfebb2209633d1cadac36cda8bd412081b
 DIST fabric-1.12.0-completion.bash 4266 SHA256 9346541b636f001d4efe1ee0bf0a7a083e85789c88ebd54910004b39ee3f68fa SHA512 2303e3b6a71ac8f6a61ce3bd464f3c950db8374b61a6375ccc6fbb2dc815a4a44509a034788862bd361ace7c0f401533cd5cee0fb6fca8d9ff7e0ffd143706a3 WHIRLPOOL 616cefd147905347c38ac7ea91ec465be12435ffe48c487083c9d0f1767bb12e5f82423c132b7cc82a89575869729ac1e530d82cf1831c97f0586be5262d8cab
+DIST fabric-1.14.0-completion.bash 4266 SHA256 9346541b636f001d4efe1ee0bf0a7a083e85789c88ebd54910004b39ee3f68fa SHA512 2303e3b6a71ac8f6a61ce3bd464f3c950db8374b61a6375ccc6fbb2dc815a4a44509a034788862bd361ace7c0f401533cd5cee0fb6fca8d9ff7e0ffd143706a3 WHIRLPOOL 616cefd147905347c38ac7ea91ec465be12435ffe48c487083c9d0f1767bb12e5f82423c132b7cc82a89575869729ac1e530d82cf1831c97f0586be5262d8cab
 EBUILD fabric-1.10.0-r1.ebuild 1735 SHA256 8306fd6b00e22f6602d6cf25a5b817759477da0b06f8806ec06bbdb085b307d5 SHA512 233ff8cbf47fa8933707d5f9738b195aeef0bea3d16a8419c1c5a2f67e0ee6d029c5bfa71aeff7b5cc1c1aaad2839b415e9a7d77b798bf235781bcf8c9ae9092 WHIRLPOOL 316d340c8684a6ca8de9bc7bea974724d92f35a270a3a6440ed7f59c21dd61cbd08f608660854d3aae240e007847befc88f5b0f5df110eee6942ff1af1937481
 EBUILD fabric-1.12.0.ebuild 2124 SHA256 8362ed935268a74c1e2cee9519fb93c0aa25ac08d44e82bf06c55762ebfb344f SHA512 5434ec174f4bce65b6bc1fdc24004454ad7c3a54049ec0126761211e42c96878f027e6604ca9f7578cae1d3582335194240dc34ed0ba23aae3c7e2c6aef3ffde WHIRLPOOL ee0a757c4560329bd6d94b7db975c882194076bd32dc2352c7af42ccc1dbb856716256c6fd2ac13c586a6bbd5e1f333f29392396b286207e26311699f4f1b043
+EBUILD fabric-1.14.0.ebuild 2124 SHA256 8362ed935268a74c1e2cee9519fb93c0aa25ac08d44e82bf06c55762ebfb344f SHA512 5434ec174f4bce65b6bc1fdc24004454ad7c3a54049ec0126761211e42c96878f027e6604ca9f7578cae1d3582335194240dc34ed0ba23aae3c7e2c6aef3ffde WHIRLPOOL ee0a757c4560329bd6d94b7db975c882194076bd32dc2352c7af42ccc1dbb856716256c6fd2ac13c586a6bbd5e1f333f29392396b286207e26311699f4f1b043
 MISC ChangeLog 3927 SHA256 c5ddd7505154ea80b6c1d0b2c5608d3d1ee8713b4e41884aa83782cf8b9cec19 SHA512 f1ac97c9fe44eda1e0ceb4de41e179c921146a4fe3b50a5806592be8d39aa341f11483a33376647b48107ea1be628e6d0e15d982e7786061ace9332f3f0e4b5a WHIRLPOOL 6c54f2cc0826deda85d3890954640b19ef5cbea5a5b8b99caf86e7c37730b8ed6d2b6e5506e3d78dc35bacba1405197381bee78602091862f3f5222ddcc92b9d
 MISC ChangeLog-2015 8942 SHA256 a594917a8152d500cf5087976c3c00421c760dcdfa5a1f473393a20406d63e17 SHA512 f832546fadd4a535740dcc6387b9a0e897cd1021415af8de2432fc29be82701d25350a07ba0d5edbd39fb1284a4e5a379520b95c27b1c6bae7f47ab0066e6bb4 WHIRLPOOL 643f5315fa34ca80e19a631bfd4057a4434dcfa25decfe2a770a4645235b13c15aecba2ae64cc9f7d0bf2e161e7ba60405c17ced443a8f36b2c38a4933a180c0
 MISC metadata.xml 309 SHA256 5255f8fc6c04937a200f9d3c2318e99f68b74b4bd4e61d2cd55d05586d5f096b SHA512 ca05cacf9ab4eb5814b4d311902e34ba0e788c811b59c9a687b0d320b254036a688cccc45265384523b2fc460383336d334acc860b72f78d3ec9736361bf6b24 WHIRLPOOL 796c675b4f796955e6cddb40d0440c11a00994bcd93f8a94d26b3636545ba4f7effbe0a8c5d6304b4130445dabec63b710817f5f4a60a70fb4bbd7c0ee8db90d
diff --git a/dev-python/fabric/fabric-1.14.0.ebuild b/dev-python/fabric/fabric-1.14.0.ebuild
new file mode 100644
index 000000000000..36ca64ccbfef
--- /dev/null
+++ b/dev-python/fabric/fabric-1.14.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit bash-completion-r1 distutils-r1
+
+MY_PN="Fabric"
+MY_P="${MY_PN}-${PV}"
+
+COMP_HASH="83d303e9fb352deaf4885b6db0781b3d9115e9c6"
+
+DESCRIPTION="A simple pythonic tool for remote execution and deployment"
+HOMEPAGE="http://fabfile.org https://pypi.python.org/pypi/Fabric"
+SRC_URI="
+	mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz
+	https://raw.githubusercontent.com/kbakulin/fabric-completion/${COMP_HASH}/fabric-completion.bash -> ${P}-completion.bash"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	>=dev-python/paramiko-1.10[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		>=dev-python/python-docs-2.7.6-r1:2.7
+		dev-python/alabaster[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		<dev-python/fudge-1.0[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	# Re-set intersphinx_mapping for doc build
+	if use doc; then
+		local PYTHON_DOC_ATOM=$(best_version --host-root dev-python/python-docs:2.7)
+		local PYTHON_DOC_VERSION="${PYTHON_DOC_ATOM#dev-python/python-docs-}"
+		local PYTHON_DOC="/usr/share/doc/python-docs-${PYTHON_DOC_VERSION}/html"
+		local PYTHON_DOC_INVENTORY="${PYTHON_DOC}/objects.inv"
+		sed \
+			-e "s|'http://docs.python.org/2.6', None|'${PYTHON_DOC}', '${PYTHON_DOC_INVENTORY}'|" \
+			-e "s|    'www'|    #'www'|" \
+			-i sites/docs/conf.py || die
+	fi
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build -b html -c sites/docs/ sites/docs/ sites/docs/html || die
+	fi
+}
+
+python_test() {
+	# 1 failure, reported https://github.com/fabric/fabric/issues/1360
+	sed \
+		-e 's:test_abort_message_only_printed_once:_&:g' \
+		-i tests/test_utils.py || die
+	esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( sites/docs/html/. )
+	distutils-r1_python_install_all
+	newbashcomp "${DISTDIR}"/${P}-completion.bash  ${PN}
+}
diff --git a/dev-python/fonttools/Manifest b/dev-python/fonttools/Manifest
index 3ed6f7fa5074..5410ff98d885 100644
--- a/dev-python/fonttools/Manifest
+++ b/dev-python/fonttools/Manifest
@@ -2,10 +2,12 @@ DIST fonttools-3.0.tar.gz 298992 SHA256 3bc9141d608603faac3f800482feec78a550d0a9
 DIST fonttools-3.10.0.tar.gz 820057 SHA256 91fbab7277017587d9c6bfaf6770cbf1b38983d02308eb3f948b7915e43ef6bb SHA512 fe59f03d6d2bb1dbbe02da922c994911cbb12cea02dfae67651872fbda9b5b1c522bd6d69a4eb117854eceb79c92b385a28e2df5a4a7ceebce4467f9f193e68d WHIRLPOOL ac3acbf8346f3e60c7d96333315a4b4493cfb4ac687781c54f8a70ed5959f15ae1ef117eeed3c3009b2d03aea1fba4bfa66a2a09fba30128afbe6b01d73440b5
 DIST fonttools-3.15.1.tar.gz 888194 SHA256 72c0706fed42b5fbb0d02b2abed040763de7b5062681f81978ffe288fa81486e SHA512 a5d258c52d56a37f368cf405a0705744e5c0828954ea389359115c3cd0ccc856dd7d699182410a5173e9b9f60c38495abbe1fb01b8a9b6c9263ef7aa93f9ce4b WHIRLPOOL b7e32bce05ec6b7c4f258cbccfbb7cec1ea6e58c726bf5f2fe043bf46f563c6cc1618cf1fe067b58228547c552d107b82e8d3f4ff72c6042e7fb0870683ba465
 DIST fonttools-3.17.0.tar.gz 937186 SHA256 0acafe9b45cec75d547293e7f45eb7d313b950f28c49e10e5501fa29fe032f6a SHA512 09bb16d9e7b453b0ce28cf096c797f04a31b7e24f9258be9869b680cac22e0a50b954c2f5aae6821152f26a74890e1372e9a3a30f0d6f86e5299cb28d3d65a55 WHIRLPOOL 95c005f9fc30cecfb4886241b7cad97ddbd8a0a738f04aae3c69635b81010698c0e8eef9cb9c528ceb8185b22d7cb73063b86879a7ecc2f1be78aaa434eb8e5b
+DIST fonttools-3.18.0.tar.gz 944103 SHA256 0f9987594bba2705d0b5cb421b2f81a0669e03123bcd47392ecc4c74342b91b2 SHA512 514f729bc701f402d416c9f4a4292007bdcd53aa1a288aa20490be9622916817b9f038aacc0d92d7ca6769eb334c8a06569ab133dc88e9a82abffd74be226869 WHIRLPOOL 41c4291b0963a5ff2c06bb772431f2461ff8a18d6efd019936daab18a53ed3aff70d60f5ae10f98b97e6b8f1726788cf9304efeeeb40536358aedc723f801c49
 EBUILD fonttools-3.0.ebuild 715 SHA256 8063187c690b0d0a6675c6d75d42f9964c4ebb5728be9752c20e87e1a06733bc SHA512 5ff43c81e6109df1cab0d27c059c85e20e6fb268b4bad6168fcd88b7a2f317b3ffd3f20ee4634e43e0deadd2cbfdf24936c0099cf4114d8944ac846ca2604822 WHIRLPOOL 68175c4aa3bce2545c324d52a97c59fc1430a45af90ad73c02b58bde70253254b4ab1ef762b2dfcc2b4f56443db39938f6ee5f54df7f473c41cffd316daac0d8
 EBUILD fonttools-3.10.0.ebuild 684 SHA256 d79d0f1b1938ac557ce2fa894b74e5b6ad30e85cc027b9c60d870d4c69b210d3 SHA512 c8260cd0e0a4256e329d64c5da8e82965a6dbe9f1e671636c37c8b43df9f8b325c0fff8064499320789866fd2f840c074f91f2330efb48721f4bc80c7c65e2fd WHIRLPOOL 8ff7e13eb25d65634eac6e8d3669150b1fab479966abb623c65d62e4af35e792b68de7a90b95931c9f76c044cd33b8ccaa9720ed2fbe23d10f83e0d5ac73e80b
 EBUILD fonttools-3.15.1.ebuild 684 SHA256 d79d0f1b1938ac557ce2fa894b74e5b6ad30e85cc027b9c60d870d4c69b210d3 SHA512 c8260cd0e0a4256e329d64c5da8e82965a6dbe9f1e671636c37c8b43df9f8b325c0fff8064499320789866fd2f840c074f91f2330efb48721f4bc80c7c65e2fd WHIRLPOOL 8ff7e13eb25d65634eac6e8d3669150b1fab479966abb623c65d62e4af35e792b68de7a90b95931c9f76c044cd33b8ccaa9720ed2fbe23d10f83e0d5ac73e80b
 EBUILD fonttools-3.17.0.ebuild 782 SHA256 922eee5b0686661c0cb53fff2590ba8efa88a732b418bf7dfdca81b467c61c58 SHA512 a23fb33013aa596a1bce66b2865f3415ca8fb367a6fb1652b73e16e61f662507a78d0560497d96a789e9e5309659cebd4a81b1956044311259a99a1e71dc8ccb WHIRLPOOL bd9aa7823f14d285eb5eb91334d48493f0e79e66982288dc7affb304f6aae273f4b016c941a1ed3015781b265ad26d918fca45a38afa2572d83d1d3d081fd3fb
+EBUILD fonttools-3.18.0.ebuild 782 SHA256 922eee5b0686661c0cb53fff2590ba8efa88a732b418bf7dfdca81b467c61c58 SHA512 a23fb33013aa596a1bce66b2865f3415ca8fb367a6fb1652b73e16e61f662507a78d0560497d96a789e9e5309659cebd4a81b1956044311259a99a1e71dc8ccb WHIRLPOOL bd9aa7823f14d285eb5eb91334d48493f0e79e66982288dc7affb304f6aae273f4b016c941a1ed3015781b265ad26d918fca45a38afa2572d83d1d3d081fd3fb
 MISC ChangeLog 4002 SHA256 42b11bb0f5614967123acea7e923e200c9daa5eb5dca2b001ea09784857f2c9b SHA512 3353e6cbdb063c5a7d9c28d5075ece4e9f2ceeaec4b70244c366702ce6234bd31655a950ef784f539876a91dcce1844be4e1b783bf4207b700e0271e12149143 WHIRLPOOL be3503d0c399902be1096da262e4f8e3718939751ea20909d6ffe1c6b583eff1abd055ed56d9be7ee7ddc71607f17771c1364249466e8f8918ece2e754321f8f
 MISC ChangeLog-2015 5323 SHA256 c9e5e7d9ec87a9e9f64e6338e76a181f7da573f58b455616813cde0db280aebf SHA512 d154cbca050af6635b35785c8f5eb5cb4fcbbbc5166de5b19554157fae9c2f9f43bed7291bb5336974d6a22e3e31333c5c0f435a9f2c13bef04a26779b1943e1 WHIRLPOOL 8706cac483a90734992fe78941c5ea5ff8a339072f9ab454e9fa4432c175c50fba4bb204ab1d6e682ac0ce53cf5dc48fd0cad833f757d2f513de3972aa7c475e
 MISC metadata.xml 474 SHA256 a225fe4cedc13906fc4cd9b5553236e3e77472c83b7f49f296d80b67920a7d64 SHA512 f683da73b5db5e132fa4eacd6de94e50e434f12a88e14b1d97585492c4c4bbe3dda1791eb7855e6b4111ecd61601da4da22c6b77305d9affdd8f9e478c140ed4 WHIRLPOOL 411fdb291b0b113393bad9ca098308fac8887aff6f42c08d4c0c30619307bdf9e29ee9af1a314662733b71e753bded3659f5504b4ba9a1474276f11af8c5e0cb
diff --git a/dev-python/fonttools/fonttools-3.18.0.ebuild b/dev-python/fonttools/fonttools-3.18.0.ebuild
new file mode 100644
index 000000000000..19ab74bba8d4
--- /dev/null
+++ b/dev-python/fonttools/fonttools-3.18.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=( python{2_7,3_4,3_5,3_6} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Library for manipulating TrueType, OpenType, AFM and Type1 fonts"
+HOMEPAGE="https://github.com/behdad/fonttools/"
+SRC_URI="https://github.com/behdad/fonttools/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	touch Tests/svgLib/__init__.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/future/Manifest b/dev-python/future/Manifest
index 8767dcab41fd..b724e7c39f82 100644
--- a/dev-python/future/Manifest
+++ b/dev-python/future/Manifest
@@ -2,6 +2,6 @@ AUX future-0.15.2-fix-py35-test-failures.patch 2339 SHA256 563628f399342a6f5035b
 DIST future-0.15.2.tar.gz 1583441 SHA256 3d3b193f20ca62ba7d8782589922878820d0a023b885882deec830adbf639b97 SHA512 24a0eaf70795efe1644b098c5abbcb0103d9172a5243721f0d26b1cbd108872b6c0616180da8f5507855ddfc7b26bb10a606a64e59d307d39042b346700f77ee WHIRLPOOL 557b53495033d4586dc0f34837cc7f0cab12fb770abda56049fd90b5bac3e36db561e185d86e8a08b153869f0f692ccf0b305f5edc20871edde487faa1b1fc4f
 DIST future-0.16.0.tar.gz 824484 SHA256 e39ced1ab767b5936646cedba8bcce582398233d6a627067d4c6a454c90cfedb SHA512 41c795cd1746a76df84de2da9fbc611fc6164322c1c712ec9e8a8626c21c2717cb4899ec150d95c5e0c037270e6bb71e099edd169609369aae619daea9df2e5f WHIRLPOOL 744ab7e228c608f49308609e18778e198804a7b6fea3a6285efcce14a4ea8d114e146e94779e084ac91916fb7cc560be2178806378305b40568d6bb7ff448951
 EBUILD future-0.15.2.ebuild 496 SHA256 bae2d56d925f9250db304d426eccc49b0f74ca1afc27fab04ed32353bd883f2a SHA512 673c6e67a56de5324b91be86b99f510095fba1f79c6e236da9eaaa58531b4a461698217c3a2a03bfd279fb4ab3f3d7f765a01cb05e3634004a7e32877646027c WHIRLPOOL dcde4874e86a35322e8b1b64e789c0a3b2dbeb8a034034b3d3eeed38fb3e49f2d8c978fd4e4690b1b4ce5c0114713d5fbadb94d10afa5ce525dc1ce336936aad
-EBUILD future-0.16.0.ebuild 561 SHA256 a7e8e0904d024f68f9030f254b8ca6cfb1fc3bec6cb3a72176ad0e755958d3fa SHA512 ebc8533443a3551c37467c513c66cd207f933ee27a30ed5e73bccd407b00a39f4554c2c48260488f58eb28726c98a15418bcb59fd98914b00809865b319f2129 WHIRLPOOL d04917e7607591027bc722966d25a9ebb43bd03d8f513255cf86b483c2929110d8722163c1d71a04a4224c755f8623ddf302a3d81e3c4bc39eb0bd36b3ba9903
+EBUILD future-0.16.0.ebuild 568 SHA256 cf0eebbaf439f6391aa561269365a6512ed32ac348dd2ac368ed6bd6e94ef38c SHA512 46f474ab76bbcc6063724c69829e9920b0637a03f17370764f41bbb075d52b531dd46744f4bc11358b289c42734053cf5fcfd328aef297d53929fb070299a82f WHIRLPOOL 9556a1a243a796799bd70c4f4bb08e2b188935bc4bacdd3a2194040a1ce08e4616a6ce3f6500fdae2d3c0c9614285b907bdb6cfcd46d7e0cda7263d1e3650e7e
 MISC ChangeLog 1394 SHA256 98c7b22ba268a5ab6ef159456f749e2fe89f22c18ef62da04f14f2d2dd65a007 SHA512 4a6dbf4a22ff0af654f1b367ae6534b92c0fc3f37407c8de7be5514fc5a9de6abcc8380edaf6fb408a740ba074c731bc98b021ffeccbd44c9b344512185668ff WHIRLPOOL d627df34b85c5e6bfa05c058a0ff0846f2bec52ef7938c38e360a4e3a4c03a8412d5fde79c19f3ca0f35370574b087f23238c4392d199a8226f33f639a5d8085
 MISC metadata.xml 309 SHA256 b34d01a25d528ef86a4bccb18881a1623e31aac8a8df38c36371fa6f51fbf3e3 SHA512 e01e3b2733211e1eb6aaef4da19265c7165411a46fde4c2156118700c315bc2ad52cd87de1b90355741de77d91aa22eed5f9e5847d45186bf7138d246cd775e4 WHIRLPOOL 8f95c0410c7e60dec33b734054a4a7b57283b4e41794a7b24b006142457f97f4a5bf08ebf864e6433d5634a8e54a2f96183aea698cb5aea31be3d0ac3e01e924
diff --git a/dev-python/future/future-0.16.0.ebuild b/dev-python/future/future-0.16.0.ebuild
index ded90544b7c5..dcfecd04272e 100644
--- a/dev-python/future/future-0.16.0.ebuild
+++ b/dev-python/future/future-0.16.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-python/gst-python/Manifest b/dev-python/gst-python/Manifest
index ca9ac5c6ed21..aac7960c12f5 100644
--- a/dev-python/gst-python/Manifest
+++ b/dev-python/gst-python/Manifest
@@ -6,7 +6,7 @@ DIST gst-python-1.12.3.tar.xz 388220 SHA256 c3f529dec1294633132690806703b80bad57
 EBUILD gst-python-0.10.22-r1.ebuild 2148 SHA256 ad01d5164839df14bc10de659b53c6d78d4fe00f31f4b9533141207b8a9b2183 SHA512 ebc646247140167dff59b882007d1919cfcc03cbc872d2d0db1dba3887287b3f9110a523df844da4b59ac70f764a8cb1f9de570ac660458a29d0802b7791639f WHIRLPOOL a95ae5bff61a4db977c442527d75076b8f30fd0460f6789db43d83f1261a1ca96e90ba5572f38f581dafdb463b056d9f5aa11e796034831fd0f1c9dd13a9c1bb
 EBUILD gst-python-1.10.3.ebuild 1121 SHA256 7f451ae76de262b1383f95ec700be01a3c5e8b48bfa283cd424525167bba9322 SHA512 82a9e5b7ad9811d59cfebe0772b4003822bd179bad5d00ccbcdb4c9cb1e03ba57b9c116f0827c635ee3005c0bf4326f4d57ac51c77b7d941058a2e524ede4545 WHIRLPOOL 8a92d7d87beab2e4e3977455b21b73635885661c2e4f5ece4e9cbc674648be16e4087491c7f9844b7c712d98cafd35b361f100f7bc72a6134e71dc3ccf827525
 EBUILD gst-python-1.10.5.ebuild 1126 SHA256 bc7129b274d5602c5057279b495d006379368b275add16d8856acb662750ae87 SHA512 cc95c1e419634aa8b55cae379c7d57251281c9fe65a8b2ddf4e8d17ac113173f5c71ae0e602fc287408d60a0aba7450a5c0d9ef15db9fca3acd8556c53f9c702 WHIRLPOOL 2272e84b73cb036f8fe3dd335740b34c3afbe73a65cf7a2f4c278b211bb4ff7d7500edee4ebeae4affeeb0c38abafc9754adae836268c63c6b0e2a2cf71ecc1e
-EBUILD gst-python-1.12.3.ebuild 1130 SHA256 bc95a81e768952cdb5424a0b8eb0600c3b409e6713bfd26215d50100cd280e52 SHA512 b87d3ac5663d0bd7c8e67ddfa776ee19fcea80da1b598331a181c6e53e1a0fa0e36b5f707b1c8a26f854ff881e65bee5605d582bd73f4ca8e1ac04a8e1512d00 WHIRLPOOL 133c7068cf6ddab4f484029d35696dd3478ba12845f67bdc7f6380aa79ce480857d685cf6e604857d927752ae350d54cad5175509ac5561f69733ec5c18fe36a
+EBUILD gst-python-1.12.3.ebuild 1128 SHA256 fe56b16477a0e85f105becd205e1ab281e02c235b4498b99b04438ac9b9d32bb SHA512 9f7bb18118c6b95be31e000defd86d563551100a6e3a0ef04082facc2a7c443ed7df48518ea6f296026c14dd536ff76713dfd777193bbb45a2d665cf857eab75 WHIRLPOOL 4c010953dc789f268a8b938748096b4bc0cf7f0851b7d524cce982950e9c5785ffdcb90b84fd2d64b5b96ace179ab40b1e7bd49530532c452ad8a0ba3103d18b
 MISC ChangeLog 8901 SHA256 5b4d606ecd7d165a41fc1fd440ecf2a4f80f098db793db1d717b8a6b805be372 SHA512 8a818af9dcdcbc2daa50ad8abda2beabed387aa301e7acd8adda9119157f82ef1754eeb7ce923fbf6c9ae0399a6114946b60938282462f28e6e8ac11f99af22d WHIRLPOOL 3c3cb3912b79fe75e2aa41b4ea6fd1bd32a991826fb5e1481ded90eac868b314e3d04973417db3030027e006dc7b4c1a6d60a4f4d1b8a5f096a64828614354ff
 MISC ChangeLog-2015 19499 SHA256 faa35ccc2dcdeaf3f92a918338451aa330a6e7e959268cbf03d8a83f11a0de77 SHA512 93fbf1c4c68e5b7212ad6d310a8ed1d13710d4f2e8b7e92715d7303b6b7bf71362b0813962268e4b7abb21c9ef8f5789e0ad5fd129e96cfc2199d52de2d271c0 WHIRLPOOL e1cba65dd70b859bd351bd0634201adfbf91d00db882d03bc7439bc964d0ce17b66f6ad3b8433dbb483ca1c0e49bc3a1209fbbb2a5a410e51d9b35e28c6b1b00
 MISC metadata.xml 272 SHA256 c359e335e2d2a52e9d3462702b8e24475e6f1e6e62673d13cc64e4b49a97a059 SHA512 7dffa3bd729f24f9081f6b1c3db474cb26c54e95752a37140c5a9836299f26b3d0aa73e7c448e6b773478cb0112eaaf70f783d2b2f3d2868b1a2def8e6a9b8ea WHIRLPOOL 10927e64702cd2ed921e795e80c874379a66141393d5bcb46a86da71b47bbf9a04ecc0ff0dbd01d1d5634ae00b2f6af5c5ee17de8073a84e47b0daedde9bf618
diff --git a/dev-python/gst-python/gst-python-1.12.3.ebuild b/dev-python/gst-python/gst-python-1.12.3.ebuild
index e6bdbaf4242e..b8944d26f019 100644
--- a/dev-python/gst-python/gst-python-1.12.3.ebuild
+++ b/dev-python/gst-python/gst-python-1.12.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2"
 SLOT="1.0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha ~amd64 ~arm hppa ia64 ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 860495aa5043..9992a2f37bd7 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -1,8 +1,10 @@
 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.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.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.34.1.ebuild b/dev-python/hypothesis/hypothesis-3.34.1.ebuild
new file mode 100644
index 000000000000..4869c0b7b9eb
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-3.34.1.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/libnacl/Manifest b/dev-python/libnacl/Manifest
index 9d431ac2ff86..5bac43d8adbe 100644
--- a/dev-python/libnacl/Manifest
+++ b/dev-python/libnacl/Manifest
@@ -3,11 +3,13 @@ DIST libnacl-1.5.0.tar.gz 47386 SHA256 1af2bc9fab80bd264ed224d9c4cacb0514db2f202
 DIST libnacl-1.5.1.tar.gz 49383 SHA256 e44e9436e7245b0d8b7322bef67750cb7757834d7ccdb7eb7b723b4813df84fb SHA512 8bc5e0e15b35814249b69b6c1270fdf2c45af808c3315a6499b25a4861f0b21fe1840630a08cf808c8dc840f417736dee9d020d21d5d1d697b8644bc2645b12e WHIRLPOOL 0b4ec73546e3976a9fbca79db6e5bcbea5f90de202e3f83041c7b271f9f95d23980fe8020eb3505e8339c3b03d1dbc4f11b649f9b61979d5e86a9fdb4dbc6d46
 DIST libnacl-1.5.2.tar.gz 49573 SHA256 c58390b0d191db948fc9ab681f07fdfce2a573cd012356bada47d56795d00ee2 SHA512 f5d0827b621c0ddcb61041c3bb665d2c70f5fa400691128134d519fe454439648e7b2e36ab73b0cc827032461ad611e0834655c2f75e3cb3b53063c33aba8c1d WHIRLPOOL 926b6ced7bff0411ae3a4d060459f255fcc4af0eaa3fb41fc9cf60c7b93a0b8fb8128715ec2eb7160904e9e32267bcb3bd57ad91791229da8d906e0c07a6c92a
 DIST libnacl-1.6.0.tar.gz 39711 SHA256 5bee7374bcba132ae312928c3ad8049239e7c54bb745780c82634eb479f3c2ce SHA512 6f5202ca50bf30526bc51e2c528fe86aa412eff4b912d0b09da7f019de2929d2be2a9a8f80340849cf77b3593eae4fa96f2c0920b5201c5786f5009ad5f32c34 WHIRLPOOL 38f4b9dd1478376a48035270cae0480360b59daac24c43b0437103a92093c2edbbc74106155a226d9649deab58875f5a762730f70c8101942d9e030762b3034b
+DIST libnacl-1.6.1.tar.gz 39789 SHA256 0bde24d0a601464af4d3cc3117cf98b94046bfb01fe632f417a447b6899b11b3 SHA512 90fd9302cdfbe84acfc7dff0ac95eeb05fd1bb346cd8b220613174d5d1ae5f627be06b4d588fd4a939c49a119ca557d68a06d3cbe1c0d409a253fdca96d944ac WHIRLPOOL 794a47b575fc589d5e2e6fb133c1f666f1834156f7b479ed1ee03cff7b2ef2ed0164cff0de42f326074406cdb99807148f963112369169090329863a948e0dfb
 EBUILD libnacl-1.4.4.ebuild 514 SHA256 5014e1f8afefc4923967992f5dcdb2a2797b92a6beff41847dcd9edc45a2d5b0 SHA512 2d1cde34848085f3388246464ef19deb02a92e2de16413fb539e086a6c61f28b553f3b1ccfb1410455618151f48c69bb5062e5adc5ff76efcf39eeb55fbdc318 WHIRLPOOL 9f265f5d41ddc8e58e0515565bacd51f08cdad37427f7a2ee31b971aa7278d5cf134743bd557ac7c648e063dc61e60d71cf91292eb7fc4e8cd21bc5974e69084
 EBUILD libnacl-1.5.0.ebuild 520 SHA256 733aa1dcd118b1eaad3618dc6b1ae964279282b244ce8f28bb322f4e6c1867f4 SHA512 ac3d78c6d234b56213fe46025d56fdac38b4ba2e8cde29dd4e085795c090d70f00409d7444dae13c75116e230269cecd8d3d29e524f70c2d6c129c840c9542bf WHIRLPOOL 668fba0c4a543f6278ffe4b3d4aa2d62d4ee0448fee72c4f4c5edb80b12bc292d06deaa51426953086daeeb90ada34f6fed5dbda9083ee248e8bb94dfeece4ff
 EBUILD libnacl-1.5.1.ebuild 520 SHA256 733aa1dcd118b1eaad3618dc6b1ae964279282b244ce8f28bb322f4e6c1867f4 SHA512 ac3d78c6d234b56213fe46025d56fdac38b4ba2e8cde29dd4e085795c090d70f00409d7444dae13c75116e230269cecd8d3d29e524f70c2d6c129c840c9542bf WHIRLPOOL 668fba0c4a543f6278ffe4b3d4aa2d62d4ee0448fee72c4f4c5edb80b12bc292d06deaa51426953086daeeb90ada34f6fed5dbda9083ee248e8bb94dfeece4ff
 EBUILD libnacl-1.5.2.ebuild 520 SHA256 733aa1dcd118b1eaad3618dc6b1ae964279282b244ce8f28bb322f4e6c1867f4 SHA512 ac3d78c6d234b56213fe46025d56fdac38b4ba2e8cde29dd4e085795c090d70f00409d7444dae13c75116e230269cecd8d3d29e524f70c2d6c129c840c9542bf WHIRLPOOL 668fba0c4a543f6278ffe4b3d4aa2d62d4ee0448fee72c4f4c5edb80b12bc292d06deaa51426953086daeeb90ada34f6fed5dbda9083ee248e8bb94dfeece4ff
 EBUILD libnacl-1.6.0.ebuild 552 SHA256 fd9c931813e6847c83923824d489a639cd56fb9496e1dfde98d3a8618da9acb8 SHA512 137a499d467aee62aa53f25b23256360c8d2ba871659f0e5be5ec0ecfa60b5c79e32957d6b47ff5530dde84b4bfdad5f8d2623285b2737897bc937c436b72027 WHIRLPOOL 70fcda034a1f38a338ce50e6f7c57b052f8492db67b58321ea54cd4c0481a8eb5ea3781ea253850d948659b01d726baff75ca4a5e7ca443943d011fe63e8999c
+EBUILD libnacl-1.6.1.ebuild 552 SHA256 fd9c931813e6847c83923824d489a639cd56fb9496e1dfde98d3a8618da9acb8 SHA512 137a499d467aee62aa53f25b23256360c8d2ba871659f0e5be5ec0ecfa60b5c79e32957d6b47ff5530dde84b4bfdad5f8d2623285b2737897bc937c436b72027 WHIRLPOOL 70fcda034a1f38a338ce50e6f7c57b052f8492db67b58321ea54cd4c0481a8eb5ea3781ea253850d948659b01d726baff75ca4a5e7ca443943d011fe63e8999c
 MISC ChangeLog 2917 SHA256 c469c55aa1de9d7839b81986966e75270ed63a2f76a49fa0a405f480d8dd63be SHA512 fb55c0243e457d543bd133e8aa2b267c2cc9db72c00663389a52f567efc085a80e9e2af67804850a61fc442942cac4778cecd1d59d118ed930449fbeb7cef42b WHIRLPOOL 047b92442839784f45935736ddacdb21747d6456106fe52e3c7a0371f8193cb7a797e6877e0ed4df751b00f98d8bd0dda757e0806b5ba243a7b87d70bc8b8325
 MISC ChangeLog-2015 901 SHA256 cd39a114539571cde9c295ac0775d6f820eeb22995cb824a96d4b66640c8c437 SHA512 24afdc8b8e1b440f648dcf87f464b42ddb4afd4110b710dadf7a01b35254619ea4b74071a0b13ac7e38095b4b757f7dbfc670190b53d59c340cf579c855a1d4d WHIRLPOOL 42956de2340506b52d5e33de409b45c9e7fa7d08cc46a364f66d23c360059e0c814f616e22a22885757ed859659972b8301b6efb817156cd9b05a0de2f65bebc
 MISC metadata.xml 436 SHA256 c988eeecd5cc7f58c8c77f16c39a5d0cdccb9e6aa00f67561aba3e6077115a74 SHA512 f8a241e4d71d6d6c682f019d086e4effa58608430a5df8c2f70c29cde07124fec2c37b8c63411b19e50baf2b5486a88ec696e4499e47e64936212f6dce938a2c WHIRLPOOL ce8cfb495e00f54a1b6f9c64fc22029d63c0ddd44e2961bc5629439b0089e9f022a6eed25670cb7f9a2303eebe9c581e63bedea48541c91fcc5adbce30121925
diff --git a/dev-python/libnacl/libnacl-1.6.1.ebuild b/dev-python/libnacl/libnacl-1.6.1.ebuild
new file mode 100644
index 000000000000..19dc1f1821e4
--- /dev/null
+++ b/dev-python/libnacl/libnacl-1.6.1.ebuild
@@ -0,0 +1,22 @@
+# 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 ctypes wrapper for libsodium"
+HOMEPAGE="https://libnacl.readthedocs.org/"
+SRC_URI="https://github.com/saltstack/libnacl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-libs/libsodium"
+
+python_test() {
+	${EPYTHON} tests/runtests.py || die
+}
diff --git a/dev-python/lxml/Manifest b/dev-python/lxml/Manifest
index 0e26da36eb7a..39f02e3cf25e 100644
--- a/dev-python/lxml/Manifest
+++ b/dev-python/lxml/Manifest
@@ -3,9 +3,11 @@ AUX lxml-3.6.4-fix-test_xmlschema.patch 1483 SHA256 6f44d53b78ac07cdd87cd3653d23
 DIST lxml-3.8.0.tar.gz 3795205 SHA256 736f72be15caad8116891eb6aa4a078b590d231fdc63818c40c21624ac71db96 SHA512 08f6f352e22ed2bc199a5f34a1c6b5f7b41ec282dc0026c9f16a06466c27e39e8eb18608ba4493636170eeac4b0194f7050445e1cc9bd0a4628573c404593088 WHIRLPOOL b09d7509ca55df74c5ced03ca91b72e0f373df6cb22331a452a35cfe3aa305bb9417280ae0b4835cd4abd29f7df465468799fa25c1b8d732152222c74fee51e1
 DIST lxml-4.0.0.tar.gz 4217301 SHA256 f7bc9f702500e205b1560d620f14015fec76dcd6f9e889a946a2ddcc3c344fd0 SHA512 8aa85ab6a99097ae2eaa0087b3a663aae8ac81a0a4d685bf857571c811c8ccd6410afc414f14c68702a53e90265726af085d0609ec7f0d3cc96e3702772627e8 WHIRLPOOL 24ad26d075ecf8f7062a6aa695557628664ce9d23cee7f66218bc373c90feec07bdf8a7f6e4501b996bd4bb208ca173faac1609262c08c6313f5a2d155eed220
 DIST lxml-4.1.0.tar.gz 4247102 SHA256 be3aaeb5f468a49f523f16736ccff7d82af2b4b303292ba3d052b5b28f3fbe47 SHA512 c4a1180a119ec2d21ab29d00cf60e72ca38a2c28eca4f221251d0fd1c481650fe78ec975532c38a6a59c441bb6f6469bbb110b6b0e9d6b6fffd68dbcad90fcb6 WHIRLPOOL 5e6ab72f5c93ea3e3cb47d530d71e3c41f7724e083e000bc3108974d501b9a387fe368ec1a441f4e9b64fe71fd2b11b540fd78cd659c0761c034e463500078ba
+DIST lxml-4.1.1.tar.gz 2380804 SHA256 940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a5cfd0f40e SHA512 9542e5206f9b2f9e072c52ef8e6cf44d1aaae8ae3e7ca7e820c1fac12e716503308ccb3cebc52155b4c93799f3ebca247781fc491524d004378bd26f5cddb9d1 WHIRLPOOL f5b723f5587ca340151a5524096ae8b1cc834d555cc227d13d77742b3b8f53862583c990c6784d91502957ead351342e6fda56f0b14a60be04616ae40939fd88
 EBUILD lxml-3.8.0.ebuild 2254 SHA256 c2f8ec55283ff70da5ceef74fa9900736d4badef700dc3d47414161a62fcd26a SHA512 bd042b2a97d121436bc890f017b908510e4c199a37524c0497c0adb0d81071c3061f67b0f9fc1435def6d47cd9a4970e9f7f94aba9a629b8964d351a7d58b75b WHIRLPOOL 7095b783b48e379e2de8ae2cd5897e519b93ddec199978b74c425bfef7c8e07b9ed6c69ea1f3953fd12e57048d6d95fec5a094855a4146597382629c0dafe2f1
 EBUILD lxml-4.0.0.ebuild 2264 SHA256 06ca03fe985b78c67c8da68fb9f8a0ac321b08d880e96d3f3ce3a0af1ab9ea2e SHA512 0d03174c227a945680fcaa13ba8ba1f28981b52a8f45693564b258b5f8966217eda13dc4e72307394ae4de0696e34f977b62bfba01d547d893bd9d1dd6a08cf6 WHIRLPOOL 958a8e6d94728bdd46ea1dda4d6e37b6cb169db602a586cabca303f41b0f34c3989c2b1e949df133892014b47b5c4e646a59a0621dade74b4eda9d51febf26f5
 EBUILD lxml-4.1.0.ebuild 2264 SHA256 06ca03fe985b78c67c8da68fb9f8a0ac321b08d880e96d3f3ce3a0af1ab9ea2e SHA512 0d03174c227a945680fcaa13ba8ba1f28981b52a8f45693564b258b5f8966217eda13dc4e72307394ae4de0696e34f977b62bfba01d547d893bd9d1dd6a08cf6 WHIRLPOOL 958a8e6d94728bdd46ea1dda4d6e37b6cb169db602a586cabca303f41b0f34c3989c2b1e949df133892014b47b5c4e646a59a0621dade74b4eda9d51febf26f5
+EBUILD lxml-4.1.1.ebuild 2264 SHA256 06ca03fe985b78c67c8da68fb9f8a0ac321b08d880e96d3f3ce3a0af1ab9ea2e SHA512 0d03174c227a945680fcaa13ba8ba1f28981b52a8f45693564b258b5f8966217eda13dc4e72307394ae4de0696e34f977b62bfba01d547d893bd9d1dd6a08cf6 WHIRLPOOL 958a8e6d94728bdd46ea1dda4d6e37b6cb169db602a586cabca303f41b0f34c3989c2b1e949df133892014b47b5c4e646a59a0621dade74b4eda9d51febf26f5
 MISC ChangeLog 11862 SHA256 6fd242f3eee218860f8744e0c5656c51599e9a80cbc75e12c954a543a03ead94 SHA512 220b3df834fd4e8d85cfc46bec8a414042c06d4cd05efa887f619e855b452c7e69c7713d70478cdea9264a83f5012b5f0d0604c7511e07f495d8a0d02ae0a721 WHIRLPOOL 9771d6651fa6a474fd3e234504e419b18f9d1e266253bef4b6500e33b3d3c477aca2d2d45d6b72b9fbd144f6e9875700df0cf84e96c45482ad228e3eb89da280
 MISC ChangeLog-2015 27655 SHA256 585c3b7babb59fabf24b0bbd3abfa0abbe5f35c92faaccb0df995c61b5878b24 SHA512 0a05a247257042ba708d9914e6757aa60ece30eb67d1892b164f49d2d2825d467b4fe60396bbbadb692fc0a6f11e28efc8b6cce6176966a9e4f4669b1fff651a WHIRLPOOL d031211ffd5cc010d16cc3d872a6ed17d348103302f65e7ecb9af1082659f85e6b65babf36ec347ae1c03cf8822d71bc679eb6738bbcb892d8dbeeb322c34082
 MISC metadata.xml 317 SHA256 cd18e04d042e1f29961f6fd28916572028bba9f9fc0dfe26da78c3347b4d49e9 SHA512 900609bfd7cd032821afb5d1f6e5c25287178f06a49e59431a710d4e76187a2b41a4a0da383d257777a2120b60f15620da37c70d145eca4a84aa30a08b824fae WHIRLPOOL 093286f5009a9dff327e1f6931f18e9081a7972a86ed88d1f04f612d68e9dbb94bc5847c8430554ffb29a51cc0b233de03d82f8d4d086a116a124826faeabcd7
diff --git a/dev-python/lxml/lxml-4.1.1.ebuild b/dev-python/lxml/lxml-4.1.1.ebuild
new file mode 100644
index 000000000000..2ab0055cd819
--- /dev/null
+++ b/dev-python/lxml/lxml-4.1.1.ebuild
@@ -0,0 +1,80 @@
+# 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 eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries"
+HOMEPAGE="http://lxml.de/ https://pypi.python.org/pypi/lxml/ https://github.com/lxml/lxml"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD ElementTree GPL-2 PSF-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc examples +threads test"
+
+# Note: lib{xml2,xslt} are used as C libraries, not Python modules.
+RDEPEND="
+	>=dev-libs/libxml2-2.9.2
+	>=dev-libs/libxslt-1.1.28"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/cssselect[${PYTHON_USEDEP}] )
+	"
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.5.0-cross-compile.patch
+
+	# This patch removes a testcase that fails because of issues
+	# in libxml2.
+	#
+	# Upstream bug: https://bugs.launchpad.net/lxml/+bug/1608479
+	"${FILESDIR}"/${PN}-3.6.4-fix-test_xmlschema.patch
+)
+
+python_prepare_all() {
+	# avoid replacing PYTHONPATH in tests.
+	sed -i '/sys\.path/d' test.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	if [[ ${EPYTHON} != python3* ]]; then
+		local -x CFLAGS="${CFLAGS}"
+		append-cflags -fno-strict-aliasing
+	fi
+	tc-export PKG_CONFIG
+	distutils-r1_python_compile
+}
+
+python_test() {
+	cp -r -l src/lxml/tests "${BUILD_DIR}"/lib/lxml/ || die
+	cp -r -l src/lxml/html/tests "${BUILD_DIR}"/lib/lxml/html/ || die
+	ln -s "${S}"/doc "${BUILD_DIR}"/ || die
+
+	"${EPYTHON}" test.py -vv --all-levels -p || die "Test ${test} fails with ${EPYTHON}"
+}
+
+python_install_all() {
+	if use doc; then
+		local DOCS=( *.txt doc/*.txt )
+		local HTML_DOCS=( doc/html/. )
+	fi
+	if use examples; then
+		docinto examples
+		dodoc -r samples/.
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "Support for BeautifulSoup3 as a parser backend" dev-python/beautifulsoup
+	optfeature "Translates CSS selectors to XPath 1.0 expressions" dev-python/cssselect
+}
diff --git a/dev-python/m2crypto/Manifest b/dev-python/m2crypto/Manifest
index 1e210c00e7cd..83f9b3f7410d 100644
--- a/dev-python/m2crypto/Manifest
+++ b/dev-python/m2crypto/Manifest
@@ -2,10 +2,12 @@ DIST M2Crypto-0.24.0.tar.gz 184457 SHA256 80a56441a1d2c0cf27e725be7554c92598b938
 DIST M2Crypto-0.25.1.tar.gz 300904 SHA256 ac303a1881307a51c85ee8b1d87844d9866ee823b4fdbc52f7e79187c2d9acef SHA512 096d414efd5558f9ca4cebf46a297fa39f799e35c4325e031ee816689345e041370f2129650a10db66ebfcfe64309a7c7b49082306567baaf003b88ed9d60bda WHIRLPOOL c634685f8e096c41fc6caf9b364c5393b8f62fb585cd63f7599bb9cc10f910eb25cf48772616773ad9708d1f0fc25f139ee897d925d18432a03e18db552bfe7b
 DIST M2Crypto-0.26.0.tar.gz 305914 SHA256 05d94fd9b2dae2fb8e072819a795f0e05d3611b09ea185f68e1630530ec09ae8 SHA512 f6ba0173833d1b9a318402a3445fbb522f1848c7406face0cc08d384de6b6944395737f5871353ca1488c6655be7ffb0ad7b40b5e98d5954858da4540590d242 WHIRLPOOL 9984e4367ecca0e0fe2ca94db69db817660c9b045bdd45e117ffe23fb8ea5e522c342e08738328ed2769ee85d215e22d42e33ada806bf9de6555e28d4d31cc7c
 DIST M2Crypto-0.26.4.tar.gz 1116587 SHA256 5cae7acc0b34821f8c0ddf6665e482893fe1f198ad6379e61ffa9d8e65f5c199 SHA512 632b71850edd4f4e32d6d3aa83cb0e8068654c087498c88265f999180e0c58917aa6d29c5d1033f597397da98c3dc9acb9d21feddbb2f3da25a368f6a0af60f9 WHIRLPOOL 9388b016cf47f849379ef47a1819a9ee4fd647f8491a61e7381107032ba0e57f28bf6ebca868cf8cc6e4d6fb9341c77a01bc620b5133ea6e689aab72349a07d0
+DIST M2Crypto-0.27.0.tar.gz 1119288 SHA256 82317459d653322d6b37f122ce916dc91ddcd9d1b814847497ac796c4549dd68 SHA512 df0f6b16f7d00a19fafbb5da5a3ececff6b4627accd00ca65e0d6f9e752a97f41016d0072c8e681475fe1d87c89b7474067068c0bfce6c68a30baddeb31bfac2 WHIRLPOOL 678f19d7bcd0663b704761a78b8e2d39a1c62450f99d5b0aa513e8b8af717ef1935b274eef99d4e027e8e5992887806bd270fcba02fd3e650f086f8b87f5adc7
 EBUILD m2crypto-0.24.0.ebuild 939 SHA256 bfa6031ec861a3e04bcd464b379d90a803958ba2e4034dd85721c5b7f734490a SHA512 b5f7ae379e997a56934130c4b14b9357773904e19ec5357b93de6ab144ec7faeabfb19def44e5c8460d56fbc3b59287121f75b008f83b83e71aaf41e5d26823a WHIRLPOOL f60473c26e42124d24747d86535cea9e77e34dc975d46b53e47ae0d59a37cfffdb827eaeb2539528b0250fae5d03da4ddf34cd31496d0ef77f1558e420f48be4
 EBUILD m2crypto-0.25.1-r2.ebuild 872 SHA256 144e7206804b5044ad294ae816448f3e60b9ca8d1263aaa2482e316794face3b SHA512 73f1f2d87a9bddce1d2ab241801f78f9891b3be29dbc90803c4571fb5852d8179b8e945b7682e2ff69224dfe16ef9e2e4d046c5f604cfc18aa3f0a37d4fcbb26 WHIRLPOOL fa6e055d35d48e6e5fe6d07dfcdffa4ad12fc4922b57894b365b0bd1fa5f3b1c781b64653f31d24404023fa8797d3b50ee9f54f6874a6908a40ba56752fcfd61
 EBUILD m2crypto-0.26.0.ebuild 997 SHA256 3b2c1c5998f7916f1c65b60fb6d59b1083076956b823f18ab2ec883c3855b8d8 SHA512 a7569727bb1b958ab175d88f919119fc03e48c09931d83390b35d23dcb6e8ee4492df06ea6192315ccb86d8235f0597657c56c9ee1823ff4688719398d2eae7a WHIRLPOOL 463fed62e2fd8e3776d2b917313f30bfdff835f01dee1aa6ea64c8ab8cea9ce6535e7eefdf9d98d5b732e459cf3397d1c2294b2c57f1365ebcff83563e8d8a3e
 EBUILD m2crypto-0.26.4.ebuild 997 SHA256 3b2c1c5998f7916f1c65b60fb6d59b1083076956b823f18ab2ec883c3855b8d8 SHA512 a7569727bb1b958ab175d88f919119fc03e48c09931d83390b35d23dcb6e8ee4492df06ea6192315ccb86d8235f0597657c56c9ee1823ff4688719398d2eae7a WHIRLPOOL 463fed62e2fd8e3776d2b917313f30bfdff835f01dee1aa6ea64c8ab8cea9ce6535e7eefdf9d98d5b732e459cf3397d1c2294b2c57f1365ebcff83563e8d8a3e
+EBUILD m2crypto-0.27.0.ebuild 997 SHA256 aedec5c6c3458ac9f77131121a81129349af0dc211813b5e13a0459a8f4ccf64 SHA512 5c4f80de77ae3f46a9f5396842aa6a3eb3d39f6af375f004a60158637b3f8b7f5d2d62e6ae59d07742bf6384143affeef23be50d07d9f8e72e53df71bade20e8 WHIRLPOOL f600170c3ef19f2ac8c32fd70423fcde65b9bd523c7dbf86ea7e10628855119ed406191b5c7208129370a18c975221240ab8196d9d1bffa9be04162dc70708af
 MISC ChangeLog 4266 SHA256 cb2c5c4b7e3f369ff5771668f735d21ccb7220e0d4f0087823cbf857571e7694 SHA512 ddd1c2a62e02a76067b9dd7c78f6c0db466938118f89ac3e0fe80dcbb1836157fdf845b3a71c14730d18d696555ebb9ccaf724be9c7935dd549f43d30e2f9c8f WHIRLPOOL 176157383668d784462e09697ecbf240110622b7f63eb423ab85c684beb3452e3cb177814c6925864607901377bef1fc48d32931254cfe36d9d58c6842f4d1d6
 MISC ChangeLog-2015 14785 SHA256 bc1f5e8965bd259e09aca3df7f1f04e5730b88839a8624159adfd0098202b627 SHA512 fc570db891f03ca71c118ce6662fcad9a219d15d2dde18b3d914aeecd1108783abf2f4659e96e3f5e8aa6cb4bf476bd7f98f1975fd395411e5725118013f82b9 WHIRLPOOL f6a6a35ab0566f54b3d49bf5714c8173a0ab9a91114a25ff508507469c6d538869231119b338e9bb9ad7baae81e62aedec3978e5292b8e4089c849d6e0e973fa
 MISC metadata.xml 380 SHA256 5ab7583a3fb8617ce68eb175d57b6a1ba951baca62d0179d80f63aca9eba3635 SHA512 f2e3b4228c45471f0132b3bb412f017f4006eb82bd63e187db3efdfd3f412c1db19bdb79d37630bb059f75ef69f110687b8924d22c2aef0101cb40eb3486f1e6 WHIRLPOOL f7bbc7ad82ae17374b32f1606bbf8960c799800debf709111abffb1df8da39d4492038dbeb3e3eb135f81f43038615d6d0fc0810151a58d5c27a3936237df9da
diff --git a/dev-python/m2crypto/m2crypto-0.27.0.ebuild b/dev-python/m2crypto/m2crypto-0.27.0.ebuild
new file mode 100644
index 000000000000..5745a2aafe43
--- /dev/null
+++ b/dev-python/m2crypto/m2crypto-0.27.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+MY_PN="M2Crypto"
+
+DESCRIPTION="M2Crypto: A Python crypto and SSL toolkit"
+HOMEPAGE="https://gitlab.com/m2crypto/m2crypto https://pypi.python.org/pypi/M2Crypto"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+
+IUSE="libressl"
+
+RDEPEND="
+	!libressl? ( >=dev-libs/openssl-0.9.8:0= )
+	libressl? ( dev-libs/libressl:0= )
+	dev-python/typing[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	>=dev-lang/swig-1.3.28:0
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+# Tests access network, and fail randomly. Bug #431458.
+RESTRICT=test
+
+python_compile() {
+	distutils-r1_python_compile --openssl="${EPREFIX}"/usr
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index 7556ba0c4c3b..8c3ff6313df5 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -8,10 +8,12 @@ AUX matplotlib-2.0.2-nose-fixes.patch 586 SHA256 744722572f56fd020a54ba4eaff2a59
 DIST matplotlib-1.4.3.tar.gz 49933525 SHA256 5b9544472d9d6ab3d47423bdb5a0e64fdf913e505c1c083f25283dd0362bc0b6 SHA512 51b0f58b2618b47b653e17e4f6b6a1215d3a3b0f1331ce3555cc7435e365d9c75693f289ce12fe3bf8f69fd57b663e545f0f1c2c94e81eaa661cac0689e125f5 WHIRLPOOL 160ca48ecb44db58f1c56bd6e89592c5d1badd8e434fc25d32aa6d4d7a346ae7c7444d1c8e0c2ca2bf5c3246fd56cd93856ec7b1e3e51f5e471b9b55a0f2c1ad
 DIST matplotlib-1.5.3.tar.gz 51606089 SHA256 a0a5dc39f785014f2088fed2c6d2d129f0444f71afbb9c44f7bdf1b14d86ebbc SHA512 553be9f661a1923d8ec7504a11dd3317e5ffb429c19339c58047715f4c28358d6d2ac38d46bd27ecd1dcf7159f157aab80d90713fbc4071e2e395bbf11ee6385 WHIRLPOOL 7e2b0472bb7d913e78260da95c93c3243562e76352790318286e5d194f88ac05a9f51fa029a7b0ad17bbbbd0dc9658769fe6301b544ec03f1ab5c205835ea894
 DIST matplotlib-2.0.2.tar.gz 53879938 SHA256 0ffbc44faa34a8b1704bc108c451ecf87988f900ef7ce757b8e2e84383121ff1 SHA512 39d68aee87fac2c246cdee7941ffaae1b8d586fa75c351bc94f963def66df32c3aba13fa0be94e1f8d21f06e068565b1a79c6d4f65589d8dd23cd48b32ab474f WHIRLPOOL 5ab8f9edb4591205d61bd47c5125520c0d24b8ce44e0041b99a5a0c692ffd3ff581cd6e092d18a64ddf6fb4f43ace6ee8c2bce19f5acd01d022d8a46e472b2df
+DIST matplotlib-2.1.0.tar.gz 35727251 SHA256 4b5f16c9cefde553ea79975305dcaa67c8e13d927b6e55aa14b4a8d867e25387 SHA512 8f512400f1f15d5400e23dd8e402783c54f62567d412863530a982c6513206d49fb91fadb3ef477648a4a38d6dd032eb90741ff4495d2be71911f83677d768b4 WHIRLPOOL 4795f3d49e3a624a22debe738cbe42ce3594c91880b3e6273f7ee05ecb7016353550cb39367f1edc6588d0e75d227d79f29af709e9471147171dd7ea5b6aa687
 EBUILD matplotlib-1.4.3.ebuild 6150 SHA256 a9aac5050e5e2b85e2dabc87ff854b1a6a1f2f93ba752497357aa9323c40d34d SHA512 9e6e415962ad4e3699bde4b2e9701ca9141a72bb7d1c9097e3bda541c2d618524eee7a64ddc22a13f2d228c2e32296a4d88592ffb6ecdb366c590f70e01a2b46 WHIRLPOOL aee3d4046f0554a4f6f45359826961bac81d95f1533c40dedf5232f27e4e3b751fddb54285c20b69ee40c5abd79cb5dbe7a833e88775b339cc98296468c7e2b7
 EBUILD matplotlib-1.5.3-r1.ebuild 6411 SHA256 1e382cc3c6ef71005b07259d2c06d64be30b21228dda6ee4ede4dba09d0c0d58 SHA512 2b82734df065dd850ab99e4a19ed8001c45f9f9a472c54b29930f2b2447b77a2b5b2538c75d8c940d1fc5ffa774ddcb85b065bca923e9a46c4feacab0c3764af WHIRLPOOL d0964372a2796304505e7d8761f4b0d401513569f50386c9b50a3550e0a1080ffa75aed9aec897a2ae7d56216c6e7a08983acc70c51ea4b49464999da2dff121
 EBUILD matplotlib-1.5.3-r2.ebuild 6559 SHA256 6b5eee62e57b305290e0e1e64a3ed37242f3236d2cbcfdf6705e26695d95a89d SHA512 00b3fc17023fa04a4e7dc35e3c5752f0e4b16ca1edd21138448ea9e44d843762b7111a018b002fea762b6c6914f1171d72054da52427572c25d87f1c2157c537 WHIRLPOOL 6639184ce4dcfa65aa3647af85582105428e1c3fbb381873af738e5eea56c53619dc88bd3e5ca2a6b8032679ce0f54ea365144a5dbac3e4bb45ef8e9bf774ead
 EBUILD matplotlib-2.0.2.ebuild 6182 SHA256 bb37b2e70a7157fc15da9afb9fb2598e35ccd9ff13cc07388c58dec3abad56e7 SHA512 ab6b634f44041f3dc17615acece6bd8066842c42203a28bad2dca4923ac3ea969eb57354f59aac417f575aaee2c6d2f77ec0384dab08ee6776106d7971078f66 WHIRLPOOL 80314ec11af2a9f06eea0e35c47c9244e6d7dbda46bb16fa859b384fa61ec105de317a1f5cb37a9a8e4f13f723ca63e08dc4509540e52a044727050f8f89c089
+EBUILD matplotlib-2.1.0.ebuild 6071 SHA256 ff5ffa4cb211dc0e032a119387c4cdf2aec9a4abffd1406003717231b1e2f7c4 SHA512 fe2f89b32566e3dc4574aa950a059b4083692c064424bab96ba732baa58449366504401366815be64b981be5eafa9957c14c4f57ba9b1c0a76a2eb96acbdf404 WHIRLPOOL 4382ac0478479b4a919716b3b0474bd3ce1cde260a717a0284081c43858f3c20c57b8cb794c34ee6aadb579491a79902cfbabaed21019f960ebb0c33d78a4e02
 EBUILD matplotlib-9999.ebuild 6396 SHA256 85daf537315da546a0b98cc4a4da704047d8499b17a9358f4ad732a58434b2f9 SHA512 1a6406602fabea4b12911a89d34e69fed7b418c3127dac5679ebfe706e144aa62c93f3aa19ca832d75fdff0b4f2c5e5029a92ed3e1a8fa6bd61973cedf5504cc WHIRLPOOL daf26233c729a7e37d8aa6e3ac33301635215d78adc475eb2397b253868cbfd556a9d6c421980abd6ba3d217b7c4490ee1441f852f5925f2b2e89ece721faa76
 MISC ChangeLog 9810 SHA256 587f82b153d9c79045205c763ff839c4c4efafc28c9ce8c1f55181284b5ca10a SHA512 0d520483f15b6775938e767a926902f828d2626b80028a34f92ee19bb9b1c9d034e6bfa92b89b1d6ba190d2bd34f4d00db7d83571af00d3d799d2204471b42d3 WHIRLPOOL 274049289255cf08568a5eb30d1e21e3d59a6abc974b47afb0ed5c615a4fec52858cf0522174b723889e09b017b464df1266fe7a6e34709d20014923262d717c
 MISC ChangeLog-2015 33930 SHA256 1b276064ae4242da1737e4b42495a7b1de60d177e0d8fcc109708ecc3e6da847 SHA512 f9d4ceb0794bb4477e373f1b4edec0f7490ffe34a8ec536eb269991c98478f9b43fdf0d942da8c8b5c081cbd2bc839ff7ee681d52f0cfad072d117e507a5f66c WHIRLPOOL 3c23403904f9a52119a3f3c2212059b685fb0475f6c42c04148f53e717a9eb5f9ed070f41c5eae6b4026a28e26f541b24191a30c057d35b055237dbf5f1a2bc0
diff --git a/dev-python/matplotlib/matplotlib-2.1.0.ebuild b/dev-python/matplotlib/matplotlib-2.1.0.ebuild
new file mode 100644
index 000000000000..766e5f93a001
--- /dev/null
+++ b/dev-python/matplotlib/matplotlib-2.1.0.ebuild
@@ -0,0 +1,250 @@
+# 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='tk?,threads(+)'
+
+inherit distutils-r1 flag-o-matic virtualx toolchain-funcs prefix
+
+DESCRIPTION="Pure python plotting library with matlab like syntax"
+HOMEPAGE="http://matplotlib.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+# Main license: matplotlib
+# Some modules: BSD
+# matplotlib/backends/qt4_editor: MIT
+# Fonts: BitstreamVera, OFL-1.1
+LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="cairo doc excel examples gtk2 gtk3 latex pyside qt5 test tk wxwidgets"
+
+PY2_FLAGS="|| ( $(python_gen_useflags python2_7) )"
+REQUIRED_USE="
+	doc? ( ${PY2_FLAGS} )
+	excel? ( ${PY2_FLAGS} )
+	gtk2? ( ${PY2_FLAGS} )
+	wxwidgets? ( ${PY2_FLAGS} )
+	test? (
+		cairo latex qt5 tk wxwidgets
+		|| ( gtk2 gtk3 )
+		)"
+
+# #456704 -- a lot of py2-only deps
+PY2_USEDEP=$(python_gen_usedep python2_7)
+COMMON_DEPEND="
+	dev-python/cycler[${PYTHON_USEDEP}]
+	dev-python/functools32[${PY2_USEDEP}]
+	>=dev-python/numpy-1.7.1[${PYTHON_USEDEP}]
+	dev-python/python-dateutil:0[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10[${PYTHON_USEDEP}]
+	dev-python/subprocess32[${PY2_USEDEP}]
+	media-fonts/stix-fonts
+	media-libs/freetype:2
+	media-libs/libpng:0
+	>=media-libs/qhull-2013
+	cairo? ( dev-python/cairocffi[${PYTHON_USEDEP}] )
+	gtk2? (
+		dev-libs/glib:2=
+		x11-libs/gdk-pixbuf
+		x11-libs/gtk+:2
+		dev-python/pygtk[${PY2_USEDEP}] )
+	wxwidgets? ( >=dev-python/wxpython-2.8:*[${PY2_USEDEP}] )"
+
+# internal copy of pycxx highly patched
+#	dev-python/pycxx
+
+DEPEND="${COMMON_DEPEND}
+	dev-python/versioneer[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	virtual/pkgconfig
+	doc? (
+		app-text/dvipng
+		dev-python/colorspacious[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/mock[${PY2_USEDEP}]
+		dev-python/numpydoc[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/xlwt[${PYTHON_USEDEP}]
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-latexrecommended
+		media-gfx/graphviz[cairo]
+	)
+	test? (
+		dev-python/backports-functools-lru-cache[${PY2_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		>=dev-python/nose-0.11.1[${PYTHON_USEDEP}]
+		)"
+
+RDEPEND="${COMMON_DEPEND}
+	>=dev-python/pyparsing-1.5.6[${PYTHON_USEDEP}]
+	excel? ( dev-python/xlwt[${PYTHON_USEDEP}] )
+	gtk3? (
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		x11-libs/gtk+:3[introspection] )
+	latex? (
+		virtual/latex-base
+		app-text/ghostscript-gpl
+		app-text/dvipng
+		app-text/poppler[utils]
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-xetex
+	)
+	pyside? ( dev-python/pyside[X,${PYTHON_USEDEP}] )
+	qt5? ( dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] )
+	"
+
+# A few C++ source files are written to srcdir.
+# Other than that, the ebuild shall be fit for out-of-source build.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+pkg_setup() {
+	unset DISPLAY # bug #278524
+	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
+}
+
+use_setup() {
+	local uword="${2:-${1}}"
+	if use ${1}; then
+		echo "${uword} = True"
+		echo "${uword}agg = True"
+	else
+		echo "${uword} = False"
+		echo "${uword}agg = False"
+	fi
+}
+
+python_prepare_all() {
+# Generates test failures, but fedora does it
+#	local PATCHES=(
+#		"${FILESDIR}"/${P}-unbundle-pycxx.patch
+#		"${FILESDIR}"/${P}-unbundle-agg.patch
+#	)
+#	rm -r agg24 CXX || die
+#	rm -r agg24 || die
+
+#	cat > lib/${PN}/externals/six.py <<-EOF
+#	from __future__ import absolute_import
+#	from six import *
+#	EOF
+
+	sed \
+		-e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \
+		-i lib/matplotlib/{mathtext,fontconfig_pattern}.py \
+		|| die "sed pyparsing failed"
+
+	hprefixify setupext.py
+
+	export XDG_RUNTIME_DIR="${T}/runtime-dir"
+	mkdir "${XDG_RUNTIME_DIR}" || die
+	chmod 0700 "${XDG_RUNTIME_DIR}" || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	append-flags -fno-strict-aliasing
+	append-cppflags -DNDEBUG  # or get old trying to do triangulation
+	tc-export PKG_CONFIG
+}
+
+python_configure() {
+	mkdir -p "${BUILD_DIR}" || die
+
+	# create setup.cfg (see setup.cfg.template for any changes).
+
+	# common switches.
+	cat > "${BUILD_DIR}"/setup.cfg <<- EOF || die
+		[directories]
+		basedirlist = ${EPREFIX}/usr
+		[provide_packages]
+		pytz = False
+		dateutil = False
+		[packages]
+		tests = $(usex test True False)
+		[gui_support]
+		agg = True
+		qt4 = False
+		qt4agg = False
+		$(use_setup cairo)
+		$(use_setup gtk3)
+		$(use_setup pyside)
+		$(use_setup qt5)
+		$(use_setup tk)
+	EOF
+
+	if use gtk3 && use cairo; then
+		echo "gtk3cairo = True" >> "${BUILD_DIR}"/setup.cfg || die
+	else
+		echo "gtk3cairo = False" >> "${BUILD_DIR}"/setup.cfg || die
+	fi
+
+	if python_is_python3; then
+		cat >> "${BUILD_DIR}"/setup.cfg <<- EOF || die
+			gtk = False
+			gtkagg = False
+			wx = False
+			wxagg = False
+		EOF
+	else
+		cat >> "${BUILD_DIR}"/setup.cfg <<-EOF || die
+			$(use_setup gtk2 gtk)
+			$(use_setup wxwidgets wx)
+		EOF
+	fi
+}
+
+wrap_setup() {
+	local -x MPLSETUPCFG=${BUILD_DIR}/setup.cfg
+	unset DISPLAY
+	"$@"
+}
+
+python_compile() {
+	wrap_setup distutils-r1_python_compile --build-lib="${BUILD_DIR}"/lib
+}
+
+python_compile_all() {
+	if use doc; then
+		cd doc || die
+
+		# necessary for in-source build
+		local -x PYTHONPATH="${BUILD_DIR}"/build/lib:${PYTHONPATH}
+
+		VARTEXFONTS="${T}"/fonts \
+		"${EPYTHON}" ./make.py --small html || die
+	fi
+}
+
+python_test() {
+	wrap_setup distutils_install_for_testing
+
+	virtx "${EPYTHON}" -c "import sys, matplotlib as m; sys.exit(0 if m.test(verbosity=2) else 1)"
+}
+
+python_install() {
+	wrap_setup distutils-r1_python_install
+
+	# mpl_toolkits namespace
+	python_moduleinto mpl_toolkits
+	python_domodule lib/mpl_toolkits/__init__.py
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+
+	distutils-r1_python_install_all
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/miniupnpc/Manifest b/dev-python/miniupnpc/Manifest
index fb2df4987b59..f1b57dc6f21c 100644
--- a/dev-python/miniupnpc/Manifest
+++ b/dev-python/miniupnpc/Manifest
@@ -1,13 +1,9 @@
-AUX 0001-Link-Python-module-against-the-shared-library.patch 707 SHA256 16a223d7dd5cd3507e11782934699540c687c2bed28d582cab177ab3f9b49e98 SHA512 ac0dc69cafc857d2a5490f8d6b3f2db877c9b8e498c771b4afb1bcfa129279ffe61c5f28ba5af1cedba6d5bfbef5803ebfca7bfe2ed55c4aacaf693119f53d00 WHIRLPOOL 2bb2df815f80f1c077110adc44c4e450c89e7e2b4bf80a66526c146e536ba7744088707e7035fb68532bde571b439967e784d3c334057f936b35d5e6ad2415b3
 AUX miniupnpc-1.9.20150917-shared-lib.patch 723 SHA256 101388a2cd63c16e7bc39f2bc2547b12a1a92e05af995648c5cb383f92ae3b6c SHA512 2a74eb019b5da38468d917f62b86a95b636f1e7375285af17e12556dec04026209cf384aa154e31a23fd86a2888dc340dee8e4bd6184779101bf290d340186f1 WHIRLPOOL 9683a1705ebf50bcf83f464a8bc0c90fc628045e9a3f129fcd753bc6283828b328694f63ac27545859628ffa7fe0bf1d161cf0a44121a82688ef3c16c1ad59ce
-DIST miniupnpc-1.8.tar.gz 70624 SHA256 bc5f73c7b0056252c1888a80e6075787a1e1e9112b808f863a245483ff79859c SHA512 8eedac9ad473fc952ca8896fe534d6da6b1b234e8b6f35f721394d4c71aca84ed287ca6c4f0455b50d97a45e4cd34e27d99a6813386e0864781364aa607e13d4 WHIRLPOOL 5b76ccbb5ed7daa9bb0d481b424b7c31a5f6dc85c5c812ba10175a29aefc0d3924f3db2aa8c3529d1241be59d67d1d4c702d27aad2de8c8a07fecf3857d73169
-DIST miniupnpc-1.9.20151008.tar.gz 83538 SHA256 e444ac3b587ce82709c4d0cfca1fe71f44f9fc433e9f946b12b9e1bfe667a633 SHA512 b13e6044184f47d0f9e78c4c97d2887ab763121b2b21c86652bf3ea1b05335cfbcfd91eecb8d1dcfb5530f2528e6cf3e9c49c742d5e771dba68a774d2c2ad4ca WHIRLPOOL 839b531eb6cae7ada0bbaa0c4230a1f6889f6a288a114262bf6e27aa27638800636127fea3066427fb030e8f449794681d2bffeb8e2d30876d8ef9e4a3ade3cc
-DIST miniupnpc-2.0.20161216.tar.gz 85780 SHA256 01e14408d6fc628de9afabc4417b84adeaba4c0ec517e7b8e278cb2993dafd3e SHA512 ed1413fa6cd8eeb0d01e595e5470b255b1119a9bcf28da17765a4a3f0eb2b514409a9bfe9cd041274761b61441389c290754055ff07d599bb653a4efe47e920f WHIRLPOOL fde2dc16f5cfd6e7d066ec49646ac79b6d262988afe928d80aaf47f6b7f868a272ac46d3136c56ed8373e800d1538fe4dd6c34255080e2bd01cc0cb8b56e37fc
+AUX miniupnpc-2.0.20171102-shared-lib.patch 1220 SHA256 44e651a4221c3ccd228a6000772ec2234a1f76dac2a47d8578a8c7b49ff0cd90 SHA512 bb099cee440b318ac12f68d810e2a7848df0150ecce01ba05e8f60cdff8fa0efb61ddc958586ffecf1bd9b0c15ea41954a6170e59028a24eb5a225e8fffdea33 WHIRLPOOL 2c1ccdd4bf44fa58a74dffb412eee8b9effe6e4bacfd03c3b6f36939f86e05cfd978544008c82ffcde0112b3ea32ed4032a76927d7f8bf4703d0fd6c1bfad5ad
 DIST miniupnpc-2.0.20170509.tar.gz 86055 SHA256 d3c368627f5cdfb66d3ebd64ca39ba54d6ff14a61966dbecb8dd296b7039f16a SHA512 71ec052ef6c8ad0d529e467ddae6eae19a93b9816174eeac753aa90e036cc2f00cf7e8d1cdb188ef8280849a988fe2995e37b63f8e2a361e021c1d1b306bff6f WHIRLPOOL 86c1a7a1d8800dbc0d1eccad66a5cb61a59af38989ca79c3b8df926ed12d9c7760d0b5d0e59d5d3190b45c7801a76c3e209f156836277992131c587b97c1a48c
-EBUILD miniupnpc-1.8.ebuild 575 SHA256 d5d4edbf0bc67caf7b16801e6cc0a310f6da9fe52129b6160e5060062f022546 SHA512 5f7d32e2c60a0fd9b995d94dafb88eb7d99b2bb5077529a6a26dc156b750f0027bc40409847854559eb96fb422bace982258b0833a1008e79bc563a08b435c7c WHIRLPOOL 46021fe6ca9b95433d7f195176b750c40e33315570b6102bb5f9b4b4b32b919a1be6e380af9f54085c1f735bec890dbb6e479b3eb2cf2d80407737fe3fc2f41d
-EBUILD miniupnpc-1.9.20151008.ebuild 561 SHA256 1e6d7fec2489f4be49d94a6cbc83c07ad458f7dab2dec7c3e0a2388a20474645 SHA512 54cb341f5ef4217e3281f0f5aaafb096adc4e38a84e0fcae5b893d0701d2d70542d1bb9d9772f98f2cf6672e5c36ff90f069afcde6d63505d77b6c8e1f4aaa6b WHIRLPOOL d31e0a8c48f03c909830ac82d1bca2f18a5ece00ad3bdae6d4e9c0c6501220539071700e02afd64436c063555553c8f6f332941e5006507ae8c6492067a567b2
-EBUILD miniupnpc-2.0.20161216.ebuild 714 SHA256 8e930e6a2d1a5774328789cf50b75f9ffa86c6edf071910438933d6f49e57eed SHA512 22a6a47c6f235b8717e188a3051e67057b7d2d9caa3d711ed56800ee9b6cc98dac19f1722e03a163deeddaaab7494a74c0b81b8704fe200225535391653c3e53 WHIRLPOOL d5b62acda838b618a8d56f2e4e062d38c6293f3d82c2ff7c147031ad8bf1721978f4bbf7c287b69a60e48df9252337415c51f416075b52e021e4dc30bc580deb
+DIST miniupnpc-2.0.20171102.tar.gz 86363 SHA256 148517020581260c8a2fa532224870bc53e59004777affcaf27ef636a72825d4 SHA512 5af68a58bef587ea5cc405155b1aca4438de3b56d5fb7e11945edd79e5cbdbf44c708b7f1ad3c3fde6bf4710de69782acf30cfcce327c5a906f4eb8f76a6ba37 WHIRLPOOL 80a9d0e487ddb2ac69af8e738144e74985c5b5acf8c4b7736121e58dbd04eaa38d90853e375334d7f05011b6134536e776757737f549410a6291941b0e47bf1e
 EBUILD miniupnpc-2.0.20170509.ebuild 714 SHA256 d57f906935dfedc8f318612e0d8a15a997a82c672aab21c4f15cc9ac4f3fdd0e SHA512 a145554f2dc93f098f6a4bf70f2505d8878de57ceb44fa74c894bbd1a6f7d27e57b2ed2f2e2d1144503444a1c25ef72a244139748db7dc5877888d785c1f330d WHIRLPOOL 3fa02d3e6d399b55c4f0e487336608c102a91e578f370ceda842a610a7b8379365c7970919bff0031e9ec4202e7451b7fe2b831154c29de38cc3b7829a877934
+EBUILD miniupnpc-2.0.20171102.ebuild 759 SHA256 0dbe36bc9bf07c1d01cbed469e6815e9310c8ce2d9b7954653984eb481567b3d SHA512 9cee2e5c32c934a5b63a5c38b74605cfb48b58ddd9d6afac1544f7a79b8e5543fa63f606c662e29224ca838779a9e139967ce61fad19ba3424656d4191840f1f WHIRLPOOL 941d7ce3fb1e1eaff8223f85002e69fe5ed23440bbc973af72ec1db70336f675a5b1051ff3916b5e1fabb45e429aec2cf74e47ac621191e73cf1be61880baf4d
 MISC ChangeLog 2944 SHA256 1b6f4082c25955afbf1d52639544498eb5bb0a2ba28161fea94c2299418f7261 SHA512 773140e9ccb0b4cc7dc7c3b4a7386782e4ce430ecb078c70fb01013d5b2f4703bcc101e2ff8a6dbd5e27ba33eac3f16af5cab12dfab54551e1efc8f543043da1 WHIRLPOOL bbc14617332c605a14de04ff775bfa6f6a4760167ad7ea05c16e5378ab7b08c28cf75374a0cc7325bb47e96c505b060dba94c801b2deb61bc11d13a68c633d8e
 MISC ChangeLog-2015 2738 SHA256 49bbe8764172112a232edcc5af555fc8f642a191f1342c78d849eab4f6426cd9 SHA512 c6b64c9d83de74c8c17c1886dfd50e23fbd3a8a9ce06216fdedd4643d78cdc76e425d9a81c32c59ec64d275662d80724af812543f91afff913ed92f847e0029f WHIRLPOOL 3f2596450dfb0fd1728e3b679a4eafe5981bd397a897fd1a8317107a14cb828b14f9757dba30eb738a5d36e20c85918b89ab633b414f3f7c679baff4e72ac7d6
 MISC metadata.xml 243 SHA256 a90d5777b80d7ed5f0f322ff9cafae7a96dd513f4af28b60e36c060305157906 SHA512 ded2bb7e056d9081e11b0470aa2874fbe9b5e63f0178bec611291f639763a9bd85a076dbc526e01df1403dea4d0eb28913addb346b676084e690e063b68eca28 WHIRLPOOL 10702c61e2ae8d5ddb862621065c0ed6b1d05b4a4ff0a30407d29edca19629cead238e10a9f1889f4c41f64d7ef88f0031f746a2e5d9502ca7b088c2039f5751
diff --git a/dev-python/miniupnpc/files/0001-Link-Python-module-against-the-shared-library.patch b/dev-python/miniupnpc/files/0001-Link-Python-module-against-the-shared-library.patch
deleted file mode 100644
index d9e6c4317ed3..000000000000
--- a/dev-python/miniupnpc/files/0001-Link-Python-module-against-the-shared-library.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 34da047ae5b945a43430f59efe0efefdd8f1ba55 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Wed, 3 Aug 2011 08:28:31 +0200
-Subject: [PATCH] Link Python module against the shared library.
-
----
- setup.py |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index ca31f96..f5aef19 100644
---- a/setup.py
-+++ b/setup.py
-@@ -10,6 +10,6 @@ from distutils.core import setup, Extension
- setup(name="miniupnpc", version="1.5",
-       ext_modules=[
- 	         Extension(name="miniupnpc", sources=["miniupnpcmodule.c"],
--			           extra_objects=["libminiupnpc.a"])
-+			           libraries=["miniupnpc"])
- 			 ])
- 
--- 
-1.7.6
-
diff --git a/dev-python/miniupnpc/files/miniupnpc-2.0.20171102-shared-lib.patch b/dev-python/miniupnpc/files/miniupnpc-2.0.20171102-shared-lib.patch
new file mode 100644
index 000000000000..f3245cb4b355
--- /dev/null
+++ b/dev-python/miniupnpc/files/miniupnpc-2.0.20171102-shared-lib.patch
@@ -0,0 +1,41 @@
+From 7a61313dda299b16c4af3260ae5c11ce5945ed97 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sun, 5 Nov 2017 09:24:00 +0100
+Subject: [PATCH] Link against the shared library
+
+---
+ setup.py | 10 +---------
+ 1 file changed, 1 insertion(+), 9 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index b84146f..73b05b7 100644
+--- a/setup.py
++++ b/setup.py
+@@ -13,13 +13,6 @@ from setuptools.command import build_ext
+ import subprocess
+ import os
+ 
+-EXT = ['libminiupnpc.a']
+-
+-class make_then_build_ext(build_ext.build_ext):
+-      def run(self):
+-            subprocess.check_call([os.environ.get('MAKE', 'make')] + EXT)
+-            build_ext.build_ext.run(self)
+-
+ setup(name="miniupnpc",
+       version=open('VERSION').read().strip(),
+       author='Thomas BERNARD',
+@@ -27,9 +20,8 @@ setup(name="miniupnpc",
+       license=open('LICENSE').read(),
+       url='http://miniupnp.free.fr/',
+       description='miniUPnP client',
+-      cmdclass={'build_ext': make_then_build_ext},
+       ext_modules=[
+          Extension(name="miniupnpc", sources=["miniupnpcmodule.c"],
+-                   extra_objects=EXT)
++                   libraries=['miniupnpc'])
+       ])
+ 
+-- 
+2.15.0.rc2
+
diff --git a/dev-python/miniupnpc/miniupnpc-1.8.ebuild b/dev-python/miniupnpc/miniupnpc-1.8.ebuild
deleted file mode 100644
index df6787d09fa1..000000000000
--- a/dev-python/miniupnpc/miniupnpc-1.8.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=(python2_7 pypy)
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for UPnP client library"
-HOMEPAGE="http://miniupnp.free.fr/"
-SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND=">=net-libs/miniupnpc-${PV}"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/0001-Link-Python-module-against-the-shared-library.patch
-)
-
-# DOCS are installed by net-libs/miniupnpc.
-DOCS=()
diff --git a/dev-python/miniupnpc/miniupnpc-1.9.20151008.ebuild b/dev-python/miniupnpc/miniupnpc-1.9.20151008.ebuild
deleted file mode 100644
index a35212d5abbe..000000000000
--- a/dev-python/miniupnpc/miniupnpc-1.9.20151008.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=(python2_7 pypy)
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for UPnP client library"
-HOMEPAGE="http://miniupnp.free.fr/"
-SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND=">=net-libs/miniupnpc-${PV}:0="
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/miniupnpc-1.9.20150917-shared-lib.patch
-)
-
-# DOCS are installed by net-libs/miniupnpc.
-DOCS=()
diff --git a/dev-python/miniupnpc/miniupnpc-2.0.20161216.ebuild b/dev-python/miniupnpc/miniupnpc-2.0.20171102.ebuild
index e52f6d8e51d7..c3659faf80f3 100644
--- a/dev-python/miniupnpc/miniupnpc-2.0.20161216.ebuild
+++ b/dev-python/miniupnpc/miniupnpc-2.0.20171102.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
 
 inherit distutils-r1
 
@@ -17,10 +17,11 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=net-libs/miniupnpc-${PV}:0="
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
 
 PATCHES=(
-	"${FILESDIR}"/miniupnpc-1.9.20150917-shared-lib.patch
+	"${FILESDIR}"/miniupnpc-2.0.20171102-shared-lib.patch
 )
 
 # DOCS are installed by net-libs/miniupnpc.
diff --git a/dev-python/pdfrw/Manifest b/dev-python/pdfrw/Manifest
index 41b1fcec1632..39ca996a49e7 100644
--- a/dev-python/pdfrw/Manifest
+++ b/dev-python/pdfrw/Manifest
@@ -1,7 +1,9 @@
 DIST pdfrw-0.2.tar.gz 69177 SHA256 09f734df28f9ad712a2c14308b1d60e7202762c3ce2e32a6ad30e7ec149822b2 SHA512 4f1ed3b7ddb42969110291b31e02e15e1f98316ede25eaa4d63cdbc443497a278267309769351e04cff52651cdbc44c93771e521cb953ba08d57152f81ee516f WHIRLPOOL efbe6fa4e2ce53f27f1aed76183d2098ff2e1a9792a581078a219c27ec02c787ad6252a3d0120beda01214bcb3aa85600d23f48e90d8deaf45eec49ae88cfade
 DIST pdfrw-0.3.tar.gz 71576 SHA256 1af18af301d2c07d846cc7203e3c7ca77b2ed2a9eb3421335cc39f5e3e148f36 SHA512 38b6e3dffcc00ae063b4a1184b2fd2444d7bb0e2a78a8262764e609c1ba0697b4c9daf83a986852c18ee3e56b945827816537f36071406f31e94ebac0369ad74 WHIRLPOOL f3de427a5757324cc28f6ab6234573031d8a64d42a3d496124c4a919c5acfb710e3a1ba92f4a3c54b2a88b5998a1c45707d98038abca9bd3c90dad44bcba408f
+DIST pdfrw-0.4.tar.gz 95402 SHA256 0dc0494a0e6561b268542b28ede2280387c2728114f117d3bb5d8e4787b93ef4 SHA512 6c0b629e837f9bd479a288bcd040952b98920da345113bf90167becbdf2f90a9d6c082c5e7988c68118bd62a2a5a0d22f98523407996531bb5d3031e847e10b0 WHIRLPOOL 6fdf1c73f826bbceda23cc1f7102570d972a1509a394523b4d7938ea02f6712b0828dcdc9e0a6a1b677d537ed2a58d1397c70073b07e59ef1d7cc55ff69e4ba4
 EBUILD pdfrw-0.2.ebuild 396 SHA256 425e837025f296acd01be3939d13d4082d181dbbf35f92fac4fdb95bd7c4553a SHA512 7b9f7e3ac9a36eeacc8b86e5e7fc88c7acf0d6eaa3c19e276378c431df3e4262eaff5456e81fae5c4158e599abc23eb9432c6643f43784eadc7a0d376ab90df2 WHIRLPOOL 1539e9a41776b3abd21e2c1c21292bb16aed7dc0717e54e26cfe229b9243b145f29a2983dcd5dd88d1fe3ded24a7031a1321ebe6df0da3ec6f0386401e04df1d
 EBUILD pdfrw-0.3.ebuild 475 SHA256 b0d4a96854750f13f44e520080188855cf0a7614b19227382b86563730d2630a SHA512 14c0ccb6cddb284fca151a26740abf3cc45547f2fa2d637b9236324a5a2c8fd3c109a7eed1913587abdf81ad5aab104e5509bac5b83ce43f4a7bffc68d730a0c WHIRLPOOL bc2da668fd93ec21af07d0908a9f920e29cd44c1a2a816eb5395aca464b3c3c1fa300bcbd855acedcbb429a39419582a3f5270ef98041285d686639e07bc8651
+EBUILD pdfrw-0.4.ebuild 475 SHA256 b0d4a96854750f13f44e520080188855cf0a7614b19227382b86563730d2630a SHA512 14c0ccb6cddb284fca151a26740abf3cc45547f2fa2d637b9236324a5a2c8fd3c109a7eed1913587abdf81ad5aab104e5509bac5b83ce43f4a7bffc68d730a0c WHIRLPOOL bc2da668fd93ec21af07d0908a9f920e29cd44c1a2a816eb5395aca464b3c3c1fa300bcbd855acedcbb429a39419582a3f5270ef98041285d686639e07bc8651
 MISC ChangeLog 3410 SHA256 33c4fc548ed8511ae5ce251ee57e764532a42c2fa4bb95fc5e7905bdf1098989 SHA512 413c72d277fa6e1ceb3a869a0351ddc07016a4bebe86b934885c041ef81da9da5f4641ac71f52c1ca13c9021affda43afc88931f5c9e3b9e7b897051687be3cf WHIRLPOOL b3d1b421fa64eea03076affba4cb2a075afd973cd73fbffc28fa48f8fecb8259b42c30157028f5bb6f78e2c238ece4578081aedfd64fd2aafbbea54d3bd79c0f
 MISC ChangeLog-2015 1284 SHA256 548182d8a00e22ca5c9024359d705aab02df960beb254c5cb74b648a8db258b3 SHA512 3ce59f93f05f8aec5d2af87ccfa2ac730e1dfd10ec0ca1dc44cc4d8662e78e9c0bea5cbb8d04bd3b650da08206d359e35d87b93185e90833da6b149af4de2483 WHIRLPOOL d86e98e1e6662d2ea61d30e47043e16fae2bf774f0fb23c4ade8b2cbc85bf39f5603ed45dcccb43a3ea021754df8c90ab4f6160404232b858670517a46efacd5
 MISC metadata.xml 361 SHA256 9efba35c9d77fbfbbf597416f50601e9586c9d9138cab5caf138f9cb933ade1d SHA512 d48a58a2fa2bf29f2739565e270bced92d417c1c9d0cba507bdd217d1ce61be0f6658e41e8100c814838bf40b79973d39ad8a0f26b04f060451929f2cb6d646e WHIRLPOOL 9bfbb388f216e42b69defb4ee0275e31fb57cfa18a94fa9a57a4d0b5c607858ba075c5300707ed7263186ea6c9f26c54c53f9559106d5c420bf103b14461c7d8
diff --git a/dev-python/pdfrw/pdfrw-0.4.ebuild b/dev-python/pdfrw/pdfrw-0.4.ebuild
new file mode 100644
index 000000000000..ef4623dcce5c
--- /dev/null
+++ b/dev-python/pdfrw/pdfrw-0.4.ebuild
@@ -0,0 +1,19 @@
+# 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="PDF file reader/writer library"
+HOMEPAGE="https://github.com/pmaupin/pdfrw"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pexpect/Manifest b/dev-python/pexpect/Manifest
index b41e6a5fc2a4..acc17b03a8c9 100644
--- a/dev-python/pexpect/Manifest
+++ b/dev-python/pexpect/Manifest
@@ -1,7 +1,7 @@
 DIST pexpect-3.3.tar.gz 132330 SHA256 dfea618d43e83cfff21504f18f98019ba520f330e4142e5185ef7c73527de5ba SHA512 66cc501f1c7bb8ba0be4cdc0db840629f51416dc54ae44dc770adb38f1a385116b0a8b9bc7f1cc1447f05ede36ef1b519f5c4e710e6cb736c923ecfc87497cfa WHIRLPOOL e708e722d4e2598958f8d724b84148608e9a53041077b1a1a2af84d5281e11f0c6c050ee88489eebc48bd5556c22e0fe9386680d34b1941ddf21539296629513
 DIST pexpect-4.2.1.tar.gz 143980 SHA256 3d132465a75b57aa818341c6521392a06cc660feb3988d7f1074f39bd23c9a92 SHA512 796474c87559cb9f4e2dfe72564d70c75e1aac4f57c4f3e4033a56c8842a48380ae0d5fafdad7f1ea6718b25c272fe4a611a59db44e69afb1f2bbf7e00256261 WHIRLPOOL 35176b56bdee1d7066705925c54014c33e18679e40f9182f15a223190904a6fead235c0d676806cc55a3f0f64666f446182056a29b27217ccc8990ecd9b8184e
 EBUILD pexpect-3.3.ebuild 1068 SHA256 d5ab249b9afb276372db9ab7a35271d9a6ac541186af0c45a3ab1617b0b145e0 SHA512 0273ebbbba5c3ce1f60956fd7c8b99f374d148e40e6fdc6910e0febc71bd6bc64e83f28f01520ed54a0dc1b400e8b9f6131d63020a2d79974f04b673a13bb5b6 WHIRLPOOL 18984dd935a20733b97c73dc7915c5d45d9f64d66226eefb7a169095648a4fca90c26c68b125ceaf4876e738569eb622b00c920001084534932d40420f42eb61
-EBUILD pexpect-4.2.1.ebuild 1170 SHA256 5fc087541be46cd7e19d3aa0fd3c20fdd3eafbdee848b16d90ddbbcd3d1a74a5 SHA512 654e1153cc269f4d4fc3282e87d82a23908b18869aedf6c11e5ea7ca72302ca53856e6e2826ee9bb33117f49c401047ac8b24fae2a2d444abe1261e36e8d3d32 WHIRLPOOL 865c25eeec287e9e0a1ad973f0948da30607ea780f9e86b1092bb5d0d34d6c0c6f3407058214921b91fc6b9babadd09d87690d2231b00533d487f503e63fead9
+EBUILD pexpect-4.2.1.ebuild 1169 SHA256 75d6f1740a300c3b733e543843833666961dc6f958d3d4693c946e0715c658f6 SHA512 c17ec345629027dc069fc2c034e877f4ed135b64e123b1563198734f03a9274d5349019fb49e1ea05110bea88ed0efde9532391835f1b91da839fb3d8e0ab8fd WHIRLPOOL 8195f18fb69eb4eb1624b23920b234bc0865063c238b789a69a228fb4382c09b77f82bdb5df2ad2ff7e4d978b64afaa51d8535004f6d0de9e08272a3f7b4b266
 MISC ChangeLog 5819 SHA256 ce40004ec45a10f2ae2a9a4200bad347eef4111f5ce9f927d015f1cb6292abfb SHA512 ad8d2be641ec91a806f722dc05a101ccdd0a44eda19e75ae14dcff363b504b1310b3c023066437fbdf3cdc2025b7c5371b12e71cf478ffe21263487f6f9b3577 WHIRLPOOL 879905b8ce46670fedc447d1e4aa1ac4a5bf02ca9235c6d365b6e9604075f7dced6ca7620524259dcecbbeeb0fcb0b458db6451ca0f072b6b3d97e878e665b59
 MISC ChangeLog-2015 9840 SHA256 72bd8513660d70da0c3e6f10f8c5768d95c185d6038a3a985a622cbe730bdd3d SHA512 15c7d741bfc96626b9cd87c72d4f1a301ed97e526e5e04ef8f415409f1ecc52475faac2c339189144e3027f70a2ad3bafff743151a6ac6e9bfc4e1a0e6e347c0 WHIRLPOOL de3274b0164e3f154706ce7444fe2c9e8918c4a73274bd7d3f14b861396dbdfb1360d6162e8b5a18d567289c3c94687e363fbbbbaf7c59dc166da3797f247b08
 MISC metadata.xml 377 SHA256 ce566bac90629ab4c9c07dfab27277b6c7e8825452a00b5e5afc8d3cb75e0e88 SHA512 31e65b2ce9ec12e9d3e95ed651841b8aad6a24330fe20b4bfd6351267423ff5005ac3cb2e89dbb8f024cf60705d3f06a8a1309169a029eb5246ddc45a8d76464 WHIRLPOOL 89f3dd9835233d4c20e80550859342aeb86ddbe67b19464f9a5d1cc7be6ed0d1ab1c2d5c883b9af91991dcb4dd93ce7c58a3a3ecec4115688cc5f8ab4774427b
diff --git a/dev-python/pexpect/pexpect-4.2.1.ebuild b/dev-python/pexpect/pexpect-4.2.1.ebuild
index 79b3a0dff221..04c9496edd98 100644
--- a/dev-python/pexpect/pexpect-4.2.1.ebuild
+++ b/dev-python/pexpect/pexpect-4.2.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha ~amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc examples test"
 
 RDEPEND=">=dev-python/ptyprocess-0.5[${PYTHON_USEDEP}]"
diff --git a/dev-python/ptyprocess/Manifest b/dev-python/ptyprocess/Manifest
index 226af156b7c9..46d64603e4b1 100644
--- a/dev-python/ptyprocess/Manifest
+++ b/dev-python/ptyprocess/Manifest
@@ -1,7 +1,7 @@
 DIST ptyprocess-0.5.1.tar.gz 68474 SHA256 0530ce63a9295bfae7bd06edc02b6aa935619f486f0f1dc0972f516265ee81a6 SHA512 9e7481e8e3facde73086ef0728a57516a15b6bc2a5fb6bf6d6f892c396c9376d9d6334ee37737f3469929c4086d5678a2c5deaf44d70589d41644a98f2239dad WHIRLPOOL ba327a02a847f7c5e4b62e6bf8ba0f070f8a22ff584045d7ed3cc134f8a922b9d75e397992cd5df5ca4569f563d234ea2a194b5a557606978a37a4f04559ee1e
 DIST ptyprocess-0.5.2.tar.gz 69297 SHA256 e64193f0047ad603b71f202332ab5527c5e52aa7c8b609704fc28c0dc20c4365 SHA512 cb4e70855d388a6ff691e2a244c072a5a50cf39cdf727e3a4218817bf5ac722c4b49f0dbfd80204259998eba137492690759b8908bfea925842b9f7fc83ee553 WHIRLPOOL de6f42fe487b948b5b7801a9c0375f7586aedcac5c7e7563f0f7cf56a3a8d7c2abea42d256544b32cf5c0bb71bc71602b8582d581199cf0e2234a648a6017be3
 DIST ptyprocess-0.5.tar.gz 14923 SHA256 dcb78fb2197b49ca1b7b2f37b047bc89c0da7a90f90bd5bc17c3ce388bb6ef59 SHA512 6619bfc1dfc7c980ffc72dba62697692eb749f19500616e8783cfdc3c35980276eb39070f4cd7932775abb5e798c921b9320c5f51b9052f526585f01cd56259e WHIRLPOOL b1bd0da485ea106a3d366ab21dc714418b8d392a32fc3386ef734362da8ee455a38f9330cedfe35687be09bea3ff622c54440119fca72d7787d9a29518717b77
-EBUILD ptyprocess-0.5.1.ebuild 606 SHA256 9048c3c2bdc0f175a297531821a82363984a38d7b992b36e830d6951de210f4b SHA512 af14cff11045c26a74717bdb7e169b7278f9a4fa48c587c3f5326fa900df3aa3a9a995db83ffb44d3f2348ea7ef6a00887d98ef6ccccb4e855934d047674a8d9 WHIRLPOOL 203ab7dfba89b1aa6eaad9022c6a397f14ed9adb9fbc83362649dd506a196396225f11222285cf5d33ea8da364af8362fb03bc5c3a3f47862f166bc55e2c0811
+EBUILD ptyprocess-0.5.1.ebuild 605 SHA256 7384b70f035a6b0f96ca1bd2119c410b5db6b0f126cca7e361604209ca4227c8 SHA512 af8ca4f636719e3bac8a2ef49774aa3ddd84f738e6af7c29d590daa499315b323ec2b3a5fb042e053e2c902b8353069b2c0667a3c3a771b1156d757cc04598cb WHIRLPOOL 09bab57f4f439fa5a483ffeb3cdbb74fb8eac5af0bf91652460a6bf4c34e96d087747f8686ac3e9d6a8c68732876f4377f0b9c06198c9a0a90bc5a5c398649b2
 EBUILD ptyprocess-0.5.2.ebuild 628 SHA256 123192b7f51075b035533bd7566694a6c0dcadbc8e29e95c0f913ae25b46f6c5 SHA512 10325f39029c41113f1bd0670b0a2c8a539fbc70e40083aa7599b7da78c649824c2eb163c5d09f8f233abde03db10e0b32fe81f01145e909c0789c514f6ae71c WHIRLPOOL 22a1a3108382ad0384a31d4b90d13a7a1fe568292c0a2e7fae7687e94b9746e5716470bd1e4c5f9393a9449e4a7e881f302f55ccc4c45bf75a8d599de799f45d
 EBUILD ptyprocess-0.5.ebuild 610 SHA256 4ea670f95be32179a1e84e923da9cac8534557e2192157974eaff371f218a51f SHA512 076adc28648cbd054a8988191dbc654c2d6c133232c1d8c36e0327eb815b1d38fdeeb96cbcbe87d574a480ab29efa306d53520f0d0fe9ee0c0418c725f76cfb9 WHIRLPOOL ed94a4fe36815c3227e3243480e18241c12c216f7144c4ee370d0d68e0bf96192d91a4ccd9625132d65fb7094af95338dfb859678f268530d377071900bbea22
 MISC ChangeLog 4460 SHA256 f44f851cdeb6894fbf80620684ab12c3174cc1d919baf2aafaf2f758ebc1fd8f SHA512 f72a44e2d7c1d457da08facf02cd5588ecd69e0d6ae23a69c734ad7a7bc1a4c94838d0c84990813aa1eb0914f6b91d25820ea42fe0a5e898a499a9657c01a500 WHIRLPOOL 27472013506d12aa3ce6d81d95ff4fdb32b96b195fa7116f9f7c289c9e7b18e19006429738d634900d439bcda5e4e80f9c0e8f4ec2ccadb2c7d624a2bbefe010
diff --git a/dev-python/ptyprocess/ptyprocess-0.5.1.ebuild b/dev-python/ptyprocess/ptyprocess-0.5.1.ebuild
index 2a61e8e817be..149fbe42ab8a 100644
--- a/dev-python/ptyprocess/ptyprocess-0.5.1.ebuild
+++ b/dev-python/ptyprocess/ptyprocess-0.5.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha ~amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
diff --git a/dev-python/pyghmi/Manifest b/dev-python/pyghmi/Manifest
new file mode 100644
index 000000000000..39105630c41d
--- /dev/null
+++ b/dev-python/pyghmi/Manifest
@@ -0,0 +1,3 @@
+DIST pyghmi-1.0.22.tar.gz 123267 SHA256 8024931866a0ff68404dc0d38db2b516920f1b0fe68ac67da33647a06f336c7a SHA512 9e3bc6b5f33d5496d7e58d2ea558d20d45a7690d493f2d1ad56fdd5570279a38e8934d8425c3d3207d8001da85a9a0b1319463b802fa9f121db7448aa919bddc WHIRLPOOL 9884a43fa69da4bba156fdf4140c7aebdfcfdaa02cd193da979734544971fd16dca0846f5b896e2f7f65111b6aff1991628a6ca25fc94e3a6b08855add76c407
+EBUILD pyghmi-1.0.22.ebuild 1233 SHA256 5b502d3e10656f9fabbad997a7380a1543d4303230c6a81a0df964bc69b0a354 SHA512 0b61a9855307d0c7c5cb2193893a2353d9dadcf5ba9f0f537fbcb6cb2695fd6655bec19f61cebb6db45b62180703cb7a50b63b51c5bf22687ba8a42466a75a63 WHIRLPOOL 8047556580eb455ba88eb0be32c97810083cf961127b3042ab4947ab74f6463bab6c67dcd073dcc71c339a2b21ab2b864542e054ceaf1a1a151e84260ec89677
+MISC metadata.xml 343 SHA256 4f98430f926ba7782b4109c8905d9cc87badeef40f8dce78b90b36ec0f6f5662 SHA512 cb4c5f58339d6c5f181bb0e9a1aacb4e3c30c5690744e0ee6649e82eece03678246cfe3b13c219e177de8812c6916fe1b6b49443c2dc0a00ed1d024c8858b5c9 WHIRLPOOL b2c88c1a7dade51cb4b69b5e0a0d5af797f7db80e46a0c1bcbe4f2ee6b2b00534e55f9f37ee7c29d5ef507882a89a7c1cb397af07cc5f290e95f02f18871761e
diff --git a/dev-python/pyghmi/metadata.xml b/dev-python/pyghmi/metadata.xml
new file mode 100644
index 000000000000..9ae992913b2b
--- /dev/null
+++ b/dev-python/pyghmi/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<upstream>
+		<remote-id type="pypi">pyghmi</remote-id>
+		<remote-id type="github">openstack/pyghmi</remote-id>
+	</upstream>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/pyghmi/pyghmi-1.0.22.ebuild b/dev-python/pyghmi/pyghmi-1.0.22.ebuild
new file mode 100644
index 000000000000..3be2b5d11b80
--- /dev/null
+++ b/dev-python/pyghmi/pyghmi-1.0.22.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="A pure python implementation of IPMI protocol"
+HOMEPAGE="https://github.com/openstack/pyghmi/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/pbr[${PYTHON_USEDEP}]
+	>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]"
+#636824 older versions of cli_helpers break the build
+DEPEND="${RDEPEND}
+	!<dev-python/cli_helpers-1.0.0
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
+		>=dev-python/hacking-0.5[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/os-testr-0.8.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		dev-python/subunit[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.17[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-0.9.32[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	esetup.py testr --coverage || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/pyinotify/Manifest b/dev-python/pyinotify/Manifest
index 1e3d039d5ab9..29cf7378e1c6 100644
--- a/dev-python/pyinotify/Manifest
+++ b/dev-python/pyinotify/Manifest
@@ -1,7 +1,7 @@
 DIST pyinotify-0.9.4.tar.gz 59604 SHA256 a09767e4e0610e2e1e9f9dc89483b0ee4a53764e700f5866a570bec51d003fec SHA512 cdaf9f239a43e3889cdca0ebe1e3559bf6411e4cd829120cc2199cb91122bfe4af62f61a9bf297de28036716f974abd4d7bbeb210e22e96245781fbad08a2b75 WHIRLPOOL aba8f4e4fba5e684e0bade9c3a02a24747f3af4a441209f138223398860da8fdbc6b52546f6cd55134e72c69e6e15b06e45c50767b13ffab6f12afa4484cbfb6
 DIST pyinotify-0.9.6.tar.gz 60998 SHA256 9c998a5d7606ca835065cdabc013ae6c66eb9ea76a00a1e3bc6e0cfe2b4f71f4 SHA512 b52de43293b06b32236e90b7c33fac061f3095cd7d4aecec89a099d56020db1a85440ab9dcc8b521238c001fc49a1f37d1b16d621bc1acab4d7273aebcaadbc5 WHIRLPOOL 19e5c96528e3092d9a0e08e4853afc1765afcb0b286875e9583c703dda066c8372def076416158a740b248ade21b14314464232bdc70f210f306f3d3ca5c4a7f
 EBUILD pyinotify-0.9.4-r1.ebuild 688 SHA256 f942cbcda514c3a9f7c71673bdc9d803a73b7fcd4940a41c92ac80c2fad9bbdf SHA512 000640c3eec6e793aaf07be397dff70db879dd3940abaf3bca24cd3fc8f47d0b7f26e597984a76be775bda8372855bcdf2e23ce524bb40290b86960f393a55cb WHIRLPOOL af92d7669d9ea5301b0c3357514cb639c853681e1b128b05ecaefd7b5261f0ebeae73491a433392a32c79464734258d8ddceb8982dbfdabaea3ef119751388c0
-EBUILD pyinotify-0.9.6.ebuild 742 SHA256 7ab51bdf934b19fde744a10eaf5a1f37418b95c53c92574ad8d6c69a9c8a41d5 SHA512 6fcd7a0e1420f6e71549af29145713640caeba7832d0be5a5f089f6bc077d980468a348964bbbdc6530ded4ea8ffd6e203815fae1877fa06f8e2bdd7084b09df WHIRLPOOL 1bb475d55047f3d7842bf1482099c0c1ca5f72c6b4057879d13aa2edf6f75e2081797ee825f5451b41a8ee2430784053d11d87acbc876ea0e1b1c21b3175d10a
+EBUILD pyinotify-0.9.6.ebuild 748 SHA256 9a6211b5e7eb363c76a5fb360864fb3f3066d549af41dcc09c53a1e6d7adbbb6 SHA512 26753fd51f779d97404ea832e2c7118340322d1cffedd05da867b0b589fff4416a5c883ef32e0b959b6207c4ace988fdf09da71603e9313925eb88c16d322a5d WHIRLPOOL 294ba0e39e32f25e7a69d7a19bf89ff84a3e59d68c690d2e8d5f7ab3b8dd6d3b5adbc0909cffc18bae344781991c64fa70b446020063a6ad646bd7d797c9ae4e
 MISC ChangeLog 3528 SHA256 e964efb0ab624f64f26987da93c9cbda885083d6f9a7540dbf5ae7852dee83d0 SHA512 3b99109008e4f6c8b640fe38a139be82c4568ea9ca16bc1a91da9ed909cdaf4875cab36f66543fd26fe69a51fddd48a4eb9a873b4c3cafe97e7141b17e7fcba8 WHIRLPOOL e4d557ddbca0aa516826a213b3074246c09466b7af3b81823a53e1b1fe725ef4a1998dfce6584d356dcff4d1f0faf378c4f4a0bb6db2bc3f2314879e10a4bf71
 MISC ChangeLog-2015 7853 SHA256 da35f50a90c28f626ffb47368a63b9246f66d434ff5bd863038e31e33193b2f5 SHA512 85e96794dd3bb632b90d6047f9d684582245a7782aa1254749c6f1373689ea95313bc8663fdfe03aacf6a8cc87075783cd466e9f43856ba85a7f658ef238cae7 WHIRLPOOL c4c7c45550f2ae3d0b0864368a06808bd4d46c9440fdcd46c7006dc88e8cbd8d0c71b41888bc018a66d898813d8def297f75b5ca8b036ecfe508f5c47e44f71e
 MISC metadata.xml 240 SHA256 07a76e79a43ffd9aa15de0e4ae548ea85aa5bd165c4602630c3519e60f113ee6 SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59 WHIRLPOOL e3e059953c7c36bd942545f4e2a0e94ba938a17fe2bd04df81b137c185e64a213152c11918922563509e4767e601b41105f80c5983a87ee4d6be7704bcf7cf54
diff --git a/dev-python/pyinotify/pyinotify-0.9.6.ebuild b/dev-python/pyinotify/pyinotify-0.9.6.ebuild
index 6579604fd3aa..6d1f0d41c2ff 100644
--- a/dev-python/pyinotify/pyinotify-0.9.6.ebuild
+++ b/dev-python/pyinotify/pyinotify-0.9.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://seb.dbzteam.org/pub/pyinotify/releases/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ia64 ppc x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pymediainfo/Manifest b/dev-python/pymediainfo/Manifest
index ec4dc1b94f48..d3270185a444 100644
--- a/dev-python/pymediainfo/Manifest
+++ b/dev-python/pymediainfo/Manifest
@@ -1,6 +1,6 @@
-DIST pymediainfo-2.1.5.tar.gz 421120 SHA256 53616f5b87431d7fd0b4c7a2c2592c9071de923c5c0b167f1015905092a86915 SHA512 ef7891bb8e55e11e211f5d7a222176ffea013c4876b2a524ee02af6bcaa3cef272c11e7e39f12790de37f9bc95aa71af049727632092dbaa4c30ea3d149ddf70 WHIRLPOOL 6272df6e234655bc30fe8af811ad644d9062dd5a86837561885144f5a51c6ad931566b9e0fac073c89d99df6b8c82e282655fded66c056315dc10a0b4d30810a
 DIST pymediainfo-2.1.9.tar.gz 420111 SHA256 ca3620c3a99052a687c3b625fdddd27693512814808c7b923709bb397930eb0d SHA512 8bc3abe3146f57cb33b5a3bdd1d902a9ef82211b0755d70d9d33601c6eaeaf397b2dd2428edd72a1541cba3cad5f2a414fc1802cf2c5529ada747c9f3b8f280c WHIRLPOOL e6b220061892e064de7506be596023271c07e7d1d47fd093782123fd27e284a1cceed403b876910fca1f27a044d786c202126507d0de8df9d59ea42eef496435
-EBUILD pymediainfo-2.1.5.ebuild 832 SHA256 dd1ef3447ea10a34e20f993408b41b1ca83dc44746dcc805044300ac4bc2c13f SHA512 0a1efe9de256c389ca1614822442b50b99e87633866c4e9db457d82267b977c4b90a7db223deaba60e122121445feab19f75a20bcf9023c4a08c21d895a41c09 WHIRLPOOL 4abcac2c5305f5bd97d6edbe7ca35f9fab0847b30e125e59f99cd1a863fc76444ecd2e81931098a507b57f2575e6906615f63e823aee6c903ace38cec7e993fd
+DIST pymediainfo-2.2.0.tar.gz 421683 SHA256 f5d10bc5a36ce8bf7489184205667be63e689310a62f283ed881fa9a5737ebde SHA512 70081c0d7f952433dd706296b4d564004b8c28af431871388d5fe2fafddbec9e2035d8bc50df170e3761bb258b113a42bf2dc13ce3b4663f724ee08cd4136cc9 WHIRLPOOL 4b4bbcd8f04c70f43818636b70cc64e210db8ab3c912ad580bf056839429bb45bdb0f7cd1ba4c7a456eb8d1f771931f380024e77df558240398c49260678faa2
 EBUILD pymediainfo-2.1.9.ebuild 944 SHA256 58758d8a00548199b657b772a8271c8ea7362931193cf54ec57e4fca73b158ad SHA512 91e6da2e802621f787e07e7b5e9569a4d266b3ac8db7c5d33cdccd5cf890906a6de7c60db708c3fd5364402374d7546139ce2f08ab40cad19e8e59cd85e10478 WHIRLPOOL b3eab11a5ca56963bcbe2434669ad488aa7e167db17b59862292eb489891b0b6cc73b0bcb10af8044d0be39dbfabeafb2f025648d1ad51569a9e3e7b30f1d62f
+EBUILD pymediainfo-2.2.0.ebuild 965 SHA256 6a35948c83013cd075c397b3c6df567a0680a631355d6c13407d4622112b53ad SHA512 c0c09a5ba066fefff04598a6bcd0ac3693d83086a1521a598b7a83523e061a4bb1c9c9febc64693820ecf28c329997d0d7b4356460c7c79bf1d1e528adb20dea WHIRLPOOL ee807d9a738463212a595ff17f2c1fed6263dc5534eb64755f13701350d097b850be4b6c1c7585bad7cf9d4059e720289bf0c1126caa75636ceb2e9e8769edcb
 MISC ChangeLog 4109 SHA256 8a84f13c8dc94df2fe5d024579c24555827c597c6d7f92a4c413ac0392e61199 SHA512 ea2256bf0b0ad275599a812376f1e80d3665bcfe9733145e4643086f4a2627b432f1940e575476126c25baf20ed62a1dd81cad641b6d2db305ef258e3283eeae WHIRLPOOL f4e3350022c632f031d6c3ee1947a10b1a62ba9b08a0402d031e391250f1acb80f635bccb41e16db3d74f958003ca394631895c86fdaf3fb29ec8f25e9ecb3a0
-MISC metadata.xml 578 SHA256 449561dee6c1d1325613419465ddfce8d8f2f8590eacb092944105569dbaa039 SHA512 5ff33ef00e7b5ecaa5deaa6f5ef3913191786fb4af6bd9efdda0d0a19d4b48f07478a6d5df20b5d9a5abf22cb451d8faad130b8acf6bf45bca9f50dc82c309ca WHIRLPOOL 633bc00626d4b366addfce322a7c1de6d2a87ce80b0427b799bc9b8e24a7e30ec2427bcd0ae597cbb61842120373d902cac9ff6ec7079581407b82cc32335923
+MISC metadata.xml 565 SHA256 4afb83d276b9e2bd605f8a80ce54b9b1f55d14b89184f66fcf75ca080191b00f SHA512 c7b5bb954173053cc9e203bf58eb1d0e6f0945a02d6e341ce8649bb6210ad595e364eec390570fc658c35e9c0850027610a99df81ffaf8d3b8627e61f9bf54f7 WHIRLPOOL 722a85321cea5f2eab8061c291fe8fd8f8038d517a77268c6702d439da48e669b054faac5b151fb619e382f6759efa8999aefeb14dd09848f8d60141bb283873
diff --git a/dev-python/pymediainfo/metadata.xml b/dev-python/pymediainfo/metadata.xml
index b60ae270951a..c724ed0a1726 100644
--- a/dev-python/pymediainfo/metadata.xml
+++ b/dev-python/pymediainfo/metadata.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-	  <email>sautier.louis@gmail.com</email>
-	  <name>Louis Sautier</name>
-  </maintainer>
-  <maintainer type="project">
-	  <email>proxy-maint@gentoo.org</email>
-	  <name>Proxy Maintainers</name>
-  </maintainer>
-  <upstream>
-	  <remote-id type="pypi">pymediainfo</remote-id>
-	  <remote-id type="github">sbraz/pymediainfo</remote-id>
-	  <bugs-to>https://github.com/sbraz/pymediainfo/issues</bugs-to>
-  </upstream>
+	<maintainer type="person">
+		<email>sautier.louis@gmail.com</email>
+		<name>Louis Sautier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pymediainfo</remote-id>
+		<remote-id type="github">sbraz/pymediainfo</remote-id>
+		<bugs-to>https://github.com/sbraz/pymediainfo/issues</bugs-to>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pymediainfo/pymediainfo-2.1.5.ebuild b/dev-python/pymediainfo/pymediainfo-2.2.0.ebuild
index 85d6bb33e270..9e6cc2c78e70 100644
--- a/dev-python/pymediainfo/pymediainfo-2.1.5.ebuild
+++ b/dev-python/pymediainfo/pymediainfo-2.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# 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} )
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy{,3} )
 
 inherit distutils-r1
 
@@ -22,7 +22,8 @@ DEPEND="
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 	test? (
 		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
 	)
 "
 
@@ -31,7 +32,9 @@ python_compile_all() {
 }
 
 python_test() {
-	nosetests tests || die "tests failed with ${EPYTHON}"
+	# requires network access
+	py.test tests/test_pymediainfo.py -k "not MediaInfoURLTest" \
+		|| die "tests failed with ${EPYTHON}"
 }
 
 python_install_all() {
diff --git a/dev-python/pynacl/Manifest b/dev-python/pynacl/Manifest
index 7a2261826a62..4291aff3758c 100644
--- a/dev-python/pynacl/Manifest
+++ b/dev-python/pynacl/Manifest
@@ -1,6 +1,8 @@
 DIST pynacl-1.1.1.tar.gz 3099431 SHA256 a251393a93c4bd85e7a2c1c0e938dc8862743ae27d8def87c32b2888ccca049e SHA512 6410f6ed2a474fefd5df425ea7e76fbe527a9d2ed09b36291caf2c5d0e68704e58caa694e06b01ea61323b2ef16ce85c1478191cf49d7eea969395a3d74d09a8 WHIRLPOOL 625589b26591c23976cb0c5c4ec9b53c428f3c3c1a07da187af52183367d625ea5bf4d3038b1fe6c88e5c9d4297b1474137b7f350430faefbdbc43f3e36fd698
 DIST pynacl-1.1.2.tar.gz 3149804 SHA256 448897f0cfe3607dc23a871fa4405ef00926179df27ee8dfd0e46d42c60d8968 SHA512 ce9c720699fc3b808bb569ad9916f5f5ea97fbc49643117b014374ffaf77ce7972a530e9c4cfaca14dcffc8d676b5bce2facf6da99bf2fda4e319b772075e52e WHIRLPOOL e30d1fb88e94976ee334a950726437995cb8aac539cb96c93812f44314d8981dad5969cc1e687638d9100553ed6cf0b5ce2c93e66f3a1cd7aa55db034a76aa33
+DIST pynacl-1.2.0.tar.gz 3301645 SHA256 d5d78493bd2f1a41d5967f43a9ee43f9d469dbe4608bdcf798146e3704722530 SHA512 ffc3b91766aad9d0d21c88c198ebb7520d204e58ffbcac815a382af7eaf9b489f85ae6c2fc4cfe4dd5e04576062bfe248bdcc08fb42bf184a73e41f4352c7bd1 WHIRLPOOL e77a8fa414929e4b3565917a2c92cd0a5265429f5282765a30d24ad7ba2397b33bbf02d49bedc5dfbbc932abf02032875d485a643c93817f145812a2224e19b0
 EBUILD pynacl-1.1.1.ebuild 887 SHA256 b355c355e1294fd995ff7652e91a0f7791d3065f87a4f59c5873133fb5b431c7 SHA512 733c60faa80eae56229983d66992771f33990dd5853ff16e7db2a6d3d4829a08a7c615a8b7364b1ea986ef8da0eb5f194d21bd5eb8a7ed31b7fac24d0bdbdcb7 WHIRLPOOL 7fb2f6ffccf747b6d9fa431df22c0c258bd55bdb450a6ad2a8a89e31c8fa2b71218d0a8a9f7a2da8f19777da86a4aed05253c520bad5e718ccef9742940f5880
 EBUILD pynacl-1.1.2.ebuild 850 SHA256 ba5f36204502ea77803a1f316858b942fb40f1cc3d729d2fdeb647acd3e1f02d SHA512 8f8b2c6fe427374ae44e34ae4b8c0ae2e48bca1a8c9f5eb6acb563a82fd77d55e7b1433899ad0e95420ce1fe8cd0f142257c66a9d7c8bd2c7d4d25be883083d2 WHIRLPOOL 2562ebf3ff0194ab0ec33e85155f6aa4c14201c651e0d7702ad07e4df75edbfa2b4a264134a3218d09edd7e564dcdc093f89c4715a9c652d724191cc1bee5e89
+EBUILD pynacl-1.2.0.ebuild 859 SHA256 21c7e5fc01d160faa31caaa457ad91fddfc2daa093eb9c34c18131bb73f18dc4 SHA512 07b6d39acc8564d43472aa21e0d974b926b023e937792740b1b32218d12a97166e4b3ecb6f3e3ed0c35c061d11a26cb8fa86e9a1432337f26fcee8c65ffc4b0d WHIRLPOOL 0bdb0e422c0d8e644553c6c508aafbaff8eced71bca67911003d94031d1f607006b5720331756398402b59bae3a379148a3c780a12de76e5dbe425d2367d77b3
 MISC ChangeLog 795 SHA256 ddaf6d63f21f4abc117412b33edbd8f4bdbe6c739ebd422f70be90fb75e69936 SHA512 13c18858ffa5c593b2888471784f06cbbe75f4af6dfc4bfd61e2b18f204336d9946c8bb0bc147f71bb33c3b9ae02d9526c617a100b8eaf0a4748b250fec5b940 WHIRLPOOL b5d78246c6e79556ec557fa1189e9349dda62287aea71c620c790fc2a15ffce5cb8049d2f176123cccd5cb6dead4c5e1927e9ee53cad6de6693e4d8d00aa2530
-MISC metadata.xml 927 SHA256 e0fe410c13e44c7765e8798fd5b5886b1da9f0239b0d8d4a6cccceb7f58dba67 SHA512 bc1d0af5e78151fa7a623fb151eb1756e066987493cadca3bd099cf88af02d6b2423f170eaa0e3e141f1113189d1fa0d3b2aa8bcfa1d713b4e830098e14ed1db WHIRLPOOL c8a1173c00473abea9b09d27b903d372884264261f175c680153ade76fb370dd99433c68acbd6fa4a4b1772bab597a23cda475a7f0375ba26e08c6fbb1cd034d
+MISC metadata.xml 927 SHA256 5a4c695b95ba6e146a0b30e8e7bd016dfcdbda75036087ccb993dbbe65980c79 SHA512 d277f860e8aa745cdd1211546cc726d814adb37594c2fdc16d56212b4bf886e7eb7333cbff4ecba0ba66db35ec468665f904345f6a6136669790f70f9bf9f536 WHIRLPOOL 31d1b8ae04404d1999eb725127082a38d3be1615c8f141ba81955dd49548a3a53644373f52fabfe5868340bbca19f9bb473d18d491e653930f69be7b4440a82a
diff --git a/dev-python/pynacl/metadata.xml b/dev-python/pynacl/metadata.xml
index 71800e048aad..891826afa999 100644
--- a/dev-python/pynacl/metadata.xml
+++ b/dev-python/pynacl/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/dev-python/pynacl/pynacl-1.2.0.ebuild b/dev-python/pynacl/pynacl-1.2.0.ebuild
new file mode 100644
index 000000000000..c4507480e595
--- /dev/null
+++ b/dev-python/pynacl/pynacl-1.2.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})
+
+inherit distutils-r1
+
+DESCRIPTION="Python binding to the Networking and Cryptography (NaCl) library"
+HOMEPAGE="https://github.com/pyca/pynacl/ https://pypi.python.org/pypi/PyNaCl/"
+SRC_URI="https://github.com/pyca/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	>=dev-python/cffi-1.4.1[${PYTHON_USEDEP}]
+	dev-libs/libsodium:0/23
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( >=dev-python/pytest-2.6.4[${PYTHON_USEDEP}] )
+"
+
+src_prepare() {
+	# For not using the bundled libsodium
+	export SODIUM_INSTALL=system
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/pyphen/Manifest b/dev-python/pyphen/Manifest
index 7f33205ddb52..488a18061264 100644
--- a/dev-python/pyphen/Manifest
+++ b/dev-python/pyphen/Manifest
@@ -1,5 +1,5 @@
 DIST Pyphen-0.9.4.tar.gz 1092404 SHA256 abfa9a0ab055341f6e250c1a6bef395c3a06f0e4cba216eeef37f617b32c0bd7 SHA512 b48dcf02c5cdf5d7ee6d6968644958af9f31fba046612016d9ae1b8cfe44d438fe769592961f93f3342cc3f3af2dfc6cd40bbfe1be67e59de9a352c33f102917 WHIRLPOOL 23237754ef3b64aa47f3744660a025e3654498787303930563a2e2b6f6886323cc8b606d23c41067559cef237b1fcba0ee1cc3dad5699c1a4faabdaf66a7d205
-EBUILD pyphen-0.9.4.ebuild 547 SHA256 6707b3e17de1b8e0cac3ea1e5c8b2ff96cc1dd87310b68736c7e96c3e7047c6b SHA512 7a0c0c7a9a8aee31c58c89a165b8655b69e4dc087f60c46424b2444ad576cb639fb9459a8ab1c0502a4b6b1fea149ce116aac0f00488201d4fd3988a931295d5 WHIRLPOOL 18933e08ebfe6397df4693ca2822cdfb0e17a7192c689aaf3367ff0d3fa9e183a2409581d0c9b2b147f0cd581d8f9052964483a6b2c5fef72b49430bbbe96b2b
+EBUILD pyphen-0.9.4.ebuild 551 SHA256 7a49ba113e55225c8300f5d7d3513209794f3663ff1100339a284a7a23057bf2 SHA512 7e0d7604d75e3a0c88089d753fad138e4881ff7836d7ff512074702918e95fc664f3889ce6eebe53e34e80b2b48ffdae800ed12d5161857da46c4a284824a601 WHIRLPOOL c4a10724cd8b848812fb6aa03be7d6af5d4afe3fd586dce543ebed21425718d443be5267c1a5dd94bb2cdf24859ad9f9f6ed0b0bf5e249fb560e83946da5f64f
 MISC ChangeLog 2911 SHA256 c18ecca09bf8b9b369a384589d807b26300ef2bd8b0c6fd14f570f10b112f4b4 SHA512 dbf9004a7dda6991a0f49730345247212d89c9b990b1b49472354c677223c7acb4b485e646a26f1d030dd7825f202ce7a1e8244d8f1ae5b079509072f8c455d9 WHIRLPOOL 0692da5fe01775951bac206f63417b70a846e260a85d699f3f9efc3e0e24ca486e6952c99e7d8f7239eb22adb39ada5812c39c4c2269f0433472319d08785619
 MISC ChangeLog-2015 1215 SHA256 46eaa0098de8a0d7ab019c5a42281583e07164546cee98d9e55e7c9feee8dabc SHA512 3261dd79befc7540f80d5af6278b7eabd72742fa8c35766fb68d73b15a9a3e793d3fcfe43ec40d55701f6a1b1dafaf99772a0b5166b77386c666b8d77fd5e13d WHIRLPOOL e3cc7e08c9b149873c3a03cd0feea1c46c73952700056c87ef84c96af3d3134d7ad5e9951bf337c1b4ecbe07ce46ce5595488387e61181a0591e3f45b71f28b3
 MISC metadata.xml 373 SHA256 14d9b4ad26e05c9d2f9777314d9fece6d4c62968f11c4128f44eed8586aca942 SHA512 9c08d8ea794dab32dcaf659cae7eec1b19d1977fddad2e54bf321e498c85fe2355f4c73bb71c78acfa094c39f20a7775bb84bb8bf163c0e3d0dcccc93d9e998a WHIRLPOOL 80969072d5dec3a06020fd6bad63ca590cb4928fd0cbf0850f5abedcaa0545a0c9a03da629fb0f60c5db45c7230819f8ea69720632af3ab3c1c74072e31d79c4
diff --git a/dev-python/pyphen/pyphen-0.9.4.ebuild b/dev-python/pyphen/pyphen-0.9.4.ebuild
index 9edcfbd4d314..5d5fed98ca2b 100644
--- a/dev-python/pyphen/pyphen-0.9.4.ebuild
+++ b/dev-python/pyphen/pyphen-0.9.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pypy-bin/Manifest b/dev-python/pypy-bin/Manifest
index b25341ed535b..b493c0023fbe 100644
--- a/dev-python/pypy-bin/Manifest
+++ b/dev-python/pypy-bin/Manifest
@@ -16,7 +16,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.ebuild 5819 SHA256 775790b1cb15fe94d626c5622ffc903fecdfb0cb0a3b9577223d2c54776d421d SHA512 fbc7150be4c5ec2fcd59e6727c2bd439257766d09c1b31aab6a3a4702447955193d8fe58723f90f50db2a7d57eb5bd58c124aa0043f06feb0a1aaf986e51b8ac WHIRLPOOL 9fe05ae695e9dc4a6e1db8054189dae98cd3adc9cf4b4ab38e7270bc224a8dfed41b579517e0240ba54523676f89a54fa41f8b75aa0ed0e9dee758610e5c7445
+EBUILD pypy-bin-5.9.0.ebuild 5672 SHA256 48d3ec8dfac15e52212e697c1f0e875fd8482c2c682d8fea9087112d01e70dbf SHA512 344ed0c59b61d6a31021b811e68b5c74762d96286ad21dcaebb05f18ce6c7a32d501d6a2d1df577fb0e6a275a40e2be2c328465459741487924a259895752185 WHIRLPOOL 1ab2cf626a999b039605a8f76c35ff773936bd4590f0f57ed4825c5a93d019014916f1b736a1c824e1fedcd60ed12fd1e05f3fef912743e0a92c99244f270ab2
 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.ebuild b/dev-python/pypy-bin/pypy-bin-5.9.0.ebuild
index b528c67b35dd..0ebeca4356ff 100644
--- a/dev-python/pypy-bin/pypy-bin-5.9.0.ebuild
+++ b/dev-python/pypy-bin/pypy-bin-5.9.0.ebuild
@@ -99,9 +99,44 @@ src_compile() {
 	mv pypy/module/cpyext/include/* include/ || die
 	mv pypy/module/cpyext/parse/*.h include/ || die
 
-	use doc && emake -C pypy/doc/ html
-	#needed even without jit :( also needed in both compile and install phases
 	pax-mark m pypy-c libpypy-c.so
+
+	use doc && emake -C pypy/doc html
+
+	einfo "Generating caches and CFFI modules ..."
+
+	# Generate Grammar and PatternGrammar pickles.
+	./pypy-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
+		|| die "Generation of Grammar and PatternGrammar pickles failed"
+
+	# Generate cffi modules
+	# Please keep in sync with pypy/tool/build_cffi_imports.py!
+#cffi_build_scripts = {
+#    "sqlite3": "_sqlite3_build.py",
+#    "audioop": "_audioop_build.py",
+#    "tk": "_tkinter/tklib_build.py",
+#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
+#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
+#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
+#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
+#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
+	cffi_targets=( audioop curses syslog pwdgrp resource )
+	use gdbm && cffi_targets+=( gdbm )
+	use sqlite && cffi_targets+=( sqlite3 )
+	use tk && cffi_targets+=( tkinter/tklib )
+
+	local t
+	# all modules except tkinter output to .
+	# tkinter outputs to the correct dir ...
+	cd lib_pypy || die
+	for t in "${cffi_targets[@]}"; do
+		# tkinter doesn't work via -m
+		../pypy-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+	done
+
+	# Cleanup temporary objects
+	find -name "_cffi_*.[co]" -delete || die
+	find -type d -empty -delete || die
 }
 
 src_test() {
@@ -114,10 +149,11 @@ src_test() {
 src_install() {
 	local dest=/usr/$(get_libdir)/pypy
 	einfo "Installing PyPy ..."
-	insinto "${dest}"
-	doins -r include lib_pypy lib-python pypy-c libpypy-c.so
-	fperms a+x ${dest}/pypy-c ${dest}/libpypy-c.so
+	exeinto "${dest}"
+	doexe pypy-c libpypy-c.so
 	pax-mark m "${ED%/}${dest}/pypy-c" "${ED%/}${dest}/libpypy-c.so"
+	insinto "${dest}"
+	doins -r include lib_pypy lib-python
 	dosym ../$(get_libdir)/pypy/pypy-c /usr/bin/pypy
 	dodoc README.rst
 
@@ -139,10 +175,7 @@ src_install() {
 	# Install docs
 	use doc && dodoc -r pypy/doc/_build/html
 
-	einfo "Generating caches and byte-compiling ..."
-
 	local -x PYTHON=${ED%/}${dest}/pypy-c
-	local -x LD_LIBRARY_PATH="${ED%/}${dest}"
 	# we can't use eclass function since PyPy is dumb and always gives
 	# paths relative to the interpreter
 	local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy/site-packages
@@ -151,38 +184,7 @@ src_install() {
 	echo "EPYTHON='${EPYTHON}'" > epython.py || die
 	python_domodule epython.py
 
-	# Generate Grammar and PatternGrammar pickles.
-	"${PYTHON}" -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
-		|| die "Generation of Grammar and PatternGrammar pickles failed"
-
-	# Generate cffi modules
-	# Please keep in sync with pypy/tool/build_cffi_imports.py!
-#cffi_build_scripts = {
-#    "sqlite3": "_sqlite3_build.py",
-#    "audioop": "_audioop_build.py",
-#    "tk": "_tkinter/tklib_build.py",
-#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
-#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
-#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
-#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
-#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
-	cffi_targets=( audioop curses syslog pwdgrp resource )
-	use gdbm && cffi_targets+=( gdbm )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd "${ED%/}${dest}"/lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		"${PYTHON}" "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-
-	# Cleanup temporary objects
-	find "${ED%/}${dest}" -name "_cffi_*.[co]" -delete || die
-	find "${ED%/}${dest}" -type d -empty -delete || die
+	einfo "Byte-compiling Python standard library..."
 
 	# compile the installed modules
 	python_optimize "${ED%/}${dest}"
diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest
index f185819a7135..228117691617 100644
--- a/dev-python/pypy/Manifest
+++ b/dev-python/pypy/Manifest
@@ -8,8 +8,8 @@ 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-5.8.0.ebuild 7705 SHA256 4e058cb539b7735bdc0729941b0318d8f00120e913a2081222ec5e7b0f586f6f SHA512 99af9fcf702a83353b3c4c582ef0f0c3b3acfafa4239ba3599279ecdeb7cc45c7783234dfac2af956352de35e61b925ff8997772f242e408dcac59c3e9ced90c WHIRLPOOL 5e4750964256829e9e6b914aad54509d7bbfc7c59b91c3bcfd4a61d479999da23e97ca41863c8c09c17337b5889fd93230c8059e7bc00e2da22b1e12b331a63c
-EBUILD pypy-5.9.0.ebuild 7705 SHA256 5dcf88e1c930daee3e8840f9a9c6bf413360d1f1bfb6ac0d59e26c23f0ba7455 SHA512 e1991d9f01ac21f3ec8704a6480d8632e53271bfb00c4360567de811b04354cab4a5151896d0ab677c012b0cfa70c06e57b14310353d5ecb4bc898f007cf802c WHIRLPOOL 34c15b8a386378b7f087682f67e5277491bd29bd734938dd2a23ccfe36b002f2829dcfb637552005167d8a2a8b310f7974ef3ccd7f9f42d66f0c4122ce1916e1
-EBUILD pypy-9999.ebuild 7715 SHA256 9eeed5694ff50be33062f51d6036220ee2223fb72be63046ea2d281895651d4c SHA512 0ba1c84e971a0d41ddcd766e8c1c5a1684a9d1e57fe8e2dd55d29339edac9e61c117b031c3a61b998fd70d3a3b7b1f6b398cde7f92ea4142fd6befa73b0395bb WHIRLPOOL 80f318573a27f9495ab8151961a138b1cfac9547280f1982b9b953e39d95b14d342b29445533ac5d1c65d4d9557cb210bedf08550b3df3a4b9d9bff51da07330
+EBUILD pypy-5.9.0.ebuild 7627 SHA256 d8a048df483a69184efe7ad6354fcbc6897a1a12c39006daf2ebf0ce50218f47 SHA512 a90e86ba1906573dbab8a897ff0afceec07fa2127bb2cef0c249285f5ede0bdba102e0ec6c818ad55bb83c5db62de1881ec0a7173b18985575c29ee4b7ed62ec WHIRLPOOL a0f09bca13f7e490f472fcc2b348582f132df36a38a5843557b9eab1977f48f8db461a959bb66d402264449c2010efaafc167184c6d408ffc3aa8d26bcadb2f5
+EBUILD pypy-9999.ebuild 7637 SHA256 0bacf767aab159b04beafdba355c63ec28b5c36ae1ef035dd940338944fc7685 SHA512 32bd760b59eea862c73e4505b0dc73e0bec2923f140d6237a06a0ddc009c113ca00fc3d38499606ed8f3ea01b29925debb7ad3523a9f154f598c4d22250dba8b WHIRLPOOL 1b789838cb6ad8fc96f8123239160a370787b4508c4e123df01b2bd00b79f22cbca10e55717e44a8eee0666d9fa6fdea02075dba0e3f9667ece87eb6b092da39
 MISC ChangeLog 9456 SHA256 2c487622b9a986cf7e958164a53f87c23fec4c87fb491b0d04f5dd96f17f911f SHA512 b639ad32b6eb4e456547d2df9cb739f88e736760ccba2bbbcf044b9140991d2b9a58944ad79dd8199a20a444cd0da79b8a0248f9072d1c4e2fb2e6f299f924ac WHIRLPOOL 6cc1e181530a5a48ac39b6adb8c52d01bd406b7e94f8cb8bd874d25b1eb708c4ee77e52e2bbcc7b40e257e86d1dba3e6db9be387828578d0d28d33b73b0e63b1
 MISC ChangeLog-2015 16042 SHA256 657b5025da42db387e3dd4b8ca2b081412e2fbe4ed95d6b633f7058107538777 SHA512 9395cfaefb8972adb9cc709884eec37094387490fd26b1ed51b45fd957348174f17dc577e826e72f758b4ba215d12af3c7c79989187280d8d58032966571ce4b WHIRLPOOL 69229bea7c34d0c718648dedc4aaf1d46e540961f65a577290649b3f799fb7e47116b2bc55d39b00a92291e21755440f0024abae2053217140c50b5b9f145880
 MISC metadata.xml 636 SHA256 f73161c46ef3c8187a80d861f0c29e04816b04b2f5c7fbd56b8b7ff140459c9f SHA512 c52d59231928b12da09c2c7149afbb852ceaf1342a2747d85493c9abc15b8d68fd24495349e583aee5cea18799bd4dada3943bc523a4e18745e2036446cd0841 WHIRLPOOL 8eb2d191fcbb21aeb2e8bb10672a066165c809aedc45cbe4e7cbe00ed75db009cb95c16d57d7e87d80e6de5c3953e4742bd68a21a58367ae92f4efd9b8a8e794
diff --git a/dev-python/pypy/pypy-5.9.0.ebuild b/dev-python/pypy/pypy-5.9.0.ebuild
index 3eff562c4ad6..cef567ec30c9 100644
--- a/dev-python/pypy/pypy-5.9.0.ebuild
+++ b/dev-python/pypy/pypy-5.9.0.ebuild
@@ -38,8 +38,7 @@ RDEPEND=">=sys-libs/zlib-1.1.3:0=
 	!dev-python/pypy-bin:0"
 DEPEND="${RDEPEND}
 	doc? ( dev-python/sphinx )
-	${PYTHON_DEPS}
-	test? ( dev-python/pytest )"
+	${PYTHON_DEPS}"
 
 S="${WORKDIR}/${MY_P}-src"
 
@@ -179,6 +178,42 @@ src_compile() {
 	pax-mark m pypy-c libpypy-c.so
 
 	use doc && emake -C pypy/doc html
+
+	einfo "Generating caches and CFFI modules ..."
+
+	# Generate Grammar and PatternGrammar pickles.
+	./pypy-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
+		|| die "Generation of Grammar and PatternGrammar pickles failed"
+
+	# Generate cffi modules
+	# Please keep in sync with pypy/tool/build_cffi_imports.py!
+#cffi_build_scripts = {
+#    "sqlite3": "_sqlite3_build.py",
+#    "audioop": "_audioop_build.py",
+#    "tk": "_tkinter/tklib_build.py",
+#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
+#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
+#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
+#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
+#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
+	cffi_targets=( audioop syslog pwdgrp resource )
+	use gdbm && cffi_targets+=( gdbm )
+	use ncurses && cffi_targets+=( curses )
+	use sqlite && cffi_targets+=( sqlite3 )
+	use tk && cffi_targets+=( tkinter/tklib )
+
+	local t
+	# all modules except tkinter output to .
+	# tkinter outputs to the correct dir ...
+	cd lib_pypy || die
+	for t in "${cffi_targets[@]}"; do
+		# tkinter doesn't work via -m
+		../pypy-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+	done
+
+	# Cleanup temporary objects
+	find -name "_cffi_*.[co]" -delete || die
+	find -type d -empty -delete || die
 }
 
 src_test() {
@@ -217,10 +252,7 @@ src_install() {
 	# Install docs
 	use doc && dodoc -r pypy/doc/_build/html
 
-	einfo "Generating caches and byte-compiling ..."
-
 	local -x PYTHON=${ED%/}${dest}/pypy-c
-	local -x LD_LIBRARY_PATH="${ED%/}${dest}"
 	# we can't use eclass function since PyPy is dumb and always gives
 	# paths relative to the interpreter
 	local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy/site-packages
@@ -229,39 +261,7 @@ src_install() {
 	echo "EPYTHON='${EPYTHON}'" > epython.py || die
 	python_domodule epython.py
 
-	# Generate Grammar and PatternGrammar pickles.
-	"${PYTHON}" -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
-		|| die "Generation of Grammar and PatternGrammar pickles failed"
-
-	# Generate cffi modules
-	# Please keep in sync with pypy/tool/build_cffi_imports.py!
-#cffi_build_scripts = {
-#    "sqlite3": "_sqlite3_build.py",
-#    "audioop": "_audioop_build.py",
-#    "tk": "_tkinter/tklib_build.py",
-#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
-#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
-#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
-#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
-#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
-	cffi_targets=( audioop syslog pwdgrp resource )
-	use gdbm && cffi_targets+=( gdbm )
-	use ncurses && cffi_targets+=( curses )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd "${ED%/}${dest}"/lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		"${PYTHON}" "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-
-	# Cleanup temporary objects
-	find "${ED%/}${dest}" -name "_cffi_*.[co]" -delete || die
-	find "${ED%/}${dest}" -type d -empty -delete || die
+	einfo "Byte-compiling Python standard library..."
 
 	# compile the installed modules
 	python_optimize "${ED%/}${dest}"
diff --git a/dev-python/pypy/pypy-9999.ebuild b/dev-python/pypy/pypy-9999.ebuild
index 62d8a0f73b85..08bd414c5901 100644
--- a/dev-python/pypy/pypy-9999.ebuild
+++ b/dev-python/pypy/pypy-9999.ebuild
@@ -39,8 +39,7 @@ RDEPEND=">=sys-libs/zlib-1.1.3:0=
 	!dev-python/pypy-bin:0"
 DEPEND="${RDEPEND}
 	doc? ( dev-python/sphinx )
-	${PYTHON_DEPS}
-	test? ( dev-python/pytest )"
+	${PYTHON_DEPS}"
 
 S="${WORKDIR}/${MY_P}-src"
 
@@ -185,6 +184,42 @@ src_compile() {
 	pax-mark m pypy-c libpypy-c.so
 
 	use doc && emake -C pypy/doc html
+
+	einfo "Generating caches and CFFI modules ..."
+
+	# Generate Grammar and PatternGrammar pickles.
+	./pypy-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
+		|| die "Generation of Grammar and PatternGrammar pickles failed"
+
+	# Generate cffi modules
+	# Please keep in sync with pypy/tool/build_cffi_imports.py!
+#cffi_build_scripts = {
+#    "sqlite3": "_sqlite3_build.py",
+#    "audioop": "_audioop_build.py",
+#    "tk": "_tkinter/tklib_build.py",
+#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
+#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
+#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
+#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
+#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
+	cffi_targets=( audioop syslog pwdgrp resource )
+	use gdbm && cffi_targets+=( gdbm )
+	use ncurses && cffi_targets+=( curses )
+	use sqlite && cffi_targets+=( sqlite3 )
+	use tk && cffi_targets+=( tkinter/tklib )
+
+	local t
+	# all modules except tkinter output to .
+	# tkinter outputs to the correct dir ...
+	cd lib_pypy || die
+	for t in "${cffi_targets[@]}"; do
+		# tkinter doesn't work via -m
+		../pypy-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+	done
+
+	# Cleanup temporary objects
+	find -name "_cffi_*.[co]" -delete || die
+	find -type d -empty -delete || die
 }
 
 src_test() {
@@ -223,10 +258,7 @@ src_install() {
 	# Install docs
 	use doc && dodoc -r pypy/doc/_build/html
 
-	einfo "Generating caches and byte-compiling ..."
-
 	local -x PYTHON=${ED%/}${dest}/pypy-c
-	local -x LD_LIBRARY_PATH="${ED%/}${dest}"
 	# we can't use eclass function since PyPy is dumb and always gives
 	# paths relative to the interpreter
 	local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy/site-packages
@@ -235,39 +267,7 @@ src_install() {
 	echo "EPYTHON='${EPYTHON}'" > epython.py || die
 	python_domodule epython.py
 
-	# Generate Grammar and PatternGrammar pickles.
-	"${PYTHON}" -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
-		|| die "Generation of Grammar and PatternGrammar pickles failed"
-
-	# Generate cffi modules
-	# Please keep in sync with pypy/tool/build_cffi_imports.py!
-#cffi_build_scripts = {
-#    "sqlite3": "_sqlite3_build.py",
-#    "audioop": "_audioop_build.py",
-#    "tk": "_tkinter/tklib_build.py",
-#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
-#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
-#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
-#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
-#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
-	cffi_targets=( audioop syslog pwdgrp resource )
-	use gdbm && cffi_targets+=( gdbm )
-	use ncurses && cffi_targets+=( curses )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd "${ED%/}${dest}"/lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		"${PYTHON}" "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-
-	# Cleanup temporary objects
-	find "${ED%/}${dest}" -name "_cffi_*.[co]" -delete || die
-	find "${ED%/}${dest}" -type d -empty -delete || die
+	einfo "Byte-compiling Python standard library..."
 
 	# compile the installed modules
 	python_optimize "${ED%/}${dest}"
diff --git a/dev-python/pypy3-bin/Manifest b/dev-python/pypy3-bin/Manifest
index 4ebb94a8a1ed..2af72b456b1e 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.ebuild 5722 SHA256 3e62b74de8b71e815d4a3342482acac2776eedc2b920745ca8ba475f3887d4de SHA512 e3308ad3010489cf095ae0d2a06f97686193ce95bb961d05a467a5da97a5af71884855e912f515edd9e15434ab7edbcb2c436528257af3c5e5e921ab46e3993c WHIRLPOOL d1b52f2d50dd4552474904ffccb38c2b549a4310eb04ba7900d851400fc718749cde982551b8205f933bc25532ab6b95ccfc554a977e93a3b873097be4025702
+EBUILD pypy3-bin-5.9.0.ebuild 5665 SHA256 11c7c48e243232f10f41c83ae577458cfddab1c3bd8ecabc42ab83402920e1cf SHA512 295ec4adf05e9ee18609b3ebf358ad636d0a8edd6724d3ad99953ae4bf2ad3e983754b59dfc7298f7fbafdb85c6a6b261040142b8a49faf8abc3342cd24a8686 WHIRLPOOL f210558fd0c2abeba2429815f75956d1616d67100bb6d6e1e80978a617a2a63db8cbadbfd3ba4892fa901a48f7dac35e1397a830c8f9807f7a2809b0f312256d
 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.ebuild b/dev-python/pypy3-bin/pypy3-bin-5.9.0.ebuild
index cea9bc9a3191..55abb1af9eeb 100644
--- a/dev-python/pypy3-bin/pypy3-bin-5.9.0.ebuild
+++ b/dev-python/pypy3-bin/pypy3-bin-5.9.0.ebuild
@@ -90,8 +90,47 @@ src_compile() {
 	mv pypy/module/cpyext/parse/*.h include/ || die
 
 	#use doc && emake -C pypy/doc/ html
-	#needed even without jit :( also needed in both compile and install phases
 	pax-mark m pypy3-c libpypy3-c.so
+
+	#use doc && emake -C pypy/doc html
+
+	einfo "Generating caches and CFFI modules ..."
+
+	# Generate Grammar and PatternGrammar pickles.
+	"${PYTHON}" -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
+		|| die "Generation of Grammar and PatternGrammar pickles failed"
+
+	# Generate cffi modules
+	# Please keep in sync with pypy/tool/build_cffi_imports.py!
+#cffi_build_scripts = {
+#    "sqlite3": "_sqlite3_build.py",
+#    "audioop": "_audioop_build.py",
+#    "tk": "_tkinter/tklib_build.py",
+#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
+#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
+#    "_gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
+#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
+#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
+#    "lzma": "_lzma_build.py",
+#    "_decimal": "_decimal_build.py",
+#    "ssl": "_ssl_build.py",
+	cffi_targets=( audioop curses syslog pwdgrp resource lzma decimal ssl )
+	use gdbm && cffi_targets+=( gdbm )
+	use sqlite && cffi_targets+=( sqlite3 )
+	use tk && cffi_targets+=( tkinter/tklib )
+
+	local t
+	# all modules except tkinter output to .
+	# tkinter outputs to the correct dir ...
+	cd lib_pypy || die
+	for t in "${cffi_targets[@]}"; do
+		# tkinter doesn't work via -m
+		../pypy3-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+	done
+
+	# Cleanup temporary objects
+	find -name "_cffi_*.[co]" -delete || die
+	find -type d -empty -delete || die
 }
 
 src_test() {
@@ -106,10 +145,11 @@ src_test() {
 src_install() {
 	local dest=/usr/$(get_libdir)/pypy3
 	einfo "Installing PyPy ..."
-	insinto "${dest}"
-	doins -r include lib_pypy lib-python pypy3-c libpypy3-c.so
-	fperms a+x ${dest}/pypy3-c ${dest}/libpypy3-c.so
+	exeinto "${dest}"
+	doexe pypy3-c libpypy3-c.so
 	pax-mark m "${ED%/}${dest}/pypy3-c" "${ED%/}${dest}/libpypy3-c.so"
+	insinto "${dest}"
+	doins -r include lib_pypy lib-python
 	dosym ../$(get_libdir)/pypy3/pypy3-c /usr/bin/pypy3
 	dodoc README.rst
 
@@ -133,7 +173,6 @@ src_install() {
 	einfo "Generating caches and byte-compiling ..."
 
 	local -x PYTHON=${ED%/}${dest}/pypy3-c
-	local -x LD_LIBRARY_PATH="${ED%/}${dest}"
 	# we can't use eclass function since PyPy is dumb and always gives
 	# paths relative to the interpreter
 	local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy3/site-packages
@@ -142,41 +181,7 @@ src_install() {
 	echo "EPYTHON='${EPYTHON}'" > epython.py || die
 	python_domodule epython.py
 
-	# Generate Grammar and PatternGrammar pickles.
-	"${PYTHON}" -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
-		|| die "Generation of Grammar and PatternGrammar pickles failed"
-
-	# Generate cffi modules
-	# Please keep in sync with pypy/tool/build_cffi_imports.py!
-#cffi_build_scripts = {
-#    "sqlite3": "_sqlite3_build.py",
-#    "audioop": "_audioop_build.py",
-#    "tk": "_tkinter/tklib_build.py",
-#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
-#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
-#    "_gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
-#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
-#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
-#    "lzma": "_lzma_build.py",
-#    "_decimal": "_decimal_build.py",
-#    "ssl": "_ssl_build.py",
-	cffi_targets=( audioop curses syslog pwdgrp resource lzma decimal ssl )
-	use gdbm && cffi_targets+=( gdbm )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd "${ED%/}${dest}"/lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		"${PYTHON}" "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-
-	# Cleanup temporary objects
-	find "${ED%/}${dest}" -name "_cffi_*.[co]" -delete || die
-	find "${ED%/}${dest}" -type d -empty -delete || die
+	einfo "Byte-compiling Python standard library..."
 
 	# compile the installed modules
 	python_optimize "${ED%/}${dest}"
diff --git a/dev-python/pypy3/Manifest b/dev-python/pypy3/Manifest
index 4ad977348100..246b6dbe509d 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 6848 SHA256 6e3ed87ce34b6ca76d2e4e227dd4df98bf4afd4f716348978c3bb553c10e94f7 SHA512 7fbc930711d56828349e8c9c9795866ba29ceffb63073edfbb639a1027e285457179ed9be7633e1403d93324a2421d9c84baf88c3ed5c6da1868cf6afb7fbdec WHIRLPOOL 83af86158f64d805a37b3e812a2309827d8fae57683be02341a5461d42512edb81064d462f599949334e8339ffd3bdaa4814cff24ef2e6bdaf9f3ec26851c597
-EBUILD pypy3-9999.ebuild 7438 SHA256 741fe59f7a8fe91c1f1234595d313adfb0c066fbdbf321b729630b5ce584c516 SHA512 fde56d70b45a548907f108854b78c67ef8a48b0701db6de225ac2cc8e78a11753d878600672dfce190669681cbaf1f8db49c71ce6542d9d81d0f8807cd2649c6 WHIRLPOOL 28129dd795c6ad670d36ef6fadfd80e670954baf6dd6a2b63743e0729067158495bc59f5a00e919cc2323438f0556b780ccc825454535a77cb2e7b0d75a1d9e4
+EBUILD pypy3-5.9.0.ebuild 6854 SHA256 1f9fda45b1f79f36c40cb227a9cc4f8e82374cdb0e346da4f576ba74feb96cd7 SHA512 b1234244ff71d78552a251a292c969ef8fe6b3b2083c1d1b9dc014ce68f91ee713bcf9e51c4a8f4b6c0b3e6ec94e7b85ee9cefb43b3ac3789da4f7175f8a7cae WHIRLPOOL 8773f2248da993d235b5daa2f755d8bfcf5d2169ef99c18b3da178e5adb4b1970374c577f4ccce39fa15e9ecaf4385639431e97b5740d3ad77d87ea370a18831
+EBUILD pypy3-9999.ebuild 7444 SHA256 664f45490474a795a90354de882e4574fd9d31d2b2d5899e099cc7b515a11e37 SHA512 4447381b0c4bd2b7630362781ea7a848bc29720cc0eca475ff8a1708af1ccb7caffd19f1719636f460a12fd3187d7fd3d910cd569a6643794af5c8ac942fa4a3 WHIRLPOOL d73c096860181dbb125b054af20f56820666057b015c63096eed99485d16df18e29754da90df9b81b005ad450f8467ffa8c97873692e12702a3d12383278f172
 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 86dc37a6b60a..68ba1a3ef97c 100644
--- a/dev-python/pypy3/pypy3-5.9.0.ebuild
+++ b/dev-python/pypy3/pypy3-5.9.0.ebuild
@@ -145,6 +145,45 @@ src_compile() {
 	pax-mark m pypy3-c libpypy3-c.so
 
 	#use doc && emake -C pypy/doc html
+
+	einfo "Generating caches and CFFI modules ..."
+
+	# Generate Grammar and PatternGrammar pickles.
+	"${PYTHON}" -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
+		|| die "Generation of Grammar and PatternGrammar pickles failed"
+
+	# Generate cffi modules
+	# Please keep in sync with pypy/tool/build_cffi_imports.py!
+#cffi_build_scripts = {
+#    "sqlite3": "_sqlite3_build.py",
+#    "audioop": "_audioop_build.py",
+#    "tk": "_tkinter/tklib_build.py",
+#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
+#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
+#    "_gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
+#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
+#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
+#    "lzma": "_lzma_build.py",
+#    "_decimal": "_decimal_build.py",
+#    "ssl": "_ssl_build.py",
+	cffi_targets=( audioop syslog pwdgrp resource lzma decimal ssl )
+	use gdbm && cffi_targets+=( gdbm )
+	use ncurses && cffi_targets+=( curses )
+	use sqlite && cffi_targets+=( sqlite3 )
+	use tk && cffi_targets+=( tkinter/tklib )
+
+	local t
+	# all modules except tkinter output to .
+	# tkinter outputs to the correct dir ...
+	cd lib_pypy || die
+	for t in "${cffi_targets[@]}"; do
+		# tkinter doesn't work via -m
+		../pypy3-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+	done
+
+	# Cleanup temporary objects
+	find -name "_cffi_*.[co]" -delete || die
+	find -type d -empty -delete || die
 }
 
 src_test() {
@@ -187,7 +226,6 @@ src_install() {
 	einfo "Generating caches and byte-compiling ..."
 
 	local -x PYTHON=${ED%/}${dest}/pypy3-c
-	local -x LD_LIBRARY_PATH="${ED%/}${dest}"
 	# we can't use eclass function since PyPy is dumb and always gives
 	# paths relative to the interpreter
 	local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy3/site-packages
@@ -196,42 +234,7 @@ src_install() {
 	echo "EPYTHON='${EPYTHON}'" > epython.py || die
 	python_domodule epython.py
 
-	# Generate Grammar and PatternGrammar pickles.
-	"${PYTHON}" -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
-		|| die "Generation of Grammar and PatternGrammar pickles failed"
-
-	# Generate cffi modules
-	# Please keep in sync with pypy/tool/build_cffi_imports.py!
-#cffi_build_scripts = {
-#    "sqlite3": "_sqlite3_build.py",
-#    "audioop": "_audioop_build.py",
-#    "tk": "_tkinter/tklib_build.py",
-#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
-#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
-#    "_gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
-#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
-#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
-#    "lzma": "_lzma_build.py",
-#    "_decimal": "_decimal_build.py",
-#    "ssl": "_ssl_build.py",
-	cffi_targets=( audioop syslog pwdgrp resource lzma decimal ssl )
-	use gdbm && cffi_targets+=( gdbm )
-	use ncurses && cffi_targets+=( curses )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd "${ED%/}${dest}"/lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		"${PYTHON}" "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-
-	# Cleanup temporary objects
-	find "${ED%/}${dest}" -name "_cffi_*.[co]" -delete || die
-	find "${ED%/}${dest}" -type d -empty -delete || die
+	einfo "Byte-compiling Python standard library..."
 
 	# compile the installed modules
 	python_optimize "${ED%/}${dest}"
diff --git a/dev-python/pypy3/pypy3-9999.ebuild b/dev-python/pypy3/pypy3-9999.ebuild
index cb2f562dfff9..92c2f84f5b09 100644
--- a/dev-python/pypy3/pypy3-9999.ebuild
+++ b/dev-python/pypy3/pypy3-9999.ebuild
@@ -172,6 +172,45 @@ src_compile() {
 	pax-mark m pypy3-c libpypy3-c.so
 
 	#use doc && emake -C pypy/doc html
+
+	einfo "Generating caches and CFFI modules ..."
+
+	# Generate Grammar and PatternGrammar pickles.
+	"${PYTHON}" -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
+		|| die "Generation of Grammar and PatternGrammar pickles failed"
+
+	# Generate cffi modules
+	# Please keep in sync with pypy/tool/build_cffi_imports.py!
+#cffi_build_scripts = {
+#    "sqlite3": "_sqlite3_build.py",
+#    "audioop": "_audioop_build.py",
+#    "tk": "_tkinter/tklib_build.py",
+#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
+#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
+#    "_gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
+#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
+#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
+#    "lzma": "_lzma_build.py",
+#    "_decimal": "_decimal_build.py",
+#    "ssl": "_ssl_build.py",
+	cffi_targets=( audioop syslog pwdgrp resource lzma decimal ssl )
+	use gdbm && cffi_targets+=( gdbm )
+	use ncurses && cffi_targets+=( curses )
+	use sqlite && cffi_targets+=( sqlite3 )
+	use tk && cffi_targets+=( tkinter/tklib )
+
+	local t
+	# all modules except tkinter output to .
+	# tkinter outputs to the correct dir ...
+	cd lib_pypy || die
+	for t in "${cffi_targets[@]}"; do
+		# tkinter doesn't work via -m
+		../pypy3-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+	done
+
+	# Cleanup temporary objects
+	find -name "_cffi_*.[co]" -delete || die
+	find -type d -empty -delete || die
 }
 
 src_test() {
@@ -215,7 +254,6 @@ src_install() {
 	einfo "Generating caches and byte-compiling ..."
 
 	local -x PYTHON=${ED%/}${dest}/pypy3-c
-	local -x LD_LIBRARY_PATH="${ED%/}${dest}"
 	# we can't use eclass function since PyPy is dumb and always gives
 	# paths relative to the interpreter
 	local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy3/site-packages
@@ -224,42 +262,7 @@ src_install() {
 	echo "EPYTHON='${EPYTHON}'" > epython.py || die
 	python_domodule epython.py
 
-	# Generate Grammar and PatternGrammar pickles.
-	"${PYTHON}" -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
-		|| die "Generation of Grammar and PatternGrammar pickles failed"
-
-	# Generate cffi modules
-	# Please keep in sync with pypy/tool/build_cffi_imports.py!
-#cffi_build_scripts = {
-#    "sqlite3": "_sqlite3_build.py",
-#    "audioop": "_audioop_build.py",
-#    "tk": "_tkinter/tklib_build.py",
-#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
-#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
-#    "_gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
-#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
-#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
-#    "lzma": "_lzma_build.py",
-#    "_decimal": "_decimal_build.py",
-#    "ssl": "_ssl_build.py",
-	cffi_targets=( audioop syslog pwdgrp resource lzma decimal ssl )
-	use gdbm && cffi_targets+=( gdbm )
-	use ncurses && cffi_targets+=( curses )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd "${ED%/}${dest}"/lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		"${PYTHON}" "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-
-	# Cleanup temporary objects
-	find "${ED%/}${dest}" -name "_cffi_*.[co]" -delete || die
-	find "${ED%/}${dest}" -type d -empty -delete || die
+	einfo "Byte-compiling Python standard library..."
 
 	# compile the installed modules
 	python_optimize "${ED%/}${dest}"
diff --git a/dev-python/pysmi/Manifest b/dev-python/pysmi/Manifest
index 3d621679fe6a..bdfb666423cc 100644
--- a/dev-python/pysmi/Manifest
+++ b/dev-python/pysmi/Manifest
@@ -1,3 +1,3 @@
 DIST pysmi-0.1.3.tar.gz 78325 SHA256 99c74d6a0b502c04cedbf5f8f2d17656b830e5c364b92a947f4cb79240206e1b SHA512 d321fbbc68e4b6b2b18de5c1215dc450ad2ba2ea6c70cbeee9d981d2e2106b59582eae42b09da72bc02af789f7f58a6fc97712869b74f0137d8f7fd7238b2211 WHIRLPOOL 7115b0b8ee3ac3727134c67b20faf7259552f7c3b2186575f4abbc52b7a3d183eaca4e8791b6dba3da75c0a8c721195e2bfff708161567063eb2b5e48af24499
-EBUILD pysmi-0.1.3.ebuild 426 SHA256 bcbb4866c3d031f409f989a79ad3556d08bcb0b9d8a509fc04939f0dcd612441 SHA512 715530734040ce446172310a87fbce6cf4adc057612939ae9c8a339bc79ad856995d5157c4005027d77030a6b839b91aa6e3b61901bc57502b4e406ab6112a9e WHIRLPOOL 1a2c9f4b4a40764d77e6120606f715971cb04b8c9d8d8e54393d11463ebd86e2ac6fe3d88bdf4b27bcbeca0bc276af2775b79446228dade02e10e5edc740d722
+EBUILD pysmi-0.1.3.ebuild 433 SHA256 9add7a225037b25364a2284fefeb319ff9ef7db9e2b49ca0a6354b9b003cb257 SHA512 52508f4312e59b1e17eab6323ed6b211ea5bdbffe6a96634725c5e98120e8ff35625d33bf81e69f66bacd2e0a1aa763afae378b2a00186d44dc0cdbbedc9231d WHIRLPOOL adc1292b62730f7bb4073004fbfb7d2282f0fb6988495a728f87bdf08d218fae8d8fcbc5efe00420ebcf21f765bb060a54cf8b16833ebb53e59798622dfde111
 MISC metadata.xml 358 SHA256 a0ec717b3c92a0292658be3f9b49c88e3807c4fef6eed620ca79d73897435c6f SHA512 f7a17e837c410ac604a0e1b4493c7219846a8c8cbcd5b4fb84ffc401b98c8eeacba4731dabad6f61bf1e4f172157c174d6a039725174e2f58b9dfbb89998635d WHIRLPOOL b3f8ef642481163608c01d39f12f705922cf6249c369b65f545b616aa64baf67655d4934005ca13dd82c8cd2656c0c9fa0c5f0994d29aa9728c236f3ea17f24a
diff --git a/dev-python/pysmi/pysmi-0.1.3.ebuild b/dev-python/pysmi/pysmi-0.1.3.ebuild
index 42dccdce4f10..6fa611d7e85a 100644
--- a/dev-python/pysmi/pysmi-0.1.3.ebuild
+++ b/dev-python/pysmi/pysmi-0.1.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/pytest-capturelog/Manifest b/dev-python/pytest-capturelog/Manifest
index 023880462b6b..7460bba23991 100644
--- a/dev-python/pytest-capturelog/Manifest
+++ b/dev-python/pytest-capturelog/Manifest
@@ -1,5 +1,5 @@
 DIST pytest-capturelog-0.7.tar.gz 4293 SHA256 b6e8d5189b39462109c2188e6b512d6cc7e66d62bb5be65389ed50e96d22000d SHA512 82567697be2c277f49633cee5c83733b3383b89e987729dc977f4ef3dd08a5ef55d507f5380ac08def7791157208459ee08d686cf532280c665e659938f03c22 WHIRLPOOL 3b292ac5197c13b72019e4051226a7417434fdba6854883273d13f6750e9420987f0af80ec8035d88b318290a190d397c3c7bc892b4930641977bad7ddbcc420
-EBUILD pytest-capturelog-0.7.ebuild 812 SHA256 5193fa5d2792245f2f9d2e8cfcbf90a9c04c53ad0726dcb9e924e449d607b18b SHA512 978350982d183b0fcb6e72f558e644b9054c9d91fa5a6bd5f2f2cf4626b6718fb615e1839814b3001d951d72dee81dbdd956f93db09bd1a08f83b592fbf29b9f WHIRLPOOL 9b80697e9d387b28e734c0ce691734bfd66461d2083d5b02f845b319993c993e67c6497d50b17f37ab26c465caa777e73ac969d5997f54454ce0431b0ce733c1
+EBUILD pytest-capturelog-0.7.ebuild 880 SHA256 8321ba5c1788033abe5ebd038a6b05c703ca2b3233cf45d4a1e60f99f0c6f652 SHA512 6feea4d20a8b0b4dbebb3672db1c6fefce8817642403a2ae1f20d57c17c508b63ee7c6243a709ad6ba44873de61c7112672050b067fa1763179f113ae441f560 WHIRLPOOL e551d7c26a8df72110dcf576577d5652162e05f5bfbc1bdd389b8291aebe07cd3ea376955cf1cbe1b136553200a1dddc47f018b31d4fb48107780c7df0d445ad
 MISC ChangeLog 3978 SHA256 c53a740e9a21f32011d5ba75ac64366d51e355662116d530c3efc4ef60f76576 SHA512 446440f264e4553d2ad5d2740cb1208eda1f98dadc393cb783d05baf9de5da1af07824c6065e1f338f603bb4dc2e9314c77a4a544d32ee46457e66bd827fb3fe WHIRLPOOL 361bc5ce838ad7d1ae9e4caae7c6039dda743512a5e36070ac81bdde8f44169775453e4ec6cb080d3045356056a91cdd1fc6abf4643ce6697216356b125d03e7
 MISC ChangeLog-2015 481 SHA256 6d51324d10dc56993f79d2158c7295c678cb3ad65bc2f017ef5394aff31f6ee7 SHA512 0539739e46160c9ffdd261ae94ccb0fa5dd42192d274e95538e0cf2d86940b1eb7c6deacc7cb7062e671a50533dd63303002150071ed325ddfc39316156c2359 WHIRLPOOL c53e91645aac6881e3c2e7d4055d252118f1caddcf427a5578f2c49f4fa8479324f6d80d79d8e5aac3588ad1cd303a33c68c9747cafa1bd78524927fcf814768
 MISC metadata.xml 390 SHA256 d76cabcccc460157c90de982e9d1b9d9a5d39c2d0cf6733372bdef32791f441c SHA512 c4f5af0f5e6ac325f47cced6f6032279bf9109d1581f18c051869cf7ef4526c38245c4b31335f6fb42851ec5ec8c52e2841aee044c25195142917a39000e7525 WHIRLPOOL edef2f2a71a6ae6041f91295ef0e7716c584e17ca3bc34d7bf1123d2d4d5947d8a1a9aed35f3b8d1d012af345574c1bca487e02a7b28d53a42f0218fb0d4aeca
diff --git a/dev-python/pytest-capturelog/pytest-capturelog-0.7.ebuild b/dev-python/pytest-capturelog/pytest-capturelog-0.7.ebuild
index fc314eaeead3..af1bda9a4af4 100644
--- a/dev-python/pytest-capturelog/pytest-capturelog-0.7.ebuild
+++ b/dev-python/pytest-capturelog/pytest-capturelog-0.7.ebuild
@@ -16,10 +16,12 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="test"
 
-RDEPEND="dev-python/py[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
+COMMON_DEPEND="dev-python/py[${PYTHON_USEDEP}]"
+DEPEND="${COMMON_DEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+RDEPEND="${COMMON_DEPEND}
+	!dev-python/pytest-catchlog"
 
 # Not included
 # https://bitbucket.org/memedough/pytest-capturelog/issues/5
diff --git a/dev-python/pytest-catchlog/Manifest b/dev-python/pytest-catchlog/Manifest
index 9aea26f2e22f..8a99e93d8097 100644
--- a/dev-python/pytest-catchlog/Manifest
+++ b/dev-python/pytest-catchlog/Manifest
@@ -1,4 +1,4 @@
 DIST pytest-catchlog-1.2.2.zip 18028 SHA256 4be15dc5ac1750f83960897f591453040dff044b5966fe24a91c2f7d04ecfcf0 SHA512 bbeeb7213898844a7956712992ddaca1e28c52fc5712339b9730f181a124af5ec90b5460981066638658246da4321840a7583ee14eec7c0482e069e2a824d031 WHIRLPOOL 522f34a6f54f15d1cf1380508517c50f9892553ae8b134c91a399f90c4534762fe88e4b3f7a5608fabf54aee1d53a4eb1e5e5473549bbafe772ba878f4116189
-EBUILD pytest-catchlog-1.2.2.ebuild 726 SHA256 a457722c530d79fcd4fadff3a0093138257e4d30d4ff55536d9ed4b37eaa3072 SHA512 9bd9dc78adb299480d5c37cadb9c6ff439cb1b28f585275467b499b39e78ca12e8d2759bb79e1658127640e6da2bbe976f7aa4c6b237f222924c36715627e4aa WHIRLPOOL 880641748d3e24404ba10467d3ccafaaf09f42af870cf18da0c5ad07261d25aac2299598314962663c7baad6c0dfb2e561c9a686898a84e02f6e1e5b98e1fd81
+EBUILD pytest-catchlog-1.2.2.ebuild 796 SHA256 a7910df8c692cdfccbd64685b826baa9e15db3fd3e09208515ce6cb99a511c65 SHA512 e6a6c22d8fa9e3477be298d3c7da74a14fd91b4205ad5f862f963d05334afa53d15429c2f6dc635c9633578c4ad7dfdd9a276cba30193336de0ae7c8b0b96043 WHIRLPOOL 22afd819eed8d34a417b9b1fa7a4db4a721d62d4d3851936f8dd90082cd5785ed99f6b3775f0cc88fae8ed5b2d688cb9986dc9417d96ff9d1dfab5f31c6e9146
 MISC ChangeLog 1820 SHA256 dde2d5ee47e26d5eee719a759d8ab78b00f40b777ee6ff90c5be4755d290570b SHA512 ddc576ef75f2f05535a5c8108d60229ed74407ef2369015a5b8e0dead2bdf2c8a68d1a5e465ea73dcb53a5f97be7c6b40f983cb315d8f92deda9909171929c2b WHIRLPOOL fc5d0469efad52530932b859adf89cd079964398657a6157ec9d5dcfa6b5e22679c413c69c8639cc1b2f9d2efbc339ef637a2afb9bec5e521df2bd23679d5552
 MISC metadata.xml 384 SHA256 a244574d516bf72be41421a45e7230126bb945d6de9a7c5933ba7942d2417fe5 SHA512 2a49b6a72107bd42dbb524a060c14a2dafc1172ea5d21427f22589f43f7cf728e0b3d843f59c962bcd8c6a072663ab842606d13827ff9803d1a016da5c09f741 WHIRLPOOL fbb95baff53f5f4f0542e9d01fe704ffbe655a21b7e86f07d2eb37bbf0e25006537e4b35deccf6081847c9dd111eac0e1c40ba1d2901ba6cbc40b2c846edce9f
diff --git a/dev-python/pytest-catchlog/pytest-catchlog-1.2.2.ebuild b/dev-python/pytest-catchlog/pytest-catchlog-1.2.2.ebuild
index b2170e329858..b948075d79ee 100644
--- a/dev-python/pytest-catchlog/pytest-catchlog-1.2.2.ebuild
+++ b/dev-python/pytest-catchlog/pytest-catchlog-1.2.2.ebuild
@@ -16,12 +16,14 @@ LICENSE="MIT"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
-RDEPEND=">=dev-python/py-1.1.1[${PYTHON_USEDEP}]"
+COMMON_DEPEND=">=dev-python/py-1.1.1[${PYTHON_USEDEP}]"
 DEPEND="
 	test? (
-		${RDEPEND}
+		${COMMON_DEPEND}
 		>=dev-python/pytest-2.7.1[${PYTHON_USEDEP}]
 	)"
+RDEPEND="${COMMON_DEPEND}
+	!dev-python/pytest-capturelog"
 
 python_test() {
 	PYTEST_PLUGINS=${PN/-/_} py.test -v -v test_pytest_catchlog.py || die
diff --git a/dev-python/pytest-flake8/Manifest b/dev-python/pytest-flake8/Manifest
index 0841a1cf9f85..f33a631496a5 100644
--- a/dev-python/pytest-flake8/Manifest
+++ b/dev-python/pytest-flake8/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-flake8-0.8.1.tar.gz 7359 SHA256 aa10a6db147485d71dad391d4149388904c3072194d51755f64784ff128845fd SHA512 b49b4d42712040492161f144cce807b661f2d8fe5b484b29ad1a519fd5b0b0cfb6abd42c3ae8999f21263c4776fb773f91bf0776971b6b6727607d33fb49ca89 WHIRLPOOL a1e5531216244617e647f10c0550c8a1b9c74929b0b1dec4d392930b02fbb699e15209ebd705e3571012d7cf7c81ecd0427f5a10e00c61e70dec00917caebb8e
-EBUILD pytest-flake8-0.8.1.ebuild 611 SHA256 5f76a79af6281230a14f91c14988127550b023f8bfd47143e61025591d3b554f SHA512 b564cbeaf3de68d62d70c2d094d9070ee06922008fd1d4e0022e3d4cf9e848120b4b354fe46c0043150a3c64a82cd7efb9ec224ce77f40874dcfed2b57f08fb0 WHIRLPOOL 323627e4bb359b77abe84b66fc06a8c9cf966ad6c7dfa6f60d04798dbc4579bccaca1fe96ae2d5d5aafa27ed6f5d630143fc03236ecbcfa59952087f0490459e
+EBUILD pytest-flake8-0.8.1.ebuild 613 SHA256 ab135d304dae954d0463a4d3ef39de0ec5515f62b9888b6f1a4ac776bdf0db1e SHA512 e61b58a8a58ebc933b9285b8dee54e96f3758acb63b3fafb06d8ebc9d2fb5d22a97106cd1d1cf94dd87de5456b8ead9dbf714c243e2d69c4a6ad4a540485153a WHIRLPOOL 54b52cce37a906cf2b9ab4efd7146fd6b4d5376846a5376004e41b842d0ebc4e7a2502482f02b6e76748b68d6d6e744fd6f3eab53c11f2da74dc9af175084a6f
 MISC metadata.xml 507 SHA256 528295931b8b1c1030287f006d5b74f11544e669150c671ed05f16f9bd6bbf19 SHA512 0f022aea078d7eb1b41db5326bf4c1b950344102f4b614ef095e20555a81032687a3312ead75ff33ee8f6dcc81984651dfc110b95113b8c4f2b3e57f52e97baa WHIRLPOOL 836bf5dc9666f705cfe3fef534de6e94c4d4ee51328b7cee6b8414536debf5f2c34aa181d2d95edb0a3aedf70f3a8c16921640b2d39e6b3d8025984930a593c3
diff --git a/dev-python/pytest-flake8/pytest-flake8-0.8.1.ebuild b/dev-python/pytest-flake8/pytest-flake8-0.8.1.ebuild
index 3023f8be88d9..a42af5a698ed 100644
--- a/dev-python/pytest-flake8/pytest-flake8-0.8.1.ebuild
+++ b/dev-python/pytest-flake8/pytest-flake8-0.8.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-isort/Manifest b/dev-python/pytest-isort/Manifest
index 9d9108ee3486..8c7e017341bd 100644
--- a/dev-python/pytest-isort/Manifest
+++ b/dev-python/pytest-isort/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-isort-0.1.0.tar.gz 5502 SHA256 e92798127e21d22513c62070989f0fb3b712650e48a4db13e5b8e8034d367cfe SHA512 86c964b6a998a32c9c474dde0a9400c45da8b26f3e8dd6f4092baa4bf1978a7f67a384bd910ec824f85a8ab49b4ea30967e1e7f908a31619ee88391d3505440b WHIRLPOOL 2cf95b1586ee52ee0f8df44a4a9a6e1ae06fd75dcbc572eab1b7c773c4632f23f5f3e11347c32b9aa67258b433670205dd5102e29d2b6886e94452db9c9e931d
-EBUILD pytest-isort-0.1.0.ebuild 661 SHA256 769988d69563f6811e1dd0406eba42a33cce73da8ed475e32dee865dca405aa1 SHA512 6dff0f4a965a2517b9b0735ea5c1eacca08f5acccd1cc6c0c4a441fcc7b7a116f712cb440d44fd3ef87cba9a7a5844f09cfd7ceb39036cdfbcba1b997f32d1dd WHIRLPOOL e5ee2b4d5e1c07e880297a17635ba370889eca824917753a221bd99a91cb001c4c20d95d55545f38780e37a5ed45655c9137fd40b5ec37c3a209b9c9d9dbf20a
+EBUILD pytest-isort-0.1.0.ebuild 663 SHA256 22b360625968e63057acb2aa1919edc265eb3fbd3a1504a81c508b2df44ec3d7 SHA512 fa9295013bda673171b6e931b87e3320a32f862308b753b017f304bc6e90e5e138a6cdf0bf693749476e264492872d1adb958154b4f0a2c8f6889c0f34682e57 WHIRLPOOL 371f94ec8a24b9ec0483320b763ed7eb9e43e27775de81cc532a492a82757c2194ddb990b3a2bc18bbced00a66f78915efd78c642d84c269218394353ebdbc15
 MISC metadata.xml 505 SHA256 2be385e29f3be6ad3e0d3c0c9637f128d39f0cf3042e647877e4a377d18d86c8 SHA512 3d77c078c21bbc18af28a19cb1d69c9277bcb1fcdcab004b21d18e715242d0d8e97aa05ebb2d232dcc2411cf068ab40ed36728d56f21ec4ba200319012e94fa2 WHIRLPOOL 122ea1230d1cc25a5febf5fa3ff65d0b05477b21dd9273fd2854ad2d2629c31b2654717c40714103abac6a034b8d25b2ee72e0f2f0ac91dee913328cd3310a74
diff --git a/dev-python/pytest-isort/pytest-isort-0.1.0.ebuild b/dev-python/pytest-isort/pytest-isort-0.1.0.ebuild
index d0c9bc036a4d..8fe6efc963f1 100644
--- a/dev-python/pytest-isort/pytest-isort-0.1.0.ebuild
+++ b/dev-python/pytest-isort/pytest-isort-0.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index 99cc8f1a6861..1e50743747d4 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -1,20 +1,26 @@
 AUX sqlalchemy-0.7-logging.handlers.patch 466 SHA256 3e2034457bbd4f4cd775f41cad156e27006c0b87cb3bec502b9b405a969d1099 SHA512 a09af91fdd6a1cc9f219c9b45fbe2fa5d9a675d2c2dc769545af52fda44ced40f673426975a09dd943e6ba5087cf0c0caa771c106e0eb755c3ed97c4ddc267fa WHIRLPOOL 8691dd7dbb09a45296dc6890644b06de63bd779cefbfe7b90d2d5753d7d752c5f6836151e26734090e69e928deb396b9a7c70fe8c980bf1a8442e623211ebdc6
 DIST SQLAlchemy-0.7.10.tar.gz 3541639 SHA256 77aa39d65c9d043eba6ba329b359ff867424fd6c403b7c0cb112b65e507e1d66 SHA512 631bc4ffb419defa531a66d82449fe48f93c88371ba0b8ab4217d900a0d1d90efe9699d8a9048d5c2ed33948c6d2f7cae46452ee45d442914018f3361e804367 WHIRLPOOL 74ffc17efbcbb2ac67712b9e11aa48431d18970f46ae5985aaa345aa8691f96e4acc4cf6fa37606699fbba83fcb7f74b0360fea2ac5e93a451585019e110f2ed
+DIST SQLAlchemy-0.9.10.tar.gz 4274855 SHA256 445cba2d5e36b9334aa06c06e00fbedb71f1b1dd03d1d2763b6cf77b9cd6163b SHA512 484f414a7133c51f231aeca3980fc088c8f952bc0a1f6cc5b6cc3c5aa6623fbe372381ce179e4cd588adcc515f6d73b52b7d8952e1f0faf0495956b364e14554 WHIRLPOOL f8b4d4a50b191747a54e5ec575e3fa3118cc731fbb6265f35edd5b066382192565122c979ce38d469b5d1d3f1cae9308cf6dde98bc822f1f1ede12b8e6ba8919
 DIST SQLAlchemy-0.9.8.tar.gz 4080098 SHA256 de3ac04ecab0a7e0af64eee30a71e723ba5886b958205f7354dd62439da60389 SHA512 3df7d7a64cdfe7b684be98e7e9d6836da54c391343bb047224a11df888041034bcc54cc30d15dc3d56b5d397b35e6aabe5732e7ca8fbf553bd8d98731c249ea5 WHIRLPOOL 2cedf7713753a6cf8838741fcf06c5510387aa4e661ea3c0ecc2bb7bdb5b03fb90f072ccd1a5671f03943952340c6c3525836e1ebe9246506143b055a1ca1991
 DIST SQLAlchemy-1.0.17.tar.gz 4787165 SHA256 4352b8ddc625fe648e9e93929fa217c234d7b1a1a2412a3021924b5c2bd95194 SHA512 18fc00bd80d136a65d5ad6929dac97a67514e001baaeaa57e95b31243cfe11aab9ab62ba8f7e68a5e833fbf024507c4908f99277445c8c3c9a3314981567978c WHIRLPOOL 7bfe9479f8cd8290d8065bc62d4ecd6ee1fdc17ada0ebc056ae2a90643a7c8e361b4456f8b93fc9cffa1e72316146975b0fe4f3ce44a8e4f76cb0994fe052a13
+DIST SQLAlchemy-1.0.19.tar.gz 4788659 SHA256 7dbca608466796816fda85282b9c90b9e0897805f4210450f18f9c2c8eee9eb5 SHA512 57d51fecb40e349b05da027bf39375a81c1d98e6d47f4dd076b9c7e2e3c8b6bdf8317e7b3e88c015cbd0d7858324ba0499a21a8ac39568c9ec95326e02af97bb WHIRLPOOL e0e2b18769444cd66412ddcef453dd546859d5bb61c6f7eef193fdd9143d1394ac44c093581af17263668534bff49a5a2777fc56656cb5e42c6a5857653b172a
 DIST SQLAlchemy-1.1.11.tar.gz 5197520 SHA256 76f76965e9a968ba3aecd2a8bc0d991cea04fd9a182e6c95c81f1551487b0211 SHA512 322ec0baa6360099eb000ddd36e28267f64019eb72201ecf60fc478591679e0dd5d2b1139a93036d2ec0165c588ea5836a67ed21dbf7c423b64432589bd73de4 WHIRLPOOL cebae426ff588ccf59e940fb11812abe60cf53fa1f67da954bbdbe06f558c5185f548e9446149e3187219608b1c9782af82c14bb41606b083f58103583d055bb
 DIST SQLAlchemy-1.1.12.tar.gz 5178158 SHA256 d501527319f51a3d9eb639b654222c6f67287228a98ba102b1d0b598eb3266c9 SHA512 f9d14b3d4eab049e9d7377008cf11678c1413e204baad898093282d1812d242a544bbb6606b4e9a83b37d5c17bcec3c115ffe402dda8b6a84d0d5186415645e3 WHIRLPOOL b6ab34dfb6eaf57d2440cc2edadc518785896b82b1c72b3cd2e3cf5296cb7db13e6705b11387412fd02db40a29380c04260dae84d774a4de1d5990ebb3ac385e
 DIST SQLAlchemy-1.1.13.tar.gz 5179952 SHA256 2a98ac87b30eaa2bee1f1044848b9590e476e7f93d033c6542e60b993a5cf898 SHA512 556222ff6b8218e7c3b892bf15ee24966aea366bf9d4e94db9762c56120aac3cde8eb174763a1edc1686744dd5c10f16791ac83111cb9d3da15f0ca5bdfad377 WHIRLPOOL a8a8ab2b18beb23164c26a42ef542fc8da3345657a67944d70885da632ef2bc1523144c5c8e280f74c767308f58db261cfc6f1a30ecbd2e53f4da1d046fb1ed1
 DIST SQLAlchemy-1.1.14.tar.gz 5183519 SHA256 f1191e29e35b6fe1aef7175a09b1707ebb7bd08d0b17cb0feada76c49e5a2d1e SHA512 82b9a97553a27e8d366401b1b99ebc884ee3a95f7ccefc27dae50bc335e30a4c019906caf07238c2a91b7b89a4a5a5e1118defb11e6a2719b631ca0d1e0905a1 WHIRLPOOL 9649bb860a09829b45a8ffc2097491d6853337258c14f8a7496ed8d177add425da183dc69e0f7cb926ef9706a7ccee4158eb11969a0b00048155d10d6e97f880
+DIST SQLAlchemy-1.1.15.tar.gz 5197858 SHA256 8b79a5ed91cdcb5abe97b0045664c55c140aec09e5dd5c01303e23de5fe7a95a SHA512 a88ad65b8b0506f4a86cea1da183ecc9279cf8ce9b9b0f3eb2a512e46130d4bc58d38d86abd803029044d5fc80a6e0a80180094934720990caad209b0a98e115 WHIRLPOOL 414ae5543ff6e7650cf9c38f80928503d347b6bd6d92cc5c64f8da628caaac96fd4434fa8798cdd590ab8648f83dabd9b0c69139f1782493f05b96ad68eadc4c
 DIST SQLAlchemy-1.1.5.tar.gz 5134252 SHA256 68fb40049690e567ebda7b270176f5abf0d53d9fbd515fec4e43326f601119b6 SHA512 94cfa2a94c21a7f40a34f7bebacf74cafcd8cfc24cabd5a79e0ed28a7a6d0c4182c9ceb076b07e1ee5ca1bd01a38a25ca264bbfdf5344c40e0c59b59582eb043 WHIRLPOOL 2264a5f23e91854d9ad6dcdabc2622658e900be560e7f6f5461357850c445574a982ea81c9ae1b5fb35bea70c419b98f8f3ab6dd4ef1990b9ac647d7f7e80ef5
 DIST SQLAlchemy-1.1.9.tar.gz 5164787 SHA256 b65cdc73cd348448ef0164f6c77d45a9f27ca575d3c5d71ccc33adf684bc6ef0 SHA512 95df08e6bca0013ddc7e61aa82d7d51eb133a9b34aa430a785bd8cec8eb79a2b6e1503c1757a71487b09e2f292b5916e6797efb2026d43175e34a52b68cf81c6 WHIRLPOOL c5ee51e72f4364d5c2c0bef0603212019d7f6d62f6cd153c88c31477f5363c37922e86e98821a17d0597ab1d360110629f53ec1257cc859204fcb7d05b3cb55e
 EBUILD sqlalchemy-0.7.10.ebuild 1583 SHA256 c35c94708252aee483dfdf097afca27d94ae8c92ae8f5c29340f612bbb172f8c SHA512 a080a72f9596945ec353b10ceda491cf35de92ddb1068ae0949a247547c0d864fe08774887b665f91a02f4536fc4a250d8ae01891e7ebe957c946d08a9584cff WHIRLPOOL 3403c6f6e8a882aec8d5bca4a406714034d032e5c51f2031275340070966dcf8720fb041db40cd6bd9e595767f184bb286f6285872ac0e4c01a5515277fbeae0
+EBUILD sqlalchemy-0.9.10.ebuild 2510 SHA256 c0b3ff590994a4b9c1cbfc9685f99c64d677f8d3a3efa73c179bb9382e72508f SHA512 bc5a3f92774c993d0c144496e6d8a4e414ff1d038808458fcdf55526513cbd01359aa9ba1c8ca831df579c66528d3ee00445bcd9c0271562e2c2692c3a38485b WHIRLPOOL d4905f4e41f0d1375c3a94d287c7c9594936e893ae94ae1ab6834e096a2d76cd8b0744c72eb34450ca5ecbd847bdc99bed938931c01ce8fb2ee248e201523008
 EBUILD sqlalchemy-0.9.8.ebuild 2459 SHA256 68f0d9ea2068c395882c57eb1c2d5926f2bec2670a117ee1934aa0caa2eb1bd2 SHA512 319800805e7b97f12e9da7ceadb5e8a39f413184890431e79fceade338a19cc34a0e78b9df12623f12eb736c3c97031ec065f90bcb62e9acad233a30377f6ab4 WHIRLPOOL 0c9ee4a0b2d6109f65431ac1e7f732db25926fc767e1187154e053b83e291c01fe51ccf8325e50a38ded1bb283fc9879d06f23f9af16761196de2de4b88e17aa
 EBUILD sqlalchemy-1.0.17.ebuild 2139 SHA256 00579d6e985cd86bc7fdcdc477d10043a3bce8b66e592944c585996b778ef2c5 SHA512 dda12647bc92fb67a6416d6506708b4918cd300de177a0c073a38ed2fde3fdf5e79c2a1d773a5f2819de17a6eb3d7f07c1e84c556b4a145c5251996a896e754e WHIRLPOOL 942edd9d3014eb1a5eaed496a092efd7297f1654a171853463b822efdc01a2fe1ca47345351b94042ce1e774eae3252e2c1897f67405e0f2f821b0f09a3eea0a
+EBUILD sqlalchemy-1.0.19.ebuild 2141 SHA256 930ed3e914e57b475fd770d7fd5cf1ecdf56fd0615eb3ae4fe68d442cbdf4307 SHA512 b0898a2d08a532bbcad7cabe097f0b6ba020e4513ceb0a4513614c5eb73f46e135554946f5a8394d8b89f2b81ec83f9ef22d1171d25782c923592c7f36c1545f WHIRLPOOL 1a231527a13c593e7835a88b7ea9d80f75d33fcfa3fd003397da6e76f1d7f0fe2425eb446e65fbad6187cbd4396a2ebc9747d59738d0084ab571b162ae2d79c2
 EBUILD sqlalchemy-1.1.11.ebuild 2141 SHA256 930ed3e914e57b475fd770d7fd5cf1ecdf56fd0615eb3ae4fe68d442cbdf4307 SHA512 b0898a2d08a532bbcad7cabe097f0b6ba020e4513ceb0a4513614c5eb73f46e135554946f5a8394d8b89f2b81ec83f9ef22d1171d25782c923592c7f36c1545f WHIRLPOOL 1a231527a13c593e7835a88b7ea9d80f75d33fcfa3fd003397da6e76f1d7f0fe2425eb446e65fbad6187cbd4396a2ebc9747d59738d0084ab571b162ae2d79c2
 EBUILD sqlalchemy-1.1.12.ebuild 2132 SHA256 8506bb883d9d3f598b323c7ffa6483a126b6d259dd6d57af041536e60bcdded9 SHA512 9a8322c01756d6c3f567364c1f17f80de03e4e9cc21ce2169ae6e2ec212957a07efe1e3c9794344a8a348fb7ca88d6795724c9842e56952ed6a6197fd1f66f68 WHIRLPOOL 19158693a4255f4ee34aaa6a29985ba38197a47b4aa8072563805bfb1c0ff6c06cd02f418bed32f740887cf771bbdd0ec7debbdab571adee6dd84decbfd4518f
 EBUILD sqlalchemy-1.1.13.ebuild 2154 SHA256 5e8ff5d901a4a650a119f861dc687cd386e3ed4d7bed4c3204462eef82039f96 SHA512 24a8109243abd342d31029b21ec2110b40c194d66a7afe020be2806229a29bed8ede5e55b31a57f70e873766452a6e67e76efb46d3f017456d67213b1e606138 WHIRLPOOL 1a3f4dbcd3293e1ae70b208d70de86eebbdfc7548e32f7efe220bc86537692ceff2ce727db65b395a6ae99892de2e34513800dcf60237165d7ad0b4d54d36ff6
 EBUILD sqlalchemy-1.1.14.ebuild 2154 SHA256 5e8ff5d901a4a650a119f861dc687cd386e3ed4d7bed4c3204462eef82039f96 SHA512 24a8109243abd342d31029b21ec2110b40c194d66a7afe020be2806229a29bed8ede5e55b31a57f70e873766452a6e67e76efb46d3f017456d67213b1e606138 WHIRLPOOL 1a3f4dbcd3293e1ae70b208d70de86eebbdfc7548e32f7efe220bc86537692ceff2ce727db65b395a6ae99892de2e34513800dcf60237165d7ad0b4d54d36ff6
+EBUILD sqlalchemy-1.1.15.ebuild 2154 SHA256 5e8ff5d901a4a650a119f861dc687cd386e3ed4d7bed4c3204462eef82039f96 SHA512 24a8109243abd342d31029b21ec2110b40c194d66a7afe020be2806229a29bed8ede5e55b31a57f70e873766452a6e67e76efb46d3f017456d67213b1e606138 WHIRLPOOL 1a3f4dbcd3293e1ae70b208d70de86eebbdfc7548e32f7efe220bc86537692ceff2ce727db65b395a6ae99892de2e34513800dcf60237165d7ad0b4d54d36ff6
 EBUILD sqlalchemy-1.1.5.ebuild 2141 SHA256 930ed3e914e57b475fd770d7fd5cf1ecdf56fd0615eb3ae4fe68d442cbdf4307 SHA512 b0898a2d08a532bbcad7cabe097f0b6ba020e4513ceb0a4513614c5eb73f46e135554946f5a8394d8b89f2b81ec83f9ef22d1171d25782c923592c7f36c1545f WHIRLPOOL 1a231527a13c593e7835a88b7ea9d80f75d33fcfa3fd003397da6e76f1d7f0fe2425eb446e65fbad6187cbd4396a2ebc9747d59738d0084ab571b162ae2d79c2
 EBUILD sqlalchemy-1.1.9.ebuild 2141 SHA256 930ed3e914e57b475fd770d7fd5cf1ecdf56fd0615eb3ae4fe68d442cbdf4307 SHA512 b0898a2d08a532bbcad7cabe097f0b6ba020e4513ceb0a4513614c5eb73f46e135554946f5a8394d8b89f2b81ec83f9ef22d1171d25782c923592c7f36c1545f WHIRLPOOL 1a231527a13c593e7835a88b7ea9d80f75d33fcfa3fd003397da6e76f1d7f0fe2425eb446e65fbad6187cbd4396a2ebc9747d59738d0084ab571b162ae2d79c2
 MISC ChangeLog 9263 SHA256 fe698bea2bd1dc022573807acc2beba66a6c3a8ad687d128da8a14a0730eec61 SHA512 49ba9000827629534e0ce7db1153e67811d0cde2f795daf8c0b9be474792bf1594d5af3477965cd357b016020615f6c0dd906566d8d83a527448179ae6d19571 WHIRLPOOL 176a37ee8a11bd94f79095eabe3df4d228a528543126bf1a51d698dc1d47c9df4c8400d04ef409784c1e89464b750a3f8ba90bdfe81c22f3f2c18892eb7e0556
diff --git a/dev-python/sqlalchemy/sqlalchemy-0.9.10.ebuild b/dev-python/sqlalchemy/sqlalchemy-0.9.10.ebuild
new file mode 100644
index 000000000000..425b8f1a16b0
--- /dev/null
+++ b/dev-python/sqlalchemy/sqlalchemy-0.9.10.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4} pypy )
+PYTHON_REQ_USE="sqlite?"
+
+# known failures #574728
+RESTRICT="test"
+
+inherit distutils-r1 flag-o-matic
+
+MY_PN="SQLAlchemy"
+MY_P="${MY_PN}-${PV/_}"
+
+DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
+HOMEPAGE="http://www.sqlalchemy.org/ https://pypi.python.org/pypi/SQLAlchemy"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc examples +sqlite test"
+REQUIRED_USE="test? ( sqlite )"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+DEPEND="${RDEPEND}
+	test? (	dev-python/pytest[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
+	)"
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	# Disable tests hardcoding function call counts specific to Python versions.
+	rm -r test/aaa_profiling || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	if ! python_is_python3; then
+		local CFLAGS=${CFLAGS}
+		append-cflags -fno-strict-aliasing
+	fi
+	distutils-r1_python_compile
+}
+
+python_test() {
+	# Create copies of necessary files in BUILD_DIR.
+	# https://bitbucket.org/zzzeek/sqlalchemy/issue/3144/
+	cp -pR examples sqla_nose.py setup.cfg test "${BUILD_DIR}" || die
+	pushd "${BUILD_DIR}" > /dev/null
+	if [[ "${EPYTHON}" == "python3.2" ]]; then
+		2to3 --no-diffs -w test
+	fi
+	# Recently upstream elected to make the testsuite also pytest capable
+	# "${PYTHON}" sqla_nose.py || die "Testsuite failed under ${EPYTHON}"
+	py.test test || die "Testsuite failed under ${EPYTHON}"
+	popd > /dev/null
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( doc/. )
+
+	use examples && local EXAMPLES=( examples/. )
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		if ! has_version dev-python/mysql-python; then
+		        elog "For MySQL support, install dev-python/mysql-python"
+		fi
+
+		if ! has_version dev-python/pymssql; then
+			elog "For mssql support, install dev-python/pymssql"
+		fi
+
+		if ! has_version dev-python/psycopg:2; then
+			elog "For postgresql support, install dev-python/psycopg:2"
+		fi
+	fi
+
+	elog "mysql backend support can be enabled by installing mysql-python for cpython py2.7 only,"
+	elog "or mysql-connector-python for support of cpythons 2.7 3.3 and 3.4"
+}
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.0.19.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.0.19.ebuild
new file mode 100644
index 000000000000..1e0a6318de86
--- /dev/null
+++ b/dev-python/sqlalchemy/sqlalchemy-1.0.19.ebuild
@@ -0,0 +1,73 @@
+# 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 )
+PYTHON_REQ_USE="sqlite?"
+
+inherit distutils-r1 eutils flag-o-matic
+
+MY_PN="SQLAlchemy"
+MY_P="${MY_PN}-${PV/_beta/b}"
+
+DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
+HOMEPAGE="http://www.sqlalchemy.org/ https://pypi.python.org/pypi/SQLAlchemy"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc examples +sqlite test"
+
+REQUIRED_USE="test? ( sqlite )"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	# Disable tests hardcoding function call counts specific to Python versions.
+	rm -r test/aaa_profiling || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	if ! python_is_python3; then
+		local CFLAGS=${CFLAGS}
+		append-cflags -fno-strict-aliasing
+	fi
+	distutils-r1_python_compile
+}
+
+python_test() {
+	# Create copies of necessary files in BUILD_DIR.
+	# https://bitbucket.org/zzzeek/sqlalchemy/issue/3144/
+	cp -pR examples sqla_nose.py setup.cfg test "${BUILD_DIR}" || die
+	pushd "${BUILD_DIR}" > /dev/null || die
+	if [[ "${EPYTHON}" == "python3.2" ]]; then
+		2to3 --no-diffs -w test || die
+	fi
+	# Recently upstream elected to make the testsuite also pytest capable
+	# "${PYTHON}" sqla_nose.py || die "Testsuite failed under ${EPYTHON}"
+	py.test --verbose test || die "Testsuite failed under ${EPYTHON}"
+	popd > /dev/null
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( doc/. )
+	use examples && dodoc -r examples
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "MySQL support" dev-python/mysql-python dev-python/mysql-connector-python
+	optfeature "mssql support" dev-python/pymssql
+	optfeature "postgresql support" dev-python/psycopg:2
+}
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.1.15.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.1.15.ebuild
new file mode 100644
index 000000000000..3bce72a347fd
--- /dev/null
+++ b/dev-python/sqlalchemy/sqlalchemy-1.1.15.ebuild
@@ -0,0 +1,73 @@
+# 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 )
+PYTHON_REQ_USE="sqlite?"
+
+inherit distutils-r1 eutils flag-o-matic
+
+MY_PN="SQLAlchemy"
+MY_P="${MY_PN}-${PV/_beta/b}"
+
+DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
+HOMEPAGE="http://www.sqlalchemy.org/ https://pypi.python.org/pypi/SQLAlchemy"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+IUSE="doc examples +sqlite test"
+
+REQUIRED_USE="test? ( sqlite )"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	# Disable tests hardcoding function call counts specific to Python versions.
+	rm -r test/aaa_profiling || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	if ! python_is_python3; then
+		local CFLAGS=${CFLAGS}
+		append-cflags -fno-strict-aliasing
+	fi
+	distutils-r1_python_compile
+}
+
+python_test() {
+	# Create copies of necessary files in BUILD_DIR.
+	# https://bitbucket.org/zzzeek/sqlalchemy/issue/3144/
+	cp -pR examples sqla_nose.py setup.cfg test "${BUILD_DIR}" || die
+	pushd "${BUILD_DIR}" > /dev/null || die
+	if [[ "${EPYTHON}" == "python3.2" ]]; then
+		2to3 --no-diffs -w test || die
+	fi
+	# Recently upstream elected to make the testsuite also pytest capable
+	# "${PYTHON}" sqla_nose.py || die "Testsuite failed under ${EPYTHON}"
+	py.test --verbose test || die "Testsuite failed under ${EPYTHON}"
+	popd > /dev/null
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( doc/. )
+	use examples && dodoc -r examples
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "MySQL support" dev-python/mysql-python dev-python/mysql-connector-python
+	optfeature "mssql support" dev-python/pymssql
+	optfeature "postgresql support" dev-python/psycopg:2
+}
diff --git a/dev-python/subvertpy/Manifest b/dev-python/subvertpy/Manifest
index 68350463b240..0a7ca6cecea2 100644
--- a/dev-python/subvertpy/Manifest
+++ b/dev-python/subvertpy/Manifest
@@ -1,5 +1,5 @@
 DIST subvertpy-0.9.1.tar.gz 110972 SHA256 8a5bc24f1abf273de22f0caf1d76a63b51ed5cfb6cd62f6ef58807adb9aaf6a7 SHA512 977e291c011e680cff9e26312b4235c0479374076964c7c4a4c3c7ec75bcc44ff7c458513ab89f1aa2b599d3bd8f94cbc6d1000afcf725a9f937a90b39456148 WHIRLPOOL c8dcc98750107110251c51a7d47b073de2ea07200fdc44fad6494be69909563a4ec1a49c085d73d820acc8a6c30c6506eb0844351e43785b0b5d3d74d1027dc0
-EBUILD subvertpy-0.9.1.ebuild 975 SHA256 4865f4e31d0941467b5b35b9d1b5fda1b9074aa03cf05ee299ca8c8b187a05dd SHA512 7e3f6cdfe9d2b148ea3fcf5d7c20986fb4e014843399dcca8dc71d0db80f91d7e2629fb43b9d900bd6a024a08735be21974cdc9ffdfc4bfecca7ba8c1eab872f WHIRLPOOL 13d4dc9c88b7501ece78fb693d9c89a98e77f6fd248a9317391fada2fb5a48a5f837a5e1fc402c607c6fb620a7845d350289916e241336994a66b2e06bbac21c
+EBUILD subvertpy-0.9.1.ebuild 985 SHA256 8114319409142332aa2eaac3c76219d808ac7e34d20b4f3c39026e932f06b8c8 SHA512 b9f3242e9a820b1ff868789e0c0c1b9ff40392e6a809558d71804da7ae80cc3097d5ab21f5166c216a6179c7aec73d032d3d732b5a1325c73e88325f7751c32d WHIRLPOOL 2b1506f562499d9644a2dfc1dafd1b15080dcce92c459c3b64cf8542c62eb30f6786c28839a8a63a2c284bf20099a1a3aa0bc3233305803879f7a1c4fea40a7d
 MISC ChangeLog 2580 SHA256 59f2b533b494a1fb38215770e0b32db1d9e612c7e4a8c3bd2dc844e97cc318a9 SHA512 9c2ab6992ef9ad2c075f616591ce3589459359b67f63d24019cc3ead62f8d7131ff1e4e8ec1cfe38d3eff9da90646b347422037e69a892d3fbecc745be284b79 WHIRLPOOL 165ba1736b26c66baf8b7a971f693399a11ba6d1b19a85966255ce61d7764fa6f8f61063ee5ff8d1d10ccb9dd1a4e780e22b0f559b1c7d1d3e78f6cae1220619
 MISC ChangeLog-2015 7619 SHA256 47a66a7fb60abd02d4b0c65d34ded9bd95a250f9c5b513fd85d335c412a31ead SHA512 9133547ccad74d18588b2be8fb50ee9960a1785b9f81db7a047ad5c6be5f1e6653442a764cff86db4be719911172116575f0303cc049946675d82e7469381614 WHIRLPOOL 4717b10e83d91442119e5635f851b9937bfc98ee102459ee20692f597317248b2be3c11aabc466471eb172581f7e9c4b21124486603721afaa54402f471d7e86
 MISC metadata.xml 240 SHA256 07a76e79a43ffd9aa15de0e4ae548ea85aa5bd165c4602630c3519e60f113ee6 SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59 WHIRLPOOL e3e059953c7c36bd942545f4e2a0e94ba938a17fe2bd04df81b137c185e64a213152c11918922563509e4767e601b41105f80c5983a87ee4d6be7704bcf7cf54
diff --git a/dev-python/subvertpy/subvertpy-0.9.1.ebuild b/dev-python/subvertpy/subvertpy-0.9.1.ebuild
index dc86dd9ed19d..0f9ecadd8481 100644
--- a/dev-python/subvertpy/subvertpy-0.9.1.ebuild
+++ b/dev-python/subvertpy/subvertpy-0.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -7,8 +7,8 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Alternative Python bindings for Subversion"
-HOMEPAGE="http://samba.org/~jelmer/subvertpy/ https://pypi.python.org/pypi/subvertpy"
-SRC_URI="http://samba.org/~jelmer/${PN}/${P}.tar.gz"
+HOMEPAGE="https://www.samba.org/~jelmer/subvertpy/ https://pypi.python.org/pypi/subvertpy"
+SRC_URI="https://www.samba.org/~jelmer/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( LGPL-2.1 LGPL-3 )"
 SLOT="0"
diff --git a/dev-python/tabulate/Manifest b/dev-python/tabulate/Manifest
index c363e459ec7a..8c228fc13593 100644
--- a/dev-python/tabulate/Manifest
+++ b/dev-python/tabulate/Manifest
@@ -1,5 +1,7 @@
 DIST tabulate-0.7.7.tar.gz 39140 SHA256 83a0b8e17c09f012090a50e1e97ae897300a72b35e0c86c0b53d3bd2ae86d8c6 SHA512 36ea77577e36fad28efa9b1c10686a4a795acdea77be4f8b442b38f45d70993245b4b473b0ce146f3d24eb49f186ec47ada332a9a3973ac2786d5a46b7358213 WHIRLPOOL 7d64e01b9a2d4ed41733b67e4108e233ba97ca95029f4f82c1b73f489dd0e17589cfbe071fd83969422779e73eb7fc1e5b7d48c891b3dcd647a9d4266900a462
+DIST tabulate-0.8.1.tar.gz 45666 SHA256 b9b4d2fc712c1e3b8f2970edf6d83fd8a329d0148de78bbe2755a79a96c190fa SHA512 f724fbabee53c738c846a5cf645470f5f97074e2b33eb030b4859478931661dac53e5446d77a656553e2dec323230bb116d350997e1407d794382f537e6dfdf5 WHIRLPOOL 53f1324078a4971720a27d66d97ffef96a514a0ae229007c1d9893b0b4cb8424a1256e3cae23ed3ee41bb8f6dd58115d50b8e24de0d351f89306b967002afe99
 EBUILD tabulate-0.7.7.ebuild 681 SHA256 78b9fb797bb7529097781b2596edeaf6c40b41934b30d72777435eb0a8af0b6e SHA512 56bc4ee47c1a161844d8bf22054398e7d589c08349afb4be97ef10f7b5558ac5ab9ca4030881aa44239262bab37cbd2fbb26d066a09978c7e175e6e355428ca9 WHIRLPOOL 2617ec42a4d498ff3b0b765b6fcd860d8d89881f8ad8f18df6cfcd239e9a26eba8c9a1303b519fdb0fa1088fc492614320752d038b8652cd1dc9c2e271d47ee9
+EBUILD tabulate-0.8.1.ebuild 677 SHA256 9e64ff5f6d92791ac19bd69469c4f12ac34a7cb461c3dd46f83ee5da105faa2e SHA512 305c8a8a492de5910a15d121bebf5f7cca208357e0a400d2bcda1b92c83fefb141085d23edf925281182c908a9036bf0ffb66ab0a54bdf76101f760151e946b8 WHIRLPOOL 9d9f1465b2890a29a99ae1b2a46d9e15b3e68ff1ee36baafc2910790a74dbcea57f871d698929853966d41c5f5bfd7e196eed3e3286827902627c7163882b320
 MISC ChangeLog 3409 SHA256 b3cbdb3dfa2a3ddd2b68ca531b3e9e52d30c626954e587e67febe63151a26d1e SHA512 2e1720b7d4798c983e43e9024e2c691082c3cf04274d94d37f4be0bf5628ceb7e17a9dfec0b80ce99e0632ceae8569360a0f7f6fcd204eb182f87b3cd904a2b4 WHIRLPOOL 380d117373caba7e00ca4131a3a406aa900c475f5befd32a1724c07ee928ac3f834c3ac6965f3ed39dcfbc92af085b1ad09ee52ed18147e4f53540a3e4a77aea
 MISC ChangeLog-2015 698 SHA256 e04c9a1b35d91b55a09b06aad15137761f256e9ac89c5c6ec26df0b0f39be6fa SHA512 bed81ec7b98d2e095365e967da932c746409d6e2afa2964365d5f0d88e96a81cd92868e9b697efae3d3b951c14609f49817de19a08c4ced58567ff6a33c2ea0e WHIRLPOOL f82829f8221f594adb396e36a9aa227d92889baa6a567e409319fd65b3e604e3ebc283872b9f6c0d2f30a16e2b99311fa5917eafbffe6ec48cdb6d5afebb3ff1
 MISC metadata.xml 321 SHA256 003c74505df5fbb65dbce3ef773ac6e9e4ddedc0e546b48812413358e7cdbc66 SHA512 4967ca411c6ee428e897be2be259da008f9dec1991754235f0e8f79d64b5175e69d460c3cfee72f49faa41704ebda3c46bb2f30fc157e95cec4d8d60ae7ba89d WHIRLPOOL cd3743e22afdcaf22e699ff13bd1340093ae86f5d4be5d38f53c78e8e5bc23766536e8589049d70c3e75a127ac3a90c071484453f1217eb1eeb83678afef4271
diff --git a/dev-python/tabulate/tabulate-0.8.1.ebuild b/dev-python/tabulate/tabulate-0.8.1.ebuild
new file mode 100644
index 000000000000..a91800179602
--- /dev/null
+++ b/dev-python/tabulate/tabulate-0.8.1.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} )
+
+inherit distutils-r1
+
+DESCRIPTION="Pretty-print tabular data"
+HOMEPAGE="https://pypi.python.org/pypi/tabulate"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	test? ( virtual/python-funcsigs[${PYTHON_USEDEP}] )
+"
+
+# Missing something in tarball
+#
+# from common import assert_equal
+RESTRICT=test
+
+python_test() {
+	local testcase
+	for testcase in test/*py; do
+		${PYTHON} ${testcase} || die
+	done
+}
diff --git a/dev-python/thriftpy/Manifest b/dev-python/thriftpy/Manifest
index 7dcd37538558..d0091ed8c182 100644
--- a/dev-python/thriftpy/Manifest
+++ b/dev-python/thriftpy/Manifest
@@ -1,3 +1,3 @@
 DIST thriftpy-0.3.9.tar.gz 208164 SHA256 309e57d97b5bfa01601393ad4f245451e989d6206a59279e56866b264a99796d SHA512 ad2b7f568db47f7f26235fc5fb6180c974eb6738f154461860c7329d263252ee627b979098c3e9ffe8ed42a0fb08a9110a6842a923ac800166d80a23d4e6a3cb WHIRLPOOL d371078349d345f01537ffc63eb924507921819d6e9c1577d0b522067cb1b36a8feae2211860c51c17b5e5fcf5c37f0c65c46b8d71687a114fb7c31667feb809
-EBUILD thriftpy-0.3.9.ebuild 665 SHA256 a3e76ade809ff4c3ced21d385309e6b16c067e9cd470bdd12a2dc367901d9577 SHA512 27ad6b411a5fcf6408727f9955e144cbe69344d107b25c8f7d588ed2095d40c3ce374cd72f5fc6475f4cd36612785935cb094b81c1012b86457098ba45a01e2c WHIRLPOOL 1769f82794945edeaa664fac8006d27fb056a0f8fb94b84c238888011a050bbc3dd7f1815ca0deba58639d51238952acdbe956d2ccc22b319f1ed67c42f83887
+EBUILD thriftpy-0.3.9.ebuild 667 SHA256 cd45447bd5a1400f0b3ed491197633450e7e907c6cb12769d70dd2bf73c8d9f6 SHA512 0377380af752d687facef3afd15129c082b4a474e5e41b5d66a27fd8df34a0dce632f4befdc6ac8cf7f486c485d3a4b3ba951ab2f71849231bf50e9fd120e330 WHIRLPOOL 10b65208619bebe4f28b6f5617c63834125fb0fb95240aafc85012c96a99b3267c64257aec59bb349c548f787b0c7875c453456fd865dd0179379de0eece41c7
 MISC metadata.xml 778 SHA256 0c6c51b81d2b75b49022a27a94aba9d2e1fe4d8251376bb6bf41f06b91433bd1 SHA512 0bf7df25d46542f335eb9473e552b4fbaef70c43ccbffe2c982aad81c3d86b80f4c78c418848d51943849f18dd57bfeb9bb71ec92a2222565608457aa96b4749 WHIRLPOOL 13d805ce73f0ad4451526ea0721c6b75a1f52bee75c830d846658a31050ef76944e32869b9a9ed0752f79b4964aabd17e5057ff7c66377b73e9c023f5e359864
diff --git a/dev-python/thriftpy/thriftpy-0.3.9.ebuild b/dev-python/thriftpy/thriftpy-0.3.9.ebuild
index d0d687f397ce..08a48772d62b 100644
--- a/dev-python/thriftpy/thriftpy-0.3.9.ebuild
+++ b/dev-python/thriftpy/thriftpy-0.3.9.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/unidecode/Manifest b/dev-python/unidecode/Manifest
index 6a4ed4c322f6..e84cc7655b63 100644
--- a/dev-python/unidecode/Manifest
+++ b/dev-python/unidecode/Manifest
@@ -2,7 +2,7 @@ DIST Unidecode-0.04.18.tar.gz 206191 SHA256 f19150c74de2fe6847b13efeeaee402f2bd2
 DIST Unidecode-0.04.20.tar.gz 205830 SHA256 ed4418b4b1b190487753f1cca6299e8076079258647284414e6d607d1f8a00e0 SHA512 07708649a130d4a1747fcc24816717a512c1edeb4c25e01a5e898b21d2e76bca6b45d983cc452fe56bddea5556632b91aa2daee511e33a423197e0df9c80e125 WHIRLPOOL 8f32b7d25b85bd1bcbdaaa94795d0790bf96cd68992af501f51c13968eaab4c3b793753f35c3a201a227176c6c212a7f21dc30b5c702c6af6a38ce5099eee956
 DIST Unidecode-0.04.21.tar.gz 205931 SHA256 280a6ab88e1f2eb5af79edff450021a0d3f0448952847cd79677e55e58bad051 SHA512 33fc546b3eefc4ba5feee90d584e49ccd81dd0ae00671f7e44f43cc3dc8a458b86ed6dbfacba6dac7539112408137fc1db6329cc42f31ee250755d841c7c29c2 WHIRLPOOL 69f643df937f045f7c11af200fa699fad79a553573d46382240822cfd8be5a8220d39568b2487aa85207873348aac3ad2e02408b7ec8c3e0658429383a486b5f
 EBUILD unidecode-0.04.18.ebuild 589 SHA256 95352df982eb8841e39f5a2215e2716dcedd621eeef9a953a147db6466c661a3 SHA512 c7a9aacf451289196eede72cfc9a2115efa233c81cfe8c4ea240e605683614964c269365c8463b24c859e19c1deaa107ee95edd9ed941bc36ab6c2de5cc47d7d WHIRLPOOL 9d322ba836f26abc1f22e227257f91b6b3530cf62fe5eb8151ec1cac4459968980cd496e47186022abeb69ffe14a9309cb5672812313a5e668d6a025050d92b7
-EBUILD unidecode-0.04.20.ebuild 593 SHA256 7d63f2ee1843008b5ea6e2f4cc4e81442ba9319c460025ac91c45136cb4d2172 SHA512 58c64134fd8a8eebe7b0fcf7368c2c159ca75238e5337b799468846af1f4bbeb742e0a721e2ad3b2a313483d72e8d69f0addd59142638118c155a98f8ce8680d WHIRLPOOL cfb057362392e214bdc35f6fc5db5251c4662fb7f7b2e878d721d978eb11bb9c78fa15fb6c185eebe9efd0dcb2aebfe6a005e2828bf22a4b8b7c7a23e464a69e
+EBUILD unidecode-0.04.20.ebuild 592 SHA256 d9af9981f34bc1cd9b093d16bc72049b03bb019f03215875dc9cb567d0a7b111 SHA512 19450803d55cc493a5a401859e18c53bbd664e45a0c4d318cabe4a2a76612fe119c7b07f1a24f5b0700c8e5cf3dcc0c11947a7a78dd589854e7b89fd3eea2ed4 WHIRLPOOL e017784a6e889d1e784ba33b2cad45d92784923528bbacf7d0e5430ecc4f7e6911836ac3faaf2f916a3ae0c79eac663d53ef40fa58a72a5c61388bbca56388ae
 EBUILD unidecode-0.04.21.ebuild 599 SHA256 38c5a8dec3b1c54909695135e31a13b0d1d2edaa9d0b4d6ded17385350d9e7ab SHA512 93f0d6aeca451e8c955657b6adaac5a1bb3d492f6725b02beea083500ddf1a390ab03e19722e860a311889a596ea9b97bd280532af36becfbe1fe69a90fe06a0 WHIRLPOOL 533299d9c26908d2410e0fa0f2890601a6adcb3f71392bc637da944c768829a4a3764a8eecbd19c53186ba2955546ee001353c5f8cb60ddf1affd2e59a9d10cd
 MISC ChangeLog 5125 SHA256 b8aa5c490f92d51802c8cb55a765d9340ee0ba74aa6345a6d8b7e600e39da816 SHA512 e2687ed8173f2ce159f5e0ef2d6cf5d596632d6db4d289f586cef7f31f292658cb58c81a4eaf26b76794111e47a247d302f8c4872839b38e4527c32bee5b774f WHIRLPOOL c7b76653af537f9664cb830d4a1c3ac22f7f3258952695ff9208bdb099017a9d975d520d7716388fe18f6db0dbdaacad678f307338daa45ff6c821facd8d532d
 MISC ChangeLog-2015 4944 SHA256 d58f0d7f5c3f8534ddfb85a77e5ed11ae5eb8a8ce687e7de6a917648e7ac7f70 SHA512 ffada20835de9370ff967e923a09250643ab23b771e03d20406bf6c7e057e99f2ba9e342cf5a27f33128aeb5029437380c99d20c5ab9e3a528f7e597a23bfda0 WHIRLPOOL 15eecbc636883944b6d6fbec5ae32b9582aa22028438daee273c28702d841064895f6bd512c6648fc54b8a8b1c85d3754764fa138ac55155dbc2fdfb609639d9
diff --git a/dev-python/unidecode/unidecode-0.04.20.ebuild b/dev-python/unidecode/unidecode-0.04.20.ebuild
index 1caa3609b94b..8270a7cc3454 100644
--- a/dev-python/unidecode/unidecode-0.04.20.ebuild
+++ b/dev-python/unidecode/unidecode-0.04.20.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ppc ppc64 sparc x86"
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/dev-python/weasyprint/Manifest b/dev-python/weasyprint/Manifest
index bfe11ffc9290..22eea588503a 100644
--- a/dev-python/weasyprint/Manifest
+++ b/dev-python/weasyprint/Manifest
@@ -1,9 +1,11 @@
 DIST WeasyPrint-0.29.tar.gz 1418105 SHA256 4edf5538b330be3e559f006db76a5a948c25f3792746aafb20f2a9d6185f0e71 SHA512 3875240b7bed6991372f6a45f82d32f0d2f3add29ab1937001c5559368405737d185aa85871358730989a91ee6b17e62cc21535735c884c47705d0d2d38bb167 WHIRLPOOL cbefe32d42e5bbc26993b58f88b2ebc26291579dd717805c8fc9c54d41fe69b3a05eb8f301e9c21b426766404c9a683cce6c115ed8193456d17c83b44c8513a9
 DIST WeasyPrint-0.39.tar.gz 386613 SHA256 ed0be652bd396a9b818f015c8bc5fb32040864ee86cda6f0160cdef1dd4f42d0 SHA512 668eed8c4f2502b3412166ea8e7b15b838b971b175ac3ec2370097b83557070684fa7bc9c62c3222056294093781649f263aba756091fb87d50ceea339e32e43 WHIRLPOOL d7b987dbef301346a83418f7a8796f0d7c3076c5b8aadc66da1779e86198864e8c6c91ea3edc7d3ebbe8820a0e5a73b11c07a7cf1b7b7a9a9c3aeebb900d7490
 DIST WeasyPrint-0.40.tar.gz 388586 SHA256 b7e00cd5c4c3de4e659cca0e02670c37bf2fcf7a57251cbfe23e31cbf9782a6b SHA512 9c0d082ed2c35f76fe8ca5d25b5e99a0f96a309b2c4715ca3bd72a3a9a11121d4f5046c4ff55f007ebf0404edb0e4f510e571f42c569778948320be0301b8c4d WHIRLPOOL 209c3aed8a03212c34a523fb777c6626b860a3eabd9b3f8d2b6ea61f40f8e606ee59e92020116b61e76b514b9d17056237ef7c1e298fdc3e98e80781aca5dc43
+DIST WeasyPrint-0.41.tar.gz 393866 SHA256 1905d906a5560472045e001779c37ccbad8f2c4fe7b9eee7999b4f2096157b23 SHA512 44b2d9e0a186c5767cd01d6e66495241d088908467e0fa28cee114a9c480bfcb4ef393236e9304653603f3917c73c452c05a38286932e0a271946860120d9a1f WHIRLPOOL ddc5edfb8b171a52d9ad5f9a49906fb476c601291176366ae3b9f820c6ed15b1907e18993076a4dc235a956d7ee9c955c6406ec89691975573a361b09e6a0b68
 EBUILD weasyprint-0.29.ebuild 1199 SHA256 fe0ddf699176a010448c842c5e375981ed2142dfef1ecba71724e58b1ef7938c SHA512 4f178b61ead5faaa0be43c9d86eca83add1a4448908a0fdbff459a5e7eb6955fdd7e7fb6eb71deb19c11a77b277fa4ed2f3afa0863335fd89e6ad7d1a36ff681 WHIRLPOOL 3b8ff7c0fbdeb5ca31c7a2aba1b7423ffa144706243d5bcd61da404fa8fddd507f892cfdcb98f7d6bb278fc0de20a58ca333331d8a3f6bb4ac520b38ae9b08f2
 EBUILD weasyprint-0.39.ebuild 1401 SHA256 6e0d5613408d9cc68c3eb5d42ad5aa417b65fd47000a19a13a24314bd4f09341 SHA512 49044ceca4ed1c070ec18be4872439714adc2078638cf3f5b7c595cba76ba9a33c103181ba4600da961b2ec8653bb9dfdf81cfafb31aa6dd06cfead0d561abae WHIRLPOOL 604e4e4b7063722e0b2a7761e29134472fbfb6b407d88a49d5f5bc9c6765f9b73410cd909a23489e3b1daf35e09d1a916923b73d87df0b69d068ec6bcb776030
 EBUILD weasyprint-0.40.ebuild 1402 SHA256 b41fb0726bcf8648d965574a410fe0cf2a584a7140e2b8748133877d06a592ec SHA512 50774c61df3271e383f373e01b19e4c6619cc5985edea2a421dc3237e099e075ce907fd8dad4de7da76a98a25a7f7b11828ed3e9675d30a2418351de62d1f056 WHIRLPOOL 8981a30edd4ddcd4e7ac44e57fa6807403dd445c3e028594bea9335003bb6de5967828f00ebeffabb5ec4973d83fd79c4ae3fa01ded91db780102713ae507d20
+EBUILD weasyprint-0.41.ebuild 1463 SHA256 2606e8ca1d4d9bb69192aeb3a17491849f5ec9de26992ee257217ca5c551abca SHA512 244d74a8a23f9473e68dbd683af867dd6643ef500fce80b8c86c026fade8a53513a63148b3a46f7262d8869dda2ba205936f32fcb10f99ae4af4baf4ed1008bd WHIRLPOOL 41c491b9ab9691a5267c8efda202c70e23d2f276cde677bdf94e477ad20050e9e05be5c095b8b2dffb1f501f16318887fe7a7e10097dfd9555564c317e502db0
 MISC ChangeLog 3062 SHA256 feda860d60311fdef3889b9291c67804675b035df32c4feafaef26b9c6523a94 SHA512 77dff5371d88ea978c25c72bff74a1019e2435999e9bfcdf336db303d8d08699e763b13da38f50fb5395e85b660b54ae22adc00fc8efcc5b6b2b59691230abf7 WHIRLPOOL f08ad8c2ca858556f347e082b464a704bd38341e2f3a9133452d7df15e56ac4384fe2d7f8f6af1be7563e213e4e8f7f2b56049178df86bad844fd3d57c1b83e9
 MISC ChangeLog-2015 2082 SHA256 ef9e282412326bfcac179195c695407e44e86837b2a53fc7de1a51559872dbd6 SHA512 a41aec4004070514cba6e3e72414d5b89a6cd8c1d859e85634c053891ce1b01732fb5a6c7bcf35a6b64e5cb858bbc34824abe8a8e4c3544424623ed36df7a9ba WHIRLPOOL 6854f04d5f436fe87fde9fedad3288e4ca00ff7a8deb853ca7f37a86922de7de39592e02cf293aa3ba29a494ae062105c46d47ed6a0b348fb7041253fa1a8310
 MISC metadata.xml 381 SHA256 65ea7c6e4e0c677c653c34beab9b43047cacbeb3c24c8eda99fb0a27d7d337bb SHA512 92ccf545a50a97d2f2cf6f85a6986525ea787d6534682b5fbdd1f0395ed7e938c4e341f5897a663b185d2b2755d4123132b8ec36866b44f2615f08d607a14398 WHIRLPOOL e3d2ea42dc1191c85fbfb7abe7ea4090b128b4a07419b39b5af343bc24759e4e0b9d9944c54660ae257671479c6494a2106e24434302fda160076f4a36f5ddbb
diff --git a/dev-python/weasyprint/weasyprint-0.41.ebuild b/dev-python/weasyprint/weasyprint-0.41.ebuild
new file mode 100644
index 000000000000..ef4488009e94
--- /dev/null
+++ b/dev-python/weasyprint/weasyprint-0.41.ebuild
@@ -0,0 +1,53 @@
+# 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} )
+
+RESTRICT="test"
+
+inherit distutils-r1
+
+DESCRIPTION="Visual rendering engine for HTML and CSS that can export to PDF"
+MY_PN="WeasyPrint"
+MY_P="${MY_PN}-${PV}"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+HOMEPAGE="http://weasyprint.org https://github.com/Kozea/WeasyPrint"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="jpeg jpeg2k test tiff"
+
+# Note: specific subslot of pango since it inlines some of pango headers.
+RDEPEND="
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf[jpeg?,jpeg2k?,tiff?]
+	x11-libs/pango:0/0
+	>=dev-python/cairocffi-0.5[${PYTHON_USEDEP}]
+	>=dev-python/cffi-0.6:=[${PYTHON_USEDEP}]
+	>=dev-python/cssselect2-0.1[${PYTHON_USEDEP}]
+	>=dev-python/html5lib-0.999999999[${PYTHON_USEDEP}]
+	>=dev-python/lxml-3.0[${PYTHON_USEDEP}]
+	>=dev-python/pyphen-0.8[${PYTHON_USEDEP}]
+	>=dev-python/tinycss2-0.5[${PYTHON_USEDEP}]
+	>=media-gfx/cairosvg-1.0.20[${PYTHON_USEDEP}]
+	>=dev-python/pdfrw-0.4[${PYTHON_USEDEP}]
+"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		  ${RDEPEND}
+		  dev-python/pytest-cov[${PYTHON_USEDEP}]
+		  dev-python/pytest-flake8[${PYTHON_USEDEP}]
+		  dev-python/pytest-isort[${PYTHON_USEDEP}]
+		  dev-python/pytest[${PYTHON_USEDEP}]
+		  media-fonts/ahem
+	)
+"
+
+S="${WORKDIR}/${MY_P}"
+
+python_test() {
+	py.test || die "testsuite failed under ${EPYTHON}"
+}
author	V3n3RiX <venerix@redcorelinux.org>	2017-11-10 00:43:02 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2017-11-10 00:43:02 +0000
commit	a5332b59346f7cbf0fdbd148b54aa8a84aaf8190 (patch)
tree	e6d8d3589fcd01fbc3f1286185639163daa81424 /dev-python
parent	fceeaf01a28ee71065cf3798b70b77d3bc4ef199 (diff)