gentoo resync : 07.10.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-10-07 11:03:14 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-10-07 11:03:14 +0100
commit: 957235cf19a691360c720f7913672adda4258ed0 (patch)
tree: 812bba7928f4293ead05a7ee9c1ac39c5ef9f12e /dev-python
parent: 62f67115b5c46134c34f88f4b1cbdacc19384c0a (diff)
107 files changed, 1541 insertions, 870 deletions
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 07fd80e734d6..e19287d75d14 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/bleach/Manifest b/dev-python/bleach/Manifest
index bf367a464705..6691d358fb65 100644
--- a/dev-python/bleach/Manifest
+++ b/dev-python/bleach/Manifest
@@ -1,7 +1,7 @@
 DIST bleach-1.5.0.tar.gz 36502 BLAKE2B a56eb875a5becd21f7ff71a29db8178a7536a7aadfe81fe178360ba61ba599df9d4d9a782bbf72eb186b61a0b2e3f99058c483cc0d194e735a787319697c7327 SHA512 572a089691af61f096716d96517a96755fe674cc471bdbcff80615ae903eaeff72c47b918ee28a1db60ee5c0253c0c52ba02544f8535ae4f283a3a87a3061124
-DIST bleach-2.1.1.tar.gz 58491 BLAKE2B bd1efbfa30cee61b5d8bfd029ff107ddc997d38139bf5b25a70a6731193f6d02a81e1e49c9ffe3eef6cbda864464108cb1f65599c68c48f1033ced27fdb65c29 SHA512 dc8ef7b678966bfebddb2d27c78abf50e71f2d90c5807cf788a08b852a085a4d990368da5dfb5f61a49e0f2f1e7d9ac73c2b6967fdacb55663ae2c339016d4c2
 DIST bleach-2.1.3.tar.gz 60141 BLAKE2B 5c04269266007e31e1a01540198177afb6b13362b89815073b7cd68668da26725f2631defdb26d124ae6c74743de0d31b2975a0d19f58e032ac2332e3ea46a75 SHA512 ff74fb3646709f20c79ea02e6d0fb93e2f204d3151a05f259b703050c10d410859af76acb470405f6fb7b55c8fb64595e6f0fcf8e9cb8fd3fc3722fa30a47de5
+DIST bleach-3.0.0.tar.gz 164459 BLAKE2B a9e873428cf629dc98c8adf56ad8a45f63e355ffb5eb495df4d452106e77a5919c90e2f1651f671e8807e0dddbdb7543fbd4c78fd95afad4cf8cee68e7a797d8 SHA512 7bc13af18baed440c0ce39f8caf7a14fc7264aba8a14a1999334d1ddd78183a0f84a17b3f2088453ee20d4873162f2a8cbd273e6f881201744b2a0f47805839e
 EBUILD bleach-1.5.0.ebuild 773 BLAKE2B 6afda52e437aa252b31174f09b7a6f61fa95f4b91f96ec364ac9375e26c2aeec5f5df001b92a8ee6c0f7ffc5a62eaf1830e64d216f3660e43661230000d2f770 SHA512 984382fe1f458fac718dde60f3e6089edb2cafa69296b3e21ef9049907da625ac44af15b87c062801a68a5b15a2fc3a989015cb5ad94c2584f2a8783311dba0f
-EBUILD bleach-2.1.1.ebuild 800 BLAKE2B eb904dc41b78b06242a83a14c30ef34930c58f41a81580499b61352cec3dd4b818c8fad4e6eb5ceda82a17d18e7dc0687ac6a869689af06cd66df4bec45d4390 SHA512 e5c9049d37883777db6930dd74b62e4bd1019e2a71108fdb87ea8479b62b3481e2594e9386543af669fa1f73308893a3d3e8ff0741a5edb383c88426486c1c7d
 EBUILD bleach-2.1.3.ebuild 792 BLAKE2B 62915001c423ea8c8db88bebc2f06a605702dd7caa93fadad76e347c66c47d2cc666657383169895b175f2cd1755489eac685e6c71de0f2b6ae40c34f30f1b0a SHA512 04c8437eed67e4f48a0829316ee5641f49bb77fe1628168b5d5df72dbaa207bba7b9ce7e6528c0c71c98e815312a0c147f717b204710b1a76bc16cc2bc3c70f3
+EBUILD bleach-3.0.0.ebuild 770 BLAKE2B d409b89d4930f5823d06f62945b33bff6b92e97d68eeee07a7735ba1de80997c6e2425a003a8be398a9bad1b145991c88890fe87edfa232d34ed7ca2cae1db98 SHA512 3e809fc9eb92847ae78a2d60052256fa8a0dff512b2ab3ef75bbded0a953dfb0996c7e21f9f1d114b1bfe801cb5850f6f9148a2d6f4b49e7dc6a6fe45a6810f1
 MISC metadata.xml 375 BLAKE2B eb46fe64fd2800b8222ce88a2ef34be12f68a5a014417ebbfcf3466beda9c64f6a6d1ef4431d83b4948c1513de81840d1f5c65961d851213f928fcc6a66045e5 SHA512 9f8329e1fe0a9a7a6268dee15c098bdd7893da00a3c4f4dcab207586dccc5f6b471754be0eacb21fbd7fcce5e3130a631fbf1fe60a27ea525552d7ef2d9c173a
diff --git a/dev-python/bleach/bleach-2.1.1.ebuild b/dev-python/bleach/bleach-3.0.0.ebuild
index 7b249d5a841f..71d5a9790dcd 100644
--- a/dev-python/bleach/bleach-2.1.1.ebuild
+++ b/dev-python/bleach/bleach-3.0.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy{,3} )
 
 inherit distutils-r1
 
@@ -16,14 +16,12 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~a
 IUSE="test"
 
 RDEPEND="
-	>=dev-python/html5lib-0.99999999[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
+	dev-python/webencodings[${PYTHON_USEDEP}]"
+BDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( >=dev-python/pytest-3.0.3[${PYTHON_USEDEP}] )
-"
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
 
 python_test() {
-	py.test -v || die "tests failed under ${EPYTHON}"
+	pytest -v || die "tests failed under ${EPYTHON}"
 }
diff --git a/dev-python/cffi/Manifest b/dev-python/cffi/Manifest
index f0ea8f2af5ee..2e377f6c6feb 100644
--- a/dev-python/cffi/Manifest
+++ b/dev-python/cffi/Manifest
@@ -2,8 +2,8 @@ DIST cffi-1.11.2.tar.gz 435142 BLAKE2B ba90cc377261a75557cef626f1c6b8c0c625c6721
 DIST cffi-1.11.4.tar.gz 436857 BLAKE2B 46b5d1adf4aca2a75ea02ba01ae934821d0e864accd9c355745a681d11a08ed34c33c473204c78ecb2113b2d59fbc762ca0607ff92f6cd2dc411907844bbdaf3 SHA512 184572ab8c1f7a72f00084c23894efe1691aa20f9e822a3f7184ebbed16e757586ac47e7f1d12dd7b14b4322bf5b88e35465dc3bc8b0caf0dc8e2b626a52615e
 DIST cffi-1.11.5.tar.gz 438498 BLAKE2B 2e22cf3c2d50d76f8f25b7ac31a77fac8a49e2b2f4952e3b1a1da79c0ad2ca5c6e450000cadd1efa06df53d14f711e0acd73a075bea45ebd61e667fb650a10ab SHA512 6770d5293cfd7405e733d60c96655641b5bcc5878fc66a737f4a8308f465d459ee0e3fcaa47893d8f57fb195e5534dd7e4728c868f33d7e657688f45e1fb1880
 DIST cffi-1.9.1.tar.gz 407108 BLAKE2B f95e99cbb7a10aacb714d6ddbe85755e24d4fbdebb9ada0ab87c95b58aa56b364df612fbdfbf6fcc3a9dfff6e96fe5e979ee37b1c6c9b62b6ba8d3a9565def2f SHA512 6e76f181b6b7b760a14ad70338edd104a8b8e2eac5680e336d3868e0bd031a1665608e29a65dc0c56806afb8a8c03811586f151f3acef11e54e60c1bfcf902e3
-EBUILD cffi-1.11.2.ebuild 1477 BLAKE2B 9a60ccb178b38795fdbebfcf84ce2121c7a977458298bef4ba4c7afabecade0f60b2b839b2543f9b91e2ccaab359cb4df5adde0c52d2dac5b218ec903ff3c23a SHA512 e2e547c243dca0709a12afd77ce860c05493c7fb168a8769d7f7cce63ea0676dbed886c2522e39a193901d009581216805dc204a2189ad0d1a1f7e4c1a337349
-EBUILD cffi-1.11.4.ebuild 1478 BLAKE2B bd7fbb53eb3a350669d3e13ce1599628ebbd1edfce3914648a0fbe06628f16477117139dda48c3f2021f2df701b49b376e45209883080d70ef8fd9fbd2339f57 SHA512 059b488a6f6f14d439d344e2629cb2a8651a63a094b5709f106e4d668450af5041dcfa4308003c939acb98350b45e46fc9959df4cb32ad8db68450ded3958822
-EBUILD cffi-1.11.5.ebuild 1491 BLAKE2B 1e616c9958cddd57864257b46bbb139db12f8596262e32d92863446f2efd6626898e2d5e7bdf6c2968c8c9ba0c1ec1af2820258cc474230393eaf794afed07b1 SHA512 f367dc7ba8f1eadbc0feb400782ba315e9ef5cbd2268e67e9a49bfb715bcd7c0a5697b4345f8a27ea038916d7a8976166e48825d60676a3a268c7e0502c004ee
-EBUILD cffi-1.9.1.ebuild 1467 BLAKE2B 294f1f7ab2cc16b168493f855c74fd041eaf03d2418c854a16157f540f74f99448f0cde38701c5c5a9f0d35ce53baa1020f3db0b7f759f36d8a822cde43a7167 SHA512 035c9d078beb565cd09f5c86046b5a2466bc1d697afaf7a3cb0ce92a59fa4ef09efc55060be995c9c91e4dfd945001c061d1e4f63672d26d89fb72655bc0b6bf
+EBUILD cffi-1.11.2.ebuild 1476 BLAKE2B 25125ac60f6f4c5d9ff2ef82ba26e125153898a82f4e3320dd0593fc40c7ac8baac95961cdd8fdf1d905608a94f4d90ea72eaae54cafe27effa3f18234937223 SHA512 2b7462558ee2126c40966b17de05010b66b9b2535fa6e31fdc3f1f55527944529d79c6b7404dddc7cafdbffe3058f43493aee5f0651eda693768989ce27c947f
+EBUILD cffi-1.11.4.ebuild 1477 BLAKE2B 8908398c5a76403e7b7157852374d29f287310b11d5afe6164d540d034b50374f497ff3a86118079ca8987117862789aa9822a517c23d77763ceb6b8cc74de6c SHA512 af4121b4931e23497f2593a1265543f61bff092f56e3296121c3b1d4740f86748e8bf3736d4d9aa371b82eeb775aa377ceb8c9bdd80f5afd00cee92bea42b429
+EBUILD cffi-1.11.5.ebuild 1490 BLAKE2B 1134e18fcef9ff89e10d8d047ac552f5667488b05db5ddbd0e9fc72b4e0b576a773fcdf1c74f2ac1aaf0676a5656a6125ea67b15f59d51026c687516b735e1af SHA512 2def086906b75aea4dd0fbefdb9570ec55d3d67d3b1685123845e7f225dbdc494a147f54b0ee1a489b873b3af0bf64d856593618e7677b3a7a99f69d3eb190c6
+EBUILD cffi-1.9.1.ebuild 1466 BLAKE2B 439b6504bdb7b2b6b84dd5580ec4a155361d453ee5de5133102826ff6ac9b42a169c55e3952677f438b3b3087b2cccf57cee785d357c9f7d706db8d9481994ad SHA512 40d33d6e223d157a7e20f9ea96133fbf1d6d49060d9cb8bdb80188075918e864c64cf34062fca7a8ea909b0a6a65f39b8b1a6b6f1aea0f741d7ca779fd466aa5
 MISC metadata.xml 317 BLAKE2B b6416209bd2358c42c2be3bd228238b401bf126919b6e7371d83d7cec8cb55a40f89db562701cc8f3dfa904e225426881b22ff1d3b72085365b5caf9b8c6a403 SHA512 0744ca7b98b2ebe2985bf2a81a337d09be62cfaa51f8380bac52f8d30941e997f09be20e28caf6967226a71369003cf35977790aba56ed0d469cc490cfa089b6
diff --git a/dev-python/cffi/cffi-1.11.2.ebuild b/dev-python/cffi/cffi-1.11.2.ebuild
index 0e086e82f5fb..73252df06fc0 100644
--- a/dev-python/cffi/cffi-1.11.2.ebuild
+++ b/dev-python/cffi/cffi-1.11.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,7 +19,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~s
 IUSE="doc test"
 
 RDEPEND="
-	virtual/libffi
+	virtual/libffi:=
 	dev-python/pycparser[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
diff --git a/dev-python/cffi/cffi-1.11.4.ebuild b/dev-python/cffi/cffi-1.11.4.ebuild
index bdcd7280874e..db4fad0ca1f3 100644
--- a/dev-python/cffi/cffi-1.11.4.ebuild
+++ b/dev-python/cffi/cffi-1.11.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,7 +19,7 @@ KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x
 IUSE="doc test"
 
 RDEPEND="
-	virtual/libffi
+	virtual/libffi:=
 	dev-python/pycparser[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
diff --git a/dev-python/cffi/cffi-1.11.5.ebuild b/dev-python/cffi/cffi-1.11.5.ebuild
index 14fa542c3c9d..a768eb4a28d7 100644
--- a/dev-python/cffi/cffi-1.11.5.ebuild
+++ b/dev-python/cffi/cffi-1.11.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,7 +19,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~s
 IUSE="doc test"
 
 RDEPEND="
-	virtual/libffi
+	virtual/libffi:=
 	dev-python/pycparser[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
diff --git a/dev-python/cffi/cffi-1.9.1.ebuild b/dev-python/cffi/cffi-1.9.1.ebuild
index b8e2ed10c434..fcc131700977 100644
--- a/dev-python/cffi/cffi-1.9.1.ebuild
+++ b/dev-python/cffi/cffi-1.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,7 +19,7 @@ KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc
 IUSE="doc test"
 
 RDEPEND="
-	virtual/libffi
+	virtual/libffi:=
 	dev-python/pycparser[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
diff --git a/dev-python/diff-cover/Manifest b/dev-python/diff-cover/Manifest
new file mode 100644
index 000000000000..0897da503727
--- /dev/null
+++ b/dev-python/diff-cover/Manifest
@@ -0,0 +1,3 @@
+DIST diff-cover-1.0.4.tar.gz 73907 BLAKE2B 81562c30533739f950e52703ce235b214f66932f806a47b1ab245b69bba8ef46d4333924ddf2ba4ca6b70a7df85ae071805a4fac7181711495f46540c4a20301 SHA512 aa5646c5d097e2b3ace5807bde007c9d8ebcf99578dee2aff1174aaafbdb9777c4794a8e9ddd4dc6edb5af7f1afc812fce4410db87d0bab4159f044489eabb5b
+EBUILD diff-cover-1.0.4.ebuild 1041 BLAKE2B 9e3becf6fde666e9b5d4e982536bd66db45b4d9b8104b0c8bc565da4bbeb7105c0d9534712a094917c8e2ae95f5fea3462b750174a4343d9ebd47654cb160fe8 SHA512 ae06bdf674819b9d0b7ad4eb52b15186a79efd647ccf56d638dfefdfa1c50b661f89ddaccee3f5d85997ad05f223e87f352b8ee88ed8aa6b6b95d4a29e276252
+MISC metadata.xml 380 BLAKE2B b3fee2fecc0de95a5056955412d4f069a57a405a887966c1511c4c63f6c2c77778ace33d439fd37c6b5db62c247fa7fcd71c15f6cc8a97de46e72a841aaa9514 SHA512 80581412380ac1b87077d5e1c74596434ae398bc9b654c5492db7ce60270e9ad40c0e13b5c95a11cae57bef6b2a1dfa8888f8061a2ff221acdfc30c21e57242e
diff --git a/dev-python/diff-cover/diff-cover-1.0.4.ebuild b/dev-python/diff-cover/diff-cover-1.0.4.ebuild
new file mode 100644
index 000000000000..dfca39bedb15
--- /dev/null
+++ b/dev-python/diff-cover/diff-cover-1.0.4.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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="Automatically find diff lines that need test coverage"
+HOMEPAGE="https://github.com/Bachmann1234/diff-cover"
+SRC_URI="https://github.com/Bachmann1234/diff-cover/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.7.1[${PYTHON_USEDEP}]
+	dev-python/jinja2_pluralize[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/flake8[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		<dev-python/pycodestyle-2.4.0[${PYTHON_USEDEP}]
+		dev-python/pyflakes[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	esetup.py test || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/diff-cover/metadata.xml b/dev-python/diff-cover/metadata.xml
new file mode 100644
index 000000000000..f185cd57cab7
--- /dev/null
+++ b/dev-python/diff-cover/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+		<name>Zac Medico</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">diff_cover</remote-id>
+		<remote-id type="github">Bachmann1234/diff-cover</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index 8f2a775bf66f..eaee1b5b7d41 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -1,9 +1,13 @@
 AUX django-1.9-bashcomp.patch 1734 BLAKE2B d65bc505e4096fd8d23619f3d76b76d66fc3e68f408906c30a1a8e97a5ef5c0c9c1b352f8c4f4acd1588c639f7b0a489a53e1dbc9763b395ce2488c463e6d5b4 SHA512 d3caa9b77d6c336e131b706411080aa129df83ac60293a2612eb268d08a6c40096b322715766801e16a641134762174ecefcf2b93698f47b022fc31421597403
 AUX django-2.0.7-bashcomp.patch 1507 BLAKE2B 8aeb494087dbccffc69ad43f370e791d9fbfb1908d45f55d5f8be01ec0f3af6b2aff591da84a06c0858fecd44180579a4647d622ef57d8235ccb4b3b80fd3a2a SHA512 5a3867b8e4f2fafe4c53a741d41e8c6e8e28a55463f7d8007afd669a04daa8b93f911e4ef8d5ad38ba300558f21ac8090b00337d0c0bfb93b2aea73a179334a4
 DIST Django-1.11.15.tar.gz 7843843 BLAKE2B b7713de8136302d8d95929ed449ab01173e28c0d5d20529eaae9d6bd6d323f53b674a4fb6e8398da4b57a223f10ef63e7961accc8fd777313f18b4e2b0f225ed SHA512 4ea18c59f7c74d0b6deb9d292d5de068c6dcc53d9596f321f5a7e823ff5fe423cc8d69c88bf53e3acd9c36c4ecc4447148243a127d5114a4894b0fd4d449f37e
+DIST Django-1.11.16.tar.gz 7852514 BLAKE2B a881caa6c31c80d6b0146cb49a08ba63ebfba21637747328adb8ec3afada2182b72c46576a79cc9e163546e5b980a2be516d842492517319deb0a4f5512ad605 SHA512 bf1329ac364c9037fd6cecd0e8565c8bd8d830343671f9ce5415a10e70da37256667675b3f97e4d2508a8a912fa7a06ca7f585586ac18e6734c939bc41a8b455
 DIST Django-2.0.8.tar.gz 7987343 BLAKE2B ab35f50ce1911cb9603c7ac85e7ab01e6019ce9a2dac4cd733b11f35722368946ff3a130c3c791da4d49cf609b5747b4c5de64e29e27a8e12abb7f9e29cd363b SHA512 ac3cc3f58cb977518c6f549834beb35677c2d5541cfb5723045b98165926e826178cb33737c52a0f999be24bc38b84dde489a5f91d1c8d51b8338aa611acb518
-DIST Django-2.1.1.tar.gz 8595422 BLAKE2B b4d46162b8a48ada2e1321e6731afdfac8c6acbc394991178c33a374ea2d61d0b1f91ede6a56f9e88d20ba2ddbe6910fe452f79fc6cfb342fddc6222c454dad1 SHA512 e29180097cda0de35eb3dac77b7f7f3f31771257b9bfcd6d3fd37d421c572e1226bb1760635ccedee357cee7ca3dcb302de6126a771007a2cdef82970a596813
+DIST Django-2.0.9.tar.gz 7992507 BLAKE2B c6f1d79401007d2c83553e885d5e32c7890b3f1ed53c948ea4c55cc2a0272c06d0b7fdafef7be5042ab26b3f8c3ffef64f6f01f49d6e615503f8bfad99b66c3a SHA512 7a766ce0240b19a18dc5a9a4682630c4ce90fa6ed0d02a97303088a990d09e097b609220f4e2806854585724f483cb2ae7e4f29bfd1898f3a0d6e758c2f4ea4a
+DIST Django-2.1.2.tar.gz 8611286 BLAKE2B 5107fd04ee11ae4ded3d8914d840e323e26617b526ab877654de08caa6ce1cb6f053d3afbdbdbda17ab26b1ed1bcb158ef092a63ef14393b87ed98e612cf43aa SHA512 3510f872762e75c7e66987857616d958d15bef91ce2d9e1656abcf4e0221b1c6ff72c59fd29643aa0b0288118db76d58023cffe48f401e7cdcd03d71822a282d
 EBUILD django-1.11.15.ebuild 3226 BLAKE2B 4fe569a5302e8a35933a4a5059930b2a644657599374db2a693a15e1df41b60d54a0a689e63777e2669bb2abbb2c034ae0eeef7b497b35925fce11513262a9e3 SHA512 549d9198a51d786a028d3defde21a66ab45819127c68422517f82a537ccdde36dfdda34999b228b46dbbd84adb0af3fffb353bca147bf148e0a3f071ceae88c0
+EBUILD django-1.11.16.ebuild 3225 BLAKE2B 73493c93c4711c7217aa3f9bbeb1c9ecc6bd51e3b8602142488246bb6e0f6928ba6022eadc0ccd4630247423b12a8c7ecac08332b359e26612ac200b5af1c9b8 SHA512 18f2eb1c50dd478b98ed8dc7a078c4b2702c7314776006e8f09e12fabe67b3522c0bb391dedba179472f6eabc380489a8558f49ef911469fd1f99bb7e6957b14
 EBUILD django-2.0.8.ebuild 3057 BLAKE2B 8374be208eb49d23aa72ab5deada4745954ce46795c08c6b63d2e4d1178c0021fef8bbc115b209d0e94623c30972c14eef23576dda43ec81a5fd4311e08794ca SHA512 1531bca2617ad4a102cd1f07eab6779bed931735ca457b575f4ca1c2f896118c1405e38ed9907d515c69b36efb0ea2d54cba290619a64e7ca1e9bbab82f90fdb
-EBUILD django-2.1.1.ebuild 2492 BLAKE2B a62ab78f1b8bf04e32acc44fc25f4f5d555c9b48592bf23722d37db1059058e930c7fa076316554241cdb038712dab7cd20dbc0852bc5c41cc437d5c0d946a2f SHA512 fb4ef78101d5db8ef5546b256fcf28a6dee888ca1ee2c97dd2de1362a033b99252904b16b70b13d6a83492d9408d9e31a64decb25769075e5a82679bb2e5456c
+EBUILD django-2.0.9.ebuild 3056 BLAKE2B c1d993c2508a178979cbbffaba723733b7e512268c216ad1f175e4da4cdc7764ed88c3c97c83f28a5fd3949f2222436a39115cba08fc10218a4a32f18c6cac56 SHA512 4e867e0d251f83dc155f448f7dd369368d6de9f4aae0f7f146a0d5d007e27505f3c0787f5231238dea3c5fb50040faf520531238ed2f7718debd5f456f5f060d
+EBUILD django-2.1.2.ebuild 2489 BLAKE2B a5fa9e5c8b327c68ec8d5cc2a254e265f0d25ac2e58e5148d6c2e4a4d88c96797afefba176afedf404667ed35cb11f1f7a05b8f0d0c1f918ad5eadb014cd537b SHA512 d31eb055c10c1441be1ac99bc2f29e4e2bbd3340285fea7559e247a0d7ce01d95b38cc2507e956760668a503ebbf9721419c9243cbf5c1d431060acc4f2e2f58
 MISC metadata.xml 488 BLAKE2B b3ffa7cc6bced74a890b71be2bfb3805bb51a523f485079a7da0cb2698f3fa0ee1746922813859ac95df41b3ef3249c413f1692f3635427fa965874287b83d88 SHA512 9091a2e41a992542b38251b12623c0b1ac737cf01a4f46ce63096568bcde4e3d8546705bdb10c14c128b4cb6564e38dbb6d1803611c5197923b847304aa69cdb
diff --git a/dev-python/django/django-1.11.16.ebuild b/dev-python/django/django-1.11.16.ebuild
new file mode 100644
index 000000000000..802b7b5468c2
--- /dev/null
+++ b/dev-python/django/django-1.11.16.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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?,threads(+)'
+WEBAPP_NO_AUTO_INSTALL="yes"
+
+inherit bash-completion-r1 distutils-r1 eutils eapi7-ver webapp
+
+MY_PN="Django"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
+SRC_URI="
+	https://www.djangoproject.com/m/releases/$(ver_cut 1-2)/${MY_P}.tar.gz
+	mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz
+	"
+
+LICENSE="BSD"
+# admin fonts: Roboto (media-fonts/roboto)
+LICENSE+=" Apache-2.0"
+# admin icons, jquery, xregexp.js
+LICENSE+=" MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc sqlite test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( >=dev-python/sphinx-1.0.7[${PYTHON_USEDEP}] )
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/numpy[$(python_gen_usedep 'python*')]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		virtual/python-enum34[${PYTHON_USEDEP}]
+		)"
+
+S="${WORKDIR}/${MY_P}"
+
+WEBAPP_MANUAL_SLOT="yes"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.9-bashcomp.patch
+)
+
+pkg_setup() {
+	webapp_pkg_setup
+}
+
+python_prepare_all() {
+	# Prevent d'loading in the doc build
+	sed -e '/^    "sphinx.ext.intersphinx",/d' -i docs/conf.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	# Tests have non-standard assumptions about PYTHONPATH,
+	# and don't work with ${BUILD_DIR}/lib.
+	PYTHONPATH=. "${PYTHON}" tests/runtests.py --settings=test_sqlite -v2 --parallel 1 \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp extras/django_bash_completion ${PN}-admin
+	bashcomp_alias ${PN}-admin django-admin.py
+
+	if use doc; then
+		rm -fr docs/_build/html/_sources || die
+		local HTML_DOCS=( docs/_build/html/. )
+	fi
+
+	insinto "${MY_HTDOCSDIR#${EPREFIX}}"
+	doins -r django/contrib/admin/static/admin/.
+	distutils-r1_python_install_all
+}
+
+src_install() {
+	distutils-r1_src_install
+	webapp_src_install
+}
+
+pkg_postinst() {
+	elog "Additional Backend support can be enabled via"
+	optfeature "MySQL backend support in python 2.7 only" dev-python/mysql-python
+	optfeature "MySQL backend support in python 2.7 - 3.4" dev-python/mysqlclient
+	optfeature "PostgreSQL backend support" dev-python/psycopg:2
+	echo ""
+	elog "Other features can be enhanced by"
+	optfeature "GEO Django" sci-libs/gdal[geos]
+	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
+	optfeature "ImageField Support" dev-python/pillow
+	optfeature "Password encryption" dev-python/bcrypt
+	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
+	echo ""
+	elog "A copy of the admin media is available to webapp-config for installation in a"
+	elog "webroot, as well as the traditional location in python's site-packages dir"
+	elog "for easy development."
+	webapp_pkg_postinst
+}
diff --git a/dev-python/django/django-2.0.9.ebuild b/dev-python/django/django-2.0.9.ebuild
new file mode 100644
index 000000000000..512fbb933f3f
--- /dev/null
+++ b/dev-python/django/django-2.0.9.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_REQ_USE='sqlite?,threads(+)'
+WEBAPP_NO_AUTO_INSTALL="yes"
+
+inherit bash-completion-r1 distutils-r1 eutils eapi7-ver webapp
+
+MY_PN="Django"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
+SRC_URI="
+	https://www.djangoproject.com/m/releases/$(ver_cut 1-2)/${MY_P}.tar.gz
+	mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz
+	"
+
+LICENSE="BSD"
+# admin fonts: Roboto (media-fonts/roboto)
+LICENSE+=" Apache-2.0"
+# admin icons, jquery, xregexp.js
+LICENSE+=" MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc sqlite test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( >=dev-python/sphinx-1.0.7[${PYTHON_USEDEP}] )
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+WEBAPP_MANUAL_SLOT="yes"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.0.7-bashcomp.patch
+)
+
+pkg_setup() {
+	webapp_pkg_setup
+}
+
+python_prepare_all() {
+	# Prevent d'loading in the doc build
+	sed -e '/^    "sphinx.ext.intersphinx",/d' -i docs/conf.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	# Tests have non-standard assumptions about PYTHONPATH,
+	# and don't work with ${BUILD_DIR}/lib.
+	PYTHONPATH=. "${PYTHON}" tests/runtests.py --settings=test_sqlite -v2 --parallel 1 \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp extras/django_bash_completion ${PN}-admin
+	bashcomp_alias ${PN}-admin django-admin.py
+
+	if use doc; then
+		rm -fr docs/_build/html/_sources || die
+		local HTML_DOCS=( docs/_build/html/. )
+	fi
+
+	insinto "${MY_HTDOCSDIR#${EPREFIX}}"
+	doins -r django/contrib/admin/static/admin/.
+	distutils-r1_python_install_all
+}
+
+src_install() {
+	distutils-r1_src_install
+	webapp_src_install
+}
+
+pkg_postinst() {
+	elog "Additional Backend support can be enabled via"
+	optfeature "MySQL backend support" dev-python/mysqlclient
+	optfeature "PostgreSQL backend support" dev-python/psycopg:2
+	echo ""
+	elog "Other features can be enhanced by"
+	optfeature "GEO Django" sci-libs/gdal[geos]
+	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
+	optfeature "ImageField Support" dev-python/pillow
+	optfeature "Password encryption" dev-python/bcrypt
+	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
+	echo ""
+	elog "A copy of the admin media is available to webapp-config for installation in a"
+	elog "webroot, as well as the traditional location in python's site-packages dir"
+	elog "for easy development."
+	webapp_pkg_postinst
+}
diff --git a/dev-python/django/django-2.1.1.ebuild b/dev-python/django/django-2.1.2.ebuild
index d2f6650c8d63..576b624d32e3 100644
--- a/dev-python/django/django-2.1.1.ebuild
+++ b/dev-python/django/django-2.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-python/dominate/Manifest b/dev-python/dominate/Manifest
index 3b7882c36884..69a887d84ec1 100644
--- a/dev-python/dominate/Manifest
+++ b/dev-python/dominate/Manifest
@@ -1,5 +1,5 @@
-DIST dominate-2.2.1.zip 46460 BLAKE2B b09984978755f9020e78873aec73c09ccdf0113b99f1a0c9dcf43307a5523000f04ef2e063d03e636e2e958aa5dbd69993a8c606838cceb216599b314ab24a2e SHA512 3f79fa4258f98708b1e169693e83f919179c1148f440300426f907e28c26b28c21a1098793a14f7e89e5aba0de61f93c889a4908f0eb6e3641ffe234e215e597
 DIST dominate-2.3.1.tar.gz 27887 BLAKE2B 3ac0820bd0cb79e648dc947d3cb69aa207e3c129cbae05daaca8fd3a6e22c67bd20fa350ce211986451caa7feb5b60c8ff692e568073e007c34de7cb8847b8a1 SHA512 599147cd9aabc7c3bc24e6c82a13b690808899107999a3b0d7d3f2f113b38c90f2c720298ffdcdf1933d2573cced05d730dab53265397b7fc010e57feabc10b3
-EBUILD dominate-2.2.1.ebuild 662 BLAKE2B 664c240b48ecddf85d01f1142b12bf5331d7073425bb7108f783379a02203ebc7a1ca5b1013dbd6f05238e6e267c3facc408695c0f7c426c9fa52c86e4846d94 SHA512 e35a3f04d9673cc915f2776e828c12be6654fd552537f7ed64f02106fdefada4836a3c12ce35b6227786c614ddb62b4b907e13778e34b0e347e9120ac48897dc
+DIST dominate-2.3.4.tar.gz 27834 BLAKE2B 12eadd39e5088768c2cfc15e23093c53c58d90dab6346ac78d47da8b7d41fb50fabf4e186b9fea18ecb54fe8b6dae03a489b27a1942cfdc13437afe9e86919ef SHA512 6cab8d6d795498d70f28c80064407616e74e027ac112f8e097509482dce000e45c3599989430a17f71631616a860e84d842b2bfac39b4be466593b5cfb20123c
 EBUILD dominate-2.3.1.ebuild 606 BLAKE2B e59982d021a5797c993d4ea58bd57c831aca4a9c17901198af5c6477221f06dfe000b69f14f6367380ef95a91ea107318119bc91b122902119e18b904d2a29df SHA512 0319d71125e32159f0672c1c167e4c53f03f2076fab285b68e62a24b78bb93bf2f03e5e3efb8b4f6f65749882508e92cfd22aaddba8032ff953e6e767b1560e4
+EBUILD dominate-2.3.4.ebuild 605 BLAKE2B 48e0b5a55457b2ca26ca15cd356ecd60416abd72bc80f2782699783f2c5e10ed282e13937846a11167259a5320969afa4cb258a3931068a6f7b7d9a678c6652a SHA512 2b8a0b551234934af21f3e312c476c4a50049bbc34c054188140625bd32c440fba48cdb9f3bb012de41dfab001b36fedc01e655356332ed34da0d6bd9a6f7e7d
 MISC metadata.xml 771 BLAKE2B b57440fdd8bad6140d982af019944cc740ba47183908dc2505c1436448e735cd63f537b3ef2158b6014c4dc050128b13881b368ef9ed5e840b37f7e88ac72a25 SHA512 2af8875459291f59c07ece49ac0edeab74408f54031878c1b03581bdbcfcb509caf37ee30d03e2f86f59dd67aba62c54808ca5a6c67037717113c3bfb6f9961e
diff --git a/dev-python/dominate/dominate-2.2.1.ebuild b/dev-python/dominate/dominate-2.3.4.ebuild
index 12751f810ead..078ac80b939c 100644
--- a/dev-python/dominate/dominate-2.2.1.ebuild
+++ b/dev-python/dominate/dominate-2.3.4.ebuild
@@ -1,30 +1,25 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+EAPI=7
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6,7}} )
 
 inherit distutils-r1
 
 DESCRIPTION="Library for creating and manipulating HTML documents using an elegant DOM API"
 HOMEPAGE="https://github.com/Knio/dominate"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
 DEPEND="
-	app-arch/unzip
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
 "
-RDEPEND=""
 
 python_test() {
-	py.test || die "Tests failed with ${EPYTHON}"
+	pytest -vv || die "Tests failed with ${EPYTHON}"
 }
diff --git a/dev-python/ebuildtester/Manifest b/dev-python/ebuildtester/Manifest
index e151a4edda9b..d35f6b32b749 100644
--- a/dev-python/ebuildtester/Manifest
+++ b/dev-python/ebuildtester/Manifest
@@ -1,10 +1,12 @@
 AUX ebuildtester.bash-completion 501 BLAKE2B 55a6ddf54f05c2958fad5d3abc6ea1cf65de1320e5cb6aff14eac2755b1fafaff1df6ea5e813135d66f96329c806a3a3db326f3ed988c09973f20297b6dbeacf SHA512 a5fd613548258585fd6ff9905f9fd4f87517d6821f4e5da8443f1f83a666ddcb40d0e09b305505894677c3f9feb1826e8f2e0ddb8af238000e3462d0da236530
 DIST ebuildtester-0.1.10.tar.gz 12912 BLAKE2B 8d1c28c14dbae7d67b718fd957e6d7c1e1d1c996f77d4ffaf8feb505424c533996858bd7051331111d955d772106c3924f81cc1c2490ff9ac7068d10d838d9fa SHA512 f238fac69415e3a7e0a9ca684aa16ab3a3df5da71daed49a4d6d57b76a696af9089079b995da667d1307b1d4646e7291b8e86777f0486af3b51a8be435b8fe16
 DIST ebuildtester-0.1.12.tar.gz 13608 BLAKE2B 4ba39f8317028f906da54aca3a3cab466eeeed9b223a93e56b25dd8212c5266e593dbfdc96f8babfc3569bd9bf676ca255636ca1d285481972a794dd9d8208bf SHA512 62d9245c0e6dc428d3def73266aea83b73659318a5a771062b5dddb634398bab62ae12d8588c247377e84a4ba4088b0ef0cc86ff1d5774a306c43af8eb6fdecb
+DIST ebuildtester-0.1.13.tar.gz 14687 BLAKE2B d88c739707e6bc0dabaf5f03eb94a55c98f73b2dd23f311df6101556899b9ddebc4f9d40715ab9d2c2a01018fa121589e707afc28b59f18378690a9176b48c75 SHA512 88ebe3218d795e395eca2d048f74bbc0bca7c304e3b70d5a04e07256e8d8ae66feadf37d196f46523b9589ec9748aa47f8807e15479b9dd9f42871819f1523f7
 DIST ebuildtester-0.1.6.tar.gz 11350 BLAKE2B 2dbc73a080cb0e6334e1e852f67dbf04e646030714f706e2ac355aac30679bab4e8420d31072d6c6de85a6dda5c2d4d412643f15cc2692f19b1715b22350c259 SHA512 68c877d9eb5dcd0ec21781e92225b3e360ef4fce8aca18b166f1589ba57eaf26e8d9af859e325e1c7c0f80640389a6da137e1fe5920b9be4aa9d35e215d7b80d
 DIST ebuildtester-0.1.7.tar.gz 12257 BLAKE2B cfa936bed77cb9a1e7be55055d1feacbd29d10167a7a4987258d197621ee48697335bdc67e1006ea2b6524397a2ad107677aaa70d1fdf8768ec024959ac9aa08 SHA512 53bbe3c6cd502c4678cea62d3743ff61ed055d5143a5074c9ac6b136aa05692bdd082467c309ccffb63ad1ba25d88ebcaa1562333ccbd73f4191233c22ca6261
 EBUILD ebuildtester-0.1.10.ebuild 676 BLAKE2B 19e4eeb9e50aacd6113315a12c1b09091a84a55d5e553a92bb4f0cf864ef74421ea7215c532c8a85d1ccb097bd40f8740901e50c8dc83ed1aba7d5e966283137 SHA512 793dab26a447bdafae2bb7dd4db9da38331ba6c125b5cec30806ac40714cbce9a60f02609ec8bd6e02d2253788f61cf4a68a2c83b541d2dfaae6337e134db68d
 EBUILD ebuildtester-0.1.12.ebuild 676 BLAKE2B 19e4eeb9e50aacd6113315a12c1b09091a84a55d5e553a92bb4f0cf864ef74421ea7215c532c8a85d1ccb097bd40f8740901e50c8dc83ed1aba7d5e966283137 SHA512 793dab26a447bdafae2bb7dd4db9da38331ba6c125b5cec30806ac40714cbce9a60f02609ec8bd6e02d2253788f61cf4a68a2c83b541d2dfaae6337e134db68d
+EBUILD ebuildtester-0.1.13.ebuild 676 BLAKE2B 19e4eeb9e50aacd6113315a12c1b09091a84a55d5e553a92bb4f0cf864ef74421ea7215c532c8a85d1ccb097bd40f8740901e50c8dc83ed1aba7d5e966283137 SHA512 793dab26a447bdafae2bb7dd4db9da38331ba6c125b5cec30806ac40714cbce9a60f02609ec8bd6e02d2253788f61cf4a68a2c83b541d2dfaae6337e134db68d
 EBUILD ebuildtester-0.1.6-r1.ebuild 666 BLAKE2B ab0a1d3b3f790a1ff0bdfeb5e754dcebeada2814b9099f56a345fb4def30d4f55e9c0a316d88e0b0bc7f00e5fe94e8771e5992762a4ce3f456700099d42971b7 SHA512 ad1108482b911ee746fc627ef4dc363926a404650d3c88b879abec82dce377f883e3bc4c27e96ee1caa637010d02cf18c7cf973b91d386815d994a6ce731463a
 EBUILD ebuildtester-0.1.6.ebuild 508 BLAKE2B e079d1f3db025e13346638417bf27f4f4afa870d70bac21667a918af9320038db9d32369da2b55fbef4c849dfccb172e18bd59aa7797107fe564038dc75b621b SHA512 b7afffaef484458f18db0fad6016a838b6ad0653492e3f9daa22c4d0213eeeb73c7a5bf884ed3373326f3564ae02bf619258ea5b101ef58b161198a84b026ecd
 EBUILD ebuildtester-0.1.7.ebuild 666 BLAKE2B ab0a1d3b3f790a1ff0bdfeb5e754dcebeada2814b9099f56a345fb4def30d4f55e9c0a316d88e0b0bc7f00e5fe94e8771e5992762a4ce3f456700099d42971b7 SHA512 ad1108482b911ee746fc627ef4dc363926a404650d3c88b879abec82dce377f883e3bc4c27e96ee1caa637010d02cf18c7cf973b91d386815d994a6ce731463a
diff --git a/dev-python/ebuildtester/ebuildtester-0.1.13.ebuild b/dev-python/ebuildtester/ebuildtester-0.1.13.ebuild
new file mode 100644
index 000000000000..3f9b13bcc09d
--- /dev/null
+++ b/dev-python/ebuildtester/ebuildtester-0.1.13.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5,6} )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="A dockerized approach to test a Gentoo package within a clean stage3 container"
+HOMEPAGE="http://ebuildtester.readthedocs.io/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="
+	app-emulation/docker
+"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+"
+
+src_install() {
+	distutils-r1_src_install
+	newbashcomp "${FILESDIR}/${PN}.bash-completion" "${PN}"
+}
diff --git a/dev-python/flask-appconfig/Manifest b/dev-python/flask-appconfig/Manifest
index 3ab75e8e9c8a..be22f0f65c63 100644
--- a/dev-python/flask-appconfig/Manifest
+++ b/dev-python/flask-appconfig/Manifest
@@ -1,3 +1,3 @@
 DIST flask-appconfig-0.11.1.tar.gz 14545 BLAKE2B 71cb3252707ee546aaa16ed36f1c605c5e90d49070a64aa381f23fcc1fa9147724a8794b8530738115c3b0505537487c63b3131c586b4383884b58f6141cd515 SHA512 9ebc42be5ef247b1f14b85f7b65600a1595ecdc70e792c0cd495347254b07675a3b7a306df8d2f2663626ceafa4ce7700f6f26cd0f1bcd974ba6bbab293847ee
-EBUILD flask-appconfig-0.11.1-r1.ebuild 1219 BLAKE2B c4990b3715f60bb277c3373413b3cb6eac7c44a8d2804af753e027dbf18e56297dfaa9ed0724bf1902d50ac2c5c4a3a5cef302c94e8a5fa0f55fb5a3901153ef SHA512 28edc3c6370258c78a8c44ee7a401f2eb0f43b37b7386c3343bb15b5b4bc454676630ac7e377134eca050cb66b2e976db9af4fd8414b246debde239711b4320e
+EBUILD flask-appconfig-0.11.1-r1.ebuild 1265 BLAKE2B d0d3ba15a4b6372c6adfa8aecab57945dd959985ea629a8c5457d96bcfbb3d3a1a1b32a397d67b2658e4ab3d4d3ab00ea9821e191971ceba96073f0d40664751 SHA512 3b68ca9755fc3b078a0cdc2e93e781dcdf957a90138d715c17f9aa1dd23289b78b1cee9a47df4a27d72b0c1f9f944656cb24754ef57a4dcb16998c821237f748
 MISC metadata.xml 449 BLAKE2B 062ef689f336373983993c0c666feb9a5fa6a6d6a19d3509a6856c6f75a4b810fbf6ed6ea42511073691d83c23a63c5cf3a78db1f0e41d2001b146d8b950e30c SHA512 6a71fd90326834e06eab6e45aeddf17940a9140d7ac41e9fbd1dd8551042066a7fe4f6eb6840d5e2363deffb9d00d59283aea87c113b4b190590d545cd283122
diff --git a/dev-python/flask-appconfig/flask-appconfig-0.11.1-r1.ebuild b/dev-python/flask-appconfig/flask-appconfig-0.11.1-r1.ebuild
index 2e1c7689325f..85f4e59c812c 100644
--- a/dev-python/flask-appconfig/flask-appconfig-0.11.1-r1.ebuild
+++ b/dev-python/flask-appconfig/flask-appconfig-0.11.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6}} )
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6,7}} )
 
 inherit distutils-r1
 
@@ -24,7 +24,10 @@ RDEPEND="
 "
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	doc? (
+		dev-python/alabaster[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
 	test? (
 		${RDEPEND}
 		dev-python/pytest[${PYTHON_USEDEP}]
@@ -46,5 +49,5 @@ python_compile_all() {
 }
 
 python_test() {
-	py.test || die "Tests failed with ${EPYTHON}"
+	pytest -vv || die "Tests failed with ${EPYTHON}"
 }
diff --git a/dev-python/git-review/Manifest b/dev-python/git-review/Manifest
index 6f452ca80f78..5f225799e3c9 100644
--- a/dev-python/git-review/Manifest
+++ b/dev-python/git-review/Manifest
@@ -1,3 +1,5 @@
 DIST git-review-1.26.0.tar.gz 56557 BLAKE2B c8af82d7cc222078c1ef470da0ffac7b698df91ed991ba43c8d34a64bbfa3996bdbe475d9965d6d1ef8cca84293613afb92ac6405c0397232e568d2ec2226202 SHA512 74b2366d7884963caaa9b4614301fad56b7997d1cb16ef333cd2dae5df5a5343e5b891fc089078856b57db0083584a8b4ceea98dd67c401651a100fc4fdf7d81
+DIST git-review-1.27.0.tar.gz 58471 BLAKE2B baace809949fb5bdb22c6cca251deca7a200b070573840f391ad24ad045276d376616c58355c5159086dc67b481686d6382c71604f2bdc8adf0b2799240a976d SHA512 e9fff7e54457b300c269378062e5bcce28511dfd6662035dc8d276e33e6a0f6b6c68bae98fb3a8a36e468f669c4eeb461e96cdf073a831c42156f8c0ef14fa0a
 EBUILD git-review-1.26.0.ebuild 665 BLAKE2B 67bac1643c0a04d4708fb79c53a5b0b3c6f26389c1b5e504d5326c890bac91e089952505694459ed454e31696535cc6275a5941f04d4b30a0f649b29ed84fe5c SHA512 5d4877bc51ba70c25cb3177095b2ba48ac34c137ffeaaa4d08149585049f91ac801303988dd5bb267ef24596054279060510b67349ed6aa4ba586012ec80b6a8
+EBUILD git-review-1.27.0.ebuild 664 BLAKE2B 0e15a21e009460d5ee20750df42823101664b6471be12aa429bd40a8b7c3f88d3ee3d5b35f0d1b6f6515e653c9b8a432a431bf937a0b0d29215e06b2031e8dba SHA512 834f2c81f45ebb7a82c69e7fdf15a2b0659755680edd25f0ed8b0468420037af16fbce4d531f37472f4110123d25b84170f18a0cd787e24ae1d380e8b653f8a3
 MISC metadata.xml 337 BLAKE2B abf6866cf38fbd7925eabe5d6f2a4cd5887dc263d419cad65ca4105a20ee975ad41e1a661696520fe016318ce55651dc123ba7e6a735335a70d3aaa1b10f3320 SHA512 5bb1243f031097419ceadb6935e12567d359790e5fe63c19687f1cfe4a64f5dfa23b5704232d5777c6dddc1908b0856a780129dc08b787d786d2b867dc40ff46
diff --git a/dev-python/git-review/git-review-1.27.0.ebuild b/dev-python/git-review/git-review-1.27.0.ebuild
new file mode 100644
index 000000000000..039cad47a078
--- /dev/null
+++ b/dev-python/git-review/git-review-1.27.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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="Tool to submit code to Gerrit"
+HOMEPAGE="https://git.openstack.org/cgit/openstack-infra/git-review"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/pbr-0.8.0[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	>=dev-python/requests-1.1[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	sed -i '/^argparse/d' requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/gst-python/Manifest b/dev-python/gst-python/Manifest
index 87d73594e0e0..a62af8dae04b 100644
--- a/dev-python/gst-python/Manifest
+++ b/dev-python/gst-python/Manifest
@@ -1,8 +1,6 @@
 AUX gst-python-0.10.9-lazy.patch 534 BLAKE2B 27019fe8f97a9e364c9851d3faa82195e72e061f7dbc0528c7b1534478b242fe62488275360f312ea16c7da9a714e82b399404c3f94b83d49332df31307444f8 SHA512 b00cb635ae44f4dc42f0d72f5fb49e6540eee6c8b989715df4554dc09e9980ce0d5c91ea7ebd853d552061d1aad1a28b645c831198b9799587debce654f508c1
 DIST gst-python-0.10.22.tar.bz2 632651 BLAKE2B 17c139c2b5514a7a5e4c2351109418a2ed1bcda149e83c0e940dd09619225fa0930bba5f5d42d3c03f5f8567f3c90454b47a51513d609a36887efedcae8ab482 SHA512 bbbd6b661778cca990da0e216294d86da31a6e472049905989a3311459dd1227bf8f2ae3699a3cdbb66a16288569764352f1e1b93e696d3db4b0728bc38e5b12
-DIST gst-python-1.12.3.tar.xz 388220 BLAKE2B ce9cecab7e65c66b43f7363be18299be0e86b1023b0897d735b8526b30290ccd320204f6acce29e512e85b2e5d7298bdc184eec1488d00fc3b2869311b71295e SHA512 f4d0d09a5b068e79496aa5e0d73f09af2d1e929cf6f80874dba8396950952b795a30f5a33c18b42a650f173c80ce342f959d497aa0d9d281bbe36507a71d1b4a
 DIST gst-python-1.14.1.tar.xz 405312 BLAKE2B 29be6f79b20a27e0d21f27cbf29b1881216e412c3c4ea016f3ee6bd921ec7b73139f74a20528f7f704526786347b065d246940f152d61a64e4eb926dbb44bb87 SHA512 32537e6556b69d00cb0b467239c148c0b9c282b76786be395e053a30554b84aea7c22e7fe6fc6faf77b35fca82fb799df4f52c114b282d0a6ea660f67dc40c53
 EBUILD gst-python-0.10.22-r1.ebuild 2148 BLAKE2B 5a99c81cd728afc601e7b8b3f54bd9d8ab8e5c215a6cdf568cf6aa01eba484c1fc16b701bb5d8bf9dc97b0f44b69688e1c8fb7d4a5c9781dd3f4d7c8d6a67071 SHA512 ebc646247140167dff59b882007d1919cfcc03cbc872d2d0db1dba3887287b3f9110a523df844da4b59ac70f764a8cb1f9de570ac660458a29d0802b7791639f
-EBUILD gst-python-1.12.3.ebuild 1126 BLAKE2B b380d585e607b91123da87fff21af321e1dd167465693f539f881d1968104d2635b348f81d40d81c1dc2c8c63797fe4d20bdff6b1125823ce4eaa46324a9e2b5 SHA512 e68bfa562cf78dc2da2b7edf570122e9052b12015fbed8948db9c5e2e5ec29a2ca7daf35fb96ea72a4d44fd5dbe6d13c75330f6734d1d4368ff525b6e4858622
 EBUILD gst-python-1.14.1-r1.ebuild 1985 BLAKE2B dbfdbe037f328152b49d7f792033f1c2d1827711543eb1bab1ba05de100611e95ef431784de14641b0c64837f00bf71035ae8d80aca66c8232395119cc2b8db1 SHA512 37f15dd10b23c7b746e1df82190befa0b2824d6122afab100113238dc0aec0d33b8031d0d00ee2dbfc22a081bd281119f1b569bbc5b7764db4d5149896a5e103
 MISC metadata.xml 272 BLAKE2B b1575d88177572e472e66c7cce4fb4c0d98aeb02edb03e800c2b2f2702b5c81c6c012c264655fce8c3170e44bfa117c81b85cdbb9f409714ab216c7a6f2b4482 SHA512 7dffa3bd729f24f9081f6b1c3db474cb26c54e95752a37140c5a9836299f26b3d0aa73e7c448e6b773478cb0112eaaf70f783d2b2f3d2868b1a2def8e6a9b8ea
diff --git a/dev-python/gst-python/gst-python-1.12.3.ebuild b/dev-python/gst-python/gst-python-1.12.3.ebuild
deleted file mode 100644
index c23317d494e3..000000000000
--- a/dev-python/gst-python/gst-python-1.12.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python{3_4,3_5,3_6} )
-
-inherit eutils python-r1
-
-DESCRIPTION="A Python Interface to GStreamer"
-HOMEPAGE="https://gstreamer.freedesktop.org/"
-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"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-python/pygobject-3:3[${PYTHON_USEDEP}]
-	>=media-libs/gstreamer-${PV}:1.0[introspection]
-	>=media-libs/gst-plugins-base-${PV}:1.0[introspection]
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	prepare_gst() {
-		mkdir -p "${BUILD_DIR}" || die
-	}
-	python_foreach_impl prepare_gst
-}
-
-src_configure() {
-	ECONF_SOURCE="${S}" python_foreach_impl run_in_build_dir econf
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	python_foreach_impl run_in_build_dir default
-	prune_libtool_files --modules
-	einstalldocs
-}
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 7bbdc0fa2272..e31e53e638dc 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -1,5 +1,5 @@
 DIST hypothesis-3.6.0.tar.gz 73586 BLAKE2B b0ec133e8c71f752114211061155c15a7d536e771ba85eab6489440b2063d3083018bf8502d9e9dbc73105ee5f03060e3189e64574a3dfa052b091040e7e7915 SHA512 cb885628e5c38ab9312cfb177ebc3c014617d21031737f5fba343ba485c1b8ff82b1302e7bc1d3e79192bfd8324fd0501498c968f3ac8343829f8965f6354389
 DIST hypothesis-python-3.59.1.tar.gz 500529 BLAKE2B 5c171045e363f2337d7ca30797b9fc7f96430c805dd4b3ec78fe927247d2c2ba4a216789a82f1e956b89d66c5ecdb2050a5f93467f2d557a05d1d48507fc06db SHA512 c3aad4cc54152963806e09af5f351e60e30cd64ad48ba3d922451b10dbb1747ea3e5d432ebc611dcb0646687d7e8755051b967304e74798d091be0b2901c832f
-EBUILD hypothesis-3.59.1.ebuild 1172 BLAKE2B 828ffd82cb805fec872ce2d1c10fb4029d43591e3463736891967c7336b032c0eaccb6ac1eb73522d7243797eb50036712ff35c2169bb8f18a9e7b8994476467 SHA512 72d91a28763297a7082645f5aeabbbb43e76b1f1febdf6ee1ef1d43a9a75035f73aa462d9556dd7ead4eb41819c4c39a0e8313a638d5c839f905009ea1feb1ba
+EBUILD hypothesis-3.59.1.ebuild 1165 BLAKE2B 6a6f93aba2e1e8e21aaba137c7ce3552f507df5848acfdee1f04faceaf16c8e1bbef2ebfd5eb89931b9ffc2b3ed01371a0789c8a1664c549e4c94b8e0cc95356 SHA512 c55850a992b3088c2b7639bfff783e356b359463df972e8c9efc1670cb3d0c6eb838c885cc0e6b17b30fdde2ccf02e211fd423fd845c91d42f2b917e57b50c54
 EBUILD hypothesis-3.6.0-r1.ebuild 911 BLAKE2B 4107db5cf3dee7f521f54dbfe0488742ddf21876b88b5b637c361d8808fa09686252e5d464391adb3e2e45737c2e347eb963fc0e49c41a04c0ff84536a131885 SHA512 315866abf6fa890934c3125d86beba7c3bd799f1472c5661725418806f68f20c850b3204b687a03c1887ecdf6a535117446a049509050da5f9d6d93cb0f6cd0b
 MISC metadata.xml 379 BLAKE2B 3623a13a813bf71f9474fa018b2f83392ec168193b9853cabcf112267d38e7278e97a415bb8b7e52f9ebb28864b8709a64996dcb0d97e1f03b3ecb31a944d74d SHA512 40bb5c1916d9027ff81cd32073de34753a30d8430f36d0fd16667a111af8fd222379dcd817edd723d362f5ff5578ad7b212f98388c00de6dff1a64bd2c3978b0
diff --git a/dev-python/hypothesis/hypothesis-3.59.1.ebuild b/dev-python/hypothesis/hypothesis-3.59.1.ebuild
index 10b1353da66e..d6a43fd2932a 100644
--- a/dev-python/hypothesis/hypothesis-3.59.1.ebuild
+++ b/dev-python/hypothesis/hypothesis-3.59.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/jinja2_pluralize/Manifest b/dev-python/jinja2_pluralize/Manifest
new file mode 100644
index 000000000000..3d056fe9b387
--- /dev/null
+++ b/dev-python/jinja2_pluralize/Manifest
@@ -0,0 +1,3 @@
+DIST jinja2_pluralize-0.3.0.tar.gz 12638 BLAKE2B bb7399d287cf0d1bfed5398c0ad7e6994dfe1d8e942d82190570d0b40d8bec4939d497cb2d9d4415c913f3f3f9c11b017035941755219effa8d92a6ef188dac9 SHA512 8830c01ff82befa353302cadc305147a950038fdf3808632f22dfce9a564a6ba7967781f579a2d94fecb1b5bb01f80d2a53ff082332b94c6e6e3f5f4106e7313
+EBUILD jinja2_pluralize-0.3.0.ebuild 595 BLAKE2B 04f82c0bffbe4db509a0e1dfe20a2d82e895bd4107f4d3d2786685006163d6bad84c23b755fafd8408668da3338ac252b6086e24d03863fd2cd859988fafe102 SHA512 4978574c5bc3322db34172b3b5536e31f9fc2adf3f6ffed5498a0f60a0b8db591359d5658b0f4cda8e7330ed45d4d1384f2b551cd09c43fe47bfea9494c5932e
+MISC metadata.xml 387 BLAKE2B bbf1f15fabc767c47fdfb69fc1dff3722cde37c075f15404667ed1a9e51ac3147bb093247af3941d9165e26118dd725eae8ad7823be1f9d7a9727ddfc2777e04 SHA512 1b5c9b39ec7a445d8cc673517d3552a9f256804ac8b4f24be6fc7a19d5c7df9613eea3f15e44009c19df3944b9a14a8dd353407bee415883322dc6e973e403eb
diff --git a/dev-python/jinja2_pluralize/jinja2_pluralize-0.3.0.ebuild b/dev-python/jinja2_pluralize/jinja2_pluralize-0.3.0.ebuild
new file mode 100644
index 000000000000..c23fffceeb65
--- /dev/null
+++ b/dev-python/jinja2_pluralize/jinja2_pluralize-0.3.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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="Jinja2 pluralize filters"
+HOMEPAGE="https://github.com/audreyr/jinja2_pluralize"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/inflect[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/jinja2_pluralize/metadata.xml b/dev-python/jinja2_pluralize/metadata.xml
new file mode 100644
index 000000000000..f6d818240495
--- /dev/null
+++ b/dev-python/jinja2_pluralize/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+		<name>Zac Medico</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">jinja2_pluralize</remote-id>
+		<remote-id type="github">audreyr/jinja2_pluralize</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/kazoo/Manifest b/dev-python/kazoo/Manifest
index 97848a3aa901..746faf33ca87 100644
--- a/dev-python/kazoo/Manifest
+++ b/dev-python/kazoo/Manifest
@@ -1,3 +1,5 @@
 DIST kazoo-2.2.1.tar.gz 108037 BLAKE2B 23b6b762469df40304cb0d9228dee63875e7c062557e0dcfd383db792c7544b19fbb4fc91a62035a2455b5a2715a57bcd4a68521cf698f01815cec20765420c8 SHA512 a2590441a9e3bfb3d14913051453e195d275b82bd6a4ce5e32d0a7bbc09b00e475ffac68fd06cb065aa439ea580b61bbeaa3ccfefa413723e46f4b1d3ce05707
+DIST kazoo-2.5.0.tar.gz 147189 BLAKE2B f90662d78698d4ba8c9a88cd4eba826df104dd746323ce92644707e22ab711ca5fafb79bbec71c4059637232eab4b510b9544871201ba8d6758618d5a79f97c8 SHA512 cb85a33f2d0aa71fc5a82e7046e5d331417df865c1a4bc18266cee65ffd6c36e12cd4058ee591214ec83225a9b3ee193587f3d07b5c1436cc715a403364ec1af
 EBUILD kazoo-2.2.1.ebuild 1118 BLAKE2B af9d452abde829cfd924d4113f5a65e20733081c146ad3ce2c8efb43fd248671cee5c2f3317483a16768c03b1eb87af2c1310c4caf3d087605bcb79c26950c61 SHA512 dc78320cfc9400e0076cd2ab73b98dc2ac7a1947ce09e63faf4942ec1854b62f1762490e8549fc32908d28417f3b41a2db728524a247f0bcd649c9081c6d52c5
+EBUILD kazoo-2.5.0.ebuild 1118 BLAKE2B 6666b94b93970afaeee99abb8e75c66d13c07160d85cceabc7a75c77cbc4840e38d681fae1337517c9e0498d78e7ca348d3075e25e757d574e367fec607165d3 SHA512 001fb52d932b5d228369e37c62aaf370c008d6c77eb6c7805b785e71c4aca42bcda1d10d0a9c12e72ab96f2c9b9b5c8b9a8cff0f17cc0b0b7631a38622392195
 MISC metadata.xml 467 BLAKE2B 289e2184ed4d8b4435da2edd6698d915a26f2dfbbba93aba0aed35a2adc5f5ef20a95d70e673de980e08d58252ea8f540b913a35a46eb1327821dca49ad36f60 SHA512 3028edb8107a980e1573f283e9f47a408b9c4ef9bea0ee452f25d908665220ea6cd43b70e2d85d339d553e60426f9d45a093eece38cd0a67f2f416db7580a6d6
diff --git a/dev-python/kazoo/kazoo-2.5.0.ebuild b/dev-python/kazoo/kazoo-2.5.0.ebuild
new file mode 100644
index 000000000000..acc6d5b4f98d
--- /dev/null
+++ b/dev-python/kazoo/kazoo-2.5.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="A high-level Python library that makes it easier to use Apache Zookeeper"
+HOMEPAGE="https://kazoo.readthedocs.org/ https://github.com/python-zk/kazoo/ https://pypi.org/project/kazoo/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc gevent test"
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	gevent? ( dev-python/gevent[$(python_gen_usedep 'python2*')] )
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )
+"
+
+# not all test deps are in the tree
+RESTRICT="test"
+
+python_compile_all() {
+	use doc && { sphinx-build -b html docs docs/_build/html || die; }
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	local DOCS=( {CHANGES,CONTRIBUTING,README}.md )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/mpmath/Manifest b/dev-python/mpmath/Manifest
index bf2cd33afc76..11ad3efbcef7 100644
--- a/dev-python/mpmath/Manifest
+++ b/dev-python/mpmath/Manifest
@@ -1,8 +1,5 @@
 AUX mpmath-1.0.0.patch 422 BLAKE2B b79a223fb3d6c712a11e225c4f617d68cfda595ad314fb33ba02333eedcf39909f9bf76c98f004619f62cfb4516172615b8e79017362807980b1c61724423543 SHA512 a5c7c8816d7e4ba2dc481480a887d94ca158fee804a01e86f91fcea037372217ed8b029f85f6a0c15558b44aaf56f6fadf36b4f7476713a04a66f18b6f1ab997
 AUX mpmath.patch 434 BLAKE2B 1d7c2a6d8d99efc75fd4e6ab5900ee88c8b75a809a8776c3dd9fd390200e5d184423625f8a9549345892ae985e4237727d39d821ecb2503d29a2d78b6417f967 SHA512 2ffc7ffa375f5c25d044974a8b1fac145a00d9b1f190d12e1ade6cadad44dae11098617de5ee0a523931f046b4cd0e785552a3de6f66f438052955b6987bda39
 DIST mpmath-1.0.0.tar.gz 511349 BLAKE2B 62c6275f76c412043cdafef51815e4b5d055a63ca36f3f63b33957351b19e03419ca27f7d59641c580cf8e47c1ca45240b68b3040e2749b3de679eb45b15a28e SHA512 b225f237008e1cfee52b2f0dca0dce1445b932b6eaef92879d7feca30d728e3f88810bfa80882ad8776ba846a636807e59bebe0b9f690cd878c089e9418bd8b7
-DIST mpmath-all-0.19.tar.gz 2123129 BLAKE2B df7e6255f09362a4203716a5d70036b712d069cc08c09613cabd6d1a88ab5155610f5fe5d2f33db3ed241322e92e93301c54c9cba777c0fbedfb5c891ffa3db0 SHA512 5a6ed0b5fad84c1e8399467ea7a1295f9b77c8e673b821c11e3298e88df6c48d9967eed84e2979bf12868e2f9b42bffba01a0c1836a6d82ac42d5f423fed6580
-EBUILD mpmath-0.19-r1.ebuild 1384 BLAKE2B 6aadcbff6fd2a2907c345a6d2e1025a3f6669b416e19ba06f355df8ab65cd71b2ed3f316a87295ce50a3b38f8974153634d83adeac8033b33bf4473df0e22c4c SHA512 a250ca3659c948dd59a4f3151ee06fb5e0f4b9c9e51ef3edb757ab9f743d4f2ab28865531bc2db486333ddfda0fe0e69184c58af8a33bd8352327849ff0824ef
-EBUILD mpmath-0.19-r2.ebuild 1390 BLAKE2B f820b249bae5761a167af070fe0a3255698ddbccc47eef896db7666aba22f606c7ac975e88bccaa853ebd5bd63a31a12fc08f2089f48fd03f65d43b23aef3015 SHA512 a4128b69fea1a8f4d936645fe9bee6d19e5c9077b088cd377c32c1541d140f1f2da42051fe194abaa914c2d1cf68cdb0e36df71ed09a0b56e6ad42f8ffc2c6a7
 EBUILD mpmath-1.0.0.ebuild 949 BLAKE2B 754a1b4fe71fd30363daa59304106e4887f7fbb8567872d2eff73bd3651516d9b74f664014521580f2696a717e9472301321114ff60d5f4e80032834fed6cfd0 SHA512 1f66dacb4c67b2a132a45727bc2df816760537f69fb3acd109f601c3e0108d793c237546dec4f9bcd26e87b2a2e2817b72436941c473438670491d79482ff08f
 MISC metadata.xml 650 BLAKE2B 520b0399fbbae4307a4b3979202b4d5c8d1b06f739e0c0460a9a0be63b78152b50ab3f7fdc9b46623cf7afaeabbc57cd35f3865462f3b16ce2beeb0b8f8659a5 SHA512 0f999aeb354c73658f916cb8d3a80dcd216f50f77839c0c854e9235566cb197a7d047ad51045996fc0b9e1c47f55e934be9dd52597fee16fcce6360bfcbe8f08
diff --git a/dev-python/mpmath/mpmath-0.19-r1.ebuild b/dev-python/mpmath/mpmath-0.19-r1.ebuild
deleted file mode 100644
index 85fc57bbf397..000000000000
--- a/dev-python/mpmath/mpmath-0.19-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit distutils-r1 eutils
-
-MY_PN=${PN}-all
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python library for arbitrary-precision floating-point arithmetic"
-HOMEPAGE="http://mpmath.org/"
-SRC_URI="http://mpmath.org/files/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-IUSE="doc examples gmp matplotlib test"
-
-RDEPEND="
-	gmp? ( dev-python/gmpy )
-	matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}/${PN}.patch"
-		)
-
-	# this fails with the current version of dev-python/py
-	rm ${PN}/conftest.py || die
-
-	# this test requires X
-	rm ${PN}/tests/test_visualization.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		einfo "Generation of documentation"
-		cd doc || die
-		"${PYTHON}" build.py || die "Generation of documentation failed"
-	fi
-}
-
-python_test() {
-	py.test -v || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/. )
-	use examples && local EXAMPLES=( demo/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/mpmath/mpmath-0.19-r2.ebuild b/dev-python/mpmath/mpmath-0.19-r2.ebuild
deleted file mode 100644
index 3bd7c37eb1c2..000000000000
--- a/dev-python/mpmath/mpmath-0.19-r2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit distutils-r1 eutils
-
-MY_PN=${PN}-all
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python library for arbitrary-precision floating-point arithmetic"
-HOMEPAGE="http://mpmath.org/"
-SRC_URI="http://mpmath.org/files/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-IUSE="doc examples gmp matplotlib test"
-
-RDEPEND="
-	gmp? ( dev-python/gmpy )
-	matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}/${PN}.patch"
-		)
-
-	# this fails with the current version of dev-python/py
-	rm ${PN}/conftest.py || die
-
-	# this test requires X
-	rm ${PN}/tests/test_visualization.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		einfo "Generation of documentation"
-		cd doc || die
-		"${PYTHON}" build.py || die "Generation of documentation failed"
-	fi
-}
-
-python_test() {
-	py.test -v || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/. )
-	use examples && local EXAMPLES=( demo/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/namespace-google/Manifest b/dev-python/namespace-google/Manifest
index 0db2f739ba1c..cfcba024cd92 100644
--- a/dev-python/namespace-google/Manifest
+++ b/dev-python/namespace-google/Manifest
@@ -1,2 +1,2 @@
-EBUILD namespace-google-1.ebuild 847 BLAKE2B 8e14c517c55948afb48ba42f129063da193d34144fa038ffa5c65d01d0ac53c89e80bb12334da32efc8a504570e8db6a34fae64267cd601e68108fb10dd8c10e SHA512 e01beb096a8676612a690fed32d9669e69569295a491be5fbf48d661d1717af0d5bbc9a12bd4186cedc43a010e30f421c79cb8e0437ecf36f62bcd964872dbdd
+EBUILD namespace-google-1.ebuild 846 BLAKE2B 3d6433ae0a1dd9d704dce7e89d3393444d89e644b5b7c8cf17d59e45015269d20e9d5d5477a9b8fbd6471f885440e1129baf9a08f1cc45a02015cf3502cce770 SHA512 51e3f0f669fe4f55f949845c62e730b2d0ac31257ab61a114ed261f31c6e47565dccb943066ff1f1a87c7651fc03b4962fa84585299d8555d0cad0b17183a5ad
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/namespace-google/namespace-google-1.ebuild b/dev-python/namespace-google/namespace-google-1.ebuild
index 7f137a69a85e..143da3ffd1fd 100644
--- a/dev-python/namespace-google/namespace-google-1.ebuild
+++ b/dev-python/namespace-google/namespace-google-1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy )
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} pypy )
 inherit python-r1
 
 DESCRIPTION="Namespace package declaration for google"
diff --git a/dev-python/olefile/Manifest b/dev-python/olefile/Manifest
index 3c7b5cb2c95a..8dd7a26473c5 100644
--- a/dev-python/olefile/Manifest
+++ b/dev-python/olefile/Manifest
@@ -1,5 +1,5 @@
 DIST olefile-0.44.tar.gz 57903 BLAKE2B 2df4078c147ff737b845fe4ca57b6520c39776efe6bac399b0b8acb4ca62f946a653f85ad0511f5fa42d8b544d539474d226fe144bc2604737f3b16e5edd5ff2 SHA512 92b6ad1bced5b2c8e5332a01e5a2e59527ec2303046d0babd665b0f02fe56966574eff56619de168c50f1ea40df2e61ce589ee61b634222146d049b129514c65
 DIST olefile-0.46.tar.gz 97587 BLAKE2B e6dbadda6f18ec287f5b1b59ab4b92ceee25b4ca47499ed31a03992ae4e3a7269ba0c641f631c4beafdfe43eccab4881d06f7ba372ec47b376b5eb3ed788f45d SHA512 e70975cdda11004ab331908085e0cbd9cf3e44f49fa1453a7af5373bfed0a98729bb7600fee7a1042be6c40c58649f3650972d9e4520bbab218cf715f6264f98
-EBUILD olefile-0.44.ebuild 673 BLAKE2B d7ccf0305e91e0e000ab4623d1e7d10bb11fd25598fe0b24cf225ca925695433cbe3b5f8c45a74b1f428dc7eb643763e050eb63112e2522f70cc6aa5a22bea49 SHA512 1e877185e201142eb7beb84bb6aa00141411a8d3d98fea677f9134b8ad6c7013c53c6d0bbaccfff83761f5221a8ed717b6527a7b14e242066a67aca185030c32
-EBUILD olefile-0.46.ebuild 674 BLAKE2B fe86bb98670b25b43ca095e580def2d14267e841124432041cd3e720e599e2112cd28b6dee105696c290303c808dfc349413d9f9636786a256270007f571c3ab SHA512 6a1f248d4a49e9c8e94b4a702c99fd6b538ee70a0bc8622fbde2c17654854e7d31dfdf7177be3921ddd79d60d07799bdeb84baaa092494cf0aed5e7facedb1c4
+EBUILD olefile-0.44.ebuild 669 BLAKE2B 7dc78d7b23c50af368ca63085b7a2af810a84fa6d7cef025657da5ca17d340e1d6deacd44941fc142076f8c3740098db4e0bd399d1daf122bd60d8eb9196eba2 SHA512 46556d11118e8053722add7636da336b9770a735c84f11f7c41640a6ca8c4b205a640b3c0123bd1bf6ff9ca8a772c745afeb72edffbb78b933f23623d2daa4ba
+EBUILD olefile-0.46.ebuild 673 BLAKE2B 7079b5ba6ab8da7f06e11931fd8693abed7b0897f6654f5ac57045c6e4453953086f88f3af144b5b7d2316bdbc41f57ab140dd58406cbc1c2f1a7c87545f2789 SHA512 1e338ae9e07b7a640bf848a0a7b3836715738d5edec752c8cc424ab12fa379b860f9f5a08bb82ced903f1792b2c166d0801b8187be8075cfe47822ef4769bef0
 MISC metadata.xml 383 BLAKE2B 45351ea99d7f164ee4e5ad18fd067d96c23fd2b6496b7ab979242cd12261fa167afc521b684b424754b8888f1a843bd42c9d15f87fd4a3c7af60148174ce27fd SHA512 9f6c8f0826a156a2b56d449ed0fd175a22e410f288194da6dfbb2b4ced638410211cd1020e26c3cafeb60aa70a99fe961a7188347118be42f9ef37a8f833f69f
diff --git a/dev-python/olefile/olefile-0.44.ebuild b/dev-python/olefile/olefile-0.44.ebuild
index e3a01470d4ed..7d8ce108ca3a 100644
--- a/dev-python/olefile/olefile-0.44.ebuild
+++ b/dev-python/olefile/olefile-0.44.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/decalage2/${PN}/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 RDEPEND=""
diff --git a/dev-python/olefile/olefile-0.46.ebuild b/dev-python/olefile/olefile-0.46.ebuild
index 7f7a33dc1d09..1497c5970444 100644
--- a/dev-python/olefile/olefile-0.46.ebuild
+++ b/dev-python/olefile/olefile-0.46.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} pypy{,3} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pandas-datareader/Manifest b/dev-python/pandas-datareader/Manifest
new file mode 100644
index 000000000000..6e08c87c6584
--- /dev/null
+++ b/dev-python/pandas-datareader/Manifest
@@ -0,0 +1,3 @@
+DIST pandas-datareader-0.7.0.tar.gz 341577 BLAKE2B 4169fdb9eb5280be15da23224d25104aaa47f7c328adc6fae6220ac11fc76954f541b8bdb117df977c163229751885e625d3a44923a8c0c2266f0eb3ee57b8af SHA512 2a2d1411fb3724f3e1cebea8a962c1d4f12124d58ba191035583d8d621bdb0dfaf0c0cbaea765ef61f5c23cc221ae2b585b612e97e45795380b70fe672d0b7a5
+EBUILD pandas-datareader-0.7.0.ebuild 1140 BLAKE2B 8f251d4f593a2e0e997750b392604b2093bdf9ef0601e7a7e4ebceb322196b5eb43d57dcdae1c5a6cf70c9bb3fbe642dfa5b5e0e0b0ffc2078305cae9bea77c6 SHA512 aa368d8fde015ad79a0346ac6c74c5507d119ae28f95927389948b24bc13a5bba69e59ce6a07d92defd64519f001a432c12a6cae1598d854935685030df89108
+MISC metadata.xml 753 BLAKE2B 2ecbabdb680770a13686fccdb0c91d7aa11b72db6649dc11395085fffc6712b23ad247355ac0845eff0ff4df306b7ae12151385ffa8871e525decc0f166b825e SHA512 886f97288af0af8c5939874e8d2d24d1614d56419a32c268bee80480f6c1a6921dfc46544bef189616737397feee4cd49cfad895939568127c046c9943c58751
diff --git a/dev-python/pandas-datareader/metadata.xml b/dev-python/pandas-datareader/metadata.xml
new file mode 100644
index 000000000000..777f5ec633c1
--- /dev/null
+++ b/dev-python/pandas-datareader/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>horea.christ@gmail.com</email>
+		<name>Horea Christian</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+		Up to date remote data access for pandas, which works for multiple versions of
+		pandas and lets you extract data from a wide range of Internet sources directly
+		into a pandas DataFrame.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">pydata/pandas-datareader</remote-id>
+		<remote-id type="pypi">pandas-datareader</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pandas-datareader/pandas-datareader-0.7.0.ebuild b/dev-python/pandas-datareader/pandas-datareader-0.7.0.ebuild
new file mode 100644
index 000000000000..875b3856915a
--- /dev/null
+++ b/dev-python/pandas-datareader/pandas-datareader-0.7.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Pandas DataFrame extraction from a wide range of Internet sources"
+HOMEPAGE="https://github.com/pydata/pandas-datareader"
+SRC_URI="https://github.com/pydata/pandas-datareader/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+# Test suite depends on outbound network connectivity and is unstable
+# https://github.com/pydata/pandas-datareader/issues/586
+RESTRICT="test"
+
+RDEPEND="
+	dev-python/lxml[${PYTHON_USEDEP}]
+	>=dev-python/pandas-0.19.2[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/wrapt[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+		)
+	"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		)
+	"
+
+python_test() {
+	pytest -v -s -r xX pandas_datareader || die
+}
diff --git a/dev-python/paramiko/Manifest b/dev-python/paramiko/Manifest
index 4a8821916c81..92e7341bcb7d 100644
--- a/dev-python/paramiko/Manifest
+++ b/dev-python/paramiko/Manifest
@@ -3,6 +3,6 @@ DIST paramiko-2.1.2.tar.gz 1196746 BLAKE2B c184e171fe550fc231d67473867db283b706a
 DIST paramiko-2.4.1.tar.gz 285151 BLAKE2B 767c4ad11da77c5c6796165057715f318cab417c5bae72cd97b51af94ecbf233316fd4286e35b2f855027e05bcf195c869b45a87f66954bee3bb98ae9d0ef1a9 SHA512 5a580d25e7911937f228ef4a2b89b5a1efd771f576c6c68cf1c36e1abbc38adbc6ad5dc91400de7112238fcf7803f5f26c13fe10be4af8a2a86af9398da7a8de
 DIST paramiko-2.4.2.tar.gz 289126 BLAKE2B 767f81a09b32762241eed6661e520e3b3a96acfe8e6e638ea7ae180a8b6866f8f4adeae0a0146d46ecbfccbe71334c5f5c14e2d049744258ca4808ac21365185 SHA512 894c2ebfcfb35a84fe74670d0eb67022a49b7bf165f31acd929045c17509d8a2be111e8319f20513b5034efd033edc6432b2ca2e7027dc7e3c6703166a96790f
 EBUILD paramiko-2.1.2.ebuild 1126 BLAKE2B b34574e42668a2ae2275ab09bf34207f1dcc81adf7576150060dd6d4c44b2e2682c79262861d14f85bb657d58a4e28e111c5a9701061922a2e7b235f5d269b4f SHA512 dcd0c120cf12e8d6927d772c569c92b0bd67738e6ce71fe7ef8f9bccfec9268e65f61e57f265635f129c9c1fbb8f3581c7d445251960c09c231ae6f74d2e07f6
-EBUILD paramiko-2.4.1.ebuild 1511 BLAKE2B efdf6865d253e622d1d987382581fb7caa20d0bc9f144899c49b184d2b9fb78eb1d43b9cd1b159eef6e41cd26fefcc9359ce5a21cab1fb9416ae8856a9260bbe SHA512 40a35eae3c02b09bdfd30f2fa21536f96ed28d42473639b2734a04b750d4497f16cdbd7320fb023a2146473d93395c03a50b314b57620c86b1e17b8aee2cfe68
-EBUILD paramiko-2.4.2.ebuild 1665 BLAKE2B d2d432532407cb4399fbaf18ef85411658cc58993594190f6178ac2d92e8f9b7ecd460babf36facb562a0b910f29b9684ef9c11b65d4fff33182c11c727c623c SHA512 4e8f7e6f0ad6ddbf472a5241caa1bbb5f01706371993ecdaa33179c3876ae0fe9bbbab5c6d29569103a5fac71df0e9e91cf521e8af97e8e161f276f9f295dca6
+EBUILD paramiko-2.4.1.ebuild 1518 BLAKE2B c59af4d2d001f5d565950a93fd462ba01e18fbb3f034b8a21b9833d3a4964477349fe9f1f1cbe22ad4263ea97296b88b180cbc60211f94fb7d17152138627e0e SHA512 4a4a9021b3f76e0340a89d8c8ae6c4973f8481dd2daa0a449f7f7ae8326a9c79bb512811227c1d1c591b62a0f793135480475b17d025b2c4c8df931e0f256f7e
+EBUILD paramiko-2.4.2.ebuild 1672 BLAKE2B 0cf3b93c6ccbd9dc188e0e42fbcf2d810ded48b26cb3399dea710d2307a6bf278c96495ab14b0f83553e916c36727f768443e49cc8bd15fd351c1097bc757c91 SHA512 507a9f2d5b0b166523b23e1ae4881f984d69587c4cdca8611e325cc29fc89bad9ed2094f9eadeb11898811b57bb14928912da527947e94dab12b0c637e775239
 MISC metadata.xml 1306 BLAKE2B 5bf88516d7d34aa0018b00250edddcc3d7044605e59fd9c799775043f2984a071f743994712cbdc009893a01ee9cbd60df85dcd7f644f7dd33e05a426b06391b SHA512 30bbefd00271e8a61c886e638f30aae8aa751dea4ed0e023e50e31d28d528a203c36e80c8a142573a4b39c958be84eca5c7c19986c2eaa86575ad9b3779ef0d1
diff --git a/dev-python/paramiko/paramiko-2.4.1.ebuild b/dev-python/paramiko/paramiko-2.4.1.ebuild
index 7460d9cfdd48..aba3b71c7215 100644
--- a/dev-python/paramiko/paramiko-2.4.1.ebuild
+++ b/dev-python/paramiko/paramiko-2.4.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
 IUSE="doc examples test"
 
 RDEPEND="
diff --git a/dev-python/paramiko/paramiko-2.4.2.ebuild b/dev-python/paramiko/paramiko-2.4.2.ebuild
index fb8e47b707db..42cc0978f990 100644
--- a/dev-python/paramiko/paramiko-2.4.2.ebuild
+++ b/dev-python/paramiko/paramiko-2.4.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
 IUSE="doc examples server test"
 
 RDEPEND="
diff --git a/dev-python/pbr/Manifest b/dev-python/pbr/Manifest
index 79bca2672b5d..9785da032eff 100644
--- a/dev-python/pbr/Manifest
+++ b/dev-python/pbr/Manifest
@@ -3,10 +3,12 @@ DIST pbr-1.10.0.tar.gz 111425 BLAKE2B 2cef589ada2892dd8357ad3248c4b544d58c699d24
 DIST pbr-3.1.1.tar.gz 102665 BLAKE2B 301515d50f8550f5553a29faacb1daef589b41b8116320abd4552bb67886498d89eced1f95e1efdd6ac0511a5587eb479dc9d2963a74e92300463c3c53201e7d SHA512 c01fb83678f8fc3acddc153dd341a17ed9d602b6770f0ff244b1c5b54c37d4ddcbd0c3d726f7d7020865819e02797c1c79a0c15e9ee2ae5c1510fce7112b2a3a
 DIST pbr-4.1.1.tar.gz 108683 BLAKE2B 5c0157ff14590113e7baae0bdca1ff46108a7a10d6eae8bd0a2d06bee62b4aa65eed25c900ae1b67324ac6b416641081c63a274c9694db1877b5d9073c1c04d9 SHA512 ed739901b3a2d1eafa1d4d408a39f1e5d967776571efe0913877145aaccee3114558e107a4e5704403288324c63a08cfbca07a3409bd1baafcbc33105abdf3e4
 DIST pbr-4.2.0.tar.gz 107958 BLAKE2B 716283ceb7b1a8da41e77441c7526bf8cbdb5be7c710013630d3bbddf7de0ce37f3abd063f6103f3ec27fc5c09796f6452d8117df3b533b3c7377bf6dce7d37f SHA512 d46d93333b4d0d3fd5c14e0a474ca7beceddf794a5dbcf66f810993b8d33b48602518072effcd429566f4eede2a38c4aec289df262c2c0e7ab4b82474e14f14d
+DIST pbr-4.3.0.tar.gz 112935 BLAKE2B 460d9f93d66a9381360f3b47beb0fb8a3ffcc21be231e5875019b00d5b60efacd7237c073f9d7850b23aed75ad842fbb6b082d665367dcc5a059b8eb0064641d SHA512 6e87c62ca434a85506f1e9d9e92d29ccccd24484120748fdfae081e3a574a9d9edcd2e3960bd0ecb5d3c8543a919b8b0f829662957ed657693022c8940f76d74
 EBUILD pbr-0.8.2-r1.ebuild 2101 BLAKE2B 4e85eb993ab7e6dc05687c531145441b1627fa61846546bd3c66cc5690bcb1f55b7b49ad0f5dc4cbf86c4e949deb7e66c11e9117a90c7933334477c6eeae6f73 SHA512 bc6d083dadd1d46e7d6f311d43e89e4fef40e7c1a02f826359166c42aa4c075c1336081bea03986519dbc9912785b1f2732326d1bbaa0ddc391c9649356a8b7c
 EBUILD pbr-1.10.0-r1.ebuild 2602 BLAKE2B fcd63f45eba4952178bea076c77e5d6880c27f310a8e2043867bc1f278f5d450f9a75832f90dc482c709d4bad4eadf3c1f150092e546e624a03290fea7390664 SHA512 d516a6d42efebe51e2846721e8292fb402d9ee5a88cea385a281f8f7d828da30c59df9582fac1174c2100f8943b318a52d208d6ee10d294a9a3e915e95c1a589
 EBUILD pbr-3.1.1.ebuild 2828 BLAKE2B 7fc677aa10ce15627e6e6f6857f0d5b1fc336fe139e42b3ff1aa62d2d898eeb6a92a8e7c22e06e5f597025a4ad16e60dfdec60758b6b5f36569bdd67a39566c1 SHA512 58894ca83de7006ee6486d75ee1673c970ccb207d50c84332b215086468e3288b10a38245a92c8a6330f2a26fddd001b70a9d89b8144009459180474774c1cc1
 EBUILD pbr-4.1.1.ebuild 2601 BLAKE2B a2945d95e1ba37c28d86fdd0bff32f0a880c801eeddb2f3f70f6b21fbac7c0bb869021ccb389888c146f5920b7350af1d0c53d34784f9dd0e0934eb937ff1f55 SHA512 c71925bd2db17d18a625ea6510f589c8bf7df9f10031659f7a6c4a63432826639ba6a93c99be229b5f62933051fc00532d53bb0660f89e0d0c804b8bc7af44dc
 EBUILD pbr-4.2.0-r1.ebuild 2747 BLAKE2B b1f4ae987da3a891fe95f9d059b089acb8f75bee89dcfadd981db41de800fdc9432e24530f2f638e0804eef9c0a316244e8b3059074fe797513373d4cfa5640f SHA512 d0cf43215fecf025910e51f22d92fd11501f8d649c31292a1623605f3536552fbb5ecfd84650e8788ec30248ea72c85b8a725a80cda0e4a1207ab8d0ad5318d9
 EBUILD pbr-4.2.0-r2.ebuild 2790 BLAKE2B 7abb3158a404d077fe0742c9ae542db9141b9de42a3c2537ef6ee0bfc7d9f542e2909e3351bdf9a6988cc08603cb24ce07044e49b08ac1f0c438cd8c6320fee5 SHA512 83903d15a678cc80171e0cd49e6bfedaebfa245494d4c2875bc6679d4647e65a816c9f41181f49739fd035b4c93a92a06db899b5a44f0688420035480c111bb5
+EBUILD pbr-4.3.0.ebuild 2787 BLAKE2B f861a99fb83212df43972145b0d2a7b2d182c37322e4d8caec90156d0c515875858027c49c62624ecd9a17234964a3dda6395086da08210aac7e398d0d1900e7 SHA512 4e5f933ecbb05ad987632dc2abd25734e28815c6547fdbaecfe2588a44b75ebd38b12be4ffc4a5921e0066842171ab7184a1a923f44aeb16a54c6bc3a845750c
 MISC metadata.xml 686 BLAKE2B e7638d779ac7aa46c074cf4060bbca595c8e555e972da8b418762bb40237ef0f6d89125f3c0e8f5201a362b2425247ed5a7ecd9d26afe9981f9e51dd005c28fc SHA512 b4bff66d2f42e08f93d723e43bd1b6b32d8bd01a45136a741992af07c11da7fe0db847e46316e5bd237f47cb844fb481e09bff0c6df3d071197686d7dfaa7bc9
diff --git a/dev-python/pbr/pbr-4.3.0.ebuild b/dev-python/pbr/pbr-4.3.0.ebuild
new file mode 100644
index 000000000000..5011d435355b
--- /dev/null
+++ b/dev-python/pbr/pbr-4.3.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Inject some useful and sensible default behaviors into setuptools"
+HOMEPAGE="https://github.com/openstack-dev/pbr"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~hppa ~mips ~s390 ~x86 ~amd64-linux ~x86-linux"
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-fbsd ~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"
+
+# git is needed for tests, see https://bugs.launchpad.net/pbr/+bug/1326682 and https://bugs.gentoo.org/show_bug.cgi?id=561038
+# docutils is needed for sphinx exceptions... https://bugs.gentoo.org/show_bug.cgi?id=603848
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/virtualenv-14.0.6[${PYTHON_USEDEP}]
+		>=dev-python/stestr-2.1.0[$(python_gen_usedep python{2_7,3_4,3_5,3_6})]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+PDEPEND=""
+
+# This normally actually belongs here.
+python_prepare_all() {
+	# This test passes when run within the source and doesn't represent a failure, but rather
+	# a gentoo sandbox constraint
+	# Rm tests that rely upon the package being already installed and fail
+	sed -e s':test_console_script_develop:_&:' \
+		-e s':test_console_script_install:_&:' \
+		-e s':test_sdist_extra_files:_&:' \
+		-e s':test_command_hooks:_&:' \
+		-e s':test_sdist_git_extra_files:_&:' \
+		-i pbr/tests/test_core.py || die
+	sed -e s':test_command_hooks:_&:' \
+		-e s':test_global_setup_hooks:_&:' \
+		-i pbr/tests/test_hooks.py || die
+	rm pbr/tests/test_wsgi.py || die "couldn't remove wsgi network tests"
+	einfo "rogue tests disabled"
+	sed -i '/^hacking/d' test-requirements.txt || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	distutils_install_for_testing
+
+	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}"
+
+	stestr init || die "stestr init failed under ${EPYTHON}"
+	stestr run || die "stestr run failed under ${EPYTHON}"
+}
diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index 3cc72d106bb9..b1691ef7f837 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -1,13 +1,9 @@
 AUX pillow-3.4.2-no-scripts.patch 411 BLAKE2B 79a798be9c7fe578a02f25f86cd658c10be36aee581c5d285f21081c17d48cbe0dbacd1098f65f71c4cab147ef77d18b334780810ad8a6c4534f53da2db83345 SHA512 51ac7df4e9c6b76bbaf20e243cb171f9d824c94e183f4bbe5047c6932efe6913527a0a4d328266a8984d51d07aaa18cbdbb98de92dc8f027a3d392d0355cdd70
-AUX pillow-4.3.0-freetype2.9-test-metrics.patch 553 BLAKE2B a5bfdf7789237b583c464f2cbb7cfdf645a272587337da227eeea98e41312bd2a7b3a7f22c182856577350489a849f52271a395f9799410a7a07f77654629197 SHA512 291ced301ee1938dfa19afc7b57285c57e6722e28f3adca492e390b1ac7a0cda43c58fa19b97cac81d2ed6ef928ccfb51de87e60b035e35f923c1a006e80be64
-AUX pillow-4.3.0-no-qt.patch 893 BLAKE2B c41d8ff63a3da5aadd0c7ebdd0c102e2a136c5feeb2bdab9b4a5a0167457b9bd51b617da94e236179bcd07762359c8692477db3af1f26aa8b373c5d19036cc7c SHA512 e67e670fc26ed438c3d00be91f0549e210692934bbaa3c6789b35178ea6c45412a69ddebebe9ea5f38bd748f7d20e4b6bd4f56277133bb470e44756168808582
-AUX pillow-4.3.0-no-scripts.patch 392 BLAKE2B 1443119f49b0c76c75d17414851e7f54d673b804d8d268fea79fe9fcc4f6361d6d2e70cfc6d855c8c374bcc28b67672778f310f38442502bf5c7096e26bf0bc7 SHA512 500706b3736e17bbfdcf18d2e3038a96ab16a5ba1015fd2ee9332ae11d8f98594ac4c50dd0f7cfd5288703970d20d0a4f3174a8071442893903888d828a2d2da
 AUX pillow-5.2.0-fix-lib-paths.patch 675 BLAKE2B 88c552a5b4db246bd63297ebc9f002aa4ed541cc9521e8f651194609d4040e22375149f1d5ce0957e8d4b69ceb5a5cc425894f7c40ba86db4204de4888528f06 SHA512 7ac1e4611e81cc80fd37dbf348fda1ca2707ca9b28c95c328614b91167ae70e477afd1730a585a2834d31d5826ac68d9816c9ecd227670b81af4e7dea238eef3
 DIST Pillow-3.4.2.zip 11042238 BLAKE2B 334af6eeadb3203b51572eca6ad9c196f3eeac14da0f1aedc351db692b33d413fdf5bc5c8564d2f53c324d9485dbdbda664b75a570b779e24f238c21829b4a39 SHA512 5e05206db5bc1b4177384f7e91ee79015c6e1bbdc7c31c997da054391b9b5ec7c1ebdec258a33f598986533894f3324b03d0b4b385b94e72a0517a3437553b39
-DIST Pillow-4.3.0.tar.gz 13874155 BLAKE2B c2258efe2727adeb7ba370fe30ef9bbabe952a1f6690e7904352884951e648d2c0e2037143b7c71a802ea1a04a2f7827a001621480036e43f6c01a96de3edcf7 SHA512 5811252802bd01ac86157235d42138685e746723df48b67ec7c7ebd3f172532b40cf86ca9d3d792e82f03986303a084bf3491c0d511dc068dea1bc631afdeabb
 DIST Pillow-5.2.0.tar.gz 14499068 BLAKE2B 7111eb8e2911cc197b66bbc06a13459484e2c4a1f5037e4bcf702ea350763b2b758cbeef9749aeb29f1ab64d33081131f7e46a3fbb33fee48e70660f8f75eddb SHA512 2f19512d0573bd4696a5b4d54ff21473492f92705d33bd0994ccd085028d209bfb0031e2b95947c1e8fc9d0b0956cdf1f705c1fbaff39390791cac1708bff22c
+DIST Pillow-5.3.0.tar.gz 15553718 BLAKE2B df93d136fb5a5ea3021a757edea5dfa7b3fc1f7a71b0f64f1d1d11b95a5dafffad98d3f7b28d5e7c07b1c93d154c9c73a688f37771587c91fb7bfb6956079375 SHA512 0596207069a87a645f7694b19ea5100d753dbb7553148fa5982b073e4e1163b5bd83ddf8b1c783a90a0b718576f08d3f15352f2742d46a425cf639de2409c4ab
 EBUILD pillow-3.4.2-r1.ebuild 2498 BLAKE2B b91e53211dfde64340575814d273d6d7afff29ae15689d4f98d411cbfa50b48594b79c0e5faa692c7630dda7955f6cddb3918227c4eaec293e065d28dc98e9e9 SHA512 37f491ebc17403dedeb9a48444ce49c5851a0d6b6a9fc24ba3bd81377133e6671df7b03fa7126d53b366ddd18e2952a445e7ca7b94a93f71743e769a5b1a30c9
-EBUILD pillow-4.3.0-r2.ebuild 2335 BLAKE2B 927d5247c0146ab1a304bdd2985f2606e336b766ec6bcd5718508f0f51b583c27cd8256ce836e7f6100625b36c53ffe11c63cde624d682bff96c45eaa49fa5cd SHA512 4e387bf4d17babe9b33856391a7f66d0849e6d652685faeb8e6afb8770514502ebd5dd10dafd98855891ae1802583b0f8cc51b9a012cc9288146c281eac60d4f
-EBUILD pillow-4.3.0-r3.ebuild 2656 BLAKE2B a5134151a03fdcb4ae3f5e5c5daaa0ec251556ac18fe3b66dc1f8d8ab0be6bfcd571b28f12d98c5ac6740e83941912474b5b5795d9e44b889f9d4f2bca9385d8 SHA512 d32e85250fa166d4d03b437f3ac801d38466878626f6a743e6719295343c6271f067467a78891f8d16c95023851d8e17cf646a9cdd4dfa34bbd2eec54c681023
-EBUILD pillow-5.2.0.ebuild 2726 BLAKE2B 2b0a513576f3dac3ddf69486e6eaa892c90b58f998d2234a114fe96bb0ff98fcd8991bb519623c609531c9d5972e23b17fd86e4604c304a91141806367eecc26 SHA512 15d5dfa2920fffc4d30577f686fcaa74d907d444ee23867aa7286308397ea80c47465a75f712b1a9f62012905c590e32d9ddd362c29e6682194e74ef47488706
+EBUILD pillow-5.2.0.ebuild 2723 BLAKE2B d6ea78cc9c4bcc83d6778397cf441365653bcaa0347ff9392986e5750e186fdfbcd499d53e3dc80f2521008655fc428171fc12301780c63d5b15b358b84602da SHA512 e00fec07dc7fb04064b3de979ccd6ce7cf5f8a96fcba63ccd87dd4b70d09fcd6f4dbdebc2479296d9ad4e1f1b9477922d53267264261e1d01211f865827e41ad
+EBUILD pillow-5.3.0.ebuild 2331 BLAKE2B d453688d152bd345242abd0bc55f51e35ebf8be5fc623cb121287b4ade989021deb10c226a77cfb4dea439df040d1befff2ef176d2ab3511485630d42d640cea SHA512 2799810b31ebf952d513221f81e169b797d774944a539f4a52104e855f3ec9714f7fc1004f6c080664ee26aa0e19ccfb4d459d9277e3bcf172e0936a12613df5
 MISC metadata.xml 590 BLAKE2B 085c6481058e0ccc50934eaef9ee5fe97666c067f847eef8f569af8d5f4f41fe5934d77cdcb0679f24a4ba411bf1885e03c74f365919080e86a4f8a434d2da8a SHA512 13e51fa5ba4ce8e0ed0f81b0a1d16ba8be875a24c9e93dcc87f08724a151c90ff40c8a9e09ee69143dc4400f067a7de90324ddd5a90c8d33b1d818a716194e9a
diff --git a/dev-python/pillow/files/pillow-4.3.0-freetype2.9-test-metrics.patch b/dev-python/pillow/files/pillow-4.3.0-freetype2.9-test-metrics.patch
deleted file mode 100644
index 211ef7ac58d3..000000000000
--- a/dev-python/pillow/files/pillow-4.3.0-freetype2.9-test-metrics.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/Tests/test_imagefont.py
-+++ b/Tests/test_imagefont.py
-@@ -58,6 +58,9 @@ class TestImageFont(PillowTestCase):
-                 ('2', '8'): {'multiline': 6.2,
-                              'textsize': 2.5,
-                              'getters': (12, 16)},
-+                ('2', '9'): {'multiline': 6.2,
-+                             'textsize': 2.5,
-+                             'getters': (12, 16)},
-                 'Default': {'multiline': 0.5,
-                             'textsize': 0.5,
-                             'getters': (12, 16)},
diff --git a/dev-python/pillow/files/pillow-4.3.0-no-qt.patch b/dev-python/pillow/files/pillow-4.3.0-no-qt.patch
deleted file mode 100644
index 231c605b8347..000000000000
--- a/dev-python/pillow/files/pillow-4.3.0-no-qt.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/PIL/ImageQt.py b/PIL/ImageQt.py
-index 36b4e1eb..ddde2cd9 100644
---- a/PIL/ImageQt.py
-+++ b/PIL/ImageQt.py
-@@ -20,24 +20,7 @@ from . import Image
- from ._util import isPath
- from io import BytesIO
- 
--qt_is_installed = True
--qt_version = None
--try:
--    from PyQt5.QtGui import QImage, qRgba, QPixmap
--    from PyQt5.QtCore import QBuffer, QIODevice
--    qt_version = '5'
--except (ImportError, RuntimeError):
--    try:
--        from PyQt4.QtGui import QImage, qRgba, QPixmap
--        from PyQt4.QtCore import QBuffer, QIODevice
--        qt_version = '4'
--    except (ImportError, RuntimeError):
--        try:
--            from PySide.QtGui import QImage, qRgba, QPixmap
--            from PySide.QtCore import QBuffer, QIODevice
--            qt_version = 'side'
--        except ImportError:
--            qt_is_installed = False
-+qt_is_installed = False
- 
- 
- def rgb(r, g, b, a=255):
diff --git a/dev-python/pillow/files/pillow-4.3.0-no-scripts.patch b/dev-python/pillow/files/pillow-4.3.0-no-scripts.patch
deleted file mode 100644
index c30b00d54d70..000000000000
--- a/dev-python/pillow/files/pillow-4.3.0-no-scripts.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-https://bugs.gentoo.org/562682
-
---- a/setup.py
-+++ b/setup.py
-@@ -779,7 +779,6 @@ try:
-           ext_modules=[Extension("PIL._imaging", ["_imaging.c"])],
-           include_package_data=True,
-           packages=find_packages(),
--          scripts=glob.glob("Scripts/*.py"),
-           install_requires=['olefile'],
-           test_suite='nose.collector',
-           keywords=["Imaging", ],
diff --git a/dev-python/pillow/pillow-4.3.0-r3.ebuild b/dev-python/pillow/pillow-4.3.0-r3.ebuild
deleted file mode 100644
index a799e79a1d3a..000000000000
--- a/dev-python/pillow/pillow-4.3.0-r3.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE='tk?,threads(+)'
-
-inherit distutils-r1 eutils virtualx
-
-MY_PN=Pillow
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python Imaging Library (fork)"
-HOMEPAGE="https://python-pillow.org/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples imagequant jpeg jpeg2k lcms qt5 test tiff tk truetype webp zlib"
-
-REQUIRED_USE="test? ( jpeg tiff )"
-
-RDEPEND="
-	dev-python/olefile[${PYTHON_USEDEP}]
-	imagequant? ( media-gfx/libimagequant:0 )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/openjpeg:2= )
-	lcms? ( media-libs/lcms:2= )
-	qt5? ( dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] )
-	tiff? ( media-libs/tiff:0=[jpeg,zlib] )
-	truetype? ( media-libs/freetype:2= )
-	webp? ( media-libs/libwebp:0= )
-	zlib? ( sys-libs/zlib:0= )"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		media-gfx/imagemagick[png]
-	)
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/pillow-4.3.0-no-scripts.patch
-	# can be removed at v5, patch already uptream. See bug 593816.
-	"${FILESDIR}"/pillow-4.3.0-freetype2.9-test-metrics.patch
-)
-
-src_prepare() {
-	if ! use qt5; then
-		# When we don't use qt5, we want to forcibly disable it by patching it
-		# out. Otherwise, we might encounter unexpected problems like in
-		# bug #662236
-		eapply "${FILESDIR}/${PN}-4.3.0-no-qt.patch"
-	fi
-	eapply_user
-}
-
-python_configure_all() {
-	# It's important that these flags are also passed during the install phase
-	# as well. Make sure of that if you change the lines below. See bug 661308.
-	mydistutilsargs=(
-		build_ext
-		--disable-platform-guessing
-		$(use_enable truetype freetype)
-		$(use_enable jpeg)
-		$(use_enable jpeg2k jpeg2000)
-		$(use_enable lcms)
-		$(use_enable tiff)
-		$(use_enable imagequant)
-		$(use_enable webp)
-		$(use_enable webp webpmux)
-		$(use_enable zlib)
-	)
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	"${PYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}"
-	virtx nosetests -vx Tests/test_*.py
-}
-
-python_install() {
-	python_doheader libImaging/*.h
-	distutils-r1_python_install
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	if use examples ; then
-		docinto examples
-		dodoc Scripts/*
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pillow/pillow-5.2.0.ebuild b/dev-python/pillow/pillow-5.2.0.ebuild
index 04ae41085612..2fe691b736fe 100644
--- a/dev-python/pillow/pillow-5.2.0.ebuild
+++ b/dev-python/pillow/pillow-5.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy )
 PYTHON_REQ_USE='tk?,threads(+)'
 
 inherit distutils-r1 virtualx
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp zlib"
 
 REQUIRED_USE="test? ( jpeg tiff )"
diff --git a/dev-python/pillow/pillow-4.3.0-r2.ebuild b/dev-python/pillow/pillow-5.3.0.ebuild
index 25dddfce611f..d05df3d9e900 100644
--- a/dev-python/pillow/pillow-4.3.0-r2.ebuild
+++ b/dev-python/pillow/pillow-5.3.0.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy )
 PYTHON_REQ_USE='tk?,threads(+)'
 
-inherit distutils-r1 eutils virtualx
+inherit distutils-r1 virtualx
 
 MY_PN=Pillow
 MY_P=${MY_PN}-${PV}
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp zlib"
 
 REQUIRED_USE="test? ( jpeg tiff )"
@@ -39,7 +39,7 @@ DEPEND="${RDEPEND}
 		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
 	)
 	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
 		media-gfx/imagemagick[png]
 	)
 "
@@ -47,9 +47,7 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
-	"${FILESDIR}"/pillow-4.3.0-no-scripts.patch
-	# can be removed at v5, patch already uptream. See bug 593816.
-	"${FILESDIR}"/pillow-4.3.0-freetype2.9-test-metrics.patch
+	"${FILESDIR}/${PN}-5.2.0-fix-lib-paths.patch"
 )
 
 python_configure_all() {
@@ -76,20 +74,21 @@ python_compile_all() {
 
 python_test() {
 	"${PYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}"
-	virtx nosetests -vx Tests/test_*.py
+	# no:relaxed: pytest-relaxed plugin make our tests fail. deactivate if installed
+	virtx pytest -vx Tests/test_*.py -p no:relaxed
 }
 
 python_install() {
-	python_doheader libImaging/*.h
+	python_doheader src/libImaging/*.h
 	distutils-r1_python_install
 }
 
 python_install_all() {
 	use doc && local HTML_DOCS=( docs/_build/html/. )
 	if use examples ; then
-		docinto examples
-		dodoc Scripts/*
-		docompress -x /usr/share/doc/${PF}/examples
+		docinto example
+		dodoc docs/example/*
+		docompress -x /usr/share/doc/${PF}/example
 	fi
 	distutils-r1_python_install_all
 }
diff --git a/dev-python/protobuf-python/Manifest b/dev-python/protobuf-python/Manifest
index 42a905ace56d..af262dfe9bb1 100644
--- a/dev-python/protobuf-python/Manifest
+++ b/dev-python/protobuf-python/Manifest
@@ -1,12 +1,11 @@
-AUX protobuf-python-3.5.2-google.protobuf.pyext._message.MessageMeta.patch 886 BLAKE2B 6b629df5af163ad7e5e835ac7d8ea66401d73297e1ffcf1372b6bdc7285efc1e36cde551381e7b3869a4efb0ec1c07a1a019e86cd477dbf24a25e06545dc401e SHA512 da18027859541cca833a8eed311d4da143be5663544bbf64d24a66fc5ba2db06fedb7110e3bd925736029bfe449e170a4aa904ecdc98eb1b7e269d9f5fd4ef04
-DIST protobuf-3.4.1.tar.gz 4490100 BLAKE2B e2bc1ef2ee1a0af44830b3c65a6c9e73883fe6ec0d07f6a6136f5564f0e85306005440ca6f8c4eb834c7c70f909792c9e2457a761f10f95431981263a9acd7a3 SHA512 471e52198fa878a79183dc8fbc39d9c65239be4d9dff799e12281ee9b1af61a427584534b1baae1773bc6e4c86467f89ca2e7911a21effd86bc5f40cc7d94c34
+AUX protobuf-python-3.5.2-google.protobuf.pyext._message.MessageMeta.patch 895 BLAKE2B de1850bb816a6776876a50c19200f757f9610cbfe9263ce2ffa05d33d44ed765f00b7510c57e763c008af34a260530dd4fd21ccc12b19ef531859f2195fd4eb2 SHA512 1b22d0df90bc602469a59f5ef82f8bbe96c164b7ad3c53ef1a7ba9ee97d8334b4e5c9fe7d57cfe2b1edad85d58f4a89095c8eeac370d6bd043c0d8561e00149d
+AUX protobuf-python-3.6.1-python-3.7.patch 2737 BLAKE2B 46feb8144761db8a089ad2e32ed0a906a4151cad62d13c0a541fc321a3affd70f672c61a32b84d4118e1a9ff7ea5562368b17d89d7681d72a24ce5cb97745949 SHA512 8fe0770f11f20b9cde72b5f862ab77ebcdc0f337886ba458fbc2543896ce6b3f659b68e2550040da246260638c5eb918ade535bf7a1b6db61a6da39232cb4de7
 DIST protobuf-3.5.1.1.tar.gz 4584489 BLAKE2B 995ee2f06a6358e9935b488269ee50f0dccede417c1757828b0108fbe8c67034301f3a9cb87517430acd9838ae71bb677f4edd8b59b2418f99c15d8ea3d33591 SHA512 f25ecf772facc8efd196b7c06012ce9ec24152b2c0cde38ed2e29ecded8f534221b008e649f4cbd991436ad3436130cd2e31d51e75019d08240d518111fb4496
 DIST protobuf-3.5.2.tar.gz 4584659 BLAKE2B f582212169d802a5844574eb900c9f8cbb343b7e73f2074e5ff0bfc544ebd13f4bc2b78271fb70f4465d78fdc39972ed68339f453c0d3ffe98d8564fbf520544 SHA512 09d10cf0c07a0ba249428bbf20f5dbed840965fa06b3c09682f286a4dee9d84bb96f3b5b50e993d48ef1f20440531255ce7d0e60a648bf3fe536a5f2b0b74181
 DIST protobuf-3.6.0.1.tar.gz 4483964 BLAKE2B 8afc1e4f4a6eba0eb453fa7cbee8e8ab4986ab9dda39a0005de9d07ec4bd4fd27a5af4ab359b139b4117a5da580be6da3387295266625ee8cc7ec9421c5c0235 SHA512 63cd799d5d6edbb05a87bc07992271c5bdb9595366d698b4dc5476cc89dc278d1c43186b9e56340958aefea2ce23e15a9c3a550158414add868b56e789ceafe4
 DIST protobuf-3.6.1.tar.gz 4485582 BLAKE2B 546c49759df784018459809b9db692c5c94aef5d717183af5cd9edd96b4c658e759f23950cdcd5dddceaaad06ea1de2a2357b9fa8c496ed5d538fc5920174da0 SHA512 1bc175d24b49de1b1e41eaf39598194e583afffb924c86c8d2e569d935af21874be76b2cbd4d9655a1d38bac3d4cd811de88bc2c72d81bad79115e69e5b0d839
-EBUILD protobuf-python-3.4.1.ebuild 1239 BLAKE2B 409fb45bd792c7c47b17388b2dc7315863c8545da671d73acb84de9c1188f12627eab1fb2c90989bd53a939792ee2b787c2088553e979ecc2f3a855f0d01f991 SHA512 039c747447eee20a1eb47a1383838086f911622036372bf051a806ed5ea55c3d5c5f58c97f1d2dc8b91c0929f56725c8942ca18274cec1a5fb7e11212a23211a
-EBUILD protobuf-python-3.5.1.1.ebuild 1232 BLAKE2B 09e1116ab940cf48856c8f86b2a67c8b827c39048641f9cb8a574e945b6b0b13d4db4fee9d65235d474e268750a2b29dfced129067043f0cba35310a40a96127 SHA512 16abc5f227c8456e06ec5452b66d09d6e7f2e119fe73da5827c60a30c0430b69521305db230b0343d11fcace74b4b6cf070a385cbf4bb5700324db27c7fb1d5d
-EBUILD protobuf-python-3.5.2-r1.ebuild 1318 BLAKE2B 0c7e8e8d5be76455a8fadb435c29c0685c83ce3e21a29b4c3f25ecf2045b0c6815ba0098051bc470b51c3c2f9b30cdbdd09c0d8f90d6461727a2272011b28242 SHA512 ac44356bef6a3f3faf84ba334a4c07672a8331a7c68edf42fbc44f016a07215b9aabbd1a273d12f58eeee57a01940eb8f96fba4f0327a9dc4134530a7ccfd466
-EBUILD protobuf-python-3.6.0.1.ebuild 1330 BLAKE2B 740647b8311b43aacb89129795fd9a6250c4eeb6c26d6958f8660c78eabc37c9c6b7622eb2a67dfa20043704eba0369934cd26bb7f592020f09bdbd78b126c13 SHA512 d14066231992885cf95aca6c7270d18bcb39f22b7eea31bab9fee19ddca620e91cb8d65459a055e85022376ee44c9800371338bf5ba7fc78eeddc1e62aa8e08e
-EBUILD protobuf-python-3.6.1.ebuild 1330 BLAKE2B f344dfa24be2f4ac134101f3b99a0b89dbf7ec2bf0d4b1b4fa3ff37af70c0526583b102cde86d997a7608dc855909c9636357dbf2655571027da2b43e9200f20 SHA512 ec52fe01e28bcfd5b052251687df8bf98706133469eddf7d920026fd10449889a8551c787856cc3c630d8041e4aa5e08ccaf90d9e847d4409ddccbc4cc06e4c9
-MISC metadata.xml 647 BLAKE2B a24942cbab04e847c0921371c22ac14ffe05b99c5a75ce99f8413e3c98e0ee5951e03b59faae740bdc0fda56e53ad36ab609fa9e4b19a6975725b4e9bf562d38 SHA512 064197fbb9f4857393236d4b4633aa389df5ebb6ab75c59552adbf80157feb20b3e2b2e5f526002652b12ea5033ea50c9db0ec02804a747fa4305505c715a87e
+EBUILD protobuf-python-3.5.1.1.ebuild 1247 BLAKE2B f7566fc24019d971eb0895f5f5dab2f86688e868d86fea4acb211d5d5f48b843b995dbae96c1eba17044db12c83b50ea402b546351a991960f383f79cc4a1153 SHA512 6d96b5827e4a569d60506570bcfa38796b7e240c85db8aaae215f79841968d13df63eebfed451f1aea8f9412267ea491eca64b776034044a64711951deb4b390
+EBUILD protobuf-python-3.5.2-r1.ebuild 1333 BLAKE2B 9c4dc72f815cd109bf397f4c5ac251f54c53d410682e94369b3a2ab62d084bdf6d1a8627c11096dbedcea565d157d96d428f447035766105b7affa1bc5e23a46 SHA512 b84fca10588e8faac8c4bc95e50d7a39a67e919e0c4a28c751f8dba9a7b421435a0b2df77d5989862d4d63441a4625af3b75b6ef59814f3d41d5da2906ea6eb4
+EBUILD protobuf-python-3.6.0.1.ebuild 1345 BLAKE2B 33781333a986e3212e68b01b0858eaf1c814559ddcc32793ef525199cfc4166de4238b1f488a3db6a4c3766d2873f0fd38a1e4ea6e602d25c3b790e616059ad2 SHA512 ccc326eccb38f08ef9f7f314ce0ab62cc6e00019a1869e7f9bc65fcf68bea23ccbc9adfec838f2bbef5daead1811a607903272e367900dfd0cb99c4024e53281
+EBUILD protobuf-python-3.6.1.ebuild 1404 BLAKE2B 4a860891db48d64b9527a508ee07341e75611d6b61b8a6f2fa6d0d77271eb60937796d9bbac8183a0b25b1e416b2498ea71d52a31e793d7c5f76890167ac50fc SHA512 3f66a54d7a3454cfcb0ea891f0b3def6497d7bf1f3bf620be53ed3f52d1110857c6cb0a2d25be6a62a37e67194e7b9b65232352abdbf9b1ce71b51e8a0b7dd65
+MISC metadata.xml 656 BLAKE2B e63db63e247b105b51b506a404d8edc821cc0ccc276a3f813df3b06951184218e736e57b577ad2f64880250c55ef09c50a9fe04428f7cec02fb04293c337175a SHA512 5d747585e025672d423690fa2d8df09380a1714c2e0adad5838a41f099e3984b70c7f80c5873ea296101898cd92dea70edee964bf01b9d86acb9a1d0140169fd
diff --git a/dev-python/protobuf-python/files/protobuf-python-3.5.2-google.protobuf.pyext._message.MessageMeta.patch b/dev-python/protobuf-python/files/protobuf-python-3.5.2-google.protobuf.pyext._message.MessageMeta.patch
index d1e1d745ab7c..c29da40ca261 100644
--- a/dev-python/protobuf-python/files/protobuf-python-3.5.2-google.protobuf.pyext._message.MessageMeta.patch
+++ b/dev-python/protobuf-python/files/protobuf-python-3.5.2-google.protobuf.pyext._message.MessageMeta.patch
@@ -1,4 +1,4 @@
-https://github.com/google/protobuf/pull/4365
+https://github.com/protocolbuffers/protobuf/pull/4365
 
 --- /python/google/protobuf/pyext/message.cc
 +++ /python/google/protobuf/pyext/message.cc
diff --git a/dev-python/protobuf-python/files/protobuf-python-3.6.1-python-3.7.patch b/dev-python/protobuf-python/files/protobuf-python-3.6.1-python-3.7.patch
new file mode 100644
index 000000000000..bd4ce9d7fcaf
--- /dev/null
+++ b/dev-python/protobuf-python/files/protobuf-python-3.6.1-python-3.7.patch
@@ -0,0 +1,67 @@
+https://github.com/protocolbuffers/protobuf/pull/4862
+https://github.com/protocolbuffers/protobuf/commit/0a59054c30e4f0ba10f10acfc1d7f3814c63e1a7
+
+--- /python/google/protobuf/pyext/descriptor.cc
++++ /python/google/protobuf/pyext/descriptor.cc
+@@ -56,7 +56,7 @@
+   #endif
+   #define PyString_AsStringAndSize(ob, charpp, sizep) \
+     (PyUnicode_Check(ob)? \
+-       ((*(charpp) = PyUnicode_AsUTF8AndSize(ob, (sizep))) == NULL? -1: 0): \
++       ((*(charpp) = const_cast<char*>(PyUnicode_AsUTF8AndSize(ob, (sizep)))) == NULL? -1: 0): \
+        PyBytes_AsStringAndSize(ob, (charpp), (sizep)))
+ #endif
+ 
+--- /python/google/protobuf/pyext/descriptor_containers.cc
++++ /python/google/protobuf/pyext/descriptor_containers.cc
+@@ -66,7 +66,7 @@
+   #endif
+   #define PyString_AsStringAndSize(ob, charpp, sizep) \
+     (PyUnicode_Check(ob)? \
+-       ((*(charpp) = PyUnicode_AsUTF8AndSize(ob, (sizep))) == NULL? -1: 0): \
++       ((*(charpp) = const_cast<char*>(PyUnicode_AsUTF8AndSize(ob, (sizep)))) == NULL? -1: 0): \
+        PyBytes_AsStringAndSize(ob, (charpp), (sizep)))
+ #endif
+ 
+--- /python/google/protobuf/pyext/descriptor_pool.cc
++++ /python/google/protobuf/pyext/descriptor_pool.cc
+@@ -48,7 +48,7 @@
+   #endif
+   #define PyString_AsStringAndSize(ob, charpp, sizep) \
+     (PyUnicode_Check(ob)? \
+-       ((*(charpp) = PyUnicode_AsUTF8AndSize(ob, (sizep))) == NULL? -1: 0): \
++       ((*(charpp) = const_cast<char*>(PyUnicode_AsUTF8AndSize(ob, (sizep)))) == NULL? -1: 0): \
+        PyBytes_AsStringAndSize(ob, (charpp), (sizep)))
+ #endif
+ 
+--- /python/google/protobuf/pyext/extension_dict.cc
++++ /python/google/protobuf/pyext/extension_dict.cc
+@@ -53,7 +53,7 @@
+   #endif
+   #define PyString_AsStringAndSize(ob, charpp, sizep) \
+     (PyUnicode_Check(ob)? \
+-       ((*(charpp) = PyUnicode_AsUTF8AndSize(ob, (sizep))) == NULL? -1: 0): \
++       ((*(charpp) = const_cast<char*>(PyUnicode_AsUTF8AndSize(ob, (sizep)))) == NULL? -1: 0): \
+        PyBytes_AsStringAndSize(ob, (charpp), (sizep)))
+ #endif
+ 
+--- /python/google/protobuf/pyext/message.cc
++++ /python/google/protobuf/pyext/message.cc
+@@ -79,7 +79,7 @@
+     (PyUnicode_Check(ob)? PyUnicode_AsUTF8(ob): PyBytes_AsString(ob))
+   #define PyString_AsStringAndSize(ob, charpp, sizep) \
+     (PyUnicode_Check(ob)? \
+-       ((*(charpp) = PyUnicode_AsUTF8AndSize(ob, (sizep))) == NULL? -1: 0): \
++       ((*(charpp) = const_cast<char*>(PyUnicode_AsUTF8AndSize(ob, (sizep)))) == NULL? -1: 0): \
+        PyBytes_AsStringAndSize(ob, (charpp), (sizep)))
+   #endif
+ #endif
+@@ -1529,7 +1529,7 @@
+     return NULL;
+   }
+ #else
+-  field_name = PyUnicode_AsUTF8AndSize(arg, &size);
++  field_name = const_cast<char*>(PyUnicode_AsUTF8AndSize(arg, &size));
+   if (!field_name) {
+     return NULL;
+   }
diff --git a/dev-python/protobuf-python/metadata.xml b/dev-python/protobuf-python/metadata.xml
index 51258826e2f9..0b20fcb3732e 100644
--- a/dev-python/protobuf-python/metadata.xml
+++ b/dev-python/protobuf-python/metadata.xml
@@ -17,6 +17,6 @@
 		<subslots>Soname version number of Protobuf</subslots>
 	</slots>
 	<upstream>
-		<remote-id type="github">google/protobuf</remote-id>
+		<remote-id type="github">protocolbuffers/protobuf</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/protobuf-python/protobuf-python-3.4.1.ebuild b/dev-python/protobuf-python/protobuf-python-3.4.1.ebuild
deleted file mode 100644
index 53518134445d..000000000000
--- a/dev-python/protobuf-python/protobuf-python-3.4.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-# pypy fails tests; pypy3 fails even running tests
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Google's Protocol Buffers - Python bindings"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/google/protobuf"
-SRC_URI="https://github.com/google/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/14"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE=""
-
-DEPEND="${PYTHON_DEPS}
-	~dev-libs/protobuf-${PV}
-	dev-python/namespace-google[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	!<dev-libs/protobuf-3[python(-)]"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/protobuf-${PV}/python"
-
-python_configure_all() {
-	mydistutilsargs=(--cpp_implementation)
-}
-
-python_compile() {
-	python_is_python3 || local -x CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
-	distutils-r1_python_compile
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	find "${D}" -name "*.pth" -delete || die
-}
diff --git a/dev-python/protobuf-python/protobuf-python-3.5.1.1.ebuild b/dev-python/protobuf-python/protobuf-python-3.5.1.1.ebuild
index 7a43298fb9cf..4dfa6381d438 100644
--- a/dev-python/protobuf-python/protobuf-python-3.5.1.1.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.5.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -8,8 +8,8 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Google's Protocol Buffers - Python bindings"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/google/protobuf"
-SRC_URI="https://github.com/google/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
+HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
+SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/15"
diff --git a/dev-python/protobuf-python/protobuf-python-3.5.2-r1.ebuild b/dev-python/protobuf-python/protobuf-python-3.5.2-r1.ebuild
index 76198330da15..7a1fc1c5c3cc 100644
--- a/dev-python/protobuf-python/protobuf-python-3.5.2-r1.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.5.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -7,8 +7,8 @@ PYTHON_COMPAT=(python2_7 python3_{4,5,6})
 inherit distutils-r1
 
 DESCRIPTION="Google's Protocol Buffers - Python bindings"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/google/protobuf"
-SRC_URI="https://github.com/google/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
+HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
+SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/15"
diff --git a/dev-python/protobuf-python/protobuf-python-3.6.0.1.ebuild b/dev-python/protobuf-python/protobuf-python-3.6.0.1.ebuild
index 9b40e02cbb3d..d625650122cb 100644
--- a/dev-python/protobuf-python/protobuf-python-3.6.0.1.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.6.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -7,8 +7,8 @@ PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
 inherit distutils-r1
 
 DESCRIPTION="Google's Protocol Buffers - Python bindings"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/google/protobuf"
-SRC_URI="https://github.com/google/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
+HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
+SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/16"
diff --git a/dev-python/protobuf-python/protobuf-python-3.6.1.ebuild b/dev-python/protobuf-python/protobuf-python-3.6.1.ebuild
index 7129c197b7ec..3d8397734fcd 100644
--- a/dev-python/protobuf-python/protobuf-python-3.6.1.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.6.1.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6,3_7})
 
 inherit distutils-r1
 
 DESCRIPTION="Google's Protocol Buffers - Python bindings"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/google/protobuf"
-SRC_URI="https://github.com/google/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
+HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
+SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/17"
@@ -27,6 +27,7 @@ S="${WORKDIR}/protobuf-${PV}/python"
 
 python_prepare_all() {
 	eapply -p2 "${FILESDIR}/${PN}-3.5.2-google.protobuf.pyext._message.MessageMeta.patch"
+	eapply -p2 "${FILESDIR}/${PN}-3.6.1-python-3.7.patch"
 	distutils-r1_python_prepare_all
 }
 
diff --git a/dev-python/pycryptopp/Manifest b/dev-python/pycryptopp/Manifest
index 0cc4a9078c21..e6d9d75d6c79 100644
--- a/dev-python/pycryptopp/Manifest
+++ b/dev-python/pycryptopp/Manifest
@@ -1,5 +1,6 @@
+AUX pycryptopp-0.7.1-abi-change.patch 1777 BLAKE2B c37989ae1e9d2000208bf7d74a9a06953d2273db1ecd976d0726513fe0f74fa5c2fae858e56163929d15fbde7464c8320ce2a9a8d040a39050a7d72ba74efdfd SHA512 cc0730806c637d105c35beaa19c546c31a92126481eba087ae7e055ab794ab8bb3a926f862ae7fc75e9b505c8a2612db3e26dd104046c2503889e1aa9b6614e0
 DIST pycryptopp-0.6.0.1206569328141510525648634803928199668821045408958.tar.gz 2009822 BLAKE2B bf25b9049d131b197352138624cc8d393e8b3b33f76e53b1087ded5cdbb365286d0db692a03eaf8c117981e95d1e2074dbbe49daeeba098c3f4a42e9625365e2 SHA512 bdd7d983bc0f8ef50c140a8da0c532883f0f1461d4a91d2761c872403133e9474d4fdbd78e275adbaacd2066cab4121034002a4730258162a618b3af913fdf7a
 DIST pycryptopp-0.7.1.869544967005693312591928092448767568728501330214.tar.gz 1992756 BLAKE2B 7b458d3143ad4b4d2a3f6dc385241f6ea224429c1b7e56d431dc11134ed12a8bf0c5420e079ab8f62db6fb405e10fb0edcd7bf3d18200445f258834970ac44dd SHA512 8b5996badedcd32345818f95e26487ac938c10e1790495515c74816075261a4fcedd2f80c55beddbdea54ed8899bc7c7b1a192468cb3cf434c50f9a68b65cc25
 EBUILD pycryptopp-0.6.0.ebuild 954 BLAKE2B 6a62771d8707a9cdbc9293cd548406a402f6dc3a462c14cb75bf74e143b20c1202f4f3ecab1f7ca3e95e5e782a5fc03f60a484450cc57976f9290414414c3f77 SHA512 05eb4ddcebc65fb36067867c0cca0c3be573acb5ca3e4829929539a704036058aac20ae94470a9dd3a256f2c64bd7e87352d80e13322b492f4c9db0ab8b32e5f
-EBUILD pycryptopp-0.7.1.ebuild 955 BLAKE2B aaa6f1b64fe35c69158d2eeb5f0c82ea1490a4fcb76095e3b79d7e0a3fcd757109d57839117945b6eb9579653877b86e3cc891cb86379d11df4dde5338bd4b75 SHA512 5d6208832b0c0f10c19fbf05156783ca4a3e748d41d9654e68fc2ad628fe3166612d2aa862c1a9d883b7540c0a486688d413c083aab670d9d2b2247937a69c41
+EBUILD pycryptopp-0.7.1-r1.ebuild 1008 BLAKE2B 620941a0714191bce4d62ee91b852db53ee67ca6f49e064c6b488fc1f2fd73996c52d8a723a24672fb735e7a3a88ada4a9ac3363941521effd3d667dca6f0d31 SHA512 0413078388c6530cc506a477a8fd108ec8b477e8984dae72c3f93da8082a1e4c5a4edb58e0331f2ea9eee6fa5f572a81905d7701f0e43b52a4a35659e04d8cd6
 MISC metadata.xml 313 BLAKE2B 436153bae6b5708f1ec47d315a12328ea8ca013e983787fd41cf319ad4d92a934fef3492d13cd79caa44e6f5dc415eed4f06bcf6590e694bdb3e04eba7e41d2d SHA512 43f568076f481a7172565b251b4e5cd08567a2a0ec204713f9f1d892331d70be656694df66f47961289a99f0aac72733e75d3689054dd88dd52a6d055e19c0dc
diff --git a/dev-python/pycryptopp/files/pycryptopp-0.7.1-abi-change.patch b/dev-python/pycryptopp/files/pycryptopp-0.7.1-abi-change.patch
new file mode 100644
index 000000000000..d6edd2ecc630
--- /dev/null
+++ b/dev-python/pycryptopp/files/pycryptopp-0.7.1-abi-change.patch
@@ -0,0 +1,55 @@
+https://github.com/tahoe-lafs/pycryptopp/issues/42
+
+--- old/src/pycryptopp/cipher/aesmodule.cpp
++++ old/src/pycryptopp/cipher/aesmodule.cpp
+@@ -20,6 +20,8 @@
+ #include <src-cryptopp/aes.h>
+ #endif
+ 
++typedef unsigned char byte;
++
+ static const char*const aes___doc__ = "_aes counter mode cipher\n\
+ You are advised to run aes.start_up_self_test() after importing this module.";
+ 
+--- old/src/pycryptopp/cipher/xsalsa20module.cpp
++++ old/src/pycryptopp/cipher/xsalsa20module.cpp
+@@ -16,6 +16,8 @@
+ #include <src-cryptopp/salsa.h>
+ #endif
+ 
++typedef unsigned char byte;
++
+ static const char* const xsalsa20__doc__ = "_xsalsa20 cipher";
+ 
+ static PyObject *xsalsa20_error;
+--- old/src/pycryptopp/hash/sha256module.cpp
++++ old/src/pycryptopp/hash/sha256module.cpp
+@@ -21,6 +21,8 @@
+ #include <src-cryptopp/filters.h>
+ #endif
+ 
++typedef unsigned char byte;
++
+ static const char*const sha256___doc__ = "_sha256 hash function";
+ 
+ static PyObject *sha256_error;
+--- old/src/pycryptopp/publickey/rsamodule.cpp
++++ old/src/pycryptopp/publickey/rsamodule.cpp
+@@ -87,7 +87,7 @@
+ VerifyingKey_serialize(VerifyingKey *self, PyObject *dummy) {
+     std::string outstr;
+     StringSink ss(outstr);
+-    self->k->DEREncode(ss);
++    self->k->GetMaterial().Save(ss);
+     PyStringObject* result = reinterpret_cast<PyStringObject*>(PyString_FromStringAndSize(outstr.c_str(), outstr.size()));
+     if (!result)
+         return NULL;
+@@ -216,7 +216,7 @@
+ SigningKey_serialize(SigningKey *self, PyObject *dummy) {
+     std::string outstr;
+     StringSink ss(outstr);
+-    self->k->DEREncode(ss);
++    self->k->GetMaterial().Save(ss);
+     PyStringObject* result = reinterpret_cast<PyStringObject*>(PyString_FromStringAndSize(outstr.c_str(), outstr.size()));
+     if (!result)
+         return NULL;
diff --git a/dev-python/pycryptopp/pycryptopp-0.7.1.ebuild b/dev-python/pycryptopp/pycryptopp-0.7.1-r1.ebuild
index 3a4257ebfa77..400c5ec5bc83 100644
--- a/dev-python/pycryptopp/pycryptopp-0.7.1.ebuild
+++ b/dev-python/pycryptopp/pycryptopp-0.7.1-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="6"
 PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1 vcs-snapshot
@@ -25,6 +25,8 @@ DEPEND="${RDEPEND}
 
 DOCS="NEWS.rst"
 
+PATCHES=( "${FILESDIR}"/${PN}-0.7.1-abi-change.patch )
+
 S="${WORKDIR}/${MY_P}"
 
 python_prepare_all() {
diff --git a/dev-python/pyftpdlib/Manifest b/dev-python/pyftpdlib/Manifest
index e247ae22eb99..1c61717f4e67 100644
--- a/dev-python/pyftpdlib/Manifest
+++ b/dev-python/pyftpdlib/Manifest
@@ -3,5 +3,5 @@ DIST pyftpdlib-1.5.3.tar.gz 183189 BLAKE2B dd563f59ff21b2059e1c6d6ac6015561d5e0d
 DIST pyftpdlib-1.5.4.tar.gz 184986 BLAKE2B 6973b1f7e0fc0c89eb5d79e082690a706b56553ad4b2ece68a8216bb99c185d770475e349402ec71baf1bb06e5ecca5be2a3c52512f0d8283c4cc249bc28a949 SHA512 6eb308021dad28c1c51a88b366947a71b7bc1802571dc14cedf3a264bd0cb8504ef990d7e3110d10709f971d4d5b0001bee859b58fb4d02a1b0d46532acc9295
 EBUILD pyftpdlib-1.5.1.ebuild 1298 BLAKE2B 2b6ff8c9de74fc7e94720c6deecc32ac2303674f80230b7b2823f43c84755153f69d6c3254264a5b1f41ead167227b71fabca1341549765b045679686d9df1f8 SHA512 5c44d3dcb62a9b72e4773bb5eef46b69576924367db85de5a73977f187d0cf5c8023c0756b913dcc238d6e3ba16f62a06355fd74463bfbe716a900aa3eb86468
 EBUILD pyftpdlib-1.5.3.ebuild 1556 BLAKE2B 06acd30f37ed3409d5919bdb11cd0b85a38714ccc2c1cf87ec9af1565f848a80f7fe0bba91529b0719a19303073c75fd855e48e66ba46bc8eb704599225f9cd1 SHA512 dcc8187355c079c8d6f6e9ba485b2b07a4f1f0e0f6ff8bb22e0932d953b55b7c01f2dfde5f815dc868fe8e826c163a72d2c300d9cbb0c1aa48b39cc175a399d2
-EBUILD pyftpdlib-1.5.4.ebuild 2536 BLAKE2B 912454d4d019c0efcca4e8a1805050e650172b1f64ace54025be850b3dcb2215febab95e8f71928886d1678675e352db1090be135f5b79b5b101f1d9feb6d257 SHA512 93e045cd4730a84e035f5e75588d637718b1a160dd5f7303ab71407ea84e93ad8a1206ba2c4658b646c8be27e98efe950132fb36d3911ef075b3087df67d3668
+EBUILD pyftpdlib-1.5.4.ebuild 2529 BLAKE2B 0d2be096e13b7d76c204d7c441a4b2ccf41104066da347538ec458a7a2a4a482166fc59bee47ad65c41311d32bc28cb29ffff067ce37e6b3034da2c34cc866dc SHA512 bf67bfe6733a3f432a81c5c1d68284aec3c69e80fdac90c62381339c765581edb25abc8a01398104bcc5883021161b7aed918d0ad8ea1827f4a5b56cf0b64386
 MISC metadata.xml 438 BLAKE2B 0e0860eb9d885ec9b432b504bef6a9394cf4a2d6d99751c80fec8441d8910f8a17364e5f32782638ac689abf5cdd3ebcb5fa20e7da3d612a5e8844e8c8a34d76 SHA512 a748827370b53c94fed352cd6bbd7468a22c7ca2f15c4601c98a2689e3a7e652ed28434bcd125fe0f3018d5508600df03130c18d7d67834b28ac0c3480b16345
diff --git a/dev-python/pyftpdlib/pyftpdlib-1.5.4.ebuild b/dev-python/pyftpdlib/pyftpdlib-1.5.4.ebuild
index b34a8629054b..1633ef26aff6 100644
--- a/dev-python/pyftpdlib/pyftpdlib-1.5.4.ebuild
+++ b/dev-python/pyftpdlib/pyftpdlib-1.5.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -64,9 +64,10 @@ python_test() {
 		test_nlst
 	)
 	skipped_tests=${skipped_tests[@]/%/ or}
-	# Don't load the relaxed plugin, see https://bugs.gentoo.org/661082
-	py.test --ignore ${PN}/test/test_misc.py -k "not (${skipped_tests% or})" \
-		-p no:relaxed || die "Tests failed with ${EPYTHON}"
+	# Tests fail with TZ=GMT, see https://bugs.gentoo.org/666623
+	TZ=UTC+1 pytest -vv \
+		--ignore ${PN}/test/test_misc.py -k "not (${skipped_tests% or})" \
+			|| die "Tests failed with ${EPYTHON}"
 }
 
 python_install_all() {
diff --git a/dev-python/pygit2/Manifest b/dev-python/pygit2/Manifest
index cfecf3c372f0..804ef65e28a4 100644
--- a/dev-python/pygit2/Manifest
+++ b/dev-python/pygit2/Manifest
@@ -1,7 +1,5 @@
 DIST pygit2-0.26.4.tar.gz 477318 BLAKE2B d17ef799ff3eab3629194fe0fe90dcc335e40509c13f53bc8f8e0b01e93dc838ca474a5e4ef44c9be2eac7d08e98c735820e936cbbcb7f398f76f9732954bc69 SHA512 e459e47bfa8137421625633a731d49882d95a52d4f2d672f2c8efe7cd6cca4b33335ee77777a353b309df4917d9b29b30c1f9a96b7e226e3e7fe0cd34bbefce6
-DIST pygit2-0.27.1.tar.gz 477820 BLAKE2B e4db7bfa484c28130ce48a2b23a0af26a715d15a789998001182f7d5c426a7f0d432d8e6f598346ce417b2c3532eb2a3407ebcfd9d48723a1e6359a30574d46c SHA512 9d889c13ad55e6c65e24b334f114f7d23b90961ae21c5b1f7bd8d85d44686f7ee8e98c13026c612c9a5feb500a54cf77bfa1e2bd165c657b58d879511622e6f7
 DIST pygit2-0.27.2.tar.gz 477237 BLAKE2B 68fc1e9d9456e4a9d6eaaf00963d02704282de2a9deb1af946ee0c7c69be22fc904b8e80fe243987a3dddb9a0e5365fdf5e336b9dca829dcd9843c2035db42c9 SHA512 f6578a3694babe7837a5ccc4c99e2fa1827b5f67815f2cac6f3b3d0498d94a0ffeb55d3c6e9c9417d47ecbf0ad9a10302e3b59ea0d2e9eec6d9da8426b10175b
 EBUILD pygit2-0.26.4.ebuild 626 BLAKE2B a077ae59833c4adb59a9a2c8eb7c37cc091478d31867e09cf3ae4949231b7f30c0dd605d47009fa40098a8b58277bdd74a744d46f5a38a08a5e2ed0e6e991cf6 SHA512 3c04ded6c6012968dfcf4a36e4c3ac5eec95cab7f558c0fc9574bc1a4ced5b93b1287291bdd84b36c8071ec2394593f70091978eed20091787ec2f53dee15a75
-EBUILD pygit2-0.27.1.ebuild 630 BLAKE2B 414ed5be58f09b29a1948e1d9dd6d13e85a202f1b1187f714aa81cd92ae08ea0611419bf12b3dbd48d375d9f248ea3eaea793464e0724be957ce7a0842669e6f SHA512 bc4509411610f5e03f0ded91332cd5dae987b446bf7ff5346bacb37a2ca5c02a7e868db5b13be7bcd2656585c24dd890e1306cc41d429b82e2772793cea3e213
 EBUILD pygit2-0.27.2.ebuild 739 BLAKE2B a5c0508833bed48cccba3a63fd37f5c3f5d6e0e59773d2ff03f9b7a5f9c13dff9db506b0d505facc72db50ec589b43dc554b69f814ace442a565da3daa4ae236 SHA512 5c60050093502af5dfd107e94a892c06b3cacfeb9eec3c857fb2eabe4638f34f2dbc52b51b6bc13c9867a0caf57271f20795a518ac18318c1e65b2f523d3b100
 MISC metadata.xml 489 BLAKE2B 3733ff314640ab2cbfa07e0ea67041ddb3635b51d339070abe97c95b5b358851b412cca5d8996dc1f25abb986a03095f19e8a50cbaeab7eb156c6b9107108cf6 SHA512 d20b7ebbdb3ea2ec72c3c5ded9874b7506b3ddabb43dbf329891478fcf5d7c4b9487ab0675d735733f463dd897dd5cdcc28080ad597f4f838bbcaa565c26915e
diff --git a/dev-python/pygit2/pygit2-0.27.1.ebuild b/dev-python/pygit2/pygit2-0.27.1.ebuild
deleted file mode 100644
index 5cbd6a17c976..000000000000
--- a/dev-python/pygit2/pygit2-0.27.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
-
-inherit distutils-r1 eapi7-ver
-
-DESCRIPTION="Python bindings for libgit2"
-HOMEPAGE="https://github.com/libgit2/pygit2 https://pypi.org/project/pygit2/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	=dev-libs/libgit2-$(ver_cut 1-2)*
-	>=dev-python/cffi-1.0:=[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-python_test() {
-	esetup.py test --args='-v'
-}
diff --git a/dev-python/pynacl/Manifest b/dev-python/pynacl/Manifest
index 515ad8a02aa7..e2a9a62887a6 100644
--- a/dev-python/pynacl/Manifest
+++ b/dev-python/pynacl/Manifest
@@ -3,5 +3,5 @@ DIST pynacl-1.2.0.tar.gz 3301645 BLAKE2B 7309409d7913bf1dee690a6fba5dd490de7a5cd
 DIST pynacl-1.2.1.tar.gz 3302051 BLAKE2B 96278368427c2b5f1d9508a5d9a36853a9c50390ee3ada20d6344e4f7f67fb3f1285c45794b863f129b48feff8a5a3d4a20796f69e832cec2aef26f27961d925 SHA512 15a3a84fed4d002072c185ca346c708ed0fb397ca3a8d0144caced635cc2e00e19603767cf9fcedc571cb4bf32c546141094ce44536dd117c3775efb2fc589b9
 EBUILD pynacl-1.1.2.ebuild 865 BLAKE2B 7f1f6c7a037719c5e94cd46eaf9c32c2949b64f3371af5a2254da8dacdd0633bfb5d0a8fe0f8f131214499d186510f48c89ffd6c9c395ea839d47825477409cc SHA512 57a53e92e4d562a826f8dafbc9691f92beca1aa6c112eec0519dafd46efb51962c0214b7733240aef2657f612d2fd3cd1129fc0c3efc7fb82838e06f4822d523
 EBUILD pynacl-1.2.0.ebuild 861 BLAKE2B 50369302f5b01db8e932ae94c6e41fce814b3c446910fde9aed2ba92e067d10e642cbddfe2e55b79311308b5dc71f98123a5e5926de18a2336b1632226b786cb SHA512 65695f94648eaafb6c163f3f10e221a0c7e1523dba6a15ca831f2387952d13a7b17327840ea2af7283b9ce1d13b2bd9512e72b1bc942d4885b93061c4f204d32
-EBUILD pynacl-1.2.1.ebuild 1000 BLAKE2B b2e14ebf3685d7335b302ac979f999c7f83786cc951add894ba3ecc520aa43ec01cf91d70cf9d09d8e34280e605da728b674121b06cd4ac61392c8d586fb9bb1 SHA512 ac10bb5b7743dcacf868815cf78028c26362a2fa2ea2b7612c0d0d44a8b60219d655dd86c74204bc531a81c4639619cb135dcb6574d76d973813700a91d2fbf2
+EBUILD pynacl-1.2.1.ebuild 1000 BLAKE2B f9e2146586401d230c35cb66dd1e44826d764a6e04437905a289576e91cbb15517bad4e76fbaa90dab20e48005a25b325fdbaacaec15edcb282e608a4bdc782a SHA512 179ec01a1d9f2d4bbb72e231de0cb54d69670ac52d587f1616718501928483d9451cd8fd7ddc67589e2996b09721f5f742b5e09d45b9b1c280c34d76389c167d
 MISC metadata.xml 831 BLAKE2B 39b921264053f9a7f18d9313daf7f3ef6e560eae777917098d8df976e3b9aede850f5073c190a9668440a487f7ac8fe2b6c1535271bb028596da0f3657ee0292 SHA512 8ae9c64a9477e03a593f40e4b5e3fe42adf2e80ab071b63be273c4cb548fef79f5e80ffcdb88786a6703dd28b8254ddd53428854419b669ca71322f7be775e27
diff --git a/dev-python/pynacl/pynacl-1.2.1.ebuild b/dev-python/pynacl/pynacl-1.2.1.ebuild
index 7d9759f68b5e..c2cf1214fc3b 100644
--- a/dev-python/pynacl/pynacl-1.2.1.ebuild
+++ b/dev-python/pynacl/pynacl-1.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pyca/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~s390 x86 ~amd64-fbsd"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pypy-bin/Manifest b/dev-python/pypy-bin/Manifest
index ef982a5c9759..fe1111d61e79 100644
--- a/dev-python/pypy-bin/Manifest
+++ b/dev-python/pypy-bin/Manifest
@@ -15,6 +15,16 @@ DIST pypy-bin-6.0.0-amd64+bzip2+jit+libressl+ncurses.tar.lz 12940199 BLAKE2B c37
 DIST pypy-bin-6.0.0-amd64+bzip2+jit+ncurses.tar.lz 12932560 BLAKE2B 97693b27ce350dd35103cf6176e7113503f790de1fc498810bfd23ed70f324fb148f801ec3d5ffcc1c578d49098ff7c4353da10509c0d56a2f3c6c4dad0a0dfa SHA512 03db8101a5aa288eb59b73d849ca0767a2b6cdffe1bfecb5f4ee5a70ceb7d73c4e1ca9be06424e18e62c2939b07c152bad1c762a9d209faa8bac9b91c48b4317
 DIST pypy-bin-6.0.0-amd64+bzip2+libressl+ncurses.tar.lz 7466895 BLAKE2B e199b8330dd4ac2acfe668fd19b2900843c96de961b3ea2fc418ec71c289c98d9c505cd42581e726179441dc877feb7eb57b89ee63c8ec00895302dacb039fbe SHA512 560886744633197abf14c21fb872f41d3d614427861045d6654c72b940e7b16996af4077ef9d531cfecc28c3e65dc64e2db149fe23c370aa8ee446dd5b0359e8
 DIST pypy-bin-6.0.0-amd64+bzip2+ncurses.tar.lz 7547568 BLAKE2B 713cd16e54cdab7e25c091db931a760f51de990bf53e566b711754c5a705507257f1c54abc5f85aba7b2449f6d3967e820d14f55953a3880e7bac3eb028db203 SHA512 e8efb0af8e8ef89c95e5fe73b177f34b9120a172e0af7e52990e428e498e3b84b31eba3dfaa28bffcb121625b5494eaeec71af2a2fa46d6b888c148ca162836b
+DIST pypy-bin-6.0.0-ffi7-amd64+bzip2+jit+libressl+ncurses.tar.lz 13018301 BLAKE2B b851ec3e73d4203a4c1eece2cf81dada7cc2b8f7047c9f4e06bd4f24008c1650d95fbd29697fafbdbed953d19595c8e77143a7bd9c8306ab3a15b2c62be48bcf SHA512 8edaf5fdad14886f4120358066fbb09be17d2b7f10dd7600f256a3f3d4b66c90502b85e8a500a70113135ce408ae2877296e1a9cb82d06ae0d031db26e09066c
+DIST pypy-bin-6.0.0-ffi7-amd64+bzip2+jit+ncurses.tar.lz 12916168 BLAKE2B f23aa0800c48d976f60d6826a424703fed1e1a00b0eb1fa09adce609cd1379f47e42df4669dad6edb59270d708f145049a7342ed73971d33183fef80dbd00539 SHA512 0ec4acf8fa2fb4b7ea409eb21a5dc0dcf14fb5616b8cb11d7892fd99aea6aa0984d0951ac474fd1469fe362e841a684d2292cafe6f69c078d003b90f224f2780
+DIST pypy-bin-6.0.0-ffi7-amd64+bzip2+libressl+ncurses.tar.lz 7546991 BLAKE2B d4e84d839dfa106a4e9b3a60327bae1fa96c326bf219b4f8dddc9dc968412b4be67e80ed1009120cf6a8b14aeede83ebb863bee1296eeafdae95a01ef0efd1eb SHA512 e3775fbf8e2a28d30a90f5bbde84bb03007aa00a6b778834db067d470d97b87c6e15ae792996d801b96d1486aecceff124854f0bd2d2bd8e353c0ee1c12662d4
+DIST pypy-bin-6.0.0-ffi7-amd64+bzip2+ncurses.tar.lz 7558174 BLAKE2B 62dc408c958c18d9751466b24c5dde46bc8705634e7312593c996c9517cc36bbaad7278aa09b179bbcb962c4124399d27647b82356c79e20e13434153b8c79b9 SHA512 8c232c7852f3e8d9e3b5bfcc3785e171ea64c63d3e1658662d9eb0340a21efecd4fa037b15ede155015b262e2f60e4fa0e80d72beb18d5e4b01dcb3e003a516f
+DIST pypy-bin-6.0.0-ffi7-x86+bzip2+jit+libressl+ncurses+sse2.tar.lz 9857459 BLAKE2B a125f68fe7ca8259d614c1d375029df776944a8f14960528d5b96125a1b46c7c014894ca3f952157957cca654dc8143033d04f4db0fdef182a6915304b630dcb SHA512 4fa02202d2ceee6cdbd2473e8f3028695a73577504053eafd87464dd75116028a3b2129be16d422fbac5372cd7623c0ee4d9ab75b87a1423dac9470eecda1227
+DIST pypy-bin-6.0.0-ffi7-x86+bzip2+jit+ncurses+sse2.tar.lz 9859596 BLAKE2B e76d456b931bb9ffd5f5140cf4125ed1446ec81432785a97f7a631adb3b97c7184d174ef928df0089e6327a1818ce70072e6835561877a6a6398bc6c6ab6705d SHA512 80895434011f8ba14cf04cd060e6b022f8f7a92fc11b3005bf92b20c267200aafa98f114eaa7b473ce2a27a44f22882ed20b59b7bff4d1b1eef3540b9154e1e5
+DIST pypy-bin-6.0.0-ffi7-x86+bzip2+libressl+ncurses+sse2.tar.lz 5940394 BLAKE2B 4f83e1bd745e686999c39fc8976c204a95b1e2e2f6a4ec23020e136f0c1046eed4ba4e8327c7bd6c2f11d80abb398fa46fd57ea18f9e9a7ed24577c67e274e7c SHA512 7007867780b9dd8f0501d278a651e0e6e82bdfcf40e66344a4d194ea71d311e0efdb8ac00a7bc413d796cadcbbe10b603707c371bec4fe12f1b090da81e11226
+DIST pypy-bin-6.0.0-ffi7-x86+bzip2+libressl+ncurses.tar.lz 5938624 BLAKE2B 218e2a75d601cad1346d4513f01e8b9544cf2d8e0de68e43e6645758efa94e8f770e06c73be16e53964752e2a747414141a99137e7f6820f33ea1d7f3463736b SHA512 c2d17b21de8fc2658c4ffca3ca02138d2446503427c7fb4d488a2a58e1e0b0bcc1eaa0548dbe176cd7a668cdf296ffdb3a0356b27dbfbd7b6be44d2224779358
+DIST pypy-bin-6.0.0-ffi7-x86+bzip2+ncurses+sse2.tar.lz 5943737 BLAKE2B ba39bff2fcccebed496c12ff85d95ea6f7d6092661b251673b53c061fba831eeab74b1286d4fb3873bbd5daa6f4ad5af2cef2c9db561afecd34285b806e0b794 SHA512 8c6a6dd5adb6a0b80c1ea3cc461ff2316084319e26b3f0c531ccf67bf518f603156624596d94f65a2b307e462cc97cef39dff33d662f847a20620103b78fcc5e
+DIST pypy-bin-6.0.0-ffi7-x86+bzip2+ncurses.tar.lz 5939972 BLAKE2B 86ca6f1dd9f00d993986476fbeb253b2a7efb862dec7c8b90945c32e9418d52460d3d305fd0e182e9351e6de148928cf786f461cb3174601d84f5604ca1ae132 SHA512 4d14693ba0bcf3d6f56c9e8a45959d84ba5aacbccee0a643a8c713569a0e5de1449e726e7c813a93105c8dd145f1be6a7f78eec22bbb5c5a8aba31f15cffdbe5
 DIST pypy-bin-6.0.0-x86+bzip2+jit+libressl+ncurses+sse2.tar.lz 10268326 BLAKE2B 0f0c9b9f9a586b7dfc1099a9dbe28fe56d49c808ffd2e632f428b8992d39db3db7f70fd4f2fd0fb261d8c85202ab4ec2febc35b1bd4dc86f38ab8fba5715541c SHA512 40986918e0ea94053b3adc5594a21acff34d4f18b0f4827ce9cb2646d3ddcda8fb6b107ac17869c2c44f99f153a2829fc3ae89e8d4caf61ead4c4a4c9b8e963d
 DIST pypy-bin-6.0.0-x86+bzip2+jit+ncurses+sse2.tar.lz 9857367 BLAKE2B 48d9271213dfa04991fbefab294cf3ee1a8d69d954315b0b3e543bffaae2134f0ce1e5f3da09e45041b988b0e08359c68b49acaf14c8bf26913cb540ac1928f6 SHA512 deeabbf19d95a6e6e55dea59cb0ff06fdf1ce687d6cd9499ef010d90445e05102056b5c8bfe9f44528cf86f087e4a2b1dee00fb5df1f7526673333cf73d5c8ab
 DIST pypy-bin-6.0.0-x86+bzip2+libressl+ncurses+sse2.tar.lz 6301309 BLAKE2B 8f8e16bd05da671fbe3e762dff33f32b1c50f3ce866432d3bc039724d025192a7116d6aa2590007e3adb52e5b3dd3ad9eadbc7c8f388bc7e02b049fcd980e3f1 SHA512 e6d32352ecb3a17e614f4ddac600f7dafb0a39fa807ba2fcce506eae881ee5c8f959e2d797f8126bfea74b801b76efbd9a3df86dc03c8521ec320fd06d05659e
@@ -25,5 +35,6 @@ DIST pypy2-v5.10.0-src.tar.bz2 19181430 BLAKE2B 4a0808c74fb167a7e98625f1d5b8559b
 DIST pypy2-v6.0.0-src.tar.bz2 19741694 BLAKE2B 55f5000e590613b516b12c3682a658fe6a17fbe264be3d61a81698cdf098b39177cf4355eb3f28980209c7a0e005498201cbad8884e3aa02cc86a228d1552046 SHA512 d3bdcd65fc83f2fda3203a604733fe6765049a17cca2715cd6045dc302a6159b4741a821c53fa4c97acf7297cef4c62e941a6a6eb7f8a253a93a28dcf2aa2ca0
 DIST python-gentoo-patches-2.7.14-0.tar.xz 13428 BLAKE2B 0048e48ddaaa4bef08451354fde95a123042880f26dddc9267c7f9a90fd8abb40955e26ee8c9dfc5a1165556bb3e11585b27288e635d42a4000dd3d7654c41ad SHA512 6da5b52065752b54e9215d0f0809c75167dc3690d0e94fa21dd7595626925bc5c1dd065d31b3bd696d7087f3986de145d3a335a29eb7bd77442637a7ec2863c1
 EBUILD pypy-bin-5.10.0.ebuild 5951 BLAKE2B 08ab9100162de3469727fb08a057d209e3809432e1fde15487f66f97073eff91145da0adeb961f5efb0e045b12a7af892966a121294f0ed6ae4119fedf5ff314 SHA512 9a6672f5702b3858353ed6c53222f427962754d72293f87e0e768806d2624539b48957c02e68cedb292de93e337721deffe2cba121f720ba0a6fde8c6e0bf92e
+EBUILD pypy-bin-6.0.0-r100.ebuild 6332 BLAKE2B 7fb9c4b8870fe696cea77c78ba5d3c6dda2fcfc5eb075ca2054790a0974f539d170a0284188f26dd784911e744a9e9ae029e629de71ea994aab2f5965a01f3d5 SHA512 3127ef12add95a2145afcb08ccc1758833acdf1144d66e240db941d9a2a611716b6b3040e2de8fc3de1bc9958a5f81418cdd69d80cabeb5ea374f004e4fbd833
 EBUILD pypy-bin-6.0.0.ebuild 6277 BLAKE2B 87ff3104c49ddaa0ecdfe85433ab8e258de55487f025dfd849dc48cd6885e4d3365b398a6ec22fa53a71830fbc206bd87270233f355cf903600acd7a0cd0c8e0 SHA512 2158d69a46abb87bea0f7f006ee6ce6a681bada8ca532042416a5d1797e241293988d5070ada0f6cac02ffa822a08397aded11e8009d7c56ef8e7cb9cf4c0bc1
 MISC metadata.xml 317 BLAKE2B d7be288f31d09754073e991e0f753e673e47fe1698408d13ce01dd58aa458e9ff9894973b27a293e426c074fbafaf5ca784fdbae0c784c1a5bf5d51bad1abd21 SHA512 65d1795605d0120c94911b2c295d8da13e01f9ac6b0750a7d536be64bf5244e20e2bb7286b33e75346e0dea333dc8970c4dcf0e98842e28f5a202ee2ddbba294
diff --git a/dev-python/pypy-bin/pypy-bin-6.0.0-r100.ebuild b/dev-python/pypy-bin/pypy-bin-6.0.0-r100.ebuild
new file mode 100644
index 000000000000..82d0da2ce0ab
--- /dev/null
+++ b/dev-python/pypy-bin/pypy-bin-6.0.0-r100.ebuild
@@ -0,0 +1,208 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit pax-utils python-utils-r1 unpacker versionator
+
+BINHOST="https://dev.gentoo.org/~mgorny/dist/pypy-bin/${PV}-ffi7"
+CPY_PATCHSET_VERSION="2.7.14-0"
+MY_P=pypy2-v${PV}
+
+DESCRIPTION="Pre-built version of PyPy"
+HOMEPAGE="http://pypy.org/"
+SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2
+	https://dev.gentoo.org/~floppym/python-gentoo-patches-${CPY_PATCHSET_VERSION}.tar.xz
+	amd64? (
+		!libressl? (
+			jit? ( ${BINHOST}/${P}-ffi7-amd64+bzip2+jit+ncurses.tar.lz )
+			!jit? ( ${BINHOST}/${P}-ffi7-amd64+bzip2+ncurses.tar.lz )
+		)
+		libressl? (
+			jit? ( ${BINHOST}/${P}-ffi7-amd64+bzip2+jit+libressl+ncurses.tar.lz )
+			!jit? ( ${BINHOST}/${P}-ffi7-amd64+bzip2+libressl+ncurses.tar.lz )
+		)
+	)
+	x86? (
+		!libressl? (
+			cpu_flags_x86_sse2? (
+				jit? ( ${BINHOST}/${P}-ffi7-x86+bzip2+jit+ncurses+sse2.tar.lz )
+				!jit? ( ${BINHOST}/${P}-ffi7-x86+bzip2+ncurses+sse2.tar.lz )
+			)
+			!cpu_flags_x86_sse2? (
+				!jit? ( ${BINHOST}/${P}-ffi7-x86+bzip2+ncurses.tar.lz )
+			)
+		)
+		libressl? (
+			cpu_flags_x86_sse2? (
+				jit? ( ${BINHOST}/${P}-ffi7-x86+bzip2+jit+libressl+ncurses+sse2.tar.lz )
+				!jit? ( ${BINHOST}/${P}-ffi7-x86+bzip2+libressl+ncurses+sse2.tar.lz )
+			)
+			!cpu_flags_x86_sse2? (
+				!jit? ( ${BINHOST}/${P}-ffi7-x86+bzip2+libressl+ncurses.tar.lz )
+			)
+		)
+	)"
+
+# Supported variants
+REQUIRED_USE="x86? ( !cpu_flags_x86_sse2? ( !jit ) )"
+
+LICENSE="MIT"
+# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
+SLOT="0/41"
+KEYWORDS="~amd64 ~x86"
+IUSE="gdbm +jit libressl sqlite cpu_flags_x86_sse2 test tk"
+
+RDEPEND="
+	app-arch/bzip2:0/1
+	dev-libs/expat:0/0
+	dev-libs/libffi:0/7
+	sys-devel/gcc:*
+	sys-libs/glibc
+	sys-libs/ncurses:0/6
+	sys-libs/zlib:0/1
+	gdbm? ( sys-libs/gdbm:0= )
+	!libressl? ( dev-libs/openssl:0/0[-bindist] )
+	libressl? ( dev-libs/libressl:0/44 )
+	sqlite? ( dev-db/sqlite:3= )
+	tk? (
+		dev-lang/tk:0=
+		dev-tcltk/tix:0=
+	)
+	!dev-python/pypy:0"
+DEPEND="${RDEPEND}
+	app-arch/lzip
+	app-arch/xz-utils"
+
+S=${WORKDIR}/${MY_P}-src
+
+QA_PREBUILT="
+	usr/lib*/pypy/pypy-c
+	usr/lib*/pypy/libpypy-c.so"
+
+src_prepare() {
+	eapply "${FILESDIR}/4.0.0-gentoo-path.patch"
+	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
+
+	sed -e "s^@EPREFIX@^${EPREFIX}^" \
+		-e "s^@libdir@^$(get_libdir)^" \
+		-i lib-python/2.7/distutils/command/install.py || die
+
+	# apply CPython stdlib patches
+	pushd lib-python/2.7 > /dev/null || die
+	# TODO: cpy turkish locale patch now fixes C code
+	# probably needs better port to pypy, if it is broken there
+	eapply "${FILESDIR}"/5.8.0_all_distutils_cxx.patch
+	eapply "${WORKDIR}"/patches/62_all_xml.use_pyxml.patch
+	popd > /dev/null || die
+
+	eapply_user
+}
+
+src_compile() {
+	# Tadaam! PyPy compiled!
+	mv "${WORKDIR}"/${P}*/{libpypy-c.so,pypy-c} . || die
+	mv "${WORKDIR}"/${P}*/include/*.h include/ || die
+	# (not installed by pypy)
+	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
+	mv pypy/module/cpyext/include/* include/ || die
+	mv pypy/module/cpyext/parse/*.h include/ || die
+
+	pax-mark m pypy-c libpypy-c.so
+
+	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() {
+	# (unset)
+	local -x PYTHONDONTWRITEBYTECODE=
+
+	local ignored_tests=(
+		# network
+		--ignore=lib-python/2.7/test/test_urllibnet.py
+		--ignore=lib-python/2.7/test/test_urllib2net.py
+		# lots of free space
+		--ignore=lib-python/2.7/test/test_zipfile64.py
+		# no module named 'worker' -- a lot
+		--ignore=lib-python/2.7/test/test_xpickle.py
+	)
+
+	./pypy-c ./pypy/test_all.py --pypy=./pypy-c -vv \
+		"${ignored_tests[@]}" lib-python || die
+}
+
+src_install() {
+	local dest=/usr/$(get_libdir)/pypy
+	einfo "Installing PyPy ..."
+	exeinto "${dest}"
+	doexe pypy-c libpypy-c.so
+	pax-mark m "${ED%/}${dest}/pypy-c" "${ED%/}${dest}/libpypy-c.so"
+	insinto "${dest}"
+	# preserve mtimes to avoid obsoleting caches
+	insopts -p
+	doins -r include lib_pypy lib-python
+	dosym ../$(get_libdir)/pypy/pypy-c /usr/bin/pypy
+	dodoc README.rst
+
+	if ! use gdbm; then
+		rm -r "${ED%/}${dest}"/lib_pypy/gdbm.py \
+			"${ED%/}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
+	fi
+	if ! use sqlite; then
+		rm -r "${ED%/}${dest}"/lib-python/*2.7/sqlite3 \
+			"${ED%/}${dest}"/lib_pypy/_sqlite3.py \
+			"${ED%/}${dest}"/lib-python/*2.7/test/test_sqlite.py || die
+	fi
+	if ! use tk; then
+		rm -r "${ED%/}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
+			"${ED%/}${dest}"/lib_pypy/_tkinter \
+			"${ED%/}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
+	fi
+
+	local -x PYTHON=${ED%/}${dest}/pypy-c
+	# 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
+	python_export pypy EPYTHON
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_domodule epython.py
+
+	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 5a8d1995e778..273f17e22cd4 100644
--- a/dev-python/pypy3-bin/Manifest
+++ b/dev-python/pypy3-bin/Manifest
@@ -9,11 +9,17 @@ DIST pypy3-bin-5.10.1-x86+bzip2+ncurses+sse2.tar.lz 5351320 BLAKE2B e45ede827a98
 DIST pypy3-bin-5.10.1-x86+bzip2+ncurses.tar.lz 5343927 BLAKE2B 27c5842a1f00ff9b56c1417c290ab677bc8e1cff36ce5d226f1e3e262b14c0f0e8a5f3d474e23bcaef467b8210357d0724e752d9249f275c16cc645e59cd1530 SHA512 6f7ff616d6d0532ce4919d5e6cd69a46fd81c548efda2869653ce07d736d83f256f302040726931d85c83a297ab4c7f6e15675a17576fbffa4313a48435e182e
 DIST pypy3-bin-6.0.0-amd64+bzip2+jit+ncurses.tar.lz 10674209 BLAKE2B f9e00ba0cdc113ebe156212c5497e122a45bc9544cb242ad02273e06210eb691f930aee7faf1d4ed3a7b14080905a9cb6d30b309c38a2c3795f2183750b4469f SHA512 52e615e2b51a43a2c91f9a2a8f0cec16a6090bfd230ef08dda462bb530da9ee66acec9c449e77f299e0b3363d6bcbc7150b14e7adbe9862d36f4738dfc6be1ca
 DIST pypy3-bin-6.0.0-amd64+bzip2+ncurses.tar.lz 6703329 BLAKE2B 64ad2b2ae1580833735dc5ce4b821f79458c98c5f761d7c9834624aff172204ac16e23582e3a776baa85accd221a9fd2225c22099de1de9c319b4f29b5f15071 SHA512 57b2e2f0ddc8d6f78beff6c049adb0a8d316db1d9f7bf5e07e4e593fa363e5ced37d212f549c0a5305459207694ac5a6aac9698a1ca3a4bf56a4437899b7e97b
+DIST pypy3-bin-6.0.0-ffi7-amd64+bzip2+jit+ncurses.tar.lz 10697120 BLAKE2B 3e368d0fb6b875472d79b531bef926bedddf73c1f2bb25e00f56cd41c4349be119281d2c2d52239bd2769f3f9810280f8c00d9332e02b8664e46de06f2c112d8 SHA512 2e9c405212d35289a8add374cae185bf9096a46604c4e2935f1a58bee51aa756b311e5b611098e917da7fbd10194706fca809249f627b7d4b8c628bf9b38aa54
+DIST pypy3-bin-6.0.0-ffi7-amd64+bzip2+ncurses.tar.lz 6710567 BLAKE2B 239badab3e3f4cb17116f2d2b3cbf58f7a481bdbc78d813563f5a7c2c67002cce598de70ebdbdd8d5dc348ec5db07559a2f35e712ebe46d1f472f2b2ccb9fa05 SHA512 ae3e76c2df50a2ec39e8f447fcacf913a1e9a3cf1268324ddc303b35e8a7a07413278e313e92579c311238ec185cb61d3d97fcbf6e972846859dc423792f55f0
+DIST pypy3-bin-6.0.0-ffi7-x86+bzip2+jit+ncurses+sse2.tar.lz 8253376 BLAKE2B 6ea95d691a5ccbb89bfd5f9351199f3d3cd4cb855d44937db58ac6327b80b71ed5d15f5dcbdc961ccf5ea1fa945ba31917716a3b9ff79327f4db3a99961569c2 SHA512 e68722eb0004680df884ff98bda906e94a5252c4e6b3ca55fe2df48a5a18d9dccc0218906c6b71a579a7a97da3a4633bb42317a276ee2640a16a9d31c1939f8e
+DIST pypy3-bin-6.0.0-ffi7-x86+bzip2+ncurses+sse2.tar.lz 5384351 BLAKE2B 952676b1ec9c71b5ec477011ec4c5020512508f7c40009d8715972726469319bccb30546105dd68be22a02572f6646f06057495442da12d889ac9695a1b14537 SHA512 c4b4289b9348ad35f79f0581e2d3a8cf1109a3edfb52cccf8e04a0089c706ae12de819d901f875bff3a439680694a98c85605c1b9abfd7fd4ff825846c2c89e3
+DIST pypy3-bin-6.0.0-ffi7-x86+bzip2+ncurses.tar.lz 5384380 BLAKE2B 7e452d0b163f401d0741e95aa2f55e84eb223eb3152f0299b365d1dd53268d315496977d988149c29e0e3439834d7283bfa9a9e05f2d7a8abb3f3d65aa05e567 SHA512 d743c4275abfbce1ef1ae2949e93097faeca8377e38761183ff7d0cc23b92d93700bf370d1511c968743e769a0b41acfeae01543885cc55bef8cdd2c6817af0f
 DIST pypy3-bin-6.0.0-x86+bzip2+jit+ncurses+sse2.tar.lz 8268406 BLAKE2B 8200d7cfc5bd813cf3138017c96cace1c07bc031f68d5a9df2f71cb887a5dd3bb979dbc67d395389c965904037935a518bf6c1492b04ce5a9f21a9bb3bb5504a SHA512 4c09c454b25faa51024c5319ba5e91f4b1883bdd25f504694f83011ef1faffe7aa28a51369d3c5c6bb9f0d8eb53d1292d57608343b731c67ceeb99f41736b044
 DIST pypy3-bin-6.0.0-x86+bzip2+ncurses+sse2.tar.lz 5363942 BLAKE2B d53b89ef73c2d4ee2bc00360a0c4a791fd8b6ac2d28dfeeb7510a465e6302f79c378aacebbaf4993b6ee55dbc6d85876149fe3f5a0d689713f029c928d93a729 SHA512 ce72d84200dd275841e691810dbf402423883b282cacbe8bbdae9285936869d40b3d43d053b0f3d4904c7ced72f35480d1780358180a1c98e8111852fef1f77f
 DIST pypy3-bin-6.0.0-x86+bzip2+ncurses.tar.lz 5366917 BLAKE2B 338a9c221048dabc548250edec05256be64dd5d1aeb5b2fff839d7d5e8dda29e7d4e0a03b1fc0c9cd418685c558bb47598c625e2d28cd4caabc45e21eee9f4f8 SHA512 5274535d01564a9087aea486320921c8784cabcc7bde3634c27b9006988fdc745e6e5e5c2fb8e7b0318fd5ca6fda3fce208743cfa079a7474ea44277237ea873
 DIST pypy3-v5.10.1-src.tar.bz2 29071765 BLAKE2B d5c163697d8dd36a9a61e9a355719628902de0c9a4c038d31cd134d9bb26b8058abfdf85b09715208146295c37e343fae5e1e4a3c8d1999306eeea93791e326c SHA512 91b0ed25130bdbb46d5e577136b5fe63d5162917dcc2d0b69f5cac2a283ece9d0bfd3c7c8dc61ff391e0550fa1603326f6edeb2df3159d71617fefe6c07439f5
 DIST pypy3-v6.0.0-src.tar.bz2 22648140 BLAKE2B b8678859b0c24494788ddf6f410a3ec1a56a04663452e1aba25d3f41c5073a95866d1623f00cb1a6c9d0256df728fa60d1edb5b58d26c0d88577769cc8a6205d SHA512 ea406c4dd1837a6ab13026de01330790f3c18f6e2bfb83e8553e52acf78b43dfb559ce75c2d91395055c771db359356c8183ed950da6f01a21bf09128935af5e
 EBUILD pypy3-bin-5.10.1.ebuild 5543 BLAKE2B d790bc82ec0c0f4e48bbfabc557241fb6eaed1e02678764ac887f498b08e277205d308126a4095a553d0d568499d6062cd76c47af1d887b0dd318a9a66fdb9f8 SHA512 ff0391da50cce922e424f2e5d47bbcd6584327be54eb03fe5570a6df45ddfab3dae510053e820961678dbc5c4c24d85bf59bdf6ce2f7cbe13ea1696a57712dff
+EBUILD pypy3-bin-6.0.0-r100.ebuild 5577 BLAKE2B dffe4b3f16d9af33ac5b7cf651a5147ba284dace9b906e62bd3779c5b6d4ca3e8fb9d2363448598edc120dc95d88df5d32de2f2b52337cc6966faf894f30cb41 SHA512 6b3dfde01104e0ea5e471db9308088adeaae2729f02e8b4271a826efc848d1e6e585b9caad721b2a06a5aaf29210be1cbfeb6ccad68b0bc179f54187d99e0fe7
 EBUILD pypy3-bin-6.0.0.ebuild 5547 BLAKE2B 27f7df0cb40c23e17bf1bca4d350f42fd5583a4c034cf79b8b6e213137089f1254c38f90a81976a194ca908c9046219646b4326a4bd1acfdaabfd67b275cd215 SHA512 23523b49c740d09b4e871e8ecfbf72e40a929be0500153398aadaaf8b17ee9ef92f3d03e8b3ef7d189ad2c377e4ef03dadc4d68716fe36e797c0f360a19962e8
 MISC metadata.xml 317 BLAKE2B d7be288f31d09754073e991e0f753e673e47fe1698408d13ce01dd58aa458e9ff9894973b27a293e426c074fbafaf5ca784fdbae0c784c1a5bf5d51bad1abd21 SHA512 65d1795605d0120c94911b2c295d8da13e01f9ac6b0750a7d536be64bf5244e20e2bb7286b33e75346e0dea333dc8970c4dcf0e98842e28f5a202ee2ddbba294
diff --git a/dev-python/pypy3-bin/pypy3-bin-6.0.0-r100.ebuild b/dev-python/pypy3-bin/pypy3-bin-6.0.0-r100.ebuild
new file mode 100644
index 000000000000..d98c618d9ebf
--- /dev/null
+++ b/dev-python/pypy3-bin/pypy3-bin-6.0.0-r100.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Test runner needs Python 2.
+PYTHON_COMPAT=( python2_7 pypy )
+inherit pax-utils python-any-r1 unpacker versionator
+
+BINHOST="https://dev.gentoo.org/~mgorny/dist/pypy3-bin/${PV}-ffi7"
+MY_P=pypy3-v${PV}
+
+DESCRIPTION="A fast, compliant alternative implementation of Python 3.3 (binary package)"
+HOMEPAGE="http://pypy.org/"
+SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2
+	amd64? (
+		jit? ( ${BINHOST}/${P}-ffi7-amd64+bzip2+jit+ncurses.tar.lz )
+		!jit? ( ${BINHOST}/${P}-ffi7-amd64+bzip2+ncurses.tar.lz )
+	)
+	x86? (
+		cpu_flags_x86_sse2? (
+			jit? ( ${BINHOST}/${P}-ffi7-x86+bzip2+jit+ncurses+sse2.tar.lz )
+			!jit? ( ${BINHOST}/${P}-ffi7-x86+bzip2+ncurses+sse2.tar.lz )
+		)
+		!cpu_flags_x86_sse2? (
+			!jit? ( ${BINHOST}/${P}-ffi7-x86+bzip2+ncurses.tar.lz )
+		)
+	)"
+
+# Supported variants
+REQUIRED_USE="x86? ( !cpu_flags_x86_sse2? ( !jit ) )"
+
+LICENSE="MIT"
+# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
+SLOT="0/60"
+KEYWORDS="~amd64 ~x86"
+IUSE="gdbm +jit libressl sqlite cpu_flags_x86_sse2 test tk"
+
+RDEPEND="
+	app-arch/bzip2:0/1
+	dev-libs/expat:0/0
+	dev-libs/libffi:0/7
+	sys-devel/gcc:*
+	sys-libs/glibc
+	sys-libs/ncurses:0/6
+	sys-libs/zlib:0/1
+	gdbm? ( sys-libs/gdbm:0= )
+	!libressl? ( dev-libs/openssl:0=[-bindist] )
+	libressl? ( dev-libs/libressl:0= )
+	sqlite? ( dev-db/sqlite:3= )
+	tk? (
+		dev-lang/tk:0=
+		dev-tcltk/tix:0=
+	)
+	!dev-python/pypy3:0"
+DEPEND="${RDEPEND}
+	app-arch/lzip
+	app-arch/xz-utils
+	test? ( ${PYTHON_DEPS} )"
+
+S=${WORKDIR}/${MY_P}-src
+
+QA_PREBUILT="
+	usr/lib*/pypy3/pypy3-c
+	usr/lib*/pypy3/libpypy3-c.so"
+
+src_prepare() {
+	eapply "${FILESDIR}/4.0.0-gentoo-path.patch"
+	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
+
+	sed -e "s^@EPREFIX@^${EPREFIX}^" \
+		-e "s^@libdir@^$(get_libdir)^" \
+		-i lib-python/3/distutils/command/install.py || die
+
+	# apply CPython stdlib patches
+	pushd lib-python/3 > /dev/null || die
+	eapply "${FILESDIR}"/5.8.0_all_distutils_cxx.patch
+	eapply "${FILESDIR}"/python-3.5-distutils-OO-build.patch
+	popd > /dev/null || die
+
+	eapply_user
+}
+
+src_compile() {
+	# Tadaam! PyPy compiled!
+	mv "${WORKDIR}"/${P}*/{libpypy3-c.so,pypy3-c} . || die
+	mv "${WORKDIR}"/${P}*/include/*.h include/ || die
+	mv pypy/module/cpyext/include/*.h include/ || die
+	mv pypy/module/cpyext/parse/*.h include/ || die
+
+	pax-mark m pypy3-c libpypy3-c.so
+
+	einfo "Generating caches and CFFI modules ..."
+
+	# Generate Grammar and PatternGrammar pickles.
+	./pypy3-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,
+#    "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() {
+	# (unset)
+	local -x PYTHONDONTWRITEBYTECODE=
+
+	# Test runner requires Python 2 too. However, it spawns PyPy3
+	# internally so that we end up testing the correct interpreter.
+	"${PYTHON}" ./pypy/test_all.py --pypy=./pypy3-c -vv lib-python || die
+}
+
+src_install() {
+	local dest=/usr/$(get_libdir)/pypy3
+	einfo "Installing PyPy ..."
+	exeinto "${dest}"
+	doexe pypy3-c libpypy3-c.so
+	pax-mark m "${ED%/}${dest}/pypy3-c" "${ED%/}${dest}/libpypy3-c.so"
+	insinto "${dest}"
+	# preserve mtimes to avoid obsoleting caches
+	insopts -p
+	doins -r include lib_pypy lib-python
+	dosym ../$(get_libdir)/pypy3/pypy3-c /usr/bin/pypy3
+	dodoc README.rst
+
+	if ! use gdbm; then
+		rm -r "${ED%/}${dest}"/lib_pypy/_gdbm* || die
+	fi
+	if ! use sqlite; then
+		rm -r "${ED%/}${dest}"/lib-python/*3/sqlite3 \
+			"${ED%/}${dest}"/lib_pypy/_sqlite3* \
+			"${ED%/}${dest}"/lib-python/*3/test/test_sqlite.py || die
+	fi
+	if ! use tk; then
+		rm -r "${ED%/}${dest}"/lib-python/*3/{idlelib,tkinter} \
+			"${ED%/}${dest}"/lib_pypy/_tkinter \
+			"${ED%/}${dest}"/lib-python/*3/test/test_{tcl,tk,ttk*}.py || die
+	fi
+
+	einfo "Generating caches and byte-compiling ..."
+
+	local -x PYTHON=${ED%/}${dest}/pypy3-c
+	# 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
+	python_export pypy3 EPYTHON
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_domodule epython.py
+
+	einfo "Byte-compiling Python standard library..."
+
+	# compile the installed modules
+	python_optimize "${ED%/}${dest}"
+}
diff --git a/dev-python/pytest-relaxed/Manifest b/dev-python/pytest-relaxed/Manifest
index e331d2c85959..168b7ff677f2 100644
--- a/dev-python/pytest-relaxed/Manifest
+++ b/dev-python/pytest-relaxed/Manifest
@@ -2,5 +2,5 @@ AUX pytest-relaxed-1.1.4-no-autoload.patch 391 BLAKE2B f4d7e9eb5449bb22e3056136a
 DIST pytest-relaxed-1.1.0.tar.gz 25942 BLAKE2B 6dd34044ec3ae0b5c85f0a76102aaeafe3dad8748c0cf34666dd3550162a2968191efb8415467259a4f072905af062aeabaaaeb475ab68d47aa8d79e3cadd3d0 SHA512 010e37c4d0c63bd00af8851bb50e52af7f8f17769be042e4941e8d8ba451920c24dfa6cdf74cd1b3ca4b3e1c71cd5e1ac34ffae855fc261cf431c212f98cbfff
 DIST pytest-relaxed-1.1.4.tar.gz 26854 BLAKE2B c9b4d7c5c68fb24deaa9b107960eec7b24ab1cfe4ed37f0ffa99b4e5a9d3572be860ff3bc39882f5024fb6aad73f5f976c450294cf713483bba655af56b70245 SHA512 d4e7ed5143ac9f1bff1f911e4ab3aede076d154dcecc28ce96cbc49782d186214893b942a3548da2789faa51df5ddbd43ff41c82b9bb9d0d52f38a2000fc0c6b
 EBUILD pytest-relaxed-1.1.0.ebuild 907 BLAKE2B c599c1b1a8e1f18f7fe0280ed7d5337e201d7fd61839ce151522c2b0316de7b48a048c16424dbea8817afbd3d9cd3ad11b1bedfe1b6942c6582446e259431f13 SHA512 4b9f17644496b1408960f76041ef96c1d311d0c86bb69324465985ea7ca53a5753687716cb7eea65918ff7273b038fd1d64e7aec5b34fd343f5e91479dc32140
-EBUILD pytest-relaxed-1.1.4.ebuild 1395 BLAKE2B d90decfb2884710261defa5533c0a73e8f7682e3f8d6727dd79f7e25c520958d42252c9498dc83c551886e3fb3f13fd5f8cef9b6a9aac5d6b30d35fba36820c2 SHA512 3b1649f1f5d5a7bd5bf5ae1a6c14419796725fa57504a6cb41da8cb1f345eba952f2034439ae4ab5703826b7e4fd30b540a30bbaeae6e12198e4a5a240fe6be0
+EBUILD pytest-relaxed-1.1.4.ebuild 1396 BLAKE2B 91498a87b1aa4515af5e5841ce3f545d59b6b54ea15d03598079ee72bfff9ccf778da52a2237720041479159cd0aa93731fbb59d125d75c7aec5a46136b582f7 SHA512 683fe0e89d13928e6e4e772a06fd30cc0468c940acbe4c7854c12cd467ab4a64528c13d33d4e1dc86fc678ffc8dd20ec26b3626fc8826af459818b0796871ea4
 MISC metadata.xml 382 BLAKE2B 858b2e05190a45c6842f93638cc598f3b97b3481a361438789a2f1e4aabfd474da056d5a3396927e555d4395cd1ac13393fbb0682aa3fdc6c734b718c0451ebc SHA512 9a59cb814efe45123a5d8fc8fe8b81d068013c58fb6f4e04bd9c0267c4c5ec1f1b254770ba6f5e43a645093c84a477d903e5d981c89532732c840e2026ba40a0
diff --git a/dev-python/pytest-relaxed/pytest-relaxed-1.1.4.ebuild b/dev-python/pytest-relaxed/pytest-relaxed-1.1.4.ebuild
index 0f5f4b758f31..683884b4f05d 100644
--- a/dev-python/pytest-relaxed/pytest-relaxed-1.1.4.ebuild
+++ b/dev-python/pytest-relaxed/pytest-relaxed-1.1.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD-2"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index d0b9a4387a2f..1e8c2f292ba1 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -1,15 +1,11 @@
 AUX pytest-3.4.2-pypy-syntaxerror-offset.patch 996 BLAKE2B ff6d362d20f6432f73956e1aee4c2bc596e3d8e3347da3624dfd3cbfdd1eabd8872058737e8f9b558f3570878756c7b87a65514956b1e81235c2727e8ff2fc63 SHA512 4a28ddc07389aac79e46528e85229aba126a89c27b7bec73b406766be49f5c8be9bdc2cb3158bfb475b4d6371e2f33960e1ed154e3b9eda15aeb8b151f3d2148
 AUX pytest-3.6.3-pypy-syntaxerror-offset.patch 1055 BLAKE2B 8a92e1300052ed7f178252489d4b687d9d58d5fa9067a1f17a20ddbd698843a5614e7dd729670920a447e189b0e40ed2ae26fd13ad7d9cfebc59889c8cc50d87 SHA512 fa2600e320a74eca59004953aea0ac7607e6b7fcbcb702a5ac709dfcf73d036f47c5a79b01e56061ed6776ccaddd7a261162848218969fd1b462c5e1dd615ad3
-DIST pytest-3.0.3.tar.gz 731934 BLAKE2B 7fb57d75bd54eb8a31d9701fdf739119715c475eaaacae3cd038057c1d2bf43fa86ccdc45b3c84962708ef606976ab39ad41e0c3690c8b5f4c04d870579a384e SHA512 ec0b4a5f0d6673a339c5a70b402c004c23db7001005454329eeaea15d890f53b8f2740f6c6254499d0f915b9058bfdfa535d9f22847bb382a060d65204fce4af
 DIST pytest-3.2.2.tar.gz 786396 BLAKE2B e669da930890e902b0323ec3a6685080ddd889e74655f7b4cb08ec421651f987597021a31471aab5a32d637b99620ce7792cbdf8f85561db3bb10ff06a446ba1 SHA512 6df3a50e7d1efeaf7a283920b16d1daf800798f422bc851b0aacd2bbd5cb0a88c95f9057fae49943b9dfe6527ed552cdf8d983b944ab91d0af252ee4f6eb82db
-DIST pytest-3.4.1.tar.gz 812928 BLAKE2B 27b25fcc5a268b1c92188c01bf16bf1eb4b8ced7d1a3c8095350ec55b1f1845a5d54bd6bd169142ca0d327f2f8d193774643174a356dd95fa07b3195bc1e8713 SHA512 75f728840cde6512619a03ce75fd0b04cb9d57a99f381366a0f9c10ffa3210448e7e85505357bfa9bfb0cca11cdedda2c0e091e5473ed82707a2597f234e659a
 DIST pytest-3.4.2.tar.gz 812719 BLAKE2B 96623d6cdea4bd79778175c18c949938505f1862010f700f9a8cb85f445910381af391a5b69e664fbbfc254bf46502c798c72026772070236a0a3bca7aeeb3d6 SHA512 787065ab76d4482799bb2da9f024c9c383e68cc1cc01f3b80f6ed9444ca6383d20953615696ed4dd01668777b094cf5002b23c4ce51828879dcf8ebf2170c71b
 DIST pytest-3.6.3.tar.gz 830949 BLAKE2B 4c0df5d157b8bb0ac6261a793aac2a8074c869b1a7cbda3eda600c79648b3722eaf2a57514c1fece60e0aac324b8ed09e8e889dda268619204e9e1f1637e1c9b SHA512 e18d8e972cb1b05b037b9441eea5981ce036d8e2c2bab80f6e50f283df9bd08740296133990424cf78449f6d3d2fbd1d59709770aa972af99fe061583f2d79a7
-DIST pytest-3.8.0.tar.gz 865922 BLAKE2B 821051de2c502c892841f59124f6cdbfb6f31ebd8661bf242484c7c3f687ce75f9c4eb0984f7dabed0aff44277dcbbeb9f14c4cde2f6b152aad69f3769e27bc8 SHA512 26efe2bcd6c86c55cb17a17ad3cfe0762ba5d61adf9830fe5780c0c90df65bbeb2346abb8310c6123c308ed0e641d4cf325ca9ac16dcd8994b6a636bcfd386a4
-EBUILD pytest-3.0.3.ebuild 1966 BLAKE2B 50b123408a85c5b283fe1653444472fd467272d99dc944bdf876556fe5e9aa1208e32efbc119cc95ca834bb66a50f195199efd4d04054cf3cc98530eccda710c SHA512 2d6713c361334f2af886827a0918f574512e885fe77cc5a4595ca47d31b37d32f5768989a6bb5447666c8850ca15bca73e7641414d724bb9512d70abb5ea0eba
+DIST pytest-3.8.2.tar.gz 869668 BLAKE2B 91d75481e4ef36ab06654b340751a33a96b9f6187cdfc65694973e2d4d7ddc5806fe673c87f0aa442c6c657a953b36c22d288eee8f61cc002be4be803bc98111 SHA512 5420de07ff741f64bcb7fce7bf3b5097cf63be2539c2e694c168bd824ba468ca87cb17be801b72b972ab417da98d1b5473f319afd642bf5c6c0270e3a697d016
 EBUILD pytest-3.2.2.ebuild 2113 BLAKE2B 1789686fa508f9629adc37e7fcd26e8a4426214b6335922927bcd8bb37c336792b564ce505c122a729edfaa53af604e4fd1be31f45c5251f0008e14c8cefb06c SHA512 1384082815df0f30e50881c89d81822575509f1333c2d3713b69ff7e3a9113c1a70fa5220d0e10bae0b5f17d844a14501e59af8c944ca4006dfeb9cd0e8616b1
-EBUILD pytest-3.4.1-r1.ebuild 2297 BLAKE2B 52af333554c85fff95f0bffe2246cd7e88a6446ddbe8dc4829600d1a018da613c4aed06e039fbd54d621ca45a3dcf454d24ae9bbe302d97c6084ea37d6641945 SHA512 5c06bedcf6b6f8df4f6bba8f5aace83a72ff530f1f0368a0a5b76f0380d02c55cf64e8645362c63f7f6efef5d49eefcdfff2423734a62acb23799a9e3c567200
 EBUILD pytest-3.4.2.ebuild 2509 BLAKE2B 23b2f34e9f2923a0eb143a341f4dff40e88d4ff1bf52cd7637d9354192ebadb58c39050feb00911993f0067d60571598864e5a85644b0adb33cab722594f9ebc SHA512 1958df6b0567c547bf70789836e12929caf3e1f17ac16ebad88aac081dce949888a08efceaba04649feb8098d4373548a5d4de511a8b94d6f50eebbd1d5d7b64
 EBUILD pytest-3.6.3.ebuild 2413 BLAKE2B 56d11541e919a95919ad66efa0b4603ccd61116133381fac8c5ff605fc5f3b53792b611b7c40a6428d81890134c0482fba18e13575d2ffc5f3c96e5c982dd3ae SHA512 ac4a4fe08e095f1a9012346fdfae6fb926e5db595defbf1f3f5a15ef96e7325846536e277513cf3f79242dd26dd726622686bc534e9fbe53a98fd2d9c4285cba
-EBUILD pytest-3.8.0.ebuild 2605 BLAKE2B 3bb1965f31ba5627d0a6ad32bb3e84d4d96d3fd652ec2b31f8b2f5a358fb9309797944093ba2b8222c7dcf2de5725c9f8535ac45f6e5a18605a078909a4faad7 SHA512 ab74df5d15d1be647eb74cb91719d5408a4abf4795b87b5f7367c7f441f9f3b7c7e528a1d598d8999048126bff0075dc030184c49a7ec84782b03dc072b5cc06
+EBUILD pytest-3.8.2.ebuild 2445 BLAKE2B a3b8d228f33317817ddaf3e86091e17647f59279d7ec6ae34bc180c5f12aa43a1a86cc9f832112472237da897b4506daf0b97fe5e74da87028ffdb543b4f0520 SHA512 0c895d526c881e1a20d372833078efdc8ffba3bbe2b8c7d883a670ef4de431296430cf8f47bc6d2d77642b154cc44f346ead8880b891108d7bbe369e5ff1ac35
 MISC metadata.xml 309 BLAKE2B f29391c5f96f44f6329d3665346a5d46ecb4a86d103ae8008769af86126756e76bfa89cfe462e9c219e5f70b64013f662d020c7a2f6015d8cadd0eb25a7614eb SHA512 ba53c13ac716488e3e5dadf5dcfcb697dc9bb13f89e9d0fb98b9a5a6e36cafeeb64d1348008f42497117bf46fb6f3bc288c10a68c4d5ab53c9c02a3ae61b594f
diff --git a/dev-python/pytest/pytest-3.0.3.ebuild b/dev-python/pytest/pytest-3.0.3.ebuild
deleted file mode 100644
index f6d776d3e09f..000000000000
--- a/dev-python/pytest/pytest-3.0.3.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple powerful testing with Python"
-HOMEPAGE="http://pytest.org/ https://pypi.org/project/pytest/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86"
-IUSE="doc test"
-
-# When bumping, please check setup.py for the proper py version
-PY_VER="1.4.29"
-COMMON_DEPEND="
-	>=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	test? (
-		>=dev-python/hypothesis-3.5.2[${PYTHON_USEDEP}]
-		>dev-python/pytest-xdist-1.13[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	!<dev-python/logilab-common-1.3.0
-"
-
-python_prepare_all() {
-	chmod o-w *egg*/* || die
-	# Disable versioning of py.test script to avoid collision with
-	# versioning performed by the eclass.
-	sed -e "s/return points/return {'py.test': target}/" -i setup.py || die "sed failed"
-	grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency"
-
-	# https://bugs.gentoo.org/598442
-	rm testing/test_pdb.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# test_nose.py not written to suit py3.2 in pypy3
-	if [[ "${EPYTHON}" == pypy3 ]]; then
-		"${PYTHON}" "${BUILD_DIR}"/lib/pytest.py -vv \
-			--ignore=testing/BUILD_nose.py \
-			|| die "tests failed with ${EPYTHON}"
-	else
-		"${PYTHON}" "${BUILD_DIR}"/lib/pytest.py -v testing || die "tests failed with ${EPYTHON}"
-	fi
-}
-
-python_compile_all(){
-	use doc && emake -C doc/en html
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( doc/en/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pytest/pytest-3.4.1-r1.ebuild b/dev-python/pytest/pytest-3.4.1-r1.ebuild
deleted file mode 100644
index d9b4a24f1a25..000000000000
--- a/dev-python/pytest/pytest-3.4.1-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple powerful testing with Python"
-HOMEPAGE="http://pytest.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-# When bumping, please check setup.py for the proper py version
-PY_VER="1.5.0"
-COMMON_DEPEND="
-	>=dev-python/attrs-17.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pluggy-0.5[${PYTHON_USEDEP}]
-	>=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	virtual/python-funcsigs[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)"
-
-DEPEND="${COMMON_DEPEND}
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hypothesis-3.5.2[${PYTHON_USEDEP}]
-		>dev-python/pytest-xdist-1.13[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-	)"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	!<dev-python/logilab-common-1.3.0"
-
-python_prepare_all() {
-	chmod o-w *egg*/* || die
-	# Disable versioning of py.test script to avoid collision with
-	# versioning performed by the eclass.
-	sed -e "s/return points/return {'py.test': target}/" -i setup.py || die "sed failed"
-	grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency"
-
-	# Something in the ebuild environment causes this to hang/error.
-	# https://bugs.gentoo.org/598442
-	rm testing/test_pdb.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# test_nose.py not written to suit py3.2 in pypy3
-	if [[ "${EPYTHON}" == pypy3 ]]; then
-		"${PYTHON}" "${BUILD_DIR}"/lib/pytest.py --lsof -rfsxX \
-			--ignore=testing/BUILD_nose.py \
-			|| die "tests failed with ${EPYTHON}"
-	else
-		"${PYTHON}" "${BUILD_DIR}"/lib/pytest.py --lsof -rfsxX testing || die "tests failed with ${EPYTHON}"
-	fi
-}
-
-python_compile_all(){
-	use doc && emake -C doc/en html
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( doc/en/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pytest/pytest-3.8.0.ebuild b/dev-python/pytest/pytest-3.8.2.ebuild
index 93cc15d8ad4b..17be8889de91 100644
--- a/dev-python/pytest/pytest-3.8.0.ebuild
+++ b/dev-python/pytest/pytest-3.8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,7 +22,7 @@ PY_VER="1.5.0"
 
 # pathlib2 has been added to stdlib before py3.6, but pytest needs __fspath__
 # support, which only came in py3.6.
-COMMON_DEPEND="
+RDEPEND="
 	>=dev-python/atomicwrites-1.0[${PYTHON_USEDEP}]
 	>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]
 	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
@@ -39,7 +39,7 @@ COMMON_DEPEND="
 #	)"
 
 # flake & pytest-capturelog cause a number of tests to fail
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
 	test? (
 		>=dev-python/hypothesis-3.56[${PYTHON_USEDEP}]
@@ -51,15 +51,7 @@ DEPEND="${COMMON_DEPEND}
 		!!dev-python/pytest-capturelog
 	)"
 
-RDEPEND="
-	${COMMON_DEPEND}
-	!<dev-python/logilab-common-1.3.0"
-
 python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}"/pytest-3.6.3-pypy-syntaxerror-offset.patch
-	)
-
 	grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency"
 
 	# Something in the ebuild environment causes this to hang/error.
diff --git a/dev-python/python-caja/Manifest b/dev-python/python-caja/Manifest
index 84eaff6858e1..a3c5791d2921 100644
--- a/dev-python/python-caja/Manifest
+++ b/dev-python/python-caja/Manifest
@@ -1,9 +1,3 @@
-DIST python-caja-1.12.0.tar.xz 265720 BLAKE2B 6d1d1e9609b24ee0632eda68730aa2ae2aacffb3e4762a9b5269cd76fefde40dfa3cfc20857567a2d2470372695b0356e4329a11ffd159e349231f109d5077e0 SHA512 fbec1a7f5e560cda2b3bba41dcd93c0484f2b7b7527577a2b2114c84019203df92c136fecbbe6c889785c610035a582f1912ad7da9bb1258ada661b56edf4be7
-DIST python-caja-1.14.0.tar.xz 279432 BLAKE2B 15bbf397373125fba85c5ec0ee694be500cab1b4252a73666259bde7984318baa1cc5f760a492f4b930305c99c040f5e3c12b7dc77d82889f5dcea0d4bea3d07 SHA512 835d9c1df112746fb3ecfe2e661e0c36814f3e2b21c763450354ce9bc0119d055b6773efa64d252ea8a618ec6c36e2d9cbfca698ffa6652cad0b94a499167497
-DIST python-caja-1.16.0.tar.xz 280956 BLAKE2B 0850c7aaa4e61a620340bb6f2d8518c423341d2918491519cd7105097c8a226750db6a499eb601b972972e1d0122158a011ee1efb9128f8a75d8efcd31ba9d6f SHA512 ce82fbd6d1127df33153920fbf703f77be2e1dabeb6ba33275fb1b1ba5d8aabc96222cf42280844237f0e182b0eccf764fd8ea33a8de96e844eeb0d5ef0cd5de
 DIST python-caja-1.18.1.tar.xz 284020 BLAKE2B 9513c89450c07330471b2ee9a9d9644eef33858060e66054ab00fb16d3d63292e14704c9f80d7cd5928fcf108bb1cf8c5afd7eb8713814554574cda39b0a8960 SHA512 5907f0769e43b592228aa66f9b51e227a414051975066c16734397afa05c1235d442c625bb00a51e9356768fc3b9f46cfca51e9563e4368b39a8e58a9e514e7d
-EBUILD python-caja-1.12.0-r1.ebuild 1034 BLAKE2B 5d4deb1bad0421e339bd39535a2129f8363eac8b8fac382c6d4b1464ec9f574909d2920a1ffca72b14fdc0dc433294287a8c1a6d94c18eacd826df292b6f8139 SHA512 fb5edef48d7677c1c07b4f941015a2fe666f72ab94312b09c64c16d4e2a76d2fa125b74d1105240c3bf6064615da5ce17a0f7d770d1b495d3f32f6aaf734cad1
-EBUILD python-caja-1.14.0.ebuild 1076 BLAKE2B 4504320a5654c499d0a6e143ff507d175b66afce86d13a39b010673b0581cf63d66a3e973d5ddadbaf126a79bee30fdb836f52dcdf49279c95e8b051e6f5e139 SHA512 35a380ed78eee70e76b77e953b6825ad10fa487f132784a13fbf658b572ec08a32a54cdd548dbb17cc272dc01ebabb1af4d8fc98f528ff4b373bb91bb2d293fe
-EBUILD python-caja-1.16.0.ebuild 1076 BLAKE2B 4504320a5654c499d0a6e143ff507d175b66afce86d13a39b010673b0581cf63d66a3e973d5ddadbaf126a79bee30fdb836f52dcdf49279c95e8b051e6f5e139 SHA512 35a380ed78eee70e76b77e953b6825ad10fa487f132784a13fbf658b572ec08a32a54cdd548dbb17cc272dc01ebabb1af4d8fc98f528ff4b373bb91bb2d293fe
 EBUILD python-caja-1.18.1.ebuild 988 BLAKE2B cd89976f74579d8d85c728d20cbb7fb5882356d6294bd1496c85a38f0107a3683b24e85310193362a0c8a9158234e268ed023d13eca9ec87394848f6edbc23a6 SHA512 4fd88ecc0fb3473e52a70116404233015ed14c7c09bda9da27b0b7d52d3d217d8b2f73dcd93cb1c1af3b1faf19c948200e6cf305a04ef9ead78a3bc587625b71
-MISC metadata.xml 416 BLAKE2B 902d9e55647436228f328ae3b95500de14497e3aa673840f40208a9620061f8cd6855b34aff0902c5271b3e79b16809e81eb4f1f972dbf96808031131a207178 SHA512 10b28795c6b8a02478f4896b97bd65c01521e11e2e40c4c2d8b8d5ecd1813a8d4c267af59f005000181b41d151f332eb4d96571c6110b74f6ca14ed9428ca093
+MISC metadata.xml 340 BLAKE2B 38e2ec7c21175122fe4d2439ef5b70277caef629d7275055ae44146db7d9def0c2af3f4d190a7a4ac426ff6fe19f9cf5a707abf71dd1fab85ec79e5d81e1f075 SHA512 5892ee1cdadbfd6a93d5bea5a6232ce8351373df7a6037ed605a8d66c3367fb7afb39e1b4b31052a599cb1e7ea155ae818e9f8225c7992a21443131e98621b33
diff --git a/dev-python/python-caja/metadata.xml b/dev-python/python-caja/metadata.xml
index 9870e15abde1..2d0b28805873 100644
--- a/dev-python/python-caja/metadata.xml
+++ b/dev-python/python-caja/metadata.xml
@@ -5,9 +5,6 @@
 		<email>mate@gentoo.org</email>
 		<name>Gentoo MATE Desktop</name>
 	</maintainer>
-	<use>
-		<flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">mate-desktop/python-caja</remote-id>
 	</upstream>
diff --git a/dev-python/python-caja/python-caja-1.12.0-r1.ebuild b/dev-python/python-caja/python-caja-1.12.0-r1.ebuild
deleted file mode 100644
index 8e84490ede64..000000000000
--- a/dev-python/python-caja/python-caja-1.12.0-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit mate python-single-r1
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="Python bindings for the Caja file manager"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="doc gtk3"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="dev-libs/glib:2
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	>=mate-base/caja-1.8[gtk3(-)=,introspection]
-	!gtk3? ( x11-libs/gtk+:2 )
-	gtk3? ( x11-libs/gtk+:3 )
-	${PYTHON_DEPS}"
-
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	virtual/pkgconfig:*
-	doc? ( app-text/docbook-xml-dtd:4.1.2 )"
-
-src_install() {
-	mate_src_install
-
-	# Keep the directory for systemwide extensions.
-	keepdir /usr/share/python-caja/extensions/
-
-	# The HTML documentation generation is broken and commented out by upstream.
-	#
-	#if use doc ; then
-	#	insinto /usr/share/gtk-doc/html/nautilus-python # for dev-util/devhelp
-	#	doins -r docs/html/*
-	#fi
-}
diff --git a/dev-python/python-caja/python-caja-1.14.0.ebuild b/dev-python/python-caja/python-caja-1.14.0.ebuild
deleted file mode 100644
index 8e2f6d0374f6..000000000000
--- a/dev-python/python-caja/python-caja-1.14.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit mate python-single-r1
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Python bindings for the Caja file manager"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="doc gtk3"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	dev-libs/glib:2
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	>=mate-base/caja-1.8[gtk3(-)=,introspection]
-	!gtk3? ( x11-libs/gtk+:2 )
-	gtk3? ( x11-libs/gtk+:3 )"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	virtual/pkgconfig:*
-	doc? ( app-text/docbook-xml-dtd:4.1.2 )"
-
-src_install() {
-	mate_src_install
-
-	# Keep the directory for systemwide extensions.
-	keepdir /usr/share/python-caja/extensions/
-
-	# The HTML documentation generation is broken and commented out by upstream.
-	#
-	#if use doc ; then
-	#	insinto /usr/share/gtk-doc/html/nautilus-python # for dev-util/devhelp
-	#	doins -r docs/html/*
-	#fi
-}
diff --git a/dev-python/python-caja/python-caja-1.16.0.ebuild b/dev-python/python-caja/python-caja-1.16.0.ebuild
deleted file mode 100644
index 8e2f6d0374f6..000000000000
--- a/dev-python/python-caja/python-caja-1.16.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit mate python-single-r1
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Python bindings for the Caja file manager"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="doc gtk3"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	dev-libs/glib:2
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	>=mate-base/caja-1.8[gtk3(-)=,introspection]
-	!gtk3? ( x11-libs/gtk+:2 )
-	gtk3? ( x11-libs/gtk+:3 )"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	virtual/pkgconfig:*
-	doc? ( app-text/docbook-xml-dtd:4.1.2 )"
-
-src_install() {
-	mate_src_install
-
-	# Keep the directory for systemwide extensions.
-	keepdir /usr/share/python-caja/extensions/
-
-	# The HTML documentation generation is broken and commented out by upstream.
-	#
-	#if use doc ; then
-	#	insinto /usr/share/gtk-doc/html/nautilus-python # for dev-util/devhelp
-	#	doins -r docs/html/*
-	#fi
-}
diff --git a/dev-python/python-evdev/Manifest b/dev-python/python-evdev/Manifest
index 9ae5dd314b72..c20b5e0abe11 100644
--- a/dev-python/python-evdev/Manifest
+++ b/dev-python/python-evdev/Manifest
@@ -1,3 +1,3 @@
 DIST python-evdev-0.7.0.tar.gz 80508 BLAKE2B 9c3048d649d41b7fc0dfa1af14239a0bfbb5b85c577a8de0323cf35eff79324703987b0a5ec27c06fd277f6ddf76bdd1c7b0b2e589d03ec205c8a7eb0afcad70 SHA512 9757ce392d08f9de0446963cf5351a66dbc2373426bef26e63d71623df1f7c47d90f6e454649076ded214878e67f321380646da3f76bc0fb57f7eb9bbecd3e7a
-EBUILD python-evdev-0.7.0.ebuild 467 BLAKE2B 496bc7c239c0eb439c7eea657c02f5a450988dc75a7f5d6adfa9946d3e7d5e5cf8106ad43bba58f14478288657b2e859a4d5999afc36fe5043cfb65d7ea0b7b2 SHA512 1c2f9a874408054dedb27764161f31d5bc41c90927760bbc439433896d8879a2f9fa8b3344fcebc07c91983b4c4101771c743eb6f752db8e1656892a00dbecef
+EBUILD python-evdev-0.7.0-r1.ebuild 645 BLAKE2B e63ee394c6c0728625f05c9d790de54fa3562d8ae7c278fbf9ce3dffbf50a9d845673e383debdd00655e5416aaf34ad609e71686b78ff7c4e971b866e89539a7 SHA512 60ec8e3d83f4be8fd85980177745e606fe5c4c2dd19a9ea7ee56c815a9b44e633ac20bba09a8b390efe58b8690ede1e25af21830138287e37b54e0aeb75e6294
 MISC metadata.xml 257 BLAKE2B 5c2ca1a3b14d55f8b7d0dd09b0811de8e397c4f748a58c4133f02e86e9084da2b2afabee2c7fb38f38d97d1a301c6de2dc6c4cf8ad4f91fe55c35b8580e6ff0f SHA512 2214f84571910c807983e21889732fb6b9619cd62bafc51a3743786f42b2c6248f1717ec5936685e767a70a052ec725a7a62c602b9c95fbb8e45838472146304
diff --git a/dev-python/python-evdev/python-evdev-0.7.0.ebuild b/dev-python/python-evdev/python-evdev-0.7.0-r1.ebuild
index 4a7a95efedad..8f45fd510f8f 100644
--- a/dev-python/python-evdev/python-evdev-0.7.0.ebuild
+++ b/dev-python/python-evdev/python-evdev-0.7.0-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
 inherit distutils-r1
@@ -16,3 +16,9 @@ KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_compile() {
+	distutils-r1_python_compile build_ecodes \
+		--evdev-headers \
+		"${SYSROOT}"/usr/include/linux/input.h:"${SYSROOT}"/usr/include/linux/input-event-codes.h
+}
diff --git a/dev-python/python3-lxc/Manifest b/dev-python/python3-lxc/Manifest
index e9ffe9ce13bf..8931b1c59151 100644
--- a/dev-python/python3-lxc/Manifest
+++ b/dev-python/python3-lxc/Manifest
@@ -1,3 +1,5 @@
 DIST python3-lxc-3.0.1.tar.gz 27424 BLAKE2B ffdf128e06d7b256652588af7c464045479ce907d2119dfe9780737c7bd5f3008c01d834a79f63932bfa51e3094a9d40af46c4cb6c3be72108205d65a8ee3d11 SHA512 7e6b6cb9a02e5af8b3fc8aeefff2954c68d2d1154751fa97a70bce86131021571e15db86bb0d6900a93dda78247e37b75cdfe250bf4d1b7548dc8383ed3d45f6
+DIST python3-lxc-3.0.2.tar.gz 27300 BLAKE2B dc4ba71b156eb0f257bf9d717f07f22afee3d00666601b709341d9091a1a75d237c174f613a93b6ecf7c69b4e6cc75187316e656a02a1d52f0e9970b8f3af6ad SHA512 2fc776decf6248be39f9e8a607a967acf180f3a07e45fadd6be4450f01caa4a854f217dcf7e81e27b5b838c2cea04ef09c8ab8b87c5be5091185bba2eb6b6d23
 EBUILD python3-lxc-3.0.1.ebuild 488 BLAKE2B 2647e70a041e8471ba5c319ba18f68bb2633a7314070b43b28f4a1f8a42730175eca28010d807be9128000439f2decb70b5651bf54f265f3b0de018ee44898a3 SHA512 cd2b832892317b2da908180b99d6ba7b231ebf563aee9e963f445dc2793d1cd3d020a40a22d03379e4ea751c2d28b3cac2b77cd9813bc47acc283aabc763db47
+EBUILD python3-lxc-3.0.2.ebuild 490 BLAKE2B cac2dac3adf8d039562baa723e074357be9214e693ac8122b878abae69749c15b33d63f9c291fc4741c9b71894d3ad83914b3b3710eb0883c7ddc0d66a38cd7a SHA512 18ed28c82b929e283f180f276ba901e6a8dd81091b60e6a11f2ed17d5c9d23309985ca6fda5c1801d633cf020cfb0f53a3c6e668cd2b183be7a116132eb3119b
 MISC metadata.xml 475 BLAKE2B 4542a3c6240d1afce6fc554a255ed7097ab9923879241e73a77e391be5ee7f6638aaeb5f28ee859735c8abe412c3e62726aa64d67ce744ee1805bb7375dc1d87 SHA512 9db5e045665924cdcd5aa9d843be61c602440d2a18328db38733091ed0050e3c21f14c280a49c1db1bdcf9ae095b7bc58e50b5f3690e092502da87b2b5fc984a
diff --git a/dev-python/python3-lxc/python3-lxc-3.0.2.ebuild b/dev-python/python3-lxc/python3-lxc-3.0.2.ebuild
new file mode 100644
index 000000000000..2f5864cdfceb
--- /dev/null
+++ b/dev-python/python3-lxc/python3-lxc-3.0.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for LXC"
+HOMEPAGE="https://linuxcontainers.org/lxc/"
+SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND=">=app-emulation/lxc-3.0"
+
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index 134cabd1c514..59fef384a1ce 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,7 +1,9 @@
 AUX sip-4.18-darwin.patch 1187 BLAKE2B a3cd0418de90e7377bc2ae1206f4620c6be379a3bd38f22c19256b06f5ba0c90ff07f34dcc8d2f44a25244e11544176a5e1b91049d220bd56cc7b3876a26ba76 SHA512 1afe049fd21f0e8e5118dec4d4b74851cd5e2c75a66a93e1a79a42267954b1edfcff9644696c7d98342499fb27fde727a554b5739cbd791d17a0e319c1dddb7e
 DIST sip-4.19.12.tar.gz 1036410 BLAKE2B 11f7df2ddafe0ceb1edd75d3cc5128c32d7aa2e9a77ad4555d69bcafc87f8141384928cdf2481c324998b2e224920b50c0f397d67314370ce30cca6d7a02a15a SHA512 9b9680172357aaf4a1ebc3bf1f4d2badaaa8643e50665fed6e17d27283a499ceac56c4f1db190de4d9516c8f0f794159485cc6f8fd68daafcbe1ccac85161972
+DIST sip-4.19.13.tar.gz 1038815 BLAKE2B 0b6f2941140a535cfdfb51db71cf9a55e5f65be85961e304496fded7781da42b0ab7d01045b8802468a3ce3b57e7f571851fc7713fd47a03c8344017982d6632 SHA512 eb456e1f7efa463f859047acc5301e19279e1627629d0bad3ac7a0a52b77575126bc3f2c64bb4278ae11d415c13d2731dfc8c816bba71307173d393a414aae98
 DIST sip-4.19.8.tar.gz 1024548 BLAKE2B e43dfe542061db9f1d5981d0cc172d9c8420c4e66c282c52974ab28314c33bd28e6056b61f74b04680c1735c9bd2c4656e1a541f4bae94c858d18713f6222914 SHA512 9c0a9722a9a9dd23e2eabe751d622cdd31b376b7987b2c991f5ef4a8d11853c5c6e9f1c24a0d2d864d3990e2a45c2a159ca8511efd4a7e156a14937ef3c680f7
 EBUILD sip-4.19.12.ebuild 2779 BLAKE2B c89ad98b6a4fc5c48440c6ce3bbac9ee1f7924b56fd481d4a5d4c092309634a8cf75e36b26b09d2b60d5b9c9dfcb7ba98507d249c3693c404fa9a0b65953e6fa SHA512 89ac3915fae1296533265b373fe554d704280b4f936cf6362f5f4e43f726b01bb057c813e4eceaf91cc2abe684c6c7684144751c74510660c9ab2af084499554
+EBUILD sip-4.19.13.ebuild 2776 BLAKE2B 16ea86519013bd7ba796e2b6c5e785203cf3374802481c65e20b300ec45727c78ac8a0bd298f9d247a8b56beda81d6e2021edab657c5624b85f62c07d11a73d2 SHA512 a401b87abf046d9cbceddc521ba5e91db9abf942e7d69037c272bc070b13fd5d788426fc5d5480066c21993d20e0ab857b8af1b530210fce6014f945e41589d2
 EBUILD sip-4.19.8.ebuild 2770 BLAKE2B a2f0bb2c65e93efb40da64942e4230d35626ac44d7c90240ec1e2ffefa7256bb00073882639d72e87c46876a21cba8334dc3b822e089c149ef6f2df4e8f2b961 SHA512 7f88d918131f92a3d5e0dd34b7c70b80facfc603cf9a504de45c9c69944fb15fe836ca6125d95cab4a8fdbb17d43a729cbe13e1aebde0472843d507d97424075
 EBUILD sip-4.9999.ebuild 2651 BLAKE2B 9d70dd20b5e89a6652fa029e673331ef088d1b19e98a5e958fe453591f4d21420fcbd4ffb103c572b2176359d6cbf76804722983ed9ced2b7c805588af0fa811 SHA512 7157f51e4be926fb6572886f2fafbb0d23ebfaf21233a348a0abdc14400c3f5f52c3fef2e7174664b0a91cf3e33303c0e963b7030f1fb62b56a2550b7f192c57
 MISC metadata.xml 593 BLAKE2B 3c4b5ccd30162027c913070a54eb9b836a7add04532e1c5b03dd83f0e4e58da0d2e19aee90f1fa4a97db0008a06575a5b0fe33986e1b0c9d473e4adff056afdd SHA512 91f8918bffb715bfb1def9aa6717a8c4149b36e6a1f79e7e3d4c56e0edc51a6585dad3a93698e956f1ff0e659c1f975c3f23be5a498479fc5052369840ac83d5
diff --git a/dev-python/sip/sip-4.19.13.ebuild b/dev-python/sip/sip-4.19.13.ebuild
new file mode 100644
index 000000000000..728a604c424b
--- /dev/null
+++ b/dev-python/sip/sip-4.19.13.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+
+inherit python-r1 toolchain-funcs
+
+DESCRIPTION="Python extension module generator for C and C++ libraries"
+HOMEPAGE="https://www.riverbankcomputing.com/software/sip/intro"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit mercurial
+	EHG_REPO_URI="https://www.riverbankcomputing.com/hg/sip"
+elif [[ ${PV} == *_pre* ]]; then
+	MY_P=${P/_pre/.dev}
+	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
+	S=${WORKDIR}/${MY_P}
+else
+	SRC_URI="mirror://sourceforge/pyqt/${P}.tar.gz"
+fi
+
+# Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h
+SLOT="0/12"
+LICENSE="|| ( GPL-2 GPL-3 SIP )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="debug doc"
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+if [[ ${PV} == *9999 ]]; then
+	DEPEND+="
+		sys-devel/bison
+		sys-devel/flex
+		doc? ( dev-python/sphinx[$(python_gen_usedep 'python2*')] )"
+fi
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+if [[ ${PV} == *9999 ]]; then
+	REQUIRED_USE+=" || ( $(python_gen_useflags 'python2*') )"
+fi
+
+PATCHES=( "${FILESDIR}"/${PN}-4.18-darwin.patch )
+
+src_prepare() {
+	if [[ ${PV} == *9999 ]]; then
+		python_setup 'python2*'
+		"${PYTHON}" build.py prepare || die
+		if use doc; then
+			"${PYTHON}" build.py doc || die
+		fi
+	fi
+
+	# Sub-slot sanity check
+	local sub_slot=${SLOT#*/}
+	local sip_api_major_nr=$(sed -nre 's:^#define SIP_API_MAJOR_NR\s+([0-9]+):\1:p' siplib/sip.h || die)
+	if [[ ${sub_slot} != ${sip_api_major_nr} ]]; then
+		eerror
+		eerror "Ebuild sub-slot (${sub_slot}) does not match SIP_API_MAJOR_NR (${sip_api_major_nr})"
+		eerror "Please update SLOT variable as follows:"
+		eerror "    SLOT=\"${SLOT%%/*}/${sip_api_major_nr}\""
+		eerror
+		die "sub-slot sanity check failed"
+	fi
+
+	default
+}
+
+src_configure() {
+	configuration() {
+		local myconf=(
+			"${PYTHON}"
+			"${S}"/configure.py
+			--bindir="${EPREFIX}/usr/bin"
+			--destdir="$(python_get_sitedir)"
+			--incdir="$(python_get_includedir)"
+			$(usex debug --debug '')
+			AR="$(tc-getAR) cqs"
+			CC="$(tc-getCC)"
+			CFLAGS="${CFLAGS}"
+			CFLAGS_RELEASE=
+			CXX="$(tc-getCXX)"
+			CXXFLAGS="${CXXFLAGS}"
+			CXXFLAGS_RELEASE=
+			LINK="$(tc-getCXX)"
+			LINK_SHLIB="$(tc-getCXX)"
+			LFLAGS="${LDFLAGS}"
+			LFLAGS_RELEASE=
+			RANLIB=
+			STRIP=
+		)
+		echo "${myconf[@]}"
+		"${myconf[@]}" || die
+	}
+	python_foreach_impl run_in_build_dir configuration
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	installation() {
+		emake DESTDIR="${D}" install
+		python_optimize
+	}
+	python_foreach_impl run_in_build_dir installation
+
+	einstalldocs
+	use doc && dodoc -r doc/html
+}
diff --git a/dev-python/sphinx/Manifest b/dev-python/sphinx/Manifest
index 5ab1684d0974..bfb538339e6f 100644
--- a/dev-python/sphinx/Manifest
+++ b/dev-python/sphinx/Manifest
@@ -14,5 +14,5 @@ EBUILD sphinx-1.3.5-r1.ebuild 3577 BLAKE2B 2cb4707c8bb3e1dfec094b359cefd4d03fc2a
 EBUILD sphinx-1.6.3-r4.ebuild 3426 BLAKE2B 0dcfb96abd86c6b0439250adc8004894fd653c5070a0e3a425cbaf063c6dae7da3a48d0280a2efcbd65a7d17114f2dcff27d4d970b37af8bdd498db2a79822fd SHA512 70209e8e3c8c5b463ff5320e00efd7b1761dd7e270d4991c9e43b9a360dec966a94dd83dd65ea3d0d01eb9289a4658492809109917c4490124f1822ebb7ca217
 EBUILD sphinx-1.6.5-r1.ebuild 3496 BLAKE2B 61d468b87a23ec4d6247a4ee553d3ae94060e77f7fc4caec8b009cf43ec8849cb4cad2ac43b17ea46daa2b0bc313ee16df571660c1f6015b3173cff28c54774f SHA512 bb3cbc542479b8dbd418af82b935e389fac07d19ded44fa64251c17ef26c4e5500c97aedfcac52ad341195fa278d9235874dba18044c0feb1cbe10069a86d149
 EBUILD sphinx-1.6.7-r1.ebuild 3513 BLAKE2B 60d8965d972f777f87a25fc6b458f987da321dec1dd749d8faf7d5d875ae388d00d071d0b00b09f9e5738b5b938640e2a80f0e3ecb078efebd3c9439edf9246d SHA512 a39cfc9fe463d9100c13beefc0025d8d4cdd1f23509571ad5bd867d86cd469342aa7b66a5c350cbbf7904611369868191f31239726b48af5133f7abf31028c9b
-EBUILD sphinx-1.7.5-r1.ebuild 3130 BLAKE2B 53e026c5b06f96260cca61aebf6bf64b95c412111174afcce0322bd47961e35bdab380473557001dde488a864bbd44d9cfe2e217ecac0c7bcbb6ddcdbc54268d SHA512 4c169d583d4ef1ed05dd2713a60f2fd912265e4e912d7138aaafd63daac9e043081fa466304fb9f78fd0f9d0fae6e2748a6ae508cdb8d350579d5397649ecd98
+EBUILD sphinx-1.7.5-r1.ebuild 3300 BLAKE2B 2bc93273d9fc49adfa033126c59f3383754537ef81632e6b47f3707fbcd62895325869078ff6cb5a6f4ade8439ce676585be2954832a4b6d2fda5aee67fa7999 SHA512 e90d2932c53cdb9d0628083441d48cbfd1c1aa3bb215058a55dee6977a1f2d7bfd36ea7e3c220c3b629c03805f0f7327597f8bcf0a87db71228ad639ada188b6
 MISC metadata.xml 556 BLAKE2B a2689efbe3d569fa878296875f4145fdb4d83b4c4821aa636d4006b1823e5646b9cebd5341b4bc02de30985191b83461363cc892aca638e678f86a6e314dcef3 SHA512 bff6813bf9c5110c2e4f5764f911309325923cb58300c19c079d1e6de3d6c4c0bcaf4e206fa4bc11ebf54b961c7e09217310b5647029350d4f9602da6325db0c
diff --git a/dev-python/sphinx/sphinx-1.7.5-r1.ebuild b/dev-python/sphinx/sphinx-1.7.5-r1.ebuild
index 68cbe615c4e2..12f6fcda60b4 100644
--- a/dev-python/sphinx/sphinx-1.7.5-r1.ebuild
+++ b/dev-python/sphinx/sphinx-1.7.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,9 +14,13 @@ SRC_URI="mirror://pypi/S/${PN^}/${P^}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x86-fbsd ~x86-macos ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="doc latex net test"
 
+# Tests automagically use latex, bug 667414
+#REQUIRED_USE="test? ( latex )"
+RESTRICT="!test? ( test )"
+
 RDEPEND="
 	>=dev-python/alabaster-0.7.9[${PYTHON_USEDEP}]
 	<dev-python/alabaster-0.8[${PYTHON_USEDEP}]
@@ -54,6 +58,9 @@ DEPEND="${RDEPEND}
 		>=dev-python/whoosh-2.0[${PYTHON_USEDEP}]
 		virtual/imagemagick-tools[jpeg,png,svg]
 		virtual/python-enum34[${PYTHON_USEDEP}]
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
+		app-text/dvipng
 	)"
 
 S="${WORKDIR}/${P^}"
diff --git a/dev-python/sphinxcontrib-websupport/Manifest b/dev-python/sphinxcontrib-websupport/Manifest
index 0036ca90954d..4fcc3bec44e2 100644
--- a/dev-python/sphinxcontrib-websupport/Manifest
+++ b/dev-python/sphinxcontrib-websupport/Manifest
@@ -1,5 +1,5 @@
 DIST sphinxcontrib-websupport-1.0.1.tar.gz 590480 BLAKE2B 1be40595094233ca2ddb1a367039320fe6655b1a6bbf251d7722b60efe0d0cfbe1cdb38455f47f4fb6810500e0e4923f5a9a74df4f79d1544261c4706a59e8fb SHA512 67807b2505e063639163b020f0e62469b0c2838c303516cce9a8d90181cc7b8a10d76532adb1267556d40f95966efc20ec9f8ee1a6731056bda827a6f97f40ec
 DIST sphinxcontrib-websupport-1.1.0.tar.gz 587947 BLAKE2B fafaa56071245c8934e27c6d2d7752745b2a8047c8a30d52e513fff7f952086a1b9082aa15e15ef232d69ef0c0d5d117f8a8c97fcdf9cd90c89d53238d7f322e SHA512 adbd7db06150a4424a881a22442c2535ed823c7adcc295ef9c3af5ae38d823349830a114e8a7af2138498d0e68b37189707c1bb5a28b45c76031bcf94210fb89
 EBUILD sphinxcontrib-websupport-1.0.1-r1.ebuild 1161 BLAKE2B 6841ef437c0e54f5c01ef473178aa3e6af58c331d97343461e9ce5a8f52c2accaf9fca06154232a8d36db404b474b4de2cc2cafe0e0f9417c46a1799d1438d22 SHA512 92ed109f52211a8f0127ca1b82448b49221102a364d601ff31194c8b277ff0b85d7eb59034d74239f351ab16e5fe10e5022564e4608ccafb5b34165ebc49ed02
-EBUILD sphinxcontrib-websupport-1.1.0.ebuild 1175 BLAKE2B d5a4707e36ea8b8b5f2bd80ff0b43b81f006d20f29551e32e5a27973f3db4d7f66232367ae8119d35913e535155c20f3c13e2f497c97b82eb49c9aa137cc51e0 SHA512 f044e361c16720f28bc1d20b7ec81d1522034185d30f364bc43430c2519ef615ae2e480f8d6dba05a439189beb98e6849477ddbdd1f2ba74bb6583818197ff0b
+EBUILD sphinxcontrib-websupport-1.1.0.ebuild 1168 BLAKE2B 1fb6ff315b60be5878bfbdfc93c3b35c04f556c5e43477f65a58fd3151cda904547443b411805e3ae3b83a3b5d10659835c782824ac5958e8bfff63fe7d62d8e SHA512 971dafa099def45c7ca298ce7898dea6b10b11e98eaa1179340accccd6e788be01d9e7f3c6ab32d42f717f3725b7c8b617856d535d221db1f93bdf1f6bff9112
 MISC metadata.xml 588 BLAKE2B a7a777dd8df5b09707041ace4566bf80cee826c98aedc1e13b7dd48ddce2201aeaa79f2091ac549a66da2a04449f3ba69c243c8b1a44e0f0b661240b7dc2fbe6 SHA512 eeab14e556d91f99f5bff45a490eaecf47bcab9e295c992b817c94359fe87483947f43986bdf4633257b1ff69ffffd7b2f250e411e728f68b39a65f5b53a29bf
diff --git a/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.1.0.ebuild b/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.1.0.ebuild
index a03f6c0a8cb8..1b01a1560b5a 100644
--- a/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.1.0.ebuild
+++ b/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/sshtunnel/Manifest b/dev-python/sshtunnel/Manifest
new file mode 100644
index 000000000000..1c9fad45059d
--- /dev/null
+++ b/dev-python/sshtunnel/Manifest
@@ -0,0 +1,3 @@
+DIST sshtunnel-0.1.4.tar.gz 48330 BLAKE2B 5fdc5dd602274a16025f250fcc3a36453a17c921f51367cac0cb0ef36be6251f687b53b1df6072d1e32456a5c0fa5ec6d2fd8e5d4874977a641a6c9ba81ac57c SHA512 c228fe79cf5172c950777a40b27ababd42a31b7aad8a8472d55a2b3babf5aa4c5308799bb271f33f0e943c309eb9adedee321045a03324cb5e30a385178751ca
+EBUILD sshtunnel-0.1.4.ebuild 575 BLAKE2B d6408d3fe496b1eb3b10c5eb11a21b04186895d9b4c0bf3202ce7a986a965a9ee545a99ccd420c2beef8ce9b279add4d7d3a6c7eab68998ceec2ca48edeb81af SHA512 caf5a481bdca8e9ea2cd0227c2f83e07e7973d901c05cacf78d667131baa5cfcae7467eaa52a42323fe2271f2d1daac0498789856496adbfb1704cc947a6e7ac
+MISC metadata.xml 253 BLAKE2B 34807135fdbc8396660d3fa85339e80c0c14693b937e360de963062b40d1a4306d86c3f6fbe60c45146632f934695d26c06083a2977031c36bdee17f57140f72 SHA512 06255a02d9a177532c33fb7a9271f8f538cef82354feb7689c839e2eb1516d53fd0e78aca22fee2f9a19dbf1e3f7ad96dea23c8d97efdac952e4b754314664d9
diff --git a/dev-python/sshtunnel/metadata.xml b/dev-python/sshtunnel/metadata.xml
new file mode 100644
index 000000000000..b3c1d365eaad
--- /dev/null
+++ b/dev-python/sshtunnel/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>titanofold@gentoo.org</email>
+		<name>Aaron W. Swenson</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/sshtunnel/sshtunnel-0.1.4.ebuild b/dev-python/sshtunnel/sshtunnel-0.1.4.ebuild
new file mode 100644
index 000000000000..4aeb081ac92f
--- /dev/null
+++ b/dev-python/sshtunnel/sshtunnel-0.1.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Pure python SSH tunnels"
+HOMEPAGE="https://pypi.python.org/pypi/sshtunnel"
+SRC_URI="mirror://pypi/s/sshtunnel/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86 ~arm"
+LICENSE="MIT"
+SLOT="0"
+
+IUSE="test"
+
+RDEPEND="dev-python/paramiko[${PYTHON_USEDEP}]"
+
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/tox[${PYTHON_USEDEP}] )
+"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/statsmodels/Manifest b/dev-python/statsmodels/Manifest
index 78e268773ca4..576dfc3820e5 100644
--- a/dev-python/statsmodels/Manifest
+++ b/dev-python/statsmodels/Manifest
@@ -2,7 +2,9 @@ AUX statsmodels-0.6.1-numpy-1.10.patch 910 BLAKE2B cfff850a68733641fdad5913529e6
 AUX statsmodels-0.6.1-pandas-0.17.0.patch 1043 BLAKE2B 0473214de500e911a36cf3ba645b57536ea6ada17f7123d193d31fb266ba07724aad7297cd705b51b34a394791656a72b891ab94cbf3969935b59324813a0100 SHA512 0a4394d672105337fd03d435a402dbd31862a39b8010658f859114ed9694de9be4d6c3d641b5f385986a6651f0434a3602659d7192bf99f749e49f33f53a634b
 DIST statsmodels-0.6.1.tar.gz 6980841 BLAKE2B 5ac16df0fc06d051cc79d037bd3a9b097526498a48cdc0bf750babd5915f27a0dea23d8869a5101c62bb780ec0c54c503a766c7da6db59fb8d10dc65c70268b1 SHA512 9047b8cf4b9d19bd697867cecef1c4608fd86f3d16e67e44d8c152e1e25918f5aff6b4843c58395e71614be401551e3e48d4dcf158480cbdb45d9735b1c5ea77
 DIST statsmodels-0.8.0.tar.gz 9464851 BLAKE2B f4bcf38c0292dcdfef9e3e34519f4dff004795bf76f54773f551c6c767f16f9cee0a2756408cff6f727df8eebc269bccf2c8bd28915a729eb022eba34831628e SHA512 32bb7f36acc16796c445e5f695d958af4525fbbb2d374376fb4a73c972e3796fad05532456cef4aa5ee59d6fce11921174e17bbfc2e05d2488ce1ceac5175239
+DIST statsmodels-0.9.0.tar.gz 12658359 BLAKE2B 1b451edc281ac8bfd35441d7f31ff02c7068b854c06a5e50fcb6fb2ff3c023bbee264a25407078f99ca08e467676a32c1a0156dec668673bad3e8d7a46a95154 SHA512 a0310129ee915dce5006e4e40190d19c3a09facad398ff089fa4a244d51a035f9591267fd8d34a00ce82e4cab893df96787596f9d350d878e97a0bb3305f1bd5
 EBUILD statsmodels-0.6.1.ebuild 1790 BLAKE2B fcb7c3ad951c5bad5ea3d5bf6e373db02a75b1a210e751c5a98353818103e616114cd86edc3caa42df81bb72cf3e9bd88ee69421913ef0dafc3f7bf49f7f12af SHA512 0db7b9c98d5d9b2a6436c073bcc2172c5b9938f0f4cd5c7256ebe4e5725dc65b3dac80186397d2516b5a5fd29fc6db93afc0caf031d239010b0ef07685c6224a
 EBUILD statsmodels-0.8.0.ebuild 1954 BLAKE2B 660db988aff6c18c625065226a560f3740780ab20afeba4b4deff8a740a789ace1593e420cda8e7503f69fbc2a8f95a01e539fde60d46c3783e81d12948c10e9 SHA512 48f61224be4b2b960a147cdcef7d28e1f1d4eefce6f7526e16816a350fa75a24854fad5b49715081f749b8812f79aac07ae3ff88a031a02b7943191e4780fdc0
-EBUILD statsmodels-9999.ebuild 1919 BLAKE2B 4fc6380ed66d02d713ac95d3e4df8ccd5ccd664728145cbd5efeef37e3582b9fb3c5eb7f7b3dd7d66b00494687e822723dd391fba144cba1ab9dab33e85b3862 SHA512 be09fd1121ea2beee8e307df2bf9c6e822006e22f70d95bd11cdacea2c67962dd39a2c6b17e7f618eacfca354cbd9bf78ae95cc9bcf711c3d6c18f3c2040d6ca
-MISC metadata.xml 1075 BLAKE2B 86672821dcfcd4f52b35f953c2024646ac8bcd937b30ce7fd8c0d1411d5cefe64cc7e8943d1b073c81fbbb4cdee348b30c93fd8145651088f8f88d01ca9e742d SHA512 7e9c385a1820da33e55db49d582d750f01fd11c0dd1616470f2cd71f12c673010cf76c8af984472daa8787704d353f2d42f60798e419d182c9e24ba4dd7dd97f
+EBUILD statsmodels-0.9.0.ebuild 3415 BLAKE2B 015330f04ba36101b8165b3e8c04281dd9f5d8f6614740d655053759618c465e9b569c159340bb7831b9754852406662b807e0c7f20bbec7ba792628e9d4a3d4 SHA512 1f37a380a0b9d2a2b7197f588103d9dbe864fde788dced0652a1c88c03c32a2c8f777904fdad965baed28b80b43b8046d9d6045ccbbe4845ca22da3672658d28
+EBUILD statsmodels-9999.ebuild 1964 BLAKE2B 400467949cd23f02a0ae92ed9d7725236046cfbf640758dd0a36402da54d7e1703d7306f033fe3b52bb9818de2983c8c88fe51299b3bfba7d278c8b0e6d98d78 SHA512 2c3f726e88b257952b396185e378a4ba4dfb0f626b39e27acd88aa0d9d8e55d65171960de882bab107642327af84c0a132cc424fc1d598e2be0a78a14b546f64
+MISC metadata.xml 1318 BLAKE2B 5e5ef8e0dae2bed3ba7d999d824c416d82515a26e6f99968e1cec7de5ef159caa3de7da3c5fc47a1e3e0a5251bbc542a10210204fb5045d35d1acc45b5030090 SHA512 8c554b8e55d88a7c5ed0bd29379ea1fe41b64e9d354ba584756f706ce1fc5857068c546138b49fb8af778c5401aae7169bb30413f6f209db9371441cb956ae91
diff --git a/dev-python/statsmodels/metadata.xml b/dev-python/statsmodels/metadata.xml
index cb9b89704bd8..72014447a73d 100644
--- a/dev-python/statsmodels/metadata.xml
+++ b/dev-python/statsmodels/metadata.xml
@@ -9,6 +9,14 @@
     <email>sci-mathematics@gentoo.org</email>
     <name>Gentoo Mathematics Project</name>
   </maintainer>
+  <maintainer type="person">
+    <email>horea.christ@gmail.com</email>
+    <name>Horea Christian</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <longdescription lang="en">
     statsmodels is a Python module that allows users to explore data,
     estimate statistical models, and perform statistical tests. An
diff --git a/dev-python/statsmodels/statsmodels-0.9.0.ebuild b/dev-python/statsmodels/statsmodels-0.9.0.ebuild
new file mode 100644
index 000000000000..95b3326d4d7e
--- /dev/null
+++ b/dev-python/statsmodels/statsmodels-0.9.0.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Statistical computations and models for use with SciPy"
+HOMEPAGE="https://www.statsmodels.org/stable/index.html"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples test"
+
+COMMON_DEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	>=dev-python/pandas-0.23.0[${PYTHON_USEDEP}]
+	dev-python/patsy[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+"
+RDEPEND="${COMMON_DEPEND}"
+DEPEND="${COMMON_DEPEND}
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/ipykernel[${PYTHON_USEDEP}]
+		dev-python/jupyter_client[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/nbconvert[${PYTHON_USEDEP}]
+		dev-python/nbformat[${PYTHON_USEDEP}]
+		dev-python/numpydoc[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		)
+"
+
+python_prepare_all() {
+	# Prevent un-needed d'loading
+	sed -e "/sphinx.ext.intersphinx/d" -i docs/source/conf.py || die
+	export VARTEXFONTS="${T}"/fonts
+	export MPLCONFIGDIR="${T}"
+	echo "backend : Agg" > "${MPLCONFIGDIR}"/matplotlibrc || die
+	if use test; then
+		# Errors reported upstream: https://github.com/statsmodels/statsmodels/issues/4850
+		rm statsmodels/tsa/tests/test_tsa_indexes.py || die
+		sed -i -e \
+			"/def test_start_params_bug():/i@pytest.mark.xfail(reason='Known to fail on Gentoo')" \
+			statsmodels/tsa/tests/test_arima.py || die
+		sed -i -e \
+			"s/def test_pandas_endog():/def _test_pandas_endog():/g" \
+			statsmodels/tsa/statespace/tests/test_mlemodel.py || die
+		sed -i -e \
+			"/def test_all_datasets():/i@pytest.mark.xfail(reason='Known to fail on Gentoo')" \
+			statsmodels/datasets/tests/test_data.py || die
+		sed -i -e \
+			"/def test_issue_339():/i@pytest.mark.xfail(reason='Known to fail on Gentoo')" \
+			statsmodels/discrete/tests/test_discrete.py || die
+		sed -i \
+			-e "s/def test_hdr_multiple_alpha():/def _test_hdr_multiple_alpha():/g" \
+			statsmodels/graphics/tests/test_functional.py || die
+		sed -i \
+			-e '1s/^/import pytest \n/' \
+			-e "/def test_single_factor_repeated_measures_anova():/i@pytest.mark.xfail(reason='Known to fail on Gentoo with Python 3')" \
+			-e "/def test_two_factors_repeated_measures_anova():/i@pytest.mark.xfail(reason='Known to fail on Gentoo with Python 3')" \
+			-e "/def test_three_factors_repeated_measures_anova():/i@pytest.mark.xfail(reason='Known to fail on Gentoo with Python 3')" \
+			-e "/def test_repeated_measures_aggregate_compare_with_ezANOVA():/i@pytest.mark.xfail(reason='Known to fail on Gentoo with Python 3')" \
+			statsmodels/stats/tests/test_anova_rm.py || die
+	fi
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx -b html --build-dir=docs/build
+}
+
+python_test() {
+	cd "${BUILD_DIR}" || die
+	py.test -v || die
+}
+
+python_install_all() {
+	find . -name \*LICENSE.txt -delete || die
+	use doc && HTML_DOCS=( docs/build/html/. )
+	if use examples; then
+		docompress -x /usr/share/doc/${PF}/examples
+		dodoc -r examples
+	fi
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "Plotting functionality" "dev-python/matplotlib"
+}
diff --git a/dev-python/statsmodels/statsmodels-9999.ebuild b/dev-python/statsmodels/statsmodels-9999.ebuild
index a3afaa73d94b..51855998071e 100644
--- a/dev-python/statsmodels/statsmodels-9999.ebuild
+++ b/dev-python/statsmodels/statsmodels-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 
 inherit distutils-r1 git-r3 virtualx
 
@@ -38,7 +38,7 @@ DEPEND="${CDEPEND}
 		dev-python/numpydoc[${PYTHON_USEDEP}]
 		dev-python/sphinx[${PYTHON_USEDEP}]
 	)
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
 "
 
 python_prepare_all() {
@@ -60,7 +60,7 @@ python_compile_all() {
 
 python_test() {
 	cd "${BUILD_DIR}" || die
-	virtx nosetests -v || die
+	${EPYTHON} -c 'import statsmodels; statsmodels.test(exit=True)' || die
 }
 
 python_install_all() {
diff --git a/dev-python/zstandard/Manifest b/dev-python/zstandard/Manifest
index bc1aa804281e..f13738d746b0 100644
--- a/dev-python/zstandard/Manifest
+++ b/dev-python/zstandard/Manifest
@@ -1,3 +1,3 @@
 DIST zstandard-0.8.1.tar.gz 463785 BLAKE2B ac4dce58cefa05d265824004464bad89a7f4c4e5f19ac1d8b5b8b0ad6f806318e2b82ffb6f3a290e3605961801909b339b1e5d89fdccd76fd28c75a695a92e0a SHA512 0ddbe22381397443c6c9f84e64f9358160bede104c4f48351119d880ac4f88994739b0b3915454567d2b2b04930c6ead5aa290a40323ba4b0bacf5e97809793c
-EBUILD zstandard-0.8.1.ebuild 543 BLAKE2B 8ed93e486db71a00c07b722aefa003579c4e44be9cb4e895b9a4e87fa1c7664ec166d46f5fa545e8a9bf78156f3854ff08714a0f20f1d0b266ed4922919226c2 SHA512 0c48a1ef7fb9c256c32df684e1c4a803daabc54e14b3daf121f494c2675d3ef006c43d2590221a528767919683c50d0312a6ec68d2de4c9749bacb919277574a
+EBUILD zstandard-0.8.1.ebuild 545 BLAKE2B b503b32da86afccb1907dea8a672fa28aeb803c5f5cbf8325b0ea24945b7addce2e30839dff215a1475d0a096ec2299d5e19ad1753a3c0d3e566016f6f218687 SHA512 763315e68624772ca90a35cf70b7995cefeee53af7c2ed6746573446843c6b3c6d998514629084397a36072e3fff8447f7c653c7edf059fa1f21b85ded8162fa
 MISC metadata.xml 377 BLAKE2B 987c1e1f5a7a37a8686acf05929a8c7cfa702358d5c8fcb678ebec0e28ab590d2dbfe92892330d006b202cc4fbc22eb4fec8876902ab56f44990a59932d6c0f3 SHA512 54b4b2a4b98fda27659ac1cb39e16ff788687aa814d882822ffdfa9c085b04bb3a24885f9a08ea73b05b959ed6441a6ff5090c1159300c1d024f1abf239cb141
diff --git a/dev-python/zstandard/zstandard-0.8.1.ebuild b/dev-python/zstandard/zstandard-0.8.1.ebuild
index 1ec08922ecf0..315469ccdaac 100644
--- a/dev-python/zstandard/zstandard-0.8.1.ebuild
+++ b/dev-python/zstandard/zstandard-0.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="dev-python/cffi:=[${PYTHON_USEDEP}]"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
author	V3n3RiX <venerix@redcorelinux.org>	2018-10-07 11:03:14 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-10-07 11:03:14 +0100
commit	957235cf19a691360c720f7913672adda4258ed0 (patch)
tree	812bba7928f4293ead05a7ee9c1ac39c5ef9f12e /dev-python
parent	62f67115b5c46134c34f88f4b1cbdacc19384c0a (diff)